From 6d87cf4be7536433d263609828414e687e1d4f08 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 1 Oct 2021 14:11:13 +0200
Subject: [PATCH 001/431] Kernel routes are flushed on shutdown by kernel scan,
 not by table scan

---
 sysdep/unix/krt.c | 31 ++++++++++++++-----------------
 sysdep/unix/krt.h |  1 +
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index b98e7ec0..32bfe7fc 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -542,23 +542,6 @@ krt_is_installed(struct krt_proto *p, net *n)
   return n->routes && bmap_test(&p->p.main_channel->export_map, n->routes->rte.id);
 }
 
-static void
-krt_flush_routes(struct krt_proto *p)
-{
-  struct rtable *t = p->p.main_channel->table;
-
-  KRT_TRACE(p, D_EVENTS, "Flushing kernel routes");
-  FIB_WALK(&t->fib, net, n)
-    {
-      if (krt_is_installed(p, n))
-	{
-	  /* FIXME: this does not work if gw is changed in export filter */
-	  krt_replace_rte(p, n->n.addr, NULL, &n->routes->rte);
-	}
-    }
-  FIB_WALK_END;
-}
-
 static struct rte *
 krt_export_net(struct krt_proto *p, net *net)
 {
@@ -637,6 +620,9 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 #endif
   /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
 
+  /* Deleting all routes if flush is requested */
+  if (p->flush_routes)
+    goto delete;
 
   /* We wait for the initial feed to have correct installed state */
   if (!p->ready)
@@ -729,6 +715,17 @@ krt_prune(struct krt_proto *p)
     p->initialized = 1;
 }
 
+static void
+krt_flush_routes(struct krt_proto *p)
+{
+  KRT_TRACE(p, D_EVENTS, "Flushing kernel routes");
+  p->flush_routes = 1;
+  krt_init_scan(p);
+  krt_do_scan(p);
+  /* No prune! */
+  p->flush_routes = 0;
+}
+
 void
 krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
 {
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index cd4bd07d..f6ad6fde 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -66,6 +66,7 @@ struct krt_proto {
   byte ready;			/* Initial feed has been finished */
   byte initialized;		/* First scan has been finished */
   byte reload;			/* Next scan is doing reload */
+  byte flush_routes;		/* Scanning to flush */
 };
 
 extern pool *krt_pool;

From 13ebe7717685aaa64bbbe09a2e6cc0c6da2bd6bd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Sat, 30 Oct 2021 14:56:55 +0000
Subject: [PATCH 002/431] RPKI shouldn't process more packets when being
 stopped

---
 proto/rpki/packets.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index dd11f997..2c37df76 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -897,6 +897,9 @@ rpki_rx_hook(struct birdsock *sk, uint size)
   struct rpki_cache *cache = sk->data;
   struct rpki_proto *p = cache->p;
 
+  if ((p->p.proto_state == PS_DOWN) || (p->cache != cache))
+    return 0;
+
   byte *pkt_start = sk->rbuf;
   byte *end = pkt_start + size;
 

From 46739f007a8a21c7887a29a465db0c2520fb4a13 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Sat, 30 Oct 2021 15:50:16 +0000
Subject: [PATCH 003/431] RPKI: Do nothing when protocol is stopping

---
 proto/rpki/packets.c | 8 ++++++++
 proto/rpki/rpki.c    | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 2c37df76..a711858c 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -956,6 +956,8 @@ rpki_err_hook(struct birdsock *sk, int error_num)
     CACHE_TRACE(D_EVENTS, cache, "The other side closed a connection");
   }
 
+  if (cache->p->cache != cache)
+    return;
 
   rpki_cache_change_state(cache, RPKI_CS_ERROR_TRANSPORT);
 }
@@ -975,6 +977,9 @@ rpki_tx_hook(sock *sk)
 {
   struct rpki_cache *cache = sk->data;
 
+  if (cache->p->cache != cache)
+    return;
+
   while (rpki_fire_tx(cache) > 0)
     ;
 }
@@ -984,6 +989,9 @@ rpki_connected_hook(sock *sk)
 {
   struct rpki_cache *cache = sk->data;
 
+  if (cache->p->cache != cache)
+    return;
+
   CACHE_TRACE(D_EVENTS, cache, "Connected");
   proto_notify_state(&cache->p->p, PS_UP);
 
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 72fbc967..95066499 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -384,6 +384,9 @@ rpki_refresh_hook(timer *tm)
 {
   struct rpki_cache *cache = tm->data;
 
+  if (cache->p->cache != cache)
+    return;
+
   CACHE_DBG(cache, "%s", rpki_cache_state_to_str(cache->state));
 
   switch (cache->state)
@@ -430,6 +433,9 @@ rpki_retry_hook(timer *tm)
 {
   struct rpki_cache *cache = tm->data;
 
+  if (cache->p->cache != cache)
+    return;
+
   CACHE_DBG(cache, "%s", rpki_cache_state_to_str(cache->state));
 
   switch (cache->state)
@@ -475,6 +481,9 @@ rpki_expire_hook(timer *tm)
 {
   struct rpki_cache *cache = tm->data;
 
+  if (cache->p->cache != cache)
+    return;
+
   if (!cache->last_update)
     return;
 

From 1e76f6e954e8043ec08c917c3f53e20f7dd06c99 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 30 Sep 2021 11:54:11 +0200
Subject: [PATCH 004/431] Suppressed MRT unused static function warning

---
 proto/mrt/mrt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 03f0d59e..5da3c7c6 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -113,13 +113,13 @@ mrt_buffer_flush(buffer *b)
 }
 
 #define MRT_DEFINE_TYPE(S, T)						\
-  static inline void mrt_put_##S##_(buffer *b, T x)			\
+  UNUSED static inline void mrt_put_##S##_(buffer *b, T x)		\
   {									\
     put_##S(b->pos, x);							\
     b->pos += sizeof(T);						\
   }									\
 									\
-  static inline void mrt_put_##S(buffer *b, T x)			\
+  UNUSED static inline void mrt_put_##S(buffer *b, T x)			\
   {									\
     mrt_buffer_need(b, sizeof(T));					\
     put_##S(b->pos, x);							\

From 1c2f66f2bd9b2996c8cba0604e7ac38738399000 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 14 May 2021 16:23:18 +0200
Subject: [PATCH 005/431] Refeed is done from export table when appropriate

---
 nest/route.h        |  3 ++-
 nest/rt-table.c     | 44 +++++++++++++++++++++++++++++++++++---------
 proto/bgp/packets.c |  2 +-
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index ade14857..98d605c8 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -346,8 +346,9 @@ int rt_feed_channel(struct channel *c);
 void rt_feed_channel_abort(struct channel *c);
 int rt_reload_channel(struct channel *c);
 void rt_reload_channel_abort(struct channel *c);
+void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, struct rte_storage **old_exported, int refeed);
+int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, struct rte_storage **old_exported);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 837e0ab9..b005f6f3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -451,8 +451,11 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   struct rte_storage *old_exported = NULL;
   if (c->out_table)
   {
-    if (!rte_update_out(c, net, new, old, &old_exported, refeed))
+    if (!rte_update_out(c, net, new, old, &old_exported))
+    {
+      rte_trace_out(D_ROUTES, c, new, "idempotent");
       return;
+    }
   }
 
   if (new)
@@ -2406,7 +2409,7 @@ again:
  */
 
 int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct rte_storage **old_exported, int refeed)
+rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct rte_storage **old_exported)
 {
   struct rtable *tab = c->out_table;
   struct rte_src *src;
@@ -2423,7 +2426,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct
     src = old0->src;
 
     if (!net)
-      goto drop_withdraw;
+      goto drop;
   }
 
   /* Find the old rte */
@@ -2433,7 +2436,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct
   if (old = *pos)
   {
     if (new && rte_same(&(*pos)->rte, new))
-      goto drop_update;
+      goto drop;
 
     /* Remove the old rte */
     *pos = old->next;
@@ -2444,7 +2447,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct
   if (!new)
   {
     if (!old)
-      goto drop_withdraw;
+      goto drop;
 
     if (!net->routes)
       fib_delete(&tab->fib, net);
@@ -2460,13 +2463,36 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct
   tab->rt_count++;
   return 1;
 
-drop_update:
-  return refeed;
-
-drop_withdraw:
+drop:
   return 0;
 }
 
+void
+rt_refeed_channel(struct channel *c)
+{
+  if (!c->out_table)
+  {
+    channel_request_feeding(c);
+    return;
+  }
+
+  ASSERT_DIE(c->ra_mode != RA_ANY);
+
+  c->proto->feed_begin(c, 0);
+
+  FIB_WALK(&c->out_table->fib, net, n)
+  {
+    if (!n->routes)
+      continue;
+
+    rte e = n->routes->rte;
+    c->proto->rt_notify(c->proto, c, n->n.addr, &e, NULL);
+  }
+  FIB_WALK_END;
+
+  c->proto->feed_end(c);
+}
+
 
 /*
  *	Hostcache
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 647551e5..f1e6d7d2 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2695,7 +2695,7 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, uint len)
   {
   case BGP_RR_REQUEST:
     BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
-    channel_request_feeding(&c->c);
+    rt_refeed_channel(&c->c);
     break;
 
   case BGP_RR_BEGIN:

From c56752e4367733c03a05e65ba62ccd2e54f7aadd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 21 Jun 2021 19:11:42 +0200
Subject: [PATCH 006/431] Protocol stats split to import and export

---
 nest/proto.c      | 45 +++++++++++++------------
 nest/protocol.h   | 46 +++++++++++++------------
 nest/rt-table.c   | 86 +++++++++++++++++++++++------------------------
 proto/pipe/pipe.c | 24 +++++++------
 4 files changed, 105 insertions(+), 96 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 7cfb1555..631e4b60 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -284,7 +284,7 @@ channel_feed_loop(void *ptr)
   if (c->refeeding &&
       (l->state == PLS_BLOCKED) &&
       (c->refeed_count <= l->limit) &&
-      (c->stats.exp_routes <= l->limit))
+      (c->export_stats.routes <= l->limit))
   {
     log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->limit);
     channel_reset_limit(&c->out_limit);
@@ -461,7 +461,7 @@ channel_stop_export(struct channel *c)
     rt_feed_channel_abort(c);
 
   c->export_state = ES_DOWN;
-  c->stats.exp_routes = 0;
+  c->export_stats.routes = 0;
   bmap_reset(&c->export_map, 1024);
 }
 
@@ -551,7 +551,8 @@ channel_do_start(struct channel *c)
   c->feed_event = ev_new_init(c->proto->pool, channel_feed_loop, c);
 
   bmap_init(&c->export_map, c->proto->pool, 1024);
-  memset(&c->stats, 0, sizeof(struct proto_stats));
+  memset(&c->export_stats, 0, sizeof(struct export_stats));
+  memset(&c->import_stats, 0, sizeof(struct import_stats));
 
   channel_reset_limit(&c->rx_limit);
   channel_reset_limit(&c->in_limit);
@@ -600,11 +601,12 @@ channel_do_down(struct channel *c)
   rt_unlock_table(c->table);
   c->proto->active_channels--;
 
-  if ((c->stats.imp_routes + c->stats.filt_routes) != 0)
+  if ((c->import_stats.routes + c->import_stats.filtered) != 0)
     log(L_ERR "%s: Channel %s is down but still has some routes", c->proto->name, c->name);
 
   // bmap_free(&c->export_map);
-  memset(&c->stats, 0, sizeof(struct proto_stats));
+  memset(&c->import_stats, 0, sizeof(struct import_stats));
+  memset(&c->export_stats, 0, sizeof(struct export_stats));
 
   c->in_table = NULL;
   c->reload_event = NULL;
@@ -1842,19 +1844,19 @@ static void
 channel_verify_limits(struct channel *c)
 {
   struct channel_limit *l;
-  u32 all_routes = c->stats.imp_routes + c->stats.filt_routes;
+  u32 all_routes = c->import_stats.routes + c->import_stats.filtered;
 
   l = &c->rx_limit;
   if (l->action && (all_routes > l->limit))
     channel_notify_limit(c, l, PLD_RX, all_routes);
 
   l = &c->in_limit;
-  if (l->action && (c->stats.imp_routes > l->limit))
-    channel_notify_limit(c, l, PLD_IN, c->stats.imp_routes);
+  if (l->action && (c->import_stats.routes > l->limit))
+    channel_notify_limit(c, l, PLD_IN, c->import_stats.routes);
 
   l = &c->out_limit;
-  if (l->action && (c->stats.exp_routes > l->limit))
-    channel_notify_limit(c, l, PLD_OUT, c->stats.exp_routes);
+  if (l->action && (c->export_stats.routes > l->limit))
+    channel_notify_limit(c, l, PLD_OUT, c->export_stats.routes);
 }
 
 static inline void
@@ -2009,28 +2011,29 @@ proto_state_name(struct proto *p)
 static void
 channel_show_stats(struct channel *c)
 {
-  struct proto_stats *s = &c->stats;
+  struct import_stats *is = &c->import_stats;
+  struct export_stats *es = &c->export_stats;
 
   if (c->in_keep_filtered)
     cli_msg(-1006, "    Routes:         %u imported, %u filtered, %u exported, %u preferred",
-	    s->imp_routes, s->filt_routes, s->exp_routes, s->pref_routes);
+	    is->routes, is->filtered, es->routes, is->pref);
   else
     cli_msg(-1006, "    Routes:         %u imported, %u exported, %u preferred",
-	    s->imp_routes, s->exp_routes, s->pref_routes);
+	    is->routes, es->routes, is->pref);
 
   cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   accepted");
   cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u",
-	  s->imp_updates_received, s->imp_updates_invalid,
-	  s->imp_updates_filtered, s->imp_updates_ignored,
-	  s->imp_updates_accepted);
+	  is->updates_received, is->updates_invalid,
+	  is->updates_filtered, is->updates_ignored,
+	  is->updates_accepted);
   cli_msg(-1006, "      Import withdraws:   %10u %10u        --- %10u %10u",
-	  s->imp_withdraws_received, s->imp_withdraws_invalid,
-	  s->imp_withdraws_ignored, s->imp_withdraws_accepted);
+	  is->withdraws_received, is->withdraws_invalid,
+	  is->withdraws_ignored, is->withdraws_accepted);
   cli_msg(-1006, "      Export updates:     %10u %10u %10u        --- %10u",
-	  s->exp_updates_received, s->exp_updates_rejected,
-	  s->exp_updates_filtered, s->exp_updates_accepted);
+	  es->updates_received, es->updates_rejected,
+	  es->updates_filtered, es->updates_accepted);
   cli_msg(-1006, "      Export withdraws:   %10u        ---        ---        --- %10u",
-	  s->exp_withdraws_received, s->exp_withdraws_accepted);
+	  es->withdraws_received, es->withdraws_accepted);
 }
 
 void
diff --git a/nest/protocol.h b/nest/protocol.h
index 80b4509b..9be8e531 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -132,29 +132,31 @@ struct proto_config {
 };
 
 /* Protocol statistics */
-struct proto_stats {
+struct import_stats {
   /* Import - from protocol to core */
-  u32 imp_routes;		/* Number of routes successfully imported to the (adjacent) routing table */
-  u32 filt_routes;		/* Number of routes rejected in import filter but kept in the routing table */
-  u32 pref_routes;		/* Number of routes selected as best in the (adjacent) routing table */
-  u32 imp_updates_received;	/* Number of route updates received */
-  u32 imp_updates_invalid;	/* Number of route updates rejected as invalid */
-  u32 imp_updates_filtered;	/* Number of route updates rejected by filters */
-  u32 imp_updates_ignored;	/* Number of route updates rejected as already in route table */
-  u32 imp_updates_accepted;	/* Number of route updates accepted and imported */
-  u32 imp_withdraws_received;	/* Number of route withdraws received */
-  u32 imp_withdraws_invalid;	/* Number of route withdraws rejected as invalid */
-  u32 imp_withdraws_ignored;	/* Number of route withdraws rejected as already not in route table */
-  u32 imp_withdraws_accepted;	/* Number of route withdraws accepted and processed */
+  u32 routes;			/* Number of routes successfully imported to the (adjacent) routing table */
+  u32 filtered;			/* Number of routes rejected in import filter but kept in the routing table */
+  u32 pref;			/* Number of routes selected as best in the (adjacent) routing table */
+  u32 updates_received;		/* Number of route updates received */
+  u32 updates_invalid;		/* Number of route updates rejected as invalid */
+  u32 updates_filtered;		/* Number of route updates rejected by filters */
+  u32 updates_ignored;		/* Number of route updates rejected as already in route table */
+  u32 updates_accepted;		/* Number of route updates accepted and imported */
+  u32 withdraws_received;	/* Number of route withdraws received */
+  u32 withdraws_invalid;	/* Number of route withdraws rejected as invalid */
+  u32 withdraws_ignored;	/* Number of route withdraws rejected as already not in route table */
+  u32 withdraws_accepted;	/* Number of route withdraws accepted and processed */
+};
 
+struct export_stats {
   /* Export - from core to protocol */
-  u32 exp_routes;		/* Number of routes successfully exported to the protocol */
-  u32 exp_updates_received;	/* Number of route updates received */
-  u32 exp_updates_rejected;	/* Number of route updates rejected by protocol */
-  u32 exp_updates_filtered;	/* Number of route updates rejected by filters */
-  u32 exp_updates_accepted;	/* Number of route updates accepted and exported */
-  u32 exp_withdraws_received;	/* Number of route withdraws received */
-  u32 exp_withdraws_accepted;	/* Number of route withdraws accepted and processed */
+  u32 routes;			/* Number of routes successfully exported to the protocol */
+  u32 updates_received;		/* Number of route updates received */
+  u32 updates_rejected;		/* Number of route updates rejected by protocol */
+  u32 updates_filtered;		/* Number of route updates rejected by filters */
+  u32 updates_accepted;		/* Number of route updates accepted and exported */
+  u32 withdraws_received;	/* Number of route withdraws received */
+  u32 withdraws_accepted;	/* Number of route withdraws accepted and processed */
 };
 
 struct proto {
@@ -516,7 +518,9 @@ struct channel {
 
   struct event *feed_event;		/* Event responsible for feeding */
   struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
-  struct proto_stats stats;		/* Per-channel protocol statistics */
+  struct import_stats import_stats;	/* Import statistics */
+  struct export_stats export_stats;	/* Export statistics */
+
   u32 refeed_count;			/* Number of routes exported during refeed regardless of out_limit */
 
   u8 net_type;				/* Routing table network type (NET_*), 0 for undefined */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6851b4bc..0b6351e9 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -375,7 +375,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 {
   struct proto *p = c->proto;
   const struct filter *filter = c->out_filter;
-  struct proto_stats *stats = &c->stats;
+  struct export_stats *stats = &c->export_stats;
   int v;
 
   v = p->preexport ? p->preexport(c, rt) : 0;
@@ -384,7 +384,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
       if (silent)
 	goto reject;
 
-      stats->exp_updates_rejected++;
+      stats->updates_rejected++;
       if (v == RIC_REJECT)
 	rte_trace_out(D_FILTERS, c, rt, "rejected by protocol");
       goto reject;
@@ -404,7 +404,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
       if (silent)
 	goto reject;
 
-      stats->exp_updates_filtered++;
+      stats->updates_filtered++;
       rte_trace_out(D_FILTERS, c, rt, "filtered out");
       goto reject;
     }
@@ -427,7 +427,7 @@ static void
 do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
 {
   struct proto *p = c->proto;
-  struct proto_stats *stats = &c->stats;
+  struct export_stats *stats = &c->export_stats;
 
   if (refeed && new)
     c->refeed_count++;
@@ -436,12 +436,12 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   struct channel_limit *l = &c->out_limit;
   if (l->action && !old && new)
   {
-    if (stats->exp_routes >= l->limit)
-      channel_notify_limit(c, l, PLD_OUT, stats->exp_routes);
+    if (stats->routes >= l->limit)
+      channel_notify_limit(c, l, PLD_OUT, stats->routes);
 
     if (l->state == PLS_BLOCKED)
     {
-      stats->exp_updates_rejected++;
+      stats->updates_rejected++;
       rte_trace_out(D_FILTERS, c, new, "rejected [limit]");
       return;
     }
@@ -459,20 +459,20 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   }
 
   if (new)
-    stats->exp_updates_accepted++;
+    stats->updates_accepted++;
   else
-    stats->exp_withdraws_accepted++;
+    stats->withdraws_accepted++;
 
   if (old)
   {
     bmap_clear(&c->export_map, old->id);
-    stats->exp_routes--;
+    stats->routes--;
   }
 
   if (new)
   {
     bmap_set(&c->export_map, new->id);
-    stats->exp_routes++;
+    stats->routes++;
   }
 
   if (p->debug & D_ROUTES)
@@ -495,9 +495,9 @@ static void
 rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
 {
   if (new)
-    c->stats.exp_updates_received++;
+    c->export_stats.updates_received++;
   else
-    c->stats.exp_withdraws_received++;
+    c->export_stats.withdraws_received++;
 
   if (new)
     new = export_filter(c, new, 0);
@@ -537,9 +537,9 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
    */
 
   if (net->routes)
-    c->stats.exp_updates_received++;
+    c->export_stats.updates_received++;
   else
-    c->stats.exp_withdraws_received++;
+    c->export_stats.withdraws_received++;
 
   /* Find old_best - either old_changed, or route for net->routes */
   if (old_changed && bmap_test(&c->export_map, old_changed->id))
@@ -655,9 +655,9 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
     return;
 
   if (new_best)
-    c->stats.exp_updates_received++;
+    c->export_stats.updates_received++;
   else
-    c->stats.exp_withdraws_received++;
+    c->export_stats.withdraws_received++;
 
   /* Prepare new merged route */
   if (new_best)
@@ -735,9 +735,9 @@ rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct r
   if (new_best != old_best)
   {
     if (new_best)
-      new_best->rte.sender->stats.pref_routes++;
+      new_best->rte.sender->import_stats.pref++;
     if (old_best)
-      old_best->rte.sender->stats.pref_routes--;
+      old_best->rte.sender->import_stats.pref--;
 
     if (tab->hostcache)
       rt_notify_hostcache(tab, net);
@@ -836,7 +836,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 {
   struct proto *p = c->proto;
   struct rtable *table = c->table;
-  struct proto_stats *stats = &c->stats;
+  struct import_stats *stats = &c->import_stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
@@ -873,7 +873,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 
 	      if (!rte_is_filtered(new))
 		{
-		  stats->imp_updates_ignored++;
+		  stats->updates_ignored++;
 	          rte_trace_in(D_ROUTES, c, new, "ignored");
 		}
 
@@ -887,7 +887,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 
   if (!old && !new)
     {
-      stats->imp_withdraws_ignored++;
+      stats->withdraws_ignored++;
       return;
     }
 
@@ -897,7 +897,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   struct channel_limit *l = &c->rx_limit;
   if (l->action && !old && new && !c->in_table)
     {
-      u32 all_routes = stats->imp_routes + stats->filt_routes;
+      u32 all_routes = stats->routes + stats->filtered;
 
       if (all_routes >= l->limit)
 	channel_notify_limit(c, l, PLD_RX, all_routes);
@@ -907,7 +907,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	  /* In receive limit the situation is simple, old is NULL so
 	     we just free new and exit like nothing happened */
 
-	  stats->imp_updates_ignored++;
+	  stats->updates_ignored++;
 	  rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
 	  return;
 	}
@@ -916,8 +916,8 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   l = &c->in_limit;
   if (l->action && !old_ok && new_ok)
     {
-      if (stats->imp_routes >= l->limit)
-	channel_notify_limit(c, l, PLD_IN, stats->imp_routes);
+      if (stats->routes >= l->limit)
+	channel_notify_limit(c, l, PLD_IN, stats->routes);
 
       if (l->state == PLS_BLOCKED)
 	{
@@ -928,7 +928,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	     if both are NULL as this case is probably assumed to be
 	     already handled. */
 
-	  stats->imp_updates_ignored++;
+	  stats->updates_ignored++;
 	  rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
 
 	  if (c->in_keep_filtered)
@@ -948,11 +948,11 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
     }
 
   if (new_ok)
-    stats->imp_updates_accepted++;
+    stats->updates_accepted++;
   else if (old_ok)
-    stats->imp_withdraws_accepted++;
+    stats->withdraws_accepted++;
   else
-    stats->imp_withdraws_ignored++;
+    stats->withdraws_ignored++;
 
   if (old_ok || new_ok)
     table->last_rt_change = current_time();
@@ -961,9 +961,9 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   struct rte_storage *new_stored = new ? rte_store(new, net, table) : NULL;
 
   if (new)
-    rte_is_filtered(new) ? stats->filt_routes++ : stats->imp_routes++;
+    rte_is_filtered(new) ? stats->filtered++ : stats->routes++;
   if (old)
-    rte_is_filtered(old) ? stats->filt_routes-- : stats->imp_routes--;
+    rte_is_filtered(old) ? stats->filtered-- : stats->routes--;
 
   if (table->config->sorted)
     {
@@ -1128,7 +1128,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   if (c->in_table && !rte_update_in(c, n, new, src))
     return;
 
-  struct proto_stats *stats = &c->stats;
+  struct import_stats *stats = &c->import_stats;
   const struct filter *filter = c->in_filter;
   net *nn;
 
@@ -1140,17 +1140,17 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
       new->net = n;
       new->sender = c;
 
-      stats->imp_updates_received++;
+      stats->updates_received++;
       if (!rte_validate(new))
 	{
 	  rte_trace_in(D_FILTERS, c, new, "invalid");
-	  stats->imp_updates_invalid++;
+	  stats->updates_invalid++;
 	  goto drop;
 	}
 
       if (filter == FILTER_REJECT)
 	{
-	  stats->imp_updates_filtered++;
+	  stats->updates_filtered++;
 	  rte_trace_in(D_FILTERS, c, new, "filtered out");
 
 	  if (! c->in_keep_filtered)
@@ -1164,7 +1164,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	  int fr = f_run(filter, new, rte_update_pool, 0);
 	  if (fr > F_ACCEPT)
 	  {
-	    stats->imp_updates_filtered++;
+	    stats->updates_filtered++;
 	    rte_trace_in(D_FILTERS, c, new, "filtered out");
 
 	    if (! c->in_keep_filtered)
@@ -1180,11 +1180,11 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
     }
   else
     {
-      stats->imp_withdraws_received++;
+      stats->withdraws_received++;
 
       if (!(nn = net_find(c->table, n)) || !src)
 	{
-	  stats->imp_withdraws_ignored++;
+	  stats->withdraws_ignored++;
 	  rte_update_unlock();
 	  return;
 	}
@@ -2297,8 +2297,8 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
   return 1;
 
 drop_update:
-  c->stats.imp_updates_received++;
-  c->stats.imp_updates_ignored++;
+  c->import_stats.updates_received++;
+  c->import_stats.updates_ignored++;
 
   if (!net->routes)
     fib_delete(&tab->fib, net);
@@ -2306,8 +2306,8 @@ drop_update:
   return 0;
 
 drop_withdraw:
-  c->stats.imp_withdraws_received++;
-  c->stats.imp_withdraws_ignored++;
+  c->import_stats.withdraws_received++;
+  c->import_stats.withdraws_ignored++;
   return 0;
 }
 
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 7604cc79..55a0b526 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -212,8 +212,10 @@ pipe_get_status(struct proto *P, byte *buf)
 static void
 pipe_show_stats(struct pipe_proto *p)
 {
-  struct proto_stats *s1 = &p->pri->stats;
-  struct proto_stats *s2 = &p->sec->stats;
+  struct import_stats *s1i = &p->pri->import_stats;
+  struct export_stats *s1e = &p->pri->export_stats;
+  struct import_stats *s2i = &p->sec->import_stats;
+  struct export_stats *s2e = &p->sec->export_stats;
 
   /*
    * Pipe stats (as anything related to pipes) are a bit tricky. There
@@ -237,20 +239,20 @@ pipe_show_stats(struct pipe_proto *p)
    */
 
   cli_msg(-1006, "  Routes:         %u imported, %u exported",
-	  s1->imp_routes, s2->imp_routes);
+	  s1i->routes, s2i->routes);
   cli_msg(-1006, "  Route change stats:     received   rejected   filtered    ignored   accepted");
   cli_msg(-1006, "    Import updates:     %10u %10u %10u %10u %10u",
-	  s2->exp_updates_received, s2->exp_updates_rejected + s1->imp_updates_invalid,
-	  s2->exp_updates_filtered, s1->imp_updates_ignored, s1->imp_updates_accepted);
+	  s2e->updates_received, s2e->updates_rejected + s1i->updates_invalid,
+	  s2e->updates_filtered, s1i->updates_ignored, s1i->updates_accepted);
   cli_msg(-1006, "    Import withdraws:   %10u %10u        --- %10u %10u",
-	  s2->exp_withdraws_received, s1->imp_withdraws_invalid,
-	  s1->imp_withdraws_ignored, s1->imp_withdraws_accepted);
+	  s2e->withdraws_received, s1i->withdraws_invalid,
+	  s1i->withdraws_ignored, s1i->withdraws_accepted);
   cli_msg(-1006, "    Export updates:     %10u %10u %10u %10u %10u",
-	  s1->exp_updates_received, s1->exp_updates_rejected + s2->imp_updates_invalid,
-	  s1->exp_updates_filtered, s2->imp_updates_ignored, s2->imp_updates_accepted);
+	  s1e->updates_received, s1e->updates_rejected + s2i->updates_invalid,
+	  s1e->updates_filtered, s2i->updates_ignored, s2i->updates_accepted);
   cli_msg(-1006, "    Export withdraws:   %10u %10u        --- %10u %10u",
-	  s1->exp_withdraws_received, s2->imp_withdraws_invalid,
-	  s2->imp_withdraws_ignored, s2->imp_withdraws_accepted);
+	  s1e->withdraws_received, s2i->withdraws_invalid,
+	  s2i->withdraws_ignored, s2i->withdraws_accepted);
 }
 
 static const char *pipe_feed_state[] = { [ES_DOWN] = "down", [ES_FEEDING] = "feed", [ES_READY] = "up" };

From 3a8197a9dce6fc5d38b089a291ac79d8d394fea1 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 6 Nov 2021 20:34:16 +0100
Subject: [PATCH 007/431] Limit containment

---
 nest/limit.h      |  49 ++++++++++
 nest/proto.c      | 225 +++++++++++++++++++++++++---------------------
 nest/protocol.h   |  40 ++++++---
 nest/rt-table.c   | 144 +++++++++++++----------------
 proto/pipe/pipe.c |  13 ++-
 5 files changed, 269 insertions(+), 202 deletions(-)
 create mode 100644 nest/limit.h

diff --git a/nest/limit.h b/nest/limit.h
new file mode 100644
index 00000000..5838ad3b
--- /dev/null
+++ b/nest/limit.h
@@ -0,0 +1,49 @@
+/*
+ *	BIRD Internet Routing Daemon -- Limits
+ *
+ *	(c) 1998--2000 Martin Mares <mj@ucw.cz>
+ *	(c) 2021 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LIMIT_H_
+#define _BIRD_LIMIT_H_
+
+struct limit {
+  u32 max;
+  u32 count;
+  int (*action)(struct limit *, void *data);
+};
+
+static inline int limit_do_action(struct limit *l, void *data)
+{
+  return l->action ? l->action(l, data) : 1;
+}
+
+static inline int limit_push(struct limit *l, void *data)
+{
+  if ((l->count >= l->max) && limit_do_action(l, data))
+    return 1;
+
+  l->count++;
+  return 0;
+}
+
+static inline void limit_pop(struct limit *l)
+{
+  --l->count;
+}
+
+static inline void limit_reset(struct limit *l)
+{
+  l->count = 0;
+}
+
+static inline void limit_update(struct limit *l, void *data, u32 max)
+{
+  if (l->count > (l->max = max))
+    limit_do_action(l, data);
+}
+
+#endif
diff --git a/nest/proto.c b/nest/proto.c
index c7e25209..2009ff1f 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -52,9 +52,9 @@ static void channel_request_reload(struct channel *c);
 static void proto_shutdown_loop(timer *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
-static void channel_verify_limits(struct channel *c);
-static inline void channel_reset_limit(struct channel_limit *l);
-
+static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
+static void channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
+static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
 
 static inline int proto_is_done(struct proto *p)
 { return (p->proto_state == PS_DOWN) && (p->active_channels == 0); }
@@ -168,9 +168,10 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
 
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
-  c->rx_limit = cf->rx_limit;
-  c->in_limit = cf->in_limit;
-  c->out_limit = cf->out_limit;
+
+  channel_init_limit(c, &c->rx_limit, PLD_RX, &cf->rx_limit);
+  channel_init_limit(c, &c->in_limit, PLD_IN, &cf->in_limit);
+  channel_init_limit(c, &c->out_limit, PLD_OUT, &cf->out_limit);
 
   c->net_type = cf->net_type;
   c->ra_mode = cf->ra_mode;
@@ -280,14 +281,12 @@ channel_feed_loop(void *ptr)
   }
 
   /* Reset export limit if the feed ended with acceptable number of exported routes */
-  struct channel_limit *l = &c->out_limit;
   if (c->refeeding &&
-      (l->state == PLS_BLOCKED) &&
-      (c->refeed_count <= l->limit) &&
-      (c->export_stats.routes <= l->limit))
+      (c->limit_active & (1 << PLD_OUT)) &&
+      (c->refeed_count <= c->out_limit.max))
   {
-    log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->limit);
-    channel_reset_limit(&c->out_limit);
+    log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, c->out_limit.max);
+    channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
     /* Continue in feed - it will process routing table again from beginning */
     c->refeed_count = 0;
@@ -461,7 +460,8 @@ channel_stop_export(struct channel *c)
     rt_feed_channel_abort(c);
 
   c->export_state = ES_DOWN;
-  c->export_stats.routes = 0;
+
+  channel_reset_limit(c, &c->out_limit, PLD_OUT);
   bmap_reset(&c->export_map, 1024);
   bmap_reset(&c->export_reject_map, 1024);
 }
@@ -556,9 +556,9 @@ channel_do_start(struct channel *c)
   memset(&c->export_stats, 0, sizeof(struct export_stats));
   memset(&c->import_stats, 0, sizeof(struct import_stats));
 
-  channel_reset_limit(&c->rx_limit);
-  channel_reset_limit(&c->in_limit);
-  channel_reset_limit(&c->out_limit);
+  channel_reset_limit(c, &c->rx_limit, PLD_RX);
+  channel_reset_limit(c, &c->in_limit, PLD_IN);
+  channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
   CALL(c->channel->start, c);
 }
@@ -604,8 +604,8 @@ channel_do_down(struct channel *c)
   rt_unlock_table(c->table);
   c->proto->active_channels--;
 
-  if ((c->import_stats.routes + c->import_stats.filtered) != 0)
-    log(L_ERR "%s: Channel %s is down but still has some routes", c->proto->name, c->name);
+  if (c->in_limit.count || c->rx_limit.count)
+    bug("%s: Channel %s is down but still has some routes", c->proto->name, c->name);
 
   // bmap_free(&c->export_map);
   memset(&c->import_stats, 0, sizeof(struct import_stats));
@@ -748,8 +748,8 @@ channel_request_reload(struct channel *c)
    * Should this be done before reload_routes() hook?
    * Perhaps, but routes are updated asynchronously.
    */
-  channel_reset_limit(&c->rx_limit);
-  channel_reset_limit(&c->in_limit);
+  channel_reset_limit(c, &c->rx_limit, PLD_RX);
+  channel_reset_limit(c, &c->in_limit, PLD_IN);
 }
 
 const struct channel_class channel_basic = {
@@ -852,9 +852,10 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   /* Reconfigure channel fields */
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
-  c->rx_limit = cf->rx_limit;
-  c->in_limit = cf->in_limit;
-  c->out_limit = cf->out_limit;
+
+  channel_update_limit(c, &c->rx_limit, PLD_RX, &cf->rx_limit);
+  channel_update_limit(c, &c->in_limit, PLD_IN, &cf->in_limit);
+  channel_update_limit(c, &c->out_limit, PLD_OUT, &cf->out_limit);
 
   // c->ra_mode = cf->ra_mode;
   c->merge_limit = cf->merge_limit;
@@ -863,8 +864,6 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   c->in_keep_filtered = cf->in_keep_filtered;
   c->rpki_reload = cf->rpki_reload;
 
-  channel_verify_limits(c);
-
   /* Execute channel-specific reconfigure hook */
   if (c->channel->reconfigure && !c->channel->reconfigure(c, cf, &import_changed, &export_changed))
     return 0;
@@ -1785,88 +1784,104 @@ proto_set_message(struct proto *p, char *msg, int len)
 }
 
 
-static const char *
-channel_limit_name(struct channel_limit *l)
-{
-  const char *actions[] = {
-    [PLA_WARN] = "warn",
-    [PLA_BLOCK] = "block",
-    [PLA_RESTART] = "restart",
-    [PLA_DISABLE] = "disable",
-  };
+static const char * channel_limit_name[] = {
+  [PLA_WARN] = "warn",
+  [PLA_BLOCK] = "block",
+  [PLA_RESTART] = "restart",
+  [PLA_DISABLE] = "disable",
+};
 
-  return actions[l->action];
-}
 
-/**
- * channel_notify_limit: notify about limit hit and take appropriate action
- * @c: channel
- * @l: limit being hit
- * @dir: limit direction (PLD_*)
- * @rt_count: the number of routes
- *
- * The function is called by the route processing core when limit @l
- * is breached. It activates the limit and tooks appropriate action
- * according to @l->action.
- */
-void
-channel_notify_limit(struct channel *c, struct channel_limit *l, int dir, u32 rt_count)
+static void
+channel_log_limit(struct channel *c, struct limit *l, int dir)
 {
   const char *dir_name[PLD_MAX] = { "receive", "import" , "export" };
-  const byte dir_down[PLD_MAX] = { PDC_RX_LIMIT_HIT, PDC_IN_LIMIT_HIT, PDC_OUT_LIMIT_HIT };
-  struct proto *p = c->proto;
-
-  if (l->state == PLS_BLOCKED)
-    return;
-
-  /* For warning action, we want the log message every time we hit the limit */
-  if (!l->state || ((l->action == PLA_WARN) && (rt_count == l->limit)))
-    log(L_WARN "Protocol %s hits route %s limit (%d), action: %s",
-	p->name, dir_name[dir], l->limit, channel_limit_name(l));
-
-  switch (l->action)
-  {
-  case PLA_WARN:
-    l->state = PLS_ACTIVE;
-    break;
-
-  case PLA_BLOCK:
-    l->state = PLS_BLOCKED;
-    break;
-
-  case PLA_RESTART:
-  case PLA_DISABLE:
-    l->state = PLS_BLOCKED;
-    if (p->proto_state == PS_UP)
-      proto_schedule_down(p, l->action == PLA_RESTART, dir_down[dir]);
-    break;
-  }
+  log(L_WARN "Channel %s.%s hits route %s limit (%d), action: %s",
+      c->proto->name, c->name, dir_name[dir], l->max, channel_limit_name[c->limit_actions[dir]]);
 }
 
 static void
-channel_verify_limits(struct channel *c)
+channel_activate_limit(struct channel *c, struct limit *l, int dir)
 {
-  struct channel_limit *l;
-  u32 all_routes = c->import_stats.routes + c->import_stats.filtered;
+  if (c->limit_active & (1 << dir))
+    return;
 
-  l = &c->rx_limit;
-  if (l->action && (all_routes > l->limit))
-    channel_notify_limit(c, l, PLD_RX, all_routes);
-
-  l = &c->in_limit;
-  if (l->action && (c->import_stats.routes > l->limit))
-    channel_notify_limit(c, l, PLD_IN, c->import_stats.routes);
-
-  l = &c->out_limit;
-  if (l->action && (c->export_stats.routes > l->limit))
-    channel_notify_limit(c, l, PLD_OUT, c->export_stats.routes);
+  c->limit_active |= (1 << dir);
+  channel_log_limit(c, l, dir);
 }
 
-static inline void
-channel_reset_limit(struct channel_limit *l)
+static int
+channel_limit_warn(struct limit *l, void *data)
 {
-  if (l->action)
-    l->state = PLS_INITIAL;
+  struct channel_limit_data *cld = data;
+  struct channel *c = cld->c;
+  int dir = cld->dir;
+
+  channel_log_limit(c, l, dir);
+
+  return 0;
+}
+
+static int
+channel_limit_block(struct limit *l, void *data)
+{
+  struct channel_limit_data *cld = data;
+  struct channel *c = cld->c;
+  int dir = cld->dir;
+
+  channel_activate_limit(c, l, dir);
+
+  return 1;
+}
+
+static const byte chl_dir_down[PLD_MAX] = { PDC_RX_LIMIT_HIT, PDC_IN_LIMIT_HIT, PDC_OUT_LIMIT_HIT };
+
+static int
+channel_limit_down(struct limit *l, void *data)
+{
+  struct channel_limit_data *cld = data;
+  struct channel *c = cld->c;
+  struct proto *p = c->proto;
+  int dir = cld->dir;
+
+  channel_activate_limit(c, l, dir);
+
+  if (p->proto_state == PS_UP)
+    proto_schedule_down(p, c->limit_actions[dir] == PLA_RESTART, chl_dir_down[dir]);
+
+  return 1;
+}
+
+static int (*channel_limit_action[])(struct limit *, void *) = {
+  [PLA_NONE] = NULL,
+  [PLA_WARN] = channel_limit_warn,
+  [PLA_BLOCK] = channel_limit_block,
+  [PLA_RESTART] = channel_limit_down,
+  [PLA_DISABLE] = channel_limit_down,
+};
+
+static void
+channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf)
+{
+  l->action = channel_limit_action[cf->action];
+  c->limit_actions[dir] = cf->action;
+
+  struct channel_limit_data cld = { .c = c, .dir = dir };
+  limit_update(l, &cld, cf->action ? cf->limit : ~((u32) 0));
+}
+
+static void
+channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf)
+{
+  channel_reset_limit(c, l, dir);
+  channel_update_limit(c, l, dir, cf);
+}
+
+static void
+channel_reset_limit(struct channel *c, struct limit *l, int dir)
+{
+  limit_reset(l);
+  c->limit_active &= ~(1 << dir);
 }
 
 static inline void
@@ -2017,12 +2032,16 @@ channel_show_stats(struct channel *c)
   struct import_stats *is = &c->import_stats;
   struct export_stats *es = &c->export_stats;
 
+  u32 rx_routes = c->rx_limit.count;
+  u32 in_routes = c->in_limit.count;
+  u32 out_routes = c->out_limit.count;
+
   if (c->in_keep_filtered)
     cli_msg(-1006, "    Routes:         %u imported, %u filtered, %u exported, %u preferred",
-	    is->routes, is->filtered, es->routes, is->pref);
+	    in_routes, (rx_routes - in_routes), out_routes, is->pref);
   else
     cli_msg(-1006, "    Routes:         %u imported, %u exported, %u preferred",
-	    is->routes, es->routes, is->pref);
+	    in_routes, out_routes, is->pref);
 
   cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   accepted");
   cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u",
@@ -2040,13 +2059,13 @@ channel_show_stats(struct channel *c)
 }
 
 void
-channel_show_limit(struct channel_limit *l, const char *dsc)
+channel_show_limit(struct limit *l, const char *dsc, int active, int action)
 {
   if (!l->action)
     return;
 
-  cli_msg(-1006, "    %-16s%d%s", dsc, l->limit, l->state ? " [HIT]" : "");
-  cli_msg(-1006, "      Action:       %s", channel_limit_name(l));
+  cli_msg(-1006, "    %-16s%d%s", dsc, l->max, active ? " [HIT]" : "");
+  cli_msg(-1006, "      Action:       %s", channel_limit_name[action]);
 }
 
 void
@@ -2064,9 +2083,9 @@ channel_show_info(struct channel *c)
 	    c->gr_lock ? " pending" : "",
 	    c->gr_wait ? " waiting" : "");
 
-  channel_show_limit(&c->rx_limit, "Receive limit:");
-  channel_show_limit(&c->in_limit, "Import limit:");
-  channel_show_limit(&c->out_limit, "Export limit:");
+  channel_show_limit(&c->rx_limit, "Receive limit:", c->limit_active & (1 << PLD_RX), c->limit_actions[PLD_RX]);
+  channel_show_limit(&c->in_limit, "Import limit:", c->limit_active & (1 << PLD_IN), c->limit_actions[PLD_IN]);
+  channel_show_limit(&c->out_limit, "Export limit:", c->limit_active & (1 << PLD_OUT), c->limit_actions[PLD_OUT]);
 
   if (c->channel_state != CS_DOWN)
     channel_show_stats(c);
diff --git a/nest/protocol.h b/nest/protocol.h
index 4c87c72d..c1978914 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -13,6 +13,7 @@
 #include "lib/resource.h"
 #include "lib/event.h"
 #include "nest/route.h"
+#include "nest/limit.h"
 #include "conf/conf.h"
 
 struct iface;
@@ -134,8 +135,6 @@ struct proto_config {
 /* Protocol statistics */
 struct import_stats {
   /* Import - from protocol to core */
-  u32 routes;			/* Number of routes successfully imported to the (adjacent) routing table */
-  u32 filtered;			/* Number of routes rejected in import filter but kept in the routing table */
   u32 pref;			/* Number of routes selected as best in the (adjacent) routing table */
   u32 updates_received;		/* Number of route updates received */
   u32 updates_invalid;		/* Number of route updates rejected as invalid */
@@ -150,7 +149,6 @@ struct import_stats {
 
 struct export_stats {
   /* Export - from core to protocol */
-  u32 routes;			/* Number of routes successfully exported to the protocol */
   u32 updates_received;		/* Number of route updates received */
   u32 updates_rejected;		/* Number of route updates rejected by protocol */
   u32 updates_filtered;		/* Number of route updates rejected by filters */
@@ -277,7 +275,7 @@ void channel_graceful_restart_unlock(struct channel *c);
 
 #define DEFAULT_GR_WAIT	240
 
-void channel_show_limit(struct channel_limit *l, const char *dsc);
+void channel_show_limit(struct limit *l, const char *dsc, int active, int action);
 void channel_show_info(struct channel *c);
 void channel_cmd_debug(struct channel *c, uint mask);
 
@@ -432,18 +430,29 @@ extern struct proto_config *cf_dev_proto;
 #define PLA_RESTART	4	/* Force protocol restart */
 #define PLA_DISABLE	5	/* Shutdown and disable protocol */
 
-#define PLS_INITIAL	0	/* Initial limit state after protocol start */
-#define PLS_ACTIVE	1	/* Limit was hit */
-#define PLS_BLOCKED	2	/* Limit is active and blocking new routes */
-
 struct channel_limit {
   u32 limit;			/* Maximum number of prefixes */
   u8 action;			/* Action to take (PLA_*) */
-  u8 state;			/* State of limit (PLS_*) */
 };
 
-void channel_notify_limit(struct channel *c, struct channel_limit *l, int dir, u32 rt_count);
+struct channel_limit_data {
+  struct channel *c;
+  int dir;
+};
 
+#define CLP__RX(_c) (&(_c)->rx_limit)
+#define CLP__IN(_c) (&(_c)->in_limit)
+#define CLP__OUT(_c) (&(_c)->out_limit)
+
+
+#if 0
+#define CHANNEL_LIMIT_LOG(_c, _dir, _op)  log(L_TRACE "%s.%s: %s limit %s %u", (_c)->proto->name, (_c)->name, #_dir, _op, (CLP__##_dir(_c))->count)
+#else
+#define CHANNEL_LIMIT_LOG(_c, _dir, _op)
+#endif
+
+#define CHANNEL_LIMIT_PUSH(_c, _dir)  ({ CHANNEL_LIMIT_LOG(_c, _dir, "push from"); struct channel_limit_data cld = { .c = (_c), .dir = PLD_##_dir }; limit_push(CLP__##_dir(_c), &cld); })
+#define CHANNEL_LIMIT_POP(_c, _dir)   ({ limit_pop(CLP__##_dir(_c)); CHANNEL_LIMIT_LOG(_c, _dir, "pop to"); })
 
 /*
  *	Channels
@@ -486,6 +495,7 @@ struct channel_config {
   struct proto_config *parent;		/* Where channel is defined (proto or template) */
   struct rtable_config *table;		/* Table we're attached to */
   const struct filter *in_filter, *out_filter; /* Attached filters */
+
   struct channel_limit rx_limit;	/* Limit for receiving routes from protocol
 					   (relevant when in_keep_filtered is active) */
   struct channel_limit in_limit;	/* Limit for importing routes from protocol */
@@ -513,9 +523,13 @@ struct channel {
   const struct filter *out_filter;	/* Output filter */
   struct bmap export_map;		/* Keeps track which routes were really exported */
   struct bmap export_reject_map;	/* Keeps track which routes were rejected by export filter */
-  struct channel_limit rx_limit;	/* Receive limit (for in_keep_filtered) */
-  struct channel_limit in_limit;	/* Input limit */
-  struct channel_limit out_limit;	/* Output limit */
+
+  struct limit rx_limit;		/* Receive limit (for in_keep_filtered) */
+  struct limit in_limit;		/* Input limit */
+  struct limit out_limit;		/* Output limit */
+
+  u8 limit_actions[PLD_MAX];		/* Limit actions enum */
+  u8 limit_active;			/* Flags for active limits */
 
   struct event *feed_event;		/* Event responsible for feeding */
   struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 146734f4..66e63acf 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -473,20 +473,16 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   if (refeed && new)
     c->refeed_count++;
 
-  /* Apply export limit */
-  struct channel_limit *l = &c->out_limit;
-  if (l->action && !old && new)
-  {
-    if (stats->routes >= l->limit)
-      channel_notify_limit(c, l, PLD_OUT, stats->routes);
-
-    if (l->state == PLS_BLOCKED)
+  if (!old && new)
+    if (CHANNEL_LIMIT_PUSH(c, OUT))
     {
       stats->updates_rejected++;
       rte_trace_out(D_FILTERS, c, new, "rejected [limit]");
       return;
     }
-  }
+
+  if (!new && old)
+    CHANNEL_LIMIT_POP(c, OUT);
 
   /* Apply export table */
   struct rte_storage *old_exported = NULL;
@@ -505,16 +501,10 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
     stats->withdraws_accepted++;
 
   if (old)
-  {
     bmap_clear(&c->export_map, old->id);
-    stats->routes--;
-  }
 
   if (new)
-  {
     bmap_set(&c->export_map, new->id);
-    stats->routes++;
-  }
 
   if (p->debug & D_ROUTES)
   {
@@ -973,58 +963,53 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   int new_ok = rte_is_ok(new);
   int old_ok = rte_is_ok(old);
 
-  struct channel_limit *l = &c->rx_limit;
-  if (l->action && !old && new && !c->in_table)
+  if (!c->in_table)
+  {
+    if (!old && new)
+      if (CHANNEL_LIMIT_PUSH(c, RX))
+      {
+	/* In receive limit the situation is simple, old is NULL so
+	   we just free new and exit like nothing happened */
+
+	stats->updates_ignored++;
+	rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
+	return;
+      }
+
+    if (old && !new)
+      CHANNEL_LIMIT_POP(c, RX);
+  }
+
+  if (!old_ok && new_ok)
+    if (CHANNEL_LIMIT_PUSH(c, IN))
     {
-      u32 all_routes = stats->routes + stats->filtered;
+      /* In import limit the situation is more complicated. We
+	 shouldn't just drop the route, we should handle it like
+	 it was filtered. We also have to continue the route
+	 processing if old or new is non-NULL, but we should exit
+	 if both are NULL as this case is probably assumed to be
+	 already handled. */
 
-      if (all_routes >= l->limit)
-	channel_notify_limit(c, l, PLD_RX, all_routes);
+      stats->updates_ignored++;
+      rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
 
-      if (l->state == PLS_BLOCKED)
-	{
-	  /* In receive limit the situation is simple, old is NULL so
-	     we just free new and exit like nothing happened */
+      if (c->in_keep_filtered)
+	new->flags |= REF_FILTERED;
+      else
+	new = NULL;
 
-	  stats->updates_ignored++;
-	  rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-	  return;
-	}
+      /* Note that old && !new could be possible when
+	 c->in_keep_filtered changed in the recent past. */
+
+      if (!old && !new)
+	return;
+
+      new_ok = 0;
+      goto skip_stats1;
     }
 
-  l = &c->in_limit;
-  if (l->action && !old_ok && new_ok)
-    {
-      if (stats->routes >= l->limit)
-	channel_notify_limit(c, l, PLD_IN, stats->routes);
-
-      if (l->state == PLS_BLOCKED)
-	{
-	  /* In import limit the situation is more complicated. We
-	     shouldn't just drop the route, we should handle it like
-	     it was filtered. We also have to continue the route
-	     processing if old or new is non-NULL, but we should exit
-	     if both are NULL as this case is probably assumed to be
-	     already handled. */
-
-	  stats->updates_ignored++;
-	  rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-
-	  if (c->in_keep_filtered)
-	    new->flags |= REF_FILTERED;
-	  else
-	    new = NULL;
-
-	  /* Note that old && !new could be possible when
-	     c->in_keep_filtered changed in the recent past. */
-
-	  if (!old && !new)
-	    return;
-
-	  new_ok = 0;
-	  goto skip_stats1;
-	}
-    }
+  if (old_ok && !new_ok)
+    CHANNEL_LIMIT_POP(c, IN);
 
   if (new_ok)
     stats->updates_accepted++;
@@ -1039,11 +1024,6 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
  skip_stats1:;
   struct rte_storage *new_stored = new ? rte_store(new, net, table) : NULL;
 
-  if (new)
-    rte_is_filtered(new) ? stats->filtered++ : stats->routes++;
-  if (old)
-    rte_is_filtered(old) ? stats->filtered-- : stats->routes--;
-
   if (table->config->sorted)
     {
       /* If routes are sorted, just insert new route to appropriate position */
@@ -2332,6 +2312,9 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 	goto drop_update;
       }
 
+      if (!new)
+	CHANNEL_LIMIT_POP(c, RX);
+
       /* Move iterator if needed */
       if (*pos == c->reload_next_rte)
 	c->reload_next_rte = (*pos)->next;
@@ -2342,7 +2325,18 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
       rte_free(del, tab);
       tab->rt_count--;
     }
-  else if (!new)
+  else if (new)
+    {
+      if (CHANNEL_LIMIT_PUSH(c, RX))
+      {
+	/* Required by rte_trace_in() */
+	new->net = n;
+
+	rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
+	goto drop_update;
+      }
+    }
+  else
     goto drop_withdraw;
 
   if (!new)
@@ -2353,22 +2347,6 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
     return 1;
   }
 
-  struct channel_limit *l = &c->rx_limit;
-  if (l->action && !*pos)
-  {
-    if (tab->rt_count >= l->limit)
-      channel_notify_limit(c, l, PLD_RX, tab->rt_count);
-
-    if (l->state == PLS_BLOCKED)
-    {
-      /* Required by rte_trace_in() */
-      new->net = n;
-
-      rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-      goto drop_update;
-    }
-  }
-
   /* Insert the new rte */
   struct rte_storage *e = rte_store(new, net, tab);
   e->rte.sender = c;
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 55a0b526..74d0e518 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -217,6 +217,9 @@ pipe_show_stats(struct pipe_proto *p)
   struct import_stats *s2i = &p->sec->import_stats;
   struct export_stats *s2e = &p->sec->export_stats;
 
+  u32 pri_routes = p->pri->in_limit.count;
+  u32 sec_routes = p->sec->in_limit.count;
+
   /*
    * Pipe stats (as anything related to pipes) are a bit tricky. There
    * are two sets of stats - s1 for ahook to the primary routing and
@@ -239,7 +242,7 @@ pipe_show_stats(struct pipe_proto *p)
    */
 
   cli_msg(-1006, "  Routes:         %u imported, %u exported",
-	  s1i->routes, s2i->routes);
+	  pri_routes, sec_routes);
   cli_msg(-1006, "  Route change stats:     received   rejected   filtered    ignored   accepted");
   cli_msg(-1006, "    Import updates:     %10u %10u %10u %10u %10u",
 	  s2e->updates_received, s2e->updates_rejected + s1i->updates_invalid,
@@ -270,8 +273,12 @@ pipe_show_proto_info(struct proto *P)
   cli_msg(-1006, "    Import filter:  %s", filter_name(p->sec->out_filter));
   cli_msg(-1006, "    Export filter:  %s", filter_name(p->pri->out_filter));
 
-  channel_show_limit(&p->pri->in_limit, "Import limit:");
-  channel_show_limit(&p->sec->in_limit, "Export limit:");
+
+
+  channel_show_limit(&p->pri->in_limit, "Import limit:",
+      (p->pri->limit_active & (1 << PLD_IN)), p->pri->limit_actions[PLD_IN]);
+  channel_show_limit(&p->sec->in_limit, "Export limit:",
+      (p->sec->limit_active & (1 << PLD_IN)), p->sec->limit_actions[PLD_IN]);
 
   if (P->proto_state != PS_DOWN)
     pipe_show_stats(p);

From 575da88f7a6cac54d204839d2b2cfc1809811ba3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 25 Feb 2021 21:52:49 +0100
Subject: [PATCH 008/431] Recursive route nexthop updates now announced with
 valid new_best/old_best information

---
 nest/rt-table.c | 84 +++++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index ee69d7c4..837e0ab9 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -349,7 +349,7 @@ rte_mergable(rte *pri, rte *sec)
 }
 
 static void
-rte_trace(struct channel *c, rte *e, int dir, char *msg)
+rte_trace(struct channel *c, rte *e, int dir, const char *msg)
 {
   log(L_TRACE "%s.%s %c %s %N %uL %uG %s",
       c->proto->name, c->name ?: "?", dir, msg, e->net, e->src->private_id, e->src->global_id,
@@ -357,14 +357,14 @@ rte_trace(struct channel *c, rte *e, int dir, char *msg)
 }
 
 static inline void
-rte_trace_in(uint flag, struct channel *c, rte *e, char *msg)
+rte_trace_in(uint flag, struct channel *c, rte *e, const char *msg)
 {
   if ((c->debug & flag) || (c->proto->debug & flag))
     rte_trace(c, e, '>', msg);
 }
 
 static inline void
-rte_trace_out(uint flag, struct channel *c, rte *e, char *msg)
+rte_trace_out(uint flag, struct channel *c, rte *e, const char *msg)
 {
   if ((c->debug & flag) || (c->proto->debug & flag))
     rte_trace(c, e, '<', msg);
@@ -1870,44 +1870,50 @@ rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
 static inline int
 rt_next_hop_update_net(rtable *tab, net *n)
 {
-  struct rte_storage **k, *e, *new, *old_best, **new_best;
+  struct rte_storage *new;
   int count = 0;
-  int free_old_best = 0;
 
-  old_best = n->routes;
+  struct rte_storage *old_best = n->routes;
   if (!old_best)
     return 0;
 
-  for (k = &n->routes; e = *k; k = &e->next)
+  for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
     if (rta_next_hop_outdated(e->rte.attrs))
-      {
-	new = rt_next_hop_update_rte(tab, n, &e->rte);
-	new->next = e->next;
-	*k = new;
-
-	rte_trace_in(D_ROUTES, new->rte.sender, &new->rte, "updated");
-	rte_announce_i(tab, RA_ANY, n, new, e, NULL, NULL);
-
-	/* Call a pre-comparison hook */
-	/* Not really an efficient way to compute this */
-	if (e->rte.src->proto->rte_recalculate)
-	  e->rte.src->proto->rte_recalculate(tab, n, &new->rte, &e->rte, NULL);
-
-	if (e != old_best)
-	  rte_free(e, tab);
-	else /* Freeing of the old best rte is postponed */
-	  free_old_best = 1;
-
-	e = new;
-	count++;
-      }
+      count++;
 
   if (!count)
     return 0;
 
+  struct rte_multiupdate {
+    struct rte_storage *old, *new;
+  } *updates = alloca(sizeof(struct rte_multiupdate) * count);
+
+  int pos = 0;
+  for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
+    if (rta_next_hop_outdated(e->rte.attrs))
+      {
+	struct rte_storage *new = rt_next_hop_update_rte(tab, n, &e->rte);
+
+	/* Call a pre-comparison hook */
+	/* Not really an efficient way to compute this */
+	if (e->rte.src->proto->rte_recalculate)
+	  e->rte.src->proto->rte_recalculate(tab, n, &new->rte, &e->rte, &old_best->rte);
+
+	updates[pos++] = (struct rte_multiupdate) {
+	  .old = e,
+	  .new = new,
+	};
+
+	/* Replace the route in the list */
+	new->next = e->next;
+	*k = e = new;
+      }
+
+  ASSERT_DIE(pos == count);
+
   /* Find the new best route */
-  new_best = NULL;
-  for (k = &n->routes; e = *k; k = &e->next)
+  struct rte_storage **new_best = NULL;
+  for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
     {
       if (!new_best || rte_better(&e->rte, &(*new_best)->rte))
 	new_best = k;
@@ -1922,15 +1928,17 @@ rt_next_hop_update_net(rtable *tab, net *n)
       n->routes = new;
     }
 
-  /* Announce the new best route */
-  if (new != old_best)
-    rte_trace_in(D_ROUTES, new->rte.sender, &new->rte, "updated [best]");
+  /* Announce the changes */
+  for (int i=0; i<count; i++)
+  {
+    _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
+    const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
+    rte_trace_in(D_ROUTES, new->rte.sender, &updates[i].new->rte, best_indicator[nb][ob]);
+    rte_announce_i(tab, RA_UNDEF, n, updates[i].new, updates[i].old, new, old_best);
+  }
 
-  /* Propagate changes */
-  rte_announce_i(tab, RA_UNDEF, n, NULL, NULL, n->routes, old_best);
-
-  if (free_old_best)
-    rte_free(old_best, tab);
+  for (int i=0; i<count; i++)
+    rte_free(updates[i].old, tab);
 
   return count;
 }

From 56c8f2f03a8631417dc3b730625c08ffca42ead2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 1 May 2020 22:26:24 +0200
Subject: [PATCH 009/431] Nest: Route generations and explicit tracking route
 propagion through pipes

---
 conf/conf.h         |  1 +
 doc/bird.sgml       |  8 ++++++++
 nest/config.Y       |  3 ++-
 nest/route.h        |  5 ++++-
 nest/rt-table.c     | 47 +++++++++++++++++++++++----------------------
 proto/pipe/config.Y |  7 ++++++-
 proto/pipe/pipe.c   | 32 ++++++++++++++++--------------
 proto/pipe/pipe.h   |  2 ++
 8 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/conf/conf.h b/conf/conf.h
index 55cb9c58..69ef8a10 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -45,6 +45,7 @@ struct config {
 
   int cli_debug;			/* Tracing of CLI connections and commands */
   int latency_debug;			/* I/O loop tracks duration of each event */
+  int pipe_debug;			/* Track route propagation through pipes */
   u32 latency_limit;			/* Events with longer duration are logged (us) */
   u32 watchdog_warning;			/* I/O loop watchdog limit for warning (us) */
   u32 watchdog_timeout;			/* Watchdog timeout (in seconds, 0 = disabled) */
diff --git a/doc/bird.sgml b/doc/bird.sgml
index a2138b55..d1a3b70f 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -4124,6 +4124,14 @@ include standard channel config options; see the example below.
 	<tag><label id="pipe-peer-table">peer table <m/table/</tag>
 	Defines secondary routing table to connect to. The primary one is
 	selected by the <cf/table/ keyword.
+
+	<tag><label id="pipe-max-generation">max generation <m/expr/</tag>
+	Sets maximal generation of route that may pass through this pipe.
+	The generation value is increased by one by each pipe on its path.
+	Not meeting this requirement causes an error message complaining about
+	an overpiped route. If you have long chains of pipes, you probably want
+	to raise this value; anyway the default of 16 should be enough for even
+	most strange uses. Maximum is 254.
 </descrip>
 
 <sect1>Attributes
diff --git a/nest/config.Y b/nest/config.Y
index ef3e27c0..a1d901ab 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -111,7 +111,7 @@ proto_postconfig(void)
 
 CF_DECLS
 
-CF_KEYWORDS(ROUTER, ID, HOSTNAME, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
+CF_KEYWORDS(ROUTER, ID, HOSTNAME, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT, PIPE)
 CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, VRF, DEFAULT, TABLE, STATES, ROUTES, FILTERS)
 CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, SADR, MPLS)
 CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED, RPKI)
@@ -348,6 +348,7 @@ debug_default:
    DEBUG PROTOCOLS debug_mask { new_config->proto_default_debug = $3; }
  | DEBUG CHANNELS debug_mask { new_config->channel_default_debug = $3; }
  | DEBUG COMMANDS expr { new_config->cli_debug = $3; }
+ | DEBUG PIPE bool { new_config->pipe_debug = $3; }
  ;
 
 /* MRTDUMP PROTOCOLS is in systep/unix/config.Y */
diff --git a/nest/route.h b/nest/route.h
index 98d605c8..9baaeda0 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -162,7 +162,6 @@ typedef struct rtable {
   char *name;				/* Name of this table */
   list channels;			/* List of attached channels (struct channel) */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
-  int pipe_busy;			/* Pipe loop detection */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 
@@ -185,6 +184,7 @@ typedef struct rtable {
   byte nhu_state;			/* Next Hop Update state */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
+  struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
 
   list subscribers;			/* Subscribers for notifications */
   struct timer *settle_timer;		/* Settle time for notifications */
@@ -243,6 +243,9 @@ typedef struct rte {
   u32 id;				/* Table specific route id */
   byte flags;				/* Table-specific flags */
   byte pflags;				/* Protocol-specific flags */
+  u8 generation;			/* If this route import is based on other previously exported route,
+					   this value should be 1 + MAX(generation of the parent routes).
+					   Otherwise the route is independent and this value is zero. */
 } rte;
 
 struct rte_storage {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b005f6f3..6851b4bc 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -837,7 +837,6 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   struct proto *p = c->proto;
   struct rtable *table = c->table;
   struct proto_stats *stats = &c->stats;
-  static struct tbf rl_pipe = TBF_DEFAULT_LOG_LIMITS;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
@@ -849,22 +848,22 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
     {
       old = &(old_stored = (*before_old))->rte;
 
-	  /* If there is the same route in the routing table but from
-	   * a different sender, then there are two paths from the
-	   * source protocol to this routing table through transparent
-	   * pipes, which is not allowed.
-	   *
-	   * We log that and ignore the route. If it is withdraw, we
-	   * ignore it completely (there might be 'spurious withdraws',
-	   * see FIXME in do_rte_announce())
-	   */
-	  if (old->sender->proto != p)
-	    {
-	      if (new)
-		  log_rl(&rl_pipe, L_ERR "Pipe collision detected when sending %N to table %s",
-		      net->n.addr, table->name);
-	      return;
-	    }
+      /* If there is the same route in the routing table but from
+       * a different sender, then there are two paths from the
+       * source protocol to this routing table through transparent
+       * pipes, which is not allowed.
+       * We log that and ignore the route. */
+      if (old->sender->proto != p)
+	{
+	  if (!old->generation && !new->generation)
+	    bug("Two protocols claim to author a route with the same rte_src in table %s: %N %s/%u:%u",
+		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
+
+	  log_rl(&table->rl_pipe, L_ERR "Route source collision in table %s: %N %s/%u:%u",
+		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
+
+	  return;
+	}
 
 	  if (new && rte_same(old, new))
 	    {
@@ -875,14 +874,15 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	      if (!rte_is_filtered(new))
 		{
 		  stats->imp_updates_ignored++;
-		  rte_trace_in(D_ROUTES, c, new, "ignored");
+	          rte_trace_in(D_ROUTES, c, new, "ignored");
 		}
 
-	      return;
-	    }
+	    return;
+	  }
 
-	  *before_old = (*before_old)->next;
-	  table->rt_count--;
+
+	*before_old = (*before_old)->next;
+	table->rt_count--;
     }
 
   if (!old && !new)
@@ -1128,7 +1128,6 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   if (c->in_table && !rte_update_in(c, n, new, src))
     return;
 
-  // struct proto *p = c->proto;
   struct proto_stats *stats = &c->stats;
   const struct filter *filter = c->in_filter;
   net *nn;
@@ -1595,6 +1594,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
     t->rt_event = ev_new_init(p, rt_event, t);
     t->last_rt_change = t->gc_time = current_time();
+
+    t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
   }
 
   return t;
diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y
index 1202c169..c869de9f 100644
--- a/proto/pipe/config.Y
+++ b/proto/pipe/config.Y
@@ -16,7 +16,7 @@ CF_DEFINES
 
 CF_DECLS
 
-CF_KEYWORDS(PIPE, PEER, TABLE)
+CF_KEYWORDS(PIPE, PEER, TABLE, MAX, GENERATION)
 
 CF_GRAMMAR
 
@@ -25,6 +25,7 @@ proto: pipe_proto '}' { this_channel = NULL; }  ;
 pipe_proto_start: proto_start PIPE
 {
   this_proto = proto_config_new(&proto_pipe, $1);
+  PIPE_CFG->max_generation = 16;
 }
 proto_name
 {
@@ -41,6 +42,10 @@ pipe_proto:
  | pipe_proto proto_item ';'
  | pipe_proto channel_item_ ';'
  | pipe_proto PEER TABLE rtable ';' { PIPE_CFG->peer = $4; }
+ | pipe_proto MAX GENERATION expr ';' {
+    if (($4 < 1) || ($4 > 254)) cf_error("Max generation must be in range 1..254, got %u", $4);
+    PIPE_CFG->max_generation = $4;
+  }
  ;
 
 CF_CODE
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 3caa85d0..7604cc79 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -56,15 +56,6 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *
   if (!new && !old)
     return;
 
-  if (dst->table->pipe_busy)
-    {
-      log(L_ERR "Pipe loop detected when sending %N to table %s",
-	  n, dst->table->name);
-      return;
-    }
-
-  src_ch->table->pipe_busy = 1;
-
   if (new)
     {
       rta *a = alloca(rta_size(new->attrs));
@@ -76,23 +67,34 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *
       rte e0 = {
 	.attrs = a,
 	.src = new->src,
+	.generation = new->generation + 1,
       };
 
       rte_update(dst, n, &e0, new->src);
     }
   else
     rte_update(dst, n, NULL, old->src);
-
-  src_ch->table->pipe_busy = 0;
 }
 
 static int
 pipe_preexport(struct channel *c, rte *e)
 {
-  struct proto *pp = e->sender->proto;
+  struct pipe_proto *p = (void *) c->proto;
 
-  if (pp == c->proto)
-    return -1;	/* Avoid local loops automatically */
+  /* Avoid direct loopbacks */
+  if (e->sender == c)
+    return -1;
+
+  /* Indirection check */
+  uint max_generation = ((struct pipe_config *) p->p.cf)->max_generation;
+  if (e->generation >= max_generation)
+  {
+    log_rl(&p->rl_gen, L_ERR "Route overpiped (%u hops of %u configured in %s) in table %s: %N %s/%u:%u",
+	e->generation, max_generation, c->proto->name,
+	c->table->name, e->net, e->src->proto->name, e->src->private_id, e->src->global_id);
+
+    return -1;
+  }
 
   return 0;
 }
@@ -177,6 +179,8 @@ pipe_init(struct proto_config *CF)
   P->preexport = pipe_preexport;
   P->reload_routes = pipe_reload_routes;
 
+  p->rl_gen = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
+
   pipe_configure_channels(p, cf);
 
   return P;
diff --git a/proto/pipe/pipe.h b/proto/pipe/pipe.h
index 038c6666..60c857eb 100644
--- a/proto/pipe/pipe.h
+++ b/proto/pipe/pipe.h
@@ -12,12 +12,14 @@
 struct pipe_config {
   struct proto_config c;
   struct rtable_config *peer;		/* Table we're connected to */
+  u8 max_generation;
 };
 
 struct pipe_proto {
   struct proto p;
   struct channel *pri;
   struct channel *sec;
+  struct tbf rl_gen;
 };
 
 #endif

From 8f3942a97e16370f5c22e9c39ddbfe63b38bd5ce Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 9 Mar 2020 15:31:10 +0100
Subject: [PATCH 010/431] Route export: rejected by filter bitmap

If a route has been rejected by filter, store that information
to avoid repeated export filter runs on rejected routes.
---
 nest/proto.c    |  3 +++
 nest/protocol.h |  3 ++-
 nest/rt-table.c | 51 ++++++++++++++++++++++++++++++-------------------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 631e4b60..c7e25209 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -463,6 +463,7 @@ channel_stop_export(struct channel *c)
   c->export_state = ES_DOWN;
   c->export_stats.routes = 0;
   bmap_reset(&c->export_map, 1024);
+  bmap_reset(&c->export_reject_map, 1024);
 }
 
 
@@ -551,6 +552,7 @@ channel_do_start(struct channel *c)
   c->feed_event = ev_new_init(c->proto->pool, channel_feed_loop, c);
 
   bmap_init(&c->export_map, c->proto->pool, 1024);
+  bmap_init(&c->export_reject_map, c->proto->pool, 1024);
   memset(&c->export_stats, 0, sizeof(struct export_stats));
   memset(&c->import_stats, 0, sizeof(struct import_stats));
 
@@ -585,6 +587,7 @@ channel_do_flush(struct channel *c)
 
   /* This have to be done in here, as channel pool is freed before channel_do_down() */
   bmap_free(&c->export_map);
+  bmap_free(&c->export_reject_map);
   c->in_table = NULL;
   c->reload_event = NULL;
   c->out_table = NULL;
diff --git a/nest/protocol.h b/nest/protocol.h
index 9be8e531..4c87c72d 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -511,7 +511,8 @@ struct channel {
   struct rtable *table;
   const struct filter *in_filter;	/* Input filter */
   const struct filter *out_filter;	/* Output filter */
-  struct bmap export_map;		/* Keeps track which routes passed export filter */
+  struct bmap export_map;		/* Keeps track which routes were really exported */
+  struct bmap export_reject_map;	/* Keeps track which routes were rejected by export filter */
   struct channel_limit rx_limit;	/* Receive limit (for in_keep_filtered) */
   struct channel_limit in_limit;	/* Input limit */
   struct channel_limit out_limit;	/* Output limit */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 0b6351e9..280551aa 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -376,18 +376,22 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
   struct proto *p = c->proto;
   const struct filter *filter = c->out_filter;
   struct export_stats *stats = &c->export_stats;
-  int v;
 
-  v = p->preexport ? p->preexport(c, rt) : 0;
+  /* Do nothing if we have already rejected the route */
+  if (silent && bmap_test(&c->export_reject_map, rt->id))
+    goto reject_noset;
+
+  int v = p->preexport ? p->preexport(c, rt) : 0;
   if (v < 0)
     {
       if (silent)
-	goto reject;
+	goto reject_noset;
 
       stats->updates_rejected++;
       if (v == RIC_REJECT)
 	rte_trace_out(D_FILTERS, c, rt, "rejected by protocol");
-      goto reject;
+      goto reject_noset;
+
     }
   if (v > 0)
     {
@@ -410,9 +414,16 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
     }
 
  accept:
+  /* We have accepted the route */
+  bmap_clear(&c->export_reject_map, rt->id);
   return rt;
 
  reject:
+  /* We have rejected the route by filter */
+  bmap_set(&c->export_reject_map, rt->id);
+
+reject_noset:
+  /* Invalidate the route */
   /* Discard temporary rte */
   return NULL;
 }
@@ -565,8 +576,14 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
   {
     /* Feed or old_best changed -> find first accepted by filters */
     for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
+    {
+      /* Already rejected before */
+      if (!refeed && bmap_test(&c->export_reject_map, r->rte.id))
+	continue;
+
       if (new_best = export_filter(c, ((nb0 = r->rte), &nb0), 0))
 	break;
+    }
   }
   else
   {
@@ -677,7 +694,6 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
 /**
  * rte_announce - announce a routing table change
  * @tab: table the route has been added to
- * @type: type of route announcement (RA_UNDEF or RA_ANY)
  * @net: network in question
  * @new: the new or changed route
  * @old: the previous route replaced by the new one
@@ -693,13 +709,6 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
  * and @new_best and @old_best describes best routes. Other routes are not
  * affected, but in sorted table the order of other routes might change.
  *
- * Second, There is a bulk change of multiple routes in @net, with shared best
- * route selection. In such case separate route changes are described using
- * @type of %RA_ANY, with @new and @old specifying the changed route, while
- * @new_best and @old_best are NULL. After that, another notification is done
- * where @new_best and @old_best are filled (may be the same), but @new and @old
- * are NULL.
- *
  * The function announces the change to all associated channels. For each
  * channel, an appropriate preprocessing is done according to channel &ra_mode.
  * For example, %RA_OPTIMAL channels receive just changes of best routes.
@@ -714,7 +723,7 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
   if (!new || !rte_is_valid(&new->rte))
@@ -751,9 +760,6 @@ rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct r
     if (c->export_state == ES_DOWN)
       continue;
 
-    if (type && (type != c->ra_mode))
-      continue;
-
     rte n0;
     switch (c->ra_mode)
     {
@@ -775,6 +781,11 @@ rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct r
       rt_notify_merged(c, net, RTE_OR_NULL(new), RTE_OR_NULL(old), RTE_OR_NULL(new_best), RTE_OR_NULL(old_best), 0);
       break;
     }
+
+    /* Drop the old stored rejection if applicable.
+     * new->id == old->id happens when updating hostentries. */
+    if (old && (!new || (new->rte.id != old->rte.id)))
+      bmap_clear(&c->export_reject_map, old->rte.id);
   }
 }
 
@@ -1083,7 +1094,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
     }
 
   /* Propagate the route change */
-  rte_announce(table, RA_UNDEF, net, new_stored, old_stored,
+  rte_announce(table, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
   if (!net->routes &&
@@ -1208,11 +1219,11 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 /* Independent call to rte_announce(), used from next hop
    recalculation, outside of rte_update(). new must be non-NULL */
 static inline void
-rte_announce_i(rtable *tab, uint type, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce_i(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	       struct rte_storage *new_best, struct rte_storage *old_best)
 {
   rte_update_lock();
-  rte_announce(tab, type, net, new, old, new_best, old_best);
+  rte_announce(tab, net, new, old, new_best, old_best);
   rte_update_unlock();
 }
 
@@ -1938,7 +1949,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
     _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
     const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
     rte_trace_in(D_ROUTES, new->rte.sender, &updates[i].new->rte, best_indicator[nb][ob]);
-    rte_announce_i(tab, RA_UNDEF, n, updates[i].new, updates[i].old, new, old_best);
+    rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
 
   for (int i=0; i<count; i++)

From 0767a0c288097dfaec45fe505c401407ecc5de55 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 30 Sep 2021 13:50:54 +0200
Subject: [PATCH 011/431] Secondary and merged exports get a whole feed instead
 of traversing the table structures directly

---
 nest/route.h      |   2 +-
 nest/rt-show.c    |   2 +-
 nest/rt-table.c   | 279 +++++++++++++++++++++++++++++-----------------
 sysdep/unix/krt.c |   2 +-
 4 files changed, 178 insertions(+), 107 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index 9baaeda0..e4507d4a 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -335,7 +335,7 @@ static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) f
 void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
-rte *rt_export_merged(struct channel *c, net *net, linpool *pool, int silent);
+rte *rt_export_merged_show(struct channel *c, net *n, linpool *pool);
 void rt_refresh_begin(rtable *t, struct channel *c);
 void rt_refresh_end(rtable *t, struct channel *c);
 void rt_modify_stale(rtable *t, struct channel *c);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index ae5000f5..ffbc0a90 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -143,7 +143,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	{
 	  /* Special case for merged export */
 	  pass = 1;
-	  rte *em = rt_export_merged(ec, n, c->show_pool, 1);
+	  rte *em = rt_export_merged_show(ec, n, c->show_pool);
 	  if (em)
 	    e = *em;
 	  else
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 280551aa..146734f4 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -51,6 +51,13 @@ static linpool *rte_update_pool;
 
 list routing_tables;
 
+struct rt_pending_export {
+  struct rte_storage *new;		/* New route */
+  struct rte_storage *new_best;		/* New best route */
+  struct rte_storage *old;		/* Old route */
+  struct rte_storage *old_best;		/* Old best route */
+};
+
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
 static void rt_update_hostcache(rtable *tab);
@@ -370,6 +377,29 @@ rte_trace_out(uint flag, struct channel *c, rte *e, const char *msg)
     rte_trace(c, e, '<', msg);
 }
 
+static uint
+rte_feed_count(net *n)
+{
+  uint count = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+      count++;
+  return count;
+}
+
+static void
+rte_feed_obtain(net *n, struct rte **feed, uint count)
+{
+  uint i = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+    {
+      ASSERT_DIE(i < count);
+      feed[i++] = &e->rte;
+    }
+  ASSERT_DIE(i == count);
+}
+
 static rte *
 export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 {
@@ -523,81 +553,71 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old, int
 }
 
 static void
-rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_changed, int refeed)
+rt_notify_accepted(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
+    struct rte **feed, uint count, int refeed)
 {
-  // struct proto *p = c->proto;
-  rte nb0;
-  rte *new_best = NULL;
-  rte *old_best = NULL;
-  int new_first = 0;
+  rte nb0, *new_best = NULL, *old_best = NULL;
 
-  /*
-   * We assume that there are no changes in net route order except (added)
-   * new_changed and (removed) old_changed. Therefore, the function is not
-   * compatible with deterministic_med (where nontrivial reordering can happen
-   * as a result of a route change) and with recomputation of recursive routes
-   * due to next hop update (where many routes can be changed in one step).
-   *
-   * Note that we need this assumption just for optimizations, we could just
-   * run full new_best recomputation otherwise.
-   *
-   * There are three cases:
-   * feed or old_best is old_changed -> we need to recompute new_best
-   * old_best is before new_changed -> new_best is old_best, ignore
-   * old_best is after new_changed -> try new_changed, otherwise old_best
-   */
-
-  if (net->routes)
-    c->export_stats.updates_received++;
-  else
-    c->export_stats.withdraws_received++;
-
-  /* Find old_best - either old_changed, or route for net->routes */
-  if (old_changed && bmap_test(&c->export_map, old_changed->id))
-    old_best = old_changed;
-  else
+  for (uint i = 0; i < count; i++)
   {
-    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
+    if (!rte_is_valid(feed[i]))
+      continue;
+
+    /* Has been already rejected, won't bother with it */
+    if (!refeed && bmap_test(&c->export_reject_map, feed[i]->id))
+      continue;
+
+    /* Previously exported */
+    if (!old_best && bmap_test(&c->export_map, feed[i]->id))
     {
-      if (bmap_test(&c->export_map, r->rte.id))
+      /* is still best */
+      if (!new_best)
       {
-	old_best = &r->rte;
+	DBG("rt_notify_accepted: idempotent\n");
+	return;
+      }
+
+      /* is superseded */
+      old_best = feed[i];
+      break;
+    }
+
+    /* Have no new best route yet */
+    if (!new_best)
+    {
+      /* Try this route not seen before */
+      nb0 = *feed[i];
+      new_best = export_filter(c, &nb0, 0);
+      DBG("rt_notify_accepted: checking route id %u: %s\n", feed[i]->id, new_best ? "ok" : "no");
+    }
+  }
+
+  /* Check obsolete routes for previously exported */
+  if (!old_best)
+    if (rpe && rpe->old && bmap_test(&c->export_map, rpe->old->rte.id))
+      old_best = &rpe->old->rte;
+
+/*    for (; rpe; rpe = atomic_load_explicit(&rpe->next, memory_order_relaxed))
+    {
+      if (rpe->old && bmap_test(&hook->accept_map, rpe->old->id))
+      {
+	old_best = &rpe->old.rte;
 	break;
       }
 
-      /* Note if new_changed found before old_best */
-      if (&r->rte == new_changed)
-	new_first = 1;
-    }
-  }
-
-  /* Find new_best */
-  if ((new_changed == old_changed) || (old_best == old_changed))
-  {
-    /* Feed or old_best changed -> find first accepted by filters */
-    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
-    {
-      /* Already rejected before */
-      if (!refeed && bmap_test(&c->export_reject_map, r->rte.id))
-	continue;
-
-      if (new_best = export_filter(c, ((nb0 = r->rte), &nb0), 0))
+      if (rpe == rpe_last)
 	break;
     }
-  }
-  else
-  {
-    /* Other cases -> either new_changed, or old_best (and nothing changed) */
-    if (new_first && (new_changed = export_filter(c, new_changed, 0)))
-      new_best = new_changed;
-    else
-      return;
-  }
+    */
 
+  /* Nothing to export */
   if (!new_best && !old_best)
+  {
+    DBG("rt_notify_accepted: nothing to export\n");
     return;
+  }
 
-  do_rt_notify(c, net->n.addr, new_best, old_best, refeed);
+  do_rt_notify(c, n, new_best, old_best, refeed);
 }
 
 
@@ -607,36 +627,45 @@ nexthop_merge_rta(struct nexthop *nhs, rta *a, linpool *pool, int max)
   return nexthop_merge(nhs, &(a->nh), 1, 0, max, pool);
 }
 
-rte *
-rt_export_merged(struct channel *c, net *net, linpool *pool, int silent)
+static rte *
+rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool, int silent, int refeed)
 {
+  _Thread_local static rte rloc;
+
   // struct proto *p = c->proto;
   struct nexthop *nhs = NULL;
-  _Thread_local static rte rme;
-  struct rte_storage *best0 = net->routes;
-  rte *best;
+  rte *best0 = feed[0], *best = NULL;
 
-  if (!best0 || !rte_is_valid(&best0->rte))
+  if (!rte_is_valid(best0))
     return NULL;
 
-  best = export_filter_(c, ((rme = best0->rte), &rme), pool, silent);
+  /* Already rejected, no need to re-run the filter */
+  if (!refeed && bmap_test(&c->export_reject_map, best0->id))
+    return NULL;
 
-  if (!best || !rte_is_reachable(best))
+  rloc = *best0;
+  best = export_filter_(c, &rloc, pool, silent);
+
+  if (!best)
+    /* Best route doesn't pass the filter */
+    return NULL;
+
+  if (!rte_is_reachable(best))
+    /* Unreachable routes can't be merged */
     return best;
 
-  for (struct rte_storage *rt0 = best0->next; rt0; rt0 = rt0->next)
+  for (uint i = 1; i < count; i++)
   {
-    if (!rte_mergable(best, &rt0->rte))
+    if (!rte_mergable(best0, feed[i]))
       continue;
 
-    rte rnh = rt0->rte;
-    rte *rt = export_filter_(c, &rnh, pool, 1);
+    rte tmp0 = *feed[i];
+    rte *tmp = export_filter_(c, &tmp0, pool, 1);
 
-    if (!rt)
+    if (!tmp || !rte_is_reachable(tmp))
       continue;
 
-    if (rte_is_reachable(rt))
-      nhs = nexthop_merge_rta(nhs, rt->attrs, pool, c->merge_limit);
+    nhs = nexthop_merge_rta(nhs, tmp->attrs, pool, c->merge_limit);
   }
 
   if (nhs)
@@ -653,41 +682,77 @@ rt_export_merged(struct channel *c, net *net, linpool *pool, int silent)
   return best;
 }
 
+rte *
+rt_export_merged_show(struct channel *c, net *n, linpool *pool)
+{
+  uint count = rte_feed_count(n);
+  rte **feed = alloca(count * sizeof(rte *));
+  rte_feed_obtain(n, feed, count);
+  return rt_export_merged(c, feed, count, pool, 1, 0);
+}
 
 static void
-rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed,
-		 rte *new_best, rte *old_best, int refeed)
+rt_notify_merged(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
+    struct rte **feed, uint count, int refeed)
 {
-  /* We assume that all rte arguments are either NULL or rte_is_valid() */
-
-  /* This check should be done by the caller */
-  if (!new_best && !old_best)
-    return;
+  // struct proto *p = c->proto;
 
+#if 0 /* TODO: Find whether this check is possible when processing multiple changes at once. */
   /* Check whether the change is relevant to the merged route */
   if ((new_best == old_best) &&
       (new_changed != old_changed) &&
       !rte_mergable(new_best, new_changed) &&
       !rte_mergable(old_best, old_changed))
     return;
+#endif
 
-  if (new_best)
-    c->export_stats.updates_received++;
-  else
-    c->export_stats.withdraws_received++;
+  rte *old_best = NULL;
+  /* Find old best route */
+  for (uint i = 0; i < count; i++)
+    if (bmap_test(&c->export_map, feed[i]->id))
+    {
+      old_best = feed[i];
+      break;
+    }
+
+  /* Check obsolete routes for previously exported */
+  if (!old_best)
+    if (rpe && rpe->old && bmap_test(&c->export_map, rpe->old->rte.id))
+      old_best = &rpe->old->rte;
+
+/*    for (; rpe; rpe = atomic_load_explicit(&rpe->next, memory_order_relaxed))
+    {
+      if (rpe->old && bmap_test(&hook->accept_map, rpe->old->id))
+      {
+	old_best = &rpe->old.rte;
+	break;
+      }
+
+      if (rpe == rpe_last)
+	break;
+    }
+    */
 
   /* Prepare new merged route */
-  if (new_best)
-    new_best = rt_export_merged(c, net, rte_update_pool, 0);
+  rte *new_merged = count ? rt_export_merged(c, feed, count, rte_update_pool, 0, refeed) : NULL;
 
-  /* Check old merged route */
-  if (old_best && !bmap_test(&c->export_map, old_best->id))
-    old_best = NULL;
-
-  if (!new_best && !old_best)
+  if (!new_merged && !old_best)
     return;
 
-  do_rt_notify(c, net->n.addr, new_best, old_best, refeed);
+  do_rt_notify(c, n, new_merged, old_best, refeed);
+}
+
+static void
+rt_notify_bulk(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
+    struct rte **feed, uint count, int refeed)
+{
+  switch (c->ra_mode)
+  {
+    case RA_ACCEPTED:
+      return rt_notify_accepted(c, n, rpe, feed, count, refeed);
+    case RA_MERGED:
+      return rt_notify_merged(c, n, rpe, feed, count, refeed);
+  }
 }
 
 
@@ -774,12 +839,15 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
       break;
 
     case RA_ACCEPTED:
-      rt_notify_accepted(c, net, RTE_OR_NULL(new), RTE_OR_NULL(old), 0);
-      break;
-
     case RA_MERGED:
-      rt_notify_merged(c, net, RTE_OR_NULL(new), RTE_OR_NULL(old), RTE_OR_NULL(new_best), RTE_OR_NULL(old_best), 0);
-      break;
+      {
+	struct rt_pending_export rpe = { .new = new, .old = old, .new_best = new_best, .old_best = old_best };
+	uint count = rte_feed_count(net);
+	rte **feed = alloca(count * sizeof(rte *));
+	rte_feed_obtain(net, feed, count);
+	rt_notify_bulk(c, net->n.addr, &rpe, feed, count, 0);
+	break;
+      }
     }
 
     /* Drop the old stored rejection if applicable.
@@ -2127,10 +2195,13 @@ static inline void
 do_feed_channel(struct channel *c, net *n, rte *e)
 {
   rte_update_lock();
-  if (c->ra_mode == RA_ACCEPTED)
-    rt_notify_accepted(c, n, NULL, NULL, c->refeeding);
-  else if (c->ra_mode == RA_MERGED)
-    rt_notify_merged(c, n, NULL, NULL, e, e, c->refeeding);
+  if ((c->ra_mode == RA_ACCEPTED) || (c->ra_mode == RA_MERGED))
+  {
+    uint count = rte_feed_count(n);
+    rte **feed = alloca(count * sizeof(rte *));
+    rte_feed_obtain(n, feed, count);
+    rt_notify_bulk(c, n->n.addr, NULL, feed, count, c->refeeding);
+  }
   else /* RA_BASIC */
   {
     rte e0 = *e;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0a746631..b98e7ec0 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -566,7 +566,7 @@ krt_export_net(struct krt_proto *p, net *net)
   const struct filter *filter = c->out_filter;
 
   if (c->ra_mode == RA_MERGED)
-    return rt_export_merged(c, net, krt_filter_lp, 1);
+    return rt_export_merged_show(c, net, krt_filter_lp);
 
   static _Thread_local rte rt;
   rt = net->routes->rte;

From 69d1ffde4c724882398b3b630ea1199f12c0c288 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 28 Jan 2020 11:42:46 +0100
Subject: [PATCH 012/431] Split route data structure to storage (ro) /
 manipulation (rw) structures.

Routes are now allocated only when they are just to be inserted to the
table. Updating a route needs a locally allocated route structure.
Ownership of the attributes is also now not transfered from protocols to
tables and vice versa but just borrowed which should be easier to handle
in a multithreaded environment.
---
 filter/f-inst.c        |  12 +-
 filter/filter.c        |  79 +----
 filter/filter.h        |   4 +-
 nest/protocol.h        |  22 +-
 nest/route.h           |  78 +++--
 nest/rt-dev.c          |  15 +-
 nest/rt-show.c         |  30 +-
 nest/rt-table.c        | 663 +++++++++++++++--------------------------
 proto/babel/babel.c    |  35 ++-
 proto/bgp/attrs.c      |  98 +++---
 proto/bgp/bgp.h        |  16 +-
 proto/bgp/packets.c    |  11 +-
 proto/mrt/mrt.c        |  17 +-
 proto/ospf/ospf.c      |   8 +-
 proto/ospf/rt.c        |  16 +-
 proto/ospf/topology.c  |  12 +-
 proto/ospf/topology.h  |   2 +-
 proto/perf/perf.c      |  13 +-
 proto/pipe/pipe.c      |  38 +--
 proto/radv/radv.c      |  18 +-
 proto/rip/rip.c        |  25 +-
 proto/rpki/rpki.c      |   9 +-
 proto/static/static.c  |  23 +-
 sysdep/bsd/krt-sock.c  |  15 +-
 sysdep/linux/netlink.c |  58 ++--
 sysdep/unix/krt.c      | 167 +++++------
 sysdep/unix/krt.h      |   2 +-
 27 files changed, 611 insertions(+), 875 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 93886494..00e22383 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -519,14 +519,14 @@
     {
       STATIC_ATTR;
       ACCESS_RTE;
-      struct rta *rta = (*fs->rte)->attrs;
+      struct rta *rta = fs->rte->attrs;
 
       switch (sa.sa_code)
       {
       case SA_FROM:	RESULT(sa.f_type, ip, rta->from); break;
       case SA_GW:	RESULT(sa.f_type, ip, rta->nh.gw); break;
-      case SA_NET:	RESULT(sa.f_type, net, (*fs->rte)->net->n.addr); break;
-      case SA_PROTO:	RESULT(sa.f_type, s, (*fs->rte)->src->proto->name); break;
+      case SA_NET:	RESULT(sa.f_type, net, fs->rte->net); break;
+      case SA_PROTO:	RESULT(sa.f_type, s, fs->rte->src->proto->name); break;
       case SA_SOURCE:	RESULT(sa.f_type, i, rta->source); break;
       case SA_SCOPE:	RESULT(sa.f_type, i, rta->scope); break;
       case SA_DEST:	RESULT(sa.f_type, i, rta->dest); break;
@@ -550,7 +550,7 @@
 
     f_rta_cow(fs);
     {
-      struct rta *rta = (*fs->rte)->attrs;
+      struct rta *rta = fs->rte->attrs;
 
       switch (sa.sa_code)
       {
@@ -562,7 +562,7 @@
 	{
 	  ip_addr ip = v1.val.ip;
 	  struct iface *ifa = ipa_is_link_local(ip) ? rta->nh.iface : NULL;
-	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, 0);
+	  neighbor *n = neigh_find(fs->rte->src->proto, ip, ifa, 0);
 	  if (!n || (n->scope == SCOPE_HOST))
 	    runtime( "Invalid gw address" );
 
@@ -1214,7 +1214,7 @@
     struct rtable *table = rtc->table;
     ACCESS_RTE;
     ACCESS_EATTRS;
-    const net_addr *net = (*fs->rte)->net->n.addr;
+    const net_addr *net = fs->rte->net;
 
     /* We ignore temporary attributes, probably not a problem here */
     /* 0x02 is a value of BA_AS_PATH, we don't want to include BGP headers */
diff --git a/filter/filter.c b/filter/filter.c
index 7004b96d..6f1e6ea0 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -74,10 +74,7 @@ struct filter_state {
   } stack;
 
   /* The route we are processing. This may be NULL to indicate no route available. */
-  struct rte **rte;
-
-  /* The old rta to be freed after filters are done. */
-  struct rta *old_rta;
+  struct rte *rte;
 
   /* Cached pointer to ea_list */
   struct ea_list **eattrs;
@@ -102,15 +99,7 @@ void (*bt_assert_hook)(int result, const struct f_line_item *assert);
 
 static inline void f_cache_eattrs(struct filter_state *fs)
 {
-  fs->eattrs = &((*fs->rte)->attrs->eattrs);
-}
-
-static inline void f_rte_cow(struct filter_state *fs)
-{
-  if (!((*fs->rte)->flags & REF_COW))
-    return;
-
-  *fs->rte = rte_cow(*fs->rte);
+  fs->eattrs = &(fs->rte->attrs->eattrs);
 }
 
 /*
@@ -119,22 +108,16 @@ static inline void f_rte_cow(struct filter_state *fs)
 static void
 f_rta_cow(struct filter_state *fs)
 {
-  if (!rta_is_cached((*fs->rte)->attrs))
+  if (!rta_is_cached(fs->rte->attrs))
     return;
 
-  /* Prepare to modify rte */
-  f_rte_cow(fs);
-
-  /* Store old rta to free it later, it stores reference from rte_cow() */
-  fs->old_rta = (*fs->rte)->attrs;
-
   /*
    * Get shallow copy of rta. Fields eattrs and nexthops of rta are shared
    * with fs->old_rta (they will be copied when the cached rta will be obtained
    * at the end of f_run()), also the lock of hostentry is inherited (we
    * suppose hostentry is not changed by filters).
    */
-  (*fs->rte)->attrs = rta_do_cow((*fs->rte)->attrs, fs->pool);
+  fs->rte->attrs = rta_do_cow(fs->rte->attrs, fs->pool);
 
   /* Re-cache the ea_list */
   f_cache_eattrs(fs);
@@ -246,29 +229,15 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
 /**
  * f_run - run a filter for a route
  * @filter: filter to run
- * @rte: route being filtered, may be modified
+ * @rte: route being filtered, must be write-able
  * @tmp_pool: all filter allocations go from this pool
  * @flags: flags
  *
- * If filter needs to modify the route, there are several
- * posibilities. @rte might be read-only (with REF_COW flag), in that
- * case rw copy is obtained by rte_cow() and @rte is replaced. If
- * @rte is originally rw, it may be directly modified (and it is never
- * copied).
- *
- * The returned rte may reuse the (possibly cached, cloned) rta, or
- * (if rta was modified) contains a modified uncached rta, which
- * uses parts allocated from @tmp_pool and parts shared from original
- * rta. There is one exception - if @rte is rw but contains a cached
- * rta and that is modified, rta in returned rte is also cached.
- *
- * Ownership of cached rtas is consistent with rte, i.e.
- * if a new rte is returned, it has its own clone of cached rta
- * (and cached rta of read-only source rte is intact), if rte is
- * modified in place, old cached rta is possibly freed.
+ * If @rte->attrs is cached, the returned rte allocates a new rta on
+ * tmp_pool, otherwise the filters may modify it.
  */
 enum filter_return
-f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags)
+f_run(const struct filter *filter, struct rte *rte, struct linpool *tmp_pool, int flags)
 {
   if (filter == FILTER_ACCEPT)
     return F_ACCEPT;
@@ -276,7 +245,6 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
   if (filter == FILTER_REJECT)
     return F_REJECT;
 
-  int rte_cow = ((*rte)->flags & REF_COW);
   DBG( "Running filter `%s'...", filter->name );
 
   /* Initialize the filter state */
@@ -293,32 +261,6 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
   /* Run the interpreter itself */
   enum filter_return fret = interpret(&filter_state, filter->root, NULL);
 
-  if (filter_state.old_rta) {
-    /*
-     * Cached rta was modified and filter_state->rte contains now an uncached one,
-     * sharing some part with the cached one. The cached rta should
-     * be freed (if rte was originally COW, filter_state->old_rta is a clone
-     * obtained during rte_cow()).
-     *
-     * This also implements the exception mentioned in f_run()
-     * description. The reason for this is that rta reuses parts of
-     * filter_state->old_rta, and these may be freed during rta_free(filter_state->old_rta).
-     * This is not the problem if rte was COW, because original rte
-     * also holds the same rta.
-     */
-    if (!rte_cow) {
-      /* Cache the new attrs */
-      (*filter_state.rte)->attrs = rta_lookup((*filter_state.rte)->attrs);
-
-      /* Drop cached ea_list pointer */
-      filter_state.eattrs = NULL;
-    }
-
-    /* Uncache the old attrs and drop the pointer as it is invalid now. */
-    rta_free(filter_state.old_rta);
-    filter_state.old_rta = NULL;
-  }
-
   /* Process the filter output, log it and return */
   if (fret < F_ACCEPT) {
     if (!(filter_state.flags & FF_SILENT))
@@ -343,7 +285,7 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
  */
 
 enum filter_return
-f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool)
+f_eval_rte(const struct f_line *expr, struct rte *rte, struct linpool *tmp_pool)
 {
   filter_state = (struct filter_state) {
     .rte = rte,
@@ -354,8 +296,7 @@ f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool
 
   LOG_BUFFER_INIT(filter_state.buf);
 
-  ASSERT(!((*rte)->flags & REF_COW));
-  ASSERT(!rta_is_cached((*rte)->attrs));
+  ASSERT(!rta_is_cached(rte->attrs));
 
   return interpret(&filter_state, expr, NULL);
 }
diff --git a/filter/filter.h b/filter/filter.h
index 26c1037b..9964831c 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -51,8 +51,8 @@ struct filter {
 
 struct rte;
 
-enum filter_return f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags);
-enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool);
+enum filter_return f_run(const struct filter *filter, struct rte *rte, struct linpool *tmp_pool, int flags);
+enum filter_return f_eval_rte(const struct f_line *expr, struct rte *rte, struct linpool *tmp_pool);
 uint f_eval_int(const struct f_line *expr);
 enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf);
 
diff --git a/nest/protocol.h b/nest/protocol.h
index e05dd7ec..80b4509b 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -211,9 +211,9 @@ struct proto {
 
   void (*if_notify)(struct proto *, unsigned flags, struct iface *i);
   void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
-  void (*rt_notify)(struct proto *, struct channel *, struct network *net, struct rte *new, struct rte *old);
+  void (*rt_notify)(struct proto *, struct channel *, const net_addr *net, struct rte *new, const struct rte *old);
   void (*neigh_notify)(struct neighbor *neigh);
-  int (*preexport)(struct proto *, struct rte *rt);
+  int (*preexport)(struct channel *, struct rte *rt);
   void (*reload_routes)(struct channel *);
   void (*feed_begin)(struct channel *, int initial);
   void (*feed_end)(struct channel *);
@@ -232,7 +232,7 @@ struct proto {
   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
-  struct rte * (*rte_modify)(struct rte *, struct linpool *);
+  struct rte *(*rte_modify)(struct rte *, struct linpool *);
   void (*rte_insert)(struct network *, struct rte *);
   void (*rte_remove)(struct network *, struct rte *);
   u32 (*rte_igp_metric)(struct rte *);
@@ -542,7 +542,7 @@ struct channel {
   struct rtable *in_table;		/* Internal table for received routes */
   struct event *reload_event;		/* Event responsible for reloading from in_table */
   struct fib_iterator reload_fit;	/* FIB iterator in in_table used during reloading */
-  struct rte *reload_next_rte;		/* Route iterator in in_table used during reloading */
+  struct rte_storage *reload_next_rte;	/* Route iterator in in_table used during reloading */
   u8 reload_active;			/* Iterator reload_fit is linked */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
@@ -632,18 +632,4 @@ void *channel_config_new(const struct channel_class *cc, const char *name, uint
 void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 int channel_reconfigure(struct channel *c, struct channel_config *cf);
 
-
-/* Moved from route.h to avoid dependency conflicts */
-static inline void rte_update(struct proto *p, const net_addr *n, rte *new) { rte_update2(p->main_channel, n, new, p->main_source); }
-
-static inline void
-rte_update3(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
-{
-  if (c->in_table && !rte_update_in(c, n, new, src))
-    return;
-
-  rte_update2(c, n, new, src);
-}
-
-
 #endif
diff --git a/nest/route.h b/nest/route.h
index bb23152b..ade14857 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -157,6 +157,7 @@ typedef struct rtable {
   resource r;
   node n;				/* Node in list of all tables */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
+  struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
   char *name;				/* Name of this table */
   list channels;			/* List of attached channels (struct channel) */
@@ -202,7 +203,7 @@ struct rt_subscription {
 #define NHU_DIRTY	3
 
 typedef struct network {
-  struct rte *routes;			/* Available routes for this network */
+  struct rte_storage *routes;			/* Available routes for this network */
   struct fib_node n;			/* FIB flags reserved for kernel syncer */
 } net;
 
@@ -234,18 +235,24 @@ struct hostentry {
 };
 
 typedef struct rte {
-  struct rte *next;
-  net *net;				/* Network this RTE belongs to */
+  struct rta *attrs;			/* Attributes of this route */
+  const net_addr *net;			/* Network this RTE belongs to */
   struct rte_src *src;			/* Route source that created the route */
   struct channel *sender;		/* Channel used to send the route to the routing table */
-  struct rta *attrs;			/* Attributes of this route */
+  btime lastmod;			/* Last modified (set by table) */
   u32 id;				/* Table specific route id */
-  byte flags;				/* Flags (REF_...) */
+  byte flags;				/* Table-specific flags */
   byte pflags;				/* Protocol-specific flags */
-  btime lastmod;			/* Last modified */
 } rte;
 
-#define REF_COW		1		/* Copy this rte on write */
+struct rte_storage {
+  struct rte_storage *next;		/* Next in chain */
+  struct rte rte;			/* Route data */
+};
+
+#define RTE_COPY(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
+#define RTE_OR_NULL(r)	((r) ? &((r)->rte) : NULL)
+
 #define REF_FILTERED	2		/* Route is rejected by import filter */
 #define REF_STALE	4		/* Route is stale in a refresh cycle */
 #define REF_DISCARD	8		/* Route is scheduled for discard */
@@ -271,6 +278,40 @@ static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED);
 #define RIC_REJECT	-1		/* Rejected by protocol */
 #define RIC_DROP	-2		/* Silently dropped by protocol */
 
+/**
+ * rte_update - enter a new update to a routing table
+ * @c: channel doing the update
+ * @net: network address
+ * @rte: a &rte representing the new route
+ * @src: old route source identifier
+ *
+ * This function imports a new route to the appropriate table (via the channel).
+ * Table keys are @net (obligatory) and @rte->attrs->src.
+ * Both the @net and @rte pointers can be local.
+ *
+ * The route attributes (@rte->attrs) are obligatory. They can be also allocated
+ * locally. Anyway, if you use an already-cached attribute object, you shall
+ * call rta_clone() on that object yourself. (This semantics may change in future.)
+ *
+ * If the route attributes are local, you may set @rte->attrs->src to NULL, then
+ * the protocol's default route source will be supplied.
+ *
+ * When rte_update() gets a route, it automatically validates it. This includes
+ * checking for validity of the given network and next hop addresses and also
+ * checking for host-scope or link-scope routes. Then the import filters are
+ * processed and if accepted, the route is passed to route table recalculation.
+ *
+ * The accepted routes are then inserted into the table, replacing the old route
+ * for the same @net identified by @src. Then the route is announced
+ * to all the channels connected to the table using the standard export mechanism.
+ * Setting @rte to NULL makes this a withdraw, otherwise @rte->src must be the same
+ * as @src.
+ *
+ * All memory used for temporary allocations is taken from a special linpool
+ * @rte_update_pool and freed when rte_update() finishes.
+ */
+void rte_update(struct channel *c, const net_addr *net, struct rte *rte, struct rte_src *src);
+
 extern list routing_tables;
 struct config;
 
@@ -286,34 +327,27 @@ static inline void rt_shutdown(rtable *r) { rfree(r->rp); }
 
 static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
 static inline net *net_find_valid(rtable *tab, const net_addr *addr)
-{ net *n = net_find(tab, addr); return (n && rte_is_valid(n->routes)) ? n : NULL; }
+{ net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
 static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
-rte *rte_find(net *net, struct rte_src *src);
-rte *rte_get_temp(struct rta *, struct rte_src *src);
-void rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
-/* rte_update() moved to protocol.h to avoid dependency conflicts */
-int rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter);
-rte *rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int silent);
+int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
+rte *rt_export_merged(struct channel *c, net *net, linpool *pool, int silent);
 void rt_refresh_begin(rtable *t, struct channel *c);
 void rt_refresh_end(rtable *t, struct channel *c);
 void rt_modify_stale(rtable *t, struct channel *c);
 void rt_schedule_prune(rtable *t);
-void rte_dump(rte *);
-void rte_free(rte *);
-rte *rte_do_cow(rte *);
-static inline rte * rte_cow(rte *r) { return (r->flags & REF_COW) ? rte_do_cow(r) : r; }
-rte *rte_cow_rta(rte *r, linpool *lp);
+void rte_dump(struct rte_storage *);
+void rte_free(struct rte_storage *, rtable *);
+struct rte_storage *rte_store(const rte *, net *net, rtable *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 int rt_feed_channel(struct channel *c);
 void rt_feed_channel_abort(struct channel *c);
-int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 int rt_reload_channel(struct channel *c);
 void rt_reload_channel_abort(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, rte **old_exported, int refeed);
+int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, struct rte_storage **old_exported, int refeed);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
 
@@ -634,7 +668,7 @@ void rta_dump(rta *);
 void rta_dump_all(void);
 void rta_show(struct cli *, rta *);
 
-u32 rt_get_igp_metric(rte *rt);
+u32 rt_get_igp_metric(rte *);
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);
 
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index e2e65926..5d1e57b3 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -67,13 +67,10 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
 
       /* Use iface ID as local source ID */
       struct rte_src *src = rt_get_source(P, ad->iface->index);
-      rte_update2(c, net, NULL, src);
+      rte_update(c, net, NULL, src);
     }
   else if (flags & IF_CHANGE_UP)
     {
-      rta *a;
-      rte *e;
-
       DBG("dev_if_notify: %s:%I going up\n", ad->iface->name, ad->ip);
 
       if (cf->check_link && !(ad->iface->flags & IF_LINK_UP))
@@ -90,10 +87,12 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
 	.nh.iface = ad->iface,
       };
 
-      a = rta_lookup(&a0);
-      e = rte_get_temp(a, src);
-      e->pflags = 0;
-      rte_update2(c, net, e, src);
+      rte e0 = {
+	.attrs = rta_lookup(&a0),
+	.src = src,
+      };
+
+      rte_update(c, net, &e0, src);
     }
 }
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 99f29691..ae5000f5 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -101,7 +101,6 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 static void
 rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 {
-  rte *e, *ee;
   byte ia[NET_MAX_TEXT_LENGTH+1];
   struct channel *ec = d->tab->export_channel;
 
@@ -114,9 +113,9 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 
   bsnprintf(ia, sizeof(ia), "%N", n->n.addr);
 
-  for (e = n->routes; e; e = e->next)
+  for (struct rte_storage *er = n->routes; er; er = er->next)
     {
-      if (rte_is_filtered(e) != d->filtered)
+      if (rte_is_filtered(&er->rte) != d->filtered)
 	continue;
 
       d->rt_counter++;
@@ -126,7 +125,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       if (pass)
 	continue;
 
-      ee = e;
+      struct rte e = er->rte;
 
       /* Export channel is down, do not try to export routes to it */
       if (ec && (ec->export_state == ES_DOWN))
@@ -134,7 +133,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 
       if (d->export_mode == RSEM_EXPORTED)
         {
-	  if (!bmap_test(&ec->export_map, ee->id))
+	  if (!bmap_test(&ec->export_map, e.id))
 	    goto skip;
 
 	  // if (ec->ra_mode != RA_ANY)
@@ -143,17 +142,17 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       else if ((d->export_mode == RSEM_EXPORT) && (ec->ra_mode == RA_MERGED))
 	{
 	  /* Special case for merged export */
-	  rte *rt_free;
-	  e = rt_export_merged(ec, n, &rt_free, c->show_pool, 1);
 	  pass = 1;
-
-	  if (!e)
-	  { e = ee; goto skip; }
+	  rte *em = rt_export_merged(ec, n, c->show_pool, 1);
+	  if (em)
+	    e = *em;
+	  else
+	    goto skip;
 	}
       else if (d->export_mode)
 	{
 	  struct proto *ep = ec->proto;
-	  int ic = ep->preexport ? ep->preexport(ep, e) : 0;
+	  int ic = ep->preexport ? ep->preexport(ec, &e) : 0;
 
 	  if (ec->ra_mode == RA_OPTIMAL || ec->ra_mode == RA_MERGED)
 	    pass = 1;
@@ -179,24 +178,19 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	    }
 	}
 
-      if (d->show_protocol && (d->show_protocol != e->src->proto))
+      if (d->show_protocol && (d->show_protocol != e.src->proto))
 	goto skip;
 
       if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT)
 	goto skip;
 
       if (d->stats < 2)
-	rt_show_rte(c, ia, e, d, (e->net->routes == ee));
+	rt_show_rte(c, ia, &e, d, (n->routes == er));
 
       d->show_counter++;
       ia[0] = 0;
 
     skip:
-      if (e != ee)
-      {
-	rte_free(e);
-	e = ee;
-      }
       lp_flush(c->show_pool);
 
       if (d->primary_only)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 468624ff..ee69d7c4 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -47,7 +47,6 @@
 
 pool *rt_table_pool;
 
-static slab *rte_slab;
 static linpool *rte_update_pool;
 
 list routing_tables;
@@ -171,7 +170,7 @@ net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
       net_addr_roa4 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa4(roa, &n) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa4(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -203,7 +202,7 @@ net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
       net_addr_roa6 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa6(roa, &n) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa6(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -252,106 +251,53 @@ net_roa_check(rtable *tab, const net_addr *n, u32 asn)
  * @net: network node
  * @src: route source
  *
- * The rte_find() function returns a route for destination @net
- * which is from route source @src.
+ * The rte_find() function returns a pointer to a route for destination @net
+ * which is from route source @src. List end pointer is returned if no route is found.
  */
-rte *
+static struct rte_storage **
 rte_find(net *net, struct rte_src *src)
 {
-  rte *e = net->routes;
+  struct rte_storage **e = &net->routes;
+
+  while ((*e) && (*e)->rte.src != src)
+    e = &(*e)->next;
 
-  while (e && e->src != src)
-    e = e->next;
   return e;
 }
 
-/**
- * rte_get_temp - get a temporary &rte
- * @a: attributes to assign to the new route (a &rta; in case it's
- * un-cached, rte_update() will create a cached copy automatically)
- *
- * Create a temporary &rte and bind it with the attributes @a.
- * Also set route preference to the default preference set for
- * the protocol.
- */
-rte *
-rte_get_temp(rta *a, struct rte_src *src)
-{
-  rte *e = sl_alloc(rte_slab);
 
-  e->attrs = a;
-  e->id = 0;
-  e->flags = 0;
-  rt_lock_source(e->src = src);
+struct rte_storage *
+rte_store(const rte *r, net *net, rtable *tab)
+{
+  struct rte_storage *e = sl_alloc(tab->rte_slab);
+
+  e->rte = *r;
+  e->rte.net = net->n.addr;
+
+  rt_lock_source(e->rte.src);
+
+  if (e->rte.attrs->cached)
+    e->rte.attrs = rta_clone(e->rte.attrs);
+  else
+    e->rte.attrs = rta_lookup(e->rte.attrs);
+
   return e;
 }
 
-rte *
-rte_do_cow(rte *r)
-{
-  rte *e = sl_alloc(rte_slab);
-
-  memcpy(e, r, sizeof(rte));
-
-  rt_lock_source(e->src);
-  e->attrs = rta_clone(r->attrs);
-  e->flags = 0;
-  return e;
-}
-
-/**
- * rte_cow_rta - get a private writable copy of &rte with writable &rta
- * @r: a route entry to be copied
- * @lp: a linpool from which to allocate &rta
- *
- * rte_cow_rta() takes a &rte and prepares it and associated &rta for
- * modification. There are three possibilities: First, both &rte and &rta are
- * private copies, in that case they are returned unchanged.  Second, &rte is
- * private copy, but &rta is cached, in that case &rta is duplicated using
- * rta_do_cow(). Third, both &rte is shared and &rta is cached, in that case
- * both structures are duplicated by rte_do_cow() and rta_do_cow().
- *
- * Note that in the second case, cached &rta loses one reference, while private
- * copy created by rta_do_cow() is a shallow copy sharing indirect data (eattrs,
- * nexthops, ...) with it. To work properly, original shared &rta should have
- * another reference during the life of created private copy.
- *
- * Result: a pointer to the new writable &rte with writable &rta.
- */
-rte *
-rte_cow_rta(rte *r, linpool *lp)
-{
-  if (!rta_is_cached(r->attrs))
-    return r;
-
-  r = rte_cow(r);
-  rta *a = rta_do_cow(r->attrs, lp);
-  rta_free(r->attrs);
-  r->attrs = a;
-  return r;
-}
-
 /**
  * rte_free - delete a &rte
- * @e: &rte to be deleted
+ * @e: &struct rte_storage to be deleted
+ * @tab: the table which the rte belongs to
  *
  * rte_free() deletes the given &rte from the routing table it's linked to.
  */
-void
-rte_free(rte *e)
-{
-  rt_unlock_source(e->src);
-  if (rta_is_cached(e->attrs))
-    rta_free(e->attrs);
-  sl_free(rte_slab, e);
-}
 
-static inline void
-rte_free_quick(rte *e)
+void
+rte_free(struct rte_storage *e, rtable *tab)
 {
-  rt_unlock_source(e->src);
-  rta_free(e->attrs);
-  sl_free(rte_slab, e);
+  rt_unlock_source(e->rte.src);
+  rta_free(e->rte.attrs);
+  sl_free(tab->rte_slab, e);
 }
 
 static int				/* Actually better or at least as good as */
@@ -406,7 +352,7 @@ static void
 rte_trace(struct channel *c, rte *e, int dir, char *msg)
 {
   log(L_TRACE "%s.%s %c %s %N %uL %uG %s",
-      c->proto->name, c->name ?: "?", dir, msg, e->net->n.addr, e->src->private_id, e->src->global_id,
+      c->proto->name, c->name ?: "?", dir, msg, e->net, e->src->private_id, e->src->global_id,
       rta_dest_name(e->attrs->dest));
 }
 
@@ -425,18 +371,14 @@ rte_trace_out(uint flag, struct channel *c, rte *e, char *msg)
 }
 
 static rte *
-export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int silent)
+export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 {
   struct proto *p = c->proto;
   const struct filter *filter = c->out_filter;
   struct proto_stats *stats = &c->stats;
-  rte *rt;
   int v;
 
-  rt = rt0;
-  *rt_free = NULL;
-
-  v = p->preexport ? p->preexport(p, rt) : 0;
+  v = p->preexport ? p->preexport(c, rt) : 0;
   if (v < 0)
     {
       if (silent)
@@ -455,7 +397,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
     }
 
   v = filter && ((filter == FILTER_REJECT) ||
-		 (f_run(filter, &rt, pool,
+		 (f_run(filter, rt, pool,
 			(silent ? FF_SILENT : 0)) > F_ACCEPT));
   if (v)
     {
@@ -468,25 +410,21 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
     }
 
  accept:
-  if (rt != rt0)
-    *rt_free = rt;
   return rt;
 
  reject:
   /* Discard temporary rte */
-  if (rt != rt0)
-    rte_free(rt);
   return NULL;
 }
 
 static inline rte *
-export_filter(struct channel *c, rte *rt0, rte **rt_free, int silent)
+export_filter(struct channel *c, rte *rt, int silent)
 {
-  return export_filter_(c, rt0, rt_free, rte_update_pool, silent);
+  return export_filter_(c, rt, rte_update_pool, silent);
 }
 
 static void
-do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
+do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
 {
   struct proto *p = c->proto;
   struct proto_stats *stats = &c->stats;
@@ -510,14 +448,12 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
   }
 
   /* Apply export table */
-  struct rte *old_exported = NULL;
+  struct rte_storage *old_exported = NULL;
   if (c->out_table)
   {
-    if (!rte_update_out(c, net->n.addr, new, old, &old_exported, refeed))
+    if (!rte_update_out(c, net, new, old, &old_exported, refeed))
       return;
   }
-  else if (c->out_filter == FILTER_ACCEPT)
-    old_exported = old;
 
   if (new)
     stats->exp_updates_accepted++;
@@ -546,25 +482,22 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
       rte_trace_out(D_ROUTES, c, old, "removed");
   }
 
-  p->rt_notify(p, c, net, new, old);
+  p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
 
   if (c->out_table && old_exported)
-    rte_free_quick(old_exported);
+    rte_free(old_exported, c->out_table);
 }
 
 static void
-rt_notify_basic(struct channel *c, net *net, rte *new, rte *old, int refeed)
+rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
 {
-  // struct proto *p = c->proto;
-  rte *new_free = NULL;
-
   if (new)
     c->stats.exp_updates_received++;
   else
     c->stats.exp_withdraws_received++;
 
   if (new)
-    new = export_filter(c, new, &new_free, 0);
+    new = export_filter(c, new, 0);
 
   if (old && !bmap_test(&c->export_map, old->id))
     old = NULL;
@@ -573,19 +506,15 @@ rt_notify_basic(struct channel *c, net *net, rte *new, rte *old, int refeed)
     return;
 
   do_rt_notify(c, net, new, old, refeed);
-
-  /* Discard temporary rte */
-  if (new_free)
-    rte_free(new_free);
 }
 
 static void
 rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_changed, int refeed)
 {
   // struct proto *p = c->proto;
+  rte nb0;
   rte *new_best = NULL;
   rte *old_best = NULL;
-  rte *new_free = NULL;
   int new_first = 0;
 
   /*
@@ -614,16 +543,16 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
     old_best = old_changed;
   else
   {
-    for (rte *r = net->routes; rte_is_valid(r); r = r->next)
+    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
     {
-      if (bmap_test(&c->export_map, r->id))
+      if (bmap_test(&c->export_map, r->rte.id))
       {
-	old_best = r;
+	old_best = &r->rte;
 	break;
       }
 
       /* Note if new_changed found before old_best */
-      if (r == new_changed)
+      if (&r->rte == new_changed)
 	new_first = 1;
     }
   }
@@ -632,14 +561,14 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
   if ((new_changed == old_changed) || (old_best == old_changed))
   {
     /* Feed or old_best changed -> find first accepted by filters */
-    for (rte *r = net->routes; rte_is_valid(r); r = r->next)
-      if (new_best = export_filter(c, r, &new_free, 0))
+    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
+      if (new_best = export_filter(c, ((nb0 = r->rte), &nb0), 0))
 	break;
   }
   else
   {
     /* Other cases -> either new_changed, or old_best (and nothing changed) */
-    if (new_first && (new_changed = export_filter(c, new_changed, &new_free, 0)))
+    if (new_first && (new_changed = export_filter(c, new_changed, 0)))
       new_best = new_changed;
     else
       return;
@@ -648,11 +577,7 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
   if (!new_best && !old_best)
     return;
 
-  do_rt_notify(c, net, new_best, old_best, refeed);
-
-  /* Discard temporary rte */
-  if (new_free)
-    rte_free(new_free);
+  do_rt_notify(c, net->n.addr, new_best, old_best, refeed);
 }
 
 
@@ -663,38 +588,35 @@ nexthop_merge_rta(struct nexthop *nhs, rta *a, linpool *pool, int max)
 }
 
 rte *
-rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int silent)
+rt_export_merged(struct channel *c, net *net, linpool *pool, int silent)
 {
   // struct proto *p = c->proto;
   struct nexthop *nhs = NULL;
-  rte *best0, *best, *rt0, *rt, *tmp;
+  _Thread_local static rte rme;
+  struct rte_storage *best0 = net->routes;
+  rte *best;
 
-  best0 = net->routes;
-  *rt_free = NULL;
-
-  if (!rte_is_valid(best0))
+  if (!best0 || !rte_is_valid(&best0->rte))
     return NULL;
 
-  best = export_filter_(c, best0, rt_free, pool, silent);
+  best = export_filter_(c, ((rme = best0->rte), &rme), pool, silent);
 
   if (!best || !rte_is_reachable(best))
     return best;
 
-  for (rt0 = best0->next; rt0; rt0 = rt0->next)
+  for (struct rte_storage *rt0 = best0->next; rt0; rt0 = rt0->next)
   {
-    if (!rte_mergable(best0, rt0))
+    if (!rte_mergable(best, &rt0->rte))
       continue;
 
-    rt = export_filter_(c, rt0, &tmp, pool, 1);
+    rte rnh = rt0->rte;
+    rte *rt = export_filter_(c, &rnh, pool, 1);
 
     if (!rt)
       continue;
 
     if (rte_is_reachable(rt))
       nhs = nexthop_merge_rta(nhs, rt->attrs, pool, c->merge_limit);
-
-    if (tmp)
-      rte_free(tmp);
   }
 
   if (nhs)
@@ -703,14 +625,11 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
 
     if (nhs->next)
     {
-      best = rte_cow_rta(best, pool);
+      best->attrs = rta_cow(best->attrs, pool);
       nexthop_link(best->attrs, nhs);
     }
   }
 
-  if (best != best0)
-    *rt_free = best;
-
   return best;
 }
 
@@ -719,9 +638,6 @@ static void
 rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed,
 		 rte *new_best, rte *old_best, int refeed)
 {
-  // struct proto *p = c->proto;
-  rte *new_free = NULL;
-
   /* We assume that all rte arguments are either NULL or rte_is_valid() */
 
   /* This check should be done by the caller */
@@ -742,7 +658,7 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
 
   /* Prepare new merged route */
   if (new_best)
-    new_best = rt_export_merged(c, net, &new_free, rte_update_pool, 0);
+    new_best = rt_export_merged(c, net, rte_update_pool, 0);
 
   /* Check old merged route */
   if (old_best && !bmap_test(&c->export_map, old_best->id))
@@ -751,11 +667,7 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
   if (!new_best && !old_best)
     return;
 
-  do_rt_notify(c, net, new_best, old_best, refeed);
-
-  /* Discard temporary rte */
-  if (new_free)
-    rte_free(new_free);
+  do_rt_notify(c, net->n.addr, new_best, old_best, refeed);
 }
 
 
@@ -799,19 +711,19 @@ rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(rtable *tab, uint type, net *net, rte *new, rte *old,
-	     rte *new_best, rte *old_best)
+rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct rte_storage *old,
+	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
-  if (!rte_is_valid(new))
+  if (!new || !rte_is_valid(&new->rte))
     new = NULL;
 
-  if (!rte_is_valid(old))
+  if (!old || !rte_is_valid(&old->rte))
     old = NULL;
 
-  if (!rte_is_valid(new_best))
+  if (!new_best || !rte_is_valid(&new_best->rte))
     new_best = NULL;
 
-  if (!rte_is_valid(old_best))
+  if (!old_best || !rte_is_valid(&old_best->rte))
     old_best = NULL;
 
   if (!new && !old && !new_best && !old_best)
@@ -820,9 +732,9 @@ rte_announce(rtable *tab, uint type, net *net, rte *new, rte *old,
   if (new_best != old_best)
   {
     if (new_best)
-      new_best->sender->stats.pref_routes++;
+      new_best->rte.sender->stats.pref_routes++;
     if (old_best)
-      old_best->sender->stats.pref_routes--;
+      old_best->rte.sender->stats.pref_routes--;
 
     if (tab->hostcache)
       rt_notify_hostcache(tab, net);
@@ -839,24 +751,25 @@ rte_announce(rtable *tab, uint type, net *net, rte *new, rte *old,
     if (type && (type != c->ra_mode))
       continue;
 
+    rte n0;
     switch (c->ra_mode)
     {
     case RA_OPTIMAL:
       if (new_best != old_best)
-	rt_notify_basic(c, net, new_best, old_best, 0);
+	rt_notify_basic(c, net->n.addr, RTE_COPY(new_best, &n0), RTE_OR_NULL(old_best), 0);
       break;
 
     case RA_ANY:
       if (new != old)
-	rt_notify_basic(c, net, new, old, 0);
+	rt_notify_basic(c, net->n.addr, RTE_COPY(new, &n0), RTE_OR_NULL(old), 0);
       break;
 
     case RA_ACCEPTED:
-      rt_notify_accepted(c, net, new, old, 0);
+      rt_notify_accepted(c, net, RTE_OR_NULL(new), RTE_OR_NULL(old), 0);
       break;
 
     case RA_MERGED:
-      rt_notify_merged(c, net, new, old, new_best, old_best, 0);
+      rt_notify_merged(c, net, RTE_OR_NULL(new), RTE_OR_NULL(old), RTE_OR_NULL(new_best), RTE_OR_NULL(old_best), 0);
       break;
     }
   }
@@ -866,36 +779,36 @@ static inline int
 rte_validate(rte *e)
 {
   int c;
-  net *n = e->net;
+  const net_addr *n = e->net;
 
-  if (!net_validate(n->n.addr))
+  if (!net_validate(n))
   {
     log(L_WARN "Ignoring bogus prefix %N received via %s",
-	n->n.addr, e->sender->proto->name);
+	n, e->sender->proto->name);
     return 0;
   }
 
   /* FIXME: better handling different nettypes */
-  c = !net_is_flow(n->n.addr) ?
-    net_classify(n->n.addr): (IADDR_HOST | SCOPE_UNIVERSE);
+  c = !net_is_flow(n) ?
+    net_classify(n): (IADDR_HOST | SCOPE_UNIVERSE);
   if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
   {
     log(L_WARN "Ignoring bogus route %N received via %s",
-	n->n.addr, e->sender->proto->name);
+	n, e->sender->proto->name);
     return 0;
   }
 
-  if (net_type_match(n->n.addr, NB_DEST) == !e->attrs->dest)
+  if (net_type_match(n, NB_DEST) == !e->attrs->dest)
   {
     log(L_WARN "Ignoring route %N with invalid dest %d received via %s",
-	n->n.addr, e->attrs->dest, e->sender->proto->name);
+	n, e->attrs->dest, e->sender->proto->name);
     return 0;
   }
 
   if ((e->attrs->dest == RTD_UNICAST) && !nexthop_is_sorted(&(e->attrs->nh)))
   {
     log(L_WARN "Ignoring unsorted multipath route %N received via %s",
-	n->n.addr, e->sender->proto->name);
+	n, e->sender->proto->name);
     return 0;
   }
 
@@ -922,16 +835,17 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   struct rtable *table = c->table;
   struct proto_stats *stats = &c->stats;
   static struct tbf rl_pipe = TBF_DEFAULT_LOG_LIMITS;
-  rte *before_old = NULL;
-  rte *old_best = net->routes;
+  struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
+  rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
-  rte **k;
 
-  k = &net->routes;			/* Find and remove original route from the same protocol */
-  while (old = *k)
+  /* Find and remove original route from the same protocol */
+  struct rte_storage **before_old = rte_find(net, src);
+
+  if (*before_old)
     {
-      if (old->src == src)
-	{
+      old = &(old_stored = (*before_old))->rte;
+
 	  /* If there is the same route in the routing table but from
 	   * a different sender, then there are two paths from the
 	   * source protocol to this routing table through transparent
@@ -944,11 +858,8 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	  if (old->sender->proto != p)
 	    {
 	      if (new)
-		{
 		  log_rl(&rl_pipe, L_ERR "Pipe collision detected when sending %N to table %s",
 		      net->n.addr, table->name);
-		  rte_free_quick(new);
-		}
 	      return;
 	    }
 
@@ -964,23 +875,13 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 		  rte_trace_in(D_ROUTES, c, new, "ignored");
 		}
 
-	      rte_free_quick(new);
 	      return;
 	    }
-	  *k = old->next;
+
+	  *before_old = (*before_old)->next;
 	  table->rt_count--;
-	  break;
-	}
-      k = &old->next;
-      before_old = old;
     }
 
-  /* Save the last accessed position */
-  rte **pos = k;
-
-  if (!old)
-    before_old = NULL;
-
   if (!old && !new)
     {
       stats->imp_withdraws_ignored++;
@@ -1005,7 +906,6 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 
 	  stats->imp_updates_ignored++;
 	  rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-	  rte_free_quick(new);
 	  return;
 	}
     }
@@ -1031,7 +931,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	  if (c->in_keep_filtered)
 	    new->flags |= REF_FILTERED;
 	  else
-	    { rte_free_quick(new); new = NULL; }
+	    new = NULL;
 
 	  /* Note that old && !new could be possible when
 	     c->in_keep_filtered changed in the recent past. */
@@ -1054,7 +954,8 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   if (old_ok || new_ok)
     table->last_rt_change = current_time();
 
- skip_stats1:
+ skip_stats1:;
+  struct rte_storage *new_stored = new ? rte_store(new, net, table) : NULL;
 
   if (new)
     rte_is_filtered(new) ? stats->filt_routes++ : stats->imp_routes++;
@@ -1064,19 +965,20 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   if (table->config->sorted)
     {
       /* If routes are sorted, just insert new route to appropriate position */
-      if (new)
+      if (new_stored)
 	{
-	  if (before_old && !rte_better(new, before_old))
-	    k = &before_old->next;
+	  struct rte_storage **k;
+	  if ((before_old != &net->routes) && !rte_better(new, &SKIP_BACK(struct rte_storage, next, before_old)->rte))
+	    k = before_old;
 	  else
 	    k = &net->routes;
 
 	  for (; *k; k=&(*k)->next)
-	    if (rte_better(new, *k))
+	    if (rte_better(new, &(*k)->rte))
 	      break;
 
-	  new->next = *k;
-	  *k = new;
+	  new_stored->next = *k;
+	  *k = new_stored;
 
 	  table->rt_count++;
 	}
@@ -1086,16 +988,17 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
       /* If routes are not sorted, find the best route and move it on
 	 the first position. There are several optimized cases. */
 
-      if (src->proto->rte_recalculate && src->proto->rte_recalculate(table, net, new, old, old_best))
+      if (src->proto->rte_recalculate &&
+	  src->proto->rte_recalculate(table, net, new_stored ? &new_stored->rte : NULL, old, old_best))
 	goto do_recalculate;
 
-      if (new && rte_better(new, old_best))
+      if (new_stored && rte_better(&new_stored->rte, old_best))
 	{
 	  /* The first case - the new route is cleary optimal,
 	     we link it at the first position */
 
-	  new->next = net->routes;
-	  net->routes = new;
+	  new_stored->next = net->routes;
+	  net->routes = new_stored;
 
 	  table->rt_count++;
 	}
@@ -1109,10 +1012,10 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 
 	do_recalculate:
 	  /* Add the new route to the list */
-	  if (new)
+	  if (new_stored)
 	    {
-	      new->next = *pos;
-	      *pos = new;
+	      new_stored->next = *before_old;
+	      *before_old = new_stored;
 
 	      table->rt_count++;
 	    }
@@ -1120,56 +1023,56 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	  /* Find a new optimal route (if there is any) */
 	  if (net->routes)
 	    {
-	      rte **bp = &net->routes;
-	      for (k=&(*bp)->next; *k; k=&(*k)->next)
-		if (rte_better(*k, *bp))
+	      struct rte_storage **bp = &net->routes;
+	      for (struct rte_storage **k=&(*bp)->next; *k; k=&(*k)->next)
+		if (rte_better(&(*k)->rte, &(*bp)->rte))
 		  bp = k;
 
 	      /* And relink it */
-	      rte *best = *bp;
+	      struct rte_storage *best = *bp;
 	      *bp = best->next;
 	      best->next = net->routes;
 	      net->routes = best;
 	    }
 	}
-      else if (new)
+      else if (new_stored)
 	{
 	  /* The third case - the new route is not better than the old
 	     best route (therefore old_best != NULL) and the old best
 	     route was not removed (therefore old_best == net->routes).
 	     We just link the new route to the old/last position. */
 
-	  new->next = *pos;
-	  *pos = new;
+	  new_stored->next = *before_old;
+	  *before_old = new_stored;
 
 	  table->rt_count++;
 	}
       /* The fourth (empty) case - suboptimal route was removed, nothing to do */
     }
 
-  if (new)
+  if (new_stored)
     {
-      new->lastmod = current_time();
+      new_stored->rte.lastmod = current_time();
 
       if (!old)
         {
-	  new->id = hmap_first_zero(&table->id_map);
-	  hmap_set(&table->id_map, new->id);
+	  new_stored->rte.id = hmap_first_zero(&table->id_map);
+	  hmap_set(&table->id_map, new_stored->rte.id);
 	}
       else
-	new->id = old->id;
+	new_stored->rte.id = old->id;
     }
 
   /* Log the route change */
   if ((c->debug & D_ROUTES) || (p->debug & D_ROUTES))
     {
       if (new_ok)
-	rte_trace(c, new, '>', new == net->routes ? "added [best]" : "added");
+	rte_trace(c, &new_stored->rte, '>', new_stored == net->routes ? "added [best]" : "added");
       else if (old_ok)
 	{
 	  if (old != old_best)
 	    rte_trace(c, old, '>', "removed");
-	  else if (rte_is_ok(net->routes))
+	  else if (net->routes && rte_is_ok(&net->routes->rte))
 	    rte_trace(c, old, '>', "removed [replaced]");
 	  else
 	    rte_trace(c, old, '>', "removed [sole]");
@@ -1177,7 +1080,8 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
     }
 
   /* Propagate the route change */
-  rte_announce(table, RA_UNDEF, net, new, old, net->routes, old_best);
+  rte_announce(table, RA_UNDEF, net, new_stored, old_stored,
+      net->routes, old_best_stored);
 
   if (!net->routes &&
       (table->gc_counter++ >= table->config->gc_max_ops) &&
@@ -1187,14 +1091,14 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   if (old_ok && p->rte_remove)
     p->rte_remove(net, old);
   if (new_ok && p->rte_insert)
-    p->rte_insert(net, new);
+    p->rte_insert(net, &new_stored->rte);
 
   if (old)
     {
-      if (!new)
+      if (!new_stored)
 	hmap_clear(&table->id_map, old->id);
 
-      rte_free_quick(old);
+      rte_free(old_stored, table);
     }
 }
 
@@ -1213,51 +1117,14 @@ rte_update_unlock(void)
     lp_flush(rte_update_pool);
 }
 
-/**
- * rte_update - enter a new update to a routing table
- * @table: table to be updated
- * @c: channel doing the update
- * @net: network node
- * @p: protocol submitting the update
- * @src: protocol originating the update
- * @new: a &rte representing the new route or %NULL for route removal.
- *
- * This function is called by the routing protocols whenever they discover
- * a new route or wish to update/remove an existing route. The right announcement
- * sequence is to build route attributes first (either un-cached with @aflags set
- * to zero or a cached one using rta_lookup(); in this case please note that
- * you need to increase the use count of the attributes yourself by calling
- * rta_clone()), call rte_get_temp() to obtain a temporary &rte, fill in all
- * the appropriate data and finally submit the new &rte by calling rte_update().
- *
- * @src specifies the protocol that originally created the route and the meaning
- * of protocol-dependent data of @new. If @new is not %NULL, @src have to be the
- * same value as @new->attrs->proto. @p specifies the protocol that called
- * rte_update(). In most cases it is the same protocol as @src. rte_update()
- * stores @p in @new->sender;
- *
- * When rte_update() gets any route, it automatically validates it (checks,
- * whether the network and next hop address are valid IP addresses and also
- * whether a normal routing protocol doesn't try to smuggle a host or link
- * scope route to the table), converts all protocol dependent attributes stored
- * in the &rte to temporary extended attributes, consults import filters of the
- * protocol to see if the route should be accepted and/or its attributes modified,
- * stores the temporary attributes back to the &rte.
- *
- * Now, having a "public" version of the route, we
- * automatically find any old route defined by the protocol @src
- * for network @n, replace it by the new one (or removing it if @new is %NULL),
- * recalculate the optimal route for this destination and finally broadcast
- * the change (if any) to all routing protocols by calling rte_announce().
- *
- * All memory used for attribute lists and other temporary allocations is taken
- * from a special linear pool @rte_update_pool and freed when rte_update()
- * finishes.
- */
+static int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 
 void
-rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
+rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
+  if (c->in_table && !rte_update_in(c, n, new, src))
+    return;
+
   // struct proto *p = c->proto;
   struct proto_stats *stats = &c->stats;
   const struct filter *filter = c->in_filter;
@@ -1268,12 +1135,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   rte_update_lock();
   if (new)
     {
-      /* Create a temporary table node */
-      nn = alloca(sizeof(net) + n->length);
-      memset(nn, 0, sizeof(net) + n->length);
-      net_copy(nn->n.addr, n);
-
-      new->net = nn;
+      new->net = n;
       new->sender = c;
 
       stats->imp_updates_received++;
@@ -1297,7 +1159,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	}
       else if (filter)
 	{
-	  int fr = f_run(filter, &new, rte_update_pool, 0);
+	  int fr = f_run(filter, new, rte_update_pool, 0);
 	  if (fr > F_ACCEPT)
 	  {
 	    stats->imp_updates_filtered++;
@@ -1309,13 +1171,10 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	    new->flags |= REF_FILTERED;
 	  }
 	}
-      if (!rta_is_cached(new->attrs)) /* Need to copy attributes */
-	new->attrs = rta_lookup(new->attrs);
-      new->flags |= REF_COW;
 
       /* Use the actual struct network, not the dummy one */
       nn = net_get(c->table, n);
-      new->net = nn;
+      new->net = nn->n.addr;
     }
   else
     {
@@ -1337,7 +1196,6 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   return;
 
  drop:
-  rte_free(new);
   new = NULL;
   if (nn = net_find(c->table, n))
     goto recalc;
@@ -1348,8 +1206,8 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 /* Independent call to rte_announce(), used from next hop
    recalculation, outside of rte_update(). new must be non-NULL */
 static inline void
-rte_announce_i(rtable *tab, uint type, net *net, rte *new, rte *old,
-	       rte *new_best, rte *old_best)
+rte_announce_i(rtable *tab, uint type, net *net, struct rte_storage *new, struct rte_storage *old,
+	       struct rte_storage *new_best, struct rte_storage *old_best)
 {
   rte_update_lock();
   rte_announce(tab, type, net, new, old, new_best, old_best);
@@ -1357,16 +1215,16 @@ rte_announce_i(rtable *tab, uint type, net *net, rte *new, rte *old,
 }
 
 static inline void
-rte_discard(rte *old)	/* Non-filtered route deletion, used during garbage collection */
+rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garbage collection */
 {
   rte_update_lock();
-  rte_recalculate(old->sender, old->net, NULL, old->src);
+  rte_recalculate(old->sender, net, NULL, old->src);
   rte_update_unlock();
 }
 
 /* Modify existing route by protocol hook, used for long-lived graceful restart */
 static inline void
-rte_modify(rte *old)
+rte_modify(net *net, rte *old)
 {
   rte_update_lock();
 
@@ -1374,13 +1232,9 @@ rte_modify(rte *old)
   if (new != old)
   {
     if (new)
-    {
-      if (!rta_is_cached(new->attrs))
-	new->attrs = rta_lookup(new->attrs);
-      new->flags = (old->flags & ~REF_MODIFY) | REF_COW;
-    }
+      new->flags = old->flags & ~REF_MODIFY;
 
-    rte_recalculate(old->sender, old->net, new, old->src);
+    rte_recalculate(old->sender, net, new, old->src);
   }
 
   rte_update_unlock();
@@ -1388,25 +1242,25 @@ rte_modify(rte *old)
 
 /* Check rtable for best route to given net whether it would be exported do p */
 int
-rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
+rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
 {
   net *n = net_find(t, a);
-  rte *rt = n ? n->routes : NULL;
 
-  if (!rte_is_valid(rt))
+  if (!n || !n->routes)
+    return 0;
+
+  rte rt = n->routes->rte;
+
+  if (!rte_is_valid(&rt))
     return 0;
 
   rte_update_lock();
 
   /* Rest is stripped down export_filter() */
-  int v = p->preexport ? p->preexport(p, rt) : 0;
+  int v = c->proto->preexport ? c->proto->preexport(c, &rt) : 0;
   if (v == RIC_PROCESS)
     v = (f_run(filter, &rt, rte_update_pool, FF_SILENT) <= F_ACCEPT);
 
-  /* Discard temporary rte */
-  if (rt != n->routes)
-    rte_free(rt);
-
   rte_update_unlock();
 
   return v > 0;
@@ -1432,10 +1286,9 @@ rt_refresh_begin(rtable *t, struct channel *c)
 {
   FIB_WALK(&t->fib, net, n)
     {
-      rte *e;
-      for (e = n->routes; e; e = e->next)
-	if (e->sender == c)
-	  e->flags |= REF_STALE;
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if (e->rte.sender == c)
+	  e->rte.flags |= REF_STALE;
     }
   FIB_WALK_END;
 }
@@ -1455,11 +1308,10 @@ rt_refresh_end(rtable *t, struct channel *c)
 
   FIB_WALK(&t->fib, net, n)
     {
-      rte *e;
-      for (e = n->routes; e; e = e->next)
-	if ((e->sender == c) && (e->flags & REF_STALE))
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if ((e->rte.sender == c) && (e->rte.flags & REF_STALE))
 	  {
-	    e->flags |= REF_DISCARD;
+	    e->rte.flags |= REF_DISCARD;
 	    prune = 1;
 	  }
     }
@@ -1476,11 +1328,10 @@ rt_modify_stale(rtable *t, struct channel *c)
 
   FIB_WALK(&t->fib, net, n)
     {
-      rte *e;
-      for (e = n->routes; e; e = e->next)
-	if ((e->sender == c) && (e->flags & REF_STALE) && !(e->flags & REF_FILTERED))
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if ((e->rte.sender == c) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
 	  {
-	    e->flags |= REF_MODIFY;
+	    e->rte.flags |= REF_MODIFY;
 	    prune = 1;
 	  }
     }
@@ -1497,12 +1348,11 @@ rt_modify_stale(rtable *t, struct channel *c)
  * This functions dumps contents of a &rte to debug output.
  */
 void
-rte_dump(rte *e)
+rte_dump(struct rte_storage *e)
 {
-  net *n = e->net;
-  debug("%-1N ", n->n.addr);
-  debug("PF=%02x ", e->pflags);
-  rta_dump(e->attrs);
+  debug("%-1N ", e->rte.net);
+  debug("PF=%02x ", e->rte.pflags);
+  rta_dump(e->rte.attrs);
   debug("\n");
 }
 
@@ -1521,8 +1371,7 @@ rt_dump(rtable *t)
 #endif
   FIB_WALK(&t->fib, net, n)
     {
-      rte *e;
-      for(e=n->routes; e; e=e->next)
+      for(struct rte_storage *e=n->routes; e; e=e->next)
 	rte_dump(e);
     }
   FIB_WALK_END;
@@ -1725,6 +1574,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   rtable *t = ralloc(p, &rt_class);
   t->rp = p;
 
+  t->rte_slab = sl_new(p, sizeof(struct rte_storage));
+
   t->name = cf->name;
   t->config = cf;
   t->addr_type = cf->addr_type;
@@ -1758,7 +1609,6 @@ rt_init(void)
   rta_init();
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
-  rte_slab = sl_new(rt_table_pool, sizeof(rte));
   init_list(&routing_tables);
 }
 
@@ -1808,12 +1658,10 @@ rt_prune_table(rtable *tab)
 again:
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
-      rte *e;
-
     rescan:
-      for (e=n->routes; e; e=e->next)
+      for (struct rte_storage *e=n->routes; e; e=e->next)
       {
-	if (e->sender->flush_active || (e->flags & REF_DISCARD))
+	if (e->rte.sender->flush_active || (e->rte.flags & REF_DISCARD))
 	  {
 	    if (limit <= 0)
 	      {
@@ -1822,13 +1670,13 @@ again:
 		return;
 	      }
 
-	    rte_discard(e);
+	    rte_discard(n, &e->rte);
 	    limit--;
 
 	    goto rescan;
 	  }
 
-	if (e->flags & REF_MODIFY)
+	if (e->rte.flags & REF_MODIFY)
 	  {
 	    if (limit <= 0)
 	      {
@@ -1837,7 +1685,7 @@ again:
 		return;
 	      }
 
-	    rte_modify(e);
+	    rte_modify(n, &e->rte);
 	    limit--;
 
 	    goto rescan;
@@ -2001,8 +1849,8 @@ no_nexthop:
     }
 }
 
-static inline rte *
-rt_next_hop_update_rte(rtable *tab UNUSED, rte *old)
+static inline struct rte_storage *
+rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
 {
   rta *a = alloca(RTA_MAX_SIZE);
   memcpy(a, old->attrs, rta_size(old->attrs));
@@ -2013,18 +1861,16 @@ rt_next_hop_update_rte(rtable *tab UNUSED, rte *old)
   rta_apply_hostentry(a, old->attrs->hostentry, &mls);
   a->cached = 0;
 
-  rte *e = sl_alloc(rte_slab);
-  memcpy(e, old, sizeof(rte));
-  e->attrs = rta_lookup(a);
-  rt_lock_source(e->src);
+  rte e0 = *old;
+  e0.attrs = a;
 
-  return e;
+  return rte_store(&e0, n, tab);
 }
 
 static inline int
 rt_next_hop_update_net(rtable *tab, net *n)
 {
-  rte **k, *e, *new, *old_best, **new_best;
+  struct rte_storage **k, *e, *new, *old_best, **new_best;
   int count = 0;
   int free_old_best = 0;
 
@@ -2033,21 +1879,22 @@ rt_next_hop_update_net(rtable *tab, net *n)
     return 0;
 
   for (k = &n->routes; e = *k; k = &e->next)
-    if (rta_next_hop_outdated(e->attrs))
+    if (rta_next_hop_outdated(e->rte.attrs))
       {
-	new = rt_next_hop_update_rte(tab, e);
+	new = rt_next_hop_update_rte(tab, n, &e->rte);
+	new->next = e->next;
 	*k = new;
 
-	rte_trace_in(D_ROUTES, new->sender, new, "updated");
+	rte_trace_in(D_ROUTES, new->rte.sender, &new->rte, "updated");
 	rte_announce_i(tab, RA_ANY, n, new, e, NULL, NULL);
 
 	/* Call a pre-comparison hook */
 	/* Not really an efficient way to compute this */
-	if (e->src->proto->rte_recalculate)
-	  e->src->proto->rte_recalculate(tab, n, new, e, NULL);
+	if (e->rte.src->proto->rte_recalculate)
+	  e->rte.src->proto->rte_recalculate(tab, n, &new->rte, &e->rte, NULL);
 
 	if (e != old_best)
-	  rte_free_quick(e);
+	  rte_free(e, tab);
 	else /* Freeing of the old best rte is postponed */
 	  free_old_best = 1;
 
@@ -2062,7 +1909,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
   new_best = NULL;
   for (k = &n->routes; e = *k; k = &e->next)
     {
-      if (!new_best || rte_better(e, *new_best))
+      if (!new_best || rte_better(&e->rte, &(*new_best)->rte))
 	new_best = k;
     }
 
@@ -2077,13 +1924,13 @@ rt_next_hop_update_net(rtable *tab, net *n)
 
   /* Announce the new best route */
   if (new != old_best)
-    rte_trace_in(D_ROUTES, new->sender, new, "updated [best]");
+    rte_trace_in(D_ROUTES, new->rte.sender, &new->rte, "updated [best]");
 
   /* Propagate changes */
   rte_announce_i(tab, RA_UNDEF, n, NULL, NULL, n->routes, old_best);
 
   if (free_old_best)
-    rte_free_quick(old_best);
+    rte_free(old_best, tab);
 
   return count;
 }
@@ -2262,7 +2109,10 @@ do_feed_channel(struct channel *c, net *n, rte *e)
   else if (c->ra_mode == RA_MERGED)
     rt_notify_merged(c, n, NULL, NULL, e, e, c->refeeding);
   else /* RA_BASIC */
-    rt_notify_basic(c, n, e, e, c->refeeding);
+  {
+    rte e0 = *e;
+    rt_notify_basic(c, n->n.addr, &e0, &e0, c->refeeding);
+  }
   rte_update_unlock();
 }
 
@@ -2291,7 +2141,7 @@ rt_feed_channel(struct channel *c)
 
   FIB_ITERATE_START(&c->table->fib, fit, net, n)
     {
-      rte *e = n->routes;
+      struct rte_storage *e = n->routes;
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
@@ -2301,13 +2151,13 @@ rt_feed_channel(struct channel *c)
       if ((c->ra_mode == RA_OPTIMAL) ||
 	  (c->ra_mode == RA_ACCEPTED) ||
 	  (c->ra_mode == RA_MERGED))
-	if (rte_is_valid(e))
+	if (e && rte_is_valid(&e->rte))
 	  {
 	    /* In the meantime, the protocol may fell down */
 	    if (c->export_state != ES_FEEDING)
 	      goto done;
 
-	    do_feed_channel(c, n, e);
+	    do_feed_channel(c, n, &e->rte);
 	    max_feed--;
 	  }
 
@@ -2318,10 +2168,10 @@ rt_feed_channel(struct channel *c)
 	    if (c->export_state != ES_FEEDING)
 	      goto done;
 
-	    if (!rte_is_valid(e))
+	    if (!rte_is_valid(&e->rte))
 	      continue;
 
-	    do_feed_channel(c, n, e);
+	    do_feed_channel(c, n, &e->rte);
 	    max_feed--;
 	  }
     }
@@ -2355,20 +2205,14 @@ rt_feed_channel_abort(struct channel *c)
  *	Import table
  */
 
-int
+static int
 rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   struct rtable *tab = c->in_table;
-  rte *old, **pos;
   net *net;
 
   if (new)
-  {
     net = net_get(tab, n);
-
-    if (!rta_is_cached(new->attrs))
-      new->attrs = rta_lookup(new->attrs);
-  }
   else
   {
     net = net_find(tab, n);
@@ -2378,9 +2222,10 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
   }
 
   /* Find the old rte */
-  for (pos = &net->routes; old = *pos; pos = &old->next)
-    if (old->src == src)
+  struct rte_storage **pos = rte_find(net, src);
+  if (*pos)
     {
+      rte *old = &(*pos)->rte;
       if (new && rte_same(old, new))
       {
 	/* Refresh the old rte, continue with update to main rtable */
@@ -2394,22 +2239,20 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
       }
 
       /* Move iterator if needed */
-      if (old == c->reload_next_rte)
-	c->reload_next_rte = old->next;
+      if (*pos == c->reload_next_rte)
+	c->reload_next_rte = (*pos)->next;
 
       /* Remove the old rte */
-      *pos = old->next;
-      rte_free_quick(old);
+      struct rte_storage *del = *pos;
+      *pos = (*pos)->next;
+      rte_free(del, tab);
       tab->rt_count--;
-
-      break;
     }
+  else if (!new)
+    goto drop_withdraw;
 
   if (!new)
   {
-    if (!old)
-      goto drop_withdraw;
-
     if (!net->routes)
       fib_delete(&tab->fib, net);
 
@@ -2417,7 +2260,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
   }
 
   struct channel_limit *l = &c->rx_limit;
-  if (l->action && !old)
+  if (l->action && !*pos)
   {
     if (tab->rt_count >= l->limit)
       channel_notify_limit(c, l, PLD_RX, tab->rt_count);
@@ -2425,7 +2268,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
     if (l->state == PLS_BLOCKED)
     {
       /* Required by rte_trace_in() */
-      new->net = net;
+      new->net = n;
 
       rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
       goto drop_update;
@@ -2433,11 +2276,9 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
   }
 
   /* Insert the new rte */
-  rte *e = rte_do_cow(new);
-  e->flags |= REF_COW;
-  e->net = net;
-  e->sender = c;
-  e->lastmod = current_time();
+  struct rte_storage *e = rte_store(new, net, tab);
+  e->rte.sender = c;
+  e->rte.lastmod = current_time();
   e->next = *pos;
   *pos = e;
   tab->rt_count++;
@@ -2446,7 +2287,6 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 drop_update:
   c->stats.imp_updates_received++;
   c->stats.imp_updates_ignored++;
-  rte_free(new);
 
   if (!net->routes)
     fib_delete(&tab->fib, net);
@@ -2475,7 +2315,7 @@ rt_reload_channel(struct channel *c)
   }
 
   do {
-    for (rte *e = c->reload_next_rte; e; e = e->next)
+    for (struct rte_storage *e = c->reload_next_rte; e; e = e->next)
     {
       if (max_feed-- <= 0)
       {
@@ -2484,7 +2324,8 @@ rt_reload_channel(struct channel *c)
 	return 0;
       }
 
-      rte_update2(c, e->net->n.addr, rte_do_cow(e), e->src);
+      rte r = e->rte;
+      rte_update(c, r.net, &r, r.src);
     }
 
     c->reload_next_rte = NULL;
@@ -2527,14 +2368,14 @@ rt_prune_sync(rtable *t, int all)
 again:
   FIB_ITERATE_START(&t->fib, &fit, net, n)
   {
-    rte *e, **ee = &n->routes;
+    struct rte_storage *e, **ee = &n->routes;
 
     while (e = *ee)
     {
-      if (all || (e->flags & (REF_STALE | REF_DISCARD)))
+      if (all || (e->rte.flags & (REF_STALE | REF_DISCARD)))
       {
 	*ee = e->next;
-	rte_free_quick(e);
+	rte_free(e, t);
 	t->rt_count--;
       }
       else
@@ -2557,20 +2398,16 @@ again:
  */
 
 int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **old_exported, int refeed)
+rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct rte_storage **old_exported, int refeed)
 {
   struct rtable *tab = c->out_table;
   struct rte_src *src;
-  rte *old, **pos;
   net *net;
 
   if (new)
   {
     net = net_get(tab, n);
     src = new->src;
-
-    if (!rta_is_cached(new->attrs))
-      new->attrs = rta_lookup(new->attrs);
   }
   else
   {
@@ -2582,30 +2419,19 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **
   }
 
   /* Find the old rte */
-  for (pos = &net->routes; old = *pos; pos = &old->next)
-    if ((c->ra_mode != RA_ANY) || (old->src == src))
-    {
-      if (new && rte_same(old, new))
-      {
-	/* REF_STALE / REF_DISCARD not used in export table */
-	/*
-	if (old->flags & (REF_STALE | REF_DISCARD | REF_MODIFY))
-	{
-	  old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
-	  return 1;
-	}
-	*/
+  struct rte_storage **pos = (c->ra_mode == RA_ANY) ? rte_find(net, src) : &net->routes;
+  struct rte_storage *old = NULL;
 
-	goto drop_update;
-      }
+  if (old = *pos)
+  {
+    if (new && rte_same(&(*pos)->rte, new))
+      goto drop_update;
 
-      /* Remove the old rte */
-      *pos = old->next;
-      *old_exported = old;
-      tab->rt_count--;
-
-      break;
-    }
+    /* Remove the old rte */
+    *pos = old->next;
+    *old_exported = old;
+    tab->rt_count--;
+  }
 
   if (!new)
   {
@@ -2619,11 +2445,8 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **
   }
 
   /* Insert the new rte */
-  rte *e = rte_do_cow(new);
-  e->flags |= REF_COW;
-  e->net = net;
-  e->sender = c;
-  e->lastmod = current_time();
+  struct rte_storage *e = rte_store(new, net, tab);
+  e->rte.lastmod = current_time();
   e->next = *pos;
   *pos = e;
   tab->rt_count++;
@@ -2835,8 +2658,8 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
   net *n = net_route(tab, &he_addr);
   if (n)
     {
-      rte *e = n->routes;
-      rta *a = e->attrs;
+      struct rte_storage *e = n->routes;
+      rta *a = e->rte.attrs;
       pxlen = n->n.addr->pxlen;
 
       if (a->hostentry)
@@ -2867,7 +2690,7 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
       he->src = rta_clone(a);
       he->dest = a->dest;
       he->nexthop_linkable = !direct;
-      he->igp_metric = rt_get_igp_metric(e);
+      he->igp_metric = rt_get_igp_metric(&e->rte);
     }
 
 done:
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 07213c8c..03c85b7d 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -681,11 +681,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     if (!neigh_find(&p->p, r->next_hop, r->neigh->ifa->iface, 0))
       a0.nh.flags = RNF_ONLINK;
 
-    rta *a = rta_lookup(&a0);
-    rte *rte = rte_get_temp(a, p->p.main_source);
+    rte e0 = {
+      .attrs = &a0,
+      .src = p->p.main_source,
+    };
 
     e->unreachable = 0;
-    rte_update2(c, e->n.addr, rte, p->p.main_source);
+    rte_update(c, e->n.addr, &e0, p->p.main_source);
   }
   else if (e->valid && (e->router_id != p->router_id))
   {
@@ -697,18 +699,19 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       .pref = 1,
     };
 
-    rta *a = rta_lookup(&a0);
-    rte *rte = rte_get_temp(a, p->p.main_source);
-    rte->pflags = 0;
+    rte e0 = {
+      .attrs = &a0,
+      .src = p->p.main_source,
+    };
 
     e->unreachable = 1;
-    rte_update2(c, e->n.addr, rte, p->p.main_source);
+    rte_update(c, e->n.addr, &e0, p->p.main_source);
   }
   else
   {
     /* Retraction */
     e->unreachable = 0;
-    rte_update2(c, e->n.addr, NULL, p->p.main_source);
+    rte_update(c, e->n.addr, NULL, p->p.main_source);
   }
 }
 
@@ -718,7 +721,7 @@ babel_announce_retraction(struct babel_proto *p, struct babel_entry *e)
 {
   struct channel *c = (e->n.addr->type == NET_IP4) ? p->ip4_channel : p->ip6_channel;
   e->unreachable = 0;
-  rte_update2(c, e->n.addr, NULL, p->p.main_source);
+  rte_update(c, e->n.addr, NULL, p->p.main_source);
 }
 
 
@@ -2257,11 +2260,11 @@ babel_kick_timer(struct babel_proto *p)
 
 
 static int
-babel_preexport(struct proto *P, struct rte *new)
+babel_preexport(struct channel *c, struct rte *new)
 {
   struct rta *a = new->attrs;
   /* Reject our own unreachable routes */
-  if ((a->dest == RTD_UNREACHABLE) && (new->src->proto == P))
+  if ((a->dest == RTD_UNREACHABLE) && (new->src->proto == c->proto))
     return -1;
 
   return 0;
@@ -2272,8 +2275,8 @@ babel_preexport(struct proto *P, struct rte *new)
  * so store it into our data structures.
  */
 static void
-babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
-		struct rte *new, struct rte *old UNUSED)
+babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
+		struct rte *new, const struct rte *old UNUSED)
 {
   struct babel_proto *p = (void *) P;
   struct babel_entry *e;
@@ -2301,11 +2304,11 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
     if (rt_metric > BABEL_INFINITY)
     {
       log(L_WARN "%s: Invalid babel_metric value %u for route %N",
-	  p->p.name, rt_metric, net->n.addr);
+	  p->p.name, rt_metric, net);
       rt_metric = BABEL_INFINITY;
     }
 
-    e = babel_get_entry(p, net->n.addr);
+    e = babel_get_entry(p, net);
 
     /* Activate triggered updates */
     if ((e->valid != BABEL_ENTRY_VALID) ||
@@ -2323,7 +2326,7 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
   else
   {
     /* Withdraw */
-    e = babel_find_entry(p, net->n.addr);
+    e = babel_find_entry(p, net);
 
     if (!e || e->valid != BABEL_ENTRY_VALID)
       return;
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 0ed2623e..90490b4f 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -333,26 +333,26 @@ bgp_aigp_set_metric(struct linpool *pool, const struct adata *ad, u64 metric)
 }
 
 int
-bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
+bgp_total_aigp_metric_(struct rta *a, u64 *metric, const struct adata **ad)
 {
-  eattr *a = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AIGP));
-  if (!a)
+  eattr *ea = ea_find(a->eattrs, EA_CODE(PROTOCOL_BGP, BA_AIGP));
+  if (!ea)
     return 0;
 
-  const byte *b = bgp_aigp_get_tlv(a->u.ptr, BGP_AIGP_METRIC);
+  const byte *b = bgp_aigp_get_tlv(ea->u.ptr, BGP_AIGP_METRIC);
   if (!b)
     return 0;
 
   u64 aigp = get_u64(b + 3);
-  u64 step = e->attrs->igp_metric;
+  u64 step = a->igp_metric;
 
-  if (!rte_resolvable(e) || (step >= IGP_METRIC_UNKNOWN))
+  if (!rta_resolvable(a) || (step >= IGP_METRIC_UNKNOWN))
     step = BGP_AIGP_MAX;
 
   if (!step)
     step = 1;
 
-  *ad = a->u.ptr;
+  *ad = ea->u.ptr;
   *metric = aigp + step;
   if (*metric < aigp)
     *metric = BGP_AIGP_MAX;
@@ -374,7 +374,7 @@ bgp_init_aigp_metric(rte *e, u64 *metric, const struct adata **ad)
 u32
 bgp_rte_igp_metric(struct rte *rt)
 {
-  u64 metric = bgp_total_aigp_metric(rt);
+  u64 metric = bgp_total_aigp_metric(rt->attrs);
   return (u32) MIN(metric, (u64) IGP_METRIC_UNKNOWN);
 }
 
@@ -903,7 +903,7 @@ bgp_decode_large_community(struct bgp_parse_state *s, uint code UNUSED, uint fla
 static void
 bgp_export_mpls_label_stack(struct bgp_export_state *s, eattr *a)
 {
-  net_addr *n = s->route->net->n.addr;
+  const net_addr *n = s->route->net;
   u32 *labels = (u32 *) a->u.ptr->data;
   uint lnum = a->u.ptr->length / 4;
 
@@ -1624,7 +1624,7 @@ bgp_free_prefix_table(struct bgp_channel *c)
 }
 
 static struct bgp_prefix *
-bgp_get_prefix(struct bgp_channel *c, net_addr *net, u32 path_id)
+bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
 {
   u32 hash = net_hash(net) ^ u32_hash(path_id);
   struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id, hash);
@@ -1668,10 +1668,10 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
  */
 
 int
-bgp_preexport(struct proto *P, rte *e)
+bgp_preexport(struct channel *c, rte *e)
 {
   struct proto *SRC = e->src->proto;
-  struct bgp_proto *p = (struct bgp_proto *) P;
+  struct bgp_proto *p = (struct bgp_proto *) (c->proto);
   struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
 
   /* Reject our routes */
@@ -1696,11 +1696,11 @@ bgp_preexport(struct proto *P, rte *e)
   }
 
   /* Handle well-known communities, RFC 1997 */
-  struct eattr *c;
+  struct eattr *com;
   if (p->cf->interpret_communities &&
-      (c = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY))))
+      (com = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY))))
   {
-    const struct adata *d = c->u.ptr;
+    const struct adata *d = com->u.ptr;
 
     /* Do not export anywhere */
     if (int_set_contains(d, BGP_COMM_NO_ADVERTISE))
@@ -1780,7 +1780,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
   /* AIGP attribute - accumulate local metric or originate new one */
   u64 metric;
   if (s.local_next_hop &&
-      (bgp_total_aigp_metric_(e, &metric, &ad) ||
+      (bgp_total_aigp_metric_(e->attrs, &metric, &ad) ||
        (c->cf->aigp_originate && bgp_init_aigp_metric(e, &metric, &ad))))
   {
     ad = bgp_aigp_set_metric(pool, ad, metric);
@@ -1839,7 +1839,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
 }
 
 void
-bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old)
+bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old)
 {
   struct bgp_proto *p = (void *) P;
   struct bgp_channel *c = (void *) C;
@@ -1863,7 +1863,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old)
     path = old->src->global_id;
   }
 
-  px = bgp_get_prefix(c, n->n.addr, c->add_path_tx ? path : 0);
+  px = bgp_get_prefix(c, n, c->add_path_tx ? path : 0);
   add_tail(&buck->prefixes, &px->buck_node);
 
   bgp_schedule_packet(p->conn, c, PKT_UPDATE);
@@ -1924,8 +1924,8 @@ bgp_rte_better(rte *new, rte *old)
     return 1;
 
   /* RFC 4271 9.1.2.1. Route resolvability test */
-  n = rte_resolvable(new);
-  o = rte_resolvable(old);
+  n = rta_resolvable(new->attrs);
+  o = rta_resolvable(old->attrs);
   if (n > o)
     return 1;
   if (n < o)
@@ -1950,8 +1950,8 @@ bgp_rte_better(rte *new, rte *old)
     return 0;
 
   /* RFC 7311 4.1 - Apply AIGP metric */
-  u64 n2 = bgp_total_aigp_metric(new);
-  u64 o2 = bgp_total_aigp_metric(old);
+  u64 n2 = bgp_total_aigp_metric(new->attrs);
+  u64 o2 = bgp_total_aigp_metric(old->attrs);
   if (n2 < o2)
     return 1;
   if (n2 > o2)
@@ -2066,7 +2066,7 @@ bgp_rte_mergable(rte *pri, rte *sec)
     return 0;
 
   /* RFC 4271 9.1.2.1. Route resolvability test */
-  if (rte_resolvable(pri) != rte_resolvable(sec))
+  if (rta_resolvable(pri->attrs) != rta_resolvable(sec->attrs))
     return 0;
 
   /* Start with local preferences */
@@ -2135,16 +2135,15 @@ same_group(rte *r, u32 lpref, u32 lasn)
 }
 
 static inline int
-use_deterministic_med(rte *r)
+use_deterministic_med(struct rte_storage *r)
 {
-  struct proto *P = r->src->proto;
+  struct proto *P = r->rte.src->proto;
   return (P->proto == &proto_bgp) && ((struct bgp_proto *) P)->cf->deterministic_med;
 }
 
 int
 bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 {
-  rte *r, *s;
   rte *key = new ? new : old;
   u32 lpref = key->attrs->pref;
   u32 lasn = bgp_get_neighbor(key);
@@ -2212,13 +2211,13 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
   }
 
   /* The default case - find a new best-in-group route */
-  r = new; /* new may not be in the list */
-  for (s=net->routes; rte_is_valid(s); s=s->next)
-    if (use_deterministic_med(s) && same_group(s, lpref, lasn))
+  rte *r = new; /* new may not be in the list */
+  for (struct rte_storage *s = net->routes; rte_is_valid(&s->rte); s = s->next)
+    if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
     {
-      s->pflags |= BGP_REF_SUPPRESSED;
-      if (!r || bgp_rte_better(s, r))
-	r = s;
+      s->rte.pflags |= BGP_REF_SUPPRESSED;
+      if (!r || bgp_rte_better(&s->rte, r))
+	r = &s->rte;
     }
 
   /* Simple case - the last route in group disappears */
@@ -2230,10 +2229,10 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     new->pflags &= ~BGP_REF_SUPPRESSED;
 
   /* Found all existing routes mergable with best-in-group */
-  for (s=net->routes; rte_is_valid(s); s=s->next)
-    if (use_deterministic_med(s) && same_group(s, lpref, lasn))
-      if ((s != r) && bgp_rte_mergable(r, s))
-	s->pflags &= ~BGP_REF_SUPPRESSED;
+  for (struct rte_storage *s = net->routes; rte_is_valid(&s->rte); s = s->next)
+    if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
+      if ((&s->rte != r) && bgp_rte_mergable(r, &s->rte))
+	s->rte.pflags &= ~BGP_REF_SUPPRESSED;
 
   /* Found best-in-group */
   r->pflags &= ~BGP_REF_SUPPRESSED;
@@ -2268,12 +2267,12 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     return !old_suppressed;
 }
 
-struct rte *
+rte *
 bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
 {
-  eattr *a = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
-  const struct adata *ad = a ? a->u.ptr : NULL;
-  uint flags = a ? a->flags : BAF_PARTIAL;
+  eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
+  const struct adata *ad = ea ? ea->u.ptr : NULL;
+  uint flags = ea ? ea->flags : BAF_PARTIAL;
 
   if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
     return NULL;
@@ -2281,12 +2280,17 @@ bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
   if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
     return r;
 
-  r = rte_cow_rta(r, pool);
-  bgp_set_attr_ptr(&(r->attrs->eattrs), pool, BA_COMMUNITY, flags,
-		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
-  r->pflags |= BGP_REF_STALE;
+  rta *a = rta_do_cow(r->attrs, pool);
+  
+  _Thread_local static rte e0;
+  e0 = *r;
+  e0.attrs = a;
 
-  return r;
+  bgp_set_attr_ptr(&(a->eattrs), pool, BA_COMMUNITY, flags,
+		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
+  e0.pflags |= BGP_REF_STALE;
+
+  return &e0;
 }
 
 
@@ -2377,14 +2381,14 @@ bgp_get_route_info(rte *e, byte *buf)
   if (rte_stale(e))
     buf += bsprintf(buf, "s");
 
-  u64 metric = bgp_total_aigp_metric(e);
+  u64 metric = bgp_total_aigp_metric(e->attrs);
   if (metric < BGP_AIGP_MAX)
   {
     buf += bsprintf(buf, "/%lu", metric);
   }
   else if (e->attrs->igp_metric)
   {
-    if (!rte_resolvable(e))
+    if (!rta_resolvable(e->attrs))
       buf += bsprintf(buf, "/-");
     else if (e->attrs->igp_metric >= IGP_METRIC_UNKNOWN)
       buf += bsprintf(buf, "/?");
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index b770956b..c79dd1b2 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -517,9 +517,9 @@ struct rte_source *bgp_find_source(struct bgp_proto *p, u32 path_id);
 struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id);
 
 static inline int
-rte_resolvable(rte *rt)
+rta_resolvable(rta *a)
 {
-  return rt->attrs->dest == RTD_UNICAST;
+  return a->dest == RTD_UNICAST;
 }
 
 
@@ -587,22 +587,22 @@ int bgp_rte_mergable(rte *pri, rte *sec);
 int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
 struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
 u32 bgp_rte_igp_metric(struct rte *);
-void bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old);
-int bgp_preexport(struct proto *, struct rte *);
+void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
+int bgp_preexport(struct channel *, struct rte *);
 int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
-void bgp_get_route_info(struct rte *, byte *buf);
-int bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad);
+void bgp_get_route_info(struct rte *, byte *);
+int bgp_total_aigp_metric_(rta *a, u64 *metric, const struct adata **ad);
 
 #define BGP_AIGP_METRIC		1
 #define BGP_AIGP_MAX		U64(0xffffffffffffffff)
 
 static inline u64
-bgp_total_aigp_metric(rte *r)
+bgp_total_aigp_metric(rta *a)
 {
   u64 metric = BGP_AIGP_MAX;
   const struct adata *ad;
 
-  bgp_total_aigp_metric_(r, &metric, &ad);
+  bgp_total_aigp_metric_(a, &metric, &ad);
   return metric;
 }
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6bc71623..647551e5 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1349,7 +1349,7 @@ bgp_rte_update(struct bgp_parse_state *s, net_addr *n, u32 path_id, rta *a0)
   if (!a0)
   {
     /* Route withdraw */
-    rte_update3(&s->channel->c, n, NULL, s->last_src);
+    rte_update(&s->channel->c, n, NULL, s->last_src);
     return;
   }
 
@@ -1362,11 +1362,12 @@ bgp_rte_update(struct bgp_parse_state *s, net_addr *n, u32 path_id, rta *a0)
     a0->eattrs = ea;
   }
 
-  rta *a = rta_clone(s->cached_rta);
-  rte *e = rte_get_temp(a, s->last_src);
+  rte e0 = {
+    .attrs = s->cached_rta,
+    .src = s->last_src,
+  };
 
-  e->pflags = 0;
-  rte_update3(&s->channel->c, n, e, s->last_src);
+  rte_update(&s->channel->c, n, &e0, s->last_src);
 }
 
 static void
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index e885611a..03f0d59e 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -460,7 +460,7 @@ mrt_rib_table_entry_bgp_attrs(struct mrt_table_dump_state *s, rte *r)
   return;
 
 fail:
-  mrt_log(s, "Attribute list too long for %N", r->net->n.addr);
+  mrt_log(s, "Attribute list too long for %N", r->net);
 }
 #endif
 
@@ -512,24 +512,21 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
   mrt_init_message(&s->buf, MRT_TABLE_DUMP_V2, subtype);
   mrt_rib_table_header(s, n->n.addr);
 
-  rte *rt, *rt0;
-  for (rt0 = n->routes; rt = rt0; rt0 = rt0->next)
+  for (struct rte_storage *rt, *rt0 = n->routes; rt = rt0; rt0 = rt0->next)
   {
-    if (rte_is_filtered(rt))
+    if (rte_is_filtered(&rt->rte))
       continue;
 
     /* Skip routes that should be reported in the other phase */
-    if (!s->always_add_path && (!rt->src->private_id != !s->add_path))
+    if (!s->always_add_path && (!rt->rte.src->private_id != !s->add_path))
     {
       s->want_add_path = 1;
       continue;
     }
 
-    if (f_run(s->filter, &rt, s->linpool, 0) <= F_ACCEPT)
-      mrt_rib_table_entry(s, rt);
-
-    if (rt != rt0)
-      rte_free(rt);
+    rte e = rt->rte;
+    if (f_run(s->filter, &e, s->linpool, 0) <= F_ACCEPT)
+      mrt_rib_table_entry(s, &e);
 
     lp_flush(s->linpool);
   }
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index f9aa6cd1..22150590 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -107,7 +107,7 @@
 #include <stdlib.h>
 #include "ospf.h"
 
-static int ospf_preexport(struct proto *P, rte *new);
+static int ospf_preexport(struct channel *C, rte *new);
 static void ospf_reload_routes(struct channel *C);
 static int ospf_rte_better(struct rte *new, struct rte *old);
 static u32 ospf_rte_igp_metric(struct rte *rt);
@@ -482,13 +482,13 @@ ospf_disp(timer * timer)
  * import to the filters.
  */
 static int
-ospf_preexport(struct proto *P, rte *e)
+ospf_preexport(struct channel *c, rte *e)
 {
-  struct ospf_proto *p = (struct ospf_proto *) P;
+  struct ospf_proto *p = (struct ospf_proto *) c->proto;
   struct ospf_area *oa = ospf_main_area(p);
 
   /* Reject our own routes */
-  if (e->src->proto == P)
+  if (e->src->proto == c->proto)
     return -1;
 
   /* Do not export routes to stub areas */
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 471bb586..3e208023 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2096,15 +2096,18 @@ again1:
 	  .u.data = nf->n.rid,
 	};
 
-	rta *a = rta_lookup(&a0);
-	rte *e = rte_get_temp(a, p->p.main_source);
-
 	rta_free(nf->old_rta);
-	nf->old_rta = rta_clone(a);
+	nf->old_rta = rta_lookup(&a0);
+
+	rte e0 = {
+	  .attrs = nf->old_rta,
+	  .src = p->p.main_source,
+	};
 
 	DBG("Mod rte type %d - %N via %I on iface %s, met %d\n",
 	    a0.source, nf->fn.addr, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1);
-	rte_update(&p->p, nf->fn.addr, e);
+
+	rte_update(p->p.main_channel, nf->fn.addr, &e0, p->p.main_source);
       }
     }
     else if (nf->old_rta)
@@ -2113,7 +2116,7 @@ again1:
       rta_free(nf->old_rta);
       nf->old_rta = NULL;
 
-      rte_update(&p->p, nf->fn.addr, NULL);
+      rte_update(p->p.main_channel, nf->fn.addr, NULL, p->p.main_source);
     }
 
     /* Remove unused rt entry, some special entries are persistent */
@@ -2129,7 +2132,6 @@ again1:
   }
   FIB_ITERATE_END;
 
-
   WALK_LIST(oa, p->area_list)
   {
     /* Cleanup ASBR hash tables */
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 52c2a0ce..bb88d20a 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -1300,7 +1300,7 @@ find_surrogate_fwaddr(struct ospf_proto *p, struct ospf_area *oa)
 }
 
 void
-ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte *old UNUSED)
+ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *n, rte *new, const rte *old UNUSED)
 {
   struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_area *oa = NULL;	/* non-NULL for NSSA-LSA */
@@ -1319,7 +1319,7 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
 
   if (!new)
   {
-    nf = fib_find(&p->rtf, n->n.addr);
+    nf = fib_find(&p->rtf, n);
 
     if (!nf || !nf->external_rte)
       return;
@@ -1346,14 +1346,14 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   if (m1 > LSINFINITY)
   {
     log(L_WARN "%s: Invalid ospf_metric1 value %u for route %N",
-	p->p.name, m1, n->n.addr);
+	p->p.name, m1, n);
     m1 = LSINFINITY;
   }
 
   if (m2 > LSINFINITY)
   {
     log(L_WARN "%s: Invalid ospf_metric2 value %u for route %N",
-	p->p.name, m2, n->n.addr);
+	p->p.name, m2, n);
     m2 = LSINFINITY;
   }
 
@@ -1377,12 +1377,12 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
     if (ipa_zero(fwd))
     {
       log(L_ERR "%s: Cannot find forwarding address for NSSA-LSA %N",
-	  p->p.name, n->n.addr);
+	  p->p.name, n);
       return;
     }
   }
 
-  nf = fib_get(&p->rtf, n->n.addr);
+  nf = fib_get(&p->rtf, n);
   ospf_originate_ext_lsa(p, oa, nf, LSA_M_EXPORT, metric, ebit, fwd, tag, 1, p->vpn_pe);
   nf->external_rte = 1;
 }
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h
index 535d1f1b..c36d0b50 100644
--- a/proto/ospf/topology.h
+++ b/proto/ospf/topology.h
@@ -200,7 +200,7 @@ void ospf_originate_sum_rt_lsa(struct ospf_proto *p, struct ospf_area *oa, u32 d
 void ospf_originate_ext_lsa(struct ospf_proto *p, struct ospf_area *oa, ort *nf, u8 mode, u32 metric, u32 ebit, ip_addr fwaddr, u32 tag, int pbit, int dn);
 void ospf_originate_gr_lsa(struct ospf_proto *p, struct ospf_iface *ifa);
 
-void ospf_rt_notify(struct proto *P, struct channel *ch, net *n, rte *new, rte *old);
+void ospf_rt_notify(struct proto *P, struct channel *ch, const net_addr *n, rte *new, const rte *old);
 void ospf_update_topology(struct ospf_proto *p);
 
 struct top_hash_entry *ospf_hash_find(struct top_graph *, u32 domain, u32 lsa, u32 rtr, u32 type);
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 52784c14..8b2cb69f 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -160,18 +160,17 @@ perf_loop(void *data)
 
   clock_gettime(CLOCK_MONOTONIC, &ts_generated);
 
-  for (uint i=0; i<N; i++) {
-    rte *e = rte_get_temp(p->data[i].a, p->p.main_source);
-    e->pflags = 0;
-
-    rte_update(P, &(p->data[i].net), e);
+  for (uint i=0; i<N; i++)
+  {
+    rte e0 = { .attrs = p->data[i].a, .src = P->main_source, };
+    rte_update(P->main_channel, &(p->data[i].net), &e0, P->main_source);
   }
 
   clock_gettime(CLOCK_MONOTONIC, &ts_update);
 
   if (!p->keep)
     for (uint i=0; i<N; i++)
-      rte_update(P, &(p->data[i].net), NULL);
+      rte_update(P->main_channel, &(p->data[i].net), NULL, P->main_source);
 
   clock_gettime(CLOCK_MONOTONIC, &ts_withdraw);
 
@@ -204,7 +203,7 @@ perf_loop(void *data)
 }
 
 static void
-perf_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net UNUSED, struct rte *new UNUSED, struct rte *old UNUSED)
+perf_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net UNUSED, struct rte *new UNUSED, const struct rte *old UNUSED)
 {
   struct perf_proto *p = (struct perf_proto *) P;
   p->exp++;
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 97862780..3caa85d0 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -48,14 +48,10 @@
 #endif
 
 static void
-pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *old)
+pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *new, const rte *old)
 {
   struct pipe_proto *p = (void *) P;
   struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri;
-  struct rte_src *src;
-
-  rte *e;
-  rta *a;
 
   if (!new && !old)
     return;
@@ -63,45 +59,39 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
   if (dst->table->pipe_busy)
     {
       log(L_ERR "Pipe loop detected when sending %N to table %s",
-	  n->n.addr, dst->table->name);
+	  n, dst->table->name);
       return;
     }
 
+  src_ch->table->pipe_busy = 1;
+
   if (new)
     {
-      src = new->src;
-
-      a = alloca(rta_size(new->attrs));
+      rta *a = alloca(rta_size(new->attrs));
       memcpy(a, new->attrs, rta_size(new->attrs));
 
       a->cached = 0;
       a->hostentry = NULL;
-      e = rte_get_temp(a, src);
-      e->pflags = new->pflags;
 
-#ifdef CONFIG_BGP
-      /* Hack to cleanup cached value */
-      if (e->src->proto->proto == &proto_bgp)
-	e->pflags &= ~(BGP_REF_STALE | BGP_REF_NOT_STALE);
-#endif
+      rte e0 = {
+	.attrs = a,
+	.src = new->src,
+      };
+
+      rte_update(dst, n, &e0, new->src);
     }
   else
-    {
-      e = NULL;
-      src = old->src;
-    }
+    rte_update(dst, n, NULL, old->src);
 
-  src_ch->table->pipe_busy = 1;
-  rte_update2(dst, n->n.addr, e, src);
   src_ch->table->pipe_busy = 0;
 }
 
 static int
-pipe_preexport(struct proto *P, rte *e)
+pipe_preexport(struct channel *c, rte *e)
 {
   struct proto *pp = e->sender->proto;
 
-  if (pp == P)
+  if (pp == c->proto)
     return -1;	/* Avoid local loops automatically */
 
   return 0;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 540ff2a7..fa228c69 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -385,16 +385,16 @@ radv_trigger_valid(struct radv_config *cf)
 }
 
 static inline int
-radv_net_match_trigger(struct radv_config *cf, net *n)
+radv_net_match_trigger(struct radv_config *cf, const net_addr *n)
 {
-  return radv_trigger_valid(cf) && net_equal(n->n.addr, &cf->trigger);
+  return radv_trigger_valid(cf) && net_equal(n, &cf->trigger);
 }
 
 int
-radv_preexport(struct proto *P, rte *new)
+radv_preexport(struct channel *c, rte *new)
 {
   // struct radv_proto *p = (struct radv_proto *) P;
-  struct radv_config *cf = (struct radv_config *) (P->cf);
+  struct radv_config *cf = (struct radv_config *) (c->proto->cf);
 
   if (radv_net_match_trigger(cf, new->net))
     return RIC_PROCESS;
@@ -406,7 +406,7 @@ radv_preexport(struct proto *P, rte *new)
 }
 
 static void
-radv_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte *old UNUSED)
+radv_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *n, rte *new, const rte *old UNUSED)
 {
   struct radv_proto *p = (struct radv_proto *) P;
   struct radv_config *cf = (struct radv_config *) (P->cf);
@@ -457,14 +457,14 @@ radv_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
 	(preference != RA_PREF_HIGH))
     {
       log(L_WARN "%s: Invalid ra_preference value %u on route %N",
-	  p->p.name, preference, n->n.addr);
+	  p->p.name, preference, n);
       preference = RA_PREF_MEDIUM;
       preference_set = 1;
       lifetime = 0;
       lifetime_set = 1;
     }
 
-    rt = fib_get(&p->routes, n->n.addr);
+    rt = fib_get(&p->routes, n);
 
     /* Ignore update if nothing changed */
     if (rt->valid &&
@@ -487,7 +487,7 @@ radv_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   else
   {
     /* Withdraw */
-    rt = fib_find(&p->routes, n->n.addr);
+    rt = fib_find(&p->routes, n);
 
     if (!rt || !rt->valid)
       return;
@@ -555,7 +555,7 @@ radv_check_active(struct radv_proto *p)
     return 1;
 
   struct channel *c = p->p.main_channel;
-  return rt_examine(c->table, &cf->trigger, &p->p, c->out_filter);
+  return rt_examine(c->table, &cf->trigger, c, c->out_filter);
 }
 
 static void
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index a501a784..0a9844f3 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -207,16 +207,15 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
       .u.data = (uintptr_t) a0.nh.iface,
     };
 
-    rta *a = rta_lookup(&a0);
-    rte *e = rte_get_temp(a, p->p.main_source);
+    rte e0 = {
+      .attrs = &a0,
+      .src = p->p.main_source,
+    };
 
-    rte_update(&p->p, en->n.addr, e);
+    rte_update(p->p.main_channel, en->n.addr, &e0, p->p.main_source);
   }
   else
-  {
-    /* Withdraw */
-    rte_update(&p->p, en->n.addr, NULL);
-  }
+    rte_update(p->p.main_channel, en->n.addr, NULL, p->p.main_source);
 }
 
 /**
@@ -311,8 +310,8 @@ rip_withdraw_rte(struct rip_proto *p, net_addr *n, struct rip_neighbor *from)
  * it into our data structures.
  */
 static void
-rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, struct rte *new,
-	      struct rte *old UNUSED)
+rip_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net, struct rte *new,
+	      const struct rte *old UNUSED)
 {
   struct rip_proto *p = (struct rip_proto *) P;
   struct rip_entry *en;
@@ -328,14 +327,14 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
     if (rt_metric > p->infinity)
     {
       log(L_WARN "%s: Invalid rip_metric value %u for route %N",
-	  p->p.name, rt_metric, net->n.addr);
+	  p->p.name, rt_metric, net);
       rt_metric = p->infinity;
     }
 
     if (rt_tag > 0xffff)
     {
       log(L_WARN "%s: Invalid rip_tag value %u for route %N",
-	  p->p.name, rt_tag, net->n.addr);
+	  p->p.name, rt_tag, net);
       rt_metric = p->infinity;
       rt_tag = 0;
     }
@@ -347,7 +346,7 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
      * collection.
      */
 
-    en = fib_get(&p->rtable, net->n.addr);
+    en = fib_get(&p->rtable, net);
 
     old_metric = en->valid ? en->metric : -1;
 
@@ -361,7 +360,7 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
   else
   {
     /* Withdraw */
-    en = fib_find(&p->rtable, net->n.addr);
+    en = fib_find(&p->rtable, net);
 
     if (!en || en->valid != RIP_ENTRY_VALID)
       return;
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index be3d19ab..72fbc967 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -127,19 +127,16 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
     .dest = RTD_NONE,
   };
 
-  rta *a = rta_lookup(&a0);
-  rte *e = rte_get_temp(a, p->p.main_source);
+  rte e0 = { .attrs = &a0, .src = p->p.main_source, };
 
-  e->pflags = 0;
-
-  rte_update2(channel, &pfxr->n, e, e->src);
+  rte_update(channel, &pfxr->n, &e0, p->p.main_source);
 }
 
 void
 rpki_table_remove_roa(struct rpki_cache *cache, struct channel *channel, const net_addr_union *pfxr)
 {
   struct rpki_proto *p = cache->p;
-  rte_update2(channel, &pfxr->n, NULL, p->p.main_source);
+  rte_update(channel, &pfxr->n, NULL, p->p.main_source);
 }
 
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 6d3871cc..6e258f6f 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -103,24 +103,13 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     return;
 
   /* We skip rta_lookup() here */
-  rte *e = rte_get_temp(a, src);
-  e->pflags = 0;
+  rte e0 = { .attrs = a, .src = src, .net = r->net, }, *e = &e0;
 
+  /* Evaluate the filter */
   if (r->cmds)
-  {
-    /* Create a temporary table node */
-    e->net = alloca(sizeof(net) + r->net->length);
-    memset(e->net, 0, sizeof(net) + r->net->length);
-    net_copy(e->net->n.addr, r->net);
+    f_eval_rte(r->cmds, e, static_lp);
 
-    /* Evaluate the filter */
-    f_eval_rte(r->cmds, &e, static_lp);
-
-    /* Remove the temporary node */
-    e->net = NULL;
-  }
-
-  rte_update2(p->p.main_channel, r->net, e, src);
+  rte_update(p->p.main_channel, r->net, e, src);
   r->state = SRS_CLEAN;
 
   if (r->cmds)
@@ -132,7 +121,7 @@ withdraw:
   if (r->state == SRS_DOWN)
     return;
 
-  rte_update2(p->p.main_channel, r->net, NULL, src);
+  rte_update(p->p.main_channel, r->net, NULL, src);
   r->state = SRS_DOWN;
 }
 
@@ -298,7 +287,7 @@ static void
 static_remove_rte(struct static_proto *p, struct static_route *r)
 {
   if (r->state)
-    rte_update2(p->p.main_channel, r->net, NULL, static_get_source(p, r->index));
+    rte_update(p->p.main_channel, r->net, NULL, static_get_source(p, r->index));
 
   static_reset_rte(p, r);
 }
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 1b0384ce..6f788ac2 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -374,7 +374,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   /* p is NULL iff KRT_SHARED_SOCKET and !scan */
 
   int ipv6;
-  rte *e;
   net *net;
   sockaddr dst, gate, mask;
   ip_addr idst, igate, imask;
@@ -495,7 +494,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   net = net_get(p->p.main_channel->table, &ndst);
 
   rta a = {
-    .src = p->p.main_source,
     .source = RTS_INHERIT,
     .scope = SCOPE_UNIVERSE,
   };
@@ -549,13 +547,12 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
       }
   }
 
- done:
-  e = rte_get_temp(&a);
-  e->net = net;
+ done:;
+  rte e0 = { .attrs = &a, .net = net, };
 
   ea_list *ea = alloca(sizeof(ea_list) + 1 * sizeof(eattr));
-  *ea = (ea_list) { .count = 1, .next = e->attrs->eattrs };
-  e->attrs->eattrs = ea;
+  *ea = (ea_list) { .count = 1, .next = e0.attrs->eattrs };
+  e0.attrs->eattrs = ea;
 
   ea->attrs[0] = (eattr) {
     .id = EA_KRT_SOURCE,
@@ -564,9 +561,9 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   };
 
   if (scan)
-    krt_got_route(p, e, src);
+    krt_got_route(p, &e0, src);
   else
-    krt_got_route_async(p, e, new, src);
+    krt_got_route_async(p, &e0, new, src);
 }
 
 static void
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 4ecd8878..bff2d579 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -105,7 +105,7 @@ struct nl_parse_state
   int scan;
   int merge;
 
-  net *net;
+  net_addr *net;
   rta *attrs;
   struct krt_proto *proto;
   s8 new;
@@ -1233,10 +1233,9 @@ nh_bufsize(struct nexthop *nh)
 }
 
 static int
-nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
+nl_send_route(struct krt_proto *p, const rte *e, int op, int dest, struct nexthop *nh)
 {
   eattr *ea;
-  net *net = e->net;
   rta *a = e->attrs;
   ea_list *eattrs = a->eattrs;
   int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh));
@@ -1251,7 +1250,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   int rsize = sizeof(*r) + bufsize;
   r = alloca(rsize);
 
-  DBG("nl_send_route(%N,op=%x)\n", net->n.addr, op);
+  DBG("nl_send_route(%N,op=%x)\n", e->net, op);
 
   bzero(&r->h, sizeof(r->h));
   bzero(&r->r, sizeof(r->r));
@@ -1260,7 +1259,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   r->h.nlmsg_flags = op | NLM_F_REQUEST | NLM_F_ACK;
 
   r->r.rtm_family = p->af;
-  r->r.rtm_dst_len = net_pxlen(net->n.addr);
+  r->r.rtm_dst_len = net_pxlen(e->net);
   r->r.rtm_protocol = RTPROT_BIRD;
   r->r.rtm_scope = RT_SCOPE_NOWHERE;
 #ifdef HAVE_MPLS_KERNEL
@@ -1272,7 +1271,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
      * 2) Never use RTA_PRIORITY
      */
 
-    u32 label = net_mpls(net->n.addr);
+    u32 label = net_mpls(e->net);
     nl_add_attr_mpls(&r->h, rsize, RTA_DST, 1, &label);
     r->r.rtm_scope = RT_SCOPE_UNIVERSE;
     r->r.rtm_type = RTN_UNICAST;
@@ -1280,12 +1279,12 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   else
 #endif
   {
-    nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(net->n.addr));
+    nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(e->net));
 
     /* Add source address for IPv6 SADR routes */
-    if (net->n.addr->type == NET_IP6_SADR)
+    if (e->net->type == NET_IP6_SADR)
     {
-      net_addr_ip6_sadr *a = (void *) &net->n.addr;
+      net_addr_ip6_sadr *a = (void *) &e->net;
       nl_add_attr_ip6(&r->h, rsize, RTA_SRC, a->src_prefix);
       r->r.rtm_src_len = a->src_pxlen;
     }
@@ -1406,7 +1405,7 @@ nl_add_rte(struct krt_proto *p, rte *e)
 }
 
 static inline int
-nl_delete_rte(struct krt_proto *p, rte *e)
+nl_delete_rte(struct krt_proto *p, const rte *e)
 {
   int err = 0;
 
@@ -1427,7 +1426,7 @@ nl_replace_rte(struct krt_proto *p, rte *e)
 
 
 void
-krt_replace_rte(struct krt_proto *p, net *n UNUSED, rte *new, rte *old)
+krt_replace_rte(struct krt_proto *p, const net_addr *n UNUSED, rte *new, const rte *old)
 {
   int err = 0;
 
@@ -1466,7 +1465,7 @@ krt_replace_rte(struct krt_proto *p, net *n UNUSED, rte *new, rte *old)
 }
 
 static int
-nl_mergable_route(struct nl_parse_state *s, net *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family)
+nl_mergable_route(struct nl_parse_state *s, const net_addr *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family)
 {
   /* Route merging is used for IPv6 scans */
   if (!s->scan || (rtm_family != AF_INET6))
@@ -1486,12 +1485,14 @@ nl_mergable_route(struct nl_parse_state *s, net *net, struct krt_proto *p, uint
 static void
 nl_announce_route(struct nl_parse_state *s)
 {
-  rte *e = rte_get_temp(s->attrs, s->proto->p.main_source);
-  e->net = s->net;
+  rte e0 = {
+    .attrs = s->attrs,
+    .net = s->net,
+  };
 
   ea_list *ea = alloca(sizeof(ea_list) + 2 * sizeof(eattr));
-  *ea = (ea_list) { .count = 2, .next = e->attrs->eattrs };
-  e->attrs->eattrs = ea;
+  *ea = (ea_list) { .count = 2, .next = e0.attrs->eattrs };
+  e0.attrs->eattrs = ea;
 
   ea->attrs[0] = (eattr) {
     .id = EA_KRT_SOURCE,
@@ -1505,9 +1506,9 @@ nl_announce_route(struct nl_parse_state *s)
   };
 
   if (s->scan)
-    krt_got_route(s->proto, e, s->krt_src);
+    krt_got_route(s->proto, &e0, s->krt_src);
   else
-    krt_got_route_async(s->proto, e, s->new, s->krt_src);
+    krt_got_route_async(s->proto, &e0, s->new, s->krt_src);
 
   s->net = NULL;
   s->attrs = NULL;
@@ -1653,16 +1654,14 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       krt_src = KRT_SRC_ALIEN;
     }
 
-  net_addr *n = &dst;
+  net_addr *net = &dst;
   if (p->p.net_type == NET_IP6_SADR)
   {
-    n = alloca(sizeof(net_addr_ip6_sadr));
-    net_fill_ip6_sadr(n, net6_prefix(&dst), net6_pxlen(&dst),
+    net = alloca(sizeof(net_addr_ip6_sadr));
+    net_fill_ip6_sadr(net, net6_prefix(&dst), net6_pxlen(&dst),
 		      net6_prefix(&src), net6_pxlen(&src));
   }
 
-  net *net = net_get(p->p.main_channel->table, n);
-
   if (s->net && !nl_mergable_route(s, net, p, priority, i->rtm_type, i->rtm_family))
     nl_announce_route(s);
 
@@ -1685,7 +1684,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	  struct nexthop *nh = nl_parse_multipath(s, p, a[RTA_MULTIPATH], i->rtm_family);
 	  if (!nh)
 	    {
-	      log(L_ERR "KRT: Received strange multipath route %N", net->n.addr);
+	      log(L_ERR "KRT: Received strange multipath route %N", net);
 	      return;
 	    }
 
@@ -1699,7 +1698,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       ra->nh.iface = if_find_by_index(oif);
       if (!ra->nh.iface)
 	{
-	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", net->n.addr, oif);
+	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", net, oif);
 	  return;
 	}
 
@@ -1726,8 +1725,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 			   (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
 	  if (!nbr || (nbr->scope == SCOPE_HOST))
 	    {
-	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr,
-                  ra->nh.gw);
+	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net, ra->nh.gw);
 	      return;
 	    }
 	}
@@ -1826,7 +1824,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 
       if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0)
         {
-	  log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net->n.addr);
+	  log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net);
 	  return;
 	}
 
@@ -1860,7 +1858,9 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   if (!s->net)
   {
     /* Store the new route */
-    s->net = net;
+    s->net = lp_alloc(s->pool, net->length);
+    net_copy(s->net, net);
+
     s->attrs = ra;
     s->proto = p;
     s->new = new;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 7d7ec7e6..0a746631 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -251,14 +251,14 @@ static inline void
 krt_trace_in(struct krt_proto *p, rte *e, char *msg)
 {
   if (p->p.debug & D_PACKETS)
-    log(L_TRACE "%s: %N: %s", p->p.name, e->net->n.addr, msg);
+    log(L_TRACE "%s: %N: %s", p->p.name, e->net, msg);
 }
 
 static inline void
 krt_trace_in_rl(struct tbf *f, struct krt_proto *p, rte *e, char *msg)
 {
   if (p->p.debug & D_PACKETS)
-    log_rl(f, L_TRACE "%s: %N: %s", p->p.name, e->net->n.addr, msg);
+    log_rl(f, L_TRACE "%s: %N: %s", p->p.name, e->net, msg);
 }
 
 /*
@@ -299,54 +299,56 @@ krt_uptodate(rte *a, rte *b)
 static void
 krt_learn_announce_update(struct krt_proto *p, rte *e)
 {
-  net *n = e->net;
-  rta *aa = rta_clone(e->attrs);
-  rte *ee = rte_get_temp(aa, p->p.main_source);
-  rte_update(&p->p, n->n.addr, ee);
+  rte e0 = {
+    .attrs = rta_clone(e->attrs),
+    .src = p->p.main_source,
+  };
+
+  rte_update(p->p.main_channel, e->net, &e0, p->p.main_source);
 }
 
 static void
-krt_learn_announce_delete(struct krt_proto *p, net *n)
+krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
 {
-  rte_update(&p->p, n->n.addr, NULL);
+  rte_update(p->p.main_channel, n, NULL, p->p.main_source);
 }
 
 /* Called when alien route is discovered during scan */
 static void
 krt_learn_scan(struct krt_proto *p, rte *e)
 {
-  net *n0 = e->net;
-  net *n = net_get(p->krt_table, n0->n.addr);
-  rte *m, **mm;
+  net *n = net_get(p->krt_table, e->net);
+  struct rte_storage *m, **mm;
 
-  e->attrs = rta_lookup(e->attrs);
+  struct rte_storage *ee = rte_store(e, n, p->krt_table);
 
-  for(mm=&n->routes; m = *mm; mm=&m->next)
-    if (krt_same_key(m, e))
+  for(mm = &n->routes; m = *mm; mm = &m->next)
+    if (krt_same_key(&m->rte, e))
       break;
   if (m)
     {
-      if (krt_uptodate(m, e))
+      if (krt_uptodate(&m->rte, e))
 	{
 	  krt_trace_in_rl(&rl_alien, p, e, "[alien] seen");
-	  rte_free(e);
-	  m->pflags |= KRT_REF_SEEN;
+	  rte_free(ee, p->krt_table);
+	  m->rte.pflags |= KRT_REF_SEEN;
 	}
       else
 	{
 	  krt_trace_in(p, e, "[alien] updated");
 	  *mm = m->next;
-	  rte_free(m);
+	  rte_free(m, p->krt_table);
 	  m = NULL;
 	}
     }
   else
     krt_trace_in(p, e, "[alien] created");
+
   if (!m)
     {
-      e->next = n->routes;
-      n->routes = e;
-      e->pflags |= KRT_REF_SEEN;
+      ee->next = n->routes;
+      n->routes = ee;
+      ee->rte.pflags |= KRT_REF_SEEN;
     }
 }
 
@@ -362,7 +364,7 @@ krt_learn_prune(struct krt_proto *p)
 again:
   FIB_ITERATE_START(fib, &fit, net, n)
     {
-      rte *e, **ee, *best, **pbest, *old_best;
+      struct rte_storage *e, **ee, *best, **pbest, *old_best;
 
       /*
        * Note that old_best may be NULL even if there was an old best route in
@@ -376,48 +378,48 @@ again:
       ee = &n->routes;
       while (e = *ee)
 	{
-	  if (e->pflags & KRT_REF_BEST)
+	  if (e->rte.pflags & KRT_REF_BEST)
 	    old_best = e;
 
-	  if (!(e->pflags & KRT_REF_SEEN))
+	  if (!(e->rte.pflags & KRT_REF_SEEN))
 	    {
 	      *ee = e->next;
-	      rte_free(e);
+	      rte_free(e, p->krt_table);
 	      continue;
 	    }
 
-	  if (!best || krt_metric(best) > krt_metric(e))
+	  if (!best || krt_metric(&best->rte) > krt_metric(&e->rte))
 	    {
 	      best = e;
 	      pbest = ee;
 	    }
 
-	  e->pflags &= ~(KRT_REF_SEEN | KRT_REF_BEST);
+	  e->rte.pflags &= ~(KRT_REF_SEEN | KRT_REF_BEST);
 	  ee = &e->next;
 	}
       if (!n->routes)
 	{
 	  DBG("%I/%d: deleting\n", n->n.prefix, n->n.pxlen);
 	  if (old_best)
-	    krt_learn_announce_delete(p, n);
+	    krt_learn_announce_delete(p, n->n.addr);
 
 	  FIB_ITERATE_PUT(&fit);
 	  fib_delete(fib, n);
 	  goto again;
 	}
 
-      best->pflags |= KRT_REF_BEST;
+      best->rte.pflags |= KRT_REF_BEST;
       *pbest = best->next;
       best->next = n->routes;
       n->routes = best;
 
       if ((best != old_best) || p->reload)
 	{
-	  DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(best));
-	  krt_learn_announce_update(p, best);
+	  DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
+	  krt_learn_announce_update(p, &best->rte);
 	}
       else
-	DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(best));
+	DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
     }
   FIB_ITERATE_END;
 
@@ -427,68 +429,67 @@ again:
 static void
 krt_learn_async(struct krt_proto *p, rte *e, int new)
 {
-  net *n0 = e->net;
-  net *n = net_get(p->krt_table, n0->n.addr);
-  rte *g, **gg, *best, **bestp, *old_best;
+  net *n = net_get(p->krt_table, e->net);
+  struct rte_storage *g, **gg, *best, **bestp, *old_best;
 
   ASSERT(!e->attrs->cached);
   e->attrs->pref = p->p.main_channel->preference;
 
-  e->attrs = rta_lookup(e->attrs);
+  struct rte_storage *ee = rte_store(e, n, p->krt_table);
 
   old_best = n->routes;
   for(gg=&n->routes; g = *gg; gg = &g->next)
-    if (krt_same_key(g, e))
+    if (krt_same_key(&g->rte, e))
       break;
   if (new)
     {
       if (g)
 	{
-	  if (krt_uptodate(g, e))
+	  if (krt_uptodate(&g->rte, e))
 	    {
 	      krt_trace_in(p, e, "[alien async] same");
-	      rte_free(e);
+	      rte_free(ee, p->krt_table);
 	      return;
 	    }
 	  krt_trace_in(p, e, "[alien async] updated");
 	  *gg = g->next;
-	  rte_free(g);
+	  rte_free(g, p->krt_table);
 	}
       else
 	krt_trace_in(p, e, "[alien async] created");
 
-      e->next = n->routes;
-      n->routes = e;
+      ee->next = n->routes;
+      n->routes = ee;
     }
   else if (!g)
     {
       krt_trace_in(p, e, "[alien async] delete failed");
-      rte_free(e);
+      rte_free(ee, p->krt_table);
       return;
     }
   else
     {
       krt_trace_in(p, e, "[alien async] removed");
       *gg = g->next;
-      rte_free(e);
-      rte_free(g);
+      rte_free(ee, p->krt_table);
+      rte_free(g, p->krt_table);
     }
   best = n->routes;
   bestp = &n->routes;
   for(gg=&n->routes; g=*gg; gg=&g->next)
   {
-    if (krt_metric(best) > krt_metric(g))
+    if (krt_metric(&best->rte) > krt_metric(&g->rte))
       {
 	best = g;
 	bestp = gg;
       }
 
-    g->pflags &= ~KRT_REF_BEST;
+    g->rte.pflags &= ~KRT_REF_BEST;
   }
 
   if (best)
     {
-      best->pflags |= KRT_REF_BEST;
+      best->rte.pflags |= KRT_REF_BEST;
       *bestp = best->next;
       best->next = n->routes;
       n->routes = best;
@@ -498,9 +499,9 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
     {
       DBG("krt_learn_async: distributing change\n");
       if (best)
-	krt_learn_announce_update(p, best);
+	krt_learn_announce_update(p, &best->rte);
       else
-	krt_learn_announce_delete(p, n);
+	krt_learn_announce_delete(p, n->n.addr);
     }
 }
 
@@ -538,7 +539,7 @@ krt_dump(struct proto *P)
 static inline int
 krt_is_installed(struct krt_proto *p, net *n)
 {
-  return n->routes && bmap_test(&p->p.main_channel->export_map, n->routes->id);
+  return n->routes && bmap_test(&p->p.main_channel->export_map, n->routes->rte.id);
 }
 
 static void
@@ -552,26 +553,25 @@ krt_flush_routes(struct krt_proto *p)
       if (krt_is_installed(p, n))
 	{
 	  /* FIXME: this does not work if gw is changed in export filter */
-	  krt_replace_rte(p, n, NULL, n->routes);
+	  krt_replace_rte(p, n->n.addr, NULL, &n->routes->rte);
 	}
     }
   FIB_WALK_END;
 }
 
 static struct rte *
-krt_export_net(struct krt_proto *p, net *net, rte **rt_free)
+krt_export_net(struct krt_proto *p, net *net)
 {
   struct channel *c = p->p.main_channel;
   const struct filter *filter = c->out_filter;
-  rte *rt;
 
   if (c->ra_mode == RA_MERGED)
-    return rt_export_merged(c, net, rt_free, krt_filter_lp, 1);
+    return rt_export_merged(c, net, krt_filter_lp, 1);
 
-  rt = net->routes;
-  *rt_free = NULL;
+  static _Thread_local rte rt;
+  rt = net->routes->rte;
 
-  if (!rte_is_valid(rt))
+  if (!rte_is_valid(&rt))
     return NULL;
 
   if (filter == FILTER_REJECT)
@@ -587,13 +587,9 @@ krt_export_net(struct krt_proto *p, net *net, rte **rt_free)
 
 
 accept:
-  if (rt != net->routes)
-    *rt_free = rt;
-  return rt;
+  return &rt;
 
 reject:
-  if (rt != net->routes)
-    rte_free(rt);
   return NULL;
 }
 
@@ -619,8 +615,7 @@ krt_same_dest(rte *k, rte *e)
 void
 krt_got_route(struct krt_proto *p, rte *e, s8 src)
 {
-  rte *new = NULL, *rt_free = NULL;
-  net *n = e->net;
+  rte *new = NULL;
   e->pflags = 0;
 
 #ifdef KRT_ALLOW_LEARN
@@ -636,10 +631,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
       if (KRT_CF->learn)
 	krt_learn_scan(p, e);
       else
-	{
-	  krt_trace_in_rl(&rl_alien, p, e, "[alien] ignored");
-	  rte_free(e);
-	}
+	krt_trace_in_rl(&rl_alien, p, e, "[alien] ignored");
       return;
     }
 #endif
@@ -650,10 +642,11 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   if (!p->ready)
     goto ignore;
 
-  if (!krt_is_installed(p, n))
+  net *net = net_find(p->p.main_channel->table, e->net);
+  if (!net || !krt_is_installed(p, net))
     goto delete;
 
-  new = krt_export_net(p, n, &rt_free);
+  new = krt_export_net(p, net);
 
   /* Rejected by filters */
   if (!new)
@@ -686,20 +679,15 @@ ignore:
 
 update:
   krt_trace_in(p, new, "updating");
-  krt_replace_rte(p, n, new, e);
+  krt_replace_rte(p, e->net, new, e);
   goto done;
 
 delete:
   krt_trace_in(p, e, "deleting");
-  krt_replace_rte(p, n, NULL, e);
+  krt_replace_rte(p, e->net, NULL, e);
   goto done;
 
 done:
-  rte_free(e);
-
-  if (rt_free)
-    rte_free(rt_free);
-
   lp_flush(krt_filter_lp);
 }
 
@@ -717,20 +705,16 @@ krt_prune(struct krt_proto *p)
   KRT_TRACE(p, D_EVENTS, "Pruning table %s", t->name);
   FIB_WALK(&t->fib, net, n)
   {
-    if (p->ready && krt_is_installed(p, n) && !bmap_test(&p->seen_map, n->routes->id))
+    if (p->ready && krt_is_installed(p, n) && !bmap_test(&p->seen_map, n->routes->rte.id))
     {
-      rte *rt_free = NULL;
-      rte *new = krt_export_net(p, n, &rt_free);
+      rte *new = krt_export_net(p, n);
 
       if (new)
       {
 	krt_trace_in(p, new, "installing");
-	krt_replace_rte(p, n, new, NULL);
+	krt_replace_rte(p, n->n.addr, new, NULL);
       }
 
-      if (rt_free)
-	rte_free(rt_free);
-
       lp_flush(krt_filter_lp);
     }
   }
@@ -748,7 +732,6 @@ krt_prune(struct krt_proto *p)
 void
 krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
 {
-  net *net = e->net;
   e->pflags = 0;
 
   switch (src)
@@ -761,7 +744,7 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
       if (new)
 	{
 	  krt_trace_in(p, e, "[redirect] deleting");
-	  krt_replace_rte(p, net, NULL, e);
+	  krt_replace_rte(p, e->net, NULL, e);
 	}
       /* If !new, it is probably echo of our deletion */
       break;
@@ -775,7 +758,6 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
 	}
 #endif
     }
-  rte_free(e);
 }
 
 /*
@@ -882,10 +864,9 @@ krt_scan_timer_kick(struct krt_proto *p)
  */
 
 static int
-krt_preexport(struct proto *P, rte *e)
+krt_preexport(struct channel *c, rte *e)
 {
-  // struct krt_proto *p = (struct krt_proto *) P;
-  if (e->src->proto == P)
+  if (e->src->proto == c->proto)
     return -1;
 
   if (!krt_capable(e))
@@ -895,8 +876,8 @@ krt_preexport(struct proto *P, rte *e)
 }
 
 static void
-krt_rt_notify(struct proto *P, struct channel *ch UNUSED, net *net,
-	      rte *new, rte *old)
+krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
+	      rte *new, const rte *old)
 {
   struct krt_proto *p = (struct krt_proto *) P;
 
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 20858cd7..cd4bd07d 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -143,7 +143,7 @@ void krt_sys_copy_config(struct krt_config *, struct krt_config *);
 
 int  krt_capable(rte *e);
 void krt_do_scan(struct krt_proto *);
-void krt_replace_rte(struct krt_proto *p, net *n, rte *new, rte *old);
+void krt_replace_rte(struct krt_proto *p, const net_addr *n, rte *new, const rte *old);
 int krt_sys_get_attr(const eattr *a, byte *buf, int buflen);
 
 

From f81702b7e44ba7f2b264fe14f0f4e1e30913e475 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 21 Jun 2021 17:07:31 +0200
Subject: [PATCH 013/431] Table import and export are now explicit hooks.

Channels have now included rt_import_req and rt_export_req to hook into
the table instead of just one list node. This will (in future) allow for:

* channel import and export bound to different tables
* more efficient pipe code (dropping most of the channel code)
* conversion of 'show route' to a special kind of export
* temporary static routes from CLI

The import / export states are also updated to the new algorithms.
---
 filter/filter.c       |  34 +-
 nest/config.Y         |   4 +-
 nest/proto.c          | 521 ++++++++++++++++----------
 nest/protocol.h       |  83 ++---
 nest/route.h          | 145 +++++++-
 nest/rt-show.c        |  36 +-
 nest/rt-table.c       | 849 +++++++++++++++++++++++++-----------------
 proto/bgp/bgp.c       |  24 +-
 proto/pipe/pipe.c     |  37 +-
 proto/rpki/packets.c  |   8 +-
 proto/static/static.c |  11 +-
 sysdep/unix/krt.c     |  33 +-
 12 files changed, 1122 insertions(+), 663 deletions(-)

diff --git a/filter/filter.c b/filter/filter.c
index 6f1e6ea0..625b3ade 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -425,6 +425,23 @@ filter_commit(struct config *new, struct config *old)
     }
 }
 
+void channel_filter_dump(const struct filter *f)
+{
+  if (f == FILTER_ACCEPT)
+    debug(" ALL");
+  else if (f == FILTER_REJECT)
+    debug(" NONE");
+  else if (f == FILTER_UNDEF)
+    debug(" UNDEF");
+  else if (f->sym) {
+    ASSERT(f->sym->filter == f);
+    debug(" named filter %s", f->sym->name);
+  } else {
+    debug("\n");
+    f_dump_line(f->root, 2);
+  }
+}
+
 void filters_dump_all(void)
 {
   struct symbol *sym;
@@ -444,19 +461,10 @@ void filters_dump_all(void)
 	  struct channel *c;
 	  WALK_LIST(c, sym->proto->proto->channels) {
 	    debug(" Channel %s (%s) IMPORT", c->name, net_label[c->net_type]);
-	    if (c->in_filter == FILTER_ACCEPT)
-	      debug(" ALL\n");
-	    else if (c->in_filter == FILTER_REJECT)
-	      debug(" NONE\n");
-	    else if (c->in_filter == FILTER_UNDEF)
-	      debug(" UNDEF\n");
-	    else if (c->in_filter->sym) {
-	      ASSERT(c->in_filter->sym->filter == c->in_filter);
-	      debug(" named filter %s\n", c->in_filter->sym->name);
-	    } else {
-	      debug("\n");
-	      f_dump_line(c->in_filter->root, 2);
-	    }
+	    channel_filter_dump(c->in_filter);
+	    debug(" EXPORT", c->name, net_label[c->net_type]);
+	    channel_filter_dump(c->out_filter);
+	    debug("\n");
 	  }
 	}
     }
diff --git a/nest/config.Y b/nest/config.Y
index a1d901ab..29d6b0db 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -820,8 +820,10 @@ CF_CLI(DUMP NEIGHBORS,,, [[Dump neighbor cache]])
 { neigh_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP ATTRIBUTES,,, [[Dump attribute cache]])
 { rta_dump_all(); cli_msg(0, ""); } ;
-CF_CLI(DUMP ROUTES,,, [[Dump routing table]])
+CF_CLI(DUMP ROUTES,,, [[Dump routes]])
 { rt_dump_all(); cli_msg(0, ""); } ;
+CF_CLI(DUMP TABLES,,, [[Dump table connections]])
+{ rt_dump_hooks_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP PROTOCOLS,,, [[Dump protocol information]])
 { protos_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP FILTER ALL,,, [[Dump all filters in linearized form]])
diff --git a/nest/proto.c b/nest/proto.c
index 2009ff1f..09582d2e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -43,8 +43,7 @@ static int graceful_restart_state;
 static u32 graceful_restart_locks;
 
 static char *p_states[] = { "DOWN", "START", "UP", "STOP" };
-static char *c_states[] = { "DOWN", "START", "UP", "FLUSHING" };
-static char *e_states[] = { "DOWN", "FEEDING", "READY" };
+static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
 
 extern struct protocol proto_unix_iface;
 
@@ -55,12 +54,14 @@ static char *proto_state_name(struct proto *p);
 static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
+static void channel_feed_end(struct channel *c);
+static void channel_export_stopped(struct rt_export_request *req);
 
 static inline int proto_is_done(struct proto *p)
 { return (p->proto_state == PS_DOWN) && (p->active_channels == 0); }
 
 static inline int channel_is_active(struct channel *c)
-{ return (c->channel_state == CS_START) || (c->channel_state == CS_UP); }
+{ return (c->channel_state != CS_DOWN); }
 
 static inline int channel_reloadable(struct channel *c)
 { return c->proto->reload_routes && c->reloadable; }
@@ -68,10 +69,46 @@ static inline int channel_reloadable(struct channel *c)
 static inline void
 channel_log_state_change(struct channel *c)
 {
-  if (c->export_state)
-    CD(c, "State changed to %s/%s", c_states[c->channel_state], e_states[c->export_state]);
-  else
-    CD(c, "State changed to %s", c_states[c->channel_state]);
+  CD(c, "State changed to %s", c_states[c->channel_state]);
+}
+
+void
+channel_import_log_state_change(struct rt_import_request *req, u8 state)
+{
+  struct channel *c = SKIP_BACK(struct channel, in_req, req);
+  CD(c, "Channel import state changed to %s", rt_import_state_name(state));
+}
+
+void
+channel_export_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  CD(c, "Channel export state changed to %s", rt_export_state_name(state));
+
+  switch (state)
+  {
+    case TES_FEEDING:
+      if (c->proto->feed_begin)
+	c->proto->feed_begin(c, !c->refeeding);
+      break;
+    case TES_READY:
+      channel_feed_end(c);
+      break;
+  }
+}
+
+static void
+channel_dump_import_req(struct rt_import_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, in_req, req);
+  debug("  Channel %s.%s import request %p\n", c->proto->name, c->name, req);
+}
+
+static void
+channel_dump_export_req(struct rt_export_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  debug("  Channel %s.%s export request %p\n", c->proto->name, c->name, req);
 }
 
 static void
@@ -141,6 +178,15 @@ proto_find_channel_by_name(struct proto *p, const char *n)
   return NULL;
 }
 
+rte * channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+
+void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+
 /**
  * proto_add_channel - connect protocol to a routing table
  * @p: protocol instance
@@ -165,6 +211,7 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->channel = cf->channel;
   c->proto = p;
   c->table = cf->table->table;
+  rt_lock_table(c->table);
 
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
@@ -182,7 +229,6 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->rpki_reload = cf->rpki_reload;
 
   c->channel_state = CS_DOWN;
-  c->export_state = ES_DOWN;
   c->last_state_change = current_time();
   c->reloadable = 1;
 
@@ -204,6 +250,7 @@ proto_remove_channel(struct proto *p UNUSED, struct channel *c)
 
   CD(c, "Removed", c->name);
 
+  rt_unlock_table(c->table);
   rem_node(&c->n);
   mb_free(c);
 }
@@ -224,7 +271,7 @@ proto_pause_channels(struct proto *p)
   struct channel *c;
   WALK_LIST(c, p->channels)
     if (!c->disabled && channel_is_active(c))
-      channel_set_state(c, CS_START);
+      channel_set_state(c, CS_PAUSE);
 }
 
 static void
@@ -233,7 +280,7 @@ proto_stop_channels(struct proto *p)
   struct channel *c;
   WALK_LIST(c, p->channels)
     if (!c->disabled && channel_is_active(c))
-      channel_set_state(c, CS_FLUSHING);
+      channel_set_state(c, CS_STOP);
 }
 
 static void
@@ -244,69 +291,6 @@ proto_remove_channels(struct proto *p)
     proto_remove_channel(p, c);
 }
 
-static void
-channel_schedule_feed(struct channel *c, int initial)
-{
-  // DBG("%s: Scheduling meal\n", p->name);
-  ASSERT(c->channel_state == CS_UP);
-
-  c->export_state = ES_FEEDING;
-  c->refeeding = !initial;
-
-  ev_schedule_work(c->feed_event);
-}
-
-static void
-channel_feed_loop(void *ptr)
-{
-  struct channel *c = ptr;
-
-  if (c->export_state != ES_FEEDING)
-    return;
-
-  /* Start feeding */
-  if (!c->feed_active)
-  {
-    if (c->proto->feed_begin)
-      c->proto->feed_begin(c, !c->refeeding);
-
-    c->refeed_pending = 0;
-  }
-
-  // DBG("Feeding protocol %s continued\n", p->name);
-  if (!rt_feed_channel(c))
-  {
-    ev_schedule_work(c->feed_event);
-    return;
-  }
-
-  /* Reset export limit if the feed ended with acceptable number of exported routes */
-  if (c->refeeding &&
-      (c->limit_active & (1 << PLD_OUT)) &&
-      (c->refeed_count <= c->out_limit.max))
-  {
-    log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, c->out_limit.max);
-    channel_reset_limit(c, &c->out_limit, PLD_OUT);
-
-    /* Continue in feed - it will process routing table again from beginning */
-    c->refeed_count = 0;
-    ev_schedule_work(c->feed_event);
-    return;
-  }
-
-  // DBG("Feeding protocol %s finished\n", p->name);
-  c->export_state = ES_READY;
-  channel_log_state_change(c);
-
-  if (c->proto->feed_end)
-    c->proto->feed_end(c);
-
-  /* Restart feeding */
-  if (c->refeed_pending)
-    channel_request_feeding(c);
-}
-
-
 static void
 channel_roa_in_changed(struct rt_subscription *s)
 {
@@ -325,14 +309,12 @@ static void
 channel_roa_out_changed(struct rt_subscription *s)
 {
   struct channel *c = s->data;
-  int active = (c->export_state == ES_FEEDING);
+  CD(c, "Feeding triggered by RPKI change");
 
-  CD(c, "Feeding triggered by RPKI change%s", active ? " - already active" : "");
+  c->refeed_pending = 1;
 
-  if (!active)
-    channel_request_feeding(c);
-  else
-    c->refeed_pending = 1;
+  if (c->out_req.hook)
+    rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
 /* Temporary code, subscriptions should be changed to resources */
@@ -444,34 +426,189 @@ channel_roa_unsubscribe_all(struct channel *c)
 }
 
 static void
-channel_start_export(struct channel *c)
+channel_start_import(struct channel *c)
 {
-  ASSERT(c->channel_state == CS_UP);
-  ASSERT(c->export_state == ES_DOWN);
+  if (c->in_req.hook)
+  {
+    log(L_WARN "%s.%s: Attempted to start channel's already started import", c->proto->name, c->name);
+    return;
+  }
 
-  channel_schedule_feed(c, 1);	/* Sets ES_FEEDING */
+  int nlen = strlen(c->name) + strlen(c->proto->name) + 2;
+  char *rn = mb_allocz(c->proto->pool, nlen);
+  bsprintf(rn, "%s.%s", c->proto->name, c->name);
+
+  c->in_req = (struct rt_import_request) {
+    .name = rn,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_dump_import_req,
+    .log_state_change = channel_import_log_state_change,
+    .preimport = channel_preimport,
+    .rte_modify = c->proto->rte_modify,
+  };
+
+  ASSERT(c->channel_state == CS_UP);
+
+  channel_reset_limit(c, &c->rx_limit, PLD_RX);
+  channel_reset_limit(c, &c->in_limit, PLD_IN);
+
+  memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
+
+  DBG("%s.%s: Channel start import req=%p\n", c->proto->name, c->name, &c->in_req);
+  rt_request_import(c->table, &c->in_req);
 }
 
 static void
-channel_stop_export(struct channel *c)
+channel_start_export(struct channel *c)
 {
-  /* Need to abort feeding */
-  if (c->export_state == ES_FEEDING)
-    rt_feed_channel_abort(c);
+  if (c->out_req.hook)
+  {
+    log(L_WARN "%s.%s: Attempted to start channel's already started export", c->proto->name, c->name);
+    return;
+  }
 
-  c->export_state = ES_DOWN;
+  ASSERT(c->channel_state == CS_UP);
+  int nlen = strlen(c->name) + strlen(c->proto->name) + 2;
+  char *rn = mb_allocz(c->proto->pool, nlen);
+  bsprintf(rn, "%s.%s", c->proto->name, c->name);
+
+  c->out_req = (struct rt_export_request) {
+    .name = rn,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_dump_export_req,
+    .log_state_change = channel_export_log_state_change,
+  };
+
+  bmap_init(&c->export_map, c->proto->pool, 1024);
+  bmap_init(&c->export_reject_map, c->proto->pool, 1024);
 
   channel_reset_limit(c, &c->out_limit, PLD_OUT);
-  bmap_reset(&c->export_map, 1024);
-  bmap_reset(&c->export_reject_map, 1024);
+
+  memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
+
+  switch (c->ra_mode) {
+    case RA_OPTIMAL:
+      c->out_req.export_one = rt_notify_optimal;
+      break;
+    case RA_ANY:
+      c->out_req.export_one = rt_notify_any;
+      c->out_req.export_bulk = rt_feed_any;
+      break;
+    case RA_ACCEPTED:
+      c->out_req.export_bulk = rt_notify_accepted;
+      break;
+    case RA_MERGED:
+      c->out_req.export_bulk = rt_notify_merged;
+      break;
+    default:
+      bug("Unknown route announcement mode");
+  }
+
+  DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
+  rt_request_export(c->table, &c->out_req);
 }
 
+static void
+channel_check_stopped(struct channel *c)
+{
+  switch (c->channel_state)
+  {
+    case CS_STOP:
+      if (c->out_req.hook || c->in_req.hook)
+	return;
+
+      channel_set_state(c, CS_DOWN);
+      ev_schedule(c->proto->event);
+
+      break;
+    case CS_PAUSE:
+      if (c->out_req.hook)
+	return;
+
+      channel_set_state(c, CS_START);
+      break;
+    default:
+      bug("Stopped channel in a bad state: %d", c->channel_state);
+  }
+
+  DBG("%s.%s: Channel requests/hooks stopped (in state %s)\n", c->proto->name, c->name, c_states[c->channel_state]);
+}
+
+void
+channel_import_stopped(struct rt_import_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, in_req, req);
+
+  req->hook = NULL;
+
+  if (c->in_table)
+    rt_prune_sync(c->in_table, 1);
+
+  mb_free(c->in_req.name);
+  c->in_req.name = NULL;
+
+  channel_check_stopped(c);
+}
+
+static void
+channel_export_stopped(struct rt_export_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+
+  /* The hook has already stopped */
+  req->hook = NULL;
+
+  if (c->refeed_pending)
+  {
+    c->refeeding = 1;
+    c->refeed_pending = 0;
+    rt_request_export(c->table, req);
+    return;
+  }
+
+  /* Free the routes from out_table */
+  if (c->out_table)
+    rt_prune_sync(c->out_table, 1);
+
+  mb_free(c->out_req.name);
+  c->out_req.name = NULL;
+
+  channel_check_stopped(c);
+}
+
+static void
+channel_feed_end(struct channel *c)
+{
+  struct rt_export_request *req = &c->out_req;
+
+  /* Reset export limit if the feed ended with acceptable number of exported routes */
+  struct limit *l = &c->out_limit;
+  if (c->refeeding &&
+      (c->limit_active & (1 << PLD_OUT)) &&
+      (c->refeed_count <= l->max) &&
+      (l->count <= l->max))
+  {
+    log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->max);
+
+    c->refeed_pending = 1;
+    rt_stop_export(req, channel_export_stopped);
+    return;
+  }
+
+  if (c->proto->feed_end)
+    c->proto->feed_end(c);
+
+  if (c->refeed_pending)
+    rt_stop_export(req, channel_export_stopped);
+  else
+    c->refeeding = 0;
+}
 
 /* Called by protocol for reload from in_table */
 void
 channel_schedule_reload(struct channel *c)
 {
-  ASSERT(c->channel_state == CS_UP);
+  ASSERT(c->in_req.hook);
 
   rt_reload_channel_abort(c);
   ev_schedule_work(c->reload_event);
@@ -497,23 +634,6 @@ channel_reload_loop(void *ptr)
     channel_request_reload(c);
 }
 
-static void
-channel_reset_import(struct channel *c)
-{
-  /* Need to abort feeding */
-  ev_postpone(c->reload_event);
-  rt_reload_channel_abort(c);
-
-  rt_prune_sync(c->in_table, 1);
-}
-
-static void
-channel_reset_export(struct channel *c)
-{
-  /* Just free the routes */
-  rt_prune_sync(c->out_table, 1);
-}
-
 /* Called by protocol to activate in_table */
 void
 channel_setup_in_table(struct channel *c)
@@ -545,22 +665,11 @@ channel_setup_out_table(struct channel *c)
 static void
 channel_do_start(struct channel *c)
 {
-  rt_lock_table(c->table);
-  add_tail(&c->table->channels, &c->table_node);
   c->proto->active_channels++;
 
-  c->feed_event = ev_new_init(c->proto->pool, channel_feed_loop, c);
-
-  bmap_init(&c->export_map, c->proto->pool, 1024);
-  bmap_init(&c->export_reject_map, c->proto->pool, 1024);
-  memset(&c->export_stats, 0, sizeof(struct export_stats));
-  memset(&c->import_stats, 0, sizeof(struct import_stats));
-
-  channel_reset_limit(c, &c->rx_limit, PLD_RX);
-  channel_reset_limit(c, &c->in_limit, PLD_IN);
-  channel_reset_limit(c, &c->out_limit, PLD_OUT);
-
   CALL(c->channel->start, c);
+
+  channel_start_import(c);
 }
 
 static void
@@ -575,9 +684,31 @@ channel_do_up(struct channel *c)
 }
 
 static void
-channel_do_flush(struct channel *c)
+channel_do_pause(struct channel *c)
 {
-  rt_schedule_prune(c->table);
+  /* Need to abort feeding */
+  if (c->reload_event)
+  {
+    ev_postpone(c->reload_event);
+    rt_reload_channel_abort(c);
+  }
+
+  /* Stop export */
+  if (c->out_req.hook)
+    rt_stop_export(&c->out_req, channel_export_stopped);
+
+  channel_roa_unsubscribe_all(c);
+
+  bmap_free(&c->export_map);
+  bmap_free(&c->export_reject_map);
+}
+
+static void
+channel_do_stop(struct channel *c)
+{
+  /* Stop import */
+  if (c->in_req.hook)
+    rt_stop_import(&c->in_req, channel_import_stopped);
 
   c->gr_wait = 0;
   if (c->gr_lock)
@@ -586,30 +717,21 @@ channel_do_flush(struct channel *c)
   CALL(c->channel->shutdown, c);
 
   /* This have to be done in here, as channel pool is freed before channel_do_down() */
-  bmap_free(&c->export_map);
-  bmap_free(&c->export_reject_map);
   c->in_table = NULL;
   c->reload_event = NULL;
   c->out_table = NULL;
-
-  channel_roa_unsubscribe_all(c);
 }
 
 static void
 channel_do_down(struct channel *c)
 {
-  ASSERT(!c->feed_active && !c->reload_active);
+  ASSERT(!c->reload_active);
 
-  rem_node(&c->table_node);
-  rt_unlock_table(c->table);
   c->proto->active_channels--;
 
-  if (c->in_limit.count || c->rx_limit.count)
-    bug("%s: Channel %s is down but still has some routes", c->proto->name, c->name);
-
   // bmap_free(&c->export_map);
-  memset(&c->import_stats, 0, sizeof(struct import_stats));
-  memset(&c->export_stats, 0, sizeof(struct export_stats));
+  memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
+  memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
 
   c->in_table = NULL;
   c->reload_event = NULL;
@@ -628,7 +750,6 @@ void
 channel_set_state(struct channel *c, uint state)
 {
   uint cs = c->channel_state;
-  uint es = c->export_state;
 
   DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, c_states[cs], c_states[state]);
   if (state == cs)
@@ -640,20 +761,11 @@ channel_set_state(struct channel *c, uint state)
   switch (state)
   {
   case CS_START:
-    ASSERT(cs == CS_DOWN || cs == CS_UP);
+    ASSERT(cs == CS_DOWN || cs == CS_PAUSE);
 
     if (cs == CS_DOWN)
       channel_do_start(c);
 
-    if (es != ES_DOWN)
-      channel_stop_export(c);
-
-    if (c->in_table && (cs == CS_UP))
-      channel_reset_import(c);
-
-    if (c->out_table && (cs == CS_UP))
-      channel_reset_export(c);
-
     break;
 
   case CS_UP:
@@ -668,23 +780,24 @@ channel_set_state(struct channel *c, uint state)
     channel_do_up(c);
     break;
 
-  case CS_FLUSHING:
-    ASSERT(cs == CS_START || cs == CS_UP);
+  case CS_PAUSE:
+    ASSERT(cs == CS_UP);
 
-    if (es != ES_DOWN)
-      channel_stop_export(c);
+    if (cs == CS_UP)
+      channel_do_pause(c);
+    break;
 
-    if (c->in_table && (cs == CS_UP))
-      channel_reset_import(c);
+  case CS_STOP:
+    ASSERT(cs == CS_UP || cs == CS_START || cs == CS_PAUSE);
 
-    if (c->out_table && (cs == CS_UP))
-      channel_reset_export(c);
+    if (cs == CS_UP)
+      channel_do_pause(c);
 
-    channel_do_flush(c);
+    channel_do_stop(c);
     break;
 
   case CS_DOWN:
-    ASSERT(cs == CS_FLUSHING);
+    ASSERT(cs == CS_STOP);
 
     channel_do_down(c);
     break;
@@ -709,35 +822,16 @@ channel_set_state(struct channel *c, uint state)
 void
 channel_request_feeding(struct channel *c)
 {
-  ASSERT(c->channel_state == CS_UP);
+  ASSERT(c->out_req.hook);
 
-  CD(c, "Feeding requested");
-
-  /* Do nothing if we are still waiting for feeding */
-  if (c->export_state == ES_DOWN)
-    return;
-
-  /* If we are already feeding, we want to restart it */
-  if (c->export_state == ES_FEEDING)
-  {
-    /* Unless feeding is in initial state */
-    if (!c->feed_active)
-	return;
-
-    rt_feed_channel_abort(c);
-  }
-
-  /* Track number of exported routes during refeed */
-  c->refeed_count = 0;
-
-  channel_schedule_feed(c, 0);	/* Sets ES_FEEDING */
-  channel_log_state_change(c);
+  c->refeed_pending = 1;
+  rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
 static void
 channel_request_reload(struct channel *c)
 {
-  ASSERT(c->channel_state == CS_UP);
+  ASSERT(c->in_req.hook);
   ASSERT(channel_reloadable(c));
 
   CD(c, "Reload requested");
@@ -861,6 +955,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   c->merge_limit = cf->merge_limit;
   c->preference = cf->preference;
   c->debug = cf->debug;
+  c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->in_keep_filtered = cf->in_keep_filtered;
   c->rpki_reload = cf->rpki_reload;
 
@@ -975,8 +1070,8 @@ proto_event(void *ptr)
 
   if (proto_is_done(p))
   {
-    if (p->proto->cleanup)
-      p->proto->cleanup(p);
+    rfree(p->pool);
+    p->pool = NULL;
 
     p->active = 0;
     proto_log_state_change(p);
@@ -1528,7 +1623,7 @@ graceful_restart_done(timer *t UNUSED)
     WALK_LIST(c, p->channels)
     {
       /* Resume postponed export of routes */
-      if ((c->channel_state == CS_UP) && c->gr_wait && c->proto->rt_notify)
+      if ((c->channel_state == CS_UP) && c->gr_wait && p->rt_notify)
 	channel_start_export(c);
 
       /* Cleanup */
@@ -1618,7 +1713,11 @@ protos_dump_all(void)
   struct proto *p;
   WALK_LIST(p, proto_list)
   {
-    debug("  protocol %s state %s\n", p->name, p_states[p->proto_state]);
+#define DPF(x)	(p->x ? " " #x : "")
+    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s%s\n",
+	p->name, p, p_states[p->proto_state], p->active_channels,
+	DPF(disabled), DPF(active), DPF(do_start), DPF(do_stop), DPF(reconfiguring));
+#undef DPF
 
     struct channel *c;
     WALK_LIST(c, p->channels)
@@ -1628,6 +1727,9 @@ protos_dump_all(void)
 	debug("\tInput filter: %s\n", filter_name(c->in_filter));
       if (c->out_filter)
 	debug("\tOutput filter: %s\n", filter_name(c->out_filter));
+      debug("\tChannel state: %s/%s/%s\n", c_states[c->channel_state],
+	  c->in_req.hook ? rt_import_state_name(rt_import_get_state(c->in_req.hook)) : "-",
+	  c->out_req.hook ? rt_export_state_name(rt_export_get_state(c->out_req.hook)) : "-");
     }
 
     if (p->proto->dump && (p->proto_state != PS_DOWN))
@@ -1933,8 +2035,6 @@ proto_do_down(struct proto *p)
 {
   p->down_code = 0;
   neigh_prune();
-  rfree(p->pool);
-  p->pool = NULL;
 
   /* Shutdown is finished in the protocol event */
   if (proto_is_done(p))
@@ -2029,8 +2129,16 @@ proto_state_name(struct proto *p)
 static void
 channel_show_stats(struct channel *c)
 {
-  struct import_stats *is = &c->import_stats;
-  struct export_stats *es = &c->export_stats;
+  struct channel_import_stats *ch_is = &c->import_stats;
+  struct channel_export_stats *ch_es = &c->export_stats;
+  struct rt_import_stats *rt_is = c->in_req.hook ? &c->in_req.hook->stats : NULL;
+  struct rt_export_stats *rt_es = c->out_req.hook ? &c->out_req.hook->stats : NULL;
+
+#define SON(ie, item)	((ie) ? (ie)->item : 0)
+#define SCI(item) SON(ch_is, item)
+#define SCE(item) SON(ch_es, item)
+#define SRI(item) SON(rt_is, item)
+#define SRE(item) SON(rt_es, item)
 
   u32 rx_routes = c->rx_limit.count;
   u32 in_routes = c->in_limit.count;
@@ -2038,24 +2146,31 @@ channel_show_stats(struct channel *c)
 
   if (c->in_keep_filtered)
     cli_msg(-1006, "    Routes:         %u imported, %u filtered, %u exported, %u preferred",
-	    in_routes, (rx_routes - in_routes), out_routes, is->pref);
+	    in_routes, (rx_routes - in_routes), out_routes, SRI(pref));
   else
     cli_msg(-1006, "    Routes:         %u imported, %u exported, %u preferred",
-	    in_routes, out_routes, is->pref);
+	    in_routes, out_routes, SRI(pref));
 
-  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   accepted");
-  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u",
-	  is->updates_received, is->updates_invalid,
-	  is->updates_filtered, is->updates_ignored,
-	  is->updates_accepted);
-  cli_msg(-1006, "      Import withdraws:   %10u %10u        --- %10u %10u",
-	  is->withdraws_received, is->withdraws_invalid,
-	  is->withdraws_ignored, is->withdraws_accepted);
-  cli_msg(-1006, "      Export updates:     %10u %10u %10u        --- %10u",
-	  es->updates_received, es->updates_rejected,
-	  es->updates_filtered, es->updates_accepted);
-  cli_msg(-1006, "      Export withdraws:   %10u        ---        ---        --- %10u",
-	  es->withdraws_received, es->withdraws_accepted);
+  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   RX limit   IN limit   accepted");
+  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u %10u %10u",
+	  SCI(updates_received), SCI(updates_invalid),
+	  SCI(updates_filtered), SRI(updates_ignored),
+	  SCI(updates_limited_rx), SCI(updates_limited_in),
+	  SRI(updates_accepted));
+  cli_msg(-1006, "      Import withdraws:   %10u %10u        --- %10u        --- %10u",
+	  SCI(withdraws_received), SCI(withdraws_invalid),
+	  SRI(withdraws_ignored), SRI(withdraws_accepted));
+  cli_msg(-1006, "      Export updates:     %10u %10u %10u        --- %10u %10u",
+	  SRE(updates_received), SCE(updates_rejected),
+	  SCE(updates_filtered), SCE(updates_limited), SCE(updates_accepted));
+  cli_msg(-1006, "      Export withdraws:   %10u        ---        ---        ---         ---%10u",
+	  SRE(withdraws_received), SCE(withdraws_accepted));
+
+#undef SRI
+#undef SRE
+#undef SCI
+#undef SCE
+#undef SON
 }
 
 void
@@ -2073,6 +2188,8 @@ channel_show_info(struct channel *c)
 {
   cli_msg(-1006, "  Channel %s", c->name);
   cli_msg(-1006, "    State:          %s", c_states[c->channel_state]);
+  cli_msg(-1006, "    Import state:   %s", rt_import_state_name(rt_import_get_state(c->in_req.hook)));
+  cli_msg(-1006, "    Export state:   %s", rt_export_state_name(rt_export_get_state(c->out_req.hook)));
   cli_msg(-1006, "    Table:          %s", c->table->name);
   cli_msg(-1006, "    Preference:     %d", c->preference);
   cli_msg(-1006, "    Input filter:   %s", filter_name(c->in_filter));
diff --git a/nest/protocol.h b/nest/protocol.h
index c1978914..7447cbf0 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -77,7 +77,6 @@ struct protocol {
   void (*dump)(struct proto *);			/* Debugging dump */
   int (*start)(struct proto *);			/* Start the instance */
   int (*shutdown)(struct proto *);		/* Stop the instance */
-  void (*cleanup)(struct proto *);		/* Called after shutdown when protocol became hungry/down */
   void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */
   void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */
   int (*get_attr)(const struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */
@@ -133,30 +132,6 @@ struct proto_config {
 };
 
 /* Protocol statistics */
-struct import_stats {
-  /* Import - from protocol to core */
-  u32 pref;			/* Number of routes selected as best in the (adjacent) routing table */
-  u32 updates_received;		/* Number of route updates received */
-  u32 updates_invalid;		/* Number of route updates rejected as invalid */
-  u32 updates_filtered;		/* Number of route updates rejected by filters */
-  u32 updates_ignored;		/* Number of route updates rejected as already in route table */
-  u32 updates_accepted;		/* Number of route updates accepted and imported */
-  u32 withdraws_received;	/* Number of route withdraws received */
-  u32 withdraws_invalid;	/* Number of route withdraws rejected as invalid */
-  u32 withdraws_ignored;	/* Number of route withdraws rejected as already not in route table */
-  u32 withdraws_accepted;	/* Number of route withdraws accepted and processed */
-};
-
-struct export_stats {
-  /* Export - from core to protocol */
-  u32 updates_received;		/* Number of route updates received */
-  u32 updates_rejected;		/* Number of route updates rejected by protocol */
-  u32 updates_filtered;		/* Number of route updates rejected by filters */
-  u32 updates_accepted;		/* Number of route updates accepted and exported */
-  u32 withdraws_received;	/* Number of route withdraws received */
-  u32 withdraws_accepted;	/* Number of route withdraws accepted and processed */
-};
-
 struct proto {
   node n;				/* Node in global proto_list */
   struct protocol *proto;		/* Protocol */
@@ -512,7 +487,6 @@ struct channel_config {
 
 struct channel {
   node n;				/* Node in proto->channels */
-  node table_node;			/* Node in table->channels */
 
   const char *name;			/* Channel name (may be NULL) */
   const struct channel_class *channel;
@@ -531,10 +505,28 @@ struct channel {
   u8 limit_actions[PLD_MAX];		/* Limit actions enum */
   u8 limit_active;			/* Flags for active limits */
 
-  struct event *feed_event;		/* Event responsible for feeding */
-  struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
-  struct import_stats import_stats;	/* Import statistics */
-  struct export_stats export_stats;	/* Export statistics */
+  struct channel_import_stats {
+    /* Import - from protocol to core */
+    u32 updates_received;		/* Number of route updates received */
+    u32 updates_invalid;		/* Number of route updates rejected as invalid */
+    u32 updates_filtered;		/* Number of route updates rejected by filters */
+    u32 updates_limited_rx;		/* Number of route updates exceeding the rx_limit */
+    u32 updates_limited_in;		/* Number of route updates exceeding the in_limit */
+    u32 withdraws_received;		/* Number of route withdraws received */
+    u32 withdraws_invalid;		/* Number of route withdraws rejected as invalid */
+  } import_stats;
+
+  struct channel_export_stats {
+    /* Export - from core to protocol */
+    u32 updates_rejected;		/* Number of route updates rejected by protocol */
+    u32 updates_filtered;		/* Number of route updates rejected by filters */
+    u32 updates_accepted;		/* Number of route updates accepted and exported */
+    u32 updates_limited;		/* Number of route updates exceeding the out_limit */
+    u32 withdraws_accepted;		/* Number of route withdraws accepted and processed */
+  } export_stats;
+
+  struct rt_import_request in_req;	/* Table import connection */
+  struct rt_export_request out_req;	/* Table export connection */
 
   u32 refeed_count;			/* Number of routes exported during refeed regardless of out_limit */
 
@@ -548,10 +540,7 @@ struct channel {
   u8 stale;				/* Used in reconfiguration */
 
   u8 channel_state;
-  u8 export_state;			/* Route export state (ES_*, see below) */
-  u8 feed_active;
-  u8 flush_active;
-  u8 refeeding;				/* We are refeeding (valid only if export_state == ES_FEEDING) */
+  u8 refeeding;				/* Refeeding the channel. */
   u8 reloadable;			/* Hook reload_routes() is allowed on the channel */
   u8 gr_lock;				/* Graceful restart mechanism should wait for this channel */
   u8 gr_wait;				/* Route export to channel is postponed until graceful restart */
@@ -599,34 +588,34 @@ struct channel {
  * restricted by that and is on volition of the protocol. Generally, channels
  * are opened in protocols' start() hooks when going to PS_UP.
  *
- * CS_FLUSHING - The transitional state between initialized channel and closed
+ * CS_STOP - The transitional state between initialized channel and closed
  * channel. The channel is still initialized, but no route exchange is allowed.
  * Instead, the associated table is running flush loop to remove routes imported
  * through the channel. After that, the channel changes state to CS_DOWN and
  * is detached from the table (the table is unlocked and the channel is unlinked
- * from it). Unlike other states, the CS_FLUSHING state is not explicitly
+ * from it). Unlike other states, the CS_STOP state is not explicitly
  * entered or left by the protocol. A protocol may request to close a channel
  * (by calling channel_close()), which causes the channel to change state to
- * CS_FLUSHING and later to CS_DOWN. Also note that channels are closed
+ * CS_STOP and later to CS_DOWN. Also note that channels are closed
  * automatically by the core when the protocol is going down.
  *
+ * CS_PAUSE - Almost the same as CS_STOP, just the table import is kept and
+ * the table export is stopped before transitioning to CS_START.
+ *
  * Allowed transitions:
  *
  * CS_DOWN	-> CS_START / CS_UP
- * CS_START	-> CS_UP / CS_FLUSHING
- * CS_UP	-> CS_START / CS_FLUSHING
- * CS_FLUSHING	-> CS_DOWN (automatic)
+ * CS_START	-> CS_UP / CS_STOP
+ * CS_UP	-> CS_PAUSE / CS_STOP
+ * CS_PAUSE	-> CS_START (automatic)
+ * CS_STOP	-> CS_DOWN (automatic)
  */
 
 #define CS_DOWN		0
 #define CS_START	1
 #define CS_UP		2
-#define CS_FLUSHING	3
-
-#define ES_DOWN		0
-#define ES_FEEDING	1
-#define ES_READY	2
-
+#define CS_STOP		3
+#define CS_PAUSE	4
 
 struct channel_config *proto_cf_find_channel(struct proto_config *p, uint net_type);
 static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc)
@@ -644,7 +633,7 @@ void channel_schedule_reload(struct channel *c);
 
 static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); }
 static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP); }
-static inline void channel_close(struct channel *c) { channel_set_state(c, CS_FLUSHING); }
+static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }
 
 void channel_request_feeding(struct channel *c);
 void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
diff --git a/nest/route.h b/nest/route.h
index e4507d4a..d0568133 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -2,6 +2,7 @@
  *	BIRD Internet Routing Daemon -- Routing Table
  *
  *	(c) 1998--2000 Martin Mares <mj@ucw.cz>
+ *	(c) 2019--2021 Maria Matejka <mq@jmq.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -17,6 +18,7 @@
 struct ea_list;
 struct protocol;
 struct proto;
+struct channel;
 struct rte_src;
 struct symbol;
 struct timer;
@@ -160,12 +162,12 @@ typedef struct rtable {
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
   char *name;				/* Name of this table */
-  list channels;			/* List of attached channels (struct channel) */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 
-  byte internal;			/* Internal table of a protocol */
+  list imports;				/* Registered route importers */
+  list exports;				/* Registered route exporters */
 
   struct hmap id_map;
   struct hostcache *hostcache;
@@ -182,6 +184,7 @@ typedef struct rtable {
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
+  byte internal;			/* This table is internal for some other object */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -238,7 +241,7 @@ typedef struct rte {
   struct rta *attrs;			/* Attributes of this route */
   const net_addr *net;			/* Network this RTE belongs to */
   struct rte_src *src;			/* Route source that created the route */
-  struct channel *sender;		/* Channel used to send the route to the routing table */
+  struct rt_import_hook *sender;	/* Import hook used to send the route to the routing table */
   btime lastmod;			/* Last modified (set by table) */
   u32 id;				/* Table specific route id */
   byte flags;				/* Table-specific flags */
@@ -262,12 +265,127 @@ struct rte_storage {
 #define REF_MODIFY	16		/* Route is scheduled for modify */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
-static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
+static inline int rte_is_valid(const rte *r) { return r && !(r->flags & REF_FILTERED); }
 
 /* Route just has REF_FILTERED flag */
-static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
+static inline int rte_is_filtered(const rte *r) { return !!(r->flags & REF_FILTERED); }
 
 
+/* Table-channel connections */
+
+struct rt_import_request {
+  struct rt_import_hook *hook;		/* The table part of importer */
+  char *name;
+  u8 trace_routes;
+
+  void (*dump_req)(struct rt_import_request *req);
+  void (*log_state_change)(struct rt_import_request *req, u8 state);
+  /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
+   * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
+  struct rte *(*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
+  struct rte *(*rte_modify)(struct rte *, struct linpool *);
+};
+
+struct rt_import_hook {
+  node n;
+  rtable *table;			/* The connected table */
+  struct rt_import_request *req;	/* The requestor */
+
+  struct rt_import_stats {
+    /* Import - from protocol to core */
+    u32 pref;				/* Number of routes selected as best in the (adjacent) routing table */
+    u32 updates_ignored;		/* Number of route updates rejected as already in route table */
+    u32 updates_accepted;		/* Number of route updates accepted and imported */
+    u32 withdraws_ignored;		/* Number of route withdraws rejected as already not in route table */
+    u32 withdraws_accepted;		/* Number of route withdraws accepted and processed */
+  } stats;
+
+  btime last_state_change;		/* Time of last state transition */
+
+  u8 import_state;			/* IS_* */
+
+  void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
+};
+
+struct rt_pending_export {
+  struct rte_storage *new, *new_best, *old, *old_best;
+};
+
+struct rt_export_request {
+  struct rt_export_hook *hook;		/* Table part of the export */
+  char *name;
+  u8 trace_routes;
+
+  /* There are two methods of export. You can either request feeding every single change
+   * or feeding the whole route feed. In case of regular export, &export_one is preferred.
+   * Anyway, when feeding, &export_bulk is preferred, falling back to &export_one.
+   * Thus, for RA_OPTIMAL, &export_one is only set,
+   *	   for RA_MERGED and RA_ACCEPTED, &export_bulk is only set
+   *	   and for RA_ANY, both are set to accomodate for feeding all routes but receiving single changes
+   */
+  void (*export_one)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+  void (*export_bulk)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+  void (*dump_req)(struct rt_export_request *req);
+  void (*log_state_change)(struct rt_export_request *req, u8);
+};
+
+struct rt_export_hook {
+  node n;
+  rtable *table;			/* The connected table */
+
+  pool *pool;
+  linpool *lp;
+
+  struct rt_export_request *req;	/* The requestor */
+
+  struct rt_export_stats {
+    /* Export - from core to protocol */
+    u32 updates_received;		/* Number of route updates received */
+    u32 withdraws_received;		/* Number of route withdraws received */
+  } stats;
+
+  struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
+
+  btime last_state_change;		/* Time of last state transition */
+
+  u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
+  u8 export_state;			/* Route export state (TES_*, see below) */
+
+  struct event *event;			/* Event running all the export operations */
+
+  void (*stopped)(struct rt_export_request *);	/* Stored callback when export is stopped */
+};
+
+#define TIS_DOWN	0
+#define TIS_UP		1
+#define TIS_STOP	2
+#define TIS_FLUSHING	3
+#define TIS_WAITING	4
+#define TIS_CLEARED	5
+#define TIS_MAX		6
+
+#define TES_DOWN	0
+#define TES_HUNGRY	1
+#define TES_FEEDING	2
+#define TES_READY	3
+#define TES_STOP	4
+#define TES_MAX		5
+
+void rt_request_import(rtable *tab, struct rt_import_request *req);
+void rt_request_export(rtable *tab, struct rt_export_request *req);
+
+void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
+void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));
+
+const char *rt_import_state_name(u8 state);
+const char *rt_export_state_name(u8 state);
+
+static inline u8 rt_import_get_state(struct rt_import_hook *ih) { return ih ? ih->import_state : TIS_DOWN; }
+static inline u8 rt_export_get_state(struct rt_export_hook *eh) { return eh ? eh->export_state : TES_DOWN; }
+
+void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, struct rte_src *src);
+
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
 #define RA_OPTIMAL	1		/* Announcement of optimal route change */
@@ -281,6 +399,7 @@ static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED);
 #define RIC_REJECT	-1		/* Rejected by protocol */
 #define RIC_DROP	-2		/* Silently dropped by protocol */
 
+#define rte_update  channel_rte_import
 /**
  * rte_update - enter a new update to a routing table
  * @c: channel doing the update
@@ -335,23 +454,24 @@ static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) f
 void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
-rte *rt_export_merged_show(struct channel *c, net *n, linpool *pool);
-void rt_refresh_begin(rtable *t, struct channel *c);
-void rt_refresh_end(rtable *t, struct channel *c);
-void rt_modify_stale(rtable *t, struct channel *c);
+rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
+void rt_refresh_begin(rtable *t, struct rt_import_request *);
+void rt_refresh_end(rtable *t, struct rt_import_request *);
+void rt_modify_stale(rtable *t, struct rt_import_request *);
 void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
 void rte_free(struct rte_storage *, rtable *);
 struct rte_storage *rte_store(const rte *, net *net, rtable *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
-int rt_feed_channel(struct channel *c);
-void rt_feed_channel_abort(struct channel *c);
+void rt_dump_hooks(rtable *);
+void rt_dump_hooks_all(void);
 int rt_reload_channel(struct channel *c);
 void rt_reload_channel_abort(struct channel *c);
 void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, struct rte_storage **old_exported);
+int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+int rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old, struct rte_storage **old_exported);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
 
@@ -377,6 +497,7 @@ struct rt_show_data {
   struct channel *export_channel;
   struct config *running_on_config;
   struct krt_proto *kernel;
+  struct rt_export_hook *kernel_export_hook;
   int export_mode, primary_only, filtered, stats, show_for;
 
   int table_open;			/* Iteration (fit) is open */
diff --git a/nest/rt-show.c b/nest/rt-show.c
index ffbc0a90..235d72e4 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -98,6 +98,29 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     rta_show(c, a);
 }
 
+static uint
+rte_feed_count(net *n)
+{
+  uint count = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+      count++;
+  return count;
+}
+
+static void
+rte_feed_obtain(net *n, rte **feed, uint count)
+{
+  uint i = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+    {
+      ASSERT_DIE(i < count);
+      feed[i++] = &e->rte;
+    }
+  ASSERT_DIE(i == count);
+}
+
 static void
 rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 {
@@ -128,7 +151,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       struct rte e = er->rte;
 
       /* Export channel is down, do not try to export routes to it */
-      if (ec && (ec->export_state == ES_DOWN))
+      if (ec && !ec->out_req.hook)
 	goto skip;
 
       if (d->export_mode == RSEM_EXPORTED)
@@ -143,7 +166,14 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	{
 	  /* Special case for merged export */
 	  pass = 1;
-	  rte *em = rt_export_merged_show(ec, n, c->show_pool);
+	  uint count = rte_feed_count(n);
+	  if (!count)
+	    goto skip;
+
+	  rte **feed = alloca(count * sizeof(rte *));
+	  rte_feed_obtain(n, feed, count);
+	  rte *em = rt_export_merged(ec, feed, count, c->show_pool, 1);
+
 	  if (em)
 	    e = *em;
 	  else
@@ -315,7 +345,7 @@ rt_show_get_default_tables(struct rt_show_data *d)
   {
     WALK_LIST(c, d->export_protocol->channels)
     {
-      if (c->export_state == ES_DOWN)
+      if (!c->out_req.hook)
 	continue;
 
       tab = rt_show_add_table(d, c->table);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 66e63acf..e7ff2816 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -50,13 +50,7 @@ pool *rt_table_pool;
 static linpool *rte_update_pool;
 
 list routing_tables;
-
-struct rt_pending_export {
-  struct rte_storage *new;		/* New route */
-  struct rte_storage *new_best;		/* New best route */
-  struct rte_storage *old;		/* Old route */
-  struct rte_storage *old_best;		/* Old best route */
-};
+list deleted_routing_tables;
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
@@ -64,6 +58,40 @@ static void rt_update_hostcache(rtable *tab);
 static void rt_next_hop_update(rtable *tab);
 static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
+static void rt_feed_channel(void *);
+
+const char *rt_import_state_name_array[TIS_MAX] = {
+  [TIS_DOWN] = "DOWN",
+  [TIS_UP] = "UP",
+  [TIS_STOP] = "STOP",
+  [TIS_FLUSHING] = "FLUSHING",
+  [TIS_WAITING] = "WAITING",
+  [TIS_CLEARED] = "CLEARED",
+};
+
+const char *rt_export_state_name_array[TES_MAX] = {
+  [TES_DOWN] = "DOWN",
+  [TES_HUNGRY] = "HUNGRY",
+  [TES_FEEDING] = "FEEDING",
+  [TES_READY] = "READY",
+  [TES_STOP] = "STOP"
+};
+
+const char *rt_import_state_name(u8 state)
+{
+  if (state >= TIS_MAX)
+    return "!! INVALID !!";
+  else
+    return rt_import_state_name_array[state];
+}
+
+const char *rt_export_state_name(u8 state)
+{
+  if (state >= TES_MAX)
+    return "!! INVALID !!";
+  else
+    return rt_export_state_name_array[state];
+}
 
 
 /* Like fib_route(), but skips empty net entries */
@@ -356,27 +384,44 @@ rte_mergable(rte *pri, rte *sec)
 }
 
 static void
-rte_trace(struct channel *c, rte *e, int dir, const char *msg)
+rte_trace(const char *name, const rte *e, int dir, const char *msg)
 {
-  log(L_TRACE "%s.%s %c %s %N %uL %uG %s",
-      c->proto->name, c->name ?: "?", dir, msg, e->net, e->src->private_id, e->src->global_id,
+  log(L_TRACE "%s %c %s %N %uL %uG %s",
+      name, dir, msg, e->net, e->src->private_id, e->src->global_id,
       rta_dest_name(e->attrs->dest));
 }
 
 static inline void
-rte_trace_in(uint flag, struct channel *c, rte *e, const char *msg)
+channel_rte_trace_in(uint flag, struct channel *c, const rte *e, const char *msg)
 {
   if ((c->debug & flag) || (c->proto->debug & flag))
-    rte_trace(c, e, '>', msg);
+    rte_trace(c->in_req.name, e, '>', msg);
 }
 
 static inline void
-rte_trace_out(uint flag, struct channel *c, rte *e, const char *msg)
+channel_rte_trace_out(uint flag, struct channel *c, const rte *e, const char *msg)
 {
   if ((c->debug & flag) || (c->proto->debug & flag))
-    rte_trace(c, e, '<', msg);
+    rte_trace(c->out_req.name, e, '<', msg);
 }
 
+static inline void
+rt_rte_trace_in(uint flag, struct rt_import_request *req, const rte *e, const char *msg)
+{
+  if (req->trace_routes & flag)
+    rte_trace(req->name, e, '>', msg);
+}
+
+#if 0
+// seems to be unused at all
+static inline void
+rt_rte_trace_out(uint flag, struct rt_export_request *req, const rte *e, const char *msg)
+{
+  if (req->trace_routes & flag)
+    rte_trace(req->name, e, '<', msg);
+}
+#endif
+
 static uint
 rte_feed_count(net *n)
 {
@@ -405,7 +450,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 {
   struct proto *p = c->proto;
   const struct filter *filter = c->out_filter;
-  struct export_stats *stats = &c->export_stats;
+  struct channel_export_stats *stats = &c->export_stats;
 
   /* Do nothing if we have already rejected the route */
   if (silent && bmap_test(&c->export_reject_map, rt->id))
@@ -419,14 +464,14 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 
       stats->updates_rejected++;
       if (v == RIC_REJECT)
-	rte_trace_out(D_FILTERS, c, rt, "rejected by protocol");
+	channel_rte_trace_out(D_FILTERS, c, rt, "rejected by protocol");
       goto reject_noset;
 
     }
   if (v > 0)
     {
       if (!silent)
-	rte_trace_out(D_FILTERS, c, rt, "forced accept by protocol");
+	channel_rte_trace_out(D_FILTERS, c, rt, "forced accept by protocol");
       goto accept;
     }
 
@@ -439,7 +484,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
 	goto reject;
 
       stats->updates_filtered++;
-      rte_trace_out(D_FILTERS, c, rt, "filtered out");
+      channel_rte_trace_out(D_FILTERS, c, rt, "filtered out");
       goto reject;
     }
 
@@ -453,7 +498,6 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
   bmap_set(&c->export_reject_map, rt->id);
 
 reject_noset:
-  /* Invalidate the route */
   /* Discard temporary rte */
   return NULL;
 }
@@ -465,19 +509,19 @@ export_filter(struct channel *c, rte *rt, int silent)
 }
 
 static void
-do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
+do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
 {
   struct proto *p = c->proto;
-  struct export_stats *stats = &c->export_stats;
+  struct channel_export_stats *stats = &c->export_stats;
 
-  if (refeed && new)
+  if (c->refeeding && new)
     c->refeed_count++;
 
   if (!old && new)
     if (CHANNEL_LIMIT_PUSH(c, OUT))
     {
       stats->updates_rejected++;
-      rte_trace_out(D_FILTERS, c, new, "rejected [limit]");
+      channel_rte_trace_out(D_FILTERS, c, new, "rejected [limit]");
       return;
     }
 
@@ -490,7 +534,7 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   {
     if (!rte_update_out(c, net, new, old, &old_exported))
     {
-      rte_trace_out(D_ROUTES, c, new, "idempotent");
+      channel_rte_trace_out(D_ROUTES, c, new, "idempotent");
       return;
     }
   }
@@ -509,11 +553,11 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
   if (p->debug & D_ROUTES)
   {
     if (new && old)
-      rte_trace_out(D_ROUTES, c, new, "replaced");
+      channel_rte_trace_out(D_ROUTES, c, new, "replaced");
     else if (new)
-      rte_trace_out(D_ROUTES, c, new, "added");
+      channel_rte_trace_out(D_ROUTES, c, new, "added");
     else if (old)
-      rte_trace_out(D_ROUTES, c, old, "removed");
+      channel_rte_trace_out(D_ROUTES, c, old, "removed");
   }
 
   p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
@@ -523,13 +567,8 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, rte *old, int ref
 }
 
 static void
-rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old, int refeed)
+rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
 {
-  if (new)
-    c->export_stats.updates_received++;
-  else
-    c->export_stats.withdraws_received++;
-
   if (new)
     new = export_filter(c, new, 0);
 
@@ -539,14 +578,17 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old, int
   if (!new && !old)
     return;
 
-  do_rt_notify(c, net, new, old, refeed);
+  do_rt_notify(c, net, new, old);
 }
 
-static void
-rt_notify_accepted(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
-    struct rte **feed, uint count, int refeed)
+void
+rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe,
+    struct rte **feed, uint count)
 {
-  rte nb0, *new_best = NULL, *old_best = NULL;
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+
+  rte nb0, *new_best = NULL;
+  const rte *old_best = NULL;
 
   for (uint i = 0; i < count; i++)
   {
@@ -554,7 +596,7 @@ rt_notify_accepted(struct channel *c, const net_addr *n, struct rt_pending_expor
       continue;
 
     /* Has been already rejected, won't bother with it */
-    if (!refeed && bmap_test(&c->export_reject_map, feed[i]->id))
+    if (!c->refeeding && bmap_test(&c->export_reject_map, feed[i]->id))
       continue;
 
     /* Previously exported */
@@ -564,7 +606,7 @@ rt_notify_accepted(struct channel *c, const net_addr *n, struct rt_pending_expor
       if (!new_best)
       {
 	DBG("rt_notify_accepted: idempotent\n");
-	return;
+	goto done;
       }
 
       /* is superseded */
@@ -604,10 +646,16 @@ rt_notify_accepted(struct channel *c, const net_addr *n, struct rt_pending_expor
   if (!new_best && !old_best)
   {
     DBG("rt_notify_accepted: nothing to export\n");
-    return;
+    goto done;
   }
 
-  do_rt_notify(c, n, new_best, old_best, refeed);
+  do_rt_notify(c, n, new_best, old_best);
+
+done:
+  /* Drop the old stored rejection if applicable.
+   * new->id == old->id happens when updating hostentries. */
+  if (rpe && rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
+    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
 }
 
 
@@ -617,20 +665,21 @@ nexthop_merge_rta(struct nexthop *nhs, rta *a, linpool *pool, int max)
   return nexthop_merge(nhs, &(a->nh), 1, 0, max, pool);
 }
 
-static rte *
-rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool, int silent, int refeed)
+rte *
+rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool, int silent)
 {
   _Thread_local static rte rloc;
 
   // struct proto *p = c->proto;
   struct nexthop *nhs = NULL;
-  rte *best0 = feed[0], *best = NULL;
+  rte *best0 = feed[0];
+  rte *best = NULL;
 
   if (!rte_is_valid(best0))
     return NULL;
 
   /* Already rejected, no need to re-run the filter */
-  if (!refeed && bmap_test(&c->export_reject_map, best0->id))
+  if (!c->refeeding && bmap_test(&c->export_reject_map, best0->id))
     return NULL;
 
   rloc = *best0;
@@ -672,19 +721,12 @@ rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool
   return best;
 }
 
-rte *
-rt_export_merged_show(struct channel *c, net *n, linpool *pool)
+void
+rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe,
+    struct rte **feed, uint count)
 {
-  uint count = rte_feed_count(n);
-  rte **feed = alloca(count * sizeof(rte *));
-  rte_feed_obtain(n, feed, count);
-  return rt_export_merged(c, feed, count, pool, 1, 0);
-}
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
-static void
-rt_notify_merged(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
-    struct rte **feed, uint count, int refeed)
-{
   // struct proto *p = c->proto;
 
 #if 0 /* TODO: Find whether this check is possible when processing multiple changes at once. */
@@ -724,28 +766,59 @@ rt_notify_merged(struct channel *c, const net_addr *n, struct rt_pending_export
     */
 
   /* Prepare new merged route */
-  rte *new_merged = count ? rt_export_merged(c, feed, count, rte_update_pool, 0, refeed) : NULL;
+  rte *new_merged = count ? rt_export_merged(c, feed, count, rte_update_pool, 0) : NULL;
 
-  if (!new_merged && !old_best)
-    return;
+  if (new_merged || old_best)
+    do_rt_notify(c, n, new_merged, old_best);
 
-  do_rt_notify(c, n, new_merged, old_best, refeed);
+  /* Drop the old stored rejection if applicable.
+   * new->id == old->id happens when updating hostentries. */
+  if (rpe && rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
+    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
 }
 
-static void
-rt_notify_bulk(struct channel *c, const net_addr *n, struct rt_pending_export *rpe,
-    struct rte **feed, uint count, int refeed)
+void
+rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
-  switch (c->ra_mode)
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  rte n0;
+
+  if (rpe->new_best != rpe->old_best)
+    rt_notify_basic(c, net, RTE_COPY(rpe->new_best, &n0), RTE_OR_NULL(rpe->old_best));
+
+  /* Drop the old stored rejection if applicable.
+   * new->id == old->id happens when updating hostentries. */
+  if (rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
+    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
+}
+
+void
+rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  rte n0;
+
+  if (rpe->new != rpe->old)
+    rt_notify_basic(c, net, RTE_COPY(rpe->new, &n0), RTE_OR_NULL(rpe->old));
+
+  /* Drop the old stored rejection if applicable.
+   * new->id == old->id happens when updating hostentries. */
+  if (rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
+    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
+}
+
+void
+rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+
+  for (uint i=0; i<count; i++)
   {
-    case RA_ACCEPTED:
-      return rt_notify_accepted(c, n, rpe, feed, count, refeed);
-    case RA_MERGED:
-      return rt_notify_merged(c, n, rpe, feed, count, refeed);
+    rte n0 = *feed[i];
+    rt_notify_basic(c, net, &n0, NULL);
   }
 }
 
-
 /**
  * rte_announce - announce a routing table change
  * @tab: table the route has been added to
@@ -799,9 +872,9 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if (new_best != old_best)
   {
     if (new_best)
-      new_best->rte.sender->import_stats.pref++;
+      new_best->rte.sender->stats.pref++;
     if (old_best)
-      old_best->rte.sender->import_stats.pref--;
+      old_best->rte.sender->stats.pref--;
 
     if (tab->hostcache)
       rt_notify_hostcache(tab, net);
@@ -809,46 +882,37 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
 
   rt_schedule_notify(tab);
 
-  struct channel *c; node *n;
-  WALK_LIST2(c, n, tab->channels, table_node)
+  struct rt_pending_export rpe = { .new = new, .old = old, .new_best = new_best, .old_best = old_best };
+  uint count = rte_feed_count(net);
+  rte **feed = NULL;
+  if (count)
   {
-    if (c->export_state == ES_DOWN)
+    feed = alloca(count * sizeof(rte *));
+    rte_feed_obtain(net, feed, count);
+  }
+
+  struct rt_export_hook *eh;
+  WALK_LIST(eh, tab->exports)
+  {
+    if (eh->export_state == TES_STOP)
       continue;
 
-    rte n0;
-    switch (c->ra_mode)
-    {
-    case RA_OPTIMAL:
-      if (new_best != old_best)
-	rt_notify_basic(c, net->n.addr, RTE_COPY(new_best, &n0), RTE_OR_NULL(old_best), 0);
-      break;
+    if (new)
+      eh->stats.updates_received++;
+    else
+      eh->stats.withdraws_received++;
 
-    case RA_ANY:
-      if (new != old)
-	rt_notify_basic(c, net->n.addr, RTE_COPY(new, &n0), RTE_OR_NULL(old), 0);
-      break;
-
-    case RA_ACCEPTED:
-    case RA_MERGED:
-      {
-	struct rt_pending_export rpe = { .new = new, .old = old, .new_best = new_best, .old_best = old_best };
-	uint count = rte_feed_count(net);
-	rte **feed = alloca(count * sizeof(rte *));
-	rte_feed_obtain(net, feed, count);
-	rt_notify_bulk(c, net->n.addr, &rpe, feed, count, 0);
-	break;
-      }
-    }
-
-    /* Drop the old stored rejection if applicable.
-     * new->id == old->id happens when updating hostentries. */
-    if (old && (!new || (new->rte.id != old->rte.id)))
-      bmap_clear(&c->export_reject_map, old->rte.id);
+    if (eh->req->export_one)
+      eh->req->export_one(eh->req, net->n.addr, &rpe);
+    else if (eh->req->export_bulk)
+      eh->req->export_bulk(eh->req, net->n.addr, &rpe, feed, count);
+    else
+      bug("Export request must always provide an export method");
   }
 }
 
 static inline int
-rte_validate(rte *e)
+rte_validate(struct channel *ch, rte *e)
 {
   int c;
   const net_addr *n = e->net;
@@ -856,7 +920,7 @@ rte_validate(rte *e)
   if (!net_validate(n))
   {
     log(L_WARN "Ignoring bogus prefix %N received via %s",
-	n, e->sender->proto->name);
+	n, ch->proto->name);
     return 0;
   }
 
@@ -866,21 +930,21 @@ rte_validate(rte *e)
   if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
   {
     log(L_WARN "Ignoring bogus route %N received via %s",
-	n, e->sender->proto->name);
+	n, ch->proto->name);
     return 0;
   }
 
   if (net_type_match(n, NB_DEST) == !e->attrs->dest)
   {
     log(L_WARN "Ignoring route %N with invalid dest %d received via %s",
-	n, e->attrs->dest, e->sender->proto->name);
+	n, e->attrs->dest, ch->proto->name);
     return 0;
   }
 
   if ((e->attrs->dest == RTD_UNICAST) && !nexthop_is_sorted(&(e->attrs->nh)))
   {
     log(L_WARN "Ignoring unsorted multipath route %N received via %s",
-	n, e->sender->proto->name);
+	n, ch->proto->name);
     return 0;
   }
 
@@ -901,11 +965,11 @@ rte_same(rte *x, rte *y)
 static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
 
 static void
-rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
+rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
 {
-  struct proto *p = c->proto;
+  struct rt_import_request *req = c->req;
   struct rtable *table = c->table;
-  struct import_stats *stats = &c->import_stats;
+  struct rt_import_stats *stats = &c->stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
@@ -922,7 +986,7 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
        * source protocol to this routing table through transparent
        * pipes, which is not allowed.
        * We log that and ignore the route. */
-      if (old->sender->proto != p)
+      if (old->sender != c)
 	{
 	  if (!old->generation && !new->generation)
 	    bug("Two protocols claim to author a route with the same rte_src in table %s: %N %s/%u:%u",
@@ -930,8 +994,6 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 
 	  log_rl(&table->rl_pipe, L_ERR "Route source collision in table %s: %N %s/%u:%u",
 		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
-
-	  return;
 	}
 
 	  if (new && rte_same(old, new))
@@ -943,13 +1005,10 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
 	      if (!rte_is_filtered(new))
 		{
 		  stats->updates_ignored++;
-	          rte_trace_in(D_ROUTES, c, new, "ignored");
+		  rt_rte_trace_in(D_ROUTES, req, new, "ignored");
 		}
-
-	    return;
 	  }
 
-
 	*before_old = (*before_old)->next;
 	table->rt_count--;
     }
@@ -960,57 +1019,12 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
       return;
     }
 
+  if (req->preimport)
+    new = req->preimport(req, new, old);
+
   int new_ok = rte_is_ok(new);
   int old_ok = rte_is_ok(old);
 
-  if (!c->in_table)
-  {
-    if (!old && new)
-      if (CHANNEL_LIMIT_PUSH(c, RX))
-      {
-	/* In receive limit the situation is simple, old is NULL so
-	   we just free new and exit like nothing happened */
-
-	stats->updates_ignored++;
-	rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-	return;
-      }
-
-    if (old && !new)
-      CHANNEL_LIMIT_POP(c, RX);
-  }
-
-  if (!old_ok && new_ok)
-    if (CHANNEL_LIMIT_PUSH(c, IN))
-    {
-      /* In import limit the situation is more complicated. We
-	 shouldn't just drop the route, we should handle it like
-	 it was filtered. We also have to continue the route
-	 processing if old or new is non-NULL, but we should exit
-	 if both are NULL as this case is probably assumed to be
-	 already handled. */
-
-      stats->updates_ignored++;
-      rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-
-      if (c->in_keep_filtered)
-	new->flags |= REF_FILTERED;
-      else
-	new = NULL;
-
-      /* Note that old && !new could be possible when
-	 c->in_keep_filtered changed in the recent past. */
-
-      if (!old && !new)
-	return;
-
-      new_ok = 0;
-      goto skip_stats1;
-    }
-
-  if (old_ok && !new_ok)
-    CHANNEL_LIMIT_POP(c, IN);
-
   if (new_ok)
     stats->updates_accepted++;
   else if (old_ok)
@@ -1021,7 +1035,6 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
   if (old_ok || new_ok)
     table->last_rt_change = current_time();
 
- skip_stats1:;
   struct rte_storage *new_stored = new ? rte_store(new, net, table) : NULL;
 
   if (table->config->sorted)
@@ -1126,19 +1139,16 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
     }
 
   /* Log the route change */
-  if ((c->debug & D_ROUTES) || (p->debug & D_ROUTES))
+  if (new_ok)
+    rt_rte_trace_in(D_ROUTES, req, &new_stored->rte, new_stored == net->routes ? "added [best]" : "added");
+  else if (old_ok)
     {
-      if (new_ok)
-	rte_trace(c, &new_stored->rte, '>', new_stored == net->routes ? "added [best]" : "added");
-      else if (old_ok)
-	{
-	  if (old != old_best)
-	    rte_trace(c, old, '>', "removed");
-	  else if (net->routes && rte_is_ok(&net->routes->rte))
-	    rte_trace(c, old, '>', "removed [replaced]");
-	  else
-	    rte_trace(c, old, '>', "removed [sole]");
-	}
+      if (old != old_best)
+	rt_rte_trace_in(D_ROUTES, req, old, "removed");
+      else if (net->routes && rte_is_ok(&net->routes->rte))
+	rt_rte_trace_in(D_ROUTES, req, old, "removed [replaced]");
+      else
+	rt_rte_trace_in(D_ROUTES, req, old, "removed [sole]");
     }
 
   /* Propagate the route change */
@@ -1150,10 +1160,13 @@ rte_recalculate(struct channel *c, net *net, rte *new, struct rte_src *src)
       (table->gc_time + table->config->gc_min_time <= current_time()))
     rt_schedule_prune(table);
 
+#if 0
+  /* Enable and reimplement these callbacks if anybody wants to use them */
   if (old_ok && p->rte_remove)
     p->rte_remove(net, old);
   if (new_ok && p->rte_insert)
     p->rte_insert(net, &new_stored->rte);
+#endif
 
   if (old)
     {
@@ -1179,89 +1192,116 @@ rte_update_unlock(void)
     lp_flush(rte_update_pool);
 }
 
-static int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+rte *
+channel_preimport(struct rt_import_request *req, rte *new, rte *old)
+{
+  struct channel *c = SKIP_BACK(struct channel, in_req, req);
+
+  if (new && !old)
+    if (CHANNEL_LIMIT_PUSH(c, RX))
+      return NULL;
+
+  if (!new && old)
+    CHANNEL_LIMIT_POP(c, RX);
+
+  int new_in = new && !rte_is_filtered(new);
+  int old_in = old && !rte_is_filtered(old);
+
+  if (new_in && !old_in)
+    if (CHANNEL_LIMIT_PUSH(c, IN))
+      if (c->in_keep_filtered)
+      {
+	new->flags |= REF_FILTERED;
+	return new;
+      }
+      else
+	return NULL;
+
+  if (!new_in && old_in)
+    CHANNEL_LIMIT_POP(c, IN);
+
+  return new;
+}
+
+static void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 
 void
 rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
+  if (!c->in_req.hook)
+    return;
+
+  ASSERT(c->channel_state == CS_UP);
+
   if (c->in_table && !rte_update_in(c, n, new, src))
     return;
 
-  struct import_stats *stats = &c->import_stats;
-  const struct filter *filter = c->in_filter;
-  net *nn;
+  return rte_update_direct(c, n, new, src);
+}
 
-  ASSERT(c->channel_state == CS_UP);
+static void
+rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
+{
+  const struct filter *filter = c->in_filter;
+  struct channel_import_stats *stats = &c->import_stats;
 
   rte_update_lock();
   if (new)
     {
       new->net = n;
-      new->sender = c;
+
+      int fr;
 
       stats->updates_received++;
-      if (!rte_validate(new))
+      if (!rte_validate(c, new))
 	{
-	  rte_trace_in(D_FILTERS, c, new, "invalid");
+	  channel_rte_trace_in(D_FILTERS, c, new, "invalid");
 	  stats->updates_invalid++;
-	  goto drop;
+	  new = NULL;
 	}
-
-      if (filter == FILTER_REJECT)
+      else if ((filter == FILTER_REJECT) ||
+	((fr = f_run(filter, new, rte_update_pool, 0)) > F_ACCEPT))
 	{
 	  stats->updates_filtered++;
-	  rte_trace_in(D_FILTERS, c, new, "filtered out");
-
-	  if (! c->in_keep_filtered)
-	    goto drop;
-
-	  /* new is a private copy, i could modify it */
-	  new->flags |= REF_FILTERED;
-	}
-      else if (filter)
-	{
-	  int fr = f_run(filter, new, rte_update_pool, 0);
-	  if (fr > F_ACCEPT)
-	  {
-	    stats->updates_filtered++;
-	    rte_trace_in(D_FILTERS, c, new, "filtered out");
-
-	    if (! c->in_keep_filtered)
-	      goto drop;
+	  channel_rte_trace_in(D_FILTERS, c, new, "filtered out");
 
+	  if (c->in_keep_filtered)
 	    new->flags |= REF_FILTERED;
-	  }
+	  else
+	    new = NULL;
 	}
-
-      /* Use the actual struct network, not the dummy one */
-      nn = net_get(c->table, n);
-      new->net = nn->n.addr;
     }
   else
-    {
-      stats->withdraws_received++;
+    stats->withdraws_received++;
 
-      if (!(nn = net_find(c->table, n)) || !src)
-	{
-	  stats->withdraws_ignored++;
-	  rte_update_unlock();
-	  return;
-	}
+  rte_import(&c->in_req, n, new, src);
+
+  rte_update_unlock();
+}
+
+void
+rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rte_src *src)
+{
+  struct rt_import_hook *hook = req->hook;
+  if (!hook)
+    return;
+
+  net *nn;
+  if (new)
+    {
+      /* Use the actual struct network, not the dummy one */
+      nn = net_get(hook->table, n);
+      new->net = nn->n.addr;
+      new->sender = hook;
+    }
+  else if (!(nn = net_find(hook->table, n)))
+    {
+      req->hook->stats.withdraws_ignored++;
+      return;
     }
 
- recalc:
   /* And recalculate the best route */
-  rte_recalculate(c, nn, new, src);
-
-  rte_update_unlock();
-  return;
-
- drop:
-  new = NULL;
-  if (nn = net_find(c->table, n))
-    goto recalc;
-
-  rte_update_unlock();
+  rte_recalculate(hook, nn, new, src);
 }
 
 /* Independent call to rte_announce(), used from next hop
@@ -1289,7 +1329,7 @@ rte_modify(net *net, rte *old)
 {
   rte_update_lock();
 
-  rte *new = old->sender->proto->rte_modify(old, rte_update_pool);
+  rte *new = old->sender->req->rte_modify(old, rte_update_pool);
   if (new != old)
   {
     if (new)
@@ -1327,6 +1367,127 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
   return v > 0;
 }
 
+static void
+rt_export_stopped(void *data)
+{
+  struct rt_export_hook *hook = data;
+  rtable *tab = hook->table;
+
+  /* Unlist */
+  rem_node(&hook->n);
+
+  /* Reporting the channel as stopped. */
+  hook->stopped(hook->req);
+
+  /* Freeing the hook together with its coroutine. */
+  rfree(hook->pool);
+  rt_unlock_table(tab);
+
+  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+}
+
+
+static inline void
+rt_set_import_state(struct rt_import_hook *hook, u8 state)
+{
+  hook->last_state_change = current_time();
+  hook->import_state = state;
+
+  if (hook->req->log_state_change)
+    hook->req->log_state_change(hook->req, state);
+}
+
+static inline void
+rt_set_export_state(struct rt_export_hook *hook, u8 state)
+{
+  hook->last_state_change = current_time();
+  hook->export_state = state;
+
+  if (hook->req->log_state_change)
+    hook->req->log_state_change(hook->req, state);
+}
+
+void
+rt_request_import(rtable *tab, struct rt_import_request *req)
+{
+  rt_lock_table(tab);
+
+  struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
+
+  DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
+
+  hook->req = req;
+  hook->table = tab;
+
+  rt_set_import_state(hook, TIS_UP);
+
+  hook->n = (node) {};
+  add_tail(&tab->imports, &hook->n);
+}
+
+void
+rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_request *))
+{
+  ASSERT_DIE(req->hook);
+  struct rt_import_hook *hook = req->hook;
+
+  rt_schedule_prune(hook->table);
+
+  rt_set_import_state(hook, TIS_STOP);
+
+  hook->stopped = stopped;
+}
+
+void
+rt_request_export(rtable *tab, struct rt_export_request *req)
+{
+  rt_lock_table(tab);
+
+  pool *p = rp_new(tab->rp, "Export hook");
+  struct rt_export_hook *hook = req->hook = mb_allocz(p, sizeof(struct rt_export_hook));
+  hook->pool = p;
+  hook->lp = lp_new_default(p);
+  
+  hook->req = req;
+  hook->table = tab;
+
+  /* stats zeroed by mb_allocz */
+
+  rt_set_export_state(hook, TES_HUNGRY);
+
+  hook->n = (node) {};
+  add_tail(&tab->exports, &hook->n);
+
+  FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
+
+  DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
+
+  rt_set_export_state(hook, TES_FEEDING);
+
+  hook->event = ev_new_init(p, rt_feed_channel, hook);
+  ev_schedule_work(hook->event);
+}
+
+void
+rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_request *))
+{
+  ASSERT_DIE(req->hook);
+  struct rt_export_hook *hook = req->hook;
+
+  rtable *tab = hook->table;
+
+  /* Stop feeding */
+  ev_postpone(hook->event);
+
+  if (hook->export_state == TES_FEEDING)
+    fit_get(&tab->fib, &hook->feed_fit);
+
+  hook->event->hook = rt_export_stopped;
+  hook->stopped = stopped;
+
+  rt_set_export_state(hook, TES_STOP);
+  ev_schedule(hook->event);
+}
 
 /**
  * rt_refresh_begin - start a refresh cycle
@@ -1343,12 +1504,12 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
  * flag in rt_refresh_end() and then removing such routes in the prune loop.
  */
 void
-rt_refresh_begin(rtable *t, struct channel *c)
+rt_refresh_begin(rtable *t, struct rt_import_request *req)
 {
   FIB_WALK(&t->fib, net, n)
     {
       for (struct rte_storage *e = n->routes; e; e = e->next)
-	if (e->rte.sender == c)
+	if (e->rte.sender == req->hook)
 	  e->rte.flags |= REF_STALE;
     }
   FIB_WALK_END;
@@ -1363,14 +1524,14 @@ rt_refresh_begin(rtable *t, struct channel *c)
  * hook. See rt_refresh_begin() for description of refresh cycles.
  */
 void
-rt_refresh_end(rtable *t, struct channel *c)
+rt_refresh_end(rtable *t, struct rt_import_request *req)
 {
   int prune = 0;
 
   FIB_WALK(&t->fib, net, n)
     {
       for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == c) && (e->rte.flags & REF_STALE))
+	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE))
 	  {
 	    e->rte.flags |= REF_DISCARD;
 	    prune = 1;
@@ -1383,14 +1544,14 @@ rt_refresh_end(rtable *t, struct channel *c)
 }
 
 void
-rt_modify_stale(rtable *t, struct channel *c)
+rt_modify_stale(rtable *t, struct rt_import_request *req)
 {
   int prune = 0;
 
   FIB_WALK(&t->fib, net, n)
     {
       for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == c) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
+	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
 	  {
 	    e->rte.flags |= REF_MODIFY;
 	    prune = 1;
@@ -1426,7 +1587,7 @@ rte_dump(struct rte_storage *e)
 void
 rt_dump(rtable *t)
 {
-  debug("Dump of routing table <%s>\n", t->name);
+  debug("Dump of routing table <%s>%s\n", t->name, t->deleted ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
 #endif
@@ -1452,6 +1613,54 @@ rt_dump_all(void)
 
   WALK_LIST2(t, n, routing_tables, n)
     rt_dump(t);
+
+  WALK_LIST2(t, n, deleted_routing_tables, n)
+    rt_dump(t);
+}
+
+void
+rt_dump_hooks(rtable *tab)
+{
+  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->deleted ? " (deleted)" : "");
+  debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
+      tab->nhu_state, tab->hcu_scheduled, tab->use_count, tab->rt_count);
+  debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
+      tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
+
+  struct rt_import_hook *ih;
+  WALK_LIST(ih, tab->imports)
+  {
+    ih->req->dump_req(ih->req);
+    debug("  Import hook %p requested by %p: pref=%u"
+       " last_state_change=%t import_state=%u stopped=%p\n",
+       ih, ih->req, ih->stats.pref,
+       ih->last_state_change, ih->import_state, ih->stopped);
+  }
+
+  struct rt_export_hook *eh;
+  WALK_LIST(eh, tab->exports)
+  {
+    eh->req->dump_req(eh->req);
+    debug("  Export hook %p requested by %p:"
+       " refeed_pending=%u last_state_change=%t export_state=%u stopped=%p\n",
+       eh, eh->req, eh->refeed_pending, eh->last_state_change, eh->export_state, eh->stopped);
+  }
+  debug("\n");
+}
+
+void
+rt_dump_hooks_all(void)
+{
+  rtable *t;
+  node *n;
+
+  debug("Dump of all table hooks\n");
+
+  WALK_LIST2(t, n, routing_tables, n)
+    rt_dump_hooks(t);
+
+  WALK_LIST2(t, n, deleted_routing_tables, n)
+    rt_dump_hooks(t);
 }
 
 static inline void
@@ -1569,6 +1778,7 @@ rt_subscribe(rtable *tab, struct rt_subscription *s)
 {
   s->tab = tab;
   rt_lock_table(tab);
+  DBG("rt_subscribe(%s)\n", tab->name);
   add_tail(&tab->subscribers, &s->n);
 }
 
@@ -1645,7 +1855,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   if (!(t->internal = cf->internal))
   {
-    init_list(&t->channels);
+    init_list(&t->imports);
+    init_list(&t->exports);
     hmap_init(&t->id_map, p, 1024);
     hmap_set(&t->id_map, 0);
 
@@ -1673,6 +1884,7 @@ rt_init(void)
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
+  init_list(&deleted_routing_tables);
 }
 
 
@@ -1696,7 +1908,7 @@ rt_prune_table(rtable *tab)
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 512;
 
-  struct channel *c;
+  struct rt_import_hook *ih;
   node *n, *x;
 
   DBG("Pruning route table %s\n", tab->name);
@@ -1710,9 +1922,9 @@ rt_prune_table(rtable *tab)
   if (tab->prune_state == 1)
   {
     /* Mark channels to flush */
-    WALK_LIST2(c, n, tab->channels, table_node)
-      if (c->channel_state == CS_FLUSHING)
-	c->flush_active = 1;
+    WALK_LIST2(ih, n, tab->imports, n)
+      if (ih->import_state == TIS_STOP)
+	rt_set_import_state(ih, TIS_FLUSHING);
 
     FIB_ITERATE_INIT(fit, &tab->fib);
     tab->prune_state = 2;
@@ -1724,7 +1936,7 @@ again:
     rescan:
       for (struct rte_storage *e=n->routes; e; e=e->next)
       {
-	if (e->rte.sender->flush_active || (e->rte.flags & REF_DISCARD))
+	if ((e->rte.sender->import_state == TIS_FLUSHING) || (e->rte.flags & REF_DISCARD))
 	  {
 	    if (limit <= 0)
 	      {
@@ -1774,21 +1986,18 @@ again:
   /* state change 2->0, 3->1 */
   tab->prune_state &= 1;
 
-  if (tab->prune_state > 0)
-    ev_schedule(tab->rt_event);
-
-  /* FIXME: This should be handled in a better way */
   rt_prune_sources();
 
   /* Close flushed channels */
-  WALK_LIST2_DELSAFE(c, n, x, tab->channels, table_node)
-    if (c->flush_active)
-      {
-	c->flush_active = 0;
-	channel_set_state(c, CS_DOWN);
-      }
-
-  return;
+  WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
+    if (ih->import_state == TIS_FLUSHING)
+    {
+      rt_set_import_state(ih, TIS_CLEARED);
+      ih->stopped(ih->req);
+      rem_node(&ih->n);
+      mb_free(ih);
+      rt_unlock_table(tab);
+    }
 }
 
 void
@@ -1996,7 +2205,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
   {
     _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
     const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
-    rte_trace_in(D_ROUTES, new->rte.sender, &updates[i].new->rte, best_indicator[nb][ob]);
+    rt_rte_trace_in(D_ROUTES, updates[i].new->rte.sender->req, &updates[i].new->rte, best_indicator[nb][ob]);
     rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
 
@@ -2171,25 +2380,6 @@ rt_commit(struct config *new, struct config *old)
   DBG("\tdone\n");
 }
 
-static inline void
-do_feed_channel(struct channel *c, net *n, rte *e)
-{
-  rte_update_lock();
-  if ((c->ra_mode == RA_ACCEPTED) || (c->ra_mode == RA_MERGED))
-  {
-    uint count = rte_feed_count(n);
-    rte **feed = alloca(count * sizeof(rte *));
-    rte_feed_obtain(n, feed, count);
-    rt_notify_bulk(c, n->n.addr, NULL, feed, count, c->refeeding);
-  }
-  else /* RA_BASIC */
-  {
-    rte e0 = *e;
-    rt_notify_basic(c, n->n.addr, &e0, &e0, c->refeeding);
-  }
-  rte_update_unlock();
-}
-
 /**
  * rt_feed_channel - advertise all routes to a channel
  * @c: channel to be fed
@@ -2199,79 +2389,55 @@ do_feed_channel(struct channel *c, net *n, rte *e)
  * has something to do. (We avoid transferring all the routes in single pass in
  * order not to monopolize CPU time.)
  */
-int
-rt_feed_channel(struct channel *c)
+static void
+rt_feed_channel(void *data)
 {
+  struct rt_export_hook *c = data;
+
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
-  ASSERT(c->export_state == ES_FEEDING);
-
-  if (!c->feed_active)
-    {
-      FIB_ITERATE_INIT(fit, &c->table->fib);
-      c->feed_active = 1;
-    }
+  ASSERT(c->export_state == TES_FEEDING);
 
   FIB_ITERATE_START(&c->table->fib, fit, net, n)
     {
-      struct rte_storage *e = n->routes;
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  return 0;
+	  ev_schedule_work(c->event);
+	  return;
 	}
 
-      if ((c->ra_mode == RA_OPTIMAL) ||
-	  (c->ra_mode == RA_ACCEPTED) ||
-	  (c->ra_mode == RA_MERGED))
-	if (e && rte_is_valid(&e->rte))
-	  {
-	    /* In the meantime, the protocol may fell down */
-	    if (c->export_state != ES_FEEDING)
-	      goto done;
+      if (c->export_state != TES_FEEDING)
+	goto done;
 
-	    do_feed_channel(c, n, &e->rte);
-	    max_feed--;
-	  }
-
-      if (c->ra_mode == RA_ANY)
-	for(e = n->routes; e; e = e->next)
-	  {
-	    /* In the meantime, the protocol may fell down */
-	    if (c->export_state != ES_FEEDING)
-	      goto done;
-
-	    if (!rte_is_valid(&e->rte))
-	      continue;
-
-	    do_feed_channel(c, n, &e->rte);
-	    max_feed--;
-	  }
+      if (c->req->export_bulk)
+      {
+	uint count = rte_feed_count(n);
+	if (count)
+	{
+	  rte_update_lock();
+	  rte **feed = alloca(count * sizeof(rte *));
+	  rte_feed_obtain(n, feed, count);
+	  struct rt_pending_export rpe = { .new_best = n->routes };
+	  c->req->export_bulk(c->req, n->n.addr, &rpe, feed, count);
+	  max_feed -= count;
+	  rte_update_unlock();
+	}
+      }
+      else if (n->routes && rte_is_valid(&n->routes->rte))
+      {
+	rte_update_lock();
+	struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
+	c->req->export_one(c->req, n->n.addr, &rpe);
+	max_feed--;
+	rte_update_unlock();
+      }
     }
   FIB_ITERATE_END;
 
 done:
-  c->feed_active = 0;
-  return 1;
-}
-
-/**
- * rt_feed_baby_abort - abort protocol feeding
- * @c: channel
- *
- * This function is called by the protocol code when the protocol stops or
- * ceases to exist during the feeding.
- */
-void
-rt_feed_channel_abort(struct channel *c)
-{
-  if (c->feed_active)
-    {
-      /* Unlink the iterator */
-      fit_get(&c->table->fib, &c->feed_fit);
-      c->feed_active = 0;
-    }
+  rt_set_export_state(c, TES_READY);
 }
 
 
@@ -2279,7 +2445,7 @@ rt_feed_channel_abort(struct channel *c)
  *	Import table
  */
 
-static int
+int
 rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   struct rtable *tab = c->in_table;
@@ -2332,7 +2498,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 	/* Required by rte_trace_in() */
 	new->net = n;
 
-	rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
+	channel_rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
 	goto drop_update;
       }
     }
@@ -2349,7 +2515,6 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 
   /* Insert the new rte */
   struct rte_storage *e = rte_store(new, net, tab);
-  e->rte.sender = c;
   e->rte.lastmod = current_time();
   e->next = *pos;
   *pos = e;
@@ -2358,7 +2523,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 
 drop_update:
   c->import_stats.updates_received++;
-  c->import_stats.updates_ignored++;
+  c->in_req.hook->stats.updates_ignored++;
 
   if (!net->routes)
     fib_delete(&tab->fib, net);
@@ -2367,7 +2532,7 @@ drop_update:
 
 drop_withdraw:
   c->import_stats.withdraws_received++;
-  c->import_stats.withdraws_ignored++;
+  c->in_req.hook->stats.withdraws_ignored++;
   return 0;
 }
 
@@ -2397,7 +2562,7 @@ rt_reload_channel(struct channel *c)
       }
 
       rte r = e->rte;
-      rte_update(c, r.net, &r, r.src);
+      rte_update_direct(c, r.net, &r, r.src);
     }
 
     c->reload_next_rte = NULL;
@@ -2470,7 +2635,7 @@ again:
  */
 
 int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, struct rte_storage **old_exported)
+rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old0, struct rte_storage **old_exported)
 {
   struct rtable *tab = c->out_table;
   struct rte_src *src;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5c78bfa1..78c36bc7 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -775,25 +775,25 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
       {
       case BGP_GRS_NONE:
 	c->gr_active = BGP_GRS_ACTIVE;
-	rt_refresh_begin(c->c.table, &c->c);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
 	break;
 
       case BGP_GRS_ACTIVE:
-	rt_refresh_end(c->c.table, &c->c);
-	rt_refresh_begin(c->c.table, &c->c);
+	rt_refresh_end(c->c.table, &c->c.in_req);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
 	break;
 
       case BGP_GRS_LLGR:
-	rt_refresh_begin(c->c.table, &c->c);
-	rt_modify_stale(c->c.table, &c->c);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
+	rt_modify_stale(c->c.table, &c->c.in_req);
 	break;
       }
     }
     else
     {
       /* Just flush the routes */
-      rt_refresh_begin(c->c.table, &c->c);
-      rt_refresh_end(c->c.table, &c->c);
+      rt_refresh_begin(c->c.table, &c->c.in_req);
+      rt_refresh_end(c->c.table, &c->c.in_req);
     }
 
     /* Reset bucket and prefix tables */
@@ -834,7 +834,7 @@ bgp_graceful_restart_done(struct bgp_channel *c)
     BGP_TRACE(D_EVENTS, "Neighbor graceful restart done");
 
   tm_stop(c->stale_timer);
-  rt_refresh_end(c->c.table, &c->c);
+  rt_refresh_end(c->c.table, &c->c.in_req);
 }
 
 /**
@@ -876,7 +876,7 @@ bgp_graceful_restart_timeout(timer *t)
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
       tm_start(c->stale_timer, c->stale_time S);
-      rt_modify_stale(c->c.table, &c->c);
+      rt_modify_stale(c->c.table, &c->c.in_req);
     }
   }
   else
@@ -914,10 +914,10 @@ bgp_refresh_begin(struct bgp_channel *c)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
   c->load_state = BFS_REFRESHING;
-  rt_refresh_begin(c->c.table, &c->c);
+  rt_refresh_begin(c->c.table, &c->c.in_req);
 
   if (c->c.in_table)
-    rt_refresh_begin(c->c.in_table, &c->c);
+    rt_refresh_begin(c->c.in_table, &c->c.in_req);
 }
 
 /**
@@ -938,7 +938,7 @@ bgp_refresh_end(struct bgp_channel *c)
   { log(L_WARN "%s: END-OF-RR received without prior BEGIN-OF-RR, ignoring", p->p.name); return; }
 
   c->load_state = BFS_NONE;
-  rt_refresh_end(c->c.table, &c->c);
+  rt_refresh_end(c->c.table, &c->c.in_req);
 
   if (c->c.in_table)
     rt_prune_sync(c->c.in_table, 0);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 74d0e518..bbcd8f0d 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -82,7 +82,7 @@ pipe_preexport(struct channel *c, rte *e)
   struct pipe_proto *p = (void *) c->proto;
 
   /* Avoid direct loopbacks */
-  if (e->sender == c)
+  if (e->sender == c->in_req.hook)
     return -1;
 
   /* Indirection check */
@@ -212,10 +212,15 @@ pipe_get_status(struct proto *P, byte *buf)
 static void
 pipe_show_stats(struct pipe_proto *p)
 {
-  struct import_stats *s1i = &p->pri->import_stats;
-  struct export_stats *s1e = &p->pri->export_stats;
-  struct import_stats *s2i = &p->sec->import_stats;
-  struct export_stats *s2e = &p->sec->export_stats;
+  struct channel_import_stats *s1i = &p->pri->import_stats;
+  struct channel_export_stats *s1e = &p->pri->export_stats;
+  struct channel_import_stats *s2i = &p->sec->import_stats;
+  struct channel_export_stats *s2e = &p->sec->export_stats;
+
+  struct rt_import_stats *rs1i = p->pri->in_req.hook ? &p->pri->in_req.hook->stats : NULL;
+  struct rt_export_stats *rs1e = p->pri->out_req.hook ? &p->pri->out_req.hook->stats : NULL;
+  struct rt_import_stats *rs2i = p->sec->in_req.hook ? &p->sec->in_req.hook->stats : NULL;
+  struct rt_export_stats *rs2e = p->sec->out_req.hook ? &p->sec->out_req.hook->stats : NULL;
 
   u32 pri_routes = p->pri->in_limit.count;
   u32 sec_routes = p->sec->in_limit.count;
@@ -245,21 +250,19 @@ pipe_show_stats(struct pipe_proto *p)
 	  pri_routes, sec_routes);
   cli_msg(-1006, "  Route change stats:     received   rejected   filtered    ignored   accepted");
   cli_msg(-1006, "    Import updates:     %10u %10u %10u %10u %10u",
-	  s2e->updates_received, s2e->updates_rejected + s1i->updates_invalid,
-	  s2e->updates_filtered, s1i->updates_ignored, s1i->updates_accepted);
+	  rs2e->updates_received, s2e->updates_rejected + s1i->updates_invalid,
+	  s2e->updates_filtered, rs1i->updates_ignored, rs1i->updates_accepted);
   cli_msg(-1006, "    Import withdraws:   %10u %10u        --- %10u %10u",
-	  s2e->withdraws_received, s1i->withdraws_invalid,
-	  s1i->withdraws_ignored, s1i->withdraws_accepted);
+	  rs2e->withdraws_received, s1i->withdraws_invalid,
+	  rs1i->withdraws_ignored, rs1i->withdraws_accepted);
   cli_msg(-1006, "    Export updates:     %10u %10u %10u %10u %10u",
-	  s1e->updates_received, s1e->updates_rejected + s2i->updates_invalid,
-	  s1e->updates_filtered, s2i->updates_ignored, s2i->updates_accepted);
+	  rs1e->updates_received, s1e->updates_rejected + s2i->updates_invalid,
+	  s1e->updates_filtered, rs2i->updates_ignored, rs2i->updates_accepted);
   cli_msg(-1006, "    Export withdraws:   %10u %10u        --- %10u %10u",
-	  s1e->withdraws_received, s2i->withdraws_invalid,
-	  s2i->withdraws_ignored, s2i->withdraws_accepted);
+	  rs1e->withdraws_received, s2i->withdraws_invalid,
+	  rs2i->withdraws_ignored, rs2i->withdraws_accepted);
 }
 
-static const char *pipe_feed_state[] = { [ES_DOWN] = "down", [ES_FEEDING] = "feed", [ES_READY] = "up" };
-
 static void
 pipe_show_proto_info(struct proto *P)
 {
@@ -268,8 +271,8 @@ pipe_show_proto_info(struct proto *P)
   cli_msg(-1006, "  Channel %s", "main");
   cli_msg(-1006, "    Table:          %s", p->pri->table->name);
   cli_msg(-1006, "    Peer table:     %s", p->sec->table->name);
-  cli_msg(-1006, "    Import state:   %s", pipe_feed_state[p->sec->export_state]);
-  cli_msg(-1006, "    Export state:   %s", pipe_feed_state[p->pri->export_state]);
+  cli_msg(-1006, "    Import state:   %s", rt_export_state_name(rt_export_get_state(p->sec->out_req.hook)));
+  cli_msg(-1006, "    Export state:   %s", rt_export_state_name(rt_export_get_state(p->pri->out_req.hook)));
   cli_msg(-1006, "    Import filter:  %s", filter_name(p->sec->out_filter));
   cli_msg(-1006, "    Export filter:  %s", filter_name(p->pri->out_filter));
 
diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index a711858c..943485d7 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -661,9 +661,9 @@ rpki_handle_cache_response_pdu(struct rpki_cache *cache, const struct pdu_cache_
        * a refresh cycle.
        */
       if (cache->p->roa4_channel)
-	rt_refresh_begin(cache->p->roa4_channel->table, cache->p->roa4_channel);
+	rt_refresh_begin(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
       if (cache->p->roa6_channel)
-	rt_refresh_begin(cache->p->roa6_channel->table, cache->p->roa6_channel);
+	rt_refresh_begin(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
 
       cache->p->refresh_channels = 1;
     }
@@ -819,9 +819,9 @@ rpki_handle_end_of_data_pdu(struct rpki_cache *cache, const struct pdu_end_of_da
   {
     cache->p->refresh_channels = 0;
     if (cache->p->roa4_channel)
-      rt_refresh_end(cache->p->roa4_channel->table, cache->p->roa4_channel);
+      rt_refresh_end(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
     if (cache->p->roa6_channel)
-      rt_refresh_end(cache->p->roa6_channel->table, cache->p->roa6_channel);
+      rt_refresh_end(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
   }
 
   cache->last_update = current_time();
diff --git a/proto/static/static.c b/proto/static/static.c
index 6e258f6f..f8ac9c81 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -507,19 +507,13 @@ static_shutdown(struct proto *P)
   WALK_LIST(r, cf->routes)
     static_reset_rte(p, r);
 
-  return PS_DOWN;
-}
-
-static void
-static_cleanup(struct proto *P)
-{
-  struct static_proto *p = (void *) P;
-
   if (p->igp_table_ip4)
     rt_unlock_table(p->igp_table_ip4);
 
   if (p->igp_table_ip6)
     rt_unlock_table(p->igp_table_ip6);
+
+  return PS_DOWN;
 }
 
 static void
@@ -777,7 +771,6 @@ struct protocol proto_static = {
   .dump =		static_dump,
   .start =		static_start,
   .shutdown =		static_shutdown,
-  .cleanup =		static_cleanup,
   .reconfigure =	static_reconfigure,
   .copy_config =	static_copy_config,
   .get_route_info =	static_get_route_info,
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 32bfe7fc..40a58442 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -542,6 +542,29 @@ krt_is_installed(struct krt_proto *p, net *n)
   return n->routes && bmap_test(&p->p.main_channel->export_map, n->routes->rte.id);
 }
 
+static uint
+rte_feed_count(net *n)
+{
+  uint count = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+      count++;
+  return count;
+}
+
+static void
+rte_feed_obtain(net *n, rte **feed, uint count)
+{
+  uint i = 0;
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+    if (rte_is_valid(RTE_OR_NULL(e)))
+    {
+      ASSERT_DIE(i < count);
+      feed[i++] = &e->rte;
+    }
+  ASSERT_DIE(i == count);
+}
+
 static struct rte *
 krt_export_net(struct krt_proto *p, net *net)
 {
@@ -549,7 +572,15 @@ krt_export_net(struct krt_proto *p, net *net)
   const struct filter *filter = c->out_filter;
 
   if (c->ra_mode == RA_MERGED)
-    return rt_export_merged_show(c, net, krt_filter_lp);
+  {
+    uint count = rte_feed_count(net);
+    if (!count)
+      return NULL;
+
+    rte **feed = alloca(count * sizeof(rte *));
+    rte_feed_obtain(net, feed, count);
+    return rt_export_merged(c, feed, count, krt_filter_lp, 1);
+  }
 
   static _Thread_local rte rt;
   rt = net->routes->rte;

From b5061659d3cc011118024861c2f048e67affbd39 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 4 Feb 2021 15:08:52 +0100
Subject: [PATCH 014/431] POSIX threads and thread-local storage is needed for
 concurrent execution

---
 aclocal.m4        | 14 ++++++++++++--
 configure.ac      | 46 +++++++++++++++++++---------------------------
 lib/birdlib.h     |  4 ----
 lib/timer.c       | 10 ----------
 sysdep/unix/log.c | 11 -----------
 5 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 1613d680..3405b85b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,6 @@
 dnl ** Additional Autoconf tests for BIRD configure script
 dnl ** (c) 1999 Martin Mares <mj@ucw.cz>
+dnl ** (c) 2021 Maria Matejka <mq@jmq.cz>
 
 AC_DEFUN([BIRD_CHECK_THREAD_LOCAL],
 [
@@ -9,14 +10,23 @@ AC_DEFUN([BIRD_CHECK_THREAD_LOCAL],
     AC_COMPILE_IFELSE([
       AC_LANG_PROGRAM(
         [
-	  _Thread_local static int x = 42;
+	  static _Thread_local int x = 42;
 	],
 	[]
       )
     ],
     [bird_cv_thread_local=yes],
+    [AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+       [
+         static __thread int x = 42;
+       ],
+       []
+      )
+    ],
+    [bird_cv_thread_local=__thread],
     [bird_cv_thread_local=no]
-    )
+    )])
   )
 ])
 
diff --git a/configure.ac b/configure.ac
index 64181d29..5c0cf002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,12 +36,6 @@ AC_ARG_ENABLE([memcheck],
   [enable_memcheck=yes]
 )
 
-AC_ARG_ENABLE([pthreads],
-  [AS_HELP_STRING([--enable-pthreads], [enable POSIX threads support @<:@try@:>@])],
-  [],
-  [enable_pthreads=try]
-)
-
 AC_ARG_ENABLE([libssh],
   [AS_HELP_STRING([--enable-libssh], [enable LibSSH support in RPKI @<:@try@:>@])],
   [],
@@ -125,25 +119,19 @@ if test -z "$GCC" ; then
 fi
 
 BIRD_CHECK_THREAD_LOCAL
-if test "$bird_cv_thread_local" = yes ; then
-  AC_DEFINE([HAVE_THREAD_LOCAL], [1], [Define to 1 if _Thread_local is available])
+if test "$bird_cv_thread_local" = no ; then
+  AC_MSG_ERROR([This program requires thread local storage.])
+elif test "$bird_cv_thread_local" != yes ; then
+  AC_DEFINE_UNQUOTED([_Thread_local], [$bird_cv_thread_local], [Legacy _Thread_local])
 fi
 
-if test "$enable_pthreads" != no ; then
-  BIRD_CHECK_PTHREADS
+BIRD_CHECK_PTHREADS
 
-  if test "$bird_cv_lib_pthreads" = yes ; then
-    AC_DEFINE([USE_PTHREADS], [1], [Define to 1 if pthreads are enabled])
-    CFLAGS="$CFLAGS -pthread"
-    LDFLAGS="$LDFLAGS -pthread"
-    proto_bfd=bfd
-  elif test "$enable_pthreads" = yes ; then
-    AC_MSG_ERROR([POSIX threads not available.])
-  fi
-
-  if test "$enable_pthreads" = try ; then
-    enable_pthreads="$bird_cv_lib_pthreads"
-  fi
+if test "$bird_cv_lib_pthreads" = yes ; then
+  CFLAGS="$CFLAGS -pthread"
+  LDFLAGS="$LDFLAGS -pthread"
+else
+  AC_MSG_ERROR([POSIX threads not available.])
 fi
 
 # This is assumed to be necessary for proper BIRD build
@@ -304,8 +292,7 @@ if test "$enable_mpls_kernel" != no ; then
   fi
 fi
 
-all_protocols="$proto_bfd babel bgp mrt ospf perf pipe radv rip rpki static"
-
+all_protocols="bfd babel bgp mrt ospf perf pipe radv rip rpki static"
 all_protocols=`echo $all_protocols | sed 's/ /,/g'`
 
 if test "$with_protocols" = all ; then
@@ -351,9 +338,15 @@ case $sysdesc in
 esac
 
 AC_CHECK_HEADERS_ONCE([alloca.h syslog.h])
-AC_CHECK_HEADER([sys/mman.h], [AC_DEFINE([HAVE_MMAP], [1], [Define to 1 if mmap() is available.])])
+AC_CHECK_HEADER([sys/mman.h], [AC_DEFINE([HAVE_MMAP], [1], [Define to 1 if mmap() is available.])], have_mman=no)
+AC_CHECK_FUNC([aligned_alloc], [AC_DEFINE([HAVE_ALIGNED_ALLOC], [1], [Define to 1 if aligned_alloc() is available.])], have_aligned_alloc=no)
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [#include <sys/socket.h>])
 
+if test "$have_aligned_alloc" = "no" && test "$have_mman" = "no" ; then
+  AC_MSG_ERROR([No means of aligned alloc found. Need mmap() or aligned_alloc().])
+fi
+
+
 AC_C_BIGENDIAN(
   [AC_DEFINE([CPU_BIG_ENDIAN], [1], [Define to 1 if cpu is big endian])],
   [AC_DEFINE([CPU_LITTLE_ENDIAN], [1], [Define to 1 if cpu is little endian])],
@@ -402,7 +395,7 @@ if test "$enable_debug" = yes ; then
     fi
   fi
 
-  if test "enable_debug_expensive" = yes ; then
+  if test "$enable_debug_expensive" = yes ; then
     AC_DEFINE([ENABLE_EXPENSIVE_CHECKS], [1], [Define to 1 if you want to run expensive consistency checks.])
   fi
 fi
@@ -467,7 +460,6 @@ AC_MSG_RESULT([        Object directory:	$objdir])
 AC_MSG_RESULT([        Iproute2 directory:	$iproutedir])
 AC_MSG_RESULT([        System configuration:	$sysdesc])
 AC_MSG_RESULT([        Debugging:		$enable_debug])
-AC_MSG_RESULT([        POSIX threads:		$enable_pthreads])
 AC_MSG_RESULT([        Routing protocols:	$protocols])
 AC_MSG_RESULT([        LibSSH support in RPKI:	$enable_libssh])
 AC_MSG_RESULT([        Kernel MPLS support:	$enable_mpls_kernel])
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 2e642d38..dc8bd00f 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -77,10 +77,6 @@ static inline int u64_cmp(u64 i1, u64 i2)
 #define STATIC_ASSERT(EXP) _Static_assert(EXP, #EXP)
 #define STATIC_ASSERT_MSG(EXP,MSG) _Static_assert(EXP, MSG)
 
-#ifndef HAVE_THREAD_LOCAL
-#define _Thread_local
-#endif
-
 /* Microsecond time */
 
 typedef s64 btime;
diff --git a/lib/timer.c b/lib/timer.c
index 381163d0..f978a0f3 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -40,8 +40,6 @@
 struct timeloop main_timeloop;
 
 
-#ifdef USE_PTHREADS
-
 #include <pthread.h>
 
 /* Data accessed and modified from proto/bfd/io.c */
@@ -62,14 +60,6 @@ timeloop_init_current(void)
 
 void wakeup_kick_current(void);
 
-#else
-
-/* Just use main timelooop */
-static inline struct timeloop * timeloop_current(void) { return &main_timeloop; }
-static inline void timeloop_init_current(void) { }
-
-#endif
-
 btime
 current_time(void)
 {
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 4e9df069..a23903b7 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -36,8 +36,6 @@ static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
 
-#ifdef USE_PTHREADS
-
 #include <pthread.h>
 
 static pthread_mutex_t log_mutex;
@@ -48,15 +46,6 @@ static pthread_t main_thread;
 void main_thread_init(void) { main_thread = pthread_self(); }
 static int main_thread_self(void) { return pthread_equal(pthread_self(), main_thread); }
 
-#else
-
-static inline void log_lock(void) {  }
-static inline void log_unlock(void) {  }
-void main_thread_init(void) { }
-static int main_thread_self(void) { return 1; }
-
-#endif
-
 
 #ifdef HAVE_SYSLOG_H
 #include <sys/syslog.h>

From feb17ced234bad13ae64b52a3f86241f74517997 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 18 Jun 2021 18:10:42 +0200
Subject: [PATCH 015/431] Dropping the POSIX thread-local variables in favor of
 much easier-to-use C11 thread-local variables

---
 lib/timer.c    | 47 ++++++++++++++------------------------------
 lib/timer.h    |  1 +
 proto/bfd/io.c | 53 +++++++++++++-------------------------------------
 3 files changed, 29 insertions(+), 72 deletions(-)

diff --git a/lib/timer.c b/lib/timer.c
index f978a0f3..6efcadb4 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -43,38 +43,23 @@ struct timeloop main_timeloop;
 #include <pthread.h>
 
 /* Data accessed and modified from proto/bfd/io.c */
-pthread_key_t current_time_key;
-
-static inline struct timeloop *
-timeloop_current(void)
-{
-  return pthread_getspecific(current_time_key);
-}
-
-static inline void
-timeloop_init_current(void)
-{
-  pthread_key_create(&current_time_key, NULL);
-  pthread_setspecific(current_time_key, &main_timeloop);
-}
+_Thread_local struct timeloop *local_timeloop;
 
 void wakeup_kick_current(void);
 
 btime
 current_time(void)
 {
-  return timeloop_current()->last_time;
+  return local_timeloop->last_time;
 }
 
 btime
 current_real_time(void)
 {
-  struct timeloop *loop = timeloop_current();
+  if (!local_timeloop->real_time)
+    times_update_real_time(local_timeloop);
 
-  if (!loop->real_time)
-    times_update_real_time(loop);
-
-  return loop->real_time;
+  return local_timeloop->real_time;
 }
 
 
@@ -128,30 +113,29 @@ tm_new(pool *p)
 void
 tm_set(timer *t, btime when)
 {
-  struct timeloop *loop = timeloop_current();
-  uint tc = timers_count(loop);
+  uint tc = timers_count(local_timeloop);
 
   if (!t->expires)
   {
     t->index = ++tc;
     t->expires = when;
-    BUFFER_PUSH(loop->timers) = t;
-    HEAP_INSERT(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP);
+    BUFFER_PUSH(local_timeloop->timers) = t;
+    HEAP_INSERT(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP);
   }
   else if (t->expires < when)
   {
     t->expires = when;
-    HEAP_INCREASE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
+    HEAP_INCREASE(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
   }
   else if (t->expires > when)
   {
     t->expires = when;
-    HEAP_DECREASE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
+    HEAP_DECREASE(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
   }
 
 #ifdef CONFIG_BFD
   /* Hack to notify BFD loops */
-  if ((loop != &main_timeloop) && (t->index == 1))
+  if ((local_timeloop != &main_timeloop) && (t->index == 1))
     wakeup_kick_current();
 #endif
 }
@@ -168,11 +152,10 @@ tm_stop(timer *t)
   if (!t->expires)
     return;
 
-  struct timeloop *loop = timeloop_current();
-  uint tc = timers_count(loop);
+  uint tc = timers_count(local_timeloop);
 
-  HEAP_DELETE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
-  BUFFER_POP(loop->timers);
+  HEAP_DELETE(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
+  BUFFER_POP(local_timeloop->timers);
 
   t->index = -1;
   t->expires = 0;
@@ -230,7 +213,7 @@ void
 timer_init(void)
 {
   timers_init(&main_timeloop, &root_pool);
-  timeloop_init_current();
+  local_timeloop = &main_timeloop;
 }
 
 
diff --git a/lib/timer.h b/lib/timer.h
index c5ea430c..bc568ee6 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -42,6 +42,7 @@ static inline timer *timers_first(struct timeloop *loop)
 { return (loop->timers.used > 1) ? loop->timers.data[1] : NULL; }
 
 extern struct timeloop main_timeloop;
+extern _Thread_local struct timeloop *local_timeloop;
 
 btime current_time(void);
 btime current_real_time(void);
diff --git a/proto/bfd/io.c b/proto/bfd/io.c
index 1cd9365a..8fdc84fb 100644
--- a/proto/bfd/io.c
+++ b/proto/bfd/io.c
@@ -52,29 +52,15 @@ struct birdloop
  *	Current thread context
  */
 
-static pthread_key_t current_loop_key;
-extern pthread_key_t current_time_key;
-
-static inline struct birdloop *
-birdloop_current(void)
-{
-  return pthread_getspecific(current_loop_key);
-}
+static _Thread_local struct birdloop *birdloop_current;
 
 static inline void
 birdloop_set_current(struct birdloop *loop)
 {
-  pthread_setspecific(current_loop_key, loop);
-  pthread_setspecific(current_time_key, loop ? &loop->time : &main_timeloop);
+  birdloop_current = loop;
+  local_timeloop = loop ? &loop->time : &main_timeloop;
 }
 
-static inline void
-birdloop_init_current(void)
-{
-  pthread_key_create(&current_loop_key, NULL);
-}
-
-
 /*
  *	Wakeup code for birdloop
  */
@@ -162,10 +148,8 @@ wakeup_kick(struct birdloop *loop)
 void
 wakeup_kick_current(void)
 {
-  struct birdloop *loop = birdloop_current();
-
-  if (loop && loop->poll_active)
-    wakeup_kick(loop);
+  if (birdloop_current && birdloop_current->poll_active)
+    wakeup_kick(birdloop_current);
 }
 
 
@@ -195,15 +179,13 @@ events_fire(struct birdloop *loop)
 void
 ev2_schedule(event *e)
 {
-  struct birdloop *loop = birdloop_current();
-
-  if (loop->poll_active && EMPTY_LIST(loop->event_list))
-    wakeup_kick(loop);
+  if (birdloop_current->poll_active && EMPTY_LIST(birdloop_current->event_list))
+    wakeup_kick(birdloop_current);
 
   if (e->n.next)
     rem_node(&e->n);
 
-  add_tail(&loop->event_list, &e->n);
+  add_tail(&birdloop_current->event_list, &e->n);
 }
 
 
@@ -238,9 +220,7 @@ sockets_add(struct birdloop *loop, sock *s)
 void
 sk_start(sock *s)
 {
-  struct birdloop *loop = birdloop_current();
-
-  sockets_add(loop, s);
+  sockets_add(birdloop_current, s);
 }
 
 static void
@@ -261,14 +241,12 @@ sockets_remove(struct birdloop *loop, sock *s)
 void
 sk_stop(sock *s)
 {
-  struct birdloop *loop = birdloop_current();
+  sockets_remove(birdloop_current, s);
 
-  sockets_remove(loop, s);
-
-  if (loop->poll_active)
+  if (birdloop_current->poll_active)
   {
-    loop->close_scheduled = 1;
-    wakeup_kick(loop);
+    birdloop_current->close_scheduled = 1;
+    wakeup_kick(birdloop_current);
   }
   else
     close(s->fd);
@@ -392,11 +370,6 @@ static void * birdloop_main(void *arg);
 struct birdloop *
 birdloop_new(void)
 {
-  /* FIXME: this init should be elsewhere and thread-safe */
-  static int init = 0;
-  if (!init)
-    { birdloop_init_current(); init = 1; }
-
   pool *p = rp_new(NULL, "Birdloop root");
   struct birdloop *loop = mb_allocz(p, sizeof(struct birdloop));
   loop->pool = p;

From 1db83a507a9ae287815d62733d1337074993b433 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 4 Feb 2021 15:52:42 +0100
Subject: [PATCH 016/431] Locking subsystem: Just a global BIRD lock to begin
 with.

---
 lib/birdlib.h           |   1 +
 lib/lists.c             |   2 +-
 lib/locking.h           |  46 ++++++++++++++++++
 sysdep/unix/Makefile    |   2 +-
 sysdep/unix/coroutine.c | 102 ++++++++++++++++++++++++++++++++++++++++
 sysdep/unix/io.c        |   3 ++
 sysdep/unix/main.c      |   3 ++
 7 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 lib/locking.h
 create mode 100644 sysdep/unix/coroutine.c

diff --git a/lib/birdlib.h b/lib/birdlib.h
index dc8bd00f..3dc39d19 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -9,6 +9,7 @@
 #ifndef _BIRD_BIRDLIB_H_
 #define _BIRD_BIRDLIB_H_
 
+#include "sysdep/config.h"
 #include "lib/alloca.h"
 
 /* Ugly structure offset handling macros */
diff --git a/lib/lists.c b/lib/lists.c
index 58d51073..dc2e4cbb 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -26,7 +26,7 @@
 
 #define _BIRD_LISTS_C_
 
-#include "nest/bird.h"
+#include "lib/birdlib.h"
 #include "lib/lists.h"
 
 LIST_INLINE int
diff --git a/lib/locking.h b/lib/locking.h
new file mode 100644
index 00000000..eb1bc8fa
--- /dev/null
+++ b/lib/locking.h
@@ -0,0 +1,46 @@
+/*
+ *	BIRD Library -- Locking
+ *
+ *	(c) 2020--2021 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LOCKING_H_
+#define _BIRD_LOCKING_H_
+
+struct domain_generic;
+
+/* Here define the global lock order; first to last. */
+struct lock_order {
+  struct domain_generic *the_bird;
+};
+
+#define LOCK_ORDER_DEPTH  (sizeof(struct lock_order) / sizeof(struct domain_generic *))
+
+extern _Thread_local struct lock_order locking_stack;
+extern _Thread_local struct domain_generic **last_locked;
+
+#define DOMAIN(type) struct domain__##type
+#define DEFINE_DOMAIN(type) DOMAIN(type) { struct domain_generic *type; }
+
+#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name) }
+struct domain_generic *domain_new(const char *name);
+
+#define DOMAIN_NULL(type)   (DOMAIN(type)) {}
+
+#define LOCK_DOMAIN(type, d)	do_lock(((d).type), &(locking_stack.type))
+#define UNLOCK_DOMAIN(type, d)  do_unlock(((d).type), &(locking_stack.type))
+
+/* Internal for locking */
+void do_lock(struct domain_generic *dg, struct domain_generic **lsp);
+void do_unlock(struct domain_generic *dg, struct domain_generic **lsp);
+
+/* Use with care. To be removed in near future. */
+DEFINE_DOMAIN(the_bird);
+extern DOMAIN(the_bird) the_bird_domain;
+
+#define the_bird_lock()		LOCK_DOMAIN(the_bird, the_bird_domain)
+#define the_bird_unlock()	UNLOCK_DOMAIN(the_bird, the_bird_domain)
+
+#endif
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index d0d36b5f..69cf8131 100644
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -1,4 +1,4 @@
-src := alloc.c io.c krt.c log.c main.c random.c
+src := alloc.c io.c krt.c log.c main.c random.c coroutine.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
new file mode 100644
index 00000000..05f101fb
--- /dev/null
+++ b/sysdep/unix/coroutine.c
@@ -0,0 +1,102 @@
+/*
+ *	BIRD Coroutines
+ *
+ *	(c) 2017 Martin Mares <mj@ucw.cz>
+ *	(c) 2020 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#undef LOCAL_DEBUG
+
+#undef DEBUG_LOCKING
+
+#include "lib/birdlib.h"
+#include "lib/locking.h"
+#include "lib/resource.h"
+
+/*
+ *	Implementation of coroutines based on POSIX threads
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdatomic.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/*
+ *	Locking subsystem
+ */
+
+#define ASSERT_NO_LOCK	ASSERT_DIE(last_locked == NULL)
+
+struct domain_generic {
+  pthread_mutex_t mutex;
+  struct domain_generic **prev;
+  struct lock_order *locked_by;
+  const char *name;
+};
+
+#define DOMAIN_INIT(_name) { .mutex = PTHREAD_MUTEX_INITIALIZER, .name = _name }
+
+static struct domain_generic the_bird_domain_gen = DOMAIN_INIT("The BIRD");
+
+DOMAIN(the_bird) the_bird_domain = { .the_bird = &the_bird_domain_gen };
+
+struct domain_generic *
+domain_new(const char *name)
+{
+  struct domain_generic *dg = xmalloc(sizeof(struct domain_generic));
+  *dg = (struct domain_generic) DOMAIN_INIT(name);
+  return dg;
+}
+
+void
+domain_free(struct domain_generic *dg)
+{
+  pthread_mutex_destroy(&dg->mutex);
+  xfree(dg);
+}
+
+_Thread_local struct lock_order locking_stack = {};
+_Thread_local struct domain_generic **last_locked = NULL;
+
+void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
+{
+  if (lsp <= last_locked)
+    bug("Trying to lock in a bad order");
+  if (*lsp)
+    bug("Inconsistent locking stack state on lock");
+
+  pthread_mutex_lock(&dg->mutex);
+
+  if (dg->prev || dg->locked_by)
+    bug("Previous unlock not finished correctly");
+  dg->prev = last_locked;
+  *lsp = dg;
+  last_locked = lsp;
+  dg->locked_by = &locking_stack;
+}
+
+void do_unlock(struct domain_generic *dg, struct domain_generic **lsp)
+{
+  if (dg->locked_by != &locking_stack)
+    bug("Inconsistent domain state on unlock");
+  if ((last_locked != lsp) || (*lsp != dg))
+    bug("Inconsistent locking stack state on unlock");
+  dg->locked_by = NULL;
+  last_locked = dg->prev;
+  *lsp = NULL;
+  dg->prev = NULL;
+  pthread_mutex_unlock(&dg->mutex);
+}
+
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 3d67d0a7..29467867 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -36,6 +36,7 @@
 #include "lib/resource.h"
 #include "lib/socket.h"
 #include "lib/event.h"
+#include "lib/locking.h"
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "nest/iface.h"
@@ -2263,7 +2264,9 @@ io_loop(void)
 
       /* And finally enter poll() to find active sockets */
       watchdog_stop();
+      the_bird_unlock();
       pout = poll(pfd, nfds, poll_tout);
+      the_bird_lock();
       watchdog_start();
 
       if (pout < 0)
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 7e8ea0dc..dabfc554 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -28,6 +28,7 @@
 #include "lib/resource.h"
 #include "lib/socket.h"
 #include "lib/event.h"
+#include "lib/locking.h"
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "nest/route.h"
@@ -959,6 +960,8 @@ main(int argc, char **argv)
       dup2(0, 2);
     }
 
+  the_bird_lock();
+
   main_thread_init();
 
   write_pid_file();

From 2d7e42cc593b3c99f8eacaaa506194aeb3a5cf85 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 13 Oct 2021 11:33:48 +0200
Subject: [PATCH 017/431] Type checking in SKIP_BACK macro

---
 lib/birdlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 431b7c0d..2e642d38 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -16,7 +16,7 @@
 struct align_probe { char x; long int y; };
 
 #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
-#define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
+#define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); ASSERT_DIE(&_ptr->i == p); _ptr; })
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define CPU_STRUCT_ALIGN (sizeof(struct align_probe))
 

From 1289c1c5eede5b3d015d06b725d30024ccac51bd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 Feb 2021 09:51:59 +0100
Subject: [PATCH 018/431] Coroutines: A simple and lightweight parallel
 execution framework.

---
 lib/coro.h              | 26 ++++++++++++++++
 sysdep/unix/coroutine.c | 69 +++++++++++++++++++++++++++++++++++++++++
 sysdep/unix/io.c        | 27 +++++++++++++++-
 sysdep/unix/log.c       | 34 ++++++++++++++++++--
 sysdep/unix/unix.h      |  1 +
 5 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 lib/coro.h

diff --git a/lib/coro.h b/lib/coro.h
new file mode 100644
index 00000000..51712b36
--- /dev/null
+++ b/lib/coro.h
@@ -0,0 +1,26 @@
+/*
+ *	BIRD Coroutines
+ *
+ *	(c) 2017 Martin Mares <mj@ucw.cz>
+ *	(c) 2020 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_CORO_H_
+#define _BIRD_CORO_H_
+
+#include "lib/resource.h"
+
+/* A completely opaque coroutine handle. */
+struct coroutine;
+
+/* Coroutines are independent threads bound to pools.
+ * You request a coroutine by calling coro_run().
+ * It is forbidden to free a running coroutine from outside.
+ * The running coroutine must free itself by rfree() before returning.
+ */
+struct coroutine *coro_run(pool *, void (*entry)(void *), void *data);
+
+
+#endif
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 05f101fb..71847505 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -17,7 +17,14 @@
 
 #include "lib/birdlib.h"
 #include "lib/locking.h"
+#include "lib/coro.h"
 #include "lib/resource.h"
+#include "lib/timer.h"
+
+/* Using a rather big stack for coroutines to allow for stack-local allocations.
+ * In real world, the kernel doesn't alloc this memory until it is used.
+ * */
+#define CORO_STACK_SIZE	1048576
 
 /*
  *	Implementation of coroutines based on POSIX threads
@@ -100,3 +107,65 @@ void do_unlock(struct domain_generic *dg, struct domain_generic **lsp)
   pthread_mutex_unlock(&dg->mutex);
 }
 
+/* Coroutines */
+struct coroutine {
+  resource r;
+  pthread_t id;
+  pthread_attr_t attr;
+  void (*entry)(void *);
+  void *data;
+};
+
+static _Thread_local _Bool coro_cleaned_up = 0;
+
+static void coro_free(resource *r)
+{
+  struct coroutine *c = (void *) r;
+  ASSERT_DIE(pthread_equal(pthread_self(), c->id));
+  pthread_attr_destroy(&c->attr);
+  coro_cleaned_up = 1;
+}
+
+static struct resclass coro_class = {
+  .name = "Coroutine",
+  .size = sizeof(struct coroutine),
+  .free = coro_free,
+};
+
+static void *coro_entry(void *p)
+{
+  struct coroutine *c = p;
+  ASSERT_DIE(c->entry);
+
+  c->entry(c->data);
+  ASSERT_DIE(coro_cleaned_up);
+
+  return NULL;
+}
+
+struct coroutine *coro_run(pool *p, void (*entry)(void *), void *data)
+{
+  ASSERT_DIE(entry);
+  ASSERT_DIE(p);
+
+  struct coroutine *c = ralloc(p, &coro_class);
+
+  c->entry = entry;
+  c->data = data;
+
+  int e = 0;
+
+  if (e = pthread_attr_init(&c->attr))
+    die("pthread_attr_init() failed: %M", e);
+
+  if (e = pthread_attr_setstacksize(&c->attr, CORO_STACK_SIZE))
+    die("pthread_attr_setstacksize(%u) failed: %M", CORO_STACK_SIZE, e);
+
+  if (e = pthread_attr_setdetachstate(&c->attr, PTHREAD_CREATE_DETACHED))
+    die("pthread_attr_setdetachstate(PTHREAD_CREATE_DETACHED) failed: %M", e);
+
+  if (e = pthread_create(&c->id, &c->attr, coro_entry, c))
+    die("pthread_create() failed: %M", e);
+
+  return c;
+}
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 29467867..40841ea4 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2176,6 +2176,15 @@ static int short_loops = 0;
 #define SHORT_LOOP_MAX 10
 #define WORK_EVENTS_MAX 10
 
+static int poll_reload_pipe[2];
+
+void
+io_loop_reload(void)
+{
+  char b;
+  write(poll_reload_pipe[1], &b, 1);
+}
+
 void
 io_loop(void)
 {
@@ -2187,6 +2196,9 @@ io_loop(void)
   int fdmax = 256;
   struct pollfd *pfd = xmalloc(fdmax * sizeof(struct pollfd));
 
+  if (pipe(poll_reload_pipe) < 0)
+    die("pipe(poll_reload_pipe) failed: %m");
+
   watchdog_start1();
   for(;;)
     {
@@ -2205,7 +2217,12 @@ io_loop(void)
 	poll_tout = MIN(poll_tout, timeout);
       }
 
-      nfds = 0;
+      /* A hack to reload main io_loop() when something has changed asynchronously. */
+      pfd[0].fd = poll_reload_pipe[0];
+      pfd[0].events = POLLIN;
+
+      nfds = 1;
+
       WALK_LIST(n, sock_list)
 	{
 	  pfd[nfds] = (struct pollfd) { .fd = -1 }; /* everything other set to 0 by this */
@@ -2277,6 +2294,14 @@ io_loop(void)
 	}
       if (pout)
 	{
+	  if (pfd[0].revents & POLLIN)
+	  {
+	    /* IO loop reload requested */
+	    char b;
+	    read(poll_reload_pipe[0], &b, 1);
+	    continue;
+	  }
+
 	  times_update(&main_timeloop);
 
 	  /* guaranteed to be non-empty */
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index a23903b7..dc2b14b3 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -15,6 +15,7 @@
  * user's manual.
  */
 
+#include <stdatomic.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -35,6 +36,10 @@ static FILE *dbgf;
 static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
+static _Atomic uint max_coro_id = ATOMIC_VAR_INIT(1);
+static _Thread_local uint this_coro_id;
+
+#define THIS_CORO_ID  (this_coro_id ?: (this_coro_id = atomic_fetch_add_explicit(&max_coro_id, 1, memory_order_acq_rel)))
 
 #include <pthread.h>
 
@@ -178,7 +183,7 @@ log_commit(int class, buffer *buf)
 		l->pos += msg_len;
 	      }
 
-	      fprintf(l->fh, "%s <%s> ", tbuf, class_names[class]);
+	      fprintf(l->fh, "%s [%04x] <%s> ", tbuf, THIS_CORO_ID, class_names[class]);
 	    }
 	  fputs(buf->start, l->fh);
 	  fputc('\n', l->fh);
@@ -288,6 +293,8 @@ die(const char *msg, ...)
   exit(1);
 }
 
+static struct timespec dbg_time_start;
+
 /**
  * debug - write to debug output
  * @msg: a printf-like message
@@ -300,12 +307,33 @@ debug(const char *msg, ...)
 {
 #define MAX_DEBUG_BUFSIZE 16384
   va_list args;
-  char buf[MAX_DEBUG_BUFSIZE];
+  char buf[MAX_DEBUG_BUFSIZE], *pos = buf;
+  int max = MAX_DEBUG_BUFSIZE;
 
   va_start(args, msg);
   if (dbgf)
     {
-      if (bvsnprintf(buf, MAX_DEBUG_BUFSIZE, msg, args) < 0)
+      struct timespec dbg_time;
+      clock_gettime(CLOCK_MONOTONIC, &dbg_time);
+      uint nsec;
+      uint sec;
+
+      if (dbg_time.tv_nsec > dbg_time_start.tv_nsec)
+      {
+	nsec = dbg_time.tv_nsec - dbg_time_start.tv_nsec;
+	sec = dbg_time.tv_sec - dbg_time_start.tv_sec;
+      }
+      else
+      {
+	nsec = 1000000000 + dbg_time.tv_nsec - dbg_time_start.tv_nsec;
+	sec = dbg_time.tv_sec - dbg_time_start.tv_sec - 1;
+      }
+
+      int n = bsnprintf(pos, max, "%u.%09u: [%04x] ", sec, nsec, THIS_CORO_ID);
+      pos += n;
+      max -= n;
+
+      if (bvsnprintf(pos, max, msg, args) < 0)
 	bug("Extremely long debug output, split it.");
 
       fputs(buf, dbgf);
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index ad85d1ea..313c97c3 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -106,6 +106,7 @@ extern volatile sig_atomic_t async_shutdown_flag;
 
 void io_init(void);
 void io_loop(void);
+void io_loop_reload(void);
 void io_log_dump(void);
 int sk_open_unix(struct birdsock *s, char *name);
 struct rfile *rf_open(struct pool *, const char *name, const char *mode);

From b5ca6a79d36549fcc5b934b8ffc283f15b8da4a5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 13 Oct 2021 14:50:02 +0200
Subject: [PATCH 019/431] GDB: SKIP_BACK and linked list tools

---
 bird-gdb.py | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 1 deletion(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index 3cf65a9c..c7351d6b 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -123,7 +123,7 @@ class BIRDFLinePrinter(BIRDPrinter):
                         "n": n,
                         "code": str(self.val['items'][n]['fi_code']),
                     } if n % 8 == 0 else str(self.val['items'][n]['fi_code']) for n in range(cnt)]))
-        
+
 
 class BIRDFExecStackPrinter(BIRDPrinter):
     "Print BIRD's struct f_exec_stack"
@@ -141,6 +141,118 @@ class BIRDFExecStackPrinter(BIRDPrinter):
                     "n": n
                         } for n in range(cnt-1, -1, -1) ])
 
+
+class BIRD:
+    def skip_back(t, i, v):
+        if isinstance(t, str):
+            t = gdb.lookup_type(t)
+        elif isinstance(t, gdb.Value):
+            t = gdb.lookup_type(t.string())
+        elif not isinstance(t, gdb.Type):
+            raise Exception(f"First argument of skip_back(t, i, v) must be a type, got {type(t)}")
+
+        t = t.strip_typedefs()
+        nullptr = gdb.Value(0).cast(t.pointer())
+
+        if isinstance(i, gdb.Value):
+            i = i.string()
+        elif not isinstance(i, str):
+            raise Exception(f"Second argument of skip_back(t, i, v) must be a item name, got {type(i)}")
+
+        if not isinstance(v, gdb.Value):
+            raise Exception(f"Third argument of skip_back(t, i, v) must be a value, got {type(v)}")
+        if v.type.code != gdb.TYPE_CODE_PTR and v.type.code != gdb.TYPE_CODE_REF:
+            raise Exception(f"Third argument of skip_back(t, i, v) must be a pointer, is {v.type} ({v.type.code})")
+        if v.type.target().strip_typedefs() != nullptr[i].type:
+            raise Exception(f"Third argument of skip_back(t, i, v) points to type {v.type.target().strip_typedefs()}, should be {nullptr[i].type}")
+
+        uintptr_t = gdb.lookup_type("uintptr_t")
+        taddr = v.dereference().address.cast(uintptr_t) - nullptr[i].address.cast(uintptr_t)
+        return gdb.Value(taddr).cast(t.pointer())
+
+    class skip_back_gdb(gdb.Function):
+        "Given address of a structure item, returns address of the structure, as the SKIP_BACK macro does"
+        def __init__(self):
+            gdb.Function.__init__(self, "SKIP_BACK")
+
+        def invoke(self, t, i, v):
+            return BIRD.skip_back(t, i, v)
+
+
+BIRD.skip_back_gdb()
+
+
+class BIRDList:
+    def __init__(self, val):
+        ltype = val.type.strip_typedefs()
+        if ltype.code != gdb.TYPE_CODE_UNION or ltype.tag != "list":
+            raise Exception(f"Not a list, is type {ltype}")
+
+        self.head = val["head"]
+        self.tail_node = val["tail_node"]
+
+        if str(self.head.address) == '0x0':
+            raise Exception("List head is NULL")
+
+        if str(self.tail_node["prev"].address) == '0x0':
+            raise Exception("List tail is NULL")
+
+    def walk(self, do):
+        cur = self.head
+        while cur.dereference() != self.tail_node:
+            do(cur)
+            cur = cur.dereference()["next"]
+
+
+class BIRDListLength(gdb.Function):
+    """Returns length of the list, as in
+    print $list_length(routing_tables)"""
+    def __init__(self):
+        super(BIRDListLength, self).__init__("list_length")
+
+    def count(self, _):
+        self.cnt += 1
+
+    def invoke(self, l):
+        self.cnt = 0
+        BIRDList(l).walk(self.count)
+        return self.cnt
+
+BIRDListLength()
+
+class BIRDListItem(gdb.Function):
+    """Returns n-th item of the list."""
+    def __init__(self):
+        super(BIRDListItem, self).__init__("list_item")
+
+    class BLException(Exception):
+        def __init__(self, node, msg):
+            Exception.__init__(self, msg)
+            self.node = node
+
+    def count(self, node):
+        if self.cnt == self.pos:
+            raise self.BLException(node, "Node found")
+
+        self.cnt += 1
+
+    def invoke(self, l, n, t=None, item="n"):
+        self.cnt = 0
+        self.pos = n
+        bl = BIRDList(l)
+        try:
+            bl.walk(self.count)
+        except self.BLException as e:
+            if t is None:
+                return e.node
+            else:
+                return BIRD.skip_back(t, item, e.node)
+
+        raise Exception("List too short")
+
+BIRDListItem()
+
+
 def register_printers(objfile):
     objfile.pretty_printers.append(BIRDFInstPrinter.lookup)
     objfile.pretty_printers.append(BIRDFValPrinter.lookup)

From df3264f51ff38c9366398564a9d342a26bc83f37 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 May 2021 13:41:23 +0200
Subject: [PATCH 020/431] Lock position checking allows for safe lock unions

---
 lib/locking.h           |  6 ++----
 sysdep/unix/coroutine.c | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index eb1bc8fa..eef60154 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,16 +16,14 @@ struct lock_order {
   struct domain_generic *the_bird;
 };
 
-#define LOCK_ORDER_DEPTH  (sizeof(struct lock_order) / sizeof(struct domain_generic *))
-
 extern _Thread_local struct lock_order locking_stack;
 extern _Thread_local struct domain_generic **last_locked;
 
 #define DOMAIN(type) struct domain__##type
 #define DEFINE_DOMAIN(type) DOMAIN(type) { struct domain_generic *type; }
 
-#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name) }
-struct domain_generic *domain_new(const char *name);
+#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name, OFFSETOF(struct lock_order, type)) }
+struct domain_generic *domain_new(const char *name, uint order);
 
 #define DOMAIN_NULL(type)   (DOMAIN(type)) {}
 
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 71847505..2eba142c 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -44,26 +44,31 @@
  *	Locking subsystem
  */
 
+_Thread_local struct lock_order locking_stack = {};
+_Thread_local struct domain_generic **last_locked = NULL;
+
 #define ASSERT_NO_LOCK	ASSERT_DIE(last_locked == NULL)
 
 struct domain_generic {
   pthread_mutex_t mutex;
+  uint order;
   struct domain_generic **prev;
   struct lock_order *locked_by;
   const char *name;
 };
 
-#define DOMAIN_INIT(_name) { .mutex = PTHREAD_MUTEX_INITIALIZER, .name = _name }
+#define DOMAIN_INIT(_name, _order) { .mutex = PTHREAD_MUTEX_INITIALIZER, .name = _name, .order = _order }
 
-static struct domain_generic the_bird_domain_gen = DOMAIN_INIT("The BIRD");
+static struct domain_generic the_bird_domain_gen = DOMAIN_INIT("The BIRD", OFFSETOF(struct lock_order, the_bird));
 
 DOMAIN(the_bird) the_bird_domain = { .the_bird = &the_bird_domain_gen };
 
 struct domain_generic *
-domain_new(const char *name)
+domain_new(const char *name, uint order)
 {
+  ASSERT_DIE(order < sizeof(struct lock_order));
   struct domain_generic *dg = xmalloc(sizeof(struct domain_generic));
-  *dg = (struct domain_generic) DOMAIN_INIT(name);
+  *dg = (struct domain_generic) DOMAIN_INIT(name, order);
   return dg;
 }
 
@@ -74,11 +79,11 @@ domain_free(struct domain_generic *dg)
   xfree(dg);
 }
 
-_Thread_local struct lock_order locking_stack = {};
-_Thread_local struct domain_generic **last_locked = NULL;
-
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 {
+  if ((char *) lsp - (char *) &locking_stack != dg->order)
+    bug("Trying to lock on bad position: order=%u, lsp=%p, base=%p", dg->order, lsp, &locking_stack);
+
   if (lsp <= last_locked)
     bug("Trying to lock in a bad order");
   if (*lsp)
@@ -96,6 +101,9 @@ void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 
 void do_unlock(struct domain_generic *dg, struct domain_generic **lsp)
 {
+  if ((char *) lsp - (char *) &locking_stack != dg->order)
+    bug("Trying to unlock on bad position: order=%u, lsp=%p, base=%p", dg->order, lsp, &locking_stack);
+
   if (dg->locked_by != &locking_stack)
     bug("Inconsistent domain state on unlock");
   if ((last_locked != lsp) || (*lsp != dg))

From 8d706aedba42f8ace0084c7b983ddaaaf47dff91 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 9 Aug 2021 11:51:19 +0200
Subject: [PATCH 021/431] Fixing expensive list checks. Debug only commit.

---
 lib/lists.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/lists.c b/lib/lists.c
index fe2b692b..58d51073 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -35,11 +35,12 @@ check_list(list *l, node *n)
   if (!l)
   {
     ASSERT_DIE(n);
-    ASSERT_DIE(n->prev);
 
-    do { n = n->prev; } while (n->prev);
+    node *nn = n;
+    while (nn->prev)
+      nn = nn->prev;
 
-    l = SKIP_BACK(list, head_node, n);
+    l = SKIP_BACK(list, head_node, nn);
   }
 
   int seen = 0;
@@ -60,7 +61,7 @@ check_list(list *l, node *n)
   }
 
   ASSERT_DIE(cur == &(l->tail_node));
-  ASSERT_DIE(!n || (seen == 1));
+  ASSERT_DIE(!n || (seen == 1) || (n == &l->head_node) || (n == &l->tail_node));
 
   return 1;
 }
@@ -129,7 +130,7 @@ self_link(node *n)
 LIST_INLINE void
 insert_node(node *n, node *after)
 {
-  EXPENSIVE_CHECK(check_list(l, after));
+  EXPENSIVE_CHECK(check_list(NULL, after));
   ASSUME(n->prev == NULL);
   ASSUME(n->next == NULL);
 
@@ -150,7 +151,7 @@ insert_node(node *n, node *after)
 LIST_INLINE void
 rem_node(node *n)
 {
-  EXPENSIVE_CHECK(check_list(NULL, n));
+  EXPENSIVE_CHECK((n == n->prev) && (n == n->next) || check_list(NULL, n));
 
   node *z = n->prev;
   node *x = n->next;

From a2af807357875f866f149b0f6db4d463d4533204 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 28 Jun 2021 15:43:45 +0200
Subject: [PATCH 022/431] Debug messages with timestamps.

On most of current hardware, getting monotonic clock is fast enough to
get it and write for each debug message.
---
 sysdep/unix/log.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index dc2b14b3..f48588b6 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -439,6 +439,8 @@ done:
 void
 log_init_debug(char *f)
 {
+  clock_gettime(CLOCK_MONOTONIC, &dbg_time_start);
+
   if (dbgf && dbgf != stderr)
     fclose(dbgf);
   if (!f)

From c84ed603714db2c42a781f8dbb5b3fd540ff689f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 18 Jun 2021 18:23:41 +0200
Subject: [PATCH 023/431] Moved BFD IO loop out of BFD as we want to use it as
 socket-io coroutine

---
 proto/bfd/Makefile                      | 4 ++--
 proto/bfd/bfd.h                         | 2 +-
 sysdep/unix/Makefile                    | 2 +-
 proto/bfd/io.c => sysdep/unix/io-loop.c | 2 +-
 proto/bfd/io.h => sysdep/unix/io-loop.h | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename proto/bfd/io.c => sysdep/unix/io-loop.c (99%)
 rename proto/bfd/io.h => sysdep/unix/io-loop.h (89%)

diff --git a/proto/bfd/Makefile b/proto/bfd/Makefile
index 402122fc..267dff98 100644
--- a/proto/bfd/Makefile
+++ b/proto/bfd/Makefile
@@ -1,6 +1,6 @@
-src := bfd.c io.c packets.c
+src := bfd.c packets.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
 
-tests_objs := $(tests_objs) $(src-o-files)
\ No newline at end of file
+tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 91fdaa60..9d4cbbf8 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -22,7 +22,7 @@
 #include "lib/string.h"
 
 #include "nest/bfd.h"
-#include "io.h"
+#include "sysdep/unix/io-loop.h"
 
 
 #define BFD_CONTROL_PORT	3784
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index 69cf8131..07f454ab 100644
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -1,4 +1,4 @@
-src := alloc.c io.c krt.c log.c main.c random.c coroutine.c
+src := alloc.c io.c io-loop.c krt.c log.c main.c random.c coroutine.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
diff --git a/proto/bfd/io.c b/sysdep/unix/io-loop.c
similarity index 99%
rename from proto/bfd/io.c
rename to sysdep/unix/io-loop.c
index c5f1e024..a15d866a 100644
--- a/proto/bfd/io.c
+++ b/sysdep/unix/io-loop.c
@@ -15,7 +15,7 @@
 #include <sys/time.h>
 
 #include "nest/bird.h"
-#include "proto/bfd/io.h"
+#include "sysdep/unix/io-loop.h"
 
 #include "lib/buffer.h"
 #include "lib/lists.h"
diff --git a/proto/bfd/io.h b/sysdep/unix/io-loop.h
similarity index 89%
rename from proto/bfd/io.h
rename to sysdep/unix/io-loop.h
index ec706e9a..d858b04e 100644
--- a/proto/bfd/io.h
+++ b/sysdep/unix/io-loop.h
@@ -4,8 +4,8 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#ifndef _BIRD_BFD_IO_H_
-#define _BIRD_BFD_IO_H_
+#ifndef _BIRD_IO_LOOP_H_
+#define _BIRD_IO_LOOP_H_
 
 #include "nest/bird.h"
 #include "lib/lists.h"
@@ -31,4 +31,4 @@ void birdloop_mask_wakeups(struct birdloop *loop);
 void birdloop_unmask_wakeups(struct birdloop *loop);
 
 
-#endif /* _BIRD_BFD_IO_H_ */
+#endif /* _BIRD_IO_LOOP_H_ */

From 445eeaf3df126af2c7b61e71c4f08a583eb4fa60 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 22 Oct 2021 21:03:25 +0200
Subject: [PATCH 024/431] Split route table event into separate events

The former rt_event is dropped in favour of separate table events.
This allows for selective corking of NHU and prune.
---
 nest/proto.c    |  16 +++---
 nest/protocol.h |   2 +-
 nest/route.h    |  12 ++---
 nest/rt-table.c | 139 +++++++++++++++++++-----------------------------
 4 files changed, 69 insertions(+), 100 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index ac0fb232..f8e1ba31 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -658,6 +658,8 @@ channel_aux_stopped(void *data)
   else
     c->in_table = NULL;
 
+  rfree(cat->tab->rp);
+
   mb_free(cat);
   return channel_check_stopped(c);
 }
@@ -666,7 +668,7 @@ static void
 channel_aux_import_stopped(struct rt_import_request *req)
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  ASSERT_DIE(cat->stop);
+  ASSERT_DIE(cat->tab->delete_event);
 }
 
 static void
@@ -675,25 +677,23 @@ channel_aux_export_stopped(struct rt_export_request *req)
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
-  if (cat->refeed_pending && !cat->stop)
+  if (cat->refeed_pending && !cat->tab->delete_event)
   {
     cat->refeed_pending = 0;
     rt_request_export(cat->tab, req);
   }
   else
-    ASSERT_DIE(cat->stop);
+    ASSERT_DIE(cat->tab->delete_event);
 }
 
 static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
-  cat->stop = 1;
-
   rt_stop_import(&cat->push, channel_aux_import_stopped);
   rt_stop_export(&cat->get, channel_aux_export_stopped);
 
-  cat->tab->deleted = channel_aux_stopped;
-  cat->tab->del_data = cat;
+  cat->tab->delete_event = ev_new_init(cat->tab->rp, channel_aux_stopped, cat);
+
   rt_unlock_table(cat->tab);
 }
 
@@ -886,7 +886,6 @@ channel_setup_in_table(struct channel *c, int best)
 
   c->in_table->c = c;
   c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  self_link(&c->in_table->tab->n);
   rt_lock_table(c->in_table->tab);
 
   rt_request_import(c->in_table->tab, &c->in_table->push);
@@ -929,7 +928,6 @@ channel_setup_out_table(struct channel *c)
 
   c->out_table->c = c;
   c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  self_link(&c->out_table->tab->n);
   rt_lock_table(c->out_table->tab);
 
   rt_request_import(c->out_table->tab, &c->out_table->push);
diff --git a/nest/protocol.h b/nest/protocol.h
index 2fbd607c..981ca96a 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -568,7 +568,7 @@ struct channel_aux_table {
   struct rt_import_request push;
   struct rt_export_request get;
   rtable *tab;
-  u8 stop;
+  event *stop;
   u8 refeed_pending;
 };
 
diff --git a/nest/route.h b/nest/route.h
index 7c5fd02f..88a56073 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -147,6 +147,7 @@ void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src)
 struct rtable_config {
   node n;
   char *name;
+  struct config *config;
   struct rtable *table;
   struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
@@ -175,17 +176,17 @@ typedef struct rtable {
   struct hmap id_map;
   struct hostcache *hostcache;
   struct rtable_config *config;		/* Configuration of this table */
-  void (*deleted)(void *);		/* Table should free itself. Call this when it is done. */
-  void *del_data;
-  struct event *rt_event;		/* Routing table event */
+  struct event *prune_event;		/* Event to prune abandoned routes */
+  struct event *ec_event;		/* Event to prune finished exports */
+  struct event *hcu_event;		/* Event to update host cache */
+  struct event *nhu_event;		/* Event to update next hops */
+  struct event *delete_event;		/* Event to delete the table */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
-  byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
-  byte export_used;			/* Export journal setup scheduled */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -475,7 +476,6 @@ void rt_unlock_table(rtable *);
 void rt_subscribe(rtable *tab, struct rt_subscription *s);
 void rt_unsubscribe(struct rt_subscription *s);
 rtable *rt_setup(pool *, struct rtable_config *);
-static inline void rt_shutdown(rtable *r) { rfree(r->rp); }
 
 static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
 static inline net *net_find_valid(rtable *tab, const net_addr *addr)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 9c12ef56..6dd6587e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -65,14 +65,14 @@ struct rt_export_block {
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
-static void rt_update_hostcache(rtable *tab);
-static void rt_next_hop_update(rtable *tab);
-static inline void rt_prune_table(rtable *tab);
+static void rt_update_hostcache(void *tab);
+static void rt_next_hop_update(void *tab);
+static inline void rt_prune_table(void *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_feed_channel(void *);
 
 static inline void rt_export_used(rtable *tab);
-static void rt_export_cleanup(rtable *tab);
+static void rt_export_cleanup(void *tab);
 
 static inline void rte_update_lock(void);
 static inline void rte_update_unlock(void);
@@ -1860,7 +1860,7 @@ rte_dump(struct rte_storage *e)
 void
 rt_dump(rtable *t)
 {
-  debug("Dump of routing table <%s>%s\n", t->name, t->deleted ? " (deleted)" : "");
+  debug("Dump of routing table <%s>%s\n", t->name, t->delete_event ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
 #endif
@@ -1891,9 +1891,9 @@ rt_dump_all(void)
 void
 rt_dump_hooks(rtable *tab)
 {
-  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->deleted ? " (deleted)" : "");
+  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete_event ? " (deleted)" : "");
   debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
-      tab->nhu_state, tab->hcu_scheduled, tab->use_count, tab->rt_count);
+      tab->nhu_state, ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
       tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
 
@@ -1930,21 +1930,11 @@ rt_dump_hooks_all(void)
     rt_dump_hooks(t);
 }
 
-static inline void
-rt_schedule_hcu(rtable *tab)
-{
-  if (tab->hcu_scheduled)
-    return;
-
-  tab->hcu_scheduled = 1;
-  ev_schedule(tab->rt_event);
-}
-
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
   if (tab->nhu_state == NHU_CLEAN)
-    ev_schedule(tab->rt_event);
+    ev_schedule(tab->nhu_event);
 
   /* state change:
    *   NHU_CLEAN   -> NHU_SCHEDULED
@@ -1957,7 +1947,7 @@ void
 rt_schedule_prune(rtable *tab)
 {
   if (tab->prune_state == 0)
-    ev_schedule(tab->rt_event);
+    ev_schedule(tab->prune_event);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
@@ -1969,36 +1959,9 @@ rt_export_used(rtable *tab)
   if (config->table_debug)
     log(L_TRACE "%s: Export cleanup requested", tab->name);
 
-  if (tab->export_used)
-    return;
-
-  tab->export_used = 1;
-  ev_schedule(tab->rt_event);
+  ev_schedule(tab->ec_event);
 }
 
-static void
-rt_event(void *ptr)
-{
-  rtable *tab = ptr;
-
-  rt_lock_table(tab);
-
-  if (tab->export_used)
-    rt_export_cleanup(tab);
-
-  if (tab->hcu_scheduled)
-    rt_update_hostcache(tab);
-
-  if (tab->nhu_state)
-    rt_next_hop_update(tab);
-
-  if (tab->prune_state)
-    rt_prune_table(tab);
-
-  rt_unlock_table(tab);
-}
-
-
 static inline btime
 rt_settled_time(rtable *tab)
 {
@@ -2078,13 +2041,9 @@ rt_free(resource *_r)
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
-  ASSERT_DIE(r->deleted);
-
-  r->config->table = NULL;
-  rem_node(&r->n);
-
-  if (r->hostcache)
-    rt_free_hostcache(r);
+  ASSERT_DIE(r->rt_count == 0);
+  ASSERT_DIE(EMPTY_LIST(r->imports));
+  ASSERT_DIE(EMPTY_LIST(r->exports));
 
   /* Freed automagically by the resource pool
   fib_free(&r->fib);
@@ -2142,7 +2101,11 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
-  t->rt_event = ev_new_init(p, rt_event, t);
+  t->ec_event = ev_new_init(p, rt_export_cleanup, t);
+  t->prune_event = ev_new_init(p, rt_prune_table, t);
+  t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
+  t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
+
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
   t->next_export_seq = 1;
@@ -2167,7 +2130,6 @@ rt_init(void)
   init_list(&routing_tables);
 }
 
-
 /**
  * rt_prune_table - prune a routing table
  *
@@ -2183,8 +2145,9 @@ rt_init(void)
  * iteration.
  */
 static void
-rt_prune_table(rtable *tab)
+rt_prune_table(void *data)
 {
+  rtable *tab = data;
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 512;
 
@@ -2232,7 +2195,7 @@ again:
 	    if (limit <= 0)
 	      {
 		FIB_ITERATE_PUT(fit);
-		ev_schedule(tab->rt_event);
+		ev_schedule(tab->prune_event);
 		return;
 	      }
 
@@ -2288,9 +2251,9 @@ again:
 }
 
 static void
-rt_export_cleanup(rtable *tab)
+rt_export_cleanup(void *data)
 {
-  tab->export_used = 0;
+  rtable *tab = data;
 
   u64 min_seq = ~((u64) 0);
   struct rt_pending_export *last_export_to_free = NULL;
@@ -2447,9 +2410,6 @@ done:;
 	imports_stopped = 1;
       }
 
-  if (tab->export_used)
-    ev_schedule(tab->rt_event);
-
   if (imports_stopped)
   {
     if (config->table_debug)
@@ -2683,8 +2643,9 @@ rt_next_hop_update_net(rtable *tab, net *n)
 }
 
 static void
-rt_next_hop_update(rtable *tab)
+rt_next_hop_update(void *data)
 {
+  rtable *tab = data;
   struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
@@ -2702,7 +2663,7 @@ rt_next_hop_update(rtable *tab)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule(tab->rt_event);
+	  ev_schedule(tab->nhu_event);
 	  return;
 	}
       max_feed -= rt_next_hop_update_net(tab, n);
@@ -2716,7 +2677,7 @@ rt_next_hop_update(rtable *tab)
   tab->nhu_state &= 1;
 
   if (tab->nhu_state != NHU_CLEAN)
-    ev_schedule(tab->rt_event);
+    ev_schedule(tab->nhu_event);
 }
 
 
@@ -2738,6 +2699,7 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_min_time = 5;
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
+  c->config = new_config;
 
   add_tail(&new_config->tables, &c->n);
 
@@ -2773,17 +2735,12 @@ rt_lock_table(rtable *r)
 void
 rt_unlock_table(rtable *r)
 {
-  if (!--r->use_count && r->deleted)
-    {
-      void *del_data = r->del_data;
-      void (*deleted)(void *) = r->deleted;
-
-      /* Delete the routing table by freeing its pool */
-      rt_shutdown(r);
-      deleted(del_data);
-    }
+  if (!--r->use_count && r->delete_event)
+    /* Delete the routing table by freeing its pool */
+    ev_schedule(r->delete_event);
 }
 
+
 static struct rtable_config *
 rt_find_table_config(struct config *cf, char *name)
 {
@@ -2791,7 +2748,23 @@ rt_find_table_config(struct config *cf, char *name)
   return (sym && (sym->class == SYM_TABLE)) ? sym->table : NULL;
 }
 
-static void rt_config_del_obstacle(void *data) { config_del_obstacle(data); }
+static void
+rt_done(void *data)
+{
+  rtable *t = data;
+  struct rtable_config *tc = t->config;
+  struct config *c = tc->config;
+
+  tc->table = NULL;
+  rem_node(&t->n);
+
+  if (t->hostcache)
+    rt_free_hostcache(t);
+
+  rfree(t->rp);
+
+  config_del_obstacle(c);
+}
 
 /**
  * rt_commit - commit new routing table configuration
@@ -2816,7 +2789,7 @@ rt_commit(struct config *new, struct config *old)
       WALK_LIST(o, old->tables)
 	{
 	  rtable *ot = o->table;
-	  if (!ot->deleted)
+	  if (!ot->delete_event)
 	    {
 	      r = rt_find_table_config(new, o->name);
 	      if (r && (r->addr_type == o->addr_type) && !new->shutdown)
@@ -2832,8 +2805,7 @@ rt_commit(struct config *new, struct config *old)
 		{
 		  DBG("\t%s: deleted\n", o->name);
 		  rt_lock_table(ot);
-		  ot->deleted = rt_config_del_obstacle;
-		  ot->del_data = old;
+		  ot->delete_event = ev_new_init(ot->rp, rt_done, ot);
 		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
@@ -3060,11 +3032,11 @@ rt_free_hostcache(rtable *tab)
 static void
 rt_notify_hostcache(rtable *tab, net *net)
 {
-  if (tab->hcu_scheduled)
+  if (ev_active(tab->hcu_event))
     return;
 
   if (trie_match_net(tab->hostcache->trie, net->n.addr))
-    rt_schedule_hcu(tab);
+    ev_schedule(tab->hcu_event);
 }
 
 static int
@@ -3161,8 +3133,9 @@ done:
 }
 
 static void
-rt_update_hostcache(rtable *tab)
+rt_update_hostcache(void *data)
 {
+  rtable *tab = data;
   struct hostcache *hc = tab->hostcache;
   struct hostentry *he;
   node *n, *x;
@@ -3183,8 +3156,6 @@ rt_update_hostcache(rtable *tab)
       if (rt_update_hostentry(tab, he))
 	rt_schedule_nhu(he->tab);
     }
-
-  tab->hcu_scheduled = 0;
 }
 
 struct hostentry *

From 44f26c49f966ca842ff9af55468de0b98c44b73e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 6 Oct 2021 15:10:33 +0200
Subject: [PATCH 025/431] Special table hooks rectified.

* internal tables are now more standalone, having their own import and
  export hooks
* route refresh/reload uses stale counter instead of stale flag,
  allowing to drop walking the table at the beginning
* route modify (by BGP LLGR) is now done by a special refeed hook,
  reimporting the modified routes directly without filters
---
 lib/lists.c          |   9 +
 lib/lists.h          |   1 +
 nest/config.Y        |   4 +-
 nest/proto.c         | 432 ++++++++++++++++++++++++-------
 nest/protocol.h      |  23 +-
 nest/route.h         |  35 +--
 nest/rt-attr.c       |   3 +-
 nest/rt-show.c       |   7 +-
 nest/rt-table.c      | 597 ++++++++++++-------------------------------
 proto/bgp/attrs.c    |  50 ++--
 proto/bgp/bgp.c      |  94 +++++--
 proto/bgp/bgp.h      |   3 +-
 proto/bgp/packets.c  |   2 +-
 proto/rpki/packets.c |   8 +-
 sysdep/unix/krt.c    | 256 ++-----------------
 sysdep/unix/krt.h    |   4 -
 16 files changed, 682 insertions(+), 846 deletions(-)

diff --git a/lib/lists.c b/lib/lists.c
index 200576cf..fe2b692b 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -109,6 +109,15 @@ add_head(list *l, node *n)
   l->head = n;
 }
 
+LIST_INLINE void
+self_link(node *n)
+{
+  ASSUME(n->prev == NULL);
+  ASSUME(n->next == NULL);
+
+  n->prev = n->next = n;
+}
+
 /**
  * insert_node - insert a node to a list
  * @n: a new list node
diff --git a/lib/lists.h b/lib/lists.h
index 479f4ed1..64b4a981 100644
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -78,6 +78,7 @@ typedef union list {			/* In fact two overlayed nodes */
 #define LIST_INLINE
 void add_tail(list *, node *);
 void add_head(list *, node *);
+void self_link(node *);
 void rem_node(node *);
 void add_tail_list(list *, list *);
 void init_list(list *);
diff --git a/nest/config.Y b/nest/config.Y
index 29d6b0db..a56b25be 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -644,12 +644,12 @@ r_args:
    }
  | r_args IMPORT TABLE channel_arg {
      if (!$4->in_table) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->in_table);
+     rt_show_add_table($$, $4->in_table->tab);
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
      if (!$4->out_table) cf_error("No export table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->out_table);
+     rt_show_add_table($$, $4->out_table->tab);
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args FILTER filter {
diff --git a/nest/proto.c b/nest/proto.c
index 09582d2e..cf448fd9 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -47,7 +47,7 @@ static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
 
 extern struct protocol proto_unix_iface;
 
-static void channel_request_reload(struct channel *c);
+static void channel_aux_request_refeed(struct channel_aux_table *cat);
 static void proto_shutdown_loop(timer *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
@@ -88,7 +88,9 @@ channel_export_log_state_change(struct rt_export_request *req, u8 state)
   switch (state)
   {
     case TES_FEEDING:
-      if (c->proto->feed_begin)
+      if (c->out_table)
+	rt_refresh_begin(&c->out_table->push);
+      else if (c->proto->feed_begin)
 	c->proto->feed_begin(c, !c->refeeding);
       break;
     case TES_READY:
@@ -179,6 +181,7 @@ proto_find_channel_by_name(struct proto *p, const char *n)
 }
 
 rte * channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+rte * channel_in_preimport(struct rt_import_request *req, rte *new, rte *old);
 
 void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
 void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
@@ -295,14 +298,10 @@ static void
 channel_roa_in_changed(struct rt_subscription *s)
 {
   struct channel *c = s->data;
-  int active = c->reload_event && ev_active(c->reload_event);
 
-  CD(c, "Reload triggered by RPKI change%s", active ? " - already active" : "");
+  CD(c, "Reload triggered by RPKI change");
 
-  if (!active)
-    channel_request_reload(c);
-  else
-    c->reload_pending = 1;
+  channel_request_reload(c);
 }
 
 static void
@@ -444,7 +443,6 @@ channel_start_import(struct channel *c)
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
     .preimport = channel_preimport,
-    .rte_modify = c->proto->rte_modify,
   };
 
   ASSERT(c->channel_state == CS_UP);
@@ -463,7 +461,8 @@ channel_start_export(struct channel *c)
 {
   if (c->out_req.hook)
   {
-    log(L_WARN "%s.%s: Attempted to start channel's already started export", c->proto->name, c->name);
+    c->restart_export = 1;
+    log(L_WARN "%s.%s: Fast channel export restart", c->proto->name, c->name);
     return;
   }
 
@@ -514,7 +513,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (c->out_req.hook || c->in_req.hook)
+      if (c->out_req.hook || c->in_req.hook || c->out_table || c->in_table)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -541,9 +540,6 @@ channel_import_stopped(struct rt_import_request *req)
 
   req->hook = NULL;
 
-  if (c->in_table)
-    rt_prune_sync(c->in_table, 1);
-
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
 
@@ -566,14 +562,16 @@ channel_export_stopped(struct rt_export_request *req)
     return;
   }
 
-  /* Free the routes from out_table */
-  if (c->out_table)
-    rt_prune_sync(c->out_table, 1);
-
   mb_free(c->out_req.name);
   c->out_req.name = NULL;
 
-  channel_check_stopped(c);
+  if (c->restart_export)
+  {
+    c->restart_export = 0;
+    channel_start_export(c);
+  }
+  else
+    channel_check_stopped(c);
 }
 
 static void
@@ -595,72 +593,296 @@ channel_feed_end(struct channel *c)
     return;
   }
 
-  if (c->proto->feed_end)
+  if (c->out_table)
+    rt_refresh_end(&c->out_table->push);
+  else if (c->proto->feed_end)
     c->proto->feed_end(c);
 
   if (c->refeed_pending)
     rt_stop_export(req, channel_export_stopped);
-  else
-    c->refeeding = 0;
 }
 
-/* Called by protocol for reload from in_table */
-void
-channel_schedule_reload(struct channel *c)
-{
-  ASSERT(c->in_req.hook);
+#define CHANNEL_AUX_TABLE_DUMP_REQ(inout, imex, pgimex, pushget)  static void \
+  channel_##inout##_##pushget##_dump_req(struct rt_##pgimex##_request *req) { \
+    struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, pushget, req); \
+    debug("  Channel %s.%s " #imex " table " #pushget " request %p\n", cat->c->proto->name, cat->c->name, req); }
 
-  rt_reload_channel_abort(c);
-  ev_schedule_work(c->reload_event);
+CHANNEL_AUX_TABLE_DUMP_REQ(in, import, import, push)
+CHANNEL_AUX_TABLE_DUMP_REQ(in, import, export, get)
+CHANNEL_AUX_TABLE_DUMP_REQ(out, export, import, push)
+CHANNEL_AUX_TABLE_DUMP_REQ(out, export, export, get)
+
+#undef CHANNEL_AUX_TABLE_DUMP_REQ
+
+static uint channel_aux_imex(struct channel_aux_table *cat)
+{
+  if (cat->c->in_table == cat)
+    return 0;
+  else if (cat->c->out_table == cat)
+    return 1;
+  else
+    bug("Channel aux table must be in_table or out_table");
 }
 
 static void
-channel_reload_loop(void *ptr)
+channel_aux_stopped(void *data)
 {
-  struct channel *c = ptr;
+  struct channel_aux_table *cat = data;
+  struct channel *c = cat->c;
 
-  /* Start reload */
-  if (!c->reload_active)
-    c->reload_pending = 0;
+  if (channel_aux_imex(cat))
+    c->out_table = NULL;
+  else
+    c->in_table = NULL;
 
-  if (!rt_reload_channel(c))
+  mb_free(cat);
+  return channel_check_stopped(c);
+}
+
+static void
+channel_aux_import_stopped(struct rt_import_request *req)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+  ASSERT_DIE(cat->stop);
+}
+
+static void
+channel_aux_export_stopped(struct rt_export_request *req)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+  req->hook = NULL;
+
+  if (cat->refeed_pending && !cat->stop)
   {
-    ev_schedule_work(c->reload_event);
-    return;
+    cat->refeed_pending = 0;
+    rt_request_export(cat->tab, req);
   }
+  else
+    ASSERT_DIE(cat->stop);
+}
 
-  /* Restart reload */
-  if (c->reload_pending)
-    channel_request_reload(c);
+static void
+channel_aux_stop(struct channel_aux_table *cat)
+{
+  cat->stop = 1;
+
+  rt_stop_import(&cat->push, channel_aux_import_stopped);
+  rt_stop_export(&cat->get, channel_aux_export_stopped);
+
+  rt_lock_table(cat->tab);
+  cat->tab->deleted = channel_aux_stopped;
+  cat->tab->del_data = cat;
+  rt_unlock_table(cat->tab);
+}
+
+static void
+channel_push_log_state_change(struct rt_import_request *req, u8 state)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+  const char *imex = channel_aux_imex(cat) ? "export" : "import";
+  CD(cat->c, "Channel %s table import state changed to %s", imex, rt_import_state_name(state));
+}
+
+static void
+channel_get_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  const char *imex = channel_aux_imex(cat) ? "export" : "import";
+  CD(cat->c, "Channel %s table export state changed to %s", imex, rt_export_state_name(state));
+
+  switch (state)
+  {
+    case TES_FEEDING:
+      if (imex && cat->c->proto->feed_begin)
+	cat->c->proto->feed_begin(cat->c, !cat->c->refeeding);
+      else if (!imex)
+	rt_refresh_begin(&cat->c->in_req);
+      break;
+
+    case TES_READY:
+      if (imex && cat->c->proto->feed_end)
+	cat->c->proto->feed_end(cat->c);
+      else if (!imex)
+	rt_refresh_end(&cat->c->in_req);
+
+      if (cat->refeed_pending)
+	rt_stop_export(&cat->get, channel_aux_export_stopped);
+
+      break;
+  }
+}
+
+void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+
+static void
+channel_in_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+
+  if (!rpe->new && !rpe->old)
+    return;
+
+  rte n0;
+  struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
+  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), src);
+}
+
+static void
+channel_in_export_one_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+
+  if (!rpe->new && !rpe->old)
+    return;
+
+  rte n0;
+  struct rte_src *src = rpe->old_best ? rpe->old_best->rte.src : rpe->new_best->rte.src;
+  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), src);
+}
+
+static void
+channel_in_export_bulk_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  for (uint i=0; i<count; i++)
+  {
+    rte n0 = *feed[i];
+    rte_update_direct(cat->c, net, &n0, n0.src);
+  }
+}
+
+static void
+channel_in_export_bulk_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  if (!count)
+    return;
+
+  rte n0 = *feed[0];
+  rte_update_direct(cat->c, net, &n0, n0.src);
+}
+
+void do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old);
+
+static void
+channel_out_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  rte n0;
+  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
+}
+
+static void
+channel_out_export_one_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  rte n0;
+  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
+}
+
+static void
+channel_out_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
+  if (cat->c->ra_mode != RA_ANY)
+    ASSERT_DIE(count <= 1);
+
+  for (uint i=0; i<count; i++)
+  {
+    rte n0 = *feed[i];
+    do_rt_notify_direct(cat->c, net, &n0, NULL);
+  }
 }
 
 /* Called by protocol to activate in_table */
 void
-channel_setup_in_table(struct channel *c)
+channel_setup_in_table(struct channel *c, int best)
 {
-  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
+  int nlen = sizeof("import") + strlen(c->name) + strlen(c->proto->name) + 3;
 
-  cf->name = "import";
-  cf->addr_type = c->net_type;
-  cf->internal = 1;
+  struct {
+    struct channel_aux_table cat;
+    struct rtable_config tab_cf;
+    char name[0];
+  } *cat = mb_allocz(c->proto->pool, sizeof(*cat) + nlen);
 
-  c->in_table = rt_setup(c->proto->pool, cf);
+  bsprintf(cat->name, "%s.%s.import", c->proto->name, c->name);
 
-  c->reload_event = ev_new_init(c->proto->pool, channel_reload_loop, c);
+  cat->tab_cf.name = cat->name;
+  cat->tab_cf.addr_type = c->net_type;
+
+  c->in_table = &cat->cat;
+  c->in_table->push = (struct rt_import_request) {
+    .name = cat->name,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_in_push_dump_req,
+    .log_state_change = channel_push_log_state_change,
+    .preimport = channel_in_preimport,
+  };
+  c->in_table->get = (struct rt_export_request) {
+    .name = cat->name,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_in_get_dump_req,
+    .log_state_change = channel_get_log_state_change,
+    .export_one = best ? channel_in_export_one_best : channel_in_export_one_any,
+    .export_bulk = best ? channel_in_export_bulk_best : channel_in_export_bulk_any,
+  };
+
+  c->in_table->c = c;
+  c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  self_link(&c->in_table->tab->n);
+
+  rt_request_import(c->in_table->tab, &c->in_table->push);
+  rt_request_export(c->in_table->tab, &c->in_table->get);
 }
 
 /* Called by protocol to activate out_table */
 void
 channel_setup_out_table(struct channel *c)
 {
-  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
-  cf->name = "export";
-  cf->addr_type = c->net_type;
-  cf->internal = 1;
+  int nlen = sizeof("export") + strlen(c->name) + strlen(c->proto->name) + 3;
 
-  c->out_table = rt_setup(c->proto->pool, cf);
+  struct {
+    struct channel_aux_table cat;
+    struct rtable_config tab_cf;
+    char name[0];
+  } *cat = mb_allocz(c->proto->pool, sizeof(*cat) + nlen);
+
+  bsprintf(cat->name, "%s.%s.export", c->proto->name, c->name);
+
+  cat->tab_cf.name = cat->name;
+  cat->tab_cf.addr_type = c->net_type;
+
+  c->out_table = &cat->cat;
+  c->out_table->push = (struct rt_import_request) {
+    .name = cat->name,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_out_push_dump_req,
+    .log_state_change = channel_push_log_state_change,
+  };
+  c->out_table->get = (struct rt_export_request) {
+    .name = cat->name,
+    .trace_routes = c->debug | c->proto->debug,
+    .dump_req = channel_out_get_dump_req,
+    .log_state_change = channel_get_log_state_change,
+    .export_one = (c->ra_mode == RA_ANY) ? channel_out_export_one_any : channel_out_export_one_best,
+    .export_bulk = channel_out_export_bulk,
+  };
+
+  c->out_table->c = c;
+  c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  self_link(&c->out_table->tab->n);
+
+  rt_request_import(c->out_table->tab, &c->out_table->push);
+  rt_request_export(c->out_table->tab, &c->out_table->get);
 }
 
+static void
+channel_aux_request_refeed(struct channel_aux_table *cat)
+{
+  cat->refeed_pending = 1;
+  rt_stop_export(&cat->get, channel_aux_export_stopped);
+}
 
 static void
 channel_do_start(struct channel *c)
@@ -686,16 +908,12 @@ channel_do_up(struct channel *c)
 static void
 channel_do_pause(struct channel *c)
 {
-  /* Need to abort feeding */
-  if (c->reload_event)
-  {
-    ev_postpone(c->reload_event);
-    rt_reload_channel_abort(c);
-  }
-
   /* Stop export */
   if (c->out_req.hook)
+  {
     rt_stop_export(&c->out_req, channel_export_stopped);
+    c->refeeding = 0;
+  }
 
   channel_roa_unsubscribe_all(c);
 
@@ -706,6 +924,13 @@ channel_do_pause(struct channel *c)
 static void
 channel_do_stop(struct channel *c)
 {
+  /* Drop auxiliary tables */
+  if (c->in_table)
+    channel_aux_stop(c->in_table);
+
+  if (c->out_table)
+    channel_aux_stop(c->out_table);
+
   /* Stop import */
   if (c->in_req.hook)
     rt_stop_import(&c->in_req, channel_import_stopped);
@@ -716,16 +941,13 @@ channel_do_stop(struct channel *c)
 
   CALL(c->channel->shutdown, c);
 
-  /* This have to be done in here, as channel pool is freed before channel_do_down() */
-  c->in_table = NULL;
-  c->reload_event = NULL;
-  c->out_table = NULL;
+  channel_roa_unsubscribe_all(c);
 }
 
 static void
 channel_do_down(struct channel *c)
 {
-  ASSERT(!c->reload_active);
+  ASSERT(!c->out_req.hook && !c->in_req.hook && !c->out_table && !c->in_table);
 
   c->proto->active_channels--;
 
@@ -733,14 +955,12 @@ channel_do_down(struct channel *c)
   memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
   memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
 
-  c->in_table = NULL;
-  c->reload_event = NULL;
-  c->out_table = NULL;
-
-  /* The in_table and out_table are going to be freed by freeing their resource pools. */
-
   CALL(c->channel->cleanup, c);
 
+  /* This have to be done in here, as channel pool is freed before channel_do_down() */
+  bmap_free(&c->export_map);
+  bmap_free(&c->export_reject_map);
+
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
     ev_schedule(c->proto->event);
@@ -769,7 +989,7 @@ channel_set_state(struct channel *c, uint state)
     break;
 
   case CS_UP:
-    ASSERT(cs == CS_DOWN || cs == CS_START);
+    ASSERT(cs == CS_DOWN || cs == CS_START || cs == CS_PAUSE);
 
     if (cs == CS_DOWN)
       channel_do_start(c);
@@ -819,8 +1039,8 @@ channel_set_state(struct channel *c, uint state)
  * completed, it will switch back to ES_READY. This function can be called
  * even when feeding is already running, in that case it is restarted.
  */
-void
-channel_request_feeding(struct channel *c)
+static void
+channel_request_table_feeding(struct channel *c)
 {
   ASSERT(c->out_req.hook);
 
@@ -828,7 +1048,18 @@ channel_request_feeding(struct channel *c)
   rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
-static void
+void
+channel_request_feeding(struct channel *c)
+{
+  ASSERT(c->out_req.hook);
+
+  if (c->out_table)
+    channel_aux_request_refeed(c->out_table);
+  else
+    channel_request_table_feeding(c);
+}
+
+void
 channel_request_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
@@ -836,14 +1067,29 @@ channel_request_reload(struct channel *c)
 
   CD(c, "Reload requested");
 
-  c->proto->reload_routes(c);
+  if (c->in_table)
+    channel_aux_request_refeed(c->in_table);
+  else
+    c->proto->reload_routes(c);
+}
 
-  /*
-   * Should this be done before reload_routes() hook?
-   * Perhaps, but routes are updated asynchronously.
-   */
-  channel_reset_limit(c, &c->rx_limit, PLD_RX);
-  channel_reset_limit(c, &c->in_limit, PLD_IN);
+void
+channel_refresh_begin(struct channel *c)
+{
+  CD(c, "Channel route refresh begin");
+  if (c->in_table)
+    rt_refresh_begin(&c->in_table->push);
+  else
+    rt_refresh_begin(&c->in_req);
+}
+
+void
+channel_refresh_end(struct channel *c)
+{
+  if (c->in_table)
+    rt_refresh_end(&c->in_table->push);
+  else
+    rt_refresh_end(&c->in_req);
 }
 
 const struct channel_class channel_basic = {
@@ -1001,7 +1247,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
     channel_request_reload(c);
 
   if (export_changed)
-    channel_request_feeding(c);
+    channel_request_table_feeding(c);
 
 done:
   CD(c, "Reconfigured");
@@ -1714,7 +1960,7 @@ protos_dump_all(void)
   WALK_LIST(p, proto_list)
   {
 #define DPF(x)	(p->x ? " " #x : "")
-    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s%s\n",
+    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s\n",
 	p->name, p, p_states[p->proto_state], p->active_channels,
 	DPF(disabled), DPF(active), DPF(do_start), DPF(do_stop), DPF(reconfiguring));
 #undef DPF
@@ -1730,6 +1976,20 @@ protos_dump_all(void)
       debug("\tChannel state: %s/%s/%s\n", c_states[c->channel_state],
 	  c->in_req.hook ? rt_import_state_name(rt_import_get_state(c->in_req.hook)) : "-",
 	  c->out_req.hook ? rt_export_state_name(rt_export_get_state(c->out_req.hook)) : "-");
+      if (c->in_table)
+      {
+	debug("\tInput aux table:\n");
+	rt_dump_hooks(c->in_table->tab);
+	rt_dump(c->in_table->tab);
+	debug("\tEnd of input aux table.\n");
+      }
+      if (c->out_table)
+      {
+	debug("\tOutput aux table:\n");
+	rt_dump_hooks(c->in_table->tab);
+	rt_dump(c->in_table->tab);
+	debug("\tEnd of output aux table.\n");
+      }
     }
 
     if (p->proto->dump && (p->proto_state != PS_DOWN))
@@ -2151,11 +2411,11 @@ channel_show_stats(struct channel *c)
     cli_msg(-1006, "    Routes:         %u imported, %u exported, %u preferred",
 	    in_routes, out_routes, SRI(pref));
 
-  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   RX limit   IN limit   accepted");
-  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u %10u %10u",
+  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored    limited    accepted");
+  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u %10u",
 	  SCI(updates_received), SCI(updates_invalid),
 	  SCI(updates_filtered), SRI(updates_ignored),
-	  SCI(updates_limited_rx), SCI(updates_limited_in),
+	  SCI(updates_limited_rx) + SCI(updates_limited_in),
 	  SRI(updates_accepted));
   cli_msg(-1006, "      Import withdraws:   %10u %10u        --- %10u        --- %10u",
 	  SCI(withdraws_received), SCI(withdraws_invalid),
diff --git a/nest/protocol.h b/nest/protocol.h
index 7447cbf0..f9996b18 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -207,7 +207,6 @@ struct proto {
   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
-  struct rte *(*rte_modify)(struct rte *, struct linpool *);
   void (*rte_insert)(struct network *, struct rte *);
   void (*rte_remove)(struct network *, struct rte *);
   u32 (*rte_igp_metric)(struct rte *);
@@ -544,24 +543,29 @@ struct channel {
   u8 reloadable;			/* Hook reload_routes() is allowed on the channel */
   u8 gr_lock;				/* Graceful restart mechanism should wait for this channel */
   u8 gr_wait;				/* Route export to channel is postponed until graceful restart */
+  u8 restart_export;			/* Route export should restart as soon as it stops */
 
   btime last_state_change;		/* Time of last state transition */
 
-  struct rtable *in_table;		/* Internal table for received routes */
-  struct event *reload_event;		/* Event responsible for reloading from in_table */
-  struct fib_iterator reload_fit;	/* FIB iterator in in_table used during reloading */
-  struct rte_storage *reload_next_rte;	/* Route iterator in in_table used during reloading */
-  u8 reload_active;			/* Iterator reload_fit is linked */
+  struct channel_aux_table *in_table;	/* Internal table for received routes */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
   u8 rpki_reload;			/* RPKI changes trigger channel reload */
 
-  struct rtable *out_table;		/* Internal table for exported routes */
+  struct channel_aux_table *out_table;	/* Internal table for exported routes */
 
   list roa_subscriptions;		/* List of active ROA table subscriptions based on filters roa_check() */
 };
 
+struct channel_aux_table {
+  struct channel *c;
+  struct rt_import_request push;
+  struct rt_export_request get;
+  rtable *tab;
+  u8 stop;
+  u8 refeed_pending;
+};
 
 /*
  * Channel states
@@ -627,7 +631,7 @@ struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
 
 void channel_set_state(struct channel *c, uint state);
-void channel_setup_in_table(struct channel *c);
+void channel_setup_in_table(struct channel *c, int best);
 void channel_setup_out_table(struct channel *c);
 void channel_schedule_reload(struct channel *c);
 
@@ -636,6 +640,9 @@ static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP)
 static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }
 
 void channel_request_feeding(struct channel *c);
+void channel_request_reload(struct channel *c);
+void channel_refresh_begin(struct channel *c);
+void channel_refresh_end(struct channel *c);
 void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 int channel_reconfigure(struct channel *c, struct channel_config *cf);
diff --git a/nest/route.h b/nest/route.h
index d0568133..cb66be2a 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -150,7 +150,6 @@ struct rtable_config {
   int gc_max_ops;			/* Maximum number of operations before GC is run */
   int gc_min_time;			/* Minimum time between two consecutive GC runs */
   byte sorted;				/* Routes of network are sorted according to rte_better() */
-  byte internal;			/* Internal table of a protocol */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
 };
@@ -172,10 +171,8 @@ typedef struct rtable {
   struct hmap id_map;
   struct hostcache *hostcache;
   struct rtable_config *config;		/* Configuration of this table */
-  struct config *deleted;		/* Table doesn't exist in current configuration,
-					 * delete as soon as use_count becomes 0 and remove
-					 * obstacle from this routing table.
-					 */
+  void (*deleted)(void *);		/* Table should free itself. Call this when it is done. */
+  void *del_data;
   struct event *rt_event;		/* Routing table event */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
@@ -184,7 +181,6 @@ typedef struct rtable {
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
-  byte internal;			/* This table is internal for some other object */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -249,6 +245,7 @@ typedef struct rte {
   u8 generation;			/* If this route import is based on other previously exported route,
 					   this value should be 1 + MAX(generation of the parent routes).
 					   Otherwise the route is independent and this value is zero. */
+  u8 stale_cycle;			/* Auxiliary value for route refresh */
 } rte;
 
 struct rte_storage {
@@ -256,13 +253,11 @@ struct rte_storage {
   struct rte rte;			/* Route data */
 };
 
-#define RTE_COPY(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
-#define RTE_OR_NULL(r)	((r) ? &((r)->rte) : NULL)
+#define RTES_CLONE(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
+#define RTES_OR_NULL(r)		((r) ? &((r)->rte) : NULL)
 
 #define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_STALE	4		/* Route is stale in a refresh cycle */
-#define REF_DISCARD	8		/* Route is scheduled for discard */
-#define REF_MODIFY	16		/* Route is scheduled for modify */
+#define REF_USE_STALE	4		/* Do not reset route's stale_cycle to the actual value */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
 static inline int rte_is_valid(const rte *r) { return r && !(r->flags & REF_FILTERED); }
@@ -283,7 +278,6 @@ struct rt_import_request {
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
    * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
   struct rte *(*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
-  struct rte *(*rte_modify)(struct rte *, struct linpool *);
 };
 
 struct rt_import_hook {
@@ -303,6 +297,10 @@ struct rt_import_hook {
   btime last_state_change;		/* Time of last state transition */
 
   u8 import_state;			/* IS_* */
+  u8 stale_set;				/* Set this stale_cycle to imported routes */
+  u8 stale_valid;			/* Routes with this stale_cycle and bigger are considered valid */
+  u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
+  u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
   void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
 };
@@ -455,9 +453,9 @@ void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
-void rt_refresh_begin(rtable *t, struct rt_import_request *);
-void rt_refresh_end(rtable *t, struct rt_import_request *);
-void rt_modify_stale(rtable *t, struct rt_import_request *);
+
+void rt_refresh_begin(struct rt_import_request *);
+void rt_refresh_end(struct rt_import_request *);
 void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
 void rte_free(struct rte_storage *, rtable *);
@@ -466,15 +464,9 @@ void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
 void rt_dump_hooks_all(void);
-int rt_reload_channel(struct channel *c);
-void rt_reload_channel_abort(struct channel *c);
-void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
-int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old, struct rte_storage **old_exported);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
-
 /* Default limit for ECMP next hops, defined in sysdep code */
 extern const int rt_default_ecmp;
 
@@ -789,6 +781,7 @@ void rta__free(rta *r);
 static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
+static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
 void rta_dump(rta *);
 void rta_dump_all(void);
 void rta_show(struct cli *, rta *);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 1bece201..77fd3c3b 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1245,8 +1245,7 @@ rta_do_cow(rta *o, linpool *lp)
       memcpy(*nhn, nho, nexthop_size(nho));
       nhn = &((*nhn)->next);
     }
-  r->cached = 0;
-  r->uc = 0;
+  rta_uncache(r);
   return r;
 }
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 235d72e4..d942b8e1 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -95,7 +95,10 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     }
 
   if (d->verbose)
+  {
+    cli_printf(c, -1008, "\tInternal route ID: %uL %uG %uS", e->src->private_id, e->src->global_id, e->stale_cycle);
     rta_show(c, a);
+  }
 }
 
 static uint
@@ -103,7 +106,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
       count++;
   return count;
 }
@@ -113,7 +116,7 @@ rte_feed_obtain(net *n, rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e7ff2816..2f480992 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -50,7 +50,6 @@ pool *rt_table_pool;
 static linpool *rte_update_pool;
 
 list routing_tables;
-list deleted_routing_tables;
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
@@ -386,9 +385,11 @@ rte_mergable(rte *pri, rte *sec)
 static void
 rte_trace(const char *name, const rte *e, int dir, const char *msg)
 {
-  log(L_TRACE "%s %c %s %N %uL %uG %s",
-      name, dir, msg, e->net, e->src->private_id, e->src->global_id,
-      rta_dest_name(e->attrs->dest));
+  log(L_TRACE "%s %c %s %N src %uL %uG %uS %s%s",
+      name, dir, msg, e->net,
+      e->src->private_id, e->src->global_id, e->stale_cycle,
+      rta_dest_name(e->attrs->dest),
+      rte_is_filtered(e) ? " (filtered)" : "");
 }
 
 static inline void
@@ -427,7 +428,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
       count++;
   return count;
 }
@@ -437,7 +438,7 @@ rte_feed_obtain(net *n, struct rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
@@ -508,10 +509,11 @@ export_filter(struct channel *c, rte *rt, int silent)
   return export_filter_(c, rt, rte_update_pool, silent);
 }
 
+void do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old);
+
 static void
 do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
 {
-  struct proto *p = c->proto;
   struct channel_export_stats *stats = &c->export_stats;
 
   if (c->refeeding && new)
@@ -528,28 +530,31 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
   if (!new && old)
     CHANNEL_LIMIT_POP(c, OUT);
 
-  /* Apply export table */
-  struct rte_storage *old_exported = NULL;
-  if (c->out_table)
-  {
-    if (!rte_update_out(c, net, new, old, &old_exported))
-    {
-      channel_rte_trace_out(D_ROUTES, c, new, "idempotent");
-      return;
-    }
-  }
-
-  if (new)
-    stats->updates_accepted++;
-  else
-    stats->withdraws_accepted++;
-
+  /* Store route export state */
   if (old)
     bmap_clear(&c->export_map, old->id);
 
   if (new)
     bmap_set(&c->export_map, new->id);
 
+  /* Apply export table */
+  if (c->out_table)
+    rte_import(&c->out_table->push, net, new, old ? old->src : new->src);
+  else
+    do_rt_notify_direct(c, net, new, old);
+}
+
+void
+do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old)
+{
+  struct proto *p = c->proto;
+  struct channel_export_stats *stats = &c->export_stats;
+
+  if (new)
+    stats->updates_accepted++;
+  else
+    stats->withdraws_accepted++;
+
   if (p->debug & D_ROUTES)
   {
     if (new && old)
@@ -560,10 +565,7 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
       channel_rte_trace_out(D_ROUTES, c, old, "removed");
   }
 
-  p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
-
-  if (c->out_table && old_exported)
-    rte_free(old_exported, c->out_table);
+  p->rt_notify(p, c, net, new, old);
 }
 
 static void
@@ -784,7 +786,7 @@ rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_
   rte n0;
 
   if (rpe->new_best != rpe->old_best)
-    rt_notify_basic(c, net, RTE_COPY(rpe->new_best, &n0), RTE_OR_NULL(rpe->old_best));
+    rt_notify_basic(c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -799,7 +801,7 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
   rte n0;
 
   if (rpe->new != rpe->old)
-    rt_notify_basic(c, net, RTE_COPY(rpe->new, &n0), RTE_OR_NULL(rpe->old));
+    rt_notify_basic(c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -974,6 +976,10 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
 
+  /* Set the stale cycle unless already set */
+  if (new && !(new->flags & REF_USE_STALE))
+    new->stale_cycle = c->stale_set;
+
   /* Find and remove original route from the same protocol */
   struct rte_storage **before_old = rte_find(net, src);
 
@@ -999,8 +1005,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	  if (new && rte_same(old, new))
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
-
-	      old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
+	      old->stale_cycle = new->stale_cycle;
 
 	      if (!rte_is_filtered(new))
 		{
@@ -1138,18 +1143,23 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	new_stored->rte.id = old->id;
     }
 
+  _Bool nb = (new_stored == net->routes);
+  _Bool ob = (old_best == old);
+
   /* Log the route change */
-  if (new_ok)
-    rt_rte_trace_in(D_ROUTES, req, &new_stored->rte, new_stored == net->routes ? "added [best]" : "added");
-  else if (old_ok)
+  if (new_ok && old_ok)
     {
-      if (old != old_best)
-	rt_rte_trace_in(D_ROUTES, req, old, "removed");
-      else if (net->routes && rte_is_ok(&net->routes->rte))
-	rt_rte_trace_in(D_ROUTES, req, old, "removed [replaced]");
-      else
-	rt_rte_trace_in(D_ROUTES, req, old, "removed [sole]");
+      const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
+      rt_rte_trace_in(D_ROUTES, req, &new_stored->rte, best_indicator[nb][ob]);
     }
+  else if (new_ok)
+    rt_rte_trace_in(D_ROUTES, req, &new_stored->rte,
+	(!net->routes->next || !rte_is_ok(&net->routes->next->rte)) ? "added [sole]" :
+	nb ? "added [best]" : "added");
+  else if (old_ok)
+    rt_rte_trace_in(D_ROUTES, req, old,
+	(!net->routes || !rte_is_ok(&net->routes->rte)) ? "removed [sole]" :
+	ob ? "removed [best]" : "removed");
 
   /* Propagate the route change */
   rte_announce(table, net, new_stored, old_stored,
@@ -1197,12 +1207,15 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 {
   struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
-  if (new && !old)
-    if (CHANNEL_LIMIT_PUSH(c, RX))
-      return NULL;
+  if (!c->in_table)
+  {
+    if (new && !old)
+      if (CHANNEL_LIMIT_PUSH(c, RX))
+	return NULL;
 
-  if (!new && old)
-    CHANNEL_LIMIT_POP(c, RX);
+    if (!new && old)
+      CHANNEL_LIMIT_POP(c, RX);
+  }
 
   int new_in = new && !rte_is_filtered(new);
   int old_in = old && !rte_is_filtered(old);
@@ -1223,7 +1236,22 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
   return new;
 }
 
-static void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+rte *
+channel_in_preimport(struct rt_import_request *req, rte *new, rte *old)
+{
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+
+  if (new && !old)
+    if (CHANNEL_LIMIT_PUSH(cat->c, RX))
+      return NULL;
+
+  if (!new && old)
+    CHANNEL_LIMIT_POP(cat->c, RX);
+
+  return new;
+}
+
+void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 
 void
 rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
@@ -1233,13 +1261,14 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
-  if (c->in_table && !rte_update_in(c, n, new, src))
-    return;
 
-  return rte_update_direct(c, n, new, src);
+  if (c->in_table)
+    rte_import(&c->in_table->push, n, new, src);
+  else
+    rte_update_direct(c, n, new, src);
 }
 
-static void
+void
 rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   const struct filter *filter = c->in_filter;
@@ -1323,24 +1352,6 @@ rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garb
   rte_update_unlock();
 }
 
-/* Modify existing route by protocol hook, used for long-lived graceful restart */
-static inline void
-rte_modify(net *net, rte *old)
-{
-  rte_update_lock();
-
-  rte *new = old->sender->req->rte_modify(old, rte_update_pool);
-  if (new != old)
-  {
-    if (new)
-      new->flags = old->flags & ~REF_MODIFY;
-
-    rte_recalculate(old->sender, net, new, old->src);
-  }
-
-  rte_update_unlock();
-}
-
 /* Check rtable for best route to given net whether it would be exported do p */
 int
 rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
@@ -1419,6 +1430,9 @@ rt_request_import(rtable *tab, struct rt_import_request *req)
   hook->req = req;
   hook->table = tab;
 
+  if (!hook->stale_set)
+    hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 1;
+
   rt_set_import_state(hook, TIS_UP);
 
   hook->n = (node) {};
@@ -1499,20 +1513,41 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
  * routes to the routing table (by rte_update()). After that, all protocol
  * routes (more precisely routes with @c as @sender) not sent during the
  * refresh cycle but still in the table from the past are pruned. This is
- * implemented by marking all related routes as stale by REF_STALE flag in
- * rt_refresh_begin(), then marking all related stale routes with REF_DISCARD
- * flag in rt_refresh_end() and then removing such routes in the prune loop.
- */
+ * implemented by setting rte->stale_cycle to req->stale_set in rte_update()
+ * and then dropping all routes with old stale_cycle values in table prune loop. */
 void
-rt_refresh_begin(rtable *t, struct rt_import_request *req)
+rt_refresh_begin(struct rt_import_request *req)
 {
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if (e->rte.sender == req->hook)
-	  e->rte.flags |= REF_STALE;
-    }
-  FIB_WALK_END;
+  struct rt_import_hook *hook = req->hook;
+  ASSERT_DIE(hook);
+
+  ASSERT_DIE(hook->stale_set == hook->stale_valid);
+
+  /* If the pruning routine is too slow */
+  if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
+      || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
+  {
+    log(L_WARN "Route refresh flood in table %s", hook->table->name);
+    FIB_WALK(&hook->table->fib, net, n)
+      {
+	for (struct rte_storage *e = n->routes; e; e = e->next)
+	  if (e->rte.sender == req->hook)
+	    e->rte.stale_cycle = 0;
+      }
+    FIB_WALK_END;
+    hook->stale_set = 1;
+    hook->stale_valid = 0;
+    hook->stale_pruned = 0;
+  }
+  else if (!++hook->stale_set)
+  {
+    /* Let's reserve the stale_cycle zero value for always-invalid routes */
+    hook->stale_set = 1;
+    hook->stale_valid = 0;
+  }
+
+  if (req->trace_routes & D_STATES)
+    log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
 }
 
 /**
@@ -1524,43 +1559,18 @@ rt_refresh_begin(rtable *t, struct rt_import_request *req)
  * hook. See rt_refresh_begin() for description of refresh cycles.
  */
 void
-rt_refresh_end(rtable *t, struct rt_import_request *req)
+rt_refresh_end(struct rt_import_request *req)
 {
-  int prune = 0;
+  struct rt_import_hook *hook = req->hook;
+  ASSERT_DIE(hook);
 
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE))
-	  {
-	    e->rte.flags |= REF_DISCARD;
-	    prune = 1;
-	  }
-    }
-  FIB_WALK_END;
+  hook->stale_valid++;
+  ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  if (prune)
-    rt_schedule_prune(t);
-}
+  rt_schedule_prune(hook->table);
 
-void
-rt_modify_stale(rtable *t, struct rt_import_request *req)
-{
-  int prune = 0;
-
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
-	  {
-	    e->rte.flags |= REF_MODIFY;
-	    prune = 1;
-	  }
-    }
-  FIB_WALK_END;
-
-  if (prune)
-    rt_schedule_prune(t);
+  if (req->trace_routes & D_STATES)
+    log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
 }
 
 /**
@@ -1613,9 +1623,6 @@ rt_dump_all(void)
 
   WALK_LIST2(t, n, routing_tables, n)
     rt_dump(t);
-
-  WALK_LIST2(t, n, deleted_routing_tables, n)
-    rt_dump(t);
 }
 
 void
@@ -1658,9 +1665,6 @@ rt_dump_hooks_all(void)
 
   WALK_LIST2(t, n, routing_tables, n)
     rt_dump_hooks(t);
-
-  WALK_LIST2(t, n, deleted_routing_tables, n)
-    rt_dump_hooks(t);
 }
 
 static inline void
@@ -1796,9 +1800,7 @@ rt_free(resource *_r)
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
-
-  if (r->internal)
-    return;
+  ASSERT_DIE(r->deleted);
 
   r->config->table = NULL;
   rem_node(&r->n);
@@ -1853,20 +1855,17 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
 
-  if (!(t->internal = cf->internal))
-  {
-    init_list(&t->imports);
-    init_list(&t->exports);
-    hmap_init(&t->id_map, p, 1024);
-    hmap_set(&t->id_map, 0);
+  init_list(&t->imports);
+  init_list(&t->exports);
+  hmap_init(&t->id_map, p, 1024);
+  hmap_set(&t->id_map, 0);
 
-    init_list(&t->subscribers);
+  init_list(&t->subscribers);
 
-    t->rt_event = ev_new_init(p, rt_event, t);
-    t->last_rt_change = t->gc_time = current_time();
+  t->rt_event = ev_new_init(p, rt_event, t);
+  t->last_rt_change = t->gc_time = current_time();
 
-    t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
-  }
+  t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
   return t;
 }
@@ -1884,7 +1883,6 @@ rt_init(void)
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
-  init_list(&deleted_routing_tables);
 }
 
 
@@ -1925,6 +1923,13 @@ rt_prune_table(rtable *tab)
     WALK_LIST2(ih, n, tab->imports, n)
       if (ih->import_state == TIS_STOP)
 	rt_set_import_state(ih, TIS_FLUSHING);
+      else if ((ih->stale_valid != ih->stale_pruning) && (ih->stale_pruning == ih->stale_pruned))
+      {
+	ih->stale_pruning = ih->stale_valid;
+
+	if (ih->req->trace_routes & D_STATES)
+	  log(L_TRACE "%s: table prune after refresh begin [%u]", ih->req->name, ih->stale_pruning);
+      }
 
     FIB_ITERATE_INIT(fit, &tab->fib);
     tab->prune_state = 2;
@@ -1936,7 +1941,11 @@ again:
     rescan:
       for (struct rte_storage *e=n->routes; e; e=e->next)
       {
-	if ((e->rte.sender->import_state == TIS_FLUSHING) || (e->rte.flags & REF_DISCARD))
+	struct rt_import_hook *s = e->rte.sender;
+
+	if ((s->import_state == TIS_FLUSHING) ||
+	    (e->rte.stale_cycle < s->stale_valid) ||
+	    (e->rte.stale_cycle > s->stale_set))
 	  {
 	    if (limit <= 0)
 	      {
@@ -1948,21 +1957,6 @@ again:
 	    rte_discard(n, &e->rte);
 	    limit--;
 
-	    goto rescan;
-	  }
-
-	if (e->rte.flags & REF_MODIFY)
-	  {
-	    if (limit <= 0)
-	      {
-		FIB_ITERATE_PUT(fit);
-		ev_schedule(tab->rt_event);
-		return;
-	      }
-
-	    rte_modify(n, &e->rte);
-	    limit--;
-
 	    goto rescan;
 	  }
       }
@@ -1998,6 +1992,13 @@ again:
       mb_free(ih);
       rt_unlock_table(tab);
     }
+    else if (ih->stale_pruning != ih->stale_pruned)
+    {
+      ih->stale_pruned = ih->stale_pruning;
+
+      if (ih->req->trace_routes & D_STATES)
+	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
+    }
 }
 
 void
@@ -2204,7 +2205,10 @@ rt_next_hop_update_net(rtable *tab, net *n)
   for (int i=0; i<count; i++)
   {
     _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
-    const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
+    const char *best_indicator[2][2] = {
+      { "autoupdated", "autoupdated [-best]" },
+      { "autoupdated [+best]", "autoupdated [best]" }
+    };
     rt_rte_trace_in(D_ROUTES, updates[i].new->rte.sender->req, &updates[i].new->rte, best_indicator[nb][ob]);
     rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
@@ -2308,11 +2312,12 @@ rt_unlock_table(rtable *r)
 {
   if (!--r->use_count && r->deleted)
     {
-      struct config *conf = r->deleted;
+      void *del_data = r->del_data;
+      void (*deleted)(void *) = r->deleted;
 
       /* Delete the routing table by freeing its pool */
       rt_shutdown(r);
-      config_del_obstacle(conf);
+      deleted(del_data);
     }
 }
 
@@ -2323,6 +2328,8 @@ rt_find_table_config(struct config *cf, char *name)
   return (sym && (sym->class == SYM_TABLE)) ? sym->table : NULL;
 }
 
+static void rt_config_del_obstacle(void *data) { config_del_obstacle(data); }
+
 /**
  * rt_commit - commit new routing table configuration
  * @new: new configuration
@@ -2361,9 +2368,10 @@ rt_commit(struct config *new, struct config *old)
 	      else
 		{
 		  DBG("\t%s: deleted\n", o->name);
-		  ot->deleted = old;
-		  config_add_obstacle(old);
 		  rt_lock_table(ot);
+		  ot->deleted = rt_config_del_obstacle;
+		  ot->del_data = old;
+		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
 	    }
@@ -2441,285 +2449,6 @@ done:
 }
 
 
-/*
- *	Import table
- */
-
-int
-rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
-{
-  struct rtable *tab = c->in_table;
-  net *net;
-
-  if (new)
-    net = net_get(tab, n);
-  else
-  {
-    net = net_find(tab, n);
-
-    if (!net)
-      goto drop_withdraw;
-  }
-
-  /* Find the old rte */
-  struct rte_storage **pos = rte_find(net, src);
-  if (*pos)
-    {
-      rte *old = &(*pos)->rte;
-      if (new && rte_same(old, new))
-      {
-	/* Refresh the old rte, continue with update to main rtable */
-	if (old->flags & (REF_STALE | REF_DISCARD | REF_MODIFY))
-	{
-	  old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
-	  return 1;
-	}
-
-	goto drop_update;
-      }
-
-      if (!new)
-	CHANNEL_LIMIT_POP(c, RX);
-
-      /* Move iterator if needed */
-      if (*pos == c->reload_next_rte)
-	c->reload_next_rte = (*pos)->next;
-
-      /* Remove the old rte */
-      struct rte_storage *del = *pos;
-      *pos = (*pos)->next;
-      rte_free(del, tab);
-      tab->rt_count--;
-    }
-  else if (new)
-    {
-      if (CHANNEL_LIMIT_PUSH(c, RX))
-      {
-	/* Required by rte_trace_in() */
-	new->net = n;
-
-	channel_rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-	goto drop_update;
-      }
-    }
-  else
-    goto drop_withdraw;
-
-  if (!new)
-  {
-    if (!net->routes)
-      fib_delete(&tab->fib, net);
-
-    return 1;
-  }
-
-  /* Insert the new rte */
-  struct rte_storage *e = rte_store(new, net, tab);
-  e->rte.lastmod = current_time();
-  e->next = *pos;
-  *pos = e;
-  tab->rt_count++;
-  return 1;
-
-drop_update:
-  c->import_stats.updates_received++;
-  c->in_req.hook->stats.updates_ignored++;
-
-  if (!net->routes)
-    fib_delete(&tab->fib, net);
-
-  return 0;
-
-drop_withdraw:
-  c->import_stats.withdraws_received++;
-  c->in_req.hook->stats.withdraws_ignored++;
-  return 0;
-}
-
-int
-rt_reload_channel(struct channel *c)
-{
-  struct rtable *tab = c->in_table;
-  struct fib_iterator *fit = &c->reload_fit;
-  int max_feed = 64;
-
-  ASSERT(c->channel_state == CS_UP);
-
-  if (!c->reload_active)
-  {
-    FIB_ITERATE_INIT(fit, &tab->fib);
-    c->reload_active = 1;
-  }
-
-  do {
-    for (struct rte_storage *e = c->reload_next_rte; e; e = e->next)
-    {
-      if (max_feed-- <= 0)
-      {
-	c->reload_next_rte = e;
-	debug("%s channel reload burst split (max_feed=%d)", c->proto->name, max_feed);
-	return 0;
-      }
-
-      rte r = e->rte;
-      rte_update_direct(c, r.net, &r, r.src);
-    }
-
-    c->reload_next_rte = NULL;
-
-    FIB_ITERATE_START(&tab->fib, fit, net, n)
-    {
-      if (c->reload_next_rte = n->routes)
-      {
-	FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
-	break;
-      }
-    }
-    FIB_ITERATE_END;
-  }
-  while (c->reload_next_rte);
-
-  c->reload_active = 0;
-  return 1;
-}
-
-void
-rt_reload_channel_abort(struct channel *c)
-{
-  if (c->reload_active)
-  {
-    /* Unlink the iterator */
-    fit_get(&c->in_table->fib, &c->reload_fit);
-    c->reload_next_rte = NULL;
-    c->reload_active = 0;
-  }
-}
-
-void
-rt_prune_sync(rtable *t, int all)
-{
-  struct fib_iterator fit;
-
-  FIB_ITERATE_INIT(&fit, &t->fib);
-
-again:
-  FIB_ITERATE_START(&t->fib, &fit, net, n)
-  {
-    struct rte_storage *e, **ee = &n->routes;
-
-    while (e = *ee)
-    {
-      if (all || (e->rte.flags & (REF_STALE | REF_DISCARD)))
-      {
-	*ee = e->next;
-	rte_free(e, t);
-	t->rt_count--;
-      }
-      else
-	ee = &e->next;
-    }
-
-    if (all || !n->routes)
-    {
-      FIB_ITERATE_PUT(&fit);
-      fib_delete(&t->fib, n);
-      goto again;
-    }
-  }
-  FIB_ITERATE_END;
-}
-
-
-/*
- *	Export table
- */
-
-int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old0, struct rte_storage **old_exported)
-{
-  struct rtable *tab = c->out_table;
-  struct rte_src *src;
-  net *net;
-
-  if (new)
-  {
-    net = net_get(tab, n);
-    src = new->src;
-  }
-  else
-  {
-    net = net_find(tab, n);
-    src = old0->src;
-
-    if (!net)
-      goto drop;
-  }
-
-  /* Find the old rte */
-  struct rte_storage **pos = (c->ra_mode == RA_ANY) ? rte_find(net, src) : &net->routes;
-  struct rte_storage *old = NULL;
-
-  if (old = *pos)
-  {
-    if (new && rte_same(&(*pos)->rte, new))
-      goto drop;
-
-    /* Remove the old rte */
-    *pos = old->next;
-    *old_exported = old;
-    tab->rt_count--;
-  }
-
-  if (!new)
-  {
-    if (!old)
-      goto drop;
-
-    if (!net->routes)
-      fib_delete(&tab->fib, net);
-
-    return 1;
-  }
-
-  /* Insert the new rte */
-  struct rte_storage *e = rte_store(new, net, tab);
-  e->rte.lastmod = current_time();
-  e->next = *pos;
-  *pos = e;
-  tab->rt_count++;
-  return 1;
-
-drop:
-  return 0;
-}
-
-void
-rt_refeed_channel(struct channel *c)
-{
-  if (!c->out_table)
-  {
-    channel_request_feeding(c);
-    return;
-  }
-
-  ASSERT_DIE(c->ra_mode != RA_ANY);
-
-  c->proto->feed_begin(c, 0);
-
-  FIB_WALK(&c->out_table->fib, net, n)
-  {
-    if (!n->routes)
-      continue;
-
-    rte e = n->routes->rte;
-    c->proto->rt_notify(c->proto, c, n->n.addr, &e, NULL);
-  }
-  FIB_WALK_END;
-
-  c->proto->feed_end(c);
-}
-
-
 /*
  *	Hostcache
  */
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 90490b4f..892b26e3 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2267,30 +2267,44 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     return !old_suppressed;
 }
 
-rte *
-bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
+void
+bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
 {
-  eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
-  const struct adata *ad = ea ? ea->u.ptr : NULL;
-  uint flags = ea ? ea->flags : BAF_PARTIAL;
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
 
-  if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
-    return NULL;
+  do {
+    rte *r = feed[--count];
+    if (r->sender != c->c.in_req.hook)
+      continue;
 
-  if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
-    return r;
+    /* A new route, do not mark as stale */
+    if (r->stale_cycle == c->c.in_req.hook->stale_set)
+      continue;
 
-  rta *a = rta_do_cow(r->attrs, pool);
-  
-  _Thread_local static rte e0;
-  e0 = *r;
-  e0.attrs = a;
+    eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
+    const struct adata *ad = ea ? ea->u.ptr : NULL;
+    uint flags = ea ? ea->flags : BAF_PARTIAL;
 
-  bgp_set_attr_ptr(&(a->eattrs), pool, BA_COMMUNITY, flags,
-		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
-  e0.pflags |= BGP_REF_STALE;
+    rte e0 = *r;
+    e0.flags |= REF_USE_STALE;
 
-  return &e0;
+    if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
+      rte_import(&c->c.in_req, n, NULL, r->src);
+
+    else if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
+      rte_import(&c->c.in_req, n, &e0, r->src);
+
+    else {
+      rta *a = e0.attrs = rta_do_cow(r->attrs, bgp_linpool);
+
+      bgp_set_attr_ptr(&(a->eattrs), bgp_linpool, BA_COMMUNITY, flags,
+	  int_set_add(bgp_linpool, ad, BGP_COMM_LLGR_STALE));
+      e0.pflags |= BGP_REF_STALE;
+
+      rte_import(&c->c.in_req, n, &e0, r->src);
+      lp_flush(bgp_linpool);
+    }
+  } while (count);
 }
 
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 78c36bc7..35e9ea59 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -140,6 +140,15 @@ static void bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd);
 static int bgp_incoming_connection(sock *sk, uint dummy UNUSED);
 static void bgp_listen_sock_err(sock *sk UNUSED, int err);
 
+static void bgp_graceful_restart_feed(struct bgp_channel *c);
+static inline void channel_refresh_end_reload(struct channel *c)
+{
+  channel_refresh_end(c);
+
+  if (c->in_table)
+    channel_request_reload(c);
+}
+
 /**
  * bgp_open - open a BGP instance
  * @p: BGP instance
@@ -775,25 +784,25 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
       {
       case BGP_GRS_NONE:
 	c->gr_active = BGP_GRS_ACTIVE;
-	rt_refresh_begin(c->c.table, &c->c.in_req);
+	channel_refresh_begin(&c->c);
 	break;
 
       case BGP_GRS_ACTIVE:
-	rt_refresh_end(c->c.table, &c->c.in_req);
-	rt_refresh_begin(c->c.table, &c->c.in_req);
+	channel_refresh_end(&c->c);
+	channel_refresh_begin(&c->c);
 	break;
 
       case BGP_GRS_LLGR:
-	rt_refresh_begin(c->c.table, &c->c.in_req);
-	rt_modify_stale(c->c.table, &c->c.in_req);
+	channel_refresh_begin(&c->c);
+	bgp_graceful_restart_feed(c);
 	break;
       }
     }
     else
     {
       /* Just flush the routes */
-      rt_refresh_begin(c->c.table, &c->c.in_req);
-      rt_refresh_end(c->c.table, &c->c.in_req);
+      channel_refresh_begin(&c->c);
+      channel_refresh_end(&c->c);
     }
 
     /* Reset bucket and prefix tables */
@@ -811,6 +820,50 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
   tm_start(p->gr_timer, p->conn->remote_caps->gr_time S);
 }
 
+static void
+bgp_graceful_restart_feed_done(struct rt_export_request *req)
+{
+  req->hook = NULL;
+}
+
+static void
+bgp_graceful_restart_feed_dump_req(struct rt_export_request *req)
+{
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  debug("  BGP-GR %s.%s export request %p\n", c->c.proto->name, c->c.name, req);
+}
+
+static void
+bgp_graceful_restart_feed_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  struct bgp_proto *p = (void *) c->c.proto;
+  BGP_TRACE(D_EVENTS, "Long-lived graceful restart export state changed to %s", rt_export_state_name(state));
+
+  if (state == TES_READY)
+    rt_stop_export(req, bgp_graceful_restart_feed_done);
+}
+
+static void
+bgp_graceful_restart_drop_export(struct rt_export_request *req UNUSED, const net_addr *n UNUSED, struct rt_pending_export *rpe UNUSED)
+{ /* Nothing to do */ }
+
+static void
+bgp_graceful_restart_feed(struct bgp_channel *c)
+{
+  c->stale_feed = (struct rt_export_request) {
+    .name = "BGP-GR",
+    .trace_routes = c->c.debug | c->c.proto->debug,
+    .dump_req = bgp_graceful_restart_feed_dump_req,
+    .log_state_change = bgp_graceful_restart_feed_log_state_change,
+    .export_bulk = bgp_rte_modify_stale,
+    .export_one = bgp_graceful_restart_drop_export,
+  };
+
+  rt_request_export(c->c.table, &c->stale_feed);
+}
+
+
 /**
  * bgp_graceful_restart_done - finish active BGP graceful restart
  * @c: BGP channel
@@ -833,8 +886,11 @@ bgp_graceful_restart_done(struct bgp_channel *c)
   if (!p->gr_active_num)
     BGP_TRACE(D_EVENTS, "Neighbor graceful restart done");
 
+  if (c->stale_feed.hook)
+    rt_stop_export(&c->stale_feed, bgp_graceful_restart_feed_done);
+
   tm_stop(c->stale_timer);
-  rt_refresh_end(c->c.table, &c->c.in_req);
+  channel_refresh_end_reload(&c->c);
 }
 
 /**
@@ -876,7 +932,7 @@ bgp_graceful_restart_timeout(timer *t)
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
       tm_start(c->stale_timer, c->stale_time S);
-      rt_modify_stale(c->c.table, &c->c.in_req);
+      bgp_graceful_restart_feed(c);
     }
   }
   else
@@ -914,10 +970,7 @@ bgp_refresh_begin(struct bgp_channel *c)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
   c->load_state = BFS_REFRESHING;
-  rt_refresh_begin(c->c.table, &c->c.in_req);
-
-  if (c->c.in_table)
-    rt_refresh_begin(c->c.in_table, &c->c.in_req);
+  channel_refresh_begin(&c->c);
 }
 
 /**
@@ -938,10 +991,7 @@ bgp_refresh_end(struct bgp_channel *c)
   { log(L_WARN "%s: END-OF-RR received without prior BEGIN-OF-RR, ignoring", p->p.name); return; }
 
   c->load_state = BFS_NONE;
-  rt_refresh_end(c->c.table, &c->c.in_req);
-
-  if (c->c.in_table)
-    rt_prune_sync(c->c.in_table, 0);
+  channel_refresh_end_reload(&c->c);
 }
 
 
@@ -1408,12 +1458,9 @@ bgp_reload_routes(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
-  ASSERT(p->conn && (p->route_refresh || c->c.in_table));
+  ASSERT(p->conn && (p->route_refresh));
 
-  if (c->c.in_table)
-    channel_schedule_reload(C);
-  else
-    bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
+  bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
 }
 
 static void
@@ -1693,7 +1740,6 @@ bgp_init(struct proto_config *CF)
   P->rte_better = bgp_rte_better;
   P->rte_mergable = bgp_rte_mergable;
   P->rte_recalculate = cf->deterministic_med ? bgp_rte_recalculate : NULL;
-  P->rte_modify = bgp_rte_modify_stale;
   P->rte_igp_metric = bgp_rte_igp_metric;
 
   p->cf = cf;
@@ -1756,7 +1802,7 @@ bgp_channel_start(struct channel *C)
   bgp_init_prefix_table(c);
 
   if (c->cf->import_table)
-    channel_setup_in_table(C);
+    channel_setup_in_table(C, 0);
 
   if (c->cf->export_table)
     channel_setup_out_table(C);
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index c79dd1b2..342dc023 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -366,6 +366,7 @@ struct bgp_channel {
 
   timer *stale_timer;			/* Long-lived stale timer for LLGR */
   u32 stale_time;			/* Stored LLGR stale time from last session */
+  struct rt_export_request stale_feed;	/* Feeder request for stale route modification */
 
   u8 add_path_rx;			/* Session expects receive of ADD-PATH extended NLRI */
   u8 add_path_tx;			/* Session expects transmit of ADD-PATH extended NLRI */
@@ -585,7 +586,7 @@ void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
 int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
-struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
+void bgp_rte_modify_stale(struct rt_export_request *, const net_addr *, struct rt_pending_export *, rte **, uint);
 u32 bgp_rte_igp_metric(struct rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
 int bgp_preexport(struct channel *, struct rte *);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index f1e6d7d2..647551e5 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2695,7 +2695,7 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, uint len)
   {
   case BGP_RR_REQUEST:
     BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
-    rt_refeed_channel(&c->c);
+    channel_request_feeding(&c->c);
     break;
 
   case BGP_RR_BEGIN:
diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 943485d7..897edc09 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -661,9 +661,9 @@ rpki_handle_cache_response_pdu(struct rpki_cache *cache, const struct pdu_cache_
        * a refresh cycle.
        */
       if (cache->p->roa4_channel)
-	rt_refresh_begin(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
+	rt_refresh_begin(&cache->p->roa4_channel->in_req);
       if (cache->p->roa6_channel)
-	rt_refresh_begin(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
+	rt_refresh_begin(&cache->p->roa6_channel->in_req);
 
       cache->p->refresh_channels = 1;
     }
@@ -819,9 +819,9 @@ rpki_handle_end_of_data_pdu(struct rpki_cache *cache, const struct pdu_end_of_da
   {
     cache->p->refresh_channels = 0;
     if (cache->p->roa4_channel)
-      rt_refresh_end(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
+      rt_refresh_end(&cache->p->roa4_channel->in_req);
     if (cache->p->roa6_channel)
-      rt_refresh_end(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
+      rt_refresh_end(&cache->p->roa6_channel->in_req);
   }
 
   cache->last_update = current_time();
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 40a58442..609ee921 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -285,249 +285,24 @@ krt_metric(rte *a)
 }
 
 static inline int
-krt_same_key(rte *a, rte *b)
+krt_rte_better(rte *a, rte *b)
 {
-  return (krt_metric(a) == krt_metric(b));
-}
-
-static inline int
-krt_uptodate(rte *a, rte *b)
-{
-  return (a->attrs == b->attrs);
-}
-
-static void
-krt_learn_announce_update(struct krt_proto *p, rte *e)
-{
-  rte e0 = {
-    .attrs = rta_clone(e->attrs),
-    .src = p->p.main_source,
-  };
-
-  rte_update(p->p.main_channel, e->net, &e0, p->p.main_source);
-}
-
-static void
-krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
-{
-  rte_update(p->p.main_channel, n, NULL, p->p.main_source);
+  return (krt_metric(a) > krt_metric(b));
 }
 
 /* Called when alien route is discovered during scan */
 static void
-krt_learn_scan(struct krt_proto *p, rte *e)
+krt_learn_rte(struct krt_proto *p, rte *e)
 {
-  net *n = net_get(p->krt_table, e->net);
-  struct rte_storage *m, **mm;
-
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
-
-  for(mm = &n->routes; m = *mm; mm = &m->next)
-    if (krt_same_key(&m->rte, e))
-      break;
-  if (m)
-    {
-      if (krt_uptodate(&m->rte, e))
-	{
-	  krt_trace_in_rl(&rl_alien, p, e, "[alien] seen");
-	  rte_free(ee, p->krt_table);
-	  m->rte.pflags |= KRT_REF_SEEN;
-	}
-      else
-	{
-	  krt_trace_in(p, e, "[alien] updated");
-	  *mm = m->next;
-	  rte_free(m, p->krt_table);
-	  m = NULL;
-	}
-    }
-  else
-    krt_trace_in(p, e, "[alien] created");
-
-  if (!m)
-    {
-      ee->next = n->routes;
-      n->routes = ee;
-      ee->rte.pflags |= KRT_REF_SEEN;
-    }
-}
-
-static void
-krt_learn_prune(struct krt_proto *p)
-{
-  struct fib *fib = &p->krt_table->fib;
-  struct fib_iterator fit;
-
-  KRT_TRACE(p, D_EVENTS, "Pruning inherited routes");
-
-  FIB_ITERATE_INIT(&fit, fib);
-again:
-  FIB_ITERATE_START(fib, &fit, net, n)
-    {
-      struct rte_storage *e, **ee, *best, **pbest, *old_best;
-
-      /*
-       * Note that old_best may be NULL even if there was an old best route in
-       * the previous step, because it might be replaced in krt_learn_scan().
-       * But in that case there is a new valid best route.
-       */
-
-      old_best = NULL;
-      best = NULL;
-      pbest = NULL;
-      ee = &n->routes;
-      while (e = *ee)
-	{
-	  if (e->rte.pflags & KRT_REF_BEST)
-	    old_best = e;
-
-	  if (!(e->rte.pflags & KRT_REF_SEEN))
-	    {
-	      *ee = e->next;
-	      rte_free(e, p->krt_table);
-	      continue;
-	    }
-
-	  if (!best || krt_metric(&best->rte) > krt_metric(&e->rte))
-	    {
-	      best = e;
-	      pbest = ee;
-	    }
-
-	  e->rte.pflags &= ~(KRT_REF_SEEN | KRT_REF_BEST);
-	  ee = &e->next;
-	}
-      if (!n->routes)
-	{
-	  DBG("%I/%d: deleting\n", n->n.prefix, n->n.pxlen);
-	  if (old_best)
-	    krt_learn_announce_delete(p, n->n.addr);
-
-	  FIB_ITERATE_PUT(&fit);
-	  fib_delete(fib, n);
-	  goto again;
-	}
-
-      best->rte.pflags |= KRT_REF_BEST;
-      *pbest = best->next;
-      best->next = n->routes;
-      n->routes = best;
-
-      if ((best != old_best) || p->reload)
-	{
-	  DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
-	  krt_learn_announce_update(p, &best->rte);
-	}
-      else
-	DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
-    }
-  FIB_ITERATE_END;
-
-  p->reload = 0;
-}
-
-static void
-krt_learn_async(struct krt_proto *p, rte *e, int new)
-{
-  net *n = net_get(p->krt_table, e->net);
-  struct rte_storage *g, **gg, *best, **bestp, *old_best;
-
-  ASSERT(!e->attrs->cached);
-  e->attrs->pref = p->p.main_channel->preference;
-
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
-
-  old_best = n->routes;
-  for(gg=&n->routes; g = *gg; gg = &g->next)
-    if (krt_same_key(&g->rte, e))
-      break;
-  if (new)
-    {
-      if (g)
-	{
-	  if (krt_uptodate(&g->rte, e))
-	    {
-	      krt_trace_in(p, e, "[alien async] same");
-	      rte_free(ee, p->krt_table);
-	      return;
-	    }
-	  krt_trace_in(p, e, "[alien async] updated");
-	  *gg = g->next;
-	  rte_free(g, p->krt_table);
-	}
-      else
-	krt_trace_in(p, e, "[alien async] created");
-
-      ee->next = n->routes;
-      n->routes = ee;
-    }
-  else if (!g)
-    {
-      krt_trace_in(p, e, "[alien async] delete failed");
-      rte_free(ee, p->krt_table);
-      return;
-    }
-  else
-    {
-      krt_trace_in(p, e, "[alien async] removed");
-      *gg = g->next;
-      rte_free(ee, p->krt_table);
-      rte_free(g, p->krt_table);
-    }
-  best = n->routes;
-  bestp = &n->routes;
-  for(gg=&n->routes; g=*gg; gg=&g->next)
-  {
-    if (krt_metric(&best->rte) > krt_metric(&g->rte))
-      {
-	best = g;
-	bestp = gg;
-      }
-
-    g->rte.pflags &= ~KRT_REF_BEST;
-  }
-
-  if (best)
-    {
-      best->rte.pflags |= KRT_REF_BEST;
-      *bestp = best->next;
-      best->next = n->routes;
-      n->routes = best;
-    }
-
-  if (best != old_best)
-    {
-      DBG("krt_learn_async: distributing change\n");
-      if (best)
-	krt_learn_announce_update(p, &best->rte);
-      else
-	krt_learn_announce_delete(p, n->n.addr);
-    }
+  e->src = rt_get_source(&p->p, krt_metric(e));
+  rte_update(p->p.main_channel, e->net, e, e->src);
 }
 
 static void
 krt_learn_init(struct krt_proto *p)
 {
   if (KRT_CF->learn)
-  {
-    struct rtable_config *cf = mb_allocz(p->p.pool, sizeof(struct rtable_config));
-    cf->name = "Inherited";
-    cf->addr_type = p->p.net_type;
-    cf->internal = 1;
-
-    p->krt_table = rt_setup(p->p.pool, cf);
-  }
-}
-
-static void
-krt_dump(struct proto *P)
-{
-  struct krt_proto *p = (struct krt_proto *) P;
-
-  if (!KRT_CF->learn)
-    return;
-  debug("KRT: Table of inheritable routes\n");
-  rt_dump(p->krt_table);
+    channel_setup_in_table(p->p.main_channel, 1);
 }
 
 #endif
@@ -547,7 +322,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
       count++;
   return count;
 }
@@ -557,7 +332,7 @@ rte_feed_obtain(net *n, rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
+    if (rte_is_valid(RTES_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
@@ -643,7 +418,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 
     case  KRT_SRC_ALIEN:
       if (KRT_CF->learn)
-	krt_learn_scan(p, e);
+	krt_learn_rte(p, e);
       else
 	krt_trace_in_rl(&rl_alien, p, e, "[alien] ignored");
       return;
@@ -712,6 +487,11 @@ static void
 krt_init_scan(struct krt_proto *p)
 {
   bmap_reset(&p->seen_map, 1024);
+
+#ifdef KRT_ALLOW_LEARN
+  if (KRT_CF->learn)
+    channel_refresh_begin(p->p.main_channel);
+#endif
 }
 
 static void
@@ -739,7 +519,7 @@ krt_prune(struct krt_proto *p)
 
 #ifdef KRT_ALLOW_LEARN
   if (KRT_CF->learn)
-    krt_learn_prune(p);
+    channel_refresh_end(p->p.main_channel);
 #endif
 
   if (p->ready)
@@ -781,7 +561,7 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
     case KRT_SRC_ALIEN:
       if (KRT_CF->learn)
 	{
-	  krt_learn_async(p, e, new);
+	  krt_learn_rte(p, e);
 	  return;
 	}
 #endif
@@ -1027,6 +807,7 @@ krt_init(struct proto_config *CF)
   p->p.if_notify = krt_if_notify;
   p->p.reload_routes = krt_reload_routes;
   p->p.feed_end = krt_feed_end;
+  p->p.rte_better = krt_rte_better;
 
   krt_sys_init(p);
   return &p->p;
@@ -1182,7 +963,4 @@ struct protocol proto_unix_kernel = {
   .reconfigure =	krt_reconfigure,
   .copy_config =	krt_copy_config,
   .get_attr =		krt_get_attr,
-#ifdef KRT_ALLOW_LEARN
-  .dump =		krt_dump,
-#endif
 };
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index f6ad6fde..968c5b16 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -51,10 +51,6 @@ struct krt_proto {
   struct proto p;
   struct krt_state sys;		/* Sysdep state */
 
-#ifdef KRT_ALLOW_LEARN
-  struct rtable *krt_table;	/* Internal table of inherited routes */
-#endif
-
 #ifndef CONFIG_ALL_TABLES_AT_ONCE
   timer *scan_timer;
 #endif

From f18968f52f461946b64aaea6c4a0e88c5235fb07 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 22 Oct 2021 19:43:55 +0200
Subject: [PATCH 026/431] Better profylaction recursive route loops

In some specific configurations, it was possible to send BIRD into an
infinite loop of recursive next hop resolution. This was caused by route
priority inversion.

To prevent priority inversions affecting other next hops, we simply
refuse to resolve any next hop if the best route for the matching prefix
is recursive or any other route with the same preference is recursive.

Next hop resolution doesn't change route priority, therefore it is
perfectly OK to resolve BGP next hops e.g. by an OSPF route, yet if the
same (or covering) prefix is also announced by iBGP, by retraction of
the OSPF route we would get a possible priority inversion.
---
 nest/rt-table.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2f480992..2dcb2e26 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2649,9 +2649,10 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
     {
       struct rte_storage *e = n->routes;
       rta *a = e->rte.attrs;
-      pxlen = n->n.addr->pxlen;
+      word pref = a->pref;
 
-      if (a->hostentry)
+      for (struct rte_storage *ee = n->routes; ee; ee = ee->next)
+	if ((ee->rte.attrs->pref >= pref) && ee->rte.attrs->hostentry)
 	{
 	  /* Recursive route should not depend on another recursive route */
 	  log(L_WARN "Next hop address %I resolvable through recursive route for %N",
@@ -2659,6 +2660,8 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 	  goto done;
 	}
 
+      pxlen = n->n.addr->pxlen;
+
       if (a->dest == RTD_UNICAST)
 	{
 	  for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)

From c70b3198dc349127273d202ab8c36afeebb6d9d0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Sep 2021 13:04:16 +0200
Subject: [PATCH 027/431] Route export is now asynchronous.

To allow for multithreaded execution, we need to break the import-export
chain and buffer the exports before actually processing them.
---
 conf/conf.h     |   2 +-
 nest/config.Y   |   2 +-
 nest/proto.c    |  72 +++--
 nest/route.h    |  33 ++-
 nest/rt-table.c | 699 +++++++++++++++++++++++++++++++++++++++---------
 5 files changed, 667 insertions(+), 141 deletions(-)

diff --git a/conf/conf.h b/conf/conf.h
index 69ef8a10..4f6aa6eb 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -45,7 +45,7 @@ struct config {
 
   int cli_debug;			/* Tracing of CLI connections and commands */
   int latency_debug;			/* I/O loop tracks duration of each event */
-  int pipe_debug;			/* Track route propagation through pipes */
+  int table_debug;			/* Track route propagation through tables */
   u32 latency_limit;			/* Events with longer duration are logged (us) */
   u32 watchdog_warning;			/* I/O loop watchdog limit for warning (us) */
   u32 watchdog_timeout;			/* Watchdog timeout (in seconds, 0 = disabled) */
diff --git a/nest/config.Y b/nest/config.Y
index a56b25be..92f1aad2 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -348,7 +348,7 @@ debug_default:
    DEBUG PROTOCOLS debug_mask { new_config->proto_default_debug = $3; }
  | DEBUG CHANNELS debug_mask { new_config->channel_default_debug = $3; }
  | DEBUG COMMANDS expr { new_config->cli_debug = $3; }
- | DEBUG PIPE bool { new_config->pipe_debug = $3; }
+ | DEBUG TABLES bool { new_config->table_debug = $3; }
  ;
 
 /* MRTDUMP PROTOCOLS is in systep/unix/config.Y */
diff --git a/nest/proto.c b/nest/proto.c
index cf448fd9..fae0647a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -649,7 +649,7 @@ channel_aux_import_stopped(struct rt_import_request *req)
 static void
 channel_aux_export_stopped(struct rt_export_request *req)
 {
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
   if (cat->refeed_pending && !cat->stop)
@@ -669,7 +669,6 @@ channel_aux_stop(struct channel_aux_table *cat)
   rt_stop_import(&cat->push, channel_aux_import_stopped);
   rt_stop_export(&cat->get, channel_aux_export_stopped);
 
-  rt_lock_table(cat->tab);
   cat->tab->deleted = channel_aux_stopped;
   cat->tab->del_data = cat;
   rt_unlock_table(cat->tab);
@@ -714,17 +713,51 @@ channel_get_log_state_change(struct rt_export_request *req, u8 state)
 
 void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 
+static int
+channel_aux_export_one_any(struct rt_export_request *req, struct rt_pending_export *rpe, rte **new, rte **old)
+{
+  struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
+  *old = RTES_OR_NULL(rpe->old);
+  struct rte_storage *new_stored;
+
+  while (rpe)
+  {
+    new_stored = rpe->new;
+    rpe_mark_seen(req->hook, rpe);
+    rpe = rpe_next(rpe, src);
+  }
+
+  *new = RTES_CLONE(new_stored, *new);
+
+  return (*new || *old) && (&new_stored->rte != *old);
+}
+
+static int
+channel_aux_export_one_best(struct rt_export_request *req, struct rt_pending_export *rpe, rte **new, rte **old)
+{
+  *old = RTES_OR_NULL(rpe->old_best);
+  struct rte_storage *new_stored;
+
+  while (rpe)
+  {
+    new_stored = rpe->new_best;
+    rpe_mark_seen(req->hook, rpe);
+    rpe = rpe_next(rpe, NULL);
+  }
+
+  *new = RTES_CLONE(new_stored, *new);
+
+  return (*new || *old) && (&new_stored->rte != *old);
+}
+
 static void
 channel_in_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
 
-  if (!rpe->new && !rpe->old)
-    return;
-
-  rte n0;
-  struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
-  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), src);
+  rte n0, *new = &n0, *old;
+  if (channel_aux_export_one_any(req, rpe, &new, &old))
+    rte_update_direct(cat->c, net, new, old ? old->src : new->src);
 }
 
 static void
@@ -732,12 +765,9 @@ channel_in_export_one_best(struct rt_export_request *req, const net_addr *net, s
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
 
-  if (!rpe->new && !rpe->old)
-    return;
-
-  rte n0;
-  struct rte_src *src = rpe->old_best ? rpe->old_best->rte.src : rpe->new_best->rte.src;
-  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), src);
+  rte n0, *new = &n0, *old;
+  if (channel_aux_export_one_best(req, rpe, &new, &old))
+    rte_update_direct(cat->c, net, new, old ? old->src : new->src);
 }
 
 static void
@@ -768,16 +798,18 @@ static void
 channel_out_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  rte n0;
-  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
+  rte n0, *new = &n0, *old;
+  if (channel_aux_export_one_any(req, rpe, &new, &old))
+    do_rt_notify_direct(cat->c, net, new, old);
 }
 
 static void
 channel_out_export_one_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  rte n0;
-  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
+  rte n0, *new = &n0, *old;
+  if (channel_aux_export_one_best(req, rpe, &new, &old))
+    do_rt_notify_direct(cat->c, net, new, old);
 }
 
 static void
@@ -831,6 +863,7 @@ channel_setup_in_table(struct channel *c, int best)
   c->in_table->c = c;
   c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
   self_link(&c->in_table->tab->n);
+  rt_lock_table(c->in_table->tab);
 
   rt_request_import(c->in_table->tab, &c->in_table->push);
   rt_request_export(c->in_table->tab, &c->in_table->get);
@@ -872,6 +905,7 @@ channel_setup_out_table(struct channel *c)
   c->out_table->c = c;
   c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
   self_link(&c->out_table->tab->n);
+  rt_lock_table(c->out_table->tab);
 
   rt_request_import(c->out_table->tab, &c->out_table->push);
   rt_request_export(c->out_table->tab, &c->out_table->get);
@@ -1051,6 +1085,8 @@ channel_request_table_feeding(struct channel *c)
 void
 channel_request_feeding(struct channel *c)
 {
+  CD(c, "Refeed requested");
+
   ASSERT(c->out_req.hook);
 
   if (c->out_table)
diff --git a/nest/route.h b/nest/route.h
index cb66be2a..d6474e09 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -15,6 +15,8 @@
 #include "lib/resource.h"
 #include "lib/net.h"
 
+#include <stdatomic.h>
+
 struct ea_list;
 struct protocol;
 struct proto;
@@ -152,6 +154,7 @@ struct rtable_config {
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
+  btime export_settle_time;		/* Delay before exports are announced */
 };
 
 typedef struct rtable {
@@ -181,12 +184,20 @@ typedef struct rtable {
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
+  byte export_used;			/* Export journal setup scheduled */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
 
   list subscribers;			/* Subscribers for notifications */
   struct timer *settle_timer;		/* Settle time for notifications */
+
+  list pending_exports;			/* List of packed struct rt_pending_export */
+  btime base_export_time;		/* When first pending export was announced */
+  struct timer *export_timer;
+
+  struct rt_pending_export *first_export;	/* First export to announce */
+  u64 next_export_seq;			/* The next export will have this ID */
 } rtable;
 
 struct rt_subscription {
@@ -203,6 +214,7 @@ struct rt_subscription {
 
 typedef struct network {
   struct rte_storage *routes;			/* Available routes for this network */
+  struct rt_pending_export *last, *first;	/* Routes with unfinished exports */
   struct fib_node n;			/* FIB flags reserved for kernel syncer */
 } net;
 
@@ -294,6 +306,7 @@ struct rt_import_hook {
     u32 withdraws_accepted;		/* Number of route withdraws accepted and processed */
   } stats;
 
+  u64 flush_seq;			/* Table export seq when the channel announced flushing */
   btime last_state_change;		/* Time of last state transition */
 
   u8 import_state;			/* IS_* */
@@ -306,7 +319,9 @@ struct rt_import_hook {
 };
 
 struct rt_pending_export {
+  struct rt_pending_export * _Atomic next;	/* Next export for the same destination */
   struct rte_storage *new, *new_best, *old, *old_best;
+  u64 seq;				/* Sequential ID (table-local) of the pending export */
 };
 
 struct rt_export_request {
@@ -333,7 +348,6 @@ struct rt_export_hook {
   rtable *table;			/* The connected table */
 
   pool *pool;
-  linpool *lp;
 
   struct rt_export_request *req;	/* The requestor */
 
@@ -345,10 +359,15 @@ struct rt_export_hook {
 
   struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
 
+  struct bmap seq_map;			/* Keep track which exports were already procesed */
+
+  struct rt_pending_export * _Atomic last_export;/* Last export processed */
+  struct rt_pending_export *rpe_next;	/* Next pending export to process */
+
   btime last_state_change;		/* Time of last state transition */
 
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
-  u8 export_state;			/* Route export state (TES_*, see below) */
+  _Atomic u8 export_state;		/* Route export state (TES_*, see below) */
 
   struct event *event;			/* Event running all the export operations */
 
@@ -384,6 +403,16 @@ static inline u8 rt_export_get_state(struct rt_export_hook *eh) { return eh ? eh
 
 void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, struct rte_src *src);
 
+/* Get next rpe. If src is given, it must match. */
+struct rt_pending_export *rpe_next(struct rt_pending_export *rpe, struct rte_src *src);
+
+/* Mark the pending export processed */
+void rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
+
+/* Get pending export seen status */
+int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
+
+
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
 #define RA_OPTIMAL	1		/* Announcement of optimal route change */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2dcb2e26..c049101a 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -45,12 +45,24 @@
 #include "lib/string.h"
 #include "lib/alloca.h"
 
+#include <stdatomic.h>
+
 pool *rt_table_pool;
 
 static linpool *rte_update_pool;
 
 list routing_tables;
 
+/* Data structures for export journal */
+#define RT_PENDING_EXPORT_ITEMS		(page_size - sizeof(struct rt_export_block)) / sizeof(struct rt_pending_export)
+
+struct rt_export_block {
+  node n;
+  _Atomic u32 end;
+  _Atomic _Bool not_last;
+  struct rt_pending_export export[];
+};
+
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
 static void rt_update_hostcache(rtable *tab);
@@ -59,6 +71,12 @@ static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_feed_channel(void *);
 
+static inline void rt_export_used(rtable *tab);
+static void rt_export_cleanup(rtable *tab);
+
+static inline void rte_update_lock(void);
+static inline void rte_update_unlock(void);
+
 const char *rt_import_state_name_array[TIS_MAX] = {
   [TIS_DOWN] = "DOWN",
   [TIS_UP] = "UP",
@@ -385,9 +403,9 @@ rte_mergable(rte *pri, rte *sec)
 static void
 rte_trace(const char *name, const rte *e, int dir, const char *msg)
 {
-  log(L_TRACE "%s %c %s %N src %uL %uG %uS %s%s",
+  log(L_TRACE "%s %c %s %N src %uL %uG %uS id %u %s%s",
       name, dir, msg, e->net,
-      e->src->private_id, e->src->global_id, e->stale_cycle,
+      e->src->private_id, e->src->global_id, e->stale_cycle, e->id,
       rta_dest_name(e->attrs->dest),
       rte_is_filtered(e) ? " (filtered)" : "");
 }
@@ -583,6 +601,16 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
   do_rt_notify(c, net, new, old);
 }
 
+static void
+channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *rpe)
+{
+  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+
+  rpe_mark_seen(req->hook, rpe);
+  if (rpe->old)
+    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
+}
+
 void
 rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe,
     struct rte **feed, uint count)
@@ -626,38 +654,30 @@ rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_p
     }
   }
 
+done:
   /* Check obsolete routes for previously exported */
-  if (!old_best)
-    if (rpe && rpe->old && bmap_test(&c->export_map, rpe->old->rte.id))
-      old_best = &rpe->old->rte;
-
-/*    for (; rpe; rpe = atomic_load_explicit(&rpe->next, memory_order_relaxed))
+  while (rpe)
+  {
+    channel_rpe_mark_seen(req, rpe);
+    if (rpe->old)
     {
-      if (rpe->old && bmap_test(&hook->accept_map, rpe->old->id))
+      if (bmap_test(&c->export_map, rpe->old->rte.id))
       {
-	old_best = &rpe->old.rte;
-	break;
+	ASSERT_DIE(old_best == NULL);
+	old_best = &rpe->old->rte;
       }
-
-      if (rpe == rpe_last)
-	break;
     }
-    */
+    rpe = rpe_next(rpe, NULL);
+  }
 
   /* Nothing to export */
   if (!new_best && !old_best)
   {
     DBG("rt_notify_accepted: nothing to export\n");
-    goto done;
+    return;
   }
 
   do_rt_notify(c, n, new_best, old_best);
-
-done:
-  /* Drop the old stored rejection if applicable.
-   * new->id == old->id happens when updating hostentries. */
-  if (rpe && rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
-    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
 }
 
 
@@ -750,63 +770,70 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
     }
 
   /* Check obsolete routes for previously exported */
-  if (!old_best)
-    if (rpe && rpe->old && bmap_test(&c->export_map, rpe->old->rte.id))
-      old_best = &rpe->old->rte;
-
-/*    for (; rpe; rpe = atomic_load_explicit(&rpe->next, memory_order_relaxed))
+  while (rpe)
+  {
+    channel_rpe_mark_seen(req, rpe);
+    if (rpe->old)
     {
-      if (rpe->old && bmap_test(&hook->accept_map, rpe->old->id))
+      if (bmap_test(&c->export_map, rpe->old->rte.id))
       {
-	old_best = &rpe->old.rte;
-	break;
+	ASSERT_DIE(old_best == NULL);
+	old_best = &rpe->old->rte;
       }
-
-      if (rpe == rpe_last)
-	break;
     }
-    */
+    rpe = rpe_next(rpe, NULL);
+  }
 
   /* Prepare new merged route */
   rte *new_merged = count ? rt_export_merged(c, feed, count, rte_update_pool, 0) : NULL;
 
   if (new_merged || old_best)
     do_rt_notify(c, n, new_merged, old_best);
-
-  /* Drop the old stored rejection if applicable.
-   * new->id == old->id happens when updating hostentries. */
-  if (rpe && rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
-    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
 }
 
 void
 rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  rte n0;
 
-  if (rpe->new_best != rpe->old_best)
-    rt_notify_basic(c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
+  rte *old = RTES_OR_NULL(rpe->old_best);
+  struct rte_storage *new_best = rpe->new_best;
 
-  /* Drop the old stored rejection if applicable.
-   * new->id == old->id happens when updating hostentries. */
-  if (rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
-    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
+  while (rpe)
+  {
+    channel_rpe_mark_seen(req, rpe);
+    new_best = rpe->new_best;
+    rpe = rpe_next(rpe, NULL);
+  }
+
+  if (&new_best->rte != old)
+  {
+    rte n0, *new = RTES_CLONE(new_best, &n0);
+    rt_notify_basic(c, net, new, old);
+  }
 }
 
 void
 rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  rte n0;
 
-  if (rpe->new != rpe->old)
-    rt_notify_basic(c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
+  struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
+  rte *old = RTES_OR_NULL(rpe->old);
+  struct rte_storage *new_any = rpe->new;
 
-  /* Drop the old stored rejection if applicable.
-   * new->id == old->id happens when updating hostentries. */
-  if (rpe->old && (!rpe->new || (rpe->new->rte.id != rpe->old->rte.id)))
-    bmap_clear(&c->export_reject_map, rpe->old->rte.id);
+  while (rpe)
+  {
+    channel_rpe_mark_seen(req, rpe);
+    new_any = rpe->new;
+    rpe = rpe_next(rpe, src);
+  }
+
+  if (&new_any->rte != old)
+  {
+    rte n0, *new = RTES_CLONE(new_any, &n0);
+    rt_notify_basic(c, net, new, old);
+  }
 }
 
 void
@@ -821,6 +848,76 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pendin
   }
 }
 
+void
+rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe)
+{
+  bmap_set(&hook->seq_map, rpe->seq);
+}
+
+struct rt_pending_export *
+rpe_next(struct rt_pending_export *rpe, struct rte_src *src)
+{
+  struct rt_pending_export *next = atomic_load_explicit(&rpe->next, memory_order_acquire);
+
+  if (!next)
+    return NULL;
+
+  if (!src)
+    return next;
+
+  while (rpe = next)
+    if (src == (rpe->new ? rpe->new->rte.src : rpe->old->rte.src))
+      return rpe;
+    else
+      next = atomic_load_explicit(&rpe->next, memory_order_acquire);
+
+  return NULL;
+}
+
+static struct rt_pending_export * rt_next_export_fast(struct rt_pending_export *last);
+static void
+rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
+{
+  if (bmap_test(&hook->seq_map, rpe->seq))
+    goto seen;
+
+  const net_addr *n = rpe->new_best ? rpe->new_best->rte.net : rpe->old_best->rte.net;
+
+  if (rpe->new)
+    hook->stats.updates_received++;
+  else
+    hook->stats.withdraws_received++;
+
+  if (hook->req->export_one)
+    hook->req->export_one(hook->req, n, rpe);
+  else if (hook->req->export_bulk)
+  {
+    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+    uint count = rte_feed_count(net);
+    rte **feed = NULL;
+    if (count)
+    {
+      feed = alloca(count * sizeof(rte *));
+      rte_feed_obtain(net, feed, count);
+    }
+    hook->req->export_bulk(hook->req, n, rpe, feed, count);
+  }
+  else
+    bug("Export request must always provide an export method");
+
+seen:
+  /* Get the next export if exists */
+  hook->rpe_next = rt_next_export_fast(rpe);
+
+  /* The last block may be available to free */
+  if (PAGE_HEAD(hook->rpe_next) != PAGE_HEAD(rpe))
+    rt_export_used(hook->table);
+
+  /* Releasing this export for cleanup routine */
+  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe->seq);
+  atomic_store_explicit(&hook->last_export, rpe, memory_order_release);
+}
+
 /**
  * rte_announce - announce a routing table change
  * @tab: table the route has been added to
@@ -856,19 +953,23 @@ static void
 rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
-  if (!new || !rte_is_valid(&new->rte))
-    new = NULL;
-
-  if (!old || !rte_is_valid(&old->rte))
-    old = NULL;
-
   if (!new_best || !rte_is_valid(&new_best->rte))
     new_best = NULL;
 
   if (!old_best || !rte_is_valid(&old_best->rte))
     old_best = NULL;
 
-  if (!new && !old && !new_best && !old_best)
+  if (!new || !rte_is_valid(&new->rte))
+    new = NULL;
+
+  if (old && !rte_is_valid(&old->rte))
+  {
+    /* Filtered old route isn't announced, should be freed immediately. */
+    rte_free(old, tab);
+    old = NULL;
+  }
+
+  if ((new == old) && (new_best == old_best))
     return;
 
   if (new_best != old_best)
@@ -884,35 +985,194 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
 
   rt_schedule_notify(tab);
 
-  struct rt_pending_export rpe = { .new = new, .old = old, .new_best = new_best, .old_best = old_best };
-  uint count = rte_feed_count(net);
-  rte **feed = NULL;
-  if (count)
+  if (EMPTY_LIST(tab->exports) && EMPTY_LIST(tab->pending_exports))
   {
-    feed = alloca(count * sizeof(rte *));
-    rte_feed_obtain(net, feed, count);
+    /* No export hook and no pending exports to cleanup. We may free the route immediately. */
+    if (!old)
+      return;
+
+    hmap_clear(&tab->id_map, old->rte.id);
+    rte_free(old, tab);
+    return;
   }
 
-  struct rt_export_hook *eh;
-  WALK_LIST(eh, tab->exports)
+  /* Get the pending export structure */
+  struct rt_export_block *rpeb = NULL, *rpebsnl = NULL;
+  u32 end = 0;
+
+  if (!EMPTY_LIST(tab->pending_exports))
   {
-    if (eh->export_state == TES_STOP)
+    rpeb = TAIL(tab->pending_exports);
+    end = atomic_load_explicit(&rpeb->end, memory_order_relaxed);
+    if (end >= RT_PENDING_EXPORT_ITEMS)
+    {
+      ASSERT_DIE(end == RT_PENDING_EXPORT_ITEMS);
+      rpebsnl = rpeb;
+
+      rpeb = NULL;
+      end = 0;
+    }
+  }
+
+  if (!rpeb)
+  {
+    rpeb = alloc_page(tab->rp);
+    *rpeb = (struct rt_export_block) {};
+    add_tail(&tab->pending_exports, &rpeb->n);
+  }
+
+  /* Fill the pending export */
+  struct rt_pending_export *rpe = &rpeb->export[rpeb->end];
+  *rpe = (struct rt_pending_export) {
+    .new = new,
+    .new_best = new_best,
+    .old = old,
+    .old_best = old_best,
+    .seq = tab->next_export_seq++,
+  };
+
+  DBG("rte_announce: table=%s net=%N new=%p from %p old=%p from %p new_best=%p old_best=%p seq=%lu\n", tab->name, net->n.addr, new, new ? new->sender : NULL, old, old ? old->sender : NULL, new_best, old_best, rpe->seq);
+
+  ASSERT_DIE(atomic_fetch_add_explicit(&rpeb->end, 1, memory_order_release) == end);
+
+  if (rpebsnl)
+  {
+    _Bool f = 0;
+    ASSERT_DIE(atomic_compare_exchange_strong_explicit(&rpebsnl->not_last, &f, 1,
+	  memory_order_release, memory_order_relaxed));
+  }
+
+  /* Append to the same-network squasher list */
+  if (net->last)
+  {
+    struct rt_pending_export *rpenull = NULL;
+    ASSERT_DIE(atomic_compare_exchange_strong_explicit(
+	  &net->last->next, &rpenull, rpe,
+	  memory_order_relaxed,
+	  memory_order_relaxed));
+    
+  }
+
+  net->last = rpe;
+
+  if (!net->first)
+    net->first = rpe;
+
+  if (tab->first_export == NULL)
+    tab->first_export = rpe;
+
+  if (!tm_active(tab->export_timer))
+    tm_start(tab->export_timer, tab->config->export_settle_time);
+}
+
+static struct rt_pending_export *
+rt_next_export_fast(struct rt_pending_export *last)
+{
+  /* Get the whole export block and find our position in there. */
+  struct rt_export_block *rpeb = PAGE_HEAD(last);
+  u32 pos = (last - &rpeb->export[0]);
+  u32 end = atomic_load_explicit(&rpeb->end, memory_order_acquire);
+  ASSERT_DIE(pos < end);
+
+  /* Next is in the same block. */
+  if (++pos < end)
+    return &rpeb->export[pos];
+
+  /* There is another block. */
+  if (atomic_load_explicit(&rpeb->not_last, memory_order_acquire))
+  {
+    /* This is OK to do non-atomically because of the not_last flag. */
+    rpeb = NODE_NEXT(rpeb);
+    return &rpeb->export[0];
+  }
+
+  /* There is nothing more. */
+  return NULL;
+}
+
+static struct rt_pending_export *
+rt_next_export(struct rt_export_hook *hook, rtable *tab)
+{
+  /* As the table is locked, it is safe to reload the last export pointer */
+  struct rt_pending_export *last = atomic_load_explicit(&hook->last_export, memory_order_acquire);
+
+  /* It is still valid, let's reuse it */
+  if (last)
+    return rt_next_export_fast(last);
+
+  /* No, therefore we must process the table's first pending export */
+  else
+    return tab->first_export;
+}
+
+static void
+rt_announce_exports(timer *tm)
+{
+  rtable *tab = tm->data;
+
+  struct rt_export_hook *c; node *n;
+  WALK_LIST2(c, n, tab->exports, n)
+  {
+    if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_READY)
       continue;
 
-    if (new)
-      eh->stats.updates_received++;
-    else
-      eh->stats.withdraws_received++;
-
-    if (eh->req->export_one)
-      eh->req->export_one(eh->req, net->n.addr, &rpe);
-    else if (eh->req->export_bulk)
-      eh->req->export_bulk(eh->req, net->n.addr, &rpe, feed, count);
-    else
-      bug("Export request must always provide an export method");
+    ev_schedule_work(c->event);
   }
 }
 
+static struct rt_pending_export *
+rt_last_export(rtable *tab)
+{
+  struct rt_pending_export *rpe = NULL;
+
+  if (!EMPTY_LIST(tab->pending_exports))
+  {
+    /* We'll continue processing exports from this export on */
+    struct rt_export_block *reb = TAIL(tab->pending_exports);
+    ASSERT_DIE(reb->end);
+    rpe = &reb->export[reb->end - 1];
+  }
+
+  return rpe;
+}
+
+#define RT_EXPORT_BULK	1024
+
+static void
+rt_export_hook(void *_data)
+{
+  struct rt_export_hook *c = _data;
+
+  ASSERT_DIE(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_READY);
+
+  if (!c->rpe_next)
+  {
+    c->rpe_next = rt_next_export(c, c->table);
+
+    if (!c->rpe_next)
+    {
+      rt_export_used(c->table);
+      return;
+    }
+  }
+
+  /* Process the export */
+  for (uint i=0; i<RT_EXPORT_BULK; i++)
+  {
+    rte_update_lock();
+
+    rte_export(c, c->rpe_next);
+
+    if (!c->rpe_next)
+      break;
+
+    rte_update_unlock();
+  }
+
+  ev_schedule_work(c->event);
+}
+
+
 static inline int
 rte_validate(struct channel *ch, rte *e)
 {
@@ -1133,14 +1393,8 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   if (new_stored)
     {
       new_stored->rte.lastmod = current_time();
-
-      if (!old)
-        {
-	  new_stored->rte.id = hmap_first_zero(&table->id_map);
-	  hmap_set(&table->id_map, new_stored->rte.id);
-	}
-      else
-	new_stored->rte.id = old->id;
+      new_stored->rte.id = hmap_first_zero(&table->id_map);
+      hmap_set(&table->id_map, new_stored->rte.id);
     }
 
   _Bool nb = (new_stored == net->routes);
@@ -1178,13 +1432,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
     p->rte_insert(net, &new_stored->rte);
 #endif
 
-  if (old)
-    {
-      if (!new_stored)
-	hmap_clear(&table->id_map, old->id);
-
-      rte_free(old_stored, table);
-    }
 }
 
 static int rte_update_nest_cnt;		/* Nesting counter to allow recursive updates */
@@ -1384,13 +1631,16 @@ rt_export_stopped(void *data)
   struct rt_export_hook *hook = data;
   rtable *tab = hook->table;
 
+  /* Drop pending exports */
+  rt_export_used(tab);
+
   /* Unlist */
   rem_node(&hook->n);
 
-  /* Reporting the channel as stopped. */
+  /* Report the channel as stopped. */
   hook->stopped(hook->req);
 
-  /* Freeing the hook together with its coroutine. */
+  /* Free the hook together with its coroutine. */
   rfree(hook->pool);
   rt_unlock_table(tab);
 
@@ -1412,7 +1662,7 @@ static inline void
 rt_set_export_state(struct rt_export_hook *hook, u8 state)
 {
   hook->last_state_change = current_time();
-  hook->export_state = state;
+  atomic_store_explicit(&hook->export_state, state, memory_order_release);
 
   if (hook->req->log_state_change)
     hook->req->log_state_change(hook->req, state);
@@ -1460,15 +1710,20 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
   pool *p = rp_new(tab->rp, "Export hook");
   struct rt_export_hook *hook = req->hook = mb_allocz(p, sizeof(struct rt_export_hook));
   hook->pool = p;
-  hook->lp = lp_new_default(p);
   
   hook->req = req;
   hook->table = tab;
 
   /* stats zeroed by mb_allocz */
 
+  bmap_init(&hook->seq_map, p, 1024);
+
   rt_set_export_state(hook, TES_HUNGRY);
 
+  struct rt_pending_export *rpe = rt_last_export(hook->table);
+  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
+  atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
+
   hook->n = (node) {};
   add_tail(&tab->exports, &hook->n);
 
@@ -1476,10 +1731,10 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
 
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
-  rt_set_export_state(hook, TES_FEEDING);
-
   hook->event = ev_new_init(p, rt_feed_channel, hook);
   ev_schedule_work(hook->event);
+
+  rt_set_export_state(hook, TES_FEEDING);
 }
 
 void
@@ -1493,16 +1748,18 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   /* Stop feeding */
   ev_postpone(hook->event);
 
-  if (hook->export_state == TES_FEEDING)
+  if (atomic_load_explicit(&hook->export_state, memory_order_relaxed) == TES_FEEDING)
     fit_get(&tab->fib, &hook->feed_fit);
 
   hook->event->hook = rt_export_stopped;
   hook->stopped = stopped;
 
-  rt_set_export_state(hook, TES_STOP);
   ev_schedule(hook->event);
+
+  rt_set_export_state(hook, TES_STOP);
 }
 
+
 /**
  * rt_refresh_begin - start a refresh cycle
  * @t: related routing table
@@ -1649,8 +1906,8 @@ rt_dump_hooks(rtable *tab)
   {
     eh->req->dump_req(eh->req);
     debug("  Export hook %p requested by %p:"
-       " refeed_pending=%u last_state_change=%t export_state=%u stopped=%p\n",
-       eh, eh->req, eh->refeed_pending, eh->last_state_change, eh->export_state, eh->stopped);
+       " refeed_pending=%u last_state_change=%t export_state=%u\n",
+       eh, eh->req, eh->refeed_pending, eh->last_state_change, atomic_load_explicit(&eh->export_state, memory_order_relaxed));
   }
   debug("\n");
 }
@@ -1700,6 +1957,18 @@ rt_schedule_prune(rtable *tab)
   tab->prune_state |= 1;
 }
 
+void
+rt_export_used(rtable *tab)
+{
+  if (config->table_debug)
+    log(L_TRACE "%s: Export cleanup requested", tab->name);
+
+  if (tab->export_used)
+    return;
+
+  tab->export_used = 1;
+  ev_schedule(tab->rt_event);
+}
 
 static void
 rt_event(void *ptr)
@@ -1708,6 +1977,9 @@ rt_event(void *ptr)
 
   rt_lock_table(tab);
 
+  if (tab->export_used)
+    rt_export_cleanup(tab);
+
   if (tab->hcu_scheduled)
     rt_update_hostcache(tab);
 
@@ -1857,13 +2129,17 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   init_list(&t->imports);
   init_list(&t->exports);
+
   hmap_init(&t->id_map, p, 1024);
   hmap_set(&t->id_map, 0);
 
+  init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
   t->rt_event = ev_new_init(p, rt_event, t);
+  t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
+  t->next_export_seq = 1;
 
   t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
@@ -1961,7 +2237,7 @@ again:
 	  }
       }
 
-      if (!n->routes)		/* Orphaned FIB entry */
+      if (!n->routes && !n->first)		/* Orphaned FIB entry */
 	{
 	  FIB_ITERATE_PUT(fit);
 	  fib_delete(&tab->fib, n);
@@ -1982,15 +2258,15 @@ again:
 
   rt_prune_sources();
 
+  uint flushed_channels = 0;
+
   /* Close flushed channels */
   WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
     if (ih->import_state == TIS_FLUSHING)
     {
-      rt_set_import_state(ih, TIS_CLEARED);
-      ih->stopped(ih->req);
-      rem_node(&ih->n);
-      mb_free(ih);
-      rt_unlock_table(tab);
+      ih->flush_seq = tab->next_export_seq;
+      rt_set_import_state(ih, TIS_WAITING);
+      flushed_channels++;
     }
     else if (ih->stale_pruning != ih->stale_pruned)
     {
@@ -1999,6 +2275,185 @@ again:
       if (ih->req->trace_routes & D_STATES)
 	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
     }
+
+  /* In some cases, we may want to directly proceed to export cleanup */
+  if (EMPTY_LIST(tab->exports) && flushed_channels)
+    rt_export_cleanup(tab);
+}
+
+static void
+rt_export_cleanup(rtable *tab)
+{
+  tab->export_used = 0;
+
+  u64 min_seq = ~((u64) 0);
+  struct rt_pending_export *last_export_to_free = NULL;
+  struct rt_pending_export *first_export = tab->first_export;
+
+  struct rt_export_hook *eh;
+  node *n;
+  WALK_LIST2(eh, n, tab->exports, n)
+  {
+    switch (atomic_load_explicit(&eh->export_state, memory_order_acquire))
+    {
+      case TES_DOWN:
+      case TES_HUNGRY:
+	continue;
+
+      case TES_READY:
+	{
+	  struct rt_pending_export *last = atomic_load_explicit(&eh->last_export, memory_order_acquire);
+	  if (!last)
+	    /* No last export means that the channel has exported nothing since last cleanup */
+	    goto done;
+
+	  else if (min_seq > last->seq)
+	  {
+	    min_seq = last->seq;
+	    last_export_to_free = last;
+	  }
+	  continue;
+	}
+
+      default:
+	/* It's only safe to cleanup when the export state is idle or regular. No feeding or stopping allowed. */
+	goto done;
+    }
+  }
+
+  tab->first_export = last_export_to_free ? rt_next_export_fast(last_export_to_free) : NULL;
+
+  if (config->table_debug)
+    log(L_TRACE "%s: Export cleanup, old first_export seq %lu, new %lu, min_seq %ld",
+      tab->name,
+      first_export ? first_export->seq : 0,
+      tab->first_export ? tab->first_export->seq : 0,
+      min_seq);
+
+  WALK_LIST2(eh, n, tab->exports, n)
+  {
+    if (atomic_load_explicit(&eh->export_state, memory_order_acquire) != TES_READY)
+      continue;
+
+    struct rt_pending_export *last = atomic_load_explicit(&eh->last_export, memory_order_acquire);
+    if (last == last_export_to_free)
+    {
+      /* This may fail when the channel managed to export more inbetween. This is OK. */
+      atomic_compare_exchange_strong_explicit(
+	  &eh->last_export, &last, NULL,
+	  memory_order_release,
+	  memory_order_relaxed);
+
+      DBG("store hook=%p last_export=NULL\n", eh);
+    }
+  }
+
+  while (first_export && (first_export->seq <= min_seq))
+  {
+    ASSERT_DIE(first_export->new || first_export->old);
+
+    const net_addr *n = first_export->new ?
+      first_export->new->rte.net :
+      first_export->old->rte.net;
+    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+
+    ASSERT_DIE(net->first == first_export);
+    
+    if (first_export == net->last)
+      /* The only export here */
+      net->last = net->first = NULL;
+    else
+      /* First is now the next one */
+      net->first = atomic_load_explicit(&first_export->next, memory_order_relaxed);
+
+    /* For now, the old route may be finally freed */
+    if (first_export->old)
+    {
+      rt_rte_trace_in(D_ROUTES, first_export->old->rte.sender->req, &first_export->old->rte, "freed");
+      hmap_clear(&tab->id_map, first_export->old->rte.id);
+      rte_free(first_export->old, tab);
+    }
+
+#ifdef LOCAL_DEBUG
+    memset(first_export, 0xbd, sizeof(struct rt_pending_export));
+#endif
+
+    struct rt_export_block *reb = HEAD(tab->pending_exports);
+    ASSERT_DIE(reb == PAGE_HEAD(first_export));
+
+    u32 pos = (first_export - &reb->export[0]);
+    u32 end = atomic_load_explicit(&reb->end, memory_order_relaxed);
+    ASSERT_DIE(pos < end);
+
+    struct rt_pending_export *next = NULL;
+    
+    if (++pos < end)
+      next = &reb->export[pos];
+    else
+    {
+      rem_node(&reb->n);
+
+#ifdef LOCAL_DEBUG
+      memset(reb, 0xbe, page_size);
+#endif
+
+      free_page(tab->rp, reb);
+
+      if (EMPTY_LIST(tab->pending_exports))
+      {
+	if (config->table_debug)
+	  log(L_TRACE "%s: Resetting export seq", tab->name);
+
+	node *n;
+	WALK_LIST2(eh, n, tab->exports, n)
+	{
+	  if (atomic_load_explicit(&eh->export_state, memory_order_acquire) != TES_READY)
+	    continue;
+
+	  ASSERT_DIE(atomic_load_explicit(&eh->last_export, memory_order_acquire) == NULL);
+	  bmap_reset(&eh->seq_map, 1024);
+	}
+
+	tab->next_export_seq = 1;
+      }
+      else
+      {
+	reb = HEAD(tab->pending_exports);
+	next = &reb->export[0];
+      }
+    }
+
+    first_export = next;
+  }
+
+done:;
+  struct rt_import_hook *ih; node *x;
+  _Bool imports_stopped = 0;
+  WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
+    if (ih->import_state == TIS_WAITING)
+      if (!first_export || (first_export->seq >= ih->flush_seq))
+      {
+	ih->import_state = TIS_CLEARED;
+	ih->stopped(ih->req);
+	rem_node(&ih->n);
+	mb_free(ih);
+	rt_unlock_table(tab);
+	imports_stopped = 1;
+      }
+
+  if (tab->export_used)
+    ev_schedule(tab->rt_event);
+
+  if (imports_stopped)
+  {
+    if (config->table_debug)
+      log(L_TRACE "%s: Sources pruning routine requested", tab->name);
+
+    rt_prune_sources();
+  }
+
+  if (EMPTY_LIST(tab->pending_exports) && tm_active(tab->export_timer))
+    tm_stop(tab->export_timer);
 }
 
 void
@@ -2180,6 +2635,11 @@ rt_next_hop_update_net(rtable *tab, net *n)
 	/* Replace the route in the list */
 	new->next = e->next;
 	*k = e = new;
+
+	/* Get a new ID for the route */
+	new->rte.lastmod = current_time();
+	new->rte.id = hmap_first_zero(&tab->id_map);
+	hmap_set(&tab->id_map, new->rte.id);
       }
 
   ASSERT_DIE(pos == count);
@@ -2213,9 +2673,6 @@ rt_next_hop_update_net(rtable *tab, net *n)
     rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
 
-  for (int i=0; i<count; i++)
-    rte_free(updates[i].old, tab);
-
   return count;
 }
 
@@ -2405,7 +2862,7 @@ rt_feed_channel(void *data)
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
-  ASSERT(c->export_state == TES_FEEDING);
+  ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
 
   FIB_ITERATE_START(&c->table->fib, fit, net, n)
     {
@@ -2416,8 +2873,8 @@ rt_feed_channel(void *data)
 	  return;
 	}
 
-      if (c->export_state != TES_FEEDING)
-	goto done;
+      if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_FEEDING)
+	return;
 
       if (c->req->export_bulk)
       {
@@ -2427,8 +2884,7 @@ rt_feed_channel(void *data)
 	  rte_update_lock();
 	  rte **feed = alloca(count * sizeof(rte *));
 	  rte_feed_obtain(n, feed, count);
-	  struct rt_pending_export rpe = { .new_best = n->routes };
-	  c->req->export_bulk(c->req, n->n.addr, &rpe, feed, count);
+	  c->req->export_bulk(c->req, n->n.addr, NULL, feed, count);
 	  max_feed -= count;
 	  rte_update_unlock();
 	}
@@ -2441,10 +2897,15 @@ rt_feed_channel(void *data)
 	max_feed--;
 	rte_update_unlock();
       }
+
+      for (struct rt_pending_export *rpe = n->first; rpe; rpe = rpe_next(rpe, NULL))
+	rpe_mark_seen(c, rpe);
     }
   FIB_ITERATE_END;
 
-done:
+  c->event->hook = rt_export_hook;
+  ev_schedule_work(c->event);
+
   rt_set_export_state(c, TES_READY);
 }
 

From a845651bc50b75b2be41b4427e04857ce3c106a6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 15 Feb 2021 18:23:15 +0100
Subject: [PATCH 028/431] Multithreaded BIRD needs reasonably new software to
 compile

---
 .gitlab-ci.yml | 25 -------------------------
 INSTALL        |  4 ++--
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65a0a05b..39202098 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,21 +134,11 @@ docker_fedora-34-amd64:
     IMG_NAME: "fedora-34-amd64"
   <<: *docker_build
 
-docker_centos-7-amd64:
-  variables:
-    IMG_NAME: "centos-7-amd64"
-  <<: *docker_build
-
 docker_centos-8-amd64:
   variables:
     IMG_NAME: "centos-8-amd64"
   <<: *docker_build
 
-docker_ubuntu-14_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-14.04-amd64"
-  <<: *docker_build
-
 docker_ubuntu-16_04-amd64:
   variables:
     IMG_NAME: "ubuntu-16.04-amd64"
@@ -312,18 +302,10 @@ build-fedora-34-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
 
-build-centos-7-amd64:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
-
 build-centos-8-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:centos-8-amd64
 
-build-ubuntu-14_04-amd64:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64
-
 build-ubuntu-16_04-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
@@ -468,13 +450,6 @@ pkg-fedora-34-amd64:
   needs: [build-fedora-34-amd64]
   image: registry.labs.nic.cz/labs/bird:fedora-34-amd64
 
-pkg-centos-7-amd64:
-  <<: *pkg-rpm-wa
-  variables:
-    LC_ALL: en_US.UTF-8
-  needs: [build-centos-7-amd64]
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
-
 pkg-centos-8-amd64:
   <<: *pkg-rpm-wa
   needs: [build-centos-8-amd64]
diff --git a/INSTALL b/INSTALL
index 7a179284..c1094ee5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,9 +27,9 @@ Requirements
 
 For compiling BIRD you need these programs and libraries:
 
- - GNU C Compiler (or LLVM Clang)
+ - GNU C Compiler (or LLVM Clang) capable of compiling C11 code
  - GNU Make
- - GNU Bison
+ - GNU Bison (at least 3.0)
  - GNU M4
  - Flex
 

From a4451535c69b8f934523905a8131ae2f16be2146 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 Aug 2021 22:48:51 +0200
Subject: [PATCH 029/431] Unified time for whole BIRD

In previous versions, every thread used its own time structures,
effectively leading to different time in every thread and strange
logging messages.

The time processing code now uses global atomic variables to keep
current time available for fast concurrent reading and safe updates.
---
 lib/timer.c        | 29 +++++----------
 lib/timer.h        | 14 ++++----
 proto/bfd/io.c     |  8 ++---
 sysdep/unix/io.c   | 90 +++++++++++++++++++---------------------------
 sysdep/unix/main.c |  1 +
 5 files changed, 56 insertions(+), 86 deletions(-)

diff --git a/lib/timer.c b/lib/timer.c
index 6efcadb4..ff1fb5ef 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -32,6 +32,7 @@
 
 #include "nest/bird.h"
 
+#include "lib/coro.h"
 #include "lib/heap.h"
 #include "lib/resource.h"
 #include "lib/timer.h"
@@ -45,23 +46,11 @@ struct timeloop main_timeloop;
 /* Data accessed and modified from proto/bfd/io.c */
 _Thread_local struct timeloop *local_timeloop;
 
+_Atomic btime last_time;
+_Atomic btime real_time;
+
 void wakeup_kick_current(void);
 
-btime
-current_time(void)
-{
-  return local_timeloop->last_time;
-}
-
-btime
-current_real_time(void)
-{
-  if (!local_timeloop->real_time)
-    times_update_real_time(local_timeloop);
-
-  return local_timeloop->real_time;
-}
-
 
 #define TIMER_LESS(a,b)		((a)->expires < (b)->expires)
 #define TIMER_SWAP(heap,a,b,t)	(t = heap[a], heap[a] = heap[b], heap[b] = t, \
@@ -164,8 +153,6 @@ tm_stop(timer *t)
 void
 timers_init(struct timeloop *loop, pool *p)
 {
-  times_init(loop);
-
   BUFFER_INIT(loop->timers, p, 4);
   BUFFER_PUSH(loop->timers) = NULL;
 }
@@ -178,8 +165,8 @@ timers_fire(struct timeloop *loop)
   btime base_time;
   timer *t;
 
-  times_update(loop);
-  base_time = loop->last_time;
+  times_update();
+  base_time = current_time();
 
   while (t = timers_first(loop))
   {
@@ -190,8 +177,8 @@ timers_fire(struct timeloop *loop)
     {
       btime when = t->expires + t->recurrent;
 
-      if (when <= loop->last_time)
-	when = loop->last_time + t->recurrent;
+      if (when <= base_time)
+	when = base_time + t->recurrent;
 
       if (t->randomize)
 	when += random() % (t->randomize + 1);
diff --git a/lib/timer.h b/lib/timer.h
index bc568ee6..b201b8c8 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -14,6 +14,10 @@
 #include "lib/buffer.h"
 #include "lib/resource.h"
 
+#include <stdatomic.h>
+
+extern _Atomic btime last_time;
+extern _Atomic btime real_time;
 
 typedef struct timer
 {
@@ -31,8 +35,6 @@ typedef struct timer
 struct timeloop
 {
   BUFFER_(timer *) timers;
-  btime last_time;
-  btime real_time;
 };
 
 static inline uint timers_count(struct timeloop *loop)
@@ -44,8 +46,8 @@ static inline timer *timers_first(struct timeloop *loop)
 extern struct timeloop main_timeloop;
 extern _Thread_local struct timeloop *local_timeloop;
 
-btime current_time(void);
-btime current_real_time(void);
+#define current_time()		atomic_load_explicit(&last_time, memory_order_acquire)
+#define current_real_time()	atomic_load_explicit(&real_time, memory_order_acquire)
 
 //#define now (current_time() TO_S)
 //#define now_real (current_real_time() TO_S)
@@ -95,9 +97,7 @@ tm_start_max(timer *t, btime after)
 }
 
 /* In sysdep code */
-void times_init(struct timeloop *loop);
-void times_update(struct timeloop *loop);
-void times_update_real_time(struct timeloop *loop);
+void times_update(void);
 
 /* For I/O loop */
 void timers_init(struct timeloop *loop, pool *p);
diff --git a/proto/bfd/io.c b/proto/bfd/io.c
index 8fdc84fb..c5f1e024 100644
--- a/proto/bfd/io.c
+++ b/proto/bfd/io.c
@@ -172,7 +172,7 @@ events_init(struct birdloop *loop)
 static void
 events_fire(struct birdloop *loop)
 {
-  times_update(&loop->time);
+  times_update();
   ev_run_list(&loop->event_list);
 }
 
@@ -332,7 +332,7 @@ sockets_fire(struct birdloop *loop)
   sock **psk = loop->poll_sk.data;
   int poll_num = loop->poll_fd.used - 1;
 
-  times_update(&loop->time);
+  times_update();
 
   /* Last fd is internal wakeup fd */
   if (pfd[poll_num].revents & POLLIN)
@@ -365,7 +365,7 @@ sockets_fire(struct birdloop *loop)
  *	Birdloop
  */
 
-static void * birdloop_main(void *arg);
+static void *birdloop_main(void *arg);
 
 struct birdloop *
 birdloop_new(void)
@@ -461,7 +461,7 @@ birdloop_main(void *arg)
     events_fire(loop);
     timers_fire(&loop->time);
 
-    times_update(&loop->time);
+    times_update();
     if (events_waiting(loop))
       timeout = 0;
     else if (t = timers_first(&loop->time))
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 40841ea4..90bb5d64 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -123,55 +123,50 @@ rf_fileno(struct rfile *f)
 
 btime boot_time;
 
+
 void
-times_init(struct timeloop *loop)
+times_update(void)
 {
   struct timespec ts;
   int rv;
 
+  btime old_time = current_time();
+  btime old_real_time = current_real_time();
+
   rv = clock_gettime(CLOCK_MONOTONIC, &ts);
   if (rv < 0)
     die("Monotonic clock is missing");
 
   if ((ts.tv_sec < 0) || (((u64) ts.tv_sec) > ((u64) 1 << 40)))
     log(L_WARN "Monotonic clock is crazy");
-
-  loop->last_time = ts.tv_sec S + ts.tv_nsec NS;
-  loop->real_time = 0;
-}
-
-void
-times_update(struct timeloop *loop)
-{
-  struct timespec ts;
-  int rv;
-
-  rv = clock_gettime(CLOCK_MONOTONIC, &ts);
-  if (rv < 0)
-    die("clock_gettime: %m");
-
+  
   btime new_time = ts.tv_sec S + ts.tv_nsec NS;
 
-  if (new_time < loop->last_time)
+  if (new_time < old_time)
     log(L_ERR "Monotonic clock is broken");
 
-  loop->last_time = new_time;
-  loop->real_time = 0;
-}
-
-void
-times_update_real_time(struct timeloop *loop)
-{
-  struct timespec ts;
-  int rv;
-
   rv = clock_gettime(CLOCK_REALTIME, &ts);
   if (rv < 0)
     die("clock_gettime: %m");
 
-  loop->real_time = ts.tv_sec S + ts.tv_nsec NS;
-}
+  btime new_real_time = ts.tv_sec S + ts.tv_nsec NS;
 
+  if (!atomic_compare_exchange_strong_explicit(
+      &last_time,
+      &old_time,
+      new_time,
+      memory_order_acq_rel,
+      memory_order_relaxed))
+    DBG("Time update collision: last_time");
+
+  if (!atomic_compare_exchange_strong_explicit(
+      &real_time,
+      &old_real_time,
+      new_real_time,
+      memory_order_acq_rel,
+      memory_order_relaxed))
+    DBG("Time update collision: real_time");
+}
 
 /**
  * DOC: Sockets
@@ -2017,30 +2012,17 @@ struct event_log_entry
 static struct event_log_entry event_log[EVENT_LOG_LENGTH];
 static struct event_log_entry *event_open;
 static int event_log_pos, event_log_num, watchdog_active;
-static btime last_time;
+static btime last_io_time;
 static btime loop_time;
 
 static void
 io_update_time(void)
 {
-  struct timespec ts;
-  int rv;
-
-  /*
-   * This is third time-tracking procedure (after update_times() above and
-   * times_update() in BFD), dedicated to internal event log and latency
-   * tracking. Hopefully, we consolidate these sometimes.
-   */
-
-  rv = clock_gettime(CLOCK_MONOTONIC, &ts);
-  if (rv < 0)
-    die("clock_gettime: %m");
-
-  last_time = ts.tv_sec S + ts.tv_nsec NS;
+  last_io_time = current_time();
 
   if (event_open)
   {
-    event_open->duration = last_time - event_open->timestamp;
+    event_open->duration = last_io_time - event_open->timestamp;
 
     if (event_open->duration > config->latency_limit)
       log(L_WARN "Event 0x%p 0x%p took %d ms",
@@ -2069,7 +2051,7 @@ io_log_event(void *hook, void *data)
 
   en->hook = hook;
   en->data = data;
-  en->timestamp = last_time;
+  en->timestamp = last_io_time;
   en->duration = 0;
 
   event_log_num++;
@@ -2097,14 +2079,14 @@ io_log_dump(void)
     struct event_log_entry *en = event_log + (event_log_pos + i) % EVENT_LOG_LENGTH;
     if (en->hook)
       log(L_DEBUG "  Event 0x%p 0x%p at %8d for %d ms", en->hook, en->data,
-	  (int) ((last_time - en->timestamp) TO_MS), (int) (en->duration TO_MS));
+	  (int) ((last_io_time - en->timestamp) TO_MS), (int) (en->duration TO_MS));
   }
 }
 
 void
 watchdog_sigalrm(int sig UNUSED)
 {
-  /* Update last_time and duration, but skip latency check */
+  /* Update last_io_time and duration, but skip latency check */
   config->latency_limit = 0xffffffff;
   io_update_time();
 
@@ -2117,7 +2099,7 @@ watchdog_start1(void)
 {
   io_update_time();
 
-  loop_time = last_time;
+  loop_time = last_io_time;
 }
 
 static inline void
@@ -2125,7 +2107,7 @@ watchdog_start(void)
 {
   io_update_time();
 
-  loop_time = last_time;
+  loop_time = last_io_time;
   event_log_num = 0;
 
   if (config->watchdog_timeout)
@@ -2146,7 +2128,7 @@ watchdog_stop(void)
     watchdog_active = 0;
   }
 
-  btime duration = last_time - loop_time;
+  btime duration = last_io_time - loop_time;
   if (duration > config->watchdog_warning)
     log(L_WARN "I/O loop cycle took %d ms for %d events",
 	(int) (duration TO_MS), event_log_num);
@@ -2202,7 +2184,7 @@ io_loop(void)
   watchdog_start1();
   for(;;)
     {
-      times_update(&main_timeloop);
+      times_update();
       events = ev_run_list(&global_event_list);
       events = ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX) || events;
       timers_fire(&main_timeloop);
@@ -2212,7 +2194,7 @@ io_loop(void)
       poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
       if (t = timers_first(&main_timeloop))
       {
-	times_update(&main_timeloop);
+	times_update();
 	timeout = (tm_remains(t) TO_MS) + 1;
 	poll_tout = MIN(poll_tout, timeout);
       }
@@ -2302,7 +2284,7 @@ io_loop(void)
 	    continue;
 	  }
 
-	  times_update(&main_timeloop);
+	  times_update();
 
 	  /* guaranteed to be non-empty */
 	  current_sock = SKIP_BACK(sock, n, HEAD(sock_list));
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index dabfc554..d35424ff 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -903,6 +903,7 @@ main(int argc, char **argv)
     dmalloc_debug(0x2f03d00);
 #endif
 
+  times_update();
   resource_sys_init();
   parse_args(argc, argv);
   log_switch(1, NULL, NULL);

From 94eb0858c2b938549d9d1703c872c6149901e7dd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 19 Jun 2021 20:50:18 +0200
Subject: [PATCH 030/431] Converting the former BFD loop to a universal IO loop
 and protocol loop.

There is a simple universal IO loop, taking care of events, timers and
sockets. Primarily, one instance of a protocol should use exactly one IO
loop to do all its work, as is now done in BFD.

Contrary to previous versions, the loop is now launched and cleaned by
the nest/proto.c code, allowing for a protocol to just request its own
loop by setting the loop's lock order in config higher than the_bird.

It is not supported nor checked if any protocol changed the requested
lock order in reconfigure. No protocol should do it at all.
---
 filter/filter_test.c    |   1 +
 lib/birdlib.h           |   1 +
 lib/coro.h              |   5 +-
 lib/event.c             | 133 ++++++++++-------
 lib/event.h             |  41 +++++-
 lib/event_test.c        |   7 +-
 lib/flowspec_test.c     |   3 +
 lib/io-loop.h           |  54 +++++++
 lib/lists.h             |  12 ++
 lib/locking.h           |  21 ++-
 lib/socket.h            |   3 +
 lib/timer.c             |  53 +++----
 lib/timer.h             |  28 ++--
 nest/a-path_test.c      |   3 +
 nest/a-set_test.c       |   4 +
 nest/config.Y           |   1 +
 nest/proto.c            | 173 ++++++++++++++--------
 nest/protocol.h         |   7 +-
 nest/route.h            |   3 +
 nest/rt-table.c         |  18 ++-
 proto/bfd/bfd.c         | 166 ++++++++++++---------
 proto/bfd/bfd.h         |   8 +-
 proto/bfd/config.Y      |   1 +
 proto/bfd/packets.c     |   4 +-
 proto/bgp/bgp.c         |   1 +
 sysdep/unix/coroutine.c |  21 ++-
 sysdep/unix/io-loop.c   | 317 ++++++++++++++++++++++------------------
 sysdep/unix/io-loop.h   |  41 +++---
 sysdep/unix/io.c        |  85 +++++++----
 sysdep/unix/main.c      |   5 +-
 sysdep/unix/unix.h      |   1 -
 test/bt-utils.c         |   7 +-
 32 files changed, 783 insertions(+), 445 deletions(-)
 create mode 100644 lib/io-loop.h

diff --git a/filter/filter_test.c b/filter/filter_test.c
index 7e4af092..2a0b5431 100644
--- a/filter/filter_test.c
+++ b/filter/filter_test.c
@@ -72,6 +72,7 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+
   bt_bird_init();
 
   bt_assert_hook = bt_assert_filter;
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 3dc39d19..385bf75c 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -71,6 +71,7 @@ static inline int u64_cmp(u64 i1, u64 i2)
 /* Macros for gcc attributes */
 
 #define NORET __attribute__((noreturn))
+#define USE_RESULT __atribute__((warn_unused_result))
 #define UNUSED __attribute__((unused))
 #define PACKED __attribute__((packed))
 #define NONNULL(...) __attribute__((nonnull((__VA_ARGS__))))
diff --git a/lib/coro.h b/lib/coro.h
index 51712b36..17ccff89 100644
--- a/lib/coro.h
+++ b/lib/coro.h
@@ -2,7 +2,7 @@
  *	BIRD Coroutines
  *
  *	(c) 2017 Martin Mares <mj@ucw.cz>
- *	(c) 2020 Maria Matejka <mq@jmq.cz>
+ *	(c) 2020-2021 Maria Matejka <mq@jmq.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -22,5 +22,8 @@ struct coroutine;
  */
 struct coroutine *coro_run(pool *, void (*entry)(void *), void *data);
 
+/* Get self. */
+extern _Thread_local struct coroutine *this_coro;
+
 
 #endif
diff --git a/lib/event.c b/lib/event.c
index 273447e0..6c5c8b14 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -19,8 +19,14 @@
  * events in them and explicitly ask to run them.
  */
 
+#undef LOCAL_DEBUG
+
 #include "nest/bird.h"
 #include "lib/event.h"
+#include "lib/locking.h"
+#include "lib/io-loop.h"
+
+extern _Thread_local struct coroutine *this_coro;
 
 event_list global_event_list;
 event_list global_work_list;
@@ -28,11 +34,16 @@ event_list global_work_list;
 inline void
 ev_postpone(event *e)
 {
+  event_list *el = e->list;
+  if (!el)
+    return;
+
+  ASSERT_DIE(birdloop_inside(el->loop));
+
+  LOCK_DOMAIN(event, el->lock);
   if (ev_active(e))
-    {
-      rem_node(&e->n);
-      e->n.next = NULL;
-    }
+    rem_node(&e->n);
+  UNLOCK_DOMAIN(event, el->lock);
 }
 
 static void
@@ -95,40 +106,25 @@ ev_run(event *e)
  * list @l which can be run by calling ev_run_list().
  */
 inline void
-ev_enqueue(event_list *l, event *e)
+ev_send(event_list *l, event *e)
 {
-  ev_postpone(e);
-  add_tail(l, &e->n);
-}
+  DBG("ev_send(%p, %p)\n", l, e);
+  ASSERT_DIE(e->hook);
+  ASSERT_DIE(!e->list || (e->list == l) || (e->list->loop == l->loop));
 
-/**
- * ev_schedule - schedule an event
- * @e: an event
- *
- * This function schedules an event by enqueueing it to a system-wide
- * event list which is run by the platform dependent code whenever
- * appropriate.
- */
-void
-ev_schedule(event *e)
-{
-  ev_enqueue(&global_event_list, e);
-}
+  e->list = l;
 
-/**
- * ev_schedule_work - schedule a work-event.
- * @e: an event
- *
- * This function schedules an event by enqueueing it to a system-wide work-event
- * list which is run by the platform dependent code whenever appropriate. This
- * is designated for work-events instead of regular events. They are executed
- * less often in order to not clog I/O loop.
- */
-void
-ev_schedule_work(event *e)
-{
-  if (!ev_active(e))
-    add_tail(&global_work_list, &e->n);
+  LOCK_DOMAIN(event, l->lock);
+  if (enlisted(&e->n))
+  {
+    UNLOCK_DOMAIN(event, l->lock);
+    return;
+  }
+
+  add_tail(&l->events, &e->n);
+  UNLOCK_DOMAIN(event, l->lock);
+
+  birdloop_ping(l->loop);
 }
 
 void io_log_event(void *hook, void *data);
@@ -142,35 +138,64 @@ void io_log_event(void *hook, void *data);
 int
 ev_run_list(event_list *l)
 {
-  node *n;
-  list tmp_list;
+  const _Bool legacy = LEGACY_EVENT_LIST(l);
 
+  if (legacy)
+    ASSERT_THE_BIRD_LOCKED;
+
+  node *n;
+
+  list tmp_list;
   init_list(&tmp_list);
-  add_tail_list(&tmp_list, l);
-  init_list(l);
+
+  /* Move the event list contents to a local list to avoid executing repeatedly added events */
+  LOCK_DOMAIN(event, l->lock);
+  add_tail_list(&tmp_list, &l->events);
+  init_list(&l->events);
+  UNLOCK_DOMAIN(event, l->lock);
+
   WALK_LIST_FIRST(n, tmp_list)
     {
       event *e = SKIP_BACK(event, n, n);
 
-      /* This is ugly hack, we want to log just events executed from the main I/O loop */
-      if ((l == &global_event_list) || (l == &global_work_list))
+      if (legacy)
+      {
+	/* The legacy way of event execution */
 	io_log_event(e->hook, e->data);
-
-      ev_run(e);
+	ev_postpone(e);
+	e->hook(e->data);
+      }
+      else
+      {
+	// io_log_event(e->hook, e->data); /* TODO: add support for event logging in other io loops */
+	ASSERT_DIE(e->list == l);
+	LOCK_DOMAIN(event, l->lock);
+	rem_node(&e->n);
+	UNLOCK_DOMAIN(event, l->lock);
+	e->hook(e->data);
+      }
     }
 
-  return !EMPTY_LIST(*l);
+  LOCK_DOMAIN(event, l->lock);
+  int repeat = ! EMPTY_LIST(l->events);
+  UNLOCK_DOMAIN(event, l->lock);
+  return repeat;
 }
 
 int
 ev_run_list_limited(event_list *l, uint limit)
 {
+  ASSERT_DIE(LEGACY_EVENT_LIST(l));
+  ASSERT_THE_BIRD_LOCKED;
+
   node *n;
   list tmp_list;
 
+  LOCK_DOMAIN(event, l->lock);
   init_list(&tmp_list);
-  add_tail_list(&tmp_list, l);
-  init_list(l);
+  add_tail_list(&tmp_list, &l->events);
+  init_list(&l->events);
+  UNLOCK_DOMAIN(event, l->lock);
 
   WALK_LIST_FIRST(n, tmp_list)
     {
@@ -179,21 +204,23 @@ ev_run_list_limited(event_list *l, uint limit)
       if (!limit)
 	break;
 
-      /* This is ugly hack, we want to log just events executed from the main I/O loop */
-      if ((l == &global_event_list) || (l == &global_work_list))
-	io_log_event(e->hook, e->data);
+      io_log_event(e->hook, e->data);
 
       ev_run(e);
       limit--;
     }
 
+  LOCK_DOMAIN(event, l->lock);
   if (!EMPTY_LIST(tmp_list))
   {
     /* Attach new items after the unprocessed old items */
-    add_tail_list(&tmp_list, l);
-    init_list(l);
-    add_tail_list(l, &tmp_list);
+    add_tail_list(&tmp_list, &l->events);
+    init_list(&l->events);
+    add_tail_list(&l->events, &tmp_list);
   }
 
-  return !EMPTY_LIST(*l);
+  int repeat = ! EMPTY_LIST(l->events);
+  UNLOCK_DOMAIN(event, l->lock);
+
+  return repeat;
 }
diff --git a/lib/event.h b/lib/event.h
index 5f3b78d8..6c358f84 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -10,33 +10,62 @@
 #define _BIRD_EVENT_H_
 
 #include "lib/resource.h"
+#include "lib/locking.h"
+
+#include <stdatomic.h>
+
+DEFINE_DOMAIN(event);
 
 typedef struct event {
   resource r;
   void (*hook)(void *);
   void *data;
   node n;				/* Internal link */
+  struct event_list *list;		/* List where this event is put in */
 } event;
 
-typedef list event_list;
+typedef struct event_list {
+  list events;
+  pool *pool;
+  struct birdloop *loop;
+  DOMAIN(event) lock;
+} event_list;
 
 extern event_list global_event_list;
 extern event_list global_work_list;
 
 event *ev_new(pool *);
 void ev_run(event *);
-#define ev_init_list(el) init_list(el)
-void ev_enqueue(event_list *, event *);
-void ev_schedule(event *);
-void ev_schedule_work(event *);
+
+static inline void ev_init_list(event_list *el, struct birdloop *loop, const char *name)
+{
+  init_list(&el->events);
+  el->loop = loop;
+  el->lock = DOMAIN_NEW(event, name);
+}
+
+void ev_send(event_list *, event *);
+#define ev_send_loop(l, e) ev_send(birdloop_event_list((l)), (e))
+
+#define ev_schedule(e) ({ ASSERT_THE_BIRD_LOCKED; if (!ev_active((e))) ev_send(&global_event_list, (e)); })
+#define ev_schedule_work(e) ({ ASSERT_THE_BIRD_LOCKED; if (!ev_active((e))) ev_send(&global_work_list, (e)); })
+
 void ev_postpone(event *);
 int ev_run_list(event_list *);
 int ev_run_list_limited(event_list *, uint);
 
+#define LEGACY_EVENT_LIST(l)  (((l) == &global_event_list) || ((l) == &global_work_list))
+
+_Bool birdloop_inside(struct birdloop *loop);
+
 static inline int
 ev_active(event *e)
 {
-  return e->n.next != NULL;
+  if (e->list == NULL)
+    return 0;
+
+  ASSERT_DIE(birdloop_inside(e->list->loop));
+  return enlisted(&e->n);
 }
 
 static inline event*
diff --git a/lib/event_test.c b/lib/event_test.c
index e1215bba..9dda3e2a 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -48,14 +48,17 @@ init_event_check_points(void)
     event_check_points[i] = 0;
 }
 
+void resource_sys_init(void);
+
 static int
 t_ev_run_list(void)
 {
   int i;
 
+  resource_sys_init();
   resource_init();
   olock_init();
-  timer_init();
+  birdloop_init();
   io_init();
   rt_init();
   if_init();
@@ -82,7 +85,9 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
 
+  the_bird_lock();
   bt_test_suite(t_ev_run_list, "Schedule and run 3 events in right order.");
+  the_bird_unlock();
 
   return bt_exit_value();
 }
diff --git a/lib/flowspec_test.c b/lib/flowspec_test.c
index ed4afe51..f7f70982 100644
--- a/lib/flowspec_test.c
+++ b/lib/flowspec_test.c
@@ -666,10 +666,13 @@ t_formatting6(void)
   return 1;
 }
 
+void resource_sys_init(void);
+
 int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  resource_sys_init();
 
   bt_test_suite(t_read_length,  "Testing get NLRI length");
   bt_test_suite(t_write_length, "Testing set NLRI length");
diff --git a/lib/io-loop.h b/lib/io-loop.h
new file mode 100644
index 00000000..25f1b2a3
--- /dev/null
+++ b/lib/io-loop.h
@@ -0,0 +1,54 @@
+/*
+ *	BIRD -- I/O and event loop
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_IO_LOOP_H_
+#define _BIRD_IO_LOOP_H_
+
+#include "nest/bird.h"
+#include "lib/lists.h"
+#include "lib/locking.h"
+#include "lib/resource.h"
+#include "lib/event.h"
+#include "lib/socket.h"
+
+void sk_start(sock *s);
+void sk_stop(sock *s);
+void sk_reloop(sock *s, struct birdloop *loop);
+
+extern struct birdloop main_birdloop;
+
+/* Start a new birdloop owned by given pool and domain */
+struct birdloop *birdloop_new(pool *p, uint order, const char *name);
+
+/* Stop the loop. At the end, the @stopped callback is called unlocked in tail
+ * position to finish cleanup. Run birdloop_free() from that callback to free
+ * the loop itself. */
+void birdloop_stop(struct birdloop *loop, void (*stopped)(void *data), void *data);
+void birdloop_stop_self(struct birdloop *loop, void (*stopped)(void *data), void *data);
+void birdloop_free(struct birdloop *loop);
+
+/* Get birdloop's event list */
+event_list *birdloop_event_list(struct birdloop *loop);
+
+/* Get birdloop's time heap */
+struct timeloop *birdloop_time_loop(struct birdloop *loop);
+
+/* Enter and exit the birdloop */
+void birdloop_enter(struct birdloop *loop);
+void birdloop_leave(struct birdloop *loop);
+
+_Bool birdloop_inside(struct birdloop *loop);
+
+void birdloop_mask_wakeups(struct birdloop *loop);
+void birdloop_unmask_wakeups(struct birdloop *loop);
+
+void birdloop_link(struct birdloop *loop);
+void birdloop_unlink(struct birdloop *loop);
+
+void birdloop_ping(struct birdloop *loop);
+
+void birdloop_init(void);
+#endif /* _BIRD_IO_LOOP_H_ */
diff --git a/lib/lists.h b/lib/lists.h
index 64b4a981..dc49ec8a 100644
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -68,6 +68,18 @@ typedef union list {			/* In fact two overlayed nodes */
 
 #define EMPTY_LIST(list) (!(list).head->next)
 
+static inline _Bool
+enlisted(node *n)
+{
+  switch ((!!n->next) + (!!n->prev))
+  {
+    case 0: return 0;
+    case 2: return 1;
+    case 1: bug("Garbled event list node");
+  }
+
+  bug("Maths is broken. And you should see a new heaven and a new earth: for the first heaven and the first earth had been passed away.");
+}
 
 #ifndef _BIRD_LISTS_C_
 #define LIST_INLINE static inline
diff --git a/lib/locking.h b/lib/locking.h
index eef60154..ab5c06af 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -14,6 +14,9 @@ struct domain_generic;
 /* Here define the global lock order; first to last. */
 struct lock_order {
   struct domain_generic *the_bird;
+  struct domain_generic *proto;
+  struct domain_generic *rtable;
+  struct domain_generic *event;
 };
 
 extern _Thread_local struct lock_order locking_stack;
@@ -21,24 +24,40 @@ extern _Thread_local struct domain_generic **last_locked;
 
 #define DOMAIN(type) struct domain__##type
 #define DEFINE_DOMAIN(type) DOMAIN(type) { struct domain_generic *type; }
+#define DOMAIN_ORDER(type)  OFFSETOF(struct lock_order, type)
 
-#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name, OFFSETOF(struct lock_order, type)) }
+#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name, DOMAIN_ORDER(type)) }
 struct domain_generic *domain_new(const char *name, uint order);
 
+#define DOMAIN_FREE(type, d)	domain_free((d).type)
+void domain_free(struct domain_generic *);
+
 #define DOMAIN_NULL(type)   (DOMAIN(type)) {}
 
 #define LOCK_DOMAIN(type, d)	do_lock(((d).type), &(locking_stack.type))
 #define UNLOCK_DOMAIN(type, d)  do_unlock(((d).type), &(locking_stack.type))
 
+#define DOMAIN_IS_LOCKED(type, d) (((d).type) == (locking_stack.type))
+#define DG_IS_LOCKED(d)	((d) == *(DG_LSP(d)))
+
 /* Internal for locking */
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp);
 void do_unlock(struct domain_generic *dg, struct domain_generic **lsp);
 
+uint dg_order(struct domain_generic *dg);
+
+#define DG_LSP(d)	((struct domain_generic **) (((void *) &locking_stack) + dg_order(d)))
+#define DG_LOCK(d)	do_lock(d, DG_LSP(d))
+#define DG_UNLOCK(d)	do_unlock(d, DG_LSP(d))
+
 /* Use with care. To be removed in near future. */
 DEFINE_DOMAIN(the_bird);
 extern DOMAIN(the_bird) the_bird_domain;
 
 #define the_bird_lock()		LOCK_DOMAIN(the_bird, the_bird_domain)
 #define the_bird_unlock()	UNLOCK_DOMAIN(the_bird, the_bird_domain)
+#define the_bird_locked()	DOMAIN_IS_LOCKED(the_bird, the_bird_domain)
+
+#define ASSERT_THE_BIRD_LOCKED	({ if (!the_bird_locked()) bug("The BIRD lock must be locked here: %s:%d", __FILE__, __LINE__); })
 
 #endif
diff --git a/lib/socket.h b/lib/socket.h
index 96fedeeb..5bdab7f3 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -12,6 +12,7 @@
 #include <errno.h>
 
 #include "lib/resource.h"
+#include "lib/event.h"
 #ifdef HAVE_LIBSSH
 #define LIBSSH_LEGACY_0_4
 #include <libssh/libssh.h>
@@ -79,6 +80,7 @@ typedef struct birdsock {
   const char *password;			/* Password for MD5 authentication */
   const char *err;			/* Error message */
   struct ssh_sock *ssh;			/* Used in SK_SSH */
+  struct event reloop;			/* Reloop event */
 } sock;
 
 sock *sock_new(pool *);			/* Allocate new socket */
@@ -128,6 +130,7 @@ extern int sk_priority_control;		/* Suggested priority for control traffic, shou
 #define SKF_TRUNCATED	0x200	/* Received packet was truncated, set by IO layer */
 #define SKF_HDRINCL	0x400	/* Used internally */
 #define SKF_PKTINFO	0x800	/* Used internally */
+#define SKF_PASSIVE_THREAD  0x1000  /* Child sockets used in thread, do not add to main loop */
 
 /*
  *	Socket types		     SA SP DA DP IF  TTL SendTo	(?=may, -=must not, *=must)
diff --git a/lib/timer.c b/lib/timer.c
index ff1fb5ef..eb7ea690 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -37,15 +37,8 @@
 #include "lib/resource.h"
 #include "lib/timer.h"
 
-
-struct timeloop main_timeloop;
-
-
 #include <pthread.h>
 
-/* Data accessed and modified from proto/bfd/io.c */
-_Thread_local struct timeloop *local_timeloop;
-
 _Atomic btime last_time;
 _Atomic btime real_time;
 
@@ -76,7 +69,7 @@ tm_dump(resource *r)
   if (t->recurrent)
     debug("recur %d, ", t->recurrent);
   if (t->expires)
-    debug("expires in %d ms)\n", (t->expires - current_time()) TO_MS);
+    debug("in loop %p expires in %d ms)\n", t->loop, (t->expires - current_time()) TO_MS);
   else
     debug("inactive)\n");
 }
@@ -99,8 +92,8 @@ tm_new(pool *p)
   return t;
 }
 
-void
-tm_set(timer *t, btime when)
+static void
+tm_set_in_tl(timer *t, btime when, struct timeloop *local_timeloop)
 {
   uint tc = timers_count(local_timeloop);
 
@@ -122,17 +115,17 @@ tm_set(timer *t, btime when)
     HEAP_DECREASE(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
   }
 
-#ifdef CONFIG_BFD
-  /* Hack to notify BFD loops */
-  if ((local_timeloop != &main_timeloop) && (t->index == 1))
-    wakeup_kick_current();
-#endif
+  t->loop = local_timeloop;
+
+  if ((t->index == 1) && (local_timeloop->coro != this_coro))
+    birdloop_ping(local_timeloop->loop);
 }
 
 void
-tm_start(timer *t, btime after)
+tm_set_in(timer *t, btime when, struct birdloop *loop)
 {
-  tm_set(t, current_time() + MAX(after, 0));
+  ASSERT_DIE(birdloop_inside(loop));
+  tm_set_in_tl(t, when, birdloop_time_loop(loop));
 }
 
 void
@@ -141,18 +134,23 @@ tm_stop(timer *t)
   if (!t->expires)
     return;
 
-  uint tc = timers_count(local_timeloop);
+  TLOCK_TIMER_ASSERT(t->loop);
 
-  HEAP_DELETE(local_timeloop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
-  BUFFER_POP(local_timeloop->timers);
+  uint tc = timers_count(t->loop);
+
+  HEAP_DELETE(t->loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index);
+  BUFFER_POP(t->loop->timers);
 
   t->index = -1;
   t->expires = 0;
+  t->loop = NULL;
 }
 
 void
 timers_init(struct timeloop *loop, pool *p)
 {
+  TLOCK_TIMER_ASSERT(loop);
+
   BUFFER_INIT(loop->timers, p, 4);
   BUFFER_PUSH(loop->timers) = NULL;
 }
@@ -160,8 +158,10 @@ timers_init(struct timeloop *loop, pool *p)
 void io_log_event(void *hook, void *data);
 
 void
-timers_fire(struct timeloop *loop)
+timers_fire(struct timeloop *loop, int io_log)
 {
+  TLOCK_TIMER_ASSERT(loop);
+
   btime base_time;
   timer *t;
 
@@ -183,26 +183,19 @@ timers_fire(struct timeloop *loop)
       if (t->randomize)
 	when += random() % (t->randomize + 1);
 
-      tm_set(t, when);
+      tm_set_in_tl(t, when, loop);
     }
     else
       tm_stop(t);
 
     /* This is ugly hack, we want to log just timers executed from the main I/O loop */
-    if (loop == &main_timeloop)
+    if (io_log)
       io_log_event(t->hook, t->data);
 
     t->hook(t);
   }
 }
 
-void
-timer_init(void)
-{
-  timers_init(&main_timeloop, &root_pool);
-  local_timeloop = &main_timeloop;
-}
-
 
 /**
  * tm_parse_time - parse a date and time
diff --git a/lib/timer.h b/lib/timer.h
index b201b8c8..04544ace 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -12,6 +12,8 @@
 
 #include "nest/bird.h"
 #include "lib/buffer.h"
+#include "lib/io-loop.h"
+#include "lib/locking.h"
 #include "lib/resource.h"
 
 #include <stdatomic.h>
@@ -29,22 +31,27 @@ typedef struct timer
   uint randomize;			/* Amount of randomization */
   uint recurrent;			/* Timer recurrence */
 
+  struct timeloop *loop;		/* Loop where the timer is active */
+
   int index;
 } timer;
 
 struct timeloop
 {
   BUFFER_(timer *) timers;
+  struct domain_generic *domain;
+  struct birdloop *loop;
+  struct coroutine *coro;
 };
 
+#define TLOCK_TIMER_ASSERT(loop) ASSERT_DIE((loop)->domain && DG_IS_LOCKED((loop)->domain))
+#define TLOCK_LOCAL_ASSERT(loop) ASSERT_DIE(!(loop)->domain || DG_IS_LOCKED((loop)->domain))
+
 static inline uint timers_count(struct timeloop *loop)
-{ return loop->timers.used - 1; }
+{ TLOCK_TIMER_ASSERT(loop); return loop->timers.used - 1; }
 
 static inline timer *timers_first(struct timeloop *loop)
-{ return (loop->timers.used > 1) ? loop->timers.data[1] : NULL; }
-
-extern struct timeloop main_timeloop;
-extern _Thread_local struct timeloop *local_timeloop;
+{ TLOCK_TIMER_ASSERT(loop); return (loop->timers.used > 1) ? loop->timers.data[1] : NULL; }
 
 #define current_time()		atomic_load_explicit(&last_time, memory_order_acquire)
 #define current_real_time()	atomic_load_explicit(&real_time, memory_order_acquire)
@@ -54,10 +61,13 @@ extern _Thread_local struct timeloop *local_timeloop;
 extern btime boot_time;
 
 timer *tm_new(pool *p);
-void tm_set(timer *t, btime when);
-void tm_start(timer *t, btime after);
+#define tm_set(t, when) tm_set_in((t), (when), &main_birdloop)
+#define tm_start(t, after) tm_start_in((t), (after), &main_birdloop)
 void tm_stop(timer *t);
 
+void tm_set_in(timer *t, btime when, struct birdloop *loop);
+#define tm_start_in(t, after, loop) tm_set_in((t), (current_time() + MAX_((after), 0)), loop)
+
 static inline int
 tm_active(timer *t)
 {
@@ -101,9 +111,7 @@ void times_update(void);
 
 /* For I/O loop */
 void timers_init(struct timeloop *loop, pool *p);
-void timers_fire(struct timeloop *loop);
-
-void timer_init(void);
+void timers_fire(struct timeloop *loop, int io_log);
 
 
 struct timeformat {
diff --git a/nest/a-path_test.c b/nest/a-path_test.c
index 9ed0a786..2e6e4956 100644
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@@ -204,10 +204,13 @@ t_as_path_converting(void)
 }
 #endif
 
+void resource_sys_init(void);
+
 int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  resource_sys_init();
 
   bt_test_suite(t_as_path_match, "Testing AS path matching and some a-path utilities.");
   bt_test_suite(t_path_format, "Testing formating as path into byte buffer");
diff --git a/nest/a-set_test.c b/nest/a-set_test.c
index 96b6a727..efd1b67d 100644
--- a/nest/a-set_test.c
+++ b/nest/a-set_test.c
@@ -240,10 +240,14 @@ t_set_ec_delete(void)
   return 1;
 }
 
+
+void resource_sys_init(void);
+
 int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  resource_sys_init();
 
   bt_test_suite(t_set_int_contains, "Testing sets of integers: contains, get_data");
   bt_test_suite(t_set_int_format,   "Testing sets of integers: format");
diff --git a/nest/config.Y b/nest/config.Y
index 92f1aad2..6e7689ed 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -434,6 +434,7 @@ proto: dev_proto '}' ;
 dev_proto_start: proto_start DIRECT {
      this_proto = proto_config_new(&proto_device, $1);
      init_list(&DIRECT_CFG->iface_list);
+     this_proto->late_if_feed = 1;
    }
  ;
 
diff --git a/nest/proto.c b/nest/proto.c
index fae0647a..ac0fb232 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -15,6 +15,7 @@
 #include "lib/event.h"
 #include "lib/timer.h"
 #include "lib/string.h"
+#include "lib/coro.h"
 #include "conf/conf.h"
 #include "nest/route.h"
 #include "nest/iface.h"
@@ -58,7 +59,28 @@ static void channel_feed_end(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
 
 static inline int proto_is_done(struct proto *p)
-{ return (p->proto_state == PS_DOWN) && (p->active_channels == 0); }
+{ return (p->proto_state == PS_DOWN) && proto_is_inactive(p); }
+
+static inline event_list *proto_event_list(struct proto *p)
+{ return p->loop == &main_birdloop ? &global_event_list : birdloop_event_list(p->loop); }
+
+static inline event_list *proto_work_list(struct proto *p)
+{ return p->loop == &main_birdloop ? &global_work_list : birdloop_event_list(p->loop); }
+
+static inline void proto_send_event(struct proto *p)
+{ ev_send(proto_event_list(p), p->event); }
+
+#define PROTO_ENTER_FROM_MAIN(p)    ({ \
+    ASSERT_DIE(birdloop_inside(&main_birdloop)); \
+    struct birdloop *_loop = (p)->loop; \
+    if (_loop != &main_birdloop) birdloop_enter(_loop); \
+    _loop; \
+    })
+
+#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
+
+#define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
+
 
 static inline int channel_is_active(struct channel *c)
 { return (c->channel_state != CS_DOWN); }
@@ -473,6 +495,7 @@ channel_start_export(struct channel *c)
 
   c->out_req = (struct rt_export_request) {
     .name = rn,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
@@ -517,7 +540,7 @@ channel_check_stopped(struct channel *c)
 	return;
 
       channel_set_state(c, CS_DOWN);
-      ev_schedule(c->proto->event);
+      proto_send_event(c->proto);
 
       break;
     case CS_PAUSE:
@@ -853,6 +876,7 @@ channel_setup_in_table(struct channel *c, int best)
   };
   c->in_table->get = (struct rt_export_request) {
     .name = cat->name,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_in_get_dump_req,
     .log_state_change = channel_get_log_state_change,
@@ -895,6 +919,7 @@ channel_setup_out_table(struct channel *c)
   };
   c->out_table->get = (struct rt_export_request) {
     .name = cat->name,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_out_get_dump_req,
     .log_state_change = channel_get_log_state_change,
@@ -997,7 +1022,7 @@ channel_do_down(struct channel *c)
 
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
-    ev_schedule(c->proto->event);
+    proto_send_event(c->proto);
 }
 
 void
@@ -1085,9 +1110,12 @@ channel_request_table_feeding(struct channel *c)
 void
 channel_request_feeding(struct channel *c)
 {
+  if (c->gr_wait || !c->proto->rt_notify)
+    return;
+
   CD(c, "Refeed requested");
 
-  ASSERT(c->out_req.hook);
+  ASSERT_DIE(c->out_req.hook);
 
   if (c->out_table)
     channel_aux_request_refeed(c->out_table);
@@ -1331,18 +1359,36 @@ proto_configure_channel(struct proto *p, struct channel **pc, struct channel_con
   return 1;
 }
 
+static void
+proto_cleanup(struct proto *p)
+{
+  rfree(p->pool);
+  p->pool = NULL;
+
+  p->active = 0;
+  proto_log_state_change(p);
+  proto_rethink_goal(p);
+}
+
+static void
+proto_loop_stopped(void *ptr)
+{
+  struct proto *p = ptr;
+
+  birdloop_enter(&main_birdloop);
+
+  p->loop = &main_birdloop;
+  p->event->list = NULL;
+  proto_cleanup(p);
+
+  birdloop_leave(&main_birdloop);
+}
 
 static void
 proto_event(void *ptr)
 {
   struct proto *p = ptr;
 
-  if (p->do_start)
-  {
-    if_feed_baby(p);
-    p->do_start = 0;
-  }
-
   if (p->do_stop)
   {
     if (p->proto == &proto_unix_iface)
@@ -1351,14 +1397,10 @@ proto_event(void *ptr)
   }
 
   if (proto_is_done(p))
-  {
-    rfree(p->pool);
-    p->pool = NULL;
-
-    p->active = 0;
-    proto_log_state_change(p);
-    proto_rethink_goal(p);
-  }
+    if (p->loop != &main_birdloop)
+      birdloop_stop_self(p->loop, proto_loop_stopped, p);
+    else
+      proto_cleanup(p);
 }
 
 
@@ -1399,6 +1441,7 @@ proto_init(struct proto_config *c, node *n)
   struct protocol *pr = c->protocol;
   struct proto *p = pr->init(c);
 
+  p->loop = &main_birdloop;
   p->proto_state = PS_DOWN;
   p->last_state_change = current_time();
   p->vrf = c->vrf;
@@ -1415,11 +1458,27 @@ proto_init(struct proto_config *c, node *n)
 static void
 proto_start(struct proto *p)
 {
-  /* Here we cannot use p->cf->name since it won't survive reconfiguration */
-  p->pool = rp_new(proto_pool, p->proto->name);
+  DBG("Kicking %s up\n", p->name);
+  PD(p, "Starting");
+
+  int ns = strlen("Protocol ") + strlen(p->cf->name) + 1;
+  void *nb = mb_alloc(proto_pool, ns);
+  ASSERT_DIE(ns - 1 == bsnprintf(nb, ns, "Protocol %s", p->cf->name));
+
+  p->pool = rp_new(proto_pool, nb);
 
   if (graceful_restart_state == GRS_INIT)
     p->gr_recovery = 1;
+
+  if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
+    p->loop = birdloop_new(p->pool, p->cf->loop_order, nb);
+
+  p->event->list = proto_event_list(p);
+
+  mb_move(nb, p->pool);
+
+  PROTO_LOCKED_FROM_MAIN(p)
+    proto_notify_state(p, (p->proto->start ? p->proto->start(p) : PS_UP));
 }
 
 
@@ -1455,6 +1514,7 @@ proto_config_new(struct protocol *pr, int class)
   cf->class = class;
   cf->debug = new_config->proto_default_debug;
   cf->mrtdump = new_config->proto_default_mrtdump;
+  cf->loop_order = DOMAIN_ORDER(the_bird);
 
   init_list(&cf->channels);
 
@@ -1743,12 +1803,21 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
     proto_rethink_goal(p);
 }
 
+static void
+proto_shutdown(struct proto *p)
+{
+  if (p->proto_state == PS_START || p->proto_state == PS_UP)
+  {
+    /* Going down */
+    DBG("Kicking %s down\n", p->name);
+    PD(p, "Shutting down");
+    proto_notify_state(p, (p->proto->shutdown ? p->proto->shutdown(p) : PS_DOWN));
+  }
+}
+
 static void
 proto_rethink_goal(struct proto *p)
 {
-  struct protocol *q;
-  byte goal;
-
   if (p->reconfiguring && !p->active)
   {
     struct proto_config *nc = p->cf_new;
@@ -1768,32 +1837,12 @@ proto_rethink_goal(struct proto *p)
 
   /* Determine what state we want to reach */
   if (p->disabled || p->reconfiguring)
-    goal = PS_DOWN;
-  else
-    goal = PS_UP;
-
-  q = p->proto;
-  if (goal == PS_UP)
   {
-    if (!p->active)
-    {
-      /* Going up */
-      DBG("Kicking %s up\n", p->name);
-      PD(p, "Starting");
-      proto_start(p);
-      proto_notify_state(p, (q->start ? q->start(p) : PS_UP));
-    }
-  }
-  else
-  {
-    if (p->proto_state == PS_START || p->proto_state == PS_UP)
-    {
-      /* Going down */
-      DBG("Kicking %s down\n", p->name);
-      PD(p, "Shutting down");
-      proto_notify_state(p, (q->shutdown ? q->shutdown(p) : PS_DOWN));
-    }
+    PROTO_LOCKED_FROM_MAIN(p)
+      proto_shutdown(p);
   }
+  else if (!p->active)
+    proto_start(p);
 }
 
 struct proto *
@@ -1998,7 +2047,7 @@ protos_dump_all(void)
 #define DPF(x)	(p->x ? " " #x : "")
     debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s\n",
 	p->name, p, p_states[p->proto_state], p->active_channels,
-	DPF(disabled), DPF(active), DPF(do_start), DPF(do_stop), DPF(reconfiguring));
+	DPF(disabled), DPF(active), DPF(do_stop), DPF(reconfiguring));
 #undef DPF
 
     struct channel *c;
@@ -2286,8 +2335,8 @@ static inline void
 proto_do_start(struct proto *p)
 {
   p->active = 1;
-  p->do_start = 1;
-  ev_schedule(p->event);
+  if (!p->cf->late_if_feed)
+    if_feed_baby(p);
 }
 
 static void
@@ -2300,6 +2349,9 @@ proto_do_up(struct proto *p)
   }
 
   proto_start_channels(p);
+
+  if (p->cf->late_if_feed)
+    if_feed_baby(p);
 }
 
 static inline void
@@ -2314,9 +2366,6 @@ proto_do_stop(struct proto *p)
   p->down_sched = 0;
   p->gr_recovery = 0;
 
-  p->do_stop = 1;
-  ev_schedule(p->event);
-
   if (p->main_source)
   {
     rt_unlock_source(p->main_source);
@@ -2324,6 +2373,9 @@ proto_do_stop(struct proto *p)
   }
 
   proto_stop_channels(p);
+
+  p->do_stop = 1;
+  proto_send_event(p);
 }
 
 static void
@@ -2334,7 +2386,7 @@ proto_do_down(struct proto *p)
 
   /* Shutdown is finished in the protocol event */
   if (proto_is_done(p))
-    ev_schedule(p->event);
+    proto_send_event(p);
 }
 
 
@@ -2573,7 +2625,7 @@ proto_cmd_disable(struct proto *p, uintptr_t arg, int cnt UNUSED)
   p->disabled = 1;
   p->down_code = PDC_CMD_DISABLE;
   proto_set_message(p, (char *) arg, -1);
-  proto_rethink_goal(p);
+  proto_shutdown(p);
   cli_msg(-9, "%s: disabled", p->name);
 }
 
@@ -2606,9 +2658,9 @@ proto_cmd_restart(struct proto *p, uintptr_t arg, int cnt UNUSED)
   p->disabled = 1;
   p->down_code = PDC_CMD_RESTART;
   proto_set_message(p, (char *) arg, -1);
-  proto_rethink_goal(p);
+  proto_shutdown(p);
   p->disabled = 0;
-  proto_rethink_goal(p);
+  /* After the protocol shuts down, proto_rethink_goal() is run from proto_event. */
   cli_msg(-12, "%s: restarted", p->name);
 }
 
@@ -2683,7 +2735,9 @@ proto_apply_cmd_symbol(const struct symbol *s, void (* cmd)(struct proto *, uint
 
   if (s->proto->proto)
   {
-    cmd(s->proto->proto, arg, 0);
+    struct proto *p = s->proto->proto;
+    PROTO_LOCKED_FROM_MAIN(p)
+      cmd(p, arg, 0);
     cli_msg(0, "");
   }
   else
@@ -2698,7 +2752,8 @@ proto_apply_cmd_patt(const char *patt, void (* cmd)(struct proto *, uintptr_t, i
 
   WALK_LIST(p, proto_list)
     if (!patt || patmatch(patt, p->name))
-      cmd(p, arg, cnt++);
+      PROTO_LOCKED_FROM_MAIN(p)
+	cmd(p, arg, cnt++);
 
   if (!cnt)
     cli_msg(8003, "No protocols match");
diff --git a/nest/protocol.h b/nest/protocol.h
index f9996b18..2fbd607c 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -120,8 +120,10 @@ struct proto_config {
   u8 net_type;				/* Protocol network type (NET_*), 0 for undefined */
   u8 disabled;				/* Protocol enabled/disabled by default */
   u8 vrf_set;				/* Related VRF instance (below) is defined */
+  u8 late_if_feed;			/* Delay interface feed after channels are up */
   u32 debug, mrtdump;			/* Debugging bitfields, both use D_* constants */
   u32 router_id;			/* Protocol specific router ID */
+  uint loop_order;			/* Launch a birdloop on this locking level; use DOMAIN_ORDER(the_bird) for mainloop */
 
   list channels;			/* List of channel configs (struct channel_config) */
   struct iface *vrf;			/* Related VRF instance, NULL if global */
@@ -139,6 +141,7 @@ struct proto {
   struct proto_config *cf_new;		/* Configuration we want to switch to after shutdown (NULL=delete) */
   pool *pool;				/* Pool containing local objects */
   event *event;				/* Protocol event */
+  struct birdloop *loop;		/* BIRDloop running this protocol */
 
   list channels;			/* List of channels to rtables (struct channel) */
   struct channel *main_channel;		/* Primary channel */
@@ -149,12 +152,12 @@ struct proto {
   u32 debug;				/* Debugging flags */
   u32 mrtdump;				/* MRTDump flags */
   uint active_channels;			/* Number of active channels */
+  uint active_coroutines;		/* Number of active coroutines */
   byte net_type;			/* Protocol network type (NET_*), 0 for undefined */
   byte disabled;			/* Manually disabled */
   byte vrf_set;				/* Related VRF instance (above) is defined */
   byte proto_state;			/* Protocol state machine (PS_*, see below) */
   byte active;				/* From PS_START to cleanup after PS_STOP */
-  byte do_start;			/* Start actions are scheduled */
   byte do_stop;				/* Stop actions are scheduled */
   byte reconfiguring;			/* We're shutting down due to reconfiguration */
   byte gr_recovery;			/* Protocol should participate in graceful restart recovery */
@@ -356,6 +359,8 @@ void proto_notify_state(struct proto *p, unsigned state);
  *	as a result of received ROUTE-REFRESH request).
  */
 
+static inline int proto_is_inactive(struct proto *p)
+{ return (p->active_channels == 0) && (p->active_coroutines == 0); }
 
 
 /*
diff --git a/nest/route.h b/nest/route.h
index d6474e09..7c5fd02f 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -11,6 +11,7 @@
 #define _BIRD_ROUTE_H_
 
 #include "lib/lists.h"
+#include "lib/event.h"
 #include "lib/bitmap.h"
 #include "lib/resource.h"
 #include "lib/net.h"
@@ -329,6 +330,8 @@ struct rt_export_request {
   char *name;
   u8 trace_routes;
 
+  event_list *list;			/* Where to schedule export events */
+
   /* There are two methods of export. You can either request feeding every single change
    * or feeding the whole route feed. In case of regular export, &export_one is preferred.
    * Anyway, when feeding, &export_bulk is preferred, falling back to &export_one.
diff --git a/nest/rt-table.c b/nest/rt-table.c
index c049101a..9c12ef56 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1105,6 +1105,12 @@ rt_next_export(struct rt_export_hook *hook, rtable *tab)
     return tab->first_export;
 }
 
+static inline void
+rt_send_export_event(struct rt_export_hook *hook)
+{
+  ev_send(hook->req->list, hook->event);
+}
+
 static void
 rt_announce_exports(timer *tm)
 {
@@ -1116,7 +1122,7 @@ rt_announce_exports(timer *tm)
     if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_READY)
       continue;
 
-    ev_schedule_work(c->event);
+    rt_send_export_event(c);
   }
 }
 
@@ -1169,7 +1175,7 @@ rt_export_hook(void *_data)
     rte_update_unlock();
   }
 
-  ev_schedule_work(c->event);
+  rt_send_export_event(c);
 }
 
 
@@ -1732,7 +1738,7 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
   hook->event = ev_new_init(p, rt_feed_channel, hook);
-  ev_schedule_work(hook->event);
+  rt_send_export_event(hook);
 
   rt_set_export_state(hook, TES_FEEDING);
 }
@@ -1754,7 +1760,7 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   hook->event->hook = rt_export_stopped;
   hook->stopped = stopped;
 
-  ev_schedule(hook->event);
+  rt_send_export_event(hook);
 
   rt_set_export_state(hook, TES_STOP);
 }
@@ -2869,7 +2875,7 @@ rt_feed_channel(void *data)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule_work(c->event);
+	  rt_send_export_event(c);
 	  return;
 	}
 
@@ -2904,7 +2910,7 @@ rt_feed_channel(void *data)
   FIB_ITERATE_END;
 
   c->event->hook = rt_export_hook;
-  ev_schedule_work(c->event);
+  rt_send_export_event(c);
 
   rt_set_export_state(c, TES_READY);
 }
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index dac184c5..3964c267 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -113,8 +113,16 @@
 #define HASH_IP_EQ(a1,n1,a2,n2)	ipa_equal(a1, a2) && n1 == n2
 #define HASH_IP_FN(a,n)		ipa_hash(a) ^ u32_hash(n)
 
-static list bfd_proto_list;
-static list bfd_wait_list;
+DEFINE_DOMAIN(rtable);
+#define BFD_LOCK	LOCK_DOMAIN(rtable, bfd_global.lock)
+#define BFD_UNLOCK	UNLOCK_DOMAIN(rtable, bfd_global.lock)
+
+static struct {
+  DOMAIN(rtable) lock;
+  list wait_list;
+  list pickup_list;
+  list proto_list;
+} bfd_global;
 
 const char *bfd_state_names[] = { "AdminDown", "Down", "Init", "Up" };
 
@@ -188,7 +196,7 @@ bfd_session_update_tx_interval(struct bfd_session *s)
     return;
 
   /* Set timer relative to last tx_timer event */
-  tm_set(s->tx_timer, s->last_tx + tx_int_l);
+  tm_set_in(s->tx_timer, s->last_tx + tx_int_l, s->ifa->bfd->p.loop);
 }
 
 static void
@@ -202,7 +210,7 @@ bfd_session_update_detection_time(struct bfd_session *s, int kick)
   if (!s->last_rx)
     return;
 
-  tm_set(s->hold_timer, s->last_rx + timeout);
+  tm_set_in(s->hold_timer, s->last_rx + timeout, s->ifa->bfd->p.loop);
 }
 
 static void
@@ -226,7 +234,7 @@ bfd_session_control_tx_timer(struct bfd_session *s, int reset)
   if (reset || !tm_active(s->tx_timer))
   {
     s->last_tx = 0;
-    tm_start(s->tx_timer, 0);
+    tm_start_in(s->tx_timer, 0, s->ifa->bfd->p.loop);
   }
 
   return;
@@ -419,7 +427,7 @@ bfd_get_free_id(struct bfd_proto *p)
 static struct bfd_session *
 bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *iface, struct bfd_options *opts)
 {
-  birdloop_enter(p->loop);
+  ASSERT_DIE(birdloop_inside(p->p.loop));
 
   struct bfd_iface *ifa = bfd_get_iface(p, local, iface);
 
@@ -454,8 +462,6 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
 
   TRACE(D_EVENTS, "Session to %I added", s->addr);
 
-  birdloop_leave(p->loop);
-
   return s;
 }
 
@@ -463,38 +469,34 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
 static void
 bfd_open_session(struct bfd_proto *p, struct bfd_session *s, ip_addr local, struct iface *ifa)
 {
-  birdloop_enter(p->loop);
+  birdloop_enter(p->p.loop);
 
   s->opened = 1;
 
   bfd_session_control_tx_timer(s);
 
-  birdloop_leave(p->loop);
+  birdloop_leave(p->p.loop);
 }
 
 static void
 bfd_close_session(struct bfd_proto *p, struct bfd_session *s)
 {
-  birdloop_enter(p->loop);
+  birdloop_enter(p->p.loop);
 
   s->opened = 0;
 
   bfd_session_update_state(s, BFD_STATE_DOWN, BFD_DIAG_PATH_DOWN);
   bfd_session_control_tx_timer(s);
 
-  birdloop_leave(p->loop);
+  birdloop_leave(p->p.loop);
 }
 */
 
 static void
-bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
+bfd_remove_session_locked(struct bfd_proto *p, struct bfd_session *s)
 {
-  ip_addr ip = s->addr;
-
   /* Caller should ensure that request list is empty */
 
-  birdloop_enter(p->loop);
-
   /* Remove session from notify list if scheduled for notification */
   /* No need for bfd_lock_sessions(), we are already protected by birdloop_enter() */
   if (NODE_VALID(&s->n))
@@ -508,11 +510,17 @@ bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
   HASH_REMOVE(p->session_hash_id, HASH_ID, s);
   HASH_REMOVE(p->session_hash_ip, HASH_IP, s);
 
+  TRACE(D_EVENTS, "Session to %I removed", s->addr);
+
   sl_free(p->session_slab, s);
+}
 
-  TRACE(D_EVENTS, "Session to %I removed", ip);
-
-  birdloop_leave(p->loop);
+static void
+bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
+{
+  birdloop_enter(p->p.loop);
+  bfd_remove_session_locked(p, s);
+  birdloop_leave(p->p.loop);
 }
 
 static void
@@ -521,7 +529,7 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
   if (EMPTY_LIST(s->request_list))
     return;
 
-  birdloop_enter(p->loop);
+  birdloop_enter(p->p.loop);
 
   struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(s->request_list));
   s->cf = bfd_merge_options(s->ifa->cf, &req->opts);
@@ -534,7 +542,7 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
 
   bfd_session_control_tx_timer(s, 0);
 
-  birdloop_leave(p->loop);
+  birdloop_leave(p->p.loop);
 
   TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
 }
@@ -618,9 +626,9 @@ bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_con
     (new->passive != old->passive);
 
   /* This should be probably changed to not access ifa->cf from the BFD thread */
-  birdloop_enter(p->loop);
+  birdloop_enter(p->p.loop);
   ifa->cf = new;
-  birdloop_leave(p->loop);
+  birdloop_leave(p->p.loop);
 }
 
 
@@ -681,41 +689,68 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 }
 
 static void
-bfd_submit_request(struct bfd_request *req)
+bfd_pickup_requests(void *_data UNUSED)
 {
   node *n;
+  WALK_LIST(n, bfd_global.proto_list)
+  {
+    struct bfd_proto *p = SKIP_BACK(struct bfd_proto, bfd_node, n);
+    birdloop_enter(p->p.loop);
+    BFD_LOCK;
 
-  WALK_LIST(n, bfd_proto_list)
-    if (bfd_add_request(SKIP_BACK(struct bfd_proto, bfd_node, n), req))
-      return;
+    node *rn, *rnxt;
+    WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
+      bfd_add_request(p, SKIP_BACK(struct bfd_request, n, rn));
 
-  rem_node(&req->n);
-  add_tail(&bfd_wait_list, &req->n);
-  req->session = NULL;
-  bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
+    BFD_UNLOCK;
+    birdloop_leave(p->p.loop);
+  }
+
+  BFD_LOCK;
+  node *rn, *rnxt;
+  WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
+  {
+    rem_node(rn);
+    add_tail(&bfd_global.wait_list, rn);
+    bfd_request_notify(SKIP_BACK(struct bfd_request, n, rn), BFD_STATE_ADMIN_DOWN, 0);
+  }
+  BFD_UNLOCK;
 }
 
+static event bfd_pickup_event = { .hook = bfd_pickup_requests };
+
 static void
 bfd_take_requests(struct bfd_proto *p)
 {
   node *n, *nn;
-
-  WALK_LIST_DELSAFE(n, nn, bfd_wait_list)
+  BFD_LOCK;
+  WALK_LIST_DELSAFE(n, nn, bfd_global.wait_list)
     bfd_add_request(p, SKIP_BACK(struct bfd_request, n, n));
+  BFD_UNLOCK;
 }
 
 static void
 bfd_drop_requests(struct bfd_proto *p)
 {
   node *n;
-
-  HASH_WALK(p->session_hash_id, next_id, s)
+  BFD_LOCK;
+  HASH_WALK_DELSAFE(p->session_hash_id, next_id, s)
   {
-    /* We assume that p is not in bfd_proto_list */
     WALK_LIST_FIRST(n, s->request_list)
-      bfd_submit_request(SKIP_BACK(struct bfd_request, n, n));
+    {
+      struct bfd_request *req = SKIP_BACK(struct bfd_request, n, n);
+      rem_node(&req->n);
+      add_tail(&bfd_global.pickup_list, &req->n);
+      req->session = NULL;
+      bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
+    }
+
+    ev_send(&global_event_list, &bfd_pickup_event);
+
+    bfd_remove_session_locked(p, s);
   }
   HASH_WALK_END;
+  BFD_UNLOCK;
 }
 
 static struct resclass bfd_request_class;
@@ -728,9 +763,6 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
 {
   struct bfd_request *req = ralloc(p, &bfd_request_class);
 
-  /* Hack: self-link req->n, we will call rem_node() on it */
-  req->n.prev = req->n.next = &req->n;
-
   req->addr = addr;
   req->local = local;
   req->iface = iface;
@@ -739,11 +771,16 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
   if (opts)
     req->opts = *opts;
 
-  bfd_submit_request(req);
-
   req->hook = hook;
   req->data = data;
 
+  req->session = NULL;
+
+  BFD_LOCK;
+  add_tail(&bfd_global.pickup_list, &req->n);
+  ev_send(&global_event_list, &bfd_pickup_event);
+  BFD_UNLOCK;
+
   return req;
 }
 
@@ -1001,8 +1038,10 @@ bfd_notify_init(struct bfd_proto *p)
 void
 bfd_init_all(void)
 {
-  init_list(&bfd_proto_list);
-  init_list(&bfd_wait_list);
+  bfd_global.lock = DOMAIN_NEW(rtable, "BFD Global");
+  init_list(&bfd_global.wait_list);
+  init_list(&bfd_global.pickup_list);
+  init_list(&bfd_global.proto_list);
 }
 
 static struct proto *
@@ -1021,10 +1060,10 @@ bfd_start(struct proto *P)
   struct bfd_proto *p = (struct bfd_proto *) P;
   struct bfd_config *cf = (struct bfd_config *) (P->cf);
 
-  p->loop = birdloop_new();
-  p->tpool = rp_new(NULL, "BFD thread root");
   pthread_spin_init(&p->lock, PTHREAD_PROCESS_PRIVATE);
 
+  p->tpool = rp_new(P->pool, "BFD loop pool");
+
   p->session_slab = sl_new(P->pool, sizeof(struct bfd_session));
   HASH_INIT(p->session_hash_id, P->pool, 8);
   HASH_INIT(p->session_hash_ip, P->pool, 8);
@@ -1034,9 +1073,7 @@ bfd_start(struct proto *P)
   init_list(&p->notify_list);
   bfd_notify_init(p);
 
-  add_tail(&bfd_proto_list, &p->bfd_node);
-
-  birdloop_enter(p->loop);
+  add_tail(&bfd_global.proto_list, &p->bfd_node);
 
   if (cf->accept_ipv4 && cf->accept_direct)
     p->rx4_1 = bfd_open_rx_sk(p, 0, SK_IPV4);
@@ -1050,42 +1087,33 @@ bfd_start(struct proto *P)
   if (cf->accept_ipv6 && cf->accept_multihop)
     p->rx6_m = bfd_open_rx_sk(p, 1, SK_IPV6);
 
-  birdloop_leave(p->loop);
-
   bfd_take_requests(p);
 
   struct bfd_neighbor *n;
   WALK_LIST(n, cf->neigh_list)
     bfd_start_neighbor(p, n);
 
-  birdloop_start(p->loop);
-
   return PS_UP;
 }
 
-
 static int
 bfd_shutdown(struct proto *P)
 {
   struct bfd_proto *p = (struct bfd_proto *) P;
-  struct bfd_config *cf = (struct bfd_config *) (P->cf);
+  struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
 
   rem_node(&p->bfd_node);
 
-  birdloop_stop(p->loop);
-
-  struct bfd_neighbor *n;
-  WALK_LIST(n, cf->neigh_list)
-    bfd_stop_neighbor(p, n);
+  struct bfd_neighbor *bn;
+  WALK_LIST(bn, cf->neigh_list)
+    bfd_stop_neighbor(p, bn);
 
   bfd_drop_requests(p);
 
-  /* FIXME: This is hack */
-  birdloop_enter(p->loop);
-  rfree(p->tpool);
-  birdloop_leave(p->loop);
-
-  birdloop_free(p->loop);
+  if (p->rx4_1) sk_stop(p->rx4_1);
+  if (p->rx4_m) sk_stop(p->rx4_m);
+  if (p->rx6_1) sk_stop(p->rx6_1);
+  if (p->rx6_m) sk_stop(p->rx6_m);
 
   return PS_DOWN;
 }
@@ -1105,7 +1133,7 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
       (new->accept_multihop != old->accept_multihop))
     return 0;
 
-  birdloop_mask_wakeups(p->loop);
+  birdloop_mask_wakeups(p->p.loop);
 
   WALK_LIST(ifa, p->iface_list)
     bfd_reconfigure_iface(p, ifa, new);
@@ -1119,7 +1147,7 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
 
   bfd_reconfigure_neighbors(p, new);
 
-  birdloop_unmask_wakeups(p->loop);
+  birdloop_unmask_wakeups(p->p.loop);
 
   return 1;
 }
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 9d4cbbf8..8430064b 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -17,12 +17,12 @@
 #include "nest/password.h"
 #include "conf/conf.h"
 #include "lib/hash.h"
+#include "lib/io-loop.h"
 #include "lib/resource.h"
 #include "lib/socket.h"
 #include "lib/string.h"
 
 #include "nest/bfd.h"
-#include "sysdep/unix/io-loop.h"
 
 
 #define BFD_CONTROL_PORT	3784
@@ -87,9 +87,11 @@ struct bfd_neighbor
 struct bfd_proto
 {
   struct proto p;
-  struct birdloop *loop;
-  pool *tpool;
+
   pthread_spinlock_t lock;
+
+  pool *tpool;
+
   node bfd_node;
 
   slab *session_slab;
diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y
index df1cba42..ed5479fb 100644
--- a/proto/bfd/config.Y
+++ b/proto/bfd/config.Y
@@ -36,6 +36,7 @@ proto: bfd_proto ;
 bfd_proto_start: proto_start BFD
 {
   this_proto = proto_config_new(&proto_bfd, $1);
+  this_proto->loop_order = DOMAIN_ORDER(proto);
   init_list(&BFD_CFG->patt_list);
   init_list(&BFD_CFG->neigh_list);
   BFD_CFG->accept_ipv4 = BFD_CFG->accept_ipv6 = 1;
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index 7618e20f..37d77f37 100644
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -410,7 +410,7 @@ bfd_err_hook(sock *sk, int err)
 sock *
 bfd_open_rx_sk(struct bfd_proto *p, int multihop, int af)
 {
-  sock *sk = sk_new(p->tpool);
+  sock *sk = sk_new(p->p.pool);
   sk->type = SK_UDP;
   sk->subtype = af;
   sk->sport = !multihop ? BFD_CONTROL_PORT : BFD_MULTI_CTL_PORT;
@@ -441,7 +441,7 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop, int af)
 sock *
 bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
 {
-  sock *sk = sk_new(p->tpool);
+  sock *sk = sk_new(p->p.pool);
   sk->type = SK_UDP;
   sk->saddr = local;
   sk->dport = ifa ? BFD_CONTROL_PORT : BFD_MULTI_CTL_PORT;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 35e9ea59..96df671f 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -853,6 +853,7 @@ bgp_graceful_restart_feed(struct bgp_channel *c)
 {
   c->stale_feed = (struct rt_export_request) {
     .name = "BGP-GR",
+    .list = &global_work_list,
     .trace_routes = c->c.debug | c->c.proto->debug,
     .dump_req = bgp_graceful_restart_feed_dump_req,
     .log_state_change = bgp_graceful_restart_feed_log_state_change,
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 2eba142c..4758c056 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -21,10 +21,9 @@
 #include "lib/resource.h"
 #include "lib/timer.h"
 
-/* Using a rather big stack for coroutines to allow for stack-local allocations.
- * In real world, the kernel doesn't alloc this memory until it is used.
- * */
-#define CORO_STACK_SIZE	1048576
+#include "conf/conf.h"
+
+#define CORO_STACK_SIZE	65536
 
 /*
  *	Implementation of coroutines based on POSIX threads
@@ -79,6 +78,11 @@ domain_free(struct domain_generic *dg)
   xfree(dg);
 }
 
+uint dg_order(struct domain_generic *dg)
+{
+  return dg->order;
+}
+
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 {
   if ((char *) lsp - (char *) &locking_stack != dg->order)
@@ -89,7 +93,11 @@ void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
   if (*lsp)
     bug("Inconsistent locking stack state on lock");
 
+  btime lock_begin = current_time();
   pthread_mutex_lock(&dg->mutex);
+  btime duration = current_time() - lock_begin;
+  if (config && (duration > config->watchdog_warning))
+    log(L_WARN "Locking of %s took %d ms", dg->name, (int) (duration TO_MS));
 
   if (dg->prev || dg->locked_by)
     bug("Previous unlock not finished correctly");
@@ -140,11 +148,16 @@ static struct resclass coro_class = {
   .free = coro_free,
 };
 
+_Thread_local struct coroutine *this_coro = NULL;
+
 static void *coro_entry(void *p)
 {
   struct coroutine *c = p;
+
   ASSERT_DIE(c->entry);
 
+  this_coro = c;
+
   c->entry(c->data);
   ASSERT_DIE(coro_cleaned_up);
 
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index a15d866a..275d38a0 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -15,50 +15,47 @@
 #include <sys/time.h>
 
 #include "nest/bird.h"
-#include "sysdep/unix/io-loop.h"
 
 #include "lib/buffer.h"
+#include "lib/coro.h"
 #include "lib/lists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
 #include "lib/timer.h"
 #include "lib/socket.h"
 
-
-struct birdloop
-{
-  pool *pool;
-  pthread_t thread;
-  pthread_mutex_t mutex;
-
-  u8 stop_called;
-  u8 poll_active;
-  u8 wakeup_masked;
-  int wakeup_fds[2];
-
-  struct timeloop time;
-  list event_list;
-  list sock_list;
-  uint sock_num;
-
-  BUFFER(sock *) poll_sk;
-  BUFFER(struct pollfd) poll_fd;
-  u8 poll_changed;
-  u8 close_scheduled;
-};
-
+#include "lib/io-loop.h"
+#include "sysdep/unix/io-loop.h"
+#include "conf/conf.h"
 
 /*
  *	Current thread context
  */
 
-static _Thread_local struct birdloop *birdloop_current;
+_Thread_local struct birdloop *birdloop_current;
+static _Thread_local struct birdloop *birdloop_wakeup_masked;
+static _Thread_local uint birdloop_wakeup_masked_count;
 
-static inline void
-birdloop_set_current(struct birdloop *loop)
+event_list *
+birdloop_event_list(struct birdloop *loop)
 {
-  birdloop_current = loop;
-  local_timeloop = loop ? &loop->time : &main_timeloop;
+  return &loop->event_list;
+}
+
+struct timeloop *
+birdloop_time_loop(struct birdloop *loop)
+{
+  return &loop->time;
+}
+
+_Bool
+birdloop_inside(struct birdloop *loop)
+{
+  for (struct birdloop *c = birdloop_current; c; c = c->prev_loop)
+    if (loop == c)
+      return 1;
+
+  return 0;
 }
 
 /*
@@ -135,57 +132,17 @@ wakeup_do_kick(struct birdloop *loop)
   pipe_kick(loop->wakeup_fds[1]);
 }
 
-static inline void
-wakeup_kick(struct birdloop *loop)
+void
+birdloop_ping(struct birdloop *loop)
 {
-  if (!loop->wakeup_masked)
-    wakeup_do_kick(loop);
+  u32 ping_sent = atomic_fetch_add_explicit(&loop->ping_sent, 1, memory_order_acq_rel);
+  if (ping_sent)
+    return;
+
+  if (loop == birdloop_wakeup_masked)
+    birdloop_wakeup_masked_count++;
   else
-    loop->wakeup_masked = 2;
-}
-
-/* For notifications from outside */
-void
-wakeup_kick_current(void)
-{
-  if (birdloop_current && birdloop_current->poll_active)
-    wakeup_kick(birdloop_current);
-}
-
-
-/*
- *	Events
- */
-
-static inline uint
-events_waiting(struct birdloop *loop)
-{
-  return !EMPTY_LIST(loop->event_list);
-}
-
-static inline void
-events_init(struct birdloop *loop)
-{
-  init_list(&loop->event_list);
-}
-
-static void
-events_fire(struct birdloop *loop)
-{
-  times_update();
-  ev_run_list(&loop->event_list);
-}
-
-void
-ev2_schedule(event *e)
-{
-  if (birdloop_current->poll_active && EMPTY_LIST(birdloop_current->event_list))
-    wakeup_kick(birdloop_current);
-
-  if (e->n.next)
-    rem_node(&e->n);
-
-  add_tail(&birdloop_current->event_list, &e->n);
+    wakeup_do_kick(loop);
 }
 
 
@@ -213,13 +170,13 @@ sockets_add(struct birdloop *loop, sock *s)
   s->index = -1;
   loop->poll_changed = 1;
 
-  if (loop->poll_active)
-    wakeup_kick(loop);
+  birdloop_ping(loop);
 }
 
 void
 sk_start(sock *s)
 {
+  ASSERT_DIE(birdloop_current != &main_birdloop);
   sockets_add(birdloop_current, s);
 }
 
@@ -230,28 +187,21 @@ sockets_remove(struct birdloop *loop, sock *s)
   loop->sock_num--;
 
   if (s->index >= 0)
+  {
     loop->poll_sk.data[s->index] = NULL;
-
-  s->index = -1;
-  loop->poll_changed = 1;
-
-  /* Wakeup moved to sk_stop() */
+    s->index = -1;
+    loop->poll_changed = 1;
+    loop->close_scheduled = 1;
+    birdloop_ping(loop);
+  }
+  else
+    close(s->fd);
 }
 
 void
 sk_stop(sock *s)
 {
   sockets_remove(birdloop_current, s);
-
-  if (birdloop_current->poll_active)
-  {
-    birdloop_current->close_scheduled = 1;
-    wakeup_kick(birdloop_current);
-  }
-  else
-    close(s->fd);
-
-  s->fd = -1;
 }
 
 static inline uint sk_want_events(sock *s)
@@ -351,12 +301,15 @@ sockets_fire(struct birdloop *loop)
 
     if (pfd->revents & POLLIN)
       while (e && *psk && (*psk)->rx_hook)
-	e = sk_read(*psk, 0);
+	e = sk_read(*psk, pfd->revents);
 
     e = 1;
     if (pfd->revents & POLLOUT)
+    {
+      loop->poll_changed = 1;
       while (e && *psk)
 	e = sk_write(*psk);
+    }
   }
 }
 
@@ -365,104 +318,168 @@ sockets_fire(struct birdloop *loop)
  *	Birdloop
  */
 
-static void *birdloop_main(void *arg);
+struct birdloop main_birdloop;
+
+static void birdloop_enter_locked(struct birdloop *loop);
+
+void
+birdloop_init(void)
+{
+  wakeup_init(&main_birdloop);
+
+  main_birdloop.time.domain = the_bird_domain.the_bird;
+  main_birdloop.time.loop = &main_birdloop;
+
+  times_update();
+  timers_init(&main_birdloop.time, &root_pool);
+
+  birdloop_enter_locked(&main_birdloop);
+}
+
+static void birdloop_main(void *arg);
 
 struct birdloop *
-birdloop_new(void)
+birdloop_new(pool *pp, uint order, const char *name)
 {
-  pool *p = rp_new(NULL, "Birdloop root");
+  struct domain_generic *dg = domain_new(name, order);
+
+  pool *p = rp_new(pp, name);
   struct birdloop *loop = mb_allocz(p, sizeof(struct birdloop));
   loop->pool = p;
-  pthread_mutex_init(&loop->mutex, NULL);
+
+  loop->time.domain = dg;
+  loop->time.loop = loop;
+
+  birdloop_enter(loop);
 
   wakeup_init(loop);
-
-  events_init(loop);
+  ev_init_list(&loop->event_list, loop, name);
   timers_init(&loop->time, p);
   sockets_init(loop);
 
+  loop->time.coro = coro_run(p, birdloop_main, loop);
+
+  birdloop_leave(loop);
+
   return loop;
 }
 
-void
-birdloop_start(struct birdloop *loop)
+static void
+birdloop_do_stop(struct birdloop *loop, void (*stopped)(void *data), void *data)
 {
-  int rv = pthread_create(&loop->thread, NULL, birdloop_main, loop);
-  if (rv)
-    die("pthread_create(): %M", rv);
+  loop->stopped = stopped;
+  loop->stop_data = data;
+  wakeup_do_kick(loop);
 }
 
 void
-birdloop_stop(struct birdloop *loop)
+birdloop_stop(struct birdloop *loop, void (*stopped)(void *data), void *data)
 {
-  pthread_mutex_lock(&loop->mutex);
-  loop->stop_called = 1;
-  wakeup_do_kick(loop);
-  pthread_mutex_unlock(&loop->mutex);
+  DG_LOCK(loop->time.domain);
+  birdloop_do_stop(loop, stopped, data);
+  DG_UNLOCK(loop->time.domain);
+}
 
-  int rv = pthread_join(loop->thread, NULL);
-  if (rv)
-    die("pthread_join(): %M", rv);
+void
+birdloop_stop_self(struct birdloop *loop, void (*stopped)(void *data), void *data)
+{
+  ASSERT_DIE(loop == birdloop_current);
+  ASSERT_DIE(DG_IS_LOCKED(loop->time.domain));
+
+  birdloop_do_stop(loop, stopped, data);
 }
 
 void
 birdloop_free(struct birdloop *loop)
 {
+  ASSERT_DIE(loop->links == 0);
+  domain_free(loop->time.domain);
   rfree(loop->pool);
 }
 
+static void
+birdloop_enter_locked(struct birdloop *loop)
+{
+  ASSERT_DIE(DG_IS_LOCKED(loop->time.domain));
+  ASSERT_DIE(!birdloop_inside(loop));
+
+  /* Store the old context */
+  loop->prev_loop = birdloop_current;
+
+  /* Put the new context */
+  birdloop_current = loop;
+}
 
 void
 birdloop_enter(struct birdloop *loop)
 {
-  /* TODO: these functions could save and restore old context */
-  pthread_mutex_lock(&loop->mutex);
-  birdloop_set_current(loop);
+  DG_LOCK(loop->time.domain);
+  return birdloop_enter_locked(loop);
+}
+
+static void
+birdloop_leave_locked(struct birdloop *loop)
+{
+  /* Check the current context */
+  ASSERT_DIE(birdloop_current == loop);
+
+  /* Restore the old context */
+  birdloop_current = loop->prev_loop;
 }
 
 void
 birdloop_leave(struct birdloop *loop)
 {
-  /* TODO: these functions could save and restore old context */
-  birdloop_set_current(NULL);
-  pthread_mutex_unlock(&loop->mutex);
+  birdloop_leave_locked(loop);
+  DG_UNLOCK(loop->time.domain);
 }
 
 void
 birdloop_mask_wakeups(struct birdloop *loop)
 {
-  pthread_mutex_lock(&loop->mutex);
-  loop->wakeup_masked = 1;
-  pthread_mutex_unlock(&loop->mutex);
+  ASSERT_DIE(birdloop_wakeup_masked == NULL);
+  birdloop_wakeup_masked = loop;
 }
 
 void
 birdloop_unmask_wakeups(struct birdloop *loop)
 {
-  pthread_mutex_lock(&loop->mutex);
-  if (loop->wakeup_masked == 2)
+  ASSERT_DIE(birdloop_wakeup_masked == loop);
+  birdloop_wakeup_masked = NULL;
+  if (birdloop_wakeup_masked_count)
     wakeup_do_kick(loop);
-  loop->wakeup_masked = 0;
-  pthread_mutex_unlock(&loop->mutex);
+
+  birdloop_wakeup_masked_count = 0;
 }
 
-static void *
+void
+birdloop_link(struct birdloop *loop)
+{
+  ASSERT_DIE(birdloop_inside(loop));
+  loop->links++;
+}
+
+void
+birdloop_unlink(struct birdloop *loop)
+{
+  ASSERT_DIE(birdloop_inside(loop));
+  loop->links--;
+}
+
+static void
 birdloop_main(void *arg)
 {
   struct birdloop *loop = arg;
   timer *t;
   int rv, timeout;
 
-  birdloop_set_current(loop);
+  btime loop_begin = current_time();
 
-  pthread_mutex_lock(&loop->mutex);
+  birdloop_enter(loop);
   while (1)
   {
-    events_fire(loop);
-    timers_fire(&loop->time);
-
-    times_update();
-    if (events_waiting(loop))
+    timers_fire(&loop->time, 0);
+    if (ev_run_list(&loop->event_list))
       timeout = 0;
     else if (t = timers_first(&loop->time))
       timeout = (tm_remains(t) TO_MS) + 1;
@@ -472,8 +489,11 @@ birdloop_main(void *arg)
     if (loop->poll_changed)
       sockets_prepare(loop);
 
-    loop->poll_active = 1;
-    pthread_mutex_unlock(&loop->mutex);
+    btime duration = current_time() - loop_begin;
+    if (duration > config->watchdog_warning)
+      log(L_WARN "I/O loop cycle took %d ms", (int) (duration TO_MS));
+
+    birdloop_leave(loop);
 
   try:
     rv = poll(loop->poll_fd.data, loop->poll_fd.used, timeout);
@@ -484,25 +504,32 @@ birdloop_main(void *arg)
       die("poll: %m");
     }
 
-    pthread_mutex_lock(&loop->mutex);
-    loop->poll_active = 0;
+    birdloop_enter(loop);
 
     if (loop->close_scheduled)
       sockets_close_fds(loop);
 
-    if (loop->stop_called)
+    if (loop->stopped)
       break;
 
+    loop_begin = current_time();
+
     if (rv)
       sockets_fire(loop);
 
-    timers_fire(&loop->time);
+    atomic_exchange_explicit(&loop->ping_sent, 0, memory_order_acq_rel);
   }
 
-  loop->stop_called = 0;
-  pthread_mutex_unlock(&loop->mutex);
+  /* Flush remaining events */
+  ASSERT_DIE(!ev_run_list(&loop->event_list));
 
-  return NULL;
+  /* No timers allowed */
+  ASSERT_DIE(timers_count(&loop->time) == 0);
+  ASSERT_DIE(EMPTY_LIST(loop->sock_list));
+  ASSERT_DIE(loop->sock_num == 0);
+
+  birdloop_leave(loop);
+  loop->stopped(loop->stop_data);
 }
 
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index d858b04e..4024b6c5 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -4,31 +4,32 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#ifndef _BIRD_IO_LOOP_H_
-#define _BIRD_IO_LOOP_H_
+#ifndef _BIRD_SYSDEP_UNIX_IO_LOOP_H_
+#define _BIRD_SYSDEP_UNIX_IO_LOOP_H_
 
-#include "nest/bird.h"
-#include "lib/lists.h"
-#include "lib/resource.h"
-#include "lib/event.h"
-#include "lib/timer.h"
-#include "lib/socket.h"
+struct birdloop
+{
+  pool *pool;
 
+  struct timeloop time;
+  event_list event_list;
+  list sock_list;
+  uint sock_num;
 
-void ev2_schedule(event *e);
+  BUFFER(sock *) poll_sk;
+  BUFFER(struct pollfd) poll_fd;
+  u8 poll_changed;
+  u8 close_scheduled;
 
-void sk_start(sock *s);
-void sk_stop(sock *s);
+  _Atomic u32 ping_sent;
+  int wakeup_fds[2];
 
-struct birdloop *birdloop_new(void);
-void birdloop_start(struct birdloop *loop);
-void birdloop_stop(struct birdloop *loop);
-void birdloop_free(struct birdloop *loop);
+  uint links;
 
-void birdloop_enter(struct birdloop *loop);
-void birdloop_leave(struct birdloop *loop);
-void birdloop_mask_wakeups(struct birdloop *loop);
-void birdloop_unmask_wakeups(struct birdloop *loop);
+  void (*stopped)(void *data);
+  void *stop_data;
 
+  struct birdloop *prev_loop;
+};
 
-#endif /* _BIRD_IO_LOOP_H_ */
+#endif
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 90bb5d64..c91f2856 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -43,6 +43,7 @@
 #include "conf/conf.h"
 
 #include "sysdep/unix/unix.h"
+#include "sysdep/unix/io-loop.h"
 #include CONFIG_INCLUDE_SYSIO_H
 
 /* Maximum number of calls of tx handler for one socket in one
@@ -800,18 +801,16 @@ sk_free(resource *r)
     sk_ssh_free(s);
 #endif
 
-  if (s->fd < 0)
+  if ((s->fd < 0) || (s->flags & SKF_THREAD))
     return;
 
-  /* FIXME: we should call sk_stop() for SKF_THREAD sockets */
-  if (!(s->flags & SKF_THREAD))
-  {
-    if (s == current_sock)
-      current_sock = sk_next(s);
-    if (s == stored_sock)
-      stored_sock = sk_next(s);
+  if (s == current_sock)
+    current_sock = sk_next(s);
+  if (s == stored_sock)
+    stored_sock = sk_next(s);
+
+  if (enlisted(&s->n))
     rem_node(&s->n);
-  }
 
   if (s->type != SK_SSH && s->type != SK_SSH_ACTIVE)
     close(s->fd);
@@ -1104,7 +1103,11 @@ sk_passive_connected(sock *s, int type)
     return 1;
   }
 
-  sk_insert(t);
+  if (s->flags & SKF_PASSIVE_THREAD)
+    t->flags |= SKF_THREAD;
+  else
+    sk_insert(t);
+
   sk_alloc_bufs(t);
   s->rx_hook(t, 0);
   return 1;
@@ -1508,6 +1511,36 @@ sk_open_unix(sock *s, char *name)
   return 0;
 }
 
+static void
+sk_reloop_hook(void *_vs)
+{
+  sock *s = _vs;
+  if (birdloop_inside(&main_birdloop))
+  {
+    s->flags &= ~SKF_THREAD;
+    sk_insert(s);
+  }
+  else
+  {
+    s->flags |= SKF_THREAD;
+    sk_start(s);
+  }
+}
+
+void
+sk_reloop(sock *s, struct birdloop *loop)
+{
+  if (enlisted(&s->n))
+    rem_node(&s->n);
+
+  s->reloop = (event) {
+    .hook = sk_reloop_hook,
+    .data = s,
+  };
+
+  ev_send_loop(loop, &s->reloop);
+}
+
 
 #define CMSG_RX_SPACE MAX(CMSG4_SPACE_PKTINFO+CMSG4_SPACE_TTL, \
 			  CMSG6_SPACE_PKTINFO+CMSG6_SPACE_TTL)
@@ -2143,8 +2176,9 @@ void
 io_init(void)
 {
   init_list(&sock_list);
-  init_list(&global_event_list);
-  init_list(&global_work_list);
+  ev_init_list(&global_event_list, &main_birdloop, "Global event list");
+  ev_init_list(&global_work_list, &main_birdloop, "Global work list");
+  ev_init_list(&main_birdloop.event_list, &main_birdloop, "Global fast event list");
   krt_io_init();
   // XXX init_times();
   // XXX update_times();
@@ -2158,14 +2192,7 @@ static int short_loops = 0;
 #define SHORT_LOOP_MAX 10
 #define WORK_EVENTS_MAX 10
 
-static int poll_reload_pipe[2];
-
-void
-io_loop_reload(void)
-{
-  char b;
-  write(poll_reload_pipe[1], &b, 1);
-}
+void pipe_drain(int fd);
 
 void
 io_loop(void)
@@ -2178,21 +2205,19 @@ io_loop(void)
   int fdmax = 256;
   struct pollfd *pfd = xmalloc(fdmax * sizeof(struct pollfd));
 
-  if (pipe(poll_reload_pipe) < 0)
-    die("pipe(poll_reload_pipe) failed: %m");
-
   watchdog_start1();
   for(;;)
     {
       times_update();
       events = ev_run_list(&global_event_list);
       events = ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX) || events;
-      timers_fire(&main_timeloop);
+      events = ev_run_list(&main_birdloop.event_list) || events;
+      timers_fire(&main_birdloop.time, 1);
       io_close_event();
 
       // FIXME
       poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
-      if (t = timers_first(&main_timeloop))
+      if (t = timers_first(&main_birdloop.time))
       {
 	times_update();
 	timeout = (tm_remains(t) TO_MS) + 1;
@@ -2200,7 +2225,7 @@ io_loop(void)
       }
 
       /* A hack to reload main io_loop() when something has changed asynchronously. */
-      pfd[0].fd = poll_reload_pipe[0];
+      pfd[0].fd = main_birdloop.wakeup_fds[0];
       pfd[0].events = POLLIN;
 
       nfds = 1;
@@ -2263,9 +2288,9 @@ io_loop(void)
 
       /* And finally enter poll() to find active sockets */
       watchdog_stop();
-      the_bird_unlock();
+      birdloop_leave(&main_birdloop);
       pout = poll(pfd, nfds, poll_tout);
-      the_bird_lock();
+      birdloop_enter(&main_birdloop);
       watchdog_start();
 
       if (pout < 0)
@@ -2279,8 +2304,8 @@ io_loop(void)
 	  if (pfd[0].revents & POLLIN)
 	  {
 	    /* IO loop reload requested */
-	    char b;
-	    read(poll_reload_pipe[0], &b, 1);
+	    pipe_drain(main_birdloop.wakeup_fds[0]);
+	    atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
 	    continue;
 	  }
 
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index d35424ff..5da27cb6 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -908,10 +908,12 @@ main(int argc, char **argv)
   parse_args(argc, argv);
   log_switch(1, NULL, NULL);
 
+  the_bird_lock();
+
   random_init();
   net_init();
   resource_init();
-  timer_init();
+  birdloop_init();
   olock_init();
   io_init();
   rt_init();
@@ -961,7 +963,6 @@ main(int argc, char **argv)
       dup2(0, 2);
     }
 
-  the_bird_lock();
 
   main_thread_init();
 
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 313c97c3..ad85d1ea 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -106,7 +106,6 @@ extern volatile sig_atomic_t async_shutdown_flag;
 
 void io_init(void);
 void io_loop(void);
-void io_loop_reload(void);
 void io_log_dump(void);
 int sk_open_unix(struct birdsock *s, char *name);
 struct rfile *rf_open(struct pool *, const char *name, const char *mode);
diff --git a/test/bt-utils.c b/test/bt-utils.c
index cbca3a6b..90815e77 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -53,16 +53,20 @@ cf_file_read(byte *dest, uint max_len, int fd)
   return l;
 }
 
+void resource_sys_init(void);
+
 void
 bt_bird_init(void)
 {
+  resource_sys_init();
   if(bt_verbose)
     log_init_debug("");
   log_switch(bt_verbose != 0, NULL, NULL);
 
+  the_bird_lock();
   resource_init();
   olock_init();
-  timer_init();
+  birdloop_init();
   io_init();
   rt_init();
   if_init();
@@ -79,6 +83,7 @@ void bt_bird_cleanup(void)
     class_to_protocol[i] = NULL;
 
   config = new_config = NULL;
+  the_bird_unlock();
 }
 
 static char *

From 6e841b3153565632b6753f6b1fe74850c37f2808 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Oct 2021 23:08:58 +0200
Subject: [PATCH 031/431] Adding a generic cork mechanism for events

---
 lib/event.c           | 76 +++++++++++++++++++++++++++++++++++++++----
 lib/event.h           | 30 +++++++++++++++++
 lib/locking.h         |  1 +
 lib/socket.h          |  1 +
 sysdep/unix/io-loop.c |  2 +-
 sysdep/unix/io.c      |  2 +-
 6 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/lib/event.c b/lib/event.c
index 6c5c8b14..5031f314 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -114,17 +114,42 @@ ev_send(event_list *l, event *e)
 
   e->list = l;
 
-  LOCK_DOMAIN(event, l->lock);
-  if (enlisted(&e->n))
+  struct event_cork *ec = e->cork;
+
+  uint ping = 0;
+
+  if (ec)
   {
+    LOCK_DOMAIN(cork, ec->lock);
+    LOCK_DOMAIN(event, l->lock);
+
+    if (!enlisted(&e->n))
+      if (ec->count)
+	add_tail(&ec->events, &e->n);
+      else
+      {
+	add_tail(&l->events, &e->n);
+	ping = 1;
+      }
+
+    UNLOCK_DOMAIN(event, l->lock);
+    UNLOCK_DOMAIN(cork, ec->lock);
+  }
+  else
+  {
+    LOCK_DOMAIN(event, l->lock);
+
+    if (!enlisted(&e->n))
+    {
+      add_tail(&l->events, &e->n);
+      ping = 1;
+    }
+
     UNLOCK_DOMAIN(event, l->lock);
-    return;
   }
 
-  add_tail(&l->events, &e->n);
-  UNLOCK_DOMAIN(event, l->lock);
-
-  birdloop_ping(l->loop);
+  if (ping)
+    birdloop_ping(l->loop);
 }
 
 void io_log_event(void *hook, void *data);
@@ -224,3 +249,40 @@ ev_run_list_limited(event_list *l, uint limit)
 
   return repeat;
 }
+
+void ev_cork(struct event_cork *ec)
+{
+  LOCK_DOMAIN(cork, ec->lock);
+  ec->count++;
+  UNLOCK_DOMAIN(cork, ec->lock);
+}
+
+void ev_uncork(struct event_cork *ec)
+{
+  LOCK_DOMAIN(cork, ec->lock);
+
+  if (--ec->count)
+  {
+    UNLOCK_DOMAIN(cork, ec->lock);
+    return;
+  }
+
+  node *n;
+  WALK_LIST_FIRST(n, ec->events)
+    {
+      event *e = SKIP_BACK(event, n, n);
+      event_list *el = e->list;
+
+      rem_node(&e->n);
+
+      LOCK_DOMAIN(event, el->lock);
+      add_tail(&el->events, &e->n);
+      UNLOCK_DOMAIN(event, el->lock);
+
+      birdloop_ping(el->loop);
+    }
+
+  UNLOCK_DOMAIN(cork, ec->lock);
+
+  birdloop_ping(&main_birdloop);
+}
diff --git a/lib/event.h b/lib/event.h
index 6c358f84..cd85bf78 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -15,6 +15,7 @@
 #include <stdatomic.h>
 
 DEFINE_DOMAIN(event);
+DEFINE_DOMAIN(cork);
 
 typedef struct event {
   resource r;
@@ -22,6 +23,8 @@ typedef struct event {
   void *data;
   node n;				/* Internal link */
   struct event_list *list;		/* List where this event is put in */
+  struct event_cork *cork;		/* Event execution limiter */
+  node cork_node;
 } event;
 
 typedef struct event_list {
@@ -31,6 +34,12 @@ typedef struct event_list {
   DOMAIN(event) lock;
 } event_list;
 
+struct event_cork {
+  DOMAIN(cork) lock;
+  u32 count;
+  list events;
+};
+
 extern event_list global_event_list;
 extern event_list global_work_list;
 
@@ -44,6 +53,13 @@ static inline void ev_init_list(event_list *el, struct birdloop *loop, const cha
   el->lock = DOMAIN_NEW(event, name);
 }
 
+static inline void ev_init_cork(struct event_cork *ec, const char *name)
+{
+  init_list(&ec->events);
+  ec->lock = DOMAIN_NEW(cork, name);
+  ec->count = 0;
+};
+
 void ev_send(event_list *, event *);
 #define ev_send_loop(l, e) ev_send(birdloop_event_list((l)), (e))
 
@@ -56,6 +72,20 @@ int ev_run_list_limited(event_list *, uint);
 
 #define LEGACY_EVENT_LIST(l)  (((l) == &global_event_list) || ((l) == &global_work_list))
 
+void ev_cork(struct event_cork *);
+void ev_uncork(struct event_cork *);
+
+static inline u32 ev_corked(struct event_cork *ec)
+{
+  if (!ec)
+    return 0;
+
+  LOCK_DOMAIN(cork, ec->lock);
+  u32 out = ec->count;
+  UNLOCK_DOMAIN(cork, ec->lock);
+  return out;
+}
+
 _Bool birdloop_inside(struct birdloop *loop);
 
 static inline int
diff --git a/lib/locking.h b/lib/locking.h
index ab5c06af..0cbdead8 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,6 +16,7 @@ struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
   struct domain_generic *rtable;
+  struct domain_generic *cork;
   struct domain_generic *event;
 };
 
diff --git a/lib/socket.h b/lib/socket.h
index 5bdab7f3..ff07660f 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -57,6 +57,7 @@ typedef struct birdsock {
   uint fast_rx;				/* RX has higher priority in event loop */
   uint rbsize;
   int (*rx_hook)(struct birdsock *, uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */
+  struct event_cork *cork;		/* Cork to temporarily stop receiving data */
 
   byte *tbuf, *tpos;			/* NULL=allocate automatically */
   byte *ttx;				/* Internal */
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 275d38a0..c7cf4ad2 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -205,7 +205,7 @@ sk_stop(sock *s)
 }
 
 static inline uint sk_want_events(sock *s)
-{ return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
+{ return ((s->rx_hook && !ev_corked(s->cork)) ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
 
 /*
 FIXME: this should be called from sock code
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index c91f2856..dd385c80 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2234,7 +2234,7 @@ io_loop(void)
 	{
 	  pfd[nfds] = (struct pollfd) { .fd = -1 }; /* everything other set to 0 by this */
 	  s = SKIP_BACK(sock, n, n);
-	  if (s->rx_hook)
+	  if (s->rx_hook && !ev_corked(s->cork))
 	    {
 	      pfd[nfds].fd = s->fd;
 	      pfd[nfds].events |= POLLIN;

From 3b20722a1fc777c27ab2e0451d0ea3fee7fa81a2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Sep 2021 14:08:03 +0200
Subject: [PATCH 032/431] Table cork: Stop creating updates when there are too
 many pending.

The corked procedure gets a callback when uncorked. Supported by table
maintenance routines and also BGP.
---
 nest/route.h    |  6 ++++++
 nest/rt-table.c | 23 ++++++++++++++++++++++-
 proto/bgp/bgp.c |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/nest/route.h b/nest/route.h
index 88a56073..310cea92 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -157,6 +157,7 @@ struct rtable_config {
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
   btime export_settle_time;		/* Delay before exports are announced */
+  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
 };
 
 typedef struct rtable {
@@ -187,6 +188,9 @@ typedef struct rtable {
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte nhu_state;			/* Next Hop Update state */
+
+  byte cork_active;			/* Congestion control activated */
+
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -378,6 +382,8 @@ struct rt_export_hook {
   void (*stopped)(struct rt_export_request *);	/* Stored callback when export is stopped */
 };
 
+extern struct event_cork rt_cork;
+
 #define TIS_DOWN	0
 #define TIS_UP		1
 #define TIS_STOP	2
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6dd6587e..b4cd0448 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -110,6 +110,7 @@ const char *rt_export_state_name(u8 state)
     return rt_export_state_name_array[state];
 }
 
+struct event_cork rt_cork;
 
 /* Like fib_route(), but skips empty net entries */
 static inline void *
@@ -1061,7 +1062,13 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if (tab->first_export == NULL)
     tab->first_export = rpe;
 
-  if (!tm_active(tab->export_timer))
+  if ((tab->first_export->seq + tab->config->cork_limit <= tab->next_export_seq) && !tab->cork_active)
+  {
+    ev_cork(&rt_cork);
+    tab->cork_active = 1;
+    tm_start(tab->export_timer, 0);
+  }
+  else if (!tm_active(tab->export_timer))
     tm_start(tab->export_timer, tab->config->export_settle_time);
 }
 
@@ -2042,6 +2049,7 @@ rt_free(resource *_r)
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
   ASSERT_DIE(r->rt_count == 0);
+  ASSERT_DIE(!r->cork_active);
   ASSERT_DIE(EMPTY_LIST(r->imports));
   ASSERT_DIE(EMPTY_LIST(r->exports));
 
@@ -2106,6 +2114,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
   t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
 
+  t->nhu_event->cork = &rt_cork;
+  t->prune_event->cork = &rt_cork;
+
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
   t->next_export_seq = 1;
@@ -2128,6 +2139,7 @@ rt_init(void)
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
+  ev_init_cork(&rt_cork, "Route Table Cork");
 }
 
 /**
@@ -2420,6 +2432,14 @@ done:;
 
   if (EMPTY_LIST(tab->pending_exports) && tm_active(tab->export_timer))
     tm_stop(tab->export_timer);
+
+  /* If reduced to at most one export block pending */
+  if (tab->cork_active &&
+      ((!tab->first_export) || (tab->first_export->seq + 128 > tab->next_export_seq)))
+  {
+    tab->cork_active = 0;
+    ev_uncork(&rt_cork);
+  }
 }
 
 void
@@ -2699,6 +2719,7 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_min_time = 5;
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
+  c->cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
   c->config = new_config;
 
   add_tail(&new_config->tables, &c->n);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 96df671f..5f2e7dfd 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -584,6 +584,7 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
     p->link_addr = p->neigh->iface->llv6->ip;
 
   conn->sk->fast_rx = 0;
+  conn->sk->cork = &rt_cork;
 
   p->conn = conn;
   p->last_error_class = 0;

From 1b39473993abcc6180657c8d3bd5f9e12e4bc816 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 12 Nov 2021 22:58:40 +0100
Subject: [PATCH 033/431] Introducing basic RCU primitives for lock-less shared
 data structures

---
 lib/Makefile            |  2 +-
 lib/coro.h              |  2 ++
 lib/rcu.c               | 79 +++++++++++++++++++++++++++++++++++++++++
 lib/rcu.h               | 55 ++++++++++++++++++++++++++++
 lib/resource.c          |  3 ++
 sysdep/unix/coroutine.c | 10 ++++++
 6 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 lib/rcu.c
 create mode 100644 lib/rcu.h

diff --git a/lib/Makefile b/lib/Makefile
index 4378a7bd..98c5db3c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
+src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c rcu.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
 obj := $(src-o-files)
 $(all-daemon)
 
diff --git a/lib/coro.h b/lib/coro.h
index 17ccff89..b36f1d2c 100644
--- a/lib/coro.h
+++ b/lib/coro.h
@@ -25,5 +25,7 @@ struct coroutine *coro_run(pool *, void (*entry)(void *), void *data);
 /* Get self. */
 extern _Thread_local struct coroutine *this_coro;
 
+/* Just wait for a little while. Not intended for general use; use events if possible. */
+void coro_yield(void);
 
 #endif
diff --git a/lib/rcu.c b/lib/rcu.c
new file mode 100644
index 00000000..69f3442f
--- /dev/null
+++ b/lib/rcu.c
@@ -0,0 +1,79 @@
+/*
+ *	BIRD Library -- Read-Copy-Update Basic Operations
+ *
+ *	(c) 2021 Maria Matejka <mq@jmq.cz>
+ *	(c) 2021 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Note: all the relevant patents shall be expired.
+ *
+ *	Using the Supplementary Material for User-Level Implementations of Read-Copy-Update
+ *	by Matthieu Desnoyers, Paul E. McKenney, Alan S. Stern, Michel R. Dagenais and Jonathan Walpole
+ *	obtained from https://www.efficios.com/pub/rcu/urcu-supp-accepted.pdf
+ */
+
+#include "lib/rcu.h"
+#include "lib/coro.h"
+#include "lib/locking.h"
+
+_Atomic uint rcu_gp_ctl = RCU_NEST_CNT;
+_Thread_local struct rcu_coro *this_rcu_coro = NULL;
+
+static list rcu_coro_list;
+
+static struct rcu_coro main_rcu_coro;
+
+DEFINE_DOMAIN(resource);
+static DOMAIN(resource) rcu_domain;
+
+static int
+rcu_gp_ongoing(_Atomic uint *ctl)
+{
+  uint val = atomic_load(ctl);
+  return (val & RCU_NEST_CNT) && ((val ^ rcu_gp_ctl) & RCU_GP_PHASE);
+}
+
+static void
+update_counter_and_wait(void)
+{
+  atomic_fetch_xor(&rcu_gp_ctl, RCU_GP_PHASE);
+  struct rcu_coro *rc;
+  WALK_LIST(rc, rcu_coro_list)
+    while (rcu_gp_ongoing(&rc->ctl))
+      coro_yield();
+}
+
+void
+synchronize_rcu(void)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  update_counter_and_wait();
+  update_counter_and_wait();
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_coro_start(struct rcu_coro *rc)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  add_tail(&rcu_coro_list, &rc->n);
+  this_rcu_coro = rc;
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_coro_stop(struct rcu_coro *rc)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  this_rcu_coro = NULL;
+  rem_node(&rc->n);
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_init(void)
+{
+  rcu_domain = DOMAIN_NEW(resource, "Read-Copy-Update");
+  init_list(&rcu_coro_list);
+  rcu_coro_start(&main_rcu_coro);
+}
diff --git a/lib/rcu.h b/lib/rcu.h
new file mode 100644
index 00000000..ac8fc9ce
--- /dev/null
+++ b/lib/rcu.h
@@ -0,0 +1,55 @@
+/*
+ *	BIRD Library -- Read-Copy-Update Basic Operations
+ *
+ *	(c) 2021 Maria Matejka <mq@jmq.cz>
+ *	(c) 2021 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Note: all the relevant patents shall be expired.
+ */
+
+#ifndef _BIRD_RCU_H_
+#define _BIRD_RCU_H_
+
+#include "lib/birdlib.h"
+#include "lib/lists.h"
+#include <stdatomic.h>
+
+#define RCU_GP_PHASE  0x100000
+#define RCU_NEST_MASK 0x0fffff
+#define RCU_NEST_CNT  0x000001
+
+extern _Atomic uint rcu_gp_ctl;
+
+struct rcu_coro {
+  node n;
+  _Atomic uint ctl;
+};
+
+extern _Thread_local struct rcu_coro *this_rcu_coro;
+
+static inline void rcu_read_lock(void)
+{
+  uint cmp = atomic_load_explicit(&this_rcu_coro->ctl, memory_order_acquire);
+
+  if (cmp & RCU_NEST_MASK)
+    atomic_store_explicit(&this_rcu_coro->ctl, cmp + RCU_NEST_CNT, memory_order_relaxed);
+  else
+    atomic_store(&this_rcu_coro->ctl, atomic_load_explicit(&rcu_gp_ctl, memory_order_acquire));
+}
+
+static inline void rcu_read_unlock(void)
+{
+  atomic_fetch_sub(&this_rcu_coro->ctl, RCU_NEST_CNT);
+}
+
+void synchronize_rcu(void);
+
+/* Registering and unregistering a coroutine. To be called from coroutine implementation */
+void rcu_coro_start(struct rcu_coro *);
+void rcu_coro_stop(struct rcu_coro *);
+
+/* Run this from resource init */
+void rcu_init(void);
+
+#endif
diff --git a/lib/resource.c b/lib/resource.c
index 2d041ad5..0651406f 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -13,6 +13,7 @@
 #include "nest/bird.h"
 #include "lib/resource.h"
 #include "lib/string.h"
+#include "lib/rcu.h"
 
 /**
  * DOC: Resource pools
@@ -284,6 +285,8 @@ rlookup(unsigned long a)
 void
 resource_init(void)
 {
+  rcu_init();
+
   root_pool.r.class = &pool_class;
   root_pool.name = "Root";
   init_list(&root_pool.inside);
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 4758c056..12ba55d8 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -18,6 +18,7 @@
 #include "lib/birdlib.h"
 #include "lib/locking.h"
 #include "lib/coro.h"
+#include "lib/rcu.h"
 #include "lib/resource.h"
 #include "lib/timer.h"
 
@@ -128,6 +129,7 @@ struct coroutine {
   resource r;
   pthread_t id;
   pthread_attr_t attr;
+  struct rcu_coro rcu;
   void (*entry)(void *);
   void *data;
 };
@@ -137,6 +139,7 @@ static _Thread_local _Bool coro_cleaned_up = 0;
 static void coro_free(resource *r)
 {
   struct coroutine *c = (void *) r;
+  rcu_coro_stop(&c->rcu);
   ASSERT_DIE(pthread_equal(pthread_self(), c->id));
   pthread_attr_destroy(&c->attr);
   coro_cleaned_up = 1;
@@ -157,6 +160,7 @@ static void *coro_entry(void *p)
   ASSERT_DIE(c->entry);
 
   this_coro = c;
+  rcu_coro_start(&c->rcu);
 
   c->entry(c->data);
   ASSERT_DIE(coro_cleaned_up);
@@ -190,3 +194,9 @@ struct coroutine *coro_run(pool *p, void (*entry)(void *), void *data)
 
   return c;
 }
+
+void
+coro_yield(void)
+{
+  usleep(100);
+}

From 1e8e3b7c1214393844c35fe3fbba9865b56ec95f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 16 Nov 2021 21:13:32 +0000
Subject: [PATCH 034/431] More information on RPKI errors

---
 proto/rpki/packets.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 897edc09..38830d28 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -233,7 +233,12 @@ static const size_t min_pdu_size[] = {
   [ERROR] 			= 16,
 };
 
-static int rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...);
+static int rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...);
+
+#define rpki_send_error_pdu(cache, error_code, err_pdu_len, erroneous_pdu, fmt...) ({ \
+    rpki_send_error_pdu_(cache, error_code, err_pdu_len, erroneous_pdu, #fmt); \
+    CACHE_TRACE(D_PACKETS, cache, #fmt); \
+    })
 
 static void
 rpki_pdu_to_network_byte_order(struct pdu_header *pdu)
@@ -595,6 +600,7 @@ rpki_handle_error_pdu(struct rpki_cache *cache, const struct pdu_error *pdu)
   case INTERNAL_ERROR:
   case INVALID_REQUEST:
   case UNSUPPORTED_PDU_TYPE:
+    CACHE_TRACE(D_PACKETS, cache, "Got UNSUPPORTED_PDU_TYPE");
     rpki_cache_change_state(cache, RPKI_CS_ERROR_FATAL);
     break;
 
@@ -1013,7 +1019,7 @@ rpki_connected_hook(sock *sk)
  * This function prepares Error PDU and sends it to a cache server.
  */
 static int
-rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
+rpki_send_error_pdu_(struct rpki_cache *cache, const enum pdu_error_type error_code, const u32 err_pdu_len, const struct pdu_header *erroneous_pdu, const char *fmt, ...)
 {
   va_list args;
   char msg[128];

From 794a4eefa11f3166404d91edddd0f4f19458f652 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 11 Nov 2021 16:25:59 +0100
Subject: [PATCH 035/431] Keeping un-unmmappable pages until they can be reused

On Linux, munmap() may fail with ENOMEM when virtual memory is too
fragmented. Working this around by just keeping such blocks for future
use.
---
 lib/locking.h       |  1 +
 lib/resource.c      | 23 +++++++++++++++++------
 sysdep/unix/alloc.c | 43 +++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index 0a69f50f..1a8bdcd4 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -19,6 +19,7 @@ struct lock_order {
   struct domain_generic *attrs;
   struct domain_generic *cork;
   struct domain_generic *event;
+  struct domain_generic *resource;
 };
 
 extern _Thread_local struct lock_order locking_stack;
diff --git a/lib/resource.c b/lib/resource.c
index e80b315b..2d041ad5 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -60,7 +60,7 @@ static struct resclass pool_class = {
 pool root_pool;
 
 void *alloc_sys_page(void);
-void free_sys_page(void *);
+int free_sys_page(void *);
 
 static int indent;
 
@@ -98,8 +98,10 @@ pool_free(resource *P)
   if (p->pages)
     {
       ASSERT_DIE(!p->pages->used);
-      for (uint i=0; i<p->pages->free; i++)
+
+      for (uint i = 0; i < p->pages->free; i++)
 	free_sys_page(p->pages->ptr[i]);
+
       free_sys_page(p->pages);
     }
 }
@@ -476,10 +478,19 @@ free_page(pool *p, void *ptr)
   ASSERT_DIE(p->pages);
   p->pages->used--;
 
-  if (p->pages->free >= POOL_PAGES_MAX)
-    return free_sys_page(ptr);
-  else
-    p->pages->ptr[p->pages->free++] = ptr;
+  ASSERT_DIE(p->pages->free <= POOL_PAGES_MAX);
+
+  if (p->pages->free == POOL_PAGES_MAX)
+  {
+    const unsigned long keep = POOL_PAGES_MAX / 4;
+
+    for (uint i = keep; i < p->pages->free; i++)
+      free_sys_page(p->pages->ptr[i]);
+
+    p->pages->free = keep;
+  }
+
+  p->pages->ptr[p->pages->free++] = ptr;
 }
 
 
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 4c9d5eb5..4ae1a9db 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -11,6 +11,8 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdatomic.h>
+#include <errno.h>
 
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
@@ -19,6 +21,13 @@
 long page_size = 0;
 _Bool alloc_multipage = 0;
 
+static _Atomic int global_page_list_not_empty;
+static list global_page_list;
+static _Atomic int global_page_spinlock;
+
+#define	GLOBAL_PAGE_SPIN_LOCK	for (int v = 0; !atomic_compare_exchange_weak_explicit(&global_page_spinlock, &v, 1, memory_order_acq_rel, memory_order_acquire); v = 0)
+#define GLOBAL_PAGE_SPIN_UNLOCK	do { int v = 1; ASSERT_DIE(atomic_compare_exchange_strong_explicit(&global_page_spinlock, &v, 0, memory_order_acq_rel, memory_order_acquire)); } while (0)
+
 #ifdef HAVE_MMAP
 static _Bool use_fake = 0;
 #else
@@ -28,12 +37,14 @@ static _Bool use_fake = 1;
 void resource_sys_init(void)
 {
 #ifdef HAVE_MMAP
+  init_list(&global_page_list);
+
   if (!(page_size = sysconf(_SC_PAGESIZE)))
     die("System page size must be non-zero");
 
   if ((u64_popcount(page_size) > 1) || (page_size > 16384))
-  {
 #endif
+  {
     /* Too big or strange page, use the aligned allocator instead */
     page_size = 4096;
     use_fake = 1;
@@ -46,6 +57,22 @@ alloc_sys_page(void)
 #ifdef HAVE_MMAP
   if (!use_fake)
   {
+    if (atomic_load_explicit(&global_page_list_not_empty, memory_order_relaxed))
+    {
+      GLOBAL_PAGE_SPIN_LOCK;
+      if (!EMPTY_LIST(global_page_list))
+      {
+	node *ret = HEAD(global_page_list);
+	rem_node(ret);
+	if (EMPTY_LIST(global_page_list))
+	  atomic_store_explicit(&global_page_list_not_empty, 0, memory_order_relaxed);
+	GLOBAL_PAGE_SPIN_UNLOCK;
+	memset(ret, 0, sizeof(node));
+	return (void *) ret;
+      }
+      GLOBAL_PAGE_SPIN_UNLOCK;
+    }
+
     if (alloc_multipage)
     {
       void *big = mmap(NULL, page_size * 2, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@@ -90,7 +117,19 @@ free_sys_page(void *ptr)
   if (!use_fake)
   {
     if (munmap(ptr, page_size) < 0)
-      bug("munmap(%p) failed: %m", ptr);
+#ifdef ENOMEM
+      if (errno == ENOMEM)
+      {
+	memset(ptr, 0, page_size);
+
+	GLOBAL_PAGE_SPIN_LOCK;
+	add_tail(&global_page_list, (node *) ptr);
+	atomic_store_explicit(&global_page_list_not_empty, 1, memory_order_relaxed);
+	GLOBAL_PAGE_SPIN_UNLOCK;
+      }
+      else
+#endif
+	bug("munmap(%p) failed: %m", ptr);
   }
   else
 #endif

From 2a224a9e1e1fbe1abec96c8585dd754fb716d020 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 13 Nov 2021 17:52:34 +0100
Subject: [PATCH 036/431] Route sources have their separate global lock

---
 nest/rt-attr.c | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index cd4c6892..cb66b65d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -86,8 +86,13 @@ const char * rta_dest_names[RTD_MAX] = {
 };
 
 DOMAIN(attrs) attrs_domain;
+DOMAIN(attrs) src_domain;
+
+#define SRC_LOCK	LOCK_DOMAIN(attrs, src_domain)
+#define SRC_UNLOCK	UNLOCK_DOMAIN(attrs, src_domain)
 
 pool *rta_pool;
+pool *src_pool;
 
 static slab *rta_slab_[4];
 static slab *nexthop_slab_[4];
@@ -110,9 +115,11 @@ static struct idm src_ids;
 static void
 rte_src_init(void)
 {
-  rte_src_slab = sl_new(rta_pool, sizeof(struct rte_src));
+  src_domain = DOMAIN_NEW(attrs, "Route sources");
+  src_pool = rp_new(&root_pool, "Route sources");
+  rte_src_slab = sl_new(src_pool, sizeof(struct rte_src));
 
-  idm_init(&src_ids, rta_pool, SRC_ID_INIT_SIZE);
+  idm_init(&src_ids, src_pool, SRC_ID_INIT_SIZE);
 }
 
 HASH_DEFINE_REHASH_FN(RSH, struct rte_src)
@@ -137,7 +144,7 @@ rt_get_source_o(struct rte_owner *p, u32 id)
     return src;
   }
 
-  RTA_LOCK;
+  SRC_LOCK;
   src = sl_allocz(rte_src_slab);
   src->owner = p;
   src->private_id = id;
@@ -146,12 +153,12 @@ rt_get_source_o(struct rte_owner *p, u32 id)
   atomic_store_explicit(&src->uc, 1, memory_order_release);
   p->uc++;
 
-  HASH_INSERT2(p->hash, RSH, rta_pool, src);
+  HASH_INSERT2(p->hash, RSH, src_pool, src);
   if (config->table_debug)
     log(L_TRACE "Allocated new rte_src for %s, ID %uL %uG, have %u sources now",
 	p->name, src->private_id, src->global_id, p->uc);
 
-  RTA_UNLOCK;
+  SRC_UNLOCK;
 
   return src;
 }
@@ -182,21 +189,21 @@ rt_prune_sources(void *data)
 
       HASH_DO_REMOVE(o->hash, RSH, sp);
 
-      RTA_LOCK;
+      SRC_LOCK;
       idm_free(&src_ids, src->global_id);
       sl_free(rte_src_slab, src);
-      RTA_UNLOCK;
+      SRC_UNLOCK;
     }
   }
   HASH_WALK_FILTER_END;
 
-  RTA_LOCK;
-  HASH_MAY_RESIZE_DOWN(o->hash, RSH, rta_pool);
+  SRC_LOCK;
+  HASH_MAY_RESIZE_DOWN(o->hash, RSH, src_pool);
 
   if (o->stop && !o->uc)
   {
     rfree(o->prune);
-    RTA_UNLOCK;
+    SRC_UNLOCK;
 
     if (config->table_debug)
       log(L_TRACE "All rte_src's for %s pruned, scheduling stop event", o->name);
@@ -204,21 +211,21 @@ rt_prune_sources(void *data)
     rt_done_sources(o);
   }
   else
-    RTA_UNLOCK;
+    SRC_UNLOCK;
 }
 
 void
 rt_init_sources(struct rte_owner *o, const char *name, event_list *list)
 {
-  RTA_LOCK;
-  HASH_INIT(o->hash, rta_pool, RSH_INIT_ORDER);
+  SRC_LOCK;
+  HASH_INIT(o->hash, src_pool, RSH_INIT_ORDER);
   o->hash_key = random_u32();
   o->uc = 0;
   o->name = name;
-  o->prune = ev_new_init(rta_pool, rt_prune_sources, o);
+  o->prune = ev_new_init(src_pool, rt_prune_sources, o);
   o->stop = NULL;
   o->list = list;
-  RTA_UNLOCK;
+  SRC_UNLOCK;
 }
 
 void
@@ -231,9 +238,9 @@ rt_destroy_sources(struct rte_owner *o, event *done)
     if (config->table_debug)
       log(L_TRACE "Source owner %s destroy requested. All rte_src's already pruned, scheduling stop event", o->name);
 
-    RTA_LOCK;
+    SRC_LOCK;
     rfree(o->prune);
-    RTA_UNLOCK;
+    SRC_UNLOCK;
 
     rt_done_sources(o);
   }

From 20ace7f2e61bc6881e4ea22c63f0d0eb9a1dd1a2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 16 Nov 2021 21:14:24 +0000
Subject: [PATCH 037/431] RPKI: Use the route refresh mechanism also for the
 first load

---
 proto/rpki/packets.c | 25 ++-----------------------
 proto/rpki/rpki.c    | 25 +++++++++++++++++++++++++
 proto/rpki/rpki.h    |  2 ++
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 38830d28..abe6abfc 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -658,21 +658,7 @@ rpki_handle_cache_response_pdu(struct rpki_cache *cache, const struct pdu_cache_
 {
   if (cache->request_session_id)
   {
-    if (cache->last_update)
-    {
-      /*
-       * This isn't the first sync and we already received records. This point
-       * is after Reset Query and before importing new records from cache
-       * server. We need to load new ones and kick out missing ones.  So start
-       * a refresh cycle.
-       */
-      if (cache->p->roa4_channel)
-	rt_refresh_begin(&cache->p->roa4_channel->in_req);
-      if (cache->p->roa6_channel)
-	rt_refresh_begin(&cache->p->roa6_channel->in_req);
-
-      cache->p->refresh_channels = 1;
-    }
+    rpki_start_refresh(cache->p);
     cache->session_id = pdu->session_id;
     cache->request_session_id = 0;
   }
@@ -821,14 +807,7 @@ rpki_handle_end_of_data_pdu(struct rpki_cache *cache, const struct pdu_end_of_da
 		(cf->keep_expire_interval ? "keeps " : ""),  cache->expire_interval);
   }
 
-  if (cache->p->refresh_channels)
-  {
-    cache->p->refresh_channels = 0;
-    if (cache->p->roa4_channel)
-      rt_refresh_end(&cache->p->roa4_channel->in_req);
-    if (cache->p->roa6_channel)
-      rt_refresh_end(&cache->p->roa6_channel->in_req);
-  }
+  rpki_stop_refresh(cache->p);
 
   cache->last_update = current_time();
   cache->serial_num = pdu->serial_num;
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 95066499..e3fccb48 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -139,6 +139,30 @@ rpki_table_remove_roa(struct rpki_cache *cache, struct channel *channel, const n
   rte_update(channel, &pfxr->n, NULL, p->p.main_source);
 }
 
+void
+rpki_start_refresh(struct rpki_proto *p)
+{
+  if (p->roa4_channel)
+    rt_refresh_begin(&p->roa4_channel->in_req);
+  if (p->roa6_channel)
+    rt_refresh_begin(&p->roa6_channel->in_req);
+
+  p->refresh_channels = 1;
+}
+
+void
+rpki_stop_refresh(struct rpki_proto *p)
+{
+  if (!p->refresh_channels)
+    return;
+
+  p->refresh_channels = 0;
+
+  if (p->roa4_channel)
+    rt_refresh_end(&p->roa4_channel->in_req);
+  if (p->roa6_channel)
+    rt_refresh_end(&p->roa6_channel->in_req);
+}
 
 /*
  *	RPKI Protocol Logic
@@ -626,6 +650,7 @@ rpki_close_connection(struct rpki_cache *cache)
 {
   CACHE_TRACE(D_EVENTS, cache, "Closing a connection");
   rpki_tr_close(cache->tr_sock);
+  rpki_stop_refresh(cache->p);
   proto_notify_state(&cache->p->p, PS_START);
 }
 
diff --git a/proto/rpki/rpki.h b/proto/rpki/rpki.h
index 8a5c38fd..a70a2027 100644
--- a/proto/rpki/rpki.h
+++ b/proto/rpki/rpki.h
@@ -83,6 +83,8 @@ const char *rpki_cache_state_to_str(enum rpki_cache_state state);
 void rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_addr_union *pfxr);
 void rpki_table_remove_roa(struct rpki_cache *cache, struct channel *channel, const net_addr_union *pfxr);
 
+void rpki_start_refresh(struct rpki_proto *p);
+void rpki_stop_refresh(struct rpki_proto *p);
 
 /*
  *	RPKI Protocol Logic

From f0507f05ce57398e135651896dace4cb68eeed54 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Sep 2021 16:40:28 +0200
Subject: [PATCH 038/431] Route sources have an explicit owner

This commit prevents use-after-free of routes belonging to protocols
which have been already destroyed, delaying also all the protocols'
shutdown until all of their routes have been finally propagated through
all the pipes down to the appropriate exports.

The use-after-free was somehow hypothetic yet theoretically possible in
rare conditions, when one BGP protocol authors a lot of routes and the
user deletes that protocol by reconfiguring in the same time as next hop
update is requested, causing rte_better() to be called on a
not-yet-pruned network prefix while the owner protocol has been already
freed.

In parallel execution environments, this would happen an inter-thread
use-after-free, causing possible heisenbugs or other nasty problems.
---
 filter/f-inst.c       |   5 +-
 lib/locking.h         |   1 +
 nest/proto.c          |  12 +++-
 nest/protocol.h       |   4 +-
 nest/route.h          |  62 ++++++++++++++++++---
 nest/rt-attr.c        | 125 ++++++++++++++++++++++++++++++++++--------
 nest/rt-dev.c         |   2 +
 nest/rt-show.c        |   6 +-
 nest/rt-table.c       |  37 +++++--------
 proto/babel/babel.c   |  16 ++++--
 proto/bgp/attrs.c     |  20 +++----
 proto/bgp/bgp.c       |  15 +++--
 proto/bgp/bgp.h       |   7 +++
 proto/bgp/packets.c   |   5 ++
 proto/mrt/mrt.c       |   4 +-
 proto/ospf/ospf.c     |  13 +++--
 proto/ospf/ospf.h     |   2 +
 proto/pipe/pipe.c     |   2 +-
 proto/rip/rip.c       |  25 +++++++--
 proto/static/static.c |  27 +++++++--
 sysdep/unix/krt.c     |   5 +-
 21 files changed, 290 insertions(+), 105 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 00e22383..706eb684 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -526,7 +526,7 @@
       case SA_FROM:	RESULT(sa.f_type, ip, rta->from); break;
       case SA_GW:	RESULT(sa.f_type, ip, rta->nh.gw); break;
       case SA_NET:	RESULT(sa.f_type, net, fs->rte->net); break;
-      case SA_PROTO:	RESULT(sa.f_type, s, fs->rte->src->proto->name); break;
+      case SA_PROTO:	RESULT(sa.f_type, s, fs->rte->src->owner->name); break;
       case SA_SOURCE:	RESULT(sa.f_type, i, rta->source); break;
       case SA_SCOPE:	RESULT(sa.f_type, i, rta->scope); break;
       case SA_DEST:	RESULT(sa.f_type, i, rta->dest); break;
@@ -562,7 +562,8 @@
 	{
 	  ip_addr ip = v1.val.ip;
 	  struct iface *ifa = ipa_is_link_local(ip) ? rta->nh.iface : NULL;
-	  neighbor *n = neigh_find(fs->rte->src->proto, ip, ifa, 0);
+	  /* XXX this code supposes that every owner is a protocol XXX */
+	  neighbor *n = neigh_find(SKIP_BACK(struct proto, sources, fs->rte->src->owner), ip, ifa, 0);
 	  if (!n || (n->scope == SCOPE_HOST))
 	    runtime( "Invalid gw address" );
 
diff --git a/lib/locking.h b/lib/locking.h
index 0cbdead8..0a69f50f 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,6 +16,7 @@ struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
   struct domain_generic *rtable;
+  struct domain_generic *attrs;
   struct domain_generic *cork;
   struct domain_generic *event;
 };
diff --git a/nest/proto.c b/nest/proto.c
index f8e1ba31..930fad1d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -2329,10 +2329,17 @@ channel_reset_limit(struct channel *c, struct limit *l, int dir)
   c->limit_active &= ~(1 << dir);
 }
 
+static struct rte_owner_class default_rte_owner_class;
+
 static inline void
 proto_do_start(struct proto *p)
 {
   p->active = 1;
+
+  rt_init_sources(&p->sources, p->name, proto_event_list(p));
+  if (!p->sources.class)
+    p->sources.class = &default_rte_owner_class;
+
   if (!p->cf->late_if_feed)
     if_feed_baby(p);
 }
@@ -2341,10 +2348,8 @@ static void
 proto_do_up(struct proto *p)
 {
   if (!p->main_source)
-  {
     p->main_source = rt_get_source(p, 0);
-    rt_lock_source(p->main_source);
-  }
+    // Locked automaticaly
 
   proto_start_channels(p);
 
@@ -2371,6 +2376,7 @@ proto_do_stop(struct proto *p)
   }
 
   proto_stop_channels(p);
+  rt_destroy_sources(&p->sources, p->event);
 
   p->do_stop = 1;
   proto_send_event(p);
diff --git a/nest/protocol.h b/nest/protocol.h
index 981ca96a..440297a1 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -78,7 +78,6 @@ struct protocol {
   int (*start)(struct proto *);			/* Start the instance */
   int (*shutdown)(struct proto *);		/* Stop the instance */
   void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */
-  void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */
   int (*get_attr)(const struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */
   void (*show_proto_info)(struct proto *);	/* Show protocol info (for `show protocols all' command) */
   void (*copy_config)(struct proto_config *, struct proto_config *);	/* Copy config from given protocol instance */
@@ -146,6 +145,7 @@ struct proto {
   list channels;			/* List of channels to rtables (struct channel) */
   struct channel *main_channel;		/* Primary channel */
   struct rte_src *main_source;		/* Primary route source */
+  struct rte_owner sources;		/* Route source owner structure */
   struct iface *vrf;			/* Related VRF instance, NULL if global */
 
   const char *name;				/* Name of this instance (== cf->name) */
@@ -360,7 +360,7 @@ void proto_notify_state(struct proto *p, unsigned state);
  */
 
 static inline int proto_is_inactive(struct proto *p)
-{ return (p->active_channels == 0) && (p->active_coroutines == 0); }
+{ return (p->active_channels == 0) && (p->active_coroutines == 0) && (p->sources.uc == 0); }
 
 
 /*
diff --git a/nest/route.h b/nest/route.h
index 310cea92..a01eff1a 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -15,6 +15,8 @@
 #include "lib/bitmap.h"
 #include "lib/resource.h"
 #include "lib/net.h"
+#include "lib/hash.h"
+#include "lib/event.h"
 
 #include <stdatomic.h>
 
@@ -579,10 +581,10 @@ struct nexthop {
 
 struct rte_src {
   struct rte_src *next;			/* Hash chain */
-  struct proto *proto;			/* Protocol the source is based on */
+  struct rte_owner *owner;		/* Route source owner */
   u32 private_id;			/* Private ID, assigned by the protocol */
   u32 global_id;			/* Globally unique ID of the source */
-  unsigned uc;				/* Use count */
+  _Atomic u64 uc;			/* Use count */
 };
 
 
@@ -720,11 +722,57 @@ typedef struct ea_list {
 #define EALF_BISECT 2			/* Use interval bisection for searching */
 #define EALF_CACHED 4			/* Attributes belonging to cached rta */
 
-struct rte_src *rt_find_source(struct proto *p, u32 id);
-struct rte_src *rt_get_source(struct proto *p, u32 id);
-static inline void rt_lock_source(struct rte_src *src) { src->uc++; }
-static inline void rt_unlock_source(struct rte_src *src) { src->uc--; }
-void rt_prune_sources(void);
+struct rte_owner_class {
+  void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */
+  int (*rte_better)(struct rte *, struct rte *);
+  int (*rte_mergable)(struct rte *, struct rte *);
+  u32 (*rte_igp_metric)(struct rte *);
+};
+
+struct rte_owner {
+  struct rte_owner_class *class;
+  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  HASH(struct rte_src) hash;
+  const char *name;
+  u32 hash_key;
+  u32 uc;
+  event_list *list;
+  event *prune;
+  event *stop;
+};
+
+DEFINE_DOMAIN(attrs);
+extern DOMAIN(attrs) attrs_domain;
+
+#define RTA_LOCK	LOCK_DOMAIN(attrs, attrs_domain)
+#define RTA_UNLOCK	UNLOCK_DOMAIN(attrs, attrs_domain)
+
+#define RTE_SRC_PU_SHIFT      44
+#define RTE_SRC_IN_PROGRESS   (1ULL << RTE_SRC_PU_SHIFT)
+
+struct rte_src *rt_get_source_o(struct rte_owner *o, u32 id);
+#define rt_get_source(p, id)  rt_get_source_o(&(p)->sources, (id))
+static inline void rt_lock_source(struct rte_src *src)
+{
+  u64 uc = atomic_fetch_add_explicit(&src->uc, 1, memory_order_acq_rel);
+  ASSERT_DIE(uc > 0);
+}
+
+static inline void rt_unlock_source(struct rte_src *src)
+{
+  u64 uc = atomic_fetch_add_explicit(&src->uc, RTE_SRC_IN_PROGRESS, memory_order_acq_rel);
+  u64 pending = uc >> RTE_SRC_PU_SHIFT;
+  uc &= RTE_SRC_IN_PROGRESS - 1;
+
+  ASSERT_DIE(uc > pending);
+  if (uc == pending + 1)
+    ev_send(src->owner->list, src->owner->prune);
+
+  atomic_fetch_sub_explicit(&src->uc, RTE_SRC_IN_PROGRESS + 1, memory_order_acq_rel);
+}
+
+void rt_init_sources(struct rte_owner *, const char *name, event_list *list);
+void rt_destroy_sources(struct rte_owner *, event *);
 
 struct ea_walk_state {
   ea_list *eattrs;			/* Ccurrent ea_list, initially set by caller */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 77fd3c3b..f7e33d72 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -85,6 +85,8 @@ const char * rta_dest_names[RTD_MAX] = {
   [RTD_PROHIBIT]	= "prohibited",
 };
 
+DOMAIN(attrs) attrs_domain;
+
 pool *rta_pool;
 
 static slab *rta_slab_[4];
@@ -96,16 +98,14 @@ static struct idm src_ids;
 
 /* rte source hash */
 
-#define RSH_KEY(n)		n->proto, n->private_id
+#define RSH_KEY(n)		n->private_id
 #define RSH_NEXT(n)		n->next
-#define RSH_EQ(p1,n1,p2,n2)	p1 == p2 && n1 == n2
-#define RSH_FN(p,n)		p->hash_key ^ u32_hash(n)
+#define RSH_EQ(n1,n2)		n1 == n2
+#define RSH_FN(n)		u32_hash(n)
 
 #define RSH_REHASH		rte_src_rehash
 #define RSH_PARAMS		/2, *2, 1, 1, 8, 20
-#define RSH_INIT_ORDER		6
-
-static HASH(struct rte_src) src_hash;
+#define RSH_INIT_ORDER		2
 
 static void
 rte_src_init(void)
@@ -113,55 +113,134 @@ rte_src_init(void)
   rte_src_slab = sl_new(rta_pool, sizeof(struct rte_src));
 
   idm_init(&src_ids, rta_pool, SRC_ID_INIT_SIZE);
-
-  HASH_INIT(src_hash, rta_pool, RSH_INIT_ORDER);
 }
 
-
 HASH_DEFINE_REHASH_FN(RSH, struct rte_src)
 
-struct rte_src *
-rt_find_source(struct proto *p, u32 id)
+static struct rte_src *
+rt_find_source(struct rte_owner *p, u32 id)
 {
-  return HASH_FIND(src_hash, RSH, p, id);
+  return HASH_FIND(p->hash, RSH, id);
 }
 
 struct rte_src *
-rt_get_source(struct proto *p, u32 id)
+rt_get_source_o(struct rte_owner *p, u32 id)
 {
+  if (p->stop)
+    bug("Stopping route owner asked for another source.");
+
   struct rte_src *src = rt_find_source(p, id);
 
   if (src)
+  {
+    UNUSED u64 uc = atomic_fetch_add_explicit(&src->uc, 1, memory_order_acq_rel);
     return src;
+  }
 
+  RTA_LOCK;
   src = sl_allocz(rte_src_slab);
-  src->proto = p;
+  src->owner = p;
   src->private_id = id;
   src->global_id = idm_alloc(&src_ids);
-  src->uc = 0;
 
-  HASH_INSERT2(src_hash, RSH, rta_pool, src);
+  atomic_store_explicit(&src->uc, 1, memory_order_release);
+  p->uc++;
+
+  HASH_INSERT2(p->hash, RSH, rta_pool, src);
+  if (config->table_debug)
+    log(L_TRACE "Allocated new rte_src for %s, ID %uL %uG, have %u sources now",
+	p->name, src->private_id, src->global_id, p->uc);
+
+  RTA_UNLOCK;
 
   return src;
 }
 
-void
-rt_prune_sources(void)
+static inline void
+rt_done_sources(struct rte_owner *o)
 {
-  HASH_WALK_FILTER(src_hash, next, src, sp)
+  if (o->stop->list)
+    ev_send(o->stop->list, o->stop);
+  else
+    ev_send(o->list, o->stop);
+}
+
+void
+rt_prune_sources(void *data)
+{
+  struct rte_owner *o = data;
+
+  HASH_WALK_FILTER(o->hash, next, src, sp)
   {
-    if (src->uc == 0)
+    u64 uc;
+    while ((uc = atomic_load_explicit(&src->uc, memory_order_acquire)) >> RTE_SRC_PU_SHIFT)
+      ;
+
+    if (uc == 0)
     {
-      HASH_DO_REMOVE(src_hash, RSH, sp);
+      o->uc--;
+
+      HASH_DO_REMOVE(o->hash, RSH, sp);
+
+      RTA_LOCK;
       idm_free(&src_ids, src->global_id);
       sl_free(rte_src_slab, src);
+      RTA_UNLOCK;
     }
   }
   HASH_WALK_FILTER_END;
 
-  HASH_MAY_RESIZE_DOWN(src_hash, RSH, rta_pool);
+  RTA_LOCK;
+  HASH_MAY_RESIZE_DOWN(o->hash, RSH, rta_pool);
+
+  if (o->stop && !o->uc)
+  {
+    rfree(o->prune);
+    RTA_UNLOCK;
+
+    if (config->table_debug)
+      log(L_TRACE "All rte_src's for %s pruned, scheduling stop event", o->name);
+
+    rt_done_sources(o);
+  }
+  else
+    RTA_UNLOCK;
 }
 
+void
+rt_init_sources(struct rte_owner *o, const char *name, event_list *list)
+{
+  RTA_LOCK;
+  HASH_INIT(o->hash, rta_pool, RSH_INIT_ORDER);
+  o->hash_key = random_u32();
+  o->uc = 0;
+  o->name = name;
+  o->prune = ev_new_init(rta_pool, rt_prune_sources, o);
+  o->stop = NULL;
+  o->list = list;
+  RTA_UNLOCK;
+}
+
+void
+rt_destroy_sources(struct rte_owner *o, event *done)
+{
+  o->stop = done;
+
+  if (!o->uc)
+  {
+    if (config->table_debug)
+      log(L_TRACE "Source owner %s destroy requested. All rte_src's already pruned, scheduling stop event", o->name);
+
+    RTA_LOCK;
+    rfree(o->prune);
+    RTA_UNLOCK;
+
+    rt_done_sources(o);
+  }
+  else
+    if (config->table_debug)
+      log(L_TRACE "Source owner %s destroy requested. Remaining %u rte_src's to prune.", o->name, o->uc);
+}
 
 /*
  *	Multipath Next Hop
@@ -1328,6 +1407,8 @@ rta_show(struct cli *c, rta *a)
 void
 rta_init(void)
 {
+  attrs_domain = DOMAIN_NEW(attrs, "Attributes");
+
   rta_pool = rp_new(&root_pool, "Attributes");
 
   rta_slab_[0] = sl_new(rta_pool, sizeof(rta));
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 5d1e57b3..c1251675 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -68,6 +68,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       /* Use iface ID as local source ID */
       struct rte_src *src = rt_get_source(P, ad->iface->index);
       rte_update(c, net, NULL, src);
+      rt_unlock_source(src);
     }
   else if (flags & IF_CHANGE_UP)
     {
@@ -93,6 +94,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       };
 
       rte_update(c, net, &e0, src);
+      rt_unlock_source(src);
     }
 }
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index d942b8e1..8196903d 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -56,7 +56,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   if (d->verbose && !rta_is_cached(a) && a->eattrs)
     ea_normalize(a->eattrs);
 
-  get_route_info = e->src->proto->proto->get_route_info;
+  get_route_info = e->src->owner->class ? e->src->owner->class->get_route_info : NULL;
   if (get_route_info)
     get_route_info(e, info);
   else
@@ -66,7 +66,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     rt_show_table(c, d);
 
   cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest),
-	     e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
+	     e->src->owner->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
   if (a->dest == RTD_UNICAST)
     for (nh = &(a->nh); nh; nh = nh->next)
@@ -211,7 +211,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	    }
 	}
 
-      if (d->show_protocol && (d->show_protocol != e.src->proto))
+      if (d->show_protocol && (&d->show_protocol->sources != e.src->owner))
 	goto skip;
 
       if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b4cd0448..c67f5bf8 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -367,16 +367,16 @@ rte_better(rte *new, rte *old)
     return 1;
   if (new->attrs->pref < old->attrs->pref)
     return 0;
-  if (new->src->proto->proto != old->src->proto->proto)
+  if (new->src->owner->class != old->src->owner->class)
     {
       /*
        *  If the user has configured protocol preferences, so that two different protocols
        *  have the same preference, try to break the tie by comparing addresses. Not too
        *  useful, but keeps the ordering of routes unambiguous.
        */
-      return new->src->proto->proto > old->src->proto->proto;
+      return new->src->owner->class > old->src->owner->class;
     }
-  if (better = new->src->proto->rte_better)
+  if (better = new->src->owner->class->rte_better)
     return better(new, old);
   return 0;
 }
@@ -392,10 +392,10 @@ rte_mergable(rte *pri, rte *sec)
   if (pri->attrs->pref != sec->attrs->pref)
     return 0;
 
-  if (pri->src->proto->proto != sec->src->proto->proto)
+  if (pri->src->owner->class != sec->src->owner->class)
     return 0;
 
-  if (mergable = pri->src->proto->rte_mergable)
+  if (mergable = pri->src->owner->class->rte_mergable)
     return mergable(pri, sec);
 
   return 0;
@@ -1269,10 +1269,10 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	{
 	  if (!old->generation && !new->generation)
 	    bug("Two protocols claim to author a route with the same rte_src in table %s: %N %s/%u:%u",
-		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
+		c->table->name, net->n.addr, old->src->owner->name, old->src->private_id, old->src->global_id);
 
 	  log_rl(&table->rl_pipe, L_ERR "Route source collision in table %s: %N %s/%u:%u",
-		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
+		c->table->name, net->n.addr, old->src->owner->name, old->src->private_id, old->src->global_id);
 	}
 
 	  if (new && rte_same(old, new))
@@ -1341,8 +1341,8 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
       /* If routes are not sorted, find the best route and move it on
 	 the first position. There are several optimized cases. */
 
-      if (src->proto->rte_recalculate &&
-	  src->proto->rte_recalculate(table, net, new_stored ? &new_stored->rte : NULL, old, old_best))
+      if (src->owner->rte_recalculate &&
+	  src->owner->rte_recalculate(table, net, new_stored ? &new_stored->rte : NULL, old, old_best))
 	goto do_recalculate;
 
       if (new_stored && rte_better(&new_stored->rte, old_best))
@@ -2237,8 +2237,6 @@ again:
   /* state change 2->0, 3->1 */
   tab->prune_state &= 1;
 
-  rt_prune_sources();
-
   uint flushed_channels = 0;
 
   /* Close flushed channels */
@@ -2409,7 +2407,6 @@ rt_export_cleanup(void *data)
 
 done:;
   struct rt_import_hook *ih; node *x;
-  _Bool imports_stopped = 0;
   WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
     if (ih->import_state == TIS_WAITING)
       if (!first_export || (first_export->seq >= ih->flush_seq))
@@ -2419,16 +2416,8 @@ done:;
 	rem_node(&ih->n);
 	mb_free(ih);
 	rt_unlock_table(tab);
-	imports_stopped = 1;
       }
 
-  if (imports_stopped)
-  {
-    if (config->table_debug)
-      log(L_TRACE "%s: Sources pruning routine requested", tab->name);
-
-    rt_prune_sources();
-  }
 
   if (EMPTY_LIST(tab->pending_exports) && tm_active(tab->export_timer))
     tm_stop(tab->export_timer);
@@ -2610,8 +2599,8 @@ rt_next_hop_update_net(rtable *tab, net *n)
 
 	/* Call a pre-comparison hook */
 	/* Not really an efficient way to compute this */
-	if (e->rte.src->proto->rte_recalculate)
-	  e->rte.src->proto->rte_recalculate(tab, n, &new->rte, &e->rte, &old_best->rte);
+	if (e->rte.src->owner->rte_recalculate)
+	  e->rte.src->owner->rte_recalculate(tab, n, &new->rte, &e->rte, &old_best->rte);
 
 	updates[pos++] = (struct rte_multiupdate) {
 	  .old = e,
@@ -3083,8 +3072,8 @@ rt_get_igp_metric(rte *rt)
   if (rt->attrs->source == RTS_DEVICE)
     return 0;
 
-  if (rt->src->proto->rte_igp_metric)
-    return rt->src->proto->rte_igp_metric(rt);
+  if (rt->src->owner->class->rte_igp_metric)
+    return rt->src->owner->class->rte_igp_metric(rt);
 
   return IGP_METRIC_UNKNOWN;
 }
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 03c85b7d..40e85a16 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2264,7 +2264,7 @@ babel_preexport(struct channel *c, struct rte *new)
 {
   struct rta *a = new->attrs;
   /* Reject our own unreachable routes */
-  if ((a->dest == RTD_UNREACHABLE) && (new->src->proto == c->proto))
+  if ((a->dest == RTD_UNREACHABLE) && (new->src->owner == &c->proto->sources))
     return -1;
 
   return 0;
@@ -2288,7 +2288,7 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
     uint rt_metric = ea_get_int(new->attrs->eattrs, EA_BABEL_METRIC, 0);
     u64 rt_router_id = 0;
 
-    if (new->src->proto == P)
+    if (new->src->owner == &P->sources)
     {
       rt_seqno = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data;
       eattr *e = ea_find(new->attrs->eattrs, EA_BABEL_ROUTER_ID);
@@ -2372,6 +2372,12 @@ babel_postconfig(struct proto_config *CF)
   cf->ip6_channel = ip6 ?: ip6_sadr;
 }
 
+static struct rte_owner_class babel_rte_owner_class = {
+  .get_route_info =	babel_get_route_info,
+  .rte_better =		babel_rte_better,
+  .rte_igp_metric =	babel_rte_igp_metric,
+};
+
 static struct proto *
 babel_init(struct proto_config *CF)
 {
@@ -2385,8 +2391,8 @@ babel_init(struct proto_config *CF)
   P->if_notify = babel_if_notify;
   P->rt_notify = babel_rt_notify;
   P->preexport = babel_preexport;
-  P->rte_better = babel_rte_better;
-  P->rte_igp_metric = babel_rte_igp_metric;
+
+  P->sources.class = &babel_rte_owner_class;
 
   return P;
 }
@@ -2479,7 +2485,6 @@ babel_reconfigure(struct proto *P, struct proto_config *CF)
   return 1;
 }
 
-
 struct protocol proto_babel = {
   .name =		"Babel",
   .template =		"babel%d",
@@ -2494,6 +2499,5 @@ struct protocol proto_babel = {
   .start =		babel_start,
   .shutdown =		babel_shutdown,
   .reconfigure =	babel_reconfigure,
-  .get_route_info =	babel_get_route_info,
   .get_attr =		babel_get_attr
 };
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 892b26e3..9b9013f9 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1670,9 +1670,8 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
 int
 bgp_preexport(struct channel *c, rte *e)
 {
-  struct proto *SRC = e->src->proto;
   struct bgp_proto *p = (struct bgp_proto *) (c->proto);
-  struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
+  struct bgp_proto *src = bgp_rte_proto(e);
 
   /* Reject our routes */
   if (src == p)
@@ -1725,8 +1724,7 @@ bgp_preexport(struct channel *c, rte *e)
 static ea_list *
 bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *attrs0, struct linpool *pool)
 {
-  struct proto *SRC = e->src->proto;
-  struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (void *) SRC : NULL;
+  struct bgp_proto *src = bgp_rte_proto(e);
   struct bgp_export_state s = { .proto = p, .channel = c, .pool = pool, .src = src, .route = e, .mpls = c->desc->mpls };
   ea_list *attrs = attrs0;
   eattr *a;
@@ -1880,7 +1878,7 @@ bgp_get_neighbor(rte *r)
     return as;
 
   /* If AS_PATH is not defined, we treat rte as locally originated */
-  struct bgp_proto *p = (void *) r->src->proto;
+  struct bgp_proto *p = bgp_rte_proto(r);
   return p->cf->confederation ?: p->local_as;
 }
 
@@ -1910,8 +1908,8 @@ rte_stale(rte *r)
 int
 bgp_rte_better(rte *new, rte *old)
 {
-  struct bgp_proto *new_bgp = (struct bgp_proto *) new->src->proto;
-  struct bgp_proto *old_bgp = (struct bgp_proto *) old->src->proto;
+  struct bgp_proto *new_bgp = bgp_rte_proto(new);
+  struct bgp_proto *old_bgp = bgp_rte_proto(old);
   eattr *x, *y;
   u32 n, o;
 
@@ -2055,8 +2053,8 @@ bgp_rte_better(rte *new, rte *old)
 int
 bgp_rte_mergable(rte *pri, rte *sec)
 {
-  struct bgp_proto *pri_bgp = (struct bgp_proto *) pri->src->proto;
-  struct bgp_proto *sec_bgp = (struct bgp_proto *) sec->src->proto;
+  struct bgp_proto *pri_bgp = bgp_rte_proto(pri);
+  struct bgp_proto *sec_bgp = bgp_rte_proto(sec);
   eattr *x, *y;
   u32 p, s;
 
@@ -2137,8 +2135,8 @@ same_group(rte *r, u32 lpref, u32 lasn)
 static inline int
 use_deterministic_med(struct rte_storage *r)
 {
-  struct proto *P = r->rte.src->proto;
-  return (P->proto == &proto_bgp) && ((struct bgp_proto *) P)->cf->deterministic_med;
+  struct bgp_proto *p = bgp_rte_proto(&r->rte);
+  return p && p->cf->deterministic_med;
 }
 
 int
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5f2e7dfd..dc845550 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1726,6 +1726,13 @@ done:
   return p->p.proto_state;
 }
 
+struct rte_owner_class bgp_rte_owner_class = {
+  .get_route_info = 	bgp_get_route_info,
+  .rte_better =		bgp_rte_better,
+  .rte_mergable =	bgp_rte_mergable,
+  .rte_igp_metric =	bgp_rte_igp_metric,
+};
+
 static struct proto *
 bgp_init(struct proto_config *CF)
 {
@@ -1739,10 +1746,9 @@ bgp_init(struct proto_config *CF)
   P->reload_routes = bgp_reload_routes;
   P->feed_begin = bgp_feed_begin;
   P->feed_end = bgp_feed_end;
-  P->rte_better = bgp_rte_better;
-  P->rte_mergable = bgp_rte_mergable;
-  P->rte_recalculate = cf->deterministic_med ? bgp_rte_recalculate : NULL;
-  P->rte_igp_metric = bgp_rte_igp_metric;
+
+  P->sources.class = &bgp_rte_owner_class;
+  P->sources.rte_recalculate = cf->deterministic_med ? bgp_rte_recalculate : NULL;
 
   p->cf = cf;
   p->is_internal = (cf->local_as == cf->remote_as);
@@ -2605,6 +2611,5 @@ struct protocol proto_bgp = {
   .copy_config = 	bgp_copy_config,
   .get_status = 	bgp_get_status,
   .get_attr = 		bgp_get_attr,
-  .get_route_info = 	bgp_get_route_info,
   .show_proto_info = 	bgp_show_proto_info
 };
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 342dc023..7cb4df1f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -523,6 +523,7 @@ rta_resolvable(rta *a)
   return a->dest == RTD_UNICAST;
 }
 
+extern struct rte_owner_class bgp_rte_owner_class;
 
 #ifdef LOCAL_DEBUG
 #define BGP_FORCE_DEBUG 1
@@ -594,6 +595,12 @@ int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
 void bgp_get_route_info(struct rte *, byte *);
 int bgp_total_aigp_metric_(rta *a, u64 *metric, const struct adata **ad);
 
+static inline struct bgp_proto *bgp_rte_proto(struct rte *rte)
+{
+  return (rte->src->owner->class == &bgp_rte_owner_class) ?
+    SKIP_BACK(struct bgp_proto, p.sources, rte->src->owner) : NULL;
+}
+
 #define BGP_AIGP_METRIC		1
 #define BGP_AIGP_MAX		U64(0xffffffffffffffff)
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 647551e5..d2d5b174 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1339,6 +1339,8 @@ bgp_rte_update(struct bgp_parse_state *s, net_addr *n, u32 path_id, rta *a0)
 {
   if (path_id != s->last_id)
   {
+    rt_unlock_source(s->last_src);
+
     s->last_src = rt_get_source(&s->proto->p, path_id);
     s->last_id = path_id;
 
@@ -2421,6 +2423,7 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
 
   s->last_id = 0;
   s->last_src = s->proto->p.main_source;
+  rt_lock_source(s->last_src);
 
   /*
    * IPv4 BGP and MP-BGP may be used together in one update, therefore we do not
@@ -2451,6 +2454,8 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
 
   rta_free(s->cached_rta);
   s->cached_rta = NULL;
+
+  rt_unlock_source(s->last_src);
 }
 
 static void
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 5da3c7c6..9d78438d 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -472,9 +472,9 @@ mrt_rib_table_entry(struct mrt_table_dump_state *s, rte *r)
 
 #ifdef CONFIG_BGP
   /* Find peer index */
-  if (r->src->proto->proto == &proto_bgp)
+  struct bgp_proto *p = bgp_rte_proto(r);
+  if (p)
   {
-    struct bgp_proto *p = (void *) r->src->proto;
     struct mrt_peer_entry *n =
       HASH_FIND(s->peer_hash, PEER, p->remote_id, p->remote_as, p->remote_ip);
 
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 22150590..16774df6 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -376,8 +376,8 @@ ospf_init(struct proto_config *CF)
   P->reload_routes = ospf_reload_routes;
   P->feed_begin = ospf_feed_begin;
   P->feed_end = ospf_feed_end;
-  P->rte_better = ospf_rte_better;
-  P->rte_igp_metric = ospf_rte_igp_metric;
+
+  P->sources.class = &ospf_rte_owner_class;
 
   return P;
 }
@@ -488,7 +488,7 @@ ospf_preexport(struct channel *c, rte *e)
   struct ospf_area *oa = ospf_main_area(p);
 
   /* Reject our own routes */
-  if (e->src->proto == c->proto)
+  if (e->sender == c->in_req.hook)
     return -1;
 
   /* Do not export routes to stub areas */
@@ -1517,6 +1517,12 @@ ospf_sh_lsadb(struct lsadb_show_data *ld)
 }
 
 
+struct rte_owner_class ospf_rte_owner_class = {
+  .get_route_info =	ospf_get_route_info,
+  .rte_better =		ospf_rte_better,
+  .rte_igp_metric =	ospf_rte_igp_metric,
+};
+
 struct protocol proto_ospf = {
   .name =		"OSPF",
   .template =		"ospf%d",
@@ -1532,5 +1538,4 @@ struct protocol proto_ospf = {
   .reconfigure =	ospf_reconfigure,
   .get_status =		ospf_get_status,
   .get_attr =		ospf_get_attr,
-  .get_route_info =	ospf_get_route_info
 };
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3e704ae8..a5f83e79 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -1007,6 +1007,8 @@ void ospf_sh_state(struct proto *P, int verbose, int reachable);
 
 void ospf_sh_lsadb(struct lsadb_show_data *ld);
 
+extern struct rte_owner_class ospf_rte_owner_class;
+
 /* iface.c */
 void ospf_iface_chstate(struct ospf_iface *ifa, u8 state);
 void ospf_iface_sm(struct ospf_iface *ifa, int event);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index bbcd8f0d..a30da0e2 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -91,7 +91,7 @@ pipe_preexport(struct channel *c, rte *e)
   {
     log_rl(&p->rl_gen, L_ERR "Route overpiped (%u hops of %u configured in %s) in table %s: %N %s/%u:%u",
 	e->generation, max_generation, c->proto->name,
-	c->table->name, e->net, e->src->proto->name, e->src->private_id, e->src->global_id);
+	c->table->name, e->net, e->src->owner->name, e->src->private_id, e->src->global_id);
 
     return -1;
   }
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 0a9844f3..ee05f058 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -353,7 +353,7 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net, s
     en->valid = RIP_ENTRY_VALID;
     en->metric = rt_metric;
     en->tag = rt_tag;
-    en->from = (new->src->proto == P) ? rt_from : NULL;
+    en->from = (new->src->owner == &P->sources) ? rt_from : NULL;
     en->iface = new->attrs->nh.iface;
     en->next_hop = new->attrs->nh.gw;
   }
@@ -1082,11 +1082,20 @@ rip_reload_routes(struct channel *C)
   rip_kick_timer(p);
 }
 
+static struct rte_owner_class rip_rte_owner_class;
+
+static inline struct rip_proto *
+rip_rte_proto(struct rte *rte)
+{
+  return (rte->src->owner->class == &rip_rte_owner_class) ?
+    SKIP_BACK(struct rip_proto, p.sources, rte->src->owner) : NULL;
+}
+
 static int
 rip_rte_better(struct rte *new, struct rte *old)
 {
   ASSERT_DIE(new->src == old->src);
-  struct rip_proto *p = (struct rip_proto *) new->src->proto;
+  struct rip_proto *p = rip_rte_proto(new);
 
   u32 new_metric = ea_get_int(new->attrs->eattrs, EA_RIP_METRIC, p->infinity);
   u32 old_metric = ea_get_int(old->attrs->eattrs, EA_RIP_METRIC, p->infinity);
@@ -1121,8 +1130,7 @@ rip_init(struct proto_config *CF)
   P->rt_notify = rip_rt_notify;
   P->neigh_notify = rip_neigh_notify;
   P->reload_routes = rip_reload_routes;
-  P->rte_better = rip_rte_better;
-  P->rte_igp_metric = rip_rte_igp_metric;
+  P->sources.class = &rip_rte_owner_class;
 
   return P;
 }
@@ -1197,7 +1205,7 @@ rip_reconfigure(struct proto *P, struct proto_config *CF)
 static void
 rip_get_route_info(rte *rte, byte *buf)
 {
-  struct rip_proto *p = (struct rip_proto *) rte->src->proto;
+  struct rip_proto *p = rip_rte_proto(rte);
   u32 rt_metric = ea_get_int(rte->attrs->eattrs, EA_RIP_METRIC, p->infinity);
   u32 rt_tag = ea_get_int(rte->attrs->eattrs, EA_RIP_TAG, 0);
 
@@ -1324,6 +1332,12 @@ rip_dump(struct proto *P)
 }
 
 
+static struct rte_owner_class rip_rte_owner_class = {
+  .get_route_info =	rip_get_route_info,
+  .rte_better =		rip_rte_better,
+  .rte_igp_metric =	rip_rte_igp_metric,
+};
+
 struct protocol proto_rip = {
   .name =		"RIP",
   .template =		"rip%d",
@@ -1338,6 +1352,5 @@ struct protocol proto_rip = {
   .start =		rip_start,
   .shutdown =		rip_shutdown,
   .reconfigure =	rip_reconfigure,
-  .get_route_info =	rip_get_route_info,
   .get_attr =		rip_get_attr
 };
diff --git a/proto/static/static.c b/proto/static/static.c
index f8ac9c81..b0c9d640 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -52,11 +52,14 @@ static linpool *static_lp;
 static inline struct rte_src * static_get_source(struct static_proto *p, uint i)
 { return i ? rt_get_source(&p->p, i) : p->p.main_source; }
 
+static inline void static_free_source(struct rte_src *src, uint i)
+{ if (i) rt_unlock_source(src); }
+
 static void
 static_announce_rte(struct static_proto *p, struct static_route *r)
 {
+  struct rte_src *src;
   rta *a = allocz(RTA_MAX_SIZE);
-  struct rte_src *src = static_get_source(p, r->index);
   a->source = RTS_STATIC;
   a->scope = SCOPE_UNIVERSE;
   a->dest = r->dest;
@@ -103,6 +106,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     return;
 
   /* We skip rta_lookup() here */
+  src = static_get_source(p, r->index);
   rte e0 = { .attrs = a, .src = src, .net = r->net, }, *e = &e0;
 
   /* Evaluate the filter */
@@ -110,6 +114,8 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     f_eval_rte(r->cmds, e, static_lp);
 
   rte_update(p->p.main_channel, r->net, e, src);
+  static_free_source(src, r->index);
+
   r->state = SRS_CLEAN;
 
   if (r->cmds)
@@ -121,7 +127,9 @@ withdraw:
   if (r->state == SRS_DOWN)
     return;
 
+  src = static_get_source(p, r->index);
   rte_update(p->p.main_channel, r->net, NULL, src);
+  static_free_source(src, r->index);
   r->state = SRS_DOWN;
 }
 
@@ -287,7 +295,11 @@ static void
 static_remove_rte(struct static_proto *p, struct static_route *r)
 {
   if (r->state)
-    rte_update(p->p.main_channel, r->net, NULL, static_get_source(p, r->index));
+  {
+    struct rte_src *src = static_get_source(p, r->index);
+    rte_update(p->p.main_channel, r->net, NULL, src);
+    static_free_source(src, r->index);
+  }
 
   static_reset_rte(p, r);
 }
@@ -444,6 +456,8 @@ static_postconfig(struct proto_config *CF)
   static_index_routes(cf);
 }
 
+static struct rte_owner_class static_rte_owner_class;
+
 static struct proto *
 static_init(struct proto_config *CF)
 {
@@ -455,8 +469,7 @@ static_init(struct proto_config *CF)
 
   P->neigh_notify = static_neigh_notify;
   P->reload_routes = static_reload_routes;
-  P->rte_better = static_rte_better;
-  P->rte_mergable = static_rte_mergable;
+  P->sources.class = &static_rte_owner_class;
 
   if (cf->igp_table_ip4)
     p->igp_table_ip4 = cf->igp_table_ip4->table;
@@ -757,6 +770,11 @@ static_show(struct proto *P)
     static_show_rt(r);
 }
 
+static struct rte_owner_class static_rte_owner_class = {
+  .get_route_info =	static_get_route_info,
+  .rte_better =		static_rte_better,
+  .rte_mergable =	static_rte_mergable,
+};
 
 struct protocol proto_static = {
   .name =		"Static",
@@ -773,5 +791,4 @@ struct protocol proto_static = {
   .shutdown =		static_shutdown,
   .reconfigure =	static_reconfigure,
   .copy_config =	static_copy_config,
-  .get_route_info =	static_get_route_info,
 };
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 609ee921..5431bebe 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -294,8 +294,9 @@ krt_rte_better(rte *a, rte *b)
 static void
 krt_learn_rte(struct krt_proto *p, rte *e)
 {
-  e->src = rt_get_source(&p->p, krt_metric(e));
+  struct rte_src *src = e->src = rt_get_source(&p->p, krt_metric(e));
   rte_update(p->p.main_channel, e->net, e, e->src);
+  rt_unlock_source(src);
 }
 
 static void
@@ -674,7 +675,7 @@ krt_scan_timer_kick(struct krt_proto *p)
 static int
 krt_preexport(struct channel *c, rte *e)
 {
-  if (e->src->proto == c->proto)
+  if (e->src->owner == &c->proto->sources)
     return -1;
 
   if (!krt_capable(e))

From 038fcf1c8b7716415235384de5dc47d07dc45b85 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Sep 2021 17:44:19 +0200
Subject: [PATCH 039/431] Locking route attributes cache

To access route attribute cache from multiple threads at once, we have
to lock the cache on writing. The route attributes data structures are
safe to read unless somebody tries to tamper with the cache itself.
---
 nest/route.h   | 10 +++++-----
 nest/rt-attr.c | 29 +++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index a01eff1a..b327e42a 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -590,7 +590,7 @@ struct rte_src {
 
 typedef struct rta {
   struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
+  _Atomic u32 uc;			/* Use count */
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
@@ -862,15 +862,15 @@ static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a
 #define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
 rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
 static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) { r->uc++; return r; }
+static inline rta *rta_clone(rta *r) { ASSERT_DIE(0 < atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel)); return r; }
 void rta__free(rta *r);
-static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
+static inline void rta_free(rta *r) { if (r && (1 == atomic_fetch_sub_explicit(&r->uc, 1, memory_order_acq_rel))) rta__free(r); }
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
 static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
-void rta_dump(rta *);
+void rta_dump(const rta *);
 void rta_dump_all(void);
-void rta_show(struct cli *, rta *);
+void rta_show(struct cli *, const rta *);
 
 u32 rt_get_igp_metric(rte *);
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index f7e33d72..20f9835d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1281,9 +1281,16 @@ rta_lookup(rta *o)
     ea_normalize(o->eattrs);
 
   h = rta_hash(o);
+
+  RTA_LOCK;
+
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
     if (r->hash_key == h && rta_same(r, o))
-      return rta_clone(r);
+    {
+      atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel);
+      RTA_UNLOCK;
+      return r;
+    }
 
   r = rta_copy(o);
   r->hash_key = h;
@@ -1294,12 +1301,21 @@ rta_lookup(rta *o)
   if (++rta_cache_count > rta_cache_limit)
     rta_rehash();
 
+  RTA_UNLOCK;
   return r;
 }
 
 void
 rta__free(rta *a)
 {
+  RTA_LOCK;
+  if (atomic_load_explicit(&a->uc, memory_order_acquire))
+  {
+    /* Somebody has cloned this rta inbetween. This sometimes happens. */
+    RTA_UNLOCK;
+    return;
+  }
+
   ASSERT(rta_cache_count && a->cached);
   rta_cache_count--;
   *a->pprev = a->next;
@@ -1311,6 +1327,7 @@ rta__free(rta *a)
   ea_free(a->eattrs);
   a->cached = 0;
   sl_free(rta_slab(a), a);
+  RTA_UNLOCK;
 }
 
 rta *
@@ -1335,7 +1352,7 @@ rta_do_cow(rta *o, linpool *lp)
  * This function takes a &rta and dumps its contents to the debug output.
  */
 void
-rta_dump(rta *a)
+rta_dump(const rta *a)
 {
   static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
 			 "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",
@@ -1350,7 +1367,7 @@ rta_dump(rta *a)
     debug(" !CACHED");
   debug(" <-%I", a->from);
   if (a->dest == RTD_UNICAST)
-    for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)
+    for (const struct nexthop *nh = &(a->nh); nh; nh = nh->next)
       {
 	if (ipa_nonzero(nh->gw)) debug(" ->%I", nh->gw);
 	if (nh->labels) debug(" L %d", nh->label[0]);
@@ -1377,6 +1394,8 @@ rta_dump_all(void)
   rta *a;
   uint h;
 
+  RTA_LOCK;
+
   debug("Route attribute cache (%d entries, rehash at %d):\n", rta_cache_count, rta_cache_limit);
   for(h=0; h<rta_cache_size; h++)
     for(a=rta_hash_table[h]; a; a=a->next)
@@ -1386,10 +1405,12 @@ rta_dump_all(void)
 	debug("\n");
       }
   debug("\n");
+
+  RTA_UNLOCK;
 }
 
 void
-rta_show(struct cli *c, rta *a)
+rta_show(struct cli *c, const rta *a)
 {
   cli_printf(c, -1008, "\tType: %s %s", rta_src_names[a->source], ip_scope_text(a->scope));
 

From 18f66055e3f7eec2108e18679652aee47f5de6b2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 29 Sep 2021 17:59:50 +0200
Subject: [PATCH 040/431] Global table update pool removed

---
 nest/proto.c          |   2 +
 nest/protocol.h       |   3 ++
 nest/route.h          |   8 +--
 nest/rt-table.c       | 116 +++++++++++++++++-------------------------
 proto/bgp/packets.c   |   4 +-
 proto/static/static.c |   2 +-
 6 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 930fad1d..f55f347a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -245,6 +245,8 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   channel_init_limit(c, &c->in_limit, PLD_IN, &cf->in_limit);
   channel_init_limit(c, &c->out_limit, PLD_OUT, &cf->out_limit);
 
+  c->rte_update_pool = lp_new_default(proto_pool);
+
   c->net_type = cf->net_type;
   c->ra_mode = cf->ra_mode;
   c->preference = cf->preference;
diff --git a/nest/protocol.h b/nest/protocol.h
index 440297a1..1647fbba 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -509,6 +509,9 @@ struct channel {
   u8 limit_actions[PLD_MAX];		/* Limit actions enum */
   u8 limit_active;			/* Flags for active limits */
 
+  linpool *rte_update_pool;
+  uint rte_update_nest_cnt;
+
   struct channel_import_stats {
     /* Import - from protocol to core */
     u32 updates_received;		/* Number of route updates received */
diff --git a/nest/route.h b/nest/route.h
index b327e42a..e2dc9986 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -197,6 +197,8 @@ typedef struct rtable {
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
 
+  linpool *nhu_lp;			/* Linpool used for NHU */
+
   list subscribers;			/* Subscribers for notifications */
   struct timer *settle_timer;		/* Settle time for notifications */
 
@@ -874,12 +876,12 @@ void rta_show(struct cli *, const rta *);
 
 u32 rt_get_igp_metric(rte *);
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
-void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);
+void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls, linpool *lp);
 
 static inline void
-rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll, mpls_label_stack *mls)
+rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll, mpls_label_stack *mls, linpool *lp)
 {
-  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep), mls);
+  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep), mls, lp);
 }
 
 /*
diff --git a/nest/rt-table.c b/nest/rt-table.c
index c67f5bf8..e307449a 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -49,8 +49,6 @@
 
 pool *rt_table_pool;
 
-static linpool *rte_update_pool;
-
 list routing_tables;
 
 /* Data structures for export journal */
@@ -74,9 +72,6 @@ static void rt_feed_channel(void *);
 static inline void rt_export_used(rtable *tab);
 static void rt_export_cleanup(void *tab);
 
-static inline void rte_update_lock(void);
-static inline void rte_update_unlock(void);
-
 const char *rt_import_state_name_array[TIS_MAX] = {
   [TIS_DOWN] = "DOWN",
   [TIS_UP] = "UP",
@@ -112,6 +107,19 @@ const char *rt_export_state_name(u8 state)
 
 struct event_cork rt_cork;
 
+static inline void
+rte_update_lock(struct channel *c)
+{
+  c->rte_update_nest_cnt++;
+}
+
+static inline void
+rte_update_unlock(struct channel *c)
+{
+  if (!--c->rte_update_nest_cnt)
+    lp_flush(c->rte_update_pool);
+}
+
 /* Like fib_route(), but skips empty net entries */
 static inline void *
 net_route_ip4(rtable *t, net_addr_ip4 *n)
@@ -525,7 +533,7 @@ reject_noset:
 static inline rte *
 export_filter(struct channel *c, rte *rt, int silent)
 {
-  return export_filter_(c, rt, rte_update_pool, silent);
+  return export_filter_(c, rt, c->rte_update_pool, silent);
 }
 
 void do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old);
@@ -618,6 +626,8 @@ rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_p
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
+  rte_update_lock(c);
+
   rte nb0, *new_best = NULL;
   const rte *old_best = NULL;
 
@@ -672,13 +682,12 @@ done:
   }
 
   /* Nothing to export */
-  if (!new_best && !old_best)
-  {
+  if (new_best || old_best)
+    do_rt_notify(c, n, new_best, old_best);
+  else
     DBG("rt_notify_accepted: nothing to export\n");
-    return;
-  }
 
-  do_rt_notify(c, n, new_best, old_best);
+  rte_update_unlock(c);
 }
 
 
@@ -750,6 +759,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
+  rte_update_lock(c);
   // struct proto *p = c->proto;
 
 #if 0 /* TODO: Find whether this check is possible when processing multiple changes at once. */
@@ -786,17 +796,19 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
   }
 
   /* Prepare new merged route */
-  rte *new_merged = count ? rt_export_merged(c, feed, count, rte_update_pool, 0) : NULL;
+  rte *new_merged = count ? rt_export_merged(c, feed, count, c->rte_update_pool, 0) : NULL;
 
   if (new_merged || old_best)
     do_rt_notify(c, n, new_merged, old_best);
+
+  rte_update_unlock(c);
 }
 
 void
 rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-
+  rte_update_lock(c);
   rte *old = RTES_OR_NULL(rpe->old_best);
   struct rte_storage *new_best = rpe->new_best;
 
@@ -812,13 +824,15 @@ rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_
     rte n0, *new = RTES_CLONE(new_best, &n0);
     rt_notify_basic(c, net, new, old);
   }
+
+  rte_update_unlock(c);
 }
 
 void
 rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-
+  rte_update_lock(c);
   struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
   rte *old = RTES_OR_NULL(rpe->old);
   struct rte_storage *new_any = rpe->new;
@@ -835,18 +849,23 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
     rte n0, *new = RTES_CLONE(new_any, &n0);
     rt_notify_basic(c, net, new, old);
   }
+
+  rte_update_unlock(c);
 }
 
 void
 rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  rte_update_lock(c);
 
   for (uint i=0; i<count; i++)
   {
     rte n0 = *feed[i];
     rt_notify_basic(c, net, &n0, NULL);
   }
+
+  rte_update_unlock(c);
 }
 
 void
@@ -1172,14 +1191,10 @@ rt_export_hook(void *_data)
   /* Process the export */
   for (uint i=0; i<RT_EXPORT_BULK; i++)
   {
-    rte_update_lock();
-
     rte_export(c, c->rpe_next);
 
     if (!c->rpe_next)
       break;
-
-    rte_update_unlock();
   }
 
   rt_send_export_event(c);
@@ -1447,21 +1462,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 
 }
 
-static int rte_update_nest_cnt;		/* Nesting counter to allow recursive updates */
-
-static inline void
-rte_update_lock(void)
-{
-  rte_update_nest_cnt++;
-}
-
-static inline void
-rte_update_unlock(void)
-{
-  if (!--rte_update_nest_cnt)
-    lp_flush(rte_update_pool);
-}
-
 rte *
 channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 {
@@ -1534,7 +1534,7 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
   const struct filter *filter = c->in_filter;
   struct channel_import_stats *stats = &c->import_stats;
 
-  rte_update_lock();
+  rte_update_lock(c);
   if (new)
     {
       new->net = n;
@@ -1549,7 +1549,7 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
 	  new = NULL;
 	}
       else if ((filter == FILTER_REJECT) ||
-	((fr = f_run(filter, new, rte_update_pool, 0)) > F_ACCEPT))
+	((fr = f_run(filter, new, c->rte_update_pool, 0)) > F_ACCEPT))
 	{
 	  stats->updates_filtered++;
 	  channel_rte_trace_in(D_FILTERS, c, new, "filtered out");
@@ -1565,7 +1565,7 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
 
   rte_import(&c->in_req, n, new, src);
 
-  rte_update_unlock();
+  rte_update_unlock(c);
 }
 
 void
@@ -1593,25 +1593,6 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
   rte_recalculate(hook, nn, new, src);
 }
 
-/* Independent call to rte_announce(), used from next hop
-   recalculation, outside of rte_update(). new must be non-NULL */
-static inline void
-rte_announce_i(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
-	       struct rte_storage *new_best, struct rte_storage *old_best)
-{
-  rte_update_lock();
-  rte_announce(tab, net, new, old, new_best, old_best);
-  rte_update_unlock();
-}
-
-static inline void
-rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garbage collection */
-{
-  rte_update_lock();
-  rte_recalculate(old->sender, net, NULL, old->src);
-  rte_update_unlock();
-}
-
 /* Check rtable for best route to given net whether it would be exported do p */
 int
 rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
@@ -1626,14 +1607,14 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
   if (!rte_is_valid(&rt))
     return 0;
 
-  rte_update_lock();
+  rte_update_lock(c);
 
   /* Rest is stripped down export_filter() */
   int v = c->proto->preexport ? c->proto->preexport(c, &rt) : 0;
   if (v == RIC_PROCESS)
-    v = (f_run(filter, &rt, rte_update_pool, FF_SILENT) <= F_ACCEPT);
+    v = (f_run(filter, &rt, c->rte_update_pool, FF_SILENT) <= F_ACCEPT);
 
-  rte_update_unlock();
+  rte_update_unlock(c);
 
   return v > 0;
 }
@@ -2123,6 +2104,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
+  t->nhu_lp = lp_new_default(p);
+
   return t;
 }
 
@@ -2137,7 +2120,6 @@ rt_init(void)
 {
   rta_init();
   rt_table_pool = rp_new(&root_pool, "Routing tables");
-  rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
   ev_init_cork(&rt_cork, "Route Table Cork");
 }
@@ -2211,7 +2193,7 @@ again:
 		return;
 	      }
 
-	    rte_discard(n, &e->rte);
+	    rte_recalculate(e->rte.sender, n, NULL, e->rte.src);
 	    limit--;
 
 	    goto rescan;
@@ -2462,7 +2444,7 @@ rta_next_hop_outdated(rta *a)
 }
 
 void
-rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls)
+rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls, linpool *lp)
 {
   a->hostentry = he;
   a->dest = he->dest;
@@ -2497,7 +2479,7 @@ no_nexthop:
     else
     {
       nhr = nhp;
-      nhp = (nhp ? (nhp->next = lp_alloc(rte_update_pool, NEXTHOP_MAX_SIZE)) : &(a->nh));
+      nhp = (nhp ? (nhp->next = lp_alloc(lp, NEXTHOP_MAX_SIZE)) : &(a->nh));
     }
 
     memset(nhp, 0, NEXTHOP_MAX_SIZE);
@@ -2561,7 +2543,7 @@ rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
   mpls_label_stack mls = { .len = a->nh.labels_orig };
   memcpy(mls.stack, &a->nh.label[a->nh.labels - mls.len], mls.len * sizeof(u32));
 
-  rta_apply_hostentry(a, old->attrs->hostentry, &mls);
+  rta_apply_hostentry(a, old->attrs->hostentry, &mls, tab->nhu_lp);
   a->cached = 0;
 
   rte e0 = *old;
@@ -2615,6 +2597,8 @@ rt_next_hop_update_net(rtable *tab, net *n)
 	new->rte.lastmod = current_time();
 	new->rte.id = hmap_first_zero(&tab->id_map);
 	hmap_set(&tab->id_map, new->rte.id);
+
+	lp_flush(tab->nhu_lp);
       }
 
   ASSERT_DIE(pos == count);
@@ -2645,7 +2629,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
       { "autoupdated [+best]", "autoupdated [best]" }
     };
     rt_rte_trace_in(D_ROUTES, updates[i].new->rte.sender->req, &updates[i].new->rte, best_indicator[nb][ob]);
-    rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
+    rte_announce(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
 
   return count;
@@ -2869,21 +2853,17 @@ rt_feed_channel(void *data)
 	uint count = rte_feed_count(n);
 	if (count)
 	{
-	  rte_update_lock();
 	  rte **feed = alloca(count * sizeof(rte *));
 	  rte_feed_obtain(n, feed, count);
 	  c->req->export_bulk(c->req, n->n.addr, NULL, feed, count);
 	  max_feed -= count;
-	  rte_update_unlock();
 	}
       }
       else if (n->routes && rte_is_valid(&n->routes->rte))
       {
-	rte_update_lock();
 	struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
 	c->req->export_one(c->req, n->n.addr, &rpe);
 	max_feed--;
-	rte_update_unlock();
       }
 
       for (struct rt_pending_export *rpe = n->first; rpe; rpe = rpe_next(rpe, NULL))
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index d2d5b174..ea9adb4c 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -971,7 +971,7 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     s->hostentry = rt_get_hostentry(tab, gw, ll, c->c.table);
 
     if (!s->mpls)
-      rta_apply_hostentry(a, s->hostentry, NULL);
+      rta_apply_hostentry(a, s->hostentry, NULL, s->pool);
 
     /* With MPLS, hostentry is applied later in bgp_apply_mpls_labels() */
   }
@@ -1005,7 +1005,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 *labels, uint lnum)
 
     ms.len = lnum;
     memcpy(ms.stack, labels, 4*lnum);
-    rta_apply_hostentry(a, s->hostentry, &ms);
+    rta_apply_hostentry(a, s->hostentry, &ms, s->pool);
   }
 }
 
diff --git a/proto/static/static.c b/proto/static/static.c
index b0c9d640..45791e8e 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -98,7 +98,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
   if (r->dest == RTDX_RECURSIVE)
   {
     rtable *tab = ipa_is_ip4(r->via) ? p->igp_table_ip4 : p->igp_table_ip6;
-    rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE, r->mls);
+    rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE, r->mls, static_lp);
   }
 
   /* Already announced */

From c7d0c5b2523a8cbfcaee9a235955dd5e58fab671 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Wed, 27 Oct 2021 12:42:05 +0000
Subject: [PATCH 041/431] Route subscription uses events

---
 nest/proto.c    | 17 +++++++++--------
 nest/route.h    |  3 +--
 nest/rt-table.c |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index f55f347a..35af3c6c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -319,9 +319,9 @@ proto_remove_channels(struct proto *p)
 }
 
 static void
-channel_roa_in_changed(struct rt_subscription *s)
+channel_roa_in_changed(void *_data)
 {
-  struct channel *c = s->data;
+  struct channel *c = _data;
 
   CD(c, "Reload triggered by RPKI change");
 
@@ -329,9 +329,9 @@ channel_roa_in_changed(struct rt_subscription *s)
 }
 
 static void
-channel_roa_out_changed(struct rt_subscription *s)
+channel_roa_out_changed(void *_data)
 {
-  struct channel *c = s->data;
+  struct channel *c = _data;
   CD(c, "Feeding triggered by RPKI change");
 
   c->refeed_pending = 1;
@@ -349,14 +349,14 @@ struct roa_subscription {
 static int
 channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
 {
-  void (*hook)(struct rt_subscription *) =
+  void (*hook)(void *) =
     dir ? channel_roa_in_changed : channel_roa_out_changed;
 
   struct roa_subscription *s;
   node *n;
 
   WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
-    if ((s->s.tab == tab) && (s->s.hook == hook))
+    if ((s->s.tab == tab) && (s->s.event->hook == hook))
       return 1;
 
   return 0;
@@ -370,9 +370,9 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
     return;
 
   struct roa_subscription *s = mb_allocz(c->proto->pool, sizeof(struct roa_subscription));
+  s->s.event = ev_new_init(c->proto->pool, dir ? channel_roa_in_changed : channel_roa_out_changed, c);
+  s->s.event->list = proto_work_list(c->proto);
 
-  s->s.hook = dir ? channel_roa_in_changed : channel_roa_out_changed;
-  s->s.data = c;
   rt_subscribe(tab, &s->s);
 
   add_tail(&c->roa_subscriptions, &s->roa_node);
@@ -383,6 +383,7 @@ channel_roa_unsubscribe(struct roa_subscription *s)
 {
   rt_unsubscribe(&s->s);
   rem_node(&s->roa_node);
+  rfree(s->s.event);
   mb_free(s);
 }
 
diff --git a/nest/route.h b/nest/route.h
index e2dc9986..683c966e 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -213,8 +213,7 @@ typedef struct rtable {
 struct rt_subscription {
   node n;
   rtable *tab;
-  void (*hook)(struct rt_subscription *b);
-  void *data;
+  event *event;
 };
 
 #define NHU_CLEAN	0
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e307449a..fb0496bd 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1979,7 +1979,7 @@ rt_settle_timer(timer *t)
 
   struct rt_subscription *s;
   WALK_LIST(s, tab->subscribers)
-    s->hook(s);
+    ev_send(s->event->list, s->event);
 }
 
 static void

From 878eeec12bf020c9e7460040d225a929bbbd2bd2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 29 Sep 2021 16:15:13 +0200
Subject: [PATCH 042/431] Routing tables now have their own loops.

This basically means that:
* there are some more levels of indirection and asynchronicity, mostly
  in cleanup procedures, requiring correct lock ordering
* all the internal table operations (prune, next hop update) are done
  without blocking the other parts of BIRD
* the protocols may get their own loops very soon
---
 filter/f-inst.c       |   4 +-
 nest/proto.c          |  77 +++++---
 nest/protocol.h       |   9 +-
 nest/route.h          | 106 ++++++-----
 nest/rt-attr.c        |  11 +-
 nest/rt-show.c        |  29 ++-
 nest/rt-table.c       | 399 +++++++++++++++++++++++++++++-------------
 proto/bgp/attrs.c     |   2 +-
 proto/bgp/bgp.c       |  12 +-
 proto/bgp/bgp.h       |   2 +-
 proto/mrt/mrt.c       |  59 +++++--
 proto/mrt/mrt.h       |   6 +-
 proto/perf/perf.c     |   4 +-
 proto/radv/radv.c     |   5 +-
 proto/static/static.c |  12 +-
 sysdep/unix/krt.c     |   9 +-
 16 files changed, 504 insertions(+), 242 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 706eb684..0341a2f1 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -1212,7 +1212,7 @@
   INST(FI_ROA_CHECK_IMPLICIT, 0, 1) {	/* ROA Check */
     NEVER_CONSTANT;
     RTC(1);
-    struct rtable *table = rtc->table;
+    rtable *table = rtc->table;
     ACCESS_RTE;
     ACCESS_EATTRS;
     const net_addr *net = fs->rte->net;
@@ -1244,7 +1244,7 @@
     ARG(1, T_NET);
     ARG(2, T_INT);
     RTC(3);
-    struct rtable *table = rtc->table;
+    rtable *table = rtc->table;
 
     u32 as = v2.val.i;
 
diff --git a/nest/proto.c b/nest/proto.c
index 35af3c6c..4ae0cbfd 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -172,7 +172,7 @@ proto_cf_find_channel(struct proto_config *pc, uint net_type)
  * Returns pointer to channel or NULL
  */
 struct channel *
-proto_find_channel_by_table(struct proto *p, struct rtable *t)
+proto_find_channel_by_table(struct proto *p, rtable *t)
 {
   struct channel *c;
 
@@ -236,7 +236,9 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->channel = cf->channel;
   c->proto = p;
   c->table = cf->table->table;
-  rt_lock_table(c->table);
+
+  RT_LOCKED(c->table, t)
+    rt_lock_table(t);
 
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
@@ -277,7 +279,9 @@ proto_remove_channel(struct proto *p UNUSED, struct channel *c)
 
   CD(c, "Removed", c->name);
 
-  rt_unlock_table(c->table);
+  RT_LOCKED(c->table, t)
+    rt_unlock_table(t);
+
   rem_node(&c->n);
   mb_free(c);
 }
@@ -391,7 +395,7 @@ static void
 channel_roa_subscribe_filter(struct channel *c, int dir)
 {
   const struct filter *f = dir ? c->in_filter : c->out_filter;
-  struct rtable *tab;
+  rtable *tab;
   int valid = 1, found = 0;
 
   if ((f == FILTER_ACCEPT) || (f == FILTER_REJECT))
@@ -560,11 +564,11 @@ channel_check_stopped(struct channel *c)
 }
 
 void
-channel_import_stopped(struct rt_import_request *req)
+channel_import_stopped(void *_c)
 {
-  struct channel *c = SKIP_BACK(struct channel, in_req, req);
+  struct channel *c = _c;
 
-  req->hook = NULL;
+  c->in_req.hook = NULL;
 
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
@@ -661,17 +665,16 @@ channel_aux_stopped(void *data)
   else
     c->in_table = NULL;
 
-  rfree(cat->tab->rp);
-
+  rfree(cat->tab->priv.rp);
   mb_free(cat);
-  return channel_check_stopped(c);
+  channel_check_stopped(c);
 }
 
 static void
-channel_aux_import_stopped(struct rt_import_request *req)
+channel_aux_import_stopped(void *_cat)
 {
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  ASSERT_DIE(cat->tab->delete_event);
+  struct channel_aux_table *cat = _cat;
+  cat->push.hook = NULL;
 }
 
 static void
@@ -680,24 +683,35 @@ channel_aux_export_stopped(struct rt_export_request *req)
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
-  if (cat->refeed_pending && !cat->tab->delete_event)
-  {
-    cat->refeed_pending = 0;
-    rt_request_export(cat->tab, req);
-  }
-  else
-    ASSERT_DIE(cat->tab->delete_event);
+  int del;
+  RT_LOCKED(cat->tab, t)
+    del = !!t->delete_event;
+
+  if (del)
+    return;
+
+  ASSERT_DIE(cat->refeed_pending);
+  cat->refeed_pending = 0;
+  rt_request_export(cat->tab, req);
 }
 
 static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
-  rt_stop_import(&cat->push, channel_aux_import_stopped);
+  RT_LOCKED(cat->tab, t)
+  {
+    t->delete_event = ev_new_init(t->rp, channel_aux_stopped, cat);
+    t->delete_event->list = proto_event_list(cat->c->proto);
+  }
+
+  cat->push_stopped = (event) {
+    .hook = channel_aux_import_stopped,
+    .data = cat,
+    .list = proto_event_list(cat->c->proto),
+  };
+
+  rt_stop_import(&cat->push, &cat->push_stopped);
   rt_stop_export(&cat->get, channel_aux_export_stopped);
-
-  cat->tab->delete_event = ev_new_init(cat->tab->rp, channel_aux_stopped, cat);
-
-  rt_unlock_table(cat->tab);
 }
 
 static void
@@ -889,7 +903,6 @@ channel_setup_in_table(struct channel *c, int best)
 
   c->in_table->c = c;
   c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  rt_lock_table(c->in_table->tab);
 
   rt_request_import(c->in_table->tab, &c->in_table->push);
   rt_request_export(c->in_table->tab, &c->in_table->get);
@@ -931,7 +944,6 @@ channel_setup_out_table(struct channel *c)
 
   c->out_table->c = c;
   c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  rt_lock_table(c->out_table->tab);
 
   rt_request_import(c->out_table->tab, &c->out_table->push);
   rt_request_export(c->out_table->tab, &c->out_table->get);
@@ -993,7 +1005,14 @@ channel_do_stop(struct channel *c)
 
   /* Stop import */
   if (c->in_req.hook)
-    rt_stop_import(&c->in_req, channel_import_stopped);
+  {
+    c->in_stopped = (event) {
+      .hook = channel_import_stopped,
+      .data = c,
+      .list = proto_event_list(c->proto),
+    };
+    rt_stop_import(&c->in_req, &c->in_stopped);
+  }
 
   c->gr_wait = 0;
   if (c->gr_lock)
@@ -2339,7 +2358,7 @@ proto_do_start(struct proto *p)
 {
   p->active = 1;
 
-  rt_init_sources(&p->sources, p->name, proto_event_list(p));
+  rt_init_sources(&p->sources, p->name, proto_work_list(p));
   if (!p->sources.class)
     p->sources.class = &default_rte_owner_class;
 
diff --git a/nest/protocol.h b/nest/protocol.h
index 1647fbba..8d077e44 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -18,7 +18,6 @@
 
 struct iface;
 struct ifa;
-struct rtable;
 struct rte;
 struct neighbor;
 struct rta;
@@ -207,7 +206,7 @@ struct proto {
    *	   rte_remove	Called whenever a rte is removed from the routing table.
    */
 
-  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
   void (*rte_insert)(struct network *, struct rte *);
@@ -496,7 +495,7 @@ struct channel {
   const struct channel_class *channel;
   struct proto *proto;
 
-  struct rtable *table;
+  rtable *table;
   const struct filter *in_filter;	/* Input filter */
   const struct filter *out_filter;	/* Output filter */
   struct bmap export_map;		/* Keeps track which routes were really exported */
@@ -556,6 +555,7 @@ struct channel {
   btime last_state_change;		/* Time of last state transition */
 
   struct channel_aux_table *in_table;	/* Internal table for received routes */
+  struct event in_stopped;		/* Import stop callback */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
@@ -570,6 +570,7 @@ struct channel_aux_table {
   struct channel *c;
   struct rt_import_request push;
   struct rt_export_request get;
+  event push_stopped;
   rtable *tab;
   event *stop;
   u8 refeed_pending;
@@ -633,7 +634,7 @@ struct channel_config *proto_cf_find_channel(struct proto_config *p, uint net_ty
 static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc)
 { return proto_cf_find_channel(pc, pc->net_type); }
 
-struct channel *proto_find_channel_by_table(struct proto *p, struct rtable *t);
+struct channel *proto_find_channel_by_table(struct proto *p, rtable *t);
 struct channel *proto_find_channel_by_name(struct proto *p, const char *n);
 struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
diff --git a/nest/route.h b/nest/route.h
index 683c966e..9417d97d 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -146,30 +146,21 @@ void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src)
  *	It's guaranteed that there is at most one RTE for every (prefix,proto) pair.
  */
 
-struct rtable_config {
-  node n;
-  char *name;
-  struct config *config;
-  struct rtable *table;
-  struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
-  uint addr_type;			/* Type of address data stored in table (NET_*) */
-  int gc_max_ops;			/* Maximum number of operations before GC is run */
-  int gc_min_time;			/* Minimum time between two consecutive GC runs */
-  byte sorted;				/* Routes of network are sorted according to rte_better() */
-  btime min_settle_time;		/* Minimum settle time for notifications */
-  btime max_settle_time;		/* Maximum settle time for notifications */
-  btime export_settle_time;		/* Delay before exports are announced */
-  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
-};
+typedef struct rtable_private {
+#define RTABLE_PUBLIC \
+  resource r; \
+  node n;				/* Node in list of all tables */ \
+  struct birdloop *loop;		/* This loop runs the table */ \
+  char *name;				/* Name of this table */ \
+  uint addr_type;			/* Type of address data stored in table (NET_*) */ \
+  struct rtable_config *config;		/* Configuration of this table */ \
+  struct event *nhu_event;		/* Event to update next hops */ \
+  _Atomic byte nhu_state;		/* Next Hop Update state */ \
 
-typedef struct rtable {
-  resource r;
-  node n;				/* Node in list of all tables */
+  RTABLE_PUBLIC;
   pool *rp;				/* Resource pool to allocate everything from, including itself */
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
-  char *name;				/* Name of this table */
-  uint addr_type;			/* Type of address data stored in table (NET_*) */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 
@@ -178,18 +169,15 @@ typedef struct rtable {
 
   struct hmap id_map;
   struct hostcache *hostcache;
-  struct rtable_config *config;		/* Configuration of this table */
   struct event *prune_event;		/* Event to prune abandoned routes */
   struct event *ec_event;		/* Event to prune finished exports */
   struct event *hcu_event;		/* Event to update host cache */
-  struct event *nhu_event;		/* Event to update next hops */
   struct event *delete_event;		/* Event to delete the table */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
-  byte nhu_state;			/* Next Hop Update state */
 
   byte cork_active;			/* Congestion control activated */
 
@@ -208,8 +196,35 @@ typedef struct rtable {
 
   struct rt_pending_export *first_export;	/* First export to announce */
   u64 next_export_seq;			/* The next export will have this ID */
+} rtable_private;
+
+typedef union {
+  struct { RTABLE_PUBLIC };
+  rtable_private priv;
 } rtable;
 
+#define RT_LOCK(tab)	({ birdloop_enter((tab)->loop); &(tab)->priv; })
+#define RT_UNLOCK(tab)	birdloop_leave((tab)->loop)
+#define RT_PRIV(tab)	({ ASSERT_DIE(birdloop_inside((tab)->loop)); &(tab)->priv; })
+
+#define RT_LOCKED(tpub, tpriv)	for (rtable_private *tpriv = RT_LOCK(tpub); tpriv; RT_UNLOCK(tpriv), (tpriv = NULL))
+
+struct rtable_config {
+  node n;
+  char *name;
+  struct config *config;
+  rtable *table;
+  struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
+  uint addr_type;			/* Type of address data stored in table (NET_*) */
+  int gc_max_ops;			/* Maximum number of operations before GC is run */
+  int gc_min_time;			/* Minimum time between two consecutive GC runs */
+  byte sorted;				/* Routes of network are sorted according to rte_better() */
+  btime min_settle_time;		/* Minimum settle time for notifications */
+  btime max_settle_time;		/* Maximum settle time for notifications */
+  btime export_settle_time;		/* Delay before exports are announced */
+  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
+};
+
 struct rt_subscription {
   node n;
   rtable *tab;
@@ -244,7 +259,7 @@ struct hostentry {
   ip_addr addr;				/* IP address of host, part of key */
   ip_addr link;				/* (link-local) IP address of host, used as gw
 					   if host is directly attached */
-  struct rtable *tab;			/* Dependent table, part of key */
+  rtable *tab;				/* Dependent table, part of key */
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
@@ -324,7 +339,7 @@ struct rt_import_hook {
   u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
   u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
-  void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
+  struct event *stopped;		/* Event to run when import is stopped */
 };
 
 struct rt_pending_export {
@@ -405,7 +420,7 @@ extern struct event_cork rt_cork;
 void rt_request_import(rtable *tab, struct rt_import_request *req);
 void rt_request_export(rtable *tab, struct rt_export_request *req);
 
-void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
+void rt_stop_import(struct rt_import_request *, struct event *stopped);
 void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));
 
 const char *rt_import_state_name(u8 state);
@@ -480,27 +495,27 @@ struct config;
 void rt_init(void);
 void rt_preconfig(struct config *);
 void rt_commit(struct config *new, struct config *old);
-void rt_lock_table(rtable *);
-void rt_unlock_table(rtable *);
+void rt_lock_table(rtable_private *);
+void rt_unlock_table(rtable_private *);
 void rt_subscribe(rtable *tab, struct rt_subscription *s);
 void rt_unsubscribe(struct rt_subscription *s);
 rtable *rt_setup(pool *, struct rtable_config *);
 
-static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
-static inline net *net_find_valid(rtable *tab, const net_addr *addr)
+static inline net *net_find(rtable_private *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
+static inline net *net_find_valid(rtable_private *tab, const net_addr *addr)
 { net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
-static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
-void *net_route(rtable *tab, const net_addr *n);
+static inline net *net_get(rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
+void *net_route(rtable_private *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
-int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
+int rt_examine(rtable_private *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
 
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
-void rt_schedule_prune(rtable *t);
+void rt_schedule_prune(rtable_private *t);
 void rte_dump(struct rte_storage *);
-void rte_free(struct rte_storage *, rtable *);
-struct rte_storage *rte_store(const rte *, net *net, rtable *);
+void rte_free(struct rte_storage *, rtable_private *);
+struct rte_storage *rte_store(const rte *, net *net, rtable_private *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
@@ -591,7 +606,7 @@ struct rte_src {
 
 typedef struct rta {
   struct rta *next, **pprev;		/* Hash chain */
-  _Atomic u32 uc;			/* Use count */
+  u32 uc;				/* Use count */
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
@@ -732,7 +747,7 @@ struct rte_owner_class {
 
 struct rte_owner {
   struct rte_owner_class *class;
-  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
   HASH(struct rte_src) hash;
   const char *name;
   u32 hash_key;
@@ -863,9 +878,20 @@ static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a
 #define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
 rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
 static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) { ASSERT_DIE(0 < atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel)); return r; }
+static inline rta *rta_clone(rta *r) {
+  RTA_LOCK;
+  r->uc++;
+  RTA_UNLOCK;
+  return r;
+}
+
 void rta__free(rta *r);
-static inline void rta_free(rta *r) { if (r && (1 == atomic_fetch_sub_explicit(&r->uc, 1, memory_order_acq_rel))) rta__free(r); }
+static inline void rta_free(rta *r) {
+  RTA_LOCK;
+  if (r && !--r->uc)
+    rta__free(r);
+  RTA_UNLOCK;
+}
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
 static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 20f9835d..cd4c6892 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1287,7 +1287,7 @@ rta_lookup(rta *o)
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
     if (r->hash_key == h && rta_same(r, o))
     {
-      atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel);
+      r->uc++;
       RTA_UNLOCK;
       return r;
     }
@@ -1308,14 +1308,6 @@ rta_lookup(rta *o)
 void
 rta__free(rta *a)
 {
-  RTA_LOCK;
-  if (atomic_load_explicit(&a->uc, memory_order_acquire))
-  {
-    /* Somebody has cloned this rta inbetween. This sometimes happens. */
-    RTA_UNLOCK;
-    return;
-  }
-
   ASSERT(rta_cache_count && a->cached);
   rta_cache_count--;
   *a->pprev = a->next;
@@ -1327,7 +1319,6 @@ rta__free(rta *a)
   ea_free(a->eattrs);
   a->cached = 0;
   sl_free(rta_slab(a), a);
-  RTA_UNLOCK;
 }
 
 rta *
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 8196903d..65b59af4 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -239,11 +239,13 @@ rt_show_cleanup(struct cli *c)
 
   /* Unlink the iterator */
   if (d->table_open)
-    fit_get(&d->tab->table->fib, &d->fit);
+    RT_LOCKED(d->tab->table, t)
+      fit_get(&t->fib, &d->fit);
 
   /* Unlock referenced tables */
   WALK_LIST(tab, d->tables)
-    rt_unlock_table(tab->table);
+    RT_LOCKED(tab->table, t)
+      rt_unlock_table(t);
 }
 
 static void
@@ -255,8 +257,6 @@ rt_show_cont(struct cli *c)
 #else
   unsigned max = 64;
 #endif
-  struct fib *fib = &d->tab->table->fib;
-  struct fib_iterator *it = &d->fit;
 
   if (d->running_on_config && (d->running_on_config != config))
   {
@@ -264,9 +264,14 @@ rt_show_cont(struct cli *c)
     goto done;
   }
 
+  rtable_private *t = RT_LOCK(d->tab->table);
+
+  struct fib *fib = &t->fib;
+  struct fib_iterator *it = &d->fit;
+
   if (!d->table_open)
   {
-    FIB_ITERATE_INIT(&d->fit, &d->tab->table->fib);
+    FIB_ITERATE_INIT(&d->fit, fib);
     d->table_open = 1;
     d->table_counter++;
     d->kernel = rt_show_get_kernel(d);
@@ -284,6 +289,7 @@ rt_show_cont(struct cli *c)
     if (!max--)
     {
       FIB_ITERATE_PUT(it);
+      RT_UNLOCK(d->tab->table);
       return;
     }
     rt_show_net(c, n, d);
@@ -300,6 +306,8 @@ rt_show_cont(struct cli *c)
 	       d->net_counter - d->net_counter_last, d->tab->table->name);
   }
 
+  RT_UNLOCK(d->tab->table);
+
   d->kernel = NULL;
   d->table_open = 0;
   d->tab = NODE_NEXT(d->tab);
@@ -431,7 +439,8 @@ rt_show(struct rt_show_data *d)
   if (!d->addr)
   {
     WALK_LIST(tab, d->tables)
-      rt_lock_table(tab->table);
+      RT_LOCKED(tab->table, t)
+	rt_lock_table(t);
 
     /* There is at least one table */
     d->tab = HEAD(d->tables);
@@ -446,13 +455,17 @@ rt_show(struct rt_show_data *d)
       d->tab = tab;
       d->kernel = rt_show_get_kernel(d);
 
+      RT_LOCK(tab->table);
+
       if (d->show_for)
-	n = net_route(tab->table, d->addr);
+	n = net_route(RT_PRIV(tab->table), d->addr);
       else
-	n = net_find(tab->table, d->addr);
+	n = net_find(RT_PRIV(tab->table), d->addr);
 
       if (n)
 	rt_show_net(this_cli, n, d);
+
+      RT_UNLOCK(tab->table);
     }
 
     if (d->rt_counter)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index fb0496bd..f304372f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -61,15 +61,15 @@ struct rt_export_block {
   struct rt_pending_export export[];
 };
 
-static void rt_free_hostcache(rtable *tab);
-static void rt_notify_hostcache(rtable *tab, net *net);
+static void rt_free_hostcache(rtable_private *tab);
+static void rt_notify_hostcache(rtable_private *tab, net *net);
 static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(void *tab);
 static inline void rt_prune_table(void *tab);
-static inline void rt_schedule_notify(rtable *tab);
+static inline void rt_schedule_notify(rtable_private *tab);
 static void rt_feed_channel(void *);
 
-static inline void rt_export_used(rtable *tab);
+static inline void rt_export_used(rtable_private *tab);
 static void rt_export_cleanup(void *tab);
 
 const char *rt_import_state_name_array[TIS_MAX] = {
@@ -122,7 +122,7 @@ rte_update_unlock(struct channel *c)
 
 /* Like fib_route(), but skips empty net entries */
 static inline void *
-net_route_ip4(rtable *t, net_addr_ip4 *n)
+net_route_ip4(rtable_private *t, net_addr_ip4 *n)
 {
   net *r;
 
@@ -136,7 +136,7 @@ net_route_ip4(rtable *t, net_addr_ip4 *n)
 }
 
 static inline void *
-net_route_ip6(rtable *t, net_addr_ip6 *n)
+net_route_ip6(rtable_private *t, net_addr_ip6 *n)
 {
   net *r;
 
@@ -150,7 +150,7 @@ net_route_ip6(rtable *t, net_addr_ip6 *n)
 }
 
 static inline void *
-net_route_ip6_sadr(rtable *t, net_addr_ip6_sadr *n)
+net_route_ip6_sadr(rtable_private *t, net_addr_ip6_sadr *n)
 {
   struct fib_node *fn;
 
@@ -189,7 +189,7 @@ net_route_ip6_sadr(rtable *t, net_addr_ip6_sadr *n)
 }
 
 void *
-net_route(rtable *tab, const net_addr *n)
+net_route(rtable_private *tab, const net_addr *n)
 {
   ASSERT(tab->addr_type == n->type);
 
@@ -218,12 +218,15 @@ net_route(rtable *tab, const net_addr *n)
 
 
 static int
-net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
+net_roa_check_ip4(rtable *t, const net_addr_ip4 *px, u32 asn)
 {
   struct net_addr_roa4 n = NET_ADDR_ROA4(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
   int anything = 0;
 
+  RT_LOCK(t);
+  rtable_private *tab = RT_PRIV(t);
+
   while (1)
   {
     for (fn = fib_get_chain(&tab->fib, (net_addr *) &n); fn; fn = fn->next)
@@ -235,7 +238,10 @@ net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
+	{
+	  RT_UNLOCK(tab);
 	  return ROA_VALID;
+	}
       }
     }
 
@@ -246,16 +252,20 @@ net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
     ip4_clrbit(&n.prefix, n.pxlen);
   }
 
+  RT_UNLOCK(tab);
   return anything ? ROA_INVALID : ROA_UNKNOWN;
 }
 
 static int
-net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
+net_roa_check_ip6(rtable *t, const net_addr_ip6 *px, u32 asn)
 {
   struct net_addr_roa6 n = NET_ADDR_ROA6(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
   int anything = 0;
 
+  RT_LOCK(t);
+  rtable_private *tab = RT_PRIV(t);
+
   while (1)
   {
     for (fn = fib_get_chain(&tab->fib, (net_addr *) &n); fn; fn = fn->next)
@@ -267,7 +277,10 @@ net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
+	{
+	  RT_UNLOCK(tab);
 	  return ROA_VALID;
+	}
       }
     }
 
@@ -278,6 +291,7 @@ net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
     ip6_clrbit(&n.prefix, n.pxlen);
   }
 
+  RT_UNLOCK(tab);
   return anything ? ROA_INVALID : ROA_UNKNOWN;
 }
 
@@ -328,7 +342,7 @@ rte_find(net *net, struct rte_src *src)
 
 
 struct rte_storage *
-rte_store(const rte *r, net *net, rtable *tab)
+rte_store(const rte *r, net *net, rtable_private *tab)
 {
   struct rte_storage *e = sl_alloc(tab->rte_slab);
 
@@ -354,7 +368,7 @@ rte_store(const rte *r, net *net, rtable *tab)
  */
 
 void
-rte_free(struct rte_storage *e, rtable *tab)
+rte_free(struct rte_storage *e, rtable_private *tab)
 {
   rt_unlock_source(e->rte.src);
   rta_free(e->rte.attrs);
@@ -912,6 +926,7 @@ rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
     hook->req->export_one(hook->req, n, rpe);
   else if (hook->req->export_bulk)
   {
+    RT_LOCK(hook->table);
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
     uint count = rte_feed_count(net);
     rte **feed = NULL;
@@ -920,6 +935,7 @@ rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
       feed = alloca(count * sizeof(rte *));
       rte_feed_obtain(net, feed, count);
     }
+    RT_UNLOCK(hook->table);
     hook->req->export_bulk(hook->req, n, rpe, feed, count);
   }
   else
@@ -931,7 +947,11 @@ seen:
 
   /* The last block may be available to free */
   if (PAGE_HEAD(hook->rpe_next) != PAGE_HEAD(rpe))
-    rt_export_used(hook->table);
+  {
+    RT_LOCK(hook->table);
+    rt_export_used(RT_PRIV(hook->table));
+    RT_UNLOCK(hook->table);
+  }
 
   /* Releasing this export for cleanup routine */
   DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe->seq);
@@ -970,7 +990,7 @@ seen:
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
   if (!new_best || !rte_is_valid(&new_best->rte))
@@ -1085,10 +1105,10 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   {
     ev_cork(&rt_cork);
     tab->cork_active = 1;
-    tm_start(tab->export_timer, 0);
+    tm_start_in(tab->export_timer, 0, tab->loop);
   }
   else if (!tm_active(tab->export_timer))
-    tm_start(tab->export_timer, tab->config->export_settle_time);
+    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 }
 
 static struct rt_pending_export *
@@ -1117,7 +1137,7 @@ rt_next_export_fast(struct rt_pending_export *last)
 }
 
 static struct rt_pending_export *
-rt_next_export(struct rt_export_hook *hook, rtable *tab)
+rt_next_export(struct rt_export_hook *hook, rtable_private *tab)
 {
   /* As the table is locked, it is safe to reload the last export pointer */
   struct rt_pending_export *last = atomic_load_explicit(&hook->last_export, memory_order_acquire);
@@ -1140,7 +1160,8 @@ rt_send_export_event(struct rt_export_hook *hook)
 static void
 rt_announce_exports(timer *tm)
 {
-  rtable *tab = tm->data;
+  rtable_private *tab = tm->data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
 
   struct rt_export_hook *c; node *n;
   WALK_LIST2(c, n, tab->exports, n)
@@ -1153,7 +1174,7 @@ rt_announce_exports(timer *tm)
 }
 
 static struct rt_pending_export *
-rt_last_export(rtable *tab)
+rt_last_export(rtable_private *tab)
 {
   struct rt_pending_export *rpe = NULL;
 
@@ -1179,13 +1200,17 @@ rt_export_hook(void *_data)
 
   if (!c->rpe_next)
   {
-    c->rpe_next = rt_next_export(c, c->table);
+    RT_LOCK(c->table);
+    c->rpe_next = rt_next_export(c, RT_PRIV(c->table));
 
     if (!c->rpe_next)
     {
-      rt_export_used(c->table);
+      rt_export_used(RT_PRIV(c->table));
+      RT_UNLOCK(c->table);
       return;
     }
+
+    RT_UNLOCK(c->table);
   }
 
   /* Process the export */
@@ -1255,10 +1280,9 @@ rte_same(rte *x, rte *y)
 static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
 
 static void
-rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
+rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
 {
   struct rt_import_request *req = c->req;
-  struct rtable *table = c->table;
   struct rt_import_stats *stats = &c->stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
@@ -1521,7 +1545,6 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
-
   if (c->in_table)
     rte_import(&c->in_table->push, n, new, src);
   else
@@ -1575,27 +1598,32 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
   if (!hook)
     return;
 
+  RT_LOCK(hook->table);
+  rtable_private *tab = RT_PRIV(hook->table);
+
   net *nn;
   if (new)
     {
       /* Use the actual struct network, not the dummy one */
-      nn = net_get(hook->table, n);
+      nn = net_get(tab, n);
       new->net = nn->n.addr;
       new->sender = hook;
     }
-  else if (!(nn = net_find(hook->table, n)))
+  else if (!(nn = net_find(tab, n)))
     {
       req->hook->stats.withdraws_ignored++;
+      RT_UNLOCK(tab);
       return;
     }
 
   /* And recalculate the best route */
-  rte_recalculate(hook, nn, new, src);
+  rte_recalculate(tab, hook, nn, new, src);
+  RT_UNLOCK(tab);
 }
 
 /* Check rtable for best route to given net whether it would be exported do p */
 int
-rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
+rt_examine(rtable_private *t, net_addr *a, struct channel *c, const struct filter *filter)
 {
   net *n = net_find(t, a);
 
@@ -1623,22 +1651,27 @@ static void
 rt_export_stopped(void *data)
 {
   struct rt_export_hook *hook = data;
-  rtable *tab = hook->table;
 
-  /* Drop pending exports */
-  rt_export_used(tab);
+  RT_LOCKED(hook->table, tab)
+  {
+    /* Drop pending exports */
+    rt_export_used(tab);
 
-  /* Unlist */
-  rem_node(&hook->n);
+    /* Unlist */
+    rem_node(&hook->n);
+  }
 
   /* Report the channel as stopped. */
   hook->stopped(hook->req);
 
-  /* Free the hook together with its coroutine. */
-  rfree(hook->pool);
-  rt_unlock_table(tab);
+  RT_LOCKED(hook->table, tab)
+  {
+    /* Free the hook together with its coroutine. */
+    rfree(hook->pool);
+    rt_unlock_table(tab);
 
-  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+    DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+  }
 }
 
 
@@ -1663,8 +1696,10 @@ rt_set_export_state(struct rt_export_hook *hook, u8 state)
 }
 
 void
-rt_request_import(rtable *tab, struct rt_import_request *req)
+rt_request_import(rtable *t, struct rt_import_request *req)
 {
+  RT_LOCK(t);
+  rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
   struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
@@ -1672,7 +1707,7 @@ rt_request_import(rtable *tab, struct rt_import_request *req)
   DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
 
   hook->req = req;
-  hook->table = tab;
+  hook->table = t;
 
   if (!hook->stale_set)
     hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 1;
@@ -1681,24 +1716,30 @@ rt_request_import(rtable *tab, struct rt_import_request *req)
 
   hook->n = (node) {};
   add_tail(&tab->imports, &hook->n);
+
+  RT_UNLOCK(t);
 }
 
 void
-rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_request *))
+rt_stop_import(struct rt_import_request *req, event *stopped)
 {
   ASSERT_DIE(req->hook);
   struct rt_import_hook *hook = req->hook;
 
-  rt_schedule_prune(hook->table);
+  RT_LOCK(hook->table);
+  rt_schedule_prune(RT_PRIV(hook->table));
 
   rt_set_import_state(hook, TIS_STOP);
 
   hook->stopped = stopped;
+  RT_UNLOCK(hook->table);
 }
 
 void
-rt_request_export(rtable *tab, struct rt_export_request *req)
+rt_request_export(rtable *t, struct rt_export_request *req)
 {
+  RT_LOCK(t);
+  rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
   pool *p = rp_new(tab->rp, "Export hook");
@@ -1706,7 +1747,7 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
   hook->pool = p;
   
   hook->req = req;
-  hook->table = tab;
+  hook->table = t;
 
   /* stats zeroed by mb_allocz */
 
@@ -1714,7 +1755,7 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
 
   rt_set_export_state(hook, TES_HUNGRY);
 
-  struct rt_pending_export *rpe = rt_last_export(hook->table);
+  struct rt_pending_export *rpe = rt_last_export(tab);
   DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
   atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
 
@@ -1726,9 +1767,11 @@ rt_request_export(rtable *tab, struct rt_export_request *req)
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
   hook->event = ev_new_init(p, rt_feed_channel, hook);
-  rt_send_export_event(hook);
+  RT_UNLOCK(t);
 
   rt_set_export_state(hook, TES_FEEDING);
+  ASSERT_DIE(hook->export_state == TES_FEEDING);
+  rt_send_export_event(hook);
 }
 
 void
@@ -1737,7 +1780,8 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
-  rtable *tab = hook->table;
+  RT_LOCK(hook->table);
+  rtable_private *tab = RT_PRIV(hook->table);
 
   /* Stop feeding */
   ev_postpone(hook->event);
@@ -1750,10 +1794,11 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
 
   rt_send_export_event(hook);
 
+  RT_UNLOCK(hook->table);
+
   rt_set_export_state(hook, TES_STOP);
 }
 
-
 /**
  * rt_refresh_begin - start a refresh cycle
  * @t: related routing table
@@ -1772,14 +1817,17 @@ rt_refresh_begin(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
+  RT_LOCK(hook->table);
+  rtable_private *tab = RT_PRIV(hook->table);
+
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
   /* If the pruning routine is too slow */
   if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
       || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
   {
-    log(L_WARN "Route refresh flood in table %s", hook->table->name);
-    FIB_WALK(&hook->table->fib, net, n)
+    log(L_WARN "Route refresh flood in table %s", tab->name);
+    FIB_WALK(&tab->fib, net, n)
       {
 	for (struct rte_storage *e = n->routes; e; e = e->next)
 	  if (e->rte.sender == req->hook)
@@ -1799,6 +1847,8 @@ rt_refresh_begin(struct rt_import_request *req)
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
+
+  RT_UNLOCK(tab);
 }
 
 /**
@@ -1815,13 +1865,16 @@ rt_refresh_end(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
+  RT_LOCK(hook->table);
   hook->stale_valid++;
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  rt_schedule_prune(hook->table);
+  rt_schedule_prune(RT_PRIV(hook->table));
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+
+  RT_UNLOCK(hook->table);
 }
 
 /**
@@ -1846,8 +1899,10 @@ rte_dump(struct rte_storage *e)
  * This function dumps contents of a given routing table to debug output.
  */
 void
-rt_dump(rtable *t)
+rt_dump(rtable *tab)
 {
+  RT_LOCK(tab);
+  rtable_private *t = RT_PRIV(tab);
   debug("Dump of routing table <%s>%s\n", t->name, t->delete_event ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
@@ -1859,6 +1914,7 @@ rt_dump(rtable *t)
     }
   FIB_WALK_END;
   debug("\n");
+  RT_UNLOCK(tab);
 }
 
 /**
@@ -1877,11 +1933,13 @@ rt_dump_all(void)
 }
 
 void
-rt_dump_hooks(rtable *tab)
+rt_dump_hooks(rtable *t)
 {
+  RT_LOCK(t);
+  rtable_private *tab = RT_PRIV(t);
   debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete_event ? " (deleted)" : "");
   debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
-      tab->nhu_state, ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
+      atomic_load(&tab->nhu_state), ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
       tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
 
@@ -1904,6 +1962,7 @@ rt_dump_hooks(rtable *tab)
        eh, eh->req, eh->refeed_pending, eh->last_state_change, atomic_load_explicit(&eh->export_state, memory_order_relaxed));
   }
   debug("\n");
+  RT_UNLOCK(t);
 }
 
 void
@@ -1921,37 +1980,36 @@ rt_dump_hooks_all(void)
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
-  if (tab->nhu_state == NHU_CLEAN)
-    ev_schedule(tab->nhu_event);
+  atomic_fetch_or_explicit(&tab->nhu_state, NHU_SCHEDULED, memory_order_acq_rel);
+  ev_send_loop(tab->loop, tab->nhu_event);
 
   /* state change:
    *   NHU_CLEAN   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_DIRTY
    */
-  tab->nhu_state |= NHU_SCHEDULED;
 }
 
 void
-rt_schedule_prune(rtable *tab)
+rt_schedule_prune(rtable_private *tab)
 {
   if (tab->prune_state == 0)
-    ev_schedule(tab->prune_event);
+    ev_send_loop(tab->loop, tab->prune_event);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
 }
 
 void
-rt_export_used(rtable *tab)
+rt_export_used(rtable_private *tab)
 {
   if (config->table_debug)
     log(L_TRACE "%s: Export cleanup requested", tab->name);
 
-  ev_schedule(tab->ec_event);
+  ev_send_loop(tab->loop, tab->ec_event);
 }
 
 static inline btime
-rt_settled_time(rtable *tab)
+rt_settled_time(rtable_private *tab)
 {
   ASSUME(tab->base_settle_time != 0);
 
@@ -1962,7 +2020,8 @@ rt_settled_time(rtable *tab)
 static void
 rt_settle_timer(timer *t)
 {
-  rtable *tab = t->data;
+  rtable_private *tab = t->data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
 
   if (!tab->base_settle_time)
     return;
@@ -1970,7 +2029,7 @@ rt_settle_timer(timer *t)
   btime settled_time = rt_settled_time(tab);
   if (current_time() < settled_time)
   {
-    tm_set(tab->settle_timer, settled_time);
+    tm_set_in(tab->settle_timer, settled_time, tab->loop);
     return;
   }
 
@@ -1983,7 +2042,7 @@ rt_settle_timer(timer *t)
 }
 
 static void
-rt_kick_settle_timer(rtable *tab)
+rt_kick_settle_timer(rtable_private *tab)
 {
   tab->base_settle_time = current_time();
 
@@ -1991,11 +2050,11 @@ rt_kick_settle_timer(rtable *tab)
     tab->settle_timer = tm_new_init(tab->rp, rt_settle_timer, tab, 0, 0);
 
   if (!tm_active(tab->settle_timer))
-    tm_set(tab->settle_timer, rt_settled_time(tab));
+    tm_set_in(tab->settle_timer, rt_settled_time(tab), tab->loop);
 }
 
 static inline void
-rt_schedule_notify(rtable *tab)
+rt_schedule_notify(rtable_private *tab)
 {
   if (EMPTY_LIST(tab->subscribers))
     return;
@@ -2007,25 +2066,33 @@ rt_schedule_notify(rtable *tab)
 }
 
 void
-rt_subscribe(rtable *tab, struct rt_subscription *s)
+rt_subscribe(rtable *t, struct rt_subscription *s)
 {
-  s->tab = tab;
-  rt_lock_table(tab);
-  DBG("rt_subscribe(%s)\n", tab->name);
-  add_tail(&tab->subscribers, &s->n);
+  s->tab = t;
+  RT_LOCKED(t, tab)
+  {
+    rt_lock_table(tab);
+    DBG("rt_subscribe(%s)\n", tab->name);
+    add_tail(&tab->subscribers, &s->n);
+  }
 }
 
 void
 rt_unsubscribe(struct rt_subscription *s)
 {
-  rem_node(&s->n);
-  rt_unlock_table(s->tab);
+  RT_LOCKED(s->tab, tab)
+  {
+    rem_node(&s->n);
+    if (EMPTY_LIST(tab->subscribers) && tm_active(tab->settle_timer))
+      tm_stop(tab->settle_timer);
+    rt_unlock_table(tab);
+  }
 }
 
 static void
 rt_free(resource *_r)
 {
-  rtable *r = (rtable *) _r;
+  rtable_private *r = (rtable_private *) _r;
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
@@ -2046,14 +2113,14 @@ rt_free(resource *_r)
 static void
 rt_res_dump(resource *_r)
 {
-  rtable *r = (rtable *) _r;
+  RT_LOCKED((rtable *) _r, r)
   debug("name \"%s\", addr_type=%s, rt_count=%u, use_count=%d\n",
       r->name, net_label[r->addr_type], r->rt_count, r->use_count);
 }
 
 static struct resclass rt_class = {
   .name = "Routing table",
-  .size = sizeof(struct rtable),
+  .size = sizeof(rtable_private),
   .free = rt_free,
   .dump = rt_res_dump,
   .lookup = NULL,
@@ -2068,9 +2135,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   ASSERT_DIE(ns - 1 == bsnprintf(nb, ns, "Routing table %s", cf->name));
 
   pool *p = rp_new(pp, nb);
-  mb_move(nb, p);
 
-  rtable *t = ralloc(p, &rt_class);
+  rtable_private *t = ralloc(p, &rt_class);
   t->rp = p;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
@@ -2090,6 +2156,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
+  t->loop = birdloop_new(p, DOMAIN_ORDER(rtable), nb);
+
   t->ec_event = ev_new_init(p, rt_export_cleanup, t);
   t->prune_event = ev_new_init(p, rt_prune_table, t);
   t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
@@ -2106,7 +2174,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->nhu_lp = lp_new_default(p);
 
-  return t;
+  mb_move(nb, p);
+  return (rtable *) t;
 }
 
 /**
@@ -2141,7 +2210,9 @@ rt_init(void)
 static void
 rt_prune_table(void *data)
 {
-  rtable *tab = data;
+  rtable_private *tab = data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
+
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 512;
 
@@ -2156,6 +2227,8 @@ rt_prune_table(void *data)
   if (tab->prune_state == 0)
     return;
 
+  rt_lock_table(tab);
+
   if (tab->prune_state == 1)
   {
     /* Mark channels to flush */
@@ -2189,11 +2262,12 @@ again:
 	    if (limit <= 0)
 	      {
 		FIB_ITERATE_PUT(fit);
-		ev_schedule(tab->prune_event);
+		ev_send_loop(tab->loop, tab->prune_event);
+		rt_unlock_table(tab);
 		return;
 	      }
 
-	    rte_recalculate(e->rte.sender, n, NULL, e->rte.src);
+	    rte_recalculate(tab, e->rte.sender, n, NULL, e->rte.src);
 	    limit--;
 
 	    goto rescan;
@@ -2217,7 +2291,8 @@ again:
   tab->gc_time = current_time();
 
   /* state change 2->0, 3->1 */
-  tab->prune_state &= 1;
+  if (tab->prune_state &= 1)
+    ev_send_loop(tab->loop, tab->prune_event);
 
   uint flushed_channels = 0;
 
@@ -2240,12 +2315,15 @@ again:
   /* In some cases, we may want to directly proceed to export cleanup */
   if (EMPTY_LIST(tab->exports) && flushed_channels)
     rt_export_cleanup(tab);
+
+  rt_unlock_table(tab);
 }
 
 static void
 rt_export_cleanup(void *data)
 {
-  rtable *tab = data;
+  rtable_private *tab = data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
 
   u64 min_seq = ~((u64) 0);
   struct rt_pending_export *last_export_to_free = NULL;
@@ -2394,7 +2472,7 @@ done:;
       if (!first_export || (first_export->seq >= ih->flush_seq))
       {
 	ih->import_state = TIS_CLEARED;
-	ih->stopped(ih->req);
+	ev_send(ih->stopped->list, ih->stopped);
 	rem_node(&ih->n);
 	mb_free(ih);
 	rt_unlock_table(tab);
@@ -2535,7 +2613,7 @@ no_nexthop:
 }
 
 static inline struct rte_storage *
-rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
+rt_next_hop_update_rte(rtable_private *tab, net *n, rte *old)
 {
   rta *a = alloca(RTA_MAX_SIZE);
   memcpy(a, old->attrs, rta_size(old->attrs));
@@ -2553,7 +2631,7 @@ rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
 }
 
 static inline int
-rt_next_hop_update_net(rtable *tab, net *n)
+rt_next_hop_update_net(rtable_private *tab, net *n)
 {
   struct rte_storage *new;
   int count = 0;
@@ -2638,17 +2716,21 @@ rt_next_hop_update_net(rtable *tab, net *n)
 static void
 rt_next_hop_update(void *data)
 {
-  rtable *tab = data;
+  rtable_private *tab = data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
+
   struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
-  if (tab->nhu_state == NHU_CLEAN)
+  if (atomic_load_explicit(&tab->nhu_state, memory_order_acquire) == NHU_CLEAN)
     return;
 
-  if (tab->nhu_state == NHU_SCHEDULED)
+  rt_lock_table(tab);
+
+  if (atomic_load_explicit(&tab->nhu_state, memory_order_acquire) == NHU_SCHEDULED)
     {
       FIB_ITERATE_INIT(fit, &tab->fib);
-      tab->nhu_state = NHU_RUNNING;
+      ASSERT_DIE(atomic_exchange_explicit(&tab->nhu_state, NHU_RUNNING, memory_order_acq_rel) == NHU_SCHEDULED);
     }
 
   FIB_ITERATE_START(&tab->fib, fit, net, n)
@@ -2656,7 +2738,8 @@ rt_next_hop_update(void *data)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule(tab->nhu_event);
+	  ev_send_loop(tab->loop, tab->nhu_event);
+	  rt_unlock_table(tab);
 	  return;
 	}
       max_feed -= rt_next_hop_update_net(tab, n);
@@ -2667,10 +2750,10 @@ rt_next_hop_update(void *data)
    *   NHU_DIRTY   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_CLEAN
    */
-  tab->nhu_state &= 1;
+  if (atomic_fetch_and_explicit(&tab->nhu_state, NHU_SCHEDULED, memory_order_acq_rel) != NHU_RUNNING)
+    ev_send_loop(tab->loop, tab->nhu_event);
 
-  if (tab->nhu_state != NHU_CLEAN)
-    ev_schedule(tab->nhu_event);
+  rt_unlock_table(tab);
 }
 
 
@@ -2713,11 +2796,22 @@ rt_new_table(struct symbol *s, uint addr_type)
  * configuration.
  */
 void
-rt_lock_table(rtable *r)
+rt_lock_table(rtable_private *r)
 {
   r->use_count++;
 }
 
+static void
+rt_loop_stopped(void *data)
+{
+  rtable_private *r = data;
+  birdloop_free(r->loop);
+  r->loop = NULL;
+  r->prune_event->list = r->ec_event->list = NULL;
+  r->nhu_event->list = r->hcu_event->list = NULL;
+  ev_send(r->delete_event->list, r->delete_event);
+}
+
 /**
  * rt_unlock_table - unlock a routing table
  * @r: routing table to be unlocked
@@ -2727,14 +2821,14 @@ rt_lock_table(rtable *r)
  * for deletion by configuration changes.
  */
 void
-rt_unlock_table(rtable *r)
+rt_unlock_table(rtable_private *r)
 {
-  if (!--r->use_count && r->delete_event)
+  if (!--r->use_count && r->delete_event &&
+      !r->prune_state && !atomic_load_explicit(&r->nhu_state, memory_order_acquire))
     /* Delete the routing table by freeing its pool */
-    ev_schedule(r->delete_event);
+    birdloop_stop_self(r->loop, rt_loop_stopped, r);
 }
 
-
 static struct rtable_config *
 rt_find_table_config(struct config *cf, char *name)
 {
@@ -2745,7 +2839,9 @@ rt_find_table_config(struct config *cf, char *name)
 static void
 rt_done(void *data)
 {
-  rtable *t = data;
+  rtable_private *t = data;
+  ASSERT_DIE(t->loop == NULL);
+
   struct rtable_config *tc = t->config;
   struct config *c = tc->config;
 
@@ -2755,6 +2851,7 @@ rt_done(void *data)
   if (t->hostcache)
     rt_free_hostcache(t);
 
+  rfree(t->delete_event);
   rfree(t->rp);
 
   config_del_obstacle(c);
@@ -2782,14 +2879,15 @@ rt_commit(struct config *new, struct config *old)
     {
       WALK_LIST(o, old->tables)
 	{
-	  rtable *ot = o->table;
+	  RT_LOCK(o->table);
+	  rtable_private *ot = RT_PRIV(o->table);
 	  if (!ot->delete_event)
 	    {
 	      r = rt_find_table_config(new, o->name);
 	      if (r && (r->addr_type == o->addr_type) && !new->shutdown)
 		{
 		  DBG("\t%s: same\n", o->name);
-		  r->table = ot;
+		  r->table = (rtable *) ot;
 		  ot->name = r->name;
 		  ot->config = r;
 		  if (o->sorted != r->sorted)
@@ -2799,11 +2897,13 @@ rt_commit(struct config *new, struct config *old)
 		{
 		  DBG("\t%s: deleted\n", o->name);
 		  rt_lock_table(ot);
-		  ot->delete_event = ev_new_init(ot->rp, rt_done, ot);
+		  ot->delete_event = ev_new_init(&root_pool, rt_done, ot);
+		  ot->delete_event->list = &global_event_list;
 		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
 	    }
+	  RT_UNLOCK(o->table);
 	}
     }
 
@@ -2834,46 +2934,98 @@ rt_feed_channel(void *data)
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
+  RT_LOCK(c->table);
+  rtable_private *tab = RT_PRIV(c->table);
+
   ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
 
-  FIB_ITERATE_START(&c->table->fib, fit, net, n)
+redo:
+  FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
 	  rt_send_export_event(c);
+
+	  RT_UNLOCK(c->table);
 	  return;
 	}
 
       if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_FEEDING)
+      {
+	RT_UNLOCK(c->table);
 	return;
+      }
 
-      if (c->req->export_bulk)
+      if (!n->routes || !rte_is_valid(&n->routes->rte))
+	; /* if no route, do nothing */
+      else if (c->req->export_bulk)
       {
 	uint count = rte_feed_count(n);
 	if (count)
 	{
 	  rte **feed = alloca(count * sizeof(rte *));
 	  rte_feed_obtain(n, feed, count);
+
+	  struct rt_pending_export *rpe_last, *rpe_first = n->first;
+	  for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
+	    rpe_last = rpe;
+
+	  FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
+	  RT_UNLOCK(c->table);
+
 	  c->req->export_bulk(c->req, n->n.addr, NULL, feed, count);
+
+	  RT_LOCK(c->table);
+
+	  for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
+	  {
+	    rpe_mark_seen(c, rpe);
+	    if (rpe == rpe_last)
+	      break;
+	    ASSERT_DIE(rpe->seq < rpe_last->seq);
+	  }
+
 	  max_feed -= count;
+
+	  goto redo;
 	}
       }
-      else if (n->routes && rte_is_valid(&n->routes->rte))
+      else if (c->req->export_one)
       {
 	struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
-	c->req->export_one(c->req, n->n.addr, &rpe);
-	max_feed--;
-      }
 
-      for (struct rt_pending_export *rpe = n->first; rpe; rpe = rpe_next(rpe, NULL))
-	rpe_mark_seen(c, rpe);
+	struct rt_pending_export *rpe_last, *rpe_first = n->first;
+	for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
+	  rpe_last = rpe;
+
+	FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
+	RT_UNLOCK(c->table);
+
+	c->req->export_one(c->req, n->n.addr, &rpe);
+
+	RT_LOCK(c->table);
+	for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
+	{
+	  rpe_mark_seen(c, rpe);
+	  if (rpe == rpe_last)
+	    break;
+	  ASSERT_DIE(rpe->seq < rpe_last->seq);
+	}
+
+	max_feed--;
+	goto redo;
+      }
+      else
+	bug("Export request must always provide an export method");
     }
   FIB_ITERATE_END;
 
   c->event->hook = rt_export_hook;
   rt_send_export_event(c);
 
+  RT_UNLOCK(c->table);
+
   rt_set_export_state(c, TES_READY);
 }
 
@@ -2981,7 +3133,7 @@ hc_delete_hostentry(struct hostcache *hc, pool *p, struct hostentry *he)
 }
 
 static void
-rt_init_hostcache(rtable *tab)
+rt_init_hostcache(rtable_private *tab)
 {
   struct hostcache *hc = mb_allocz(tab->rp, sizeof(struct hostcache));
   init_list(&hc->hostentries);
@@ -2997,7 +3149,7 @@ rt_init_hostcache(rtable *tab)
 }
 
 static void
-rt_free_hostcache(rtable *tab)
+rt_free_hostcache(rtable_private *tab)
 {
   struct hostcache *hc = tab->hostcache;
 
@@ -3020,13 +3172,13 @@ rt_free_hostcache(rtable *tab)
 }
 
 static void
-rt_notify_hostcache(rtable *tab, net *net)
+rt_notify_hostcache(rtable_private *tab, net *net)
 {
   if (ev_active(tab->hcu_event))
     return;
 
   if (trie_match_net(tab->hostcache->trie, net->n.addr))
-    ev_schedule(tab->hcu_event);
+    ev_send_loop(tab->loop, tab->hcu_event);
 }
 
 static int
@@ -3059,7 +3211,7 @@ rt_get_igp_metric(rte *rt)
 }
 
 static int
-rt_update_hostentry(rtable *tab, struct hostentry *he)
+rt_update_hostentry(rtable_private *tab, struct hostentry *he)
 {
   rta *old_src = he->src;
   int direct = 0;
@@ -3125,7 +3277,9 @@ done:
 static void
 rt_update_hostcache(void *data)
 {
-  rtable *tab = data;
+  rtable_private *tab = data;
+  ASSERT_DIE(birdloop_inside(tab->loop));
+
   struct hostcache *hc = tab->hostcache;
   struct hostentry *he;
   node *n, *x;
@@ -3149,10 +3303,12 @@ rt_update_hostcache(void *data)
 }
 
 struct hostentry *
-rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
+rt_get_hostentry(rtable *t, ip_addr a, ip_addr ll, rtable *dep)
 {
   struct hostentry *he;
 
+  rtable_private *tab = RT_LOCK(t);
+
   if (!tab->hostcache)
     rt_init_hostcache(tab);
 
@@ -3160,10 +3316,13 @@ rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
   struct hostcache *hc = tab->hostcache;
   for (he = hc->hash_table[k >> hc->hash_shift]; he != NULL; he = he->next)
     if (ipa_equal(he->addr, a) && (he->tab == dep))
-      return he;
+      goto done;
 
   he = hc_new_hostentry(hc, tab->rp, a, ipa_zero(ll) ? a : ll, dep, k);
   rt_update_hostentry(tab, he);
+
+done:
+  RT_UNLOCK(t);
   return he;
 }
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 9b9013f9..1080db77 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2140,7 +2140,7 @@ use_deterministic_med(struct rte_storage *r)
 }
 
 int
-bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
+bgp_rte_recalculate(rtable_private *table, net *net, rte *new, rte *old, rte *old_best)
 {
   rte *key = new ? new : old;
   u32 lpref = key->attrs->pref;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index dc845550..aac1f45c 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1800,10 +1800,12 @@ bgp_channel_start(struct channel *C)
   ip_addr src = p->local_ip;
 
   if (c->igp_table_ip4)
-    rt_lock_table(c->igp_table_ip4);
+    RT_LOCKED(c->igp_table_ip4, t)
+      rt_lock_table(t);
 
   if (c->igp_table_ip6)
-    rt_lock_table(c->igp_table_ip6);
+    RT_LOCKED(c->igp_table_ip6, t)
+      rt_lock_table(t);
 
   c->pool = p->p.pool; // XXXX
   bgp_init_bucket_table(c);
@@ -1884,10 +1886,12 @@ bgp_channel_cleanup(struct channel *C)
   struct bgp_channel *c = (void *) C;
 
   if (c->igp_table_ip4)
-    rt_unlock_table(c->igp_table_ip4);
+    RT_LOCKED(c->igp_table_ip4, t)
+      rt_unlock_table(t);
 
   if (c->igp_table_ip6)
-    rt_unlock_table(c->igp_table_ip6);
+    RT_LOCKED(c->igp_table_ip6, t)
+      rt_unlock_table(t);
 
   c->index = 0;
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 7cb4df1f..60f93bce 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -586,7 +586,7 @@ void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
 
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
-int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
+int bgp_rte_recalculate(rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
 void bgp_rte_modify_stale(struct rt_export_request *, const net_addr *, struct rt_pending_export *, rte **, uint);
 u32 bgp_rte_igp_metric(struct rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 9d78438d..b40592d2 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -228,7 +228,7 @@ mrt_next_table_(rtable *tab, rtable *tab_ptr, const char *pattern)
        NODE_VALID(tn);
        tn = tn->next)
   {
-    tab = SKIP_BACK(struct rtable, n, tn);
+    tab = SKIP_BACK(rtable, n, tn);
     if (patmatch(pattern, tab->name) &&
 	((tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6)))
       return tab;
@@ -243,13 +243,21 @@ mrt_next_table(struct mrt_table_dump_state *s)
   rtable *tab = mrt_next_table_(s->table, s->table_ptr, s->table_expr);
 
   if (s->table)
-    rt_unlock_table(s->table);
+  {
+    RT_LOCK(s->table);
+    rt_unlock_table(RT_PRIV(s->table));
+    RT_UNLOCK(s->table);
+  }
 
   s->table = tab;
   s->ipv4 = tab ? (tab->addr_type == NET_IP4) : 0;
 
   if (s->table)
-    rt_lock_table(s->table);
+  {
+    RT_LOCK(s->table);
+    rt_lock_table(RT_PRIV(s->table));
+    RT_UNLOCK(s->table);
+  }
 
   return s->table;
 }
@@ -573,14 +581,23 @@ mrt_table_dump_init(pool *pp)
 static void
 mrt_table_dump_free(struct mrt_table_dump_state *s)
 {
-  if (s->table_open)
-    FIB_ITERATE_UNLINK(&s->fit, &s->table->fib);
-
   if (s->table)
-    rt_unlock_table(s->table);
+  {
+    RT_LOCK(s->table);
+
+    if (s->table_open)
+      FIB_ITERATE_UNLINK(&s->fit, &RT_PRIV(s->table)->fib);
+
+    rt_unlock_table(RT_PRIV(s->table));
+    RT_UNLOCK(s->table);
+  }
 
   if (s->table_ptr)
-    rt_unlock_table(s->table_ptr);
+  {
+    RT_LOCK(s->table_ptr);
+    rt_unlock_table(RT_PRIV(s->table_ptr));
+    RT_UNLOCK(s->table_ptr);
+  }
 
   config_del_obstacle(s->config);
 
@@ -596,8 +613,14 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
   s->max = 2048;
   s->bws = &bws;
 
+  rtable_private *tab;
+
   if (s->table_open)
+  {
+    RT_LOCK(s->table);
+    tab = RT_PRIV(s->table);
     goto step;
+  }
 
   while (mrt_next_table(s))
   {
@@ -606,15 +629,18 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
 
     mrt_peer_table_dump(s);
 
-    FIB_ITERATE_INIT(&s->fit, &s->table->fib);
+    RT_LOCK(s->table);
+    tab = RT_PRIV(s->table);
+    FIB_ITERATE_INIT(&s->fit, &tab->fib);
     s->table_open = 1;
 
   step:
-    FIB_ITERATE_START(&s->table->fib, &s->fit, net, n)
+    FIB_ITERATE_START(&tab->fib, &s->fit, net, n)
     {
       if (s->max < 0)
       {
 	FIB_ITERATE_PUT(&s->fit);
+	RT_UNLOCK(s->table);
 	return 0;
       }
 
@@ -634,6 +660,7 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
     mrt_peer_table_flush(s);
   }
 
+  RT_UNLOCK(s->table);
   return 1;
 }
 
@@ -661,7 +688,11 @@ mrt_timer(timer *t)
   s->always_add_path = cf->always_add_path;
 
   if (s->table_ptr)
-    rt_lock_table(s->table_ptr);
+  {
+    RT_LOCK(s->table_ptr);
+    rt_lock_table(RT_PRIV(s->table_ptr));
+    RT_UNLOCK(s->table_ptr);
+  }
 
   p->table_dump = s;
   ev_schedule(p->event);
@@ -734,7 +765,11 @@ mrt_dump_cmd(struct mrt_dump_data *d)
   s->filename = d->filename;
 
   if (s->table_ptr)
-    rt_lock_table(s->table_ptr);
+  {
+    RT_LOCK(s->table_ptr);
+    rt_lock_table(RT_PRIV(s->table_ptr));
+    RT_UNLOCK(s->table_ptr);
+  }
 
   this_cli->cont = mrt_dump_cont;
   this_cli->cleanup = mrt_dump_cleanup;
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index 4ff94c12..04865089 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -40,7 +40,7 @@ struct mrt_proto {
 
 struct mrt_dump_data {
   const char *table_expr;
-  struct rtable *table_ptr;
+  rtable *table_ptr;
   const struct filter *filter;
   const char *filename;
 };
@@ -60,7 +60,7 @@ struct mrt_table_dump_state {
 
 					/* Configuration information */
   const char *table_expr;		/* Wildcard for table name (or NULL) */
-  struct rtable *table_ptr;		/* Explicit table (or NULL) */
+  rtable *table_ptr;			/* Explicit table (or NULL) */
   const struct filter *filter;		/* Optional filter */
   const char *filename;			/* Filename pattern */
   int always_add_path;			/* Always use *_ADDPATH message subtypes */
@@ -73,7 +73,7 @@ struct mrt_table_dump_state {
 
   HASH(struct mrt_peer_entry) peer_hash; /* Hash for peers to find the index */
 
-  struct rtable *table;			/* Processed table, NULL initially */
+  rtable *table;			/* Processed table, NULL initially */
   struct fib_iterator fit;		/* Iterator in processed table */
   int table_open;			/* Whether iterator is linked */
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 8b2cb69f..aa688d88 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -198,7 +198,9 @@ perf_loop(void *data)
     p->exp++;
   }
 
-  rt_schedule_prune(P->main_channel->table);
+  RT_LOCK(P->main_channel->table);
+  rt_schedule_prune(RT_PRIV(P->main_channel->table));
+  RT_UNLOCK(P->main_channel->table);
   ev_schedule(p->loop);
 }
 
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index fa228c69..d572c1b7 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -555,7 +555,10 @@ radv_check_active(struct radv_proto *p)
     return 1;
 
   struct channel *c = p->p.main_channel;
-  return rt_examine(c->table, &cf->trigger, c, c->out_filter);
+  RT_LOCK(c->table);
+  int active = rt_examine(RT_PRIV(c->table), &cf->trigger, c, c->out_filter);
+  RT_UNLOCK(c->table);
+  return active;
 }
 
 static void
diff --git a/proto/static/static.c b/proto/static/static.c
index 45791e8e..bd7f3f5b 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -491,10 +491,12 @@ static_start(struct proto *P)
     static_lp = lp_new(&root_pool, LP_GOOD_SIZE(1024));
 
   if (p->igp_table_ip4)
-    rt_lock_table(p->igp_table_ip4);
+    RT_LOCKED(p->igp_table_ip4, t)
+      rt_lock_table(t);
 
   if (p->igp_table_ip6)
-    rt_lock_table(p->igp_table_ip6);
+    RT_LOCKED(p->igp_table_ip6, t)
+      rt_lock_table(t);
 
   p->event = ev_new_init(p->p.pool, static_announce_marked, p);
 
@@ -521,10 +523,12 @@ static_shutdown(struct proto *P)
     static_reset_rte(p, r);
 
   if (p->igp_table_ip4)
-    rt_unlock_table(p->igp_table_ip4);
+    RT_LOCKED(p->igp_table_ip4, t)
+      rt_unlock_table(t);
 
   if (p->igp_table_ip6)
-    rt_unlock_table(p->igp_table_ip6);
+    RT_LOCKED(p->igp_table_ip6, t)
+      rt_unlock_table(t);
 
   return PS_DOWN;
 }
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 5431bebe..98c56391 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -427,6 +427,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 #endif
   /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
 
+  RT_LOCK(p->p.main_channel->table);
   /* Deleting all routes if flush is requested */
   if (p->flush_routes)
     goto delete;
@@ -435,7 +436,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   if (!p->ready)
     goto ignore;
 
-  net *net = net_find(p->p.main_channel->table, e->net);
+  net *net = net_find(RT_PRIV(p->p.main_channel->table), e->net);
   if (!net || !krt_is_installed(p, net))
     goto delete;
 
@@ -481,6 +482,7 @@ delete:
   goto done;
 
 done:
+  RT_UNLOCK(p->p.main_channel->table);
   lp_flush(krt_filter_lp);
 }
 
@@ -498,7 +500,8 @@ krt_init_scan(struct krt_proto *p)
 static void
 krt_prune(struct krt_proto *p)
 {
-  struct rtable *t = p->p.main_channel->table;
+  RT_LOCK(p->p.main_channel->table);
+  rtable_private *t = RT_PRIV(p->p.main_channel->table);
 
   KRT_TRACE(p, D_EVENTS, "Pruning table %s", t->name);
   FIB_WALK(&t->fib, net, n)
@@ -518,6 +521,8 @@ krt_prune(struct krt_proto *p)
   }
   FIB_WALK_END;
 
+  RT_UNLOCK(p->p.main_channel->table);
+
 #ifdef KRT_ALLOW_LEARN
   if (KRT_CF->learn)
     channel_refresh_end(p->p.main_channel);

From 4f3fa1623f66acd24c227cf0cc5a4af2f5133b6c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 18 Oct 2021 21:22:58 +0200
Subject: [PATCH 043/431] Pipe runs in parallel.

---
 nest/proto.c        | 1 +
 proto/pipe/config.Y | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nest/proto.c b/nest/proto.c
index 4ae0cbfd..623585f1 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1413,6 +1413,7 @@ proto_event(void *ptr)
   {
     if (p->proto == &proto_unix_iface)
       if_flush_ifaces(p);
+
     p->do_stop = 0;
   }
 
diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y
index c869de9f..fc08445f 100644
--- a/proto/pipe/config.Y
+++ b/proto/pipe/config.Y
@@ -25,6 +25,7 @@ proto: pipe_proto '}' { this_channel = NULL; }  ;
 pipe_proto_start: proto_start PIPE
 {
   this_proto = proto_config_new(&proto_pipe, $1);
+  this_proto->loop_order = DOMAIN_ORDER(proto);
   PIPE_CFG->max_generation = 16;
 }
 proto_name

From dc160e11e1a9e4344bbee6fd0bc8aee229d7c540 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Fri, 12 Nov 2021 15:53:33 +0000
Subject: [PATCH 044/431] Route table import-to-export announcement indirection
 to reduce pipe traffic

---
 nest/proto.c    |  3 +++
 nest/route.h    |  7 ++++---
 nest/rt-table.c | 53 ++++++++++++++++++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 623585f1..b7dbae5e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -468,6 +468,7 @@ channel_start_import(struct channel *c)
 
   c->in_req = (struct rt_import_request) {
     .name = rn,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
@@ -886,6 +887,7 @@ channel_setup_in_table(struct channel *c, int best)
   c->in_table = &cat->cat;
   c->in_table->push = (struct rt_import_request) {
     .name = cat->name,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_in_push_dump_req,
     .log_state_change = channel_push_log_state_change,
@@ -928,6 +930,7 @@ channel_setup_out_table(struct channel *c)
   c->out_table = &cat->cat;
   c->out_table->push = (struct rt_import_request) {
     .name = cat->name,
+    .list = proto_work_list(c->proto),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_out_push_dump_req,
     .log_state_change = channel_push_log_state_change,
diff --git a/nest/route.h b/nest/route.h
index 9417d97d..3f8bf433 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -170,6 +170,7 @@ typedef struct rtable_private {
   struct hmap id_map;
   struct hostcache *hostcache;
   struct event *prune_event;		/* Event to prune abandoned routes */
+  struct event *announce_event;		/* Event to announce pending exports */
   struct event *ec_event;		/* Event to prune finished exports */
   struct event *hcu_event;		/* Event to update host cache */
   struct event *delete_event;		/* Event to delete the table */
@@ -191,8 +192,6 @@ typedef struct rtable_private {
   struct timer *settle_timer;		/* Settle time for notifications */
 
   list pending_exports;			/* List of packed struct rt_pending_export */
-  btime base_export_time;		/* When first pending export was announced */
-  struct timer *export_timer;
 
   struct rt_pending_export *first_export;	/* First export to announce */
   u64 next_export_seq;			/* The next export will have this ID */
@@ -221,7 +220,6 @@ struct rtable_config {
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
-  btime export_settle_time;		/* Delay before exports are announced */
   uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
 };
 
@@ -309,6 +307,8 @@ struct rt_import_request {
   char *name;
   u8 trace_routes;
 
+  event_list *list;			/* Where to schedule import events */
+
   void (*dump_req)(struct rt_import_request *req);
   void (*log_state_change)(struct rt_import_request *req, u8 state);
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
@@ -339,6 +339,7 @@ struct rt_import_hook {
   u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
   u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
+  struct event *export_announce_event;	/* Event to run to announce new exports */
   struct event *stopped;		/* Event to run when import is stopped */
 };
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f304372f..f33b9153 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1023,8 +1023,6 @@ rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_
       rt_notify_hostcache(tab, net);
   }
 
-  rt_schedule_notify(tab);
-
   if (EMPTY_LIST(tab->exports) && EMPTY_LIST(tab->pending_exports))
   {
     /* No export hook and no pending exports to cleanup. We may free the route immediately. */
@@ -1105,10 +1103,7 @@ rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_
   {
     ev_cork(&rt_cork);
     tab->cork_active = 1;
-    tm_start_in(tab->export_timer, 0, tab->loop);
   }
-  else if (!tm_active(tab->export_timer))
-    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 }
 
 static struct rt_pending_export *
@@ -1158,11 +1153,13 @@ rt_send_export_event(struct rt_export_hook *hook)
 }
 
 static void
-rt_announce_exports(timer *tm)
+rt_announce_exports(void *data)
 {
-  rtable_private *tab = tm->data;
+  rtable_private *tab = data;
   ASSERT_DIE(birdloop_inside(tab->loop));
 
+  rt_schedule_notify(tab);
+
   struct rt_export_hook *c; node *n;
   WALK_LIST2(c, n, tab->exports, n)
   {
@@ -1173,6 +1170,26 @@ rt_announce_exports(timer *tm)
   }
 }
 
+static void
+rt_import_announce_exports(void *data)
+{
+  struct rt_import_hook *hook = data;
+  RT_LOCKED(hook->table, tab)
+  {
+    if (hook->import_state == TIS_CLEARED)
+    {
+      rfree(hook->export_announce_event);
+
+      ev_send(hook->stopped->list, hook->stopped);
+      rem_node(&hook->n);
+      mb_free(hook);
+      rt_unlock_table(tab);
+    }
+    else
+      ev_send_loop(tab->loop, tab->announce_event);
+  }
+}
+
 static struct rt_pending_export *
 rt_last_export(rtable_private *tab)
 {
@@ -1471,6 +1488,8 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
   rte_announce(table, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
+  ev_send(req->list, c->export_announce_event);
+
   if (!net->routes &&
       (table->gc_counter++ >= table->config->gc_max_ops) &&
       (table->gc_time + table->config->gc_min_time <= current_time()))
@@ -1709,6 +1728,8 @@ rt_request_import(rtable *t, struct rt_import_request *req)
   hook->req = req;
   hook->table = t;
 
+  hook->export_announce_event = ev_new_init(tab->rp, rt_import_announce_exports, hook);
+
   if (!hook->stale_set)
     hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 1;
 
@@ -1727,11 +1748,12 @@ rt_stop_import(struct rt_import_request *req, event *stopped)
   struct rt_import_hook *hook = req->hook;
 
   RT_LOCK(hook->table);
+
   rt_schedule_prune(RT_PRIV(hook->table));
 
   rt_set_import_state(hook, TIS_STOP);
-
   hook->stopped = stopped;
+
   RT_UNLOCK(hook->table);
 }
 
@@ -2158,6 +2180,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->loop = birdloop_new(p, DOMAIN_ORDER(rtable), nb);
 
+  t->announce_event = ev_new_init(p, rt_announce_exports, t);
   t->ec_event = ev_new_init(p, rt_export_cleanup, t);
   t->prune_event = ev_new_init(p, rt_prune_table, t);
   t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
@@ -2166,7 +2189,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->nhu_event->cork = &rt_cork;
   t->prune_event->cork = &rt_cork;
 
-  t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
   t->next_export_seq = 1;
 
@@ -2472,15 +2494,11 @@ done:;
       if (!first_export || (first_export->seq >= ih->flush_seq))
       {
 	ih->import_state = TIS_CLEARED;
-	ev_send(ih->stopped->list, ih->stopped);
-	rem_node(&ih->n);
-	mb_free(ih);
-	rt_unlock_table(tab);
+	ev_send(ih->req->list, ih->export_announce_event);
       }
 
-
-  if (EMPTY_LIST(tab->pending_exports) && tm_active(tab->export_timer))
-    tm_stop(tab->export_timer);
+  if (EMPTY_LIST(tab->pending_exports) && ev_active(tab->announce_event))
+    ev_postpone(tab->announce_event);
 
   /* If reduced to at most one export block pending */
   if (tab->cork_active &&
@@ -2753,6 +2771,8 @@ rt_next_hop_update(void *data)
   if (atomic_fetch_and_explicit(&tab->nhu_state, NHU_SCHEDULED, memory_order_acq_rel) != NHU_RUNNING)
     ev_send_loop(tab->loop, tab->nhu_event);
 
+  ev_send_loop(tab->loop, tab->announce_event);
+
   rt_unlock_table(tab);
 }
 
@@ -2809,6 +2829,7 @@ rt_loop_stopped(void *data)
   r->loop = NULL;
   r->prune_event->list = r->ec_event->list = NULL;
   r->nhu_event->list = r->hcu_event->list = NULL;
+  r->announce_event->list = NULL;
   ev_send(r->delete_event->list, r->delete_event);
 }
 

From adf37d8eff8f281871295c402a51ae1dd654851c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 15 Nov 2021 10:53:58 +0100
Subject: [PATCH 045/431] VRF setting reduced to one argument, using default
 dummy iface for default vrf

---
 nest/config.Y   |  4 ++--
 nest/iface.c    | 13 +++++++++----
 nest/iface.h    |  2 ++
 nest/neighbor.c | 10 +++++-----
 nest/proto.c    |  8 +++-----
 nest/protocol.h |  2 --
 proto/bfd/bfd.c |  2 +-
 7 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/nest/config.Y b/nest/config.Y
index 6e7689ed..0914048b 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -266,8 +266,8 @@ proto_item:
  | MRTDUMP mrtdump_mask { this_proto->mrtdump = $2; }
  | ROUTER ID idval { this_proto->router_id = $3; }
  | DESCRIPTION text { this_proto->dsc = $2; }
- | VRF text { this_proto->vrf = if_get_by_name($2); this_proto->vrf_set = 1; }
- | VRF DEFAULT { this_proto->vrf = NULL; this_proto->vrf_set = 1; }
+ | VRF text { this_proto->vrf = if_get_by_name($2); }
+ | VRF DEFAULT { this_proto->vrf = &default_vrf; }
  ;
 
 
diff --git a/nest/iface.c b/nest/iface.c
index 83a633a3..5cb9e814 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -37,6 +37,7 @@
 static pool *if_pool;
 
 list iface_list;
+struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
 
@@ -147,7 +148,7 @@ ifa_send_notify(struct proto *p, unsigned c, struct ifa *a)
 {
   if (p->ifa_notify &&
       (p->proto_state != PS_DOWN) &&
-      (!p->vrf_set || p->vrf == a->iface->master))
+      (!p->vrf || p->vrf == a->iface->master))
     {
       if (p->debug & D_IFACES)
 	log(L_TRACE "%s < address %N on interface %s %s",
@@ -185,7 +186,7 @@ if_send_notify(struct proto *p, unsigned c, struct iface *i)
 {
   if (p->if_notify &&
       (p->proto_state != PS_DOWN) &&
-      (!p->vrf_set || p->vrf == i->master))
+      (!p->vrf || p->vrf == i->master))
     {
       if (p->debug & D_IFACES)
 	log(L_TRACE "%s < interface %s %s", p->name, i->name,
@@ -243,7 +244,7 @@ if_recalc_flags(struct iface *i UNUSED, uint flags)
 {
   if ((flags & IF_ADMIN_UP) &&
       !(flags & (IF_SHUTDOWN | IF_TMP_DOWN)) &&
-      !(i->master_index && !i->master))
+      !(i->master_index && i->master == &default_vrf))
     flags |= IF_UP;
   else
     flags &= ~IF_UP;
@@ -301,6 +302,9 @@ if_update(struct iface *new)
   struct iface *i;
   unsigned c;
 
+  if (!new->master)
+    new->master = &default_vrf;
+
   WALK_LIST(i, iface_list)
     if (!strcmp(new->name, i->name))
       {
@@ -711,6 +715,7 @@ if_init(void)
 {
   if_pool = rp_new(&root_pool, "Interfaces");
   init_list(&iface_list);
+  strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
 }
 
@@ -843,7 +848,7 @@ if_show(void)
 	continue;
 
       char mbuf[16 + sizeof(i->name)] = {};
-      if (i->master)
+      if (i->master != &default_vrf)
 	bsprintf(mbuf, " master=%s", i->master->name);
       else if (i->master_index)
 	bsprintf(mbuf, " master=#%u", i->master_index);
diff --git a/nest/iface.h b/nest/iface.h
index 1189cdd4..13f3bd12 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -28,6 +28,8 @@ struct ifa {				/* Interface address */
   unsigned flags;			/* Analogous to iface->flags */
 };
 
+extern struct iface default_vrf;
+
 struct iface {
   node n;
   char name[16];
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 1a31fb79..cb2d1b2b 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -142,7 +142,7 @@ if_connected(ip_addr a, struct iface *i, struct ifa **ap, uint flags)
 }
 
 static inline int
-if_connected_any(ip_addr a, struct iface *vrf, uint vrf_set, struct iface **iface, struct ifa **addr, uint flags)
+if_connected_any(ip_addr a, struct iface *vrf, struct iface **iface, struct ifa **addr, uint flags)
 {
   struct iface *i;
   struct ifa *b;
@@ -153,7 +153,7 @@ if_connected_any(ip_addr a, struct iface *vrf, uint vrf_set, struct iface **ifac
 
   /* Prefer SCOPE_HOST or longer prefix */
   WALK_LIST(i, iface_list)
-    if ((!vrf_set || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
+    if ((!vrf || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
       if (scope_better(s, scope) || (scope_remote(s, scope) && ifa_better(b, *addr)))
       {
 	*iface = i;
@@ -245,7 +245,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
     iface = (scope < 0) ? NULL : iface;
   }
   else
-    scope = if_connected_any(a, p->vrf, p->vrf_set, &iface, &addr, flags);
+    scope = if_connected_any(a, p->vrf, &iface, &addr, flags);
 
   /* scope < 0 means i don't know neighbor */
   /* scope >= 0  <=>  iface != NULL */
@@ -369,7 +369,7 @@ neigh_update(neighbor *n, struct iface *iface)
     return;
 
   /* VRF-bound neighbors ignore changes in other VRFs */
-  if (p->vrf_set && (p->vrf != iface->master))
+  if (p->vrf && (p->vrf != iface->master))
     return;
 
   scope = if_connected(n->addr, iface, &ifa, n->flags);
@@ -379,7 +379,7 @@ neigh_update(neighbor *n, struct iface *iface)
   {
     /* When neighbor is going down, try to respawn it on other ifaces */
     if ((scope < 0) && (n->scope >= 0) && !n->ifreq && (n->flags & NEF_STICKY))
-      scope = if_connected_any(n->addr, p->vrf, p->vrf_set, &iface, &ifa, n->flags);
+      scope = if_connected_any(n->addr, p->vrf, &iface, &ifa, n->flags);
   }
   else
   {
diff --git a/nest/proto.c b/nest/proto.c
index b7dbae5e..8babedee 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1469,7 +1469,6 @@ proto_init(struct proto_config *c, node *n)
   p->proto_state = PS_DOWN;
   p->last_state_change = current_time();
   p->vrf = c->vrf;
-  p->vrf_set = c->vrf_set;
   insert_node(&p->n, n);
 
   p->event = ev_new_init(proto_pool, proto_event, p);
@@ -1654,8 +1653,7 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
   if ((nc->protocol != oc->protocol) ||
       (nc->net_type != oc->net_type) ||
       (nc->disabled != p->disabled) ||
-      (nc->vrf != oc->vrf) ||
-      (nc->vrf_set != oc->vrf_set))
+      (nc->vrf != oc->vrf))
     return 0;
 
   p->name = nc->name;
@@ -2626,8 +2624,8 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
       cli_msg(-1006, "  Message:        %s", p->message);
     if (p->cf->router_id)
       cli_msg(-1006, "  Router ID:      %R", p->cf->router_id);
-    if (p->vrf_set)
-      cli_msg(-1006, "  VRF:            %s", p->vrf ? p->vrf->name : "default");
+    if (p->vrf)
+      cli_msg(-1006, "  VRF:            %s", p->vrf->name);
 
     if (p->proto->show_proto_info)
       p->proto->show_proto_info(p);
diff --git a/nest/protocol.h b/nest/protocol.h
index 8d077e44..1d4f2059 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -117,7 +117,6 @@ struct proto_config {
   int class;				/* SYM_PROTO or SYM_TEMPLATE */
   u8 net_type;				/* Protocol network type (NET_*), 0 for undefined */
   u8 disabled;				/* Protocol enabled/disabled by default */
-  u8 vrf_set;				/* Related VRF instance (below) is defined */
   u8 late_if_feed;			/* Delay interface feed after channels are up */
   u32 debug, mrtdump;			/* Debugging bitfields, both use D_* constants */
   u32 router_id;			/* Protocol specific router ID */
@@ -154,7 +153,6 @@ struct proto {
   uint active_coroutines;		/* Number of active coroutines */
   byte net_type;			/* Protocol network type (NET_*), 0 for undefined */
   byte disabled;			/* Manually disabled */
-  byte vrf_set;				/* Related VRF instance (above) is defined */
   byte proto_state;			/* Protocol state machine (PS_*, see below) */
   byte active;				/* From PS_START to cleanup after PS_STOP */
   byte do_stop;				/* Stop actions are scheduled */
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 3964c267..dd3488d4 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -658,7 +658,7 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 {
   struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
 
-  if (p->p.vrf_set && (p->p.vrf != req->vrf))
+  if (p->p.vrf && (p->p.vrf != req->vrf))
     return 0;
 
   if (ipa_is_ip4(req->addr) ? !cf->accept_ipv4 : !cf->accept_ipv6)

From 0fd1c1d091ee8e43eb0e15c67a92960ca581ed5f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 13 Nov 2021 22:13:51 +0100
Subject: [PATCH 046/431] Route attribute cache is now lockless on read /
 clone.

Lots of time was spent locking when accessing route attribute cache.
This overhead should be now reduced to a minimum.
---
 nest/route.h   |  25 +++---
 nest/rt-attr.c | 214 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 171 insertions(+), 68 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index 3f8bf433..531e004b 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -606,8 +606,8 @@ struct rte_src {
 
 
 typedef struct rta {
-  struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
+  struct rta * _Atomic next, * _Atomic *pprev;	/* Hash chain */
+  _Atomic u32 uc;			/* Use count */
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
@@ -758,12 +758,6 @@ struct rte_owner {
   event *stop;
 };
 
-DEFINE_DOMAIN(attrs);
-extern DOMAIN(attrs) attrs_domain;
-
-#define RTA_LOCK	LOCK_DOMAIN(attrs, attrs_domain)
-#define RTA_UNLOCK	UNLOCK_DOMAIN(attrs, attrs_domain)
-
 #define RTE_SRC_PU_SHIFT      44
 #define RTE_SRC_IN_PROGRESS   (1ULL << RTE_SRC_PU_SHIFT)
 
@@ -879,20 +873,23 @@ static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a
 #define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
 rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
 static inline int rta_is_cached(rta *r) { return r->cached; }
+
 static inline rta *rta_clone(rta *r) {
-  RTA_LOCK;
-  r->uc++;
-  RTA_UNLOCK;
+  u32 uc = atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel);
+  ASSERT_DIE(uc > 0);
   return r;
 }
 
 void rta__free(rta *r);
 static inline void rta_free(rta *r) {
-  RTA_LOCK;
-  if (r && !--r->uc)
+  if (!r)
+    return;
+
+  u32 uc = atomic_fetch_sub_explicit(&r->uc, 1, memory_order_acq_rel);
+  if (uc == 1)
     rta__free(r);
-  RTA_UNLOCK;
 }
+
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
 static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index cb66b65d..9a5498ed 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -54,6 +54,7 @@
 #include "lib/hash.h"
 #include "lib/idm.h"
 #include "lib/resource.h"
+#include "lib/rcu.h"
 #include "lib/string.h"
 
 #include <stddef.h>
@@ -85,8 +86,8 @@ const char * rta_dest_names[RTD_MAX] = {
   [RTD_PROHIBIT]	= "prohibited",
 };
 
-DOMAIN(attrs) attrs_domain;
-DOMAIN(attrs) src_domain;
+DEFINE_DOMAIN(attrs);
+static DOMAIN(attrs) src_domain;
 
 #define SRC_LOCK	LOCK_DOMAIN(attrs, src_domain)
 #define SRC_UNLOCK	UNLOCK_DOMAIN(attrs, src_domain)
@@ -1166,21 +1167,28 @@ ea_append(ea_list *to, ea_list *what)
  *	rta's
  */
 
-static uint rta_cache_count;
-static uint rta_cache_size = 32;
-static uint rta_cache_limit;
-static uint rta_cache_mask;
-static rta **rta_hash_table;
+static DOMAIN(attrs) attrs_domain;
 
-static void
-rta_alloc_hash(void)
+#define RTA_LOCK	LOCK_DOMAIN(attrs, attrs_domain)
+#define RTA_UNLOCK	UNLOCK_DOMAIN(attrs, attrs_domain)
+
+struct rta_cache {
+  u32 count;
+  u32 size;
+  u32 limit;
+  u32 mask;
+  rta * _Atomic table[0];
+} * _Atomic rta_cache;
+// rta_aux, rta_cache = { .size = ATOMIC_VAR_INIT(32), };
+
+static struct rta_cache *
+rta_alloc_hash(u32 size)
 {
-  rta_hash_table = mb_allocz(rta_pool, sizeof(rta *) * rta_cache_size);
-  if (rta_cache_size < 32768)
-    rta_cache_limit = rta_cache_size * 2;
-  else
-    rta_cache_limit = ~0;
-  rta_cache_mask = rta_cache_size - 1;
+  struct rta_cache *c = mb_allocz(rta_pool, sizeof(struct rta_cache) + sizeof(rta * _Atomic) * size);
+  c->size = size;
+  c->limit = (size >> 20) ? (~0U) : (size * 2);
+  c->mask = size - 1;
+  return c;
 }
 
 static inline uint
@@ -1234,34 +1242,88 @@ rta_copy(rta *o)
 }
 
 static inline void
-rta_insert(rta *r)
+rta_insert(rta *r, struct rta_cache *c)
 {
-  uint h = r->hash_key & rta_cache_mask;
-  r->next = rta_hash_table[h];
-  if (r->next)
-    r->next->pprev = &r->next;
-  r->pprev = &rta_hash_table[h];
-  rta_hash_table[h] = r;
+  uint h = r->hash_key & c->mask;
+  rta *next = atomic_load_explicit(&c->table[h], memory_order_relaxed);
+
+  atomic_store_explicit(&r->next, next, memory_order_relaxed);
+  r->pprev = &c->table[h];
+
+  if (next)
+    next->pprev = &r->next;
+
+  /* This store MUST be the last and MUST have release order for thread-safety */
+  atomic_store_explicit(&c->table[h], r, memory_order_release);
 }
 
 static void
-rta_rehash(void)
+rta_rehash(struct rta_cache *c)
 {
-  uint ohs = rta_cache_size;
-  uint h;
-  rta *r, *n;
-  rta **oht = rta_hash_table;
+  u32 os = c->size;
 
-  rta_cache_size = 2*rta_cache_size;
-  DBG("Rehashing rta cache from %d to %d entries.\n", ohs, rta_cache_size);
-  rta_alloc_hash();
-  for(h=0; h<ohs; h++)
-    for(r=oht[h]; r; r=n)
+  struct rta_cache *nc = rta_alloc_hash(os * 2);
+  nc->count = c->count;
+
+  /* First we simply copy every chain to both new locations */
+  for (u32 h = 0; h < os; h++)
+  {
+    rta *r = atomic_load_explicit(&c->table[h], memory_order_relaxed);
+    atomic_store_explicit(&nc->table[h], r, memory_order_relaxed);
+    atomic_store_explicit(&nc->table[h + os], r, memory_order_relaxed);
+  }
+
+  /* Then we exchange the hashes; release semantics forces the previous code to be already done */
+  atomic_store_explicit(&rta_cache, nc, memory_order_release);
+
+  /* And now we pass through both chains and filter them */
+  for (u32 h = 0; h < c->size; h++)
+  {
+    rta * _Atomic * ap = &nc->table[h];
+    rta * _Atomic * bp = &nc->table[h + os];
+
+    rta *r = atomic_load_explicit(ap, memory_order_relaxed);
+    ASSERT_DIE(r == atomic_load_explicit(bp, memory_order_relaxed));
+
+    while (r)
+    {
+      if (r->hash_key & os)
       {
-	n = r->next;
-	rta_insert(r);
+	r->pprev = bp;
+	atomic_store_explicit(bp, r, memory_order_release);
+	bp = &r->next;
       }
-  mb_free(oht);
+      else
+      {
+	r->pprev = ap;
+	atomic_store_explicit(ap, r, memory_order_release);
+	ap = &r->next;
+      }
+
+      r = atomic_load_explicit(&r->next, memory_order_acquire);
+    }
+
+    atomic_store_explicit(ap, NULL, memory_order_release);
+    atomic_store_explicit(bp, NULL, memory_order_release);
+  }
+
+  synchronize_rcu();
+  mb_free(c);
+}
+
+static rta *
+rta_find(rta *o, u32 h, struct rta_cache *c)
+{
+  rta *r = NULL;
+
+  for (r = atomic_load_explicit(&c->table[h & c->mask], memory_order_acquire); r; r = atomic_load_explicit(&r->next, memory_order_acquire))
+    if (r->hash_key == h && rta_same(r, o))
+    {
+      atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel);
+      return r;
+    }
+
+  return NULL;
 }
 
 /**
@@ -1289,24 +1351,34 @@ rta_lookup(rta *o)
 
   h = rta_hash(o);
 
+  /* Lockless lookup */
+  rcu_read_lock();
+  r = rta_find(o, h, atomic_load_explicit(&rta_cache, memory_order_acquire));
+  rcu_read_unlock();
+
+  if (r)
+    return r;
+
   RTA_LOCK;
 
-  for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
-    if (r->hash_key == h && rta_same(r, o))
-    {
-      r->uc++;
-      RTA_UNLOCK;
-      return r;
-    }
+  /* Locked lookup to avoid duplicates if possible */
+  struct rta_cache *c = atomic_load_explicit(&rta_cache, memory_order_acquire);
+  r = rta_find(o, h, c);
+  if (r)
+  {
+    RTA_UNLOCK;
+    return r;
+  }
 
+  /* Store the rta */
   r = rta_copy(o);
   r->hash_key = h;
   r->cached = 1;
   rt_lock_hostentry(r->hostentry);
-  rta_insert(r);
+  rta_insert(r, c);
 
-  if (++rta_cache_count > rta_cache_limit)
-    rta_rehash();
+  if (++c->count > c->limit)
+    rta_rehash(c);
 
   RTA_UNLOCK;
   return r;
@@ -1315,17 +1387,47 @@ rta_lookup(rta *o)
 void
 rta__free(rta *a)
 {
-  ASSERT(rta_cache_count && a->cached);
-  rta_cache_count--;
-  *a->pprev = a->next;
-  if (a->next)
-    a->next->pprev = a->pprev;
+  ASSERT(a->cached);
+
+  RTA_LOCK;
+  struct rta_cache *c = atomic_load_explicit(&rta_cache, memory_order_acquire);
+
+  if (atomic_load_explicit(&a->uc, memory_order_acquire))
+  {
+    /* Acquired inbetween */
+    RTA_UNLOCK;
+    return;
+  }
+
+  /* Relink the forward pointer */
+  rta *next = atomic_load_explicit(&a->next, memory_order_acquire);
+  atomic_store_explicit(a->pprev, next, memory_order_release);
+
+  /* Relink the backwards pointer */
+  if (next)
+    next->pprev = a->pprev;
+
+  /* Wait until nobody knows about us */
+  synchronize_rcu();
+
+  if (atomic_load_explicit(&a->uc, memory_order_acquire))
+  {
+    /* Acquired inbetween, relink back */
+    rta_insert(a, c);
+    RTA_UNLOCK;
+    return;
+  }
+
+  /* Cleared to free the memory */
   rt_unlock_hostentry(a->hostentry);
   if (a->nh.next)
     nexthop_free(a->nh.next);
   ea_free(a->eattrs);
   a->cached = 0;
+  c->count--;
   sl_free(rta_slab(a), a);
+
+  RTA_UNLOCK;
 }
 
 rta *
@@ -1394,9 +1496,13 @@ rta_dump_all(void)
 
   RTA_LOCK;
 
-  debug("Route attribute cache (%d entries, rehash at %d):\n", rta_cache_count, rta_cache_limit);
-  for(h=0; h<rta_cache_size; h++)
-    for(a=rta_hash_table[h]; a; a=a->next)
+  struct rta_cache *c = atomic_load_explicit(&rta_cache, memory_order_acquire);
+
+  debug("Route attribute cache (%d entries, rehash at %d):\n", c->count, c->limit);
+  for(h=0; h<c->size; h++)
+    for(a = atomic_load_explicit(&c->table[h], memory_order_acquire);
+	a;
+	a = atomic_load_explicit(&a->next, memory_order_acquire))
       {
 	debug("%p ", a);
 	rta_dump(a);
@@ -1440,7 +1546,7 @@ rta_init(void)
   nexthop_slab_[2] = sl_new(rta_pool, sizeof(struct nexthop) + sizeof(u32)*2);
   nexthop_slab_[3] = sl_new(rta_pool, sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK);
 
-  rta_alloc_hash();
+  atomic_store_explicit(&rta_cache, rta_alloc_hash(32), memory_order_relaxed);
   rte_src_init();
 }
 

From df476c2e5d0684c3beab9058bc85d627b0e4d7ed Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 15 Nov 2021 22:48:24 +0100
Subject: [PATCH 047/431] Corking also feed start to keep BIRD running when
 refeeds would easily cause congestion

---
 nest/proto.c    |  2 ++
 nest/rt-table.c | 36 ++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 8babedee..978582ca 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -883,6 +883,7 @@ channel_setup_in_table(struct channel *c, int best)
 
   cat->tab_cf.name = cat->name;
   cat->tab_cf.addr_type = c->net_type;
+  cat->tab_cf.cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
 
   c->in_table = &cat->cat;
   c->in_table->push = (struct rt_import_request) {
@@ -926,6 +927,7 @@ channel_setup_out_table(struct channel *c)
 
   cat->tab_cf.name = cat->name;
   cat->tab_cf.addr_type = c->net_type;
+  cat->tab_cf.cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
 
   c->out_table = &cat->cat;
   c->out_table->push = (struct rt_import_request) {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f33b9153..a2f62df7 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1099,8 +1099,13 @@ rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_
   if (tab->first_export == NULL)
     tab->first_export = rpe;
 
-  if ((tab->first_export->seq + tab->config->cork_limit <= tab->next_export_seq) && !tab->cork_active)
+  if (!EMPTY_LIST(tab->exports) &&
+      (tab->first_export->seq + tab->config->cork_limit <= tab->next_export_seq) &&
+      !tab->cork_active)
   {
+    if (config->table_debug)
+      log(L_TRACE "%s: cork activated", tab->name);
+
     ev_cork(&rt_cork);
     tab->cork_active = 1;
   }
@@ -1777,22 +1782,14 @@ rt_request_export(rtable *t, struct rt_export_request *req)
 
   rt_set_export_state(hook, TES_HUNGRY);
 
-  struct rt_pending_export *rpe = rt_last_export(tab);
-  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
-  atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
-
   hook->n = (node) {};
   add_tail(&tab->exports, &hook->n);
 
-  FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
-
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
   hook->event = ev_new_init(p, rt_feed_channel, hook);
   RT_UNLOCK(t);
 
-  rt_set_export_state(hook, TES_FEEDING);
-  ASSERT_DIE(hook->export_state == TES_FEEDING);
   rt_send_export_event(hook);
 }
 
@@ -2506,6 +2503,8 @@ done:;
   {
     tab->cork_active = 0;
     ev_uncork(&rt_cork);
+    if (config->table_debug)
+      log(L_TRACE "%s: cork released", tab->name);
   }
 }
 
@@ -2955,10 +2954,23 @@ rt_feed_channel(void *data)
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
-  RT_LOCK(c->table);
-  rtable_private *tab = RT_PRIV(c->table);
+  rtable_private *tab;
+  if (c->export_state == TES_HUNGRY)
+  {
+    rt_set_export_state(c, TES_FEEDING);
 
-  ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
+    tab = RT_LOCK(c->table);
+
+    struct rt_pending_export *rpe = rt_last_export(tab);
+    DBG("store hook=%p last_export=%p seq=%lu\n", c, rpe, rpe ? rpe->seq : 0);
+    atomic_store_explicit(&c->last_export, rpe, memory_order_relaxed);
+
+    FIB_ITERATE_INIT(&c->feed_fit, &tab->fib);
+  }
+  else
+    tab = RT_LOCK(c->table);
+
+  ASSERT_DIE(c->export_state == TES_FEEDING);
 
 redo:
   FIB_ITERATE_START(&tab->fib, fit, net, n)

From aadf690b14b3ac7773beb63102989fb8c1cdf7db Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 16 Nov 2021 12:23:24 +0100
Subject: [PATCH 048/431] Higher settle times when route refresh in the source
 table is running

---
 nest/route.h    |  3 +++
 nest/rt-table.c | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index 531e004b..b5d44040 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -163,6 +163,7 @@ typedef struct rtable_private {
   struct fib fib;
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
+  u32 rr_count;				/* Number of running route refresh requests */
 
   list imports;				/* Registered route importers */
   list exports;				/* Registered route exporters */
@@ -220,6 +221,8 @@ struct rtable_config {
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
+  btime min_rr_settle_time;		/* Minimum settle time for notifications when route refresh is running */
+  btime max_rr_settle_time;		/* Maximum settle time for notifications when route refresh is running */
   uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
 };
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index a2f62df7..d09abbef 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1752,14 +1752,18 @@ rt_stop_import(struct rt_import_request *req, event *stopped)
   ASSERT_DIE(req->hook);
   struct rt_import_hook *hook = req->hook;
 
-  RT_LOCK(hook->table);
+  rtable_private *tab = RT_LOCK(hook->table);
 
-  rt_schedule_prune(RT_PRIV(hook->table));
+  rt_schedule_prune(tab);
 
   rt_set_import_state(hook, TIS_STOP);
   hook->stopped = stopped;
 
-  RT_UNLOCK(hook->table);
+  if (hook->stale_set < hook->stale_valid)
+    if (!--tab->rr_count)
+      rt_schedule_notify(tab);
+
+  RT_UNLOCK(tab);
 }
 
 void
@@ -1864,6 +1868,8 @@ rt_refresh_begin(struct rt_import_request *req)
     hook->stale_valid = 0;
   }
 
+  tab->rr_count++;
+
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
 
@@ -1884,16 +1890,19 @@ rt_refresh_end(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
-  RT_LOCK(hook->table);
+  rtable_private *tab = RT_LOCK(hook->table);
   hook->stale_valid++;
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  rt_schedule_prune(RT_PRIV(hook->table));
+  rt_schedule_prune(tab);
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
 
-  RT_UNLOCK(hook->table);
+  if (!--tab->rr_count)
+    rt_schedule_notify(tab);
+
+  RT_UNLOCK(tab);
 }
 
 /**
@@ -2032,8 +2041,17 @@ rt_settled_time(rtable_private *tab)
 {
   ASSUME(tab->base_settle_time != 0);
 
-  return MIN(tab->last_rt_change + tab->config->min_settle_time,
-	     tab->base_settle_time + tab->config->max_settle_time);
+  btime min_settle_time = tab->rr_count ? tab->config->min_rr_settle_time : tab->config->min_settle_time;
+  btime max_settle_time = tab->rr_count ? tab->config->max_rr_settle_time : tab->config->max_settle_time;
+
+  DBG("settled time computed from %t %t %t %t as %t / %t, now is %t\n",
+      tab->name, tab->last_rt_change, min_settle_time,
+	     tab->base_settle_time, max_settle_time,
+	     tab->last_rt_change + min_settle_time,
+	     tab->base_settle_time + max_settle_time, current_time());
+
+  return MIN(tab->last_rt_change + min_settle_time,
+	     tab->base_settle_time + max_settle_time);
 }
 
 static void
@@ -2794,6 +2812,8 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_min_time = 5;
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
+  c->min_rr_settle_time = 30 S;
+  c->max_rr_settle_time = 90 S;
   c->cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
   c->config = new_config;
 

From 3fd1f46184aa74d8ab7ed65c9ab6954f7e49d309 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 17 Nov 2021 21:34:54 +0100
Subject: [PATCH 049/431] RPKI has its own loop

---
 proto/rpki/config.Y        |  1 +
 proto/rpki/rpki.c          | 19 +++++++++++++++----
 proto/rpki/ssh_transport.c |  2 ++
 proto/rpki/tcp_transport.c |  2 ++
 proto/rpki/transport.c     |  2 ++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/proto/rpki/config.Y b/proto/rpki/config.Y
index d6d326b8..743b5b42 100644
--- a/proto/rpki/config.Y
+++ b/proto/rpki/config.Y
@@ -42,6 +42,7 @@ proto: rpki_proto ;
 
 rpki_proto_start: proto_start RPKI {
   this_proto = proto_config_new(&proto_rpki, $1);
+  this_proto->loop_order = DOMAIN_ORDER(proto);
   RPKI_CFG->retry_interval = RPKI_RETRY_INTERVAL;
   RPKI_CFG->refresh_interval = RPKI_REFRESH_INTERVAL;
   RPKI_CFG->expire_interval = RPKI_EXPIRE_INTERVAL;
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index e3fccb48..cc86ab6a 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -109,6 +109,7 @@ static void rpki_schedule_next_expire_check(struct rpki_cache *cache);
 static void rpki_stop_refresh_timer_event(struct rpki_cache *cache);
 static void rpki_stop_retry_timer_event(struct rpki_cache *cache);
 static void rpki_stop_expire_timer_event(struct rpki_cache *cache);
+static void rpki_stop_all_timers(struct rpki_cache *cache);
 
 
 /*
@@ -219,6 +220,8 @@ rpki_force_restart_proto(struct rpki_proto *p)
 {
   if (p->cache)
   {
+    rpki_tr_close(p->cache->tr_sock);
+    rpki_stop_all_timers(p->cache);
     CACHE_DBG(p->cache, "Connection object destroying");
   }
 
@@ -342,7 +345,7 @@ rpki_schedule_next_refresh(struct rpki_cache *cache)
   btime t = cache->refresh_interval S;
 
   CACHE_DBG(cache, "after %t s", t);
-  tm_start(cache->refresh_timer, t);
+  tm_start_in(cache->refresh_timer, t, cache->p->p.loop);
 }
 
 static void
@@ -351,7 +354,7 @@ rpki_schedule_next_retry(struct rpki_cache *cache)
   btime t = cache->retry_interval S;
 
   CACHE_DBG(cache, "after %t s", t);
-  tm_start(cache->retry_timer, t);
+  tm_start_in(cache->retry_timer, t, cache->p->p.loop);
 }
 
 static void
@@ -362,7 +365,7 @@ rpki_schedule_next_expire_check(struct rpki_cache *cache)
   t = MAX(t, 1 S);
 
   CACHE_DBG(cache, "after %t s", t);
-  tm_start(cache->expire_timer, t);
+  tm_start_in(cache->expire_timer, t, cache->p->p.loop);
 }
 
 static void
@@ -379,13 +382,21 @@ rpki_stop_retry_timer_event(struct rpki_cache *cache)
   tm_stop(cache->retry_timer);
 }
 
-static void UNUSED
+static void
 rpki_stop_expire_timer_event(struct rpki_cache *cache)
 {
   CACHE_DBG(cache, "Stop");
   tm_stop(cache->expire_timer);
 }
 
+static void
+rpki_stop_all_timers(struct rpki_cache *cache)
+{
+  rpki_stop_refresh_timer_event(cache);
+  rpki_stop_retry_timer_event(cache);
+  rpki_stop_expire_timer_event(cache);
+}
+
 static int
 rpki_do_we_recv_prefix_pdu_in_last_seconds(struct rpki_cache *cache)
 {
diff --git a/proto/rpki/ssh_transport.c b/proto/rpki/ssh_transport.c
index 6333f367..223afa80 100644
--- a/proto/rpki/ssh_transport.c
+++ b/proto/rpki/ssh_transport.c
@@ -38,6 +38,8 @@ rpki_tr_ssh_open(struct rpki_tr_sock *tr)
   if (sk_open(sk) != 0)
     return RPKI_TR_ERROR;
 
+  sk_start(sk);
+
   return RPKI_TR_SUCCESS;
 }
 
diff --git a/proto/rpki/tcp_transport.c b/proto/rpki/tcp_transport.c
index 132f8e2d..4e850c44 100644
--- a/proto/rpki/tcp_transport.c
+++ b/proto/rpki/tcp_transport.c
@@ -31,6 +31,8 @@ rpki_tr_tcp_open(struct rpki_tr_sock *tr)
   if (sk_open(sk) != 0)
     return RPKI_TR_ERROR;
 
+  sk_start(sk);
+
   return RPKI_TR_SUCCESS;
 }
 
diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c
index a1ac7587..b52495dc 100644
--- a/proto/rpki/transport.c
+++ b/proto/rpki/transport.c
@@ -85,6 +85,7 @@ rpki_tr_open(struct rpki_tr_sock *tr)
   sk->rbsize = RPKI_RX_BUFFER_SIZE;
   sk->tbsize = RPKI_TX_BUFFER_SIZE;
   sk->tos = IP_PREC_INTERNET_CONTROL;
+  sk->flags |= SKF_THREAD;
 
   if (ipa_zero(sk->daddr) && sk->host)
   {
@@ -119,6 +120,7 @@ rpki_tr_close(struct rpki_tr_sock *tr)
 
   if (tr->sk)
   {
+    sk_stop(tr->sk);
     rfree(tr->sk);
     tr->sk = NULL;
   }

From 44dbedbe3fa77a16ea7d5736f07e65d9e2c0b165 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 21 Nov 2021 12:06:19 +0100
Subject: [PATCH 050/431] BGP: End route refresh before another starts

---
 proto/bgp/bgp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index aac1f45c..b825f778 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -971,6 +971,9 @@ bgp_refresh_begin(struct bgp_channel *c)
   if (c->load_state == BFS_LOADING)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
+  if (c->load_state == BFS_REFRESHING)
+    channel_refresh_end(&c->c);
+
   c->load_state = BFS_REFRESHING;
   channel_refresh_begin(&c->c);
 }

From 4ba991f19c2f8aa893a723f29775c50e1370ed07 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 23 Nov 2021 11:12:32 +0000
Subject: [PATCH 051/431] Fixed channel export map confusion

---
 nest/proto.c    | 11 +++--------
 nest/rt-table.c |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 978582ca..7a09ed64 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -596,6 +596,9 @@ channel_export_stopped(struct rt_export_request *req)
   mb_free(c->out_req.name);
   c->out_req.name = NULL;
 
+  bmap_free(&c->export_map);
+  bmap_free(&c->export_reject_map);
+
   if (c->restart_export)
   {
     c->restart_export = 0;
@@ -993,9 +996,6 @@ channel_do_pause(struct channel *c)
   }
 
   channel_roa_unsubscribe_all(c);
-
-  bmap_free(&c->export_map);
-  bmap_free(&c->export_reject_map);
 }
 
 static void
@@ -1035,16 +1035,11 @@ channel_do_down(struct channel *c)
 
   c->proto->active_channels--;
 
-  // bmap_free(&c->export_map);
   memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
   memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
 
   CALL(c->channel->cleanup, c);
 
-  /* This have to be done in here, as channel pool is freed before channel_do_down() */
-  bmap_free(&c->export_map);
-  bmap_free(&c->export_reject_map);
-
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
     proto_send_event(c->proto);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d09abbef..c53fd195 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -507,7 +507,7 @@ export_filter_(struct channel *c, rte *rt, linpool *pool, int silent)
       stats->updates_rejected++;
       if (v == RIC_REJECT)
 	channel_rte_trace_out(D_FILTERS, c, rt, "rejected by protocol");
-      goto reject_noset;
+      goto reject;
 
     }
   if (v > 0)

From 821344c781a99a4f559949a7497617b64c061c82 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 23 Nov 2021 11:13:11 +0000
Subject: [PATCH 052/431] Stored pages release routine

---
 sysdep/unix/alloc.c | 29 +++++++++++++++++++++++++++++
 sysdep/unix/io.c    |  4 ++++
 2 files changed, 33 insertions(+)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 4ae1a9db..61360e73 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -135,3 +135,32 @@ free_sys_page(void *ptr)
 #endif
     free(ptr);
 }
+
+void
+check_stored_pages(void)
+{
+#ifdef ENOMEM
+  if (atomic_load_explicit(&global_page_list_not_empty, memory_order_relaxed) == 0)
+    return;
+
+  for (uint limit = 0; limit < 256; limit++)
+  {
+    GLOBAL_PAGE_SPIN_LOCK;
+    void *ptr = HEAD(global_page_list);
+    if (!NODE_VALID(ptr))
+    {
+      atomic_store_explicit(&global_page_list_not_empty, 0, memory_order_relaxed);
+      GLOBAL_PAGE_SPIN_UNLOCK;
+      return;
+    }
+
+    rem_node(ptr);
+    if (munmap(ptr, page_size) < 0)
+      if (errno == ENOMEM)
+	add_tail(&global_page_list, ptr);
+      else
+	bug("munmap(%p) failed: %m", ptr);
+    GLOBAL_PAGE_SPIN_UNLOCK;
+  }
+#endif
+}
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index dd385c80..91d717d0 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2193,6 +2193,7 @@ static int short_loops = 0;
 #define WORK_EVENTS_MAX 10
 
 void pipe_drain(int fd);
+void check_stored_pages(void);
 
 void
 io_loop(void)
@@ -2215,6 +2216,9 @@ io_loop(void)
       timers_fire(&main_birdloop.time, 1);
       io_close_event();
 
+      /* Try to release some memory if possible */
+      check_stored_pages();
+
       // FIXME
       poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
       if (t = timers_first(&main_birdloop.time))

From 5395880908fdb264b5b78ccc455dced49eb29915 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 23 Nov 2021 12:06:27 +0000
Subject: [PATCH 053/431] Fixed pipe reload/refeed

---
 nest/proto.c      |  5 +++++
 nest/rt-table.c   |  3 +++
 proto/pipe/pipe.c | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/nest/proto.c b/nest/proto.c
index 7a09ed64..2d30e640 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -589,6 +589,10 @@ channel_export_stopped(struct rt_export_request *req)
   {
     c->refeeding = 1;
     c->refeed_pending = 0;
+
+    bmap_reset(&c->export_map, 1024);
+    bmap_reset(&c->export_reject_map, 1024);
+
     rt_request_export(c->table, req);
     return;
   }
@@ -621,6 +625,7 @@ channel_feed_end(struct channel *c)
       (l->count <= l->max))
   {
     log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->max);
+    channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
     c->refeed_pending = 1;
     rt_stop_export(req, channel_export_stopped);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index c53fd195..e4c85fd4 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -618,6 +618,9 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
   if (old && !bmap_test(&c->export_map, old->id))
     old = NULL;
 
+  if (old && (old->sender == c->in_req.hook))
+    bug("bad-behaved pipe");
+
   if (!new && !old)
     return;
 
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index a30da0e2..270f7b92 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -108,6 +108,23 @@ pipe_reload_routes(struct channel *C)
   channel_request_feeding((C == p->pri) ? p->sec : p->pri);
 }
 
+static void
+pipe_feed_begin(struct channel *C, int refeeding UNUSED)
+{
+  struct pipe_proto *p = (void *) C->proto;
+  struct channel *dst = (C == p->pri) ? p->sec : p->pri;
+
+  channel_refresh_begin(dst);
+}
+
+static void
+pipe_feed_end(struct channel *C)
+{
+  struct pipe_proto *p = (void *) C->proto;
+  struct channel *dst = (C == p->pri) ? p->sec : p->pri;
+
+  channel_refresh_end(dst);
+}
 
 static void
 pipe_postconfig(struct proto_config *CF)
@@ -178,6 +195,8 @@ pipe_init(struct proto_config *CF)
   P->rt_notify = pipe_rt_notify;
   P->preexport = pipe_preexport;
   P->reload_routes = pipe_reload_routes;
+  P->feed_begin = pipe_feed_begin;
+  P->feed_end = pipe_feed_end;
 
   p->rl_gen = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 

From 57d0ecb9b739afec9a050178ed664ff5ec9cf42e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 23 Nov 2021 18:04:16 +0000
Subject: [PATCH 054/431] GDB pretty printer for resource pools

---
 bird-gdb.py | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 209 insertions(+), 2 deletions(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index c7351d6b..fe7827fe 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -4,9 +4,10 @@ class BIRDPrinter:
 
     @classmethod
     def lookup(cls, val):
-        if val.type.code != cls.typeCode:
+        t = val.type.strip_typedefs()
+        if t.code != cls.typeCode:
             return None
-        if val.type.tag != cls.typeTag:
+        if t.tag != cls.typeTag:
             return None
 
         return cls(val)
@@ -252,6 +253,211 @@ class BIRDListItem(gdb.Function):
 
 BIRDListItem()
 
+class BIRDResourceSize():
+    def __init__(self, netto, overhead, free):
+        self.netto = netto
+        self.overhead = overhead
+        self.free = free
+
+    def __str__(self):
+        ns = str(self.netto)
+        os = str(self.overhead)
+        fs = str(self.free)
+
+        return "{: >12s} | {: >12s} | {: >12s}".format(ns, os, fs)
+
+    def __add__(self, val):
+        return BIRDResourceSize(self.netto + val.netto, self.overhead + val.overhead, self.free + val.free)
+
+class BIRDResource():
+    def __init__(self, val):
+        self.val = val
+
+    def __str__(self):
+        return f"Item {self.val.address} of class \"{self.val['class']['name'].string()}\""
+
+    def memsize(self):
+        if str(self.val["class"]["memsize"]) == '0x0':
+            size = self.val["class"]["size"]
+            ressize = gdb.lookup_type("struct resource").sizeof
+            return BIRDResourceSize(size - ressize, ressize, 0)
+        else:
+            raise Exception(f"Resource class {self.val['class']['name']} with defined memsize() not known by Python")
+
+    def parse(self):
+        pass
+
+class BIRDMBResource(BIRDResource):
+    def __init__(self, val):
+        self.mbtype = gdb.lookup_type("struct mblock")
+        self.val = val.cast(self.mbtype)
+
+    def memsize(self):
+        return BIRDResourceSize(self.val["size"], 8 + self.mbtype.sizeof, 0)
+
+    def __str__(self):
+        return f"Standalone memory block {self.val.address} of size {self.val['size']}, data at {self.val['data'].address}"
+
+class BIRDLinPoolResource(BIRDResource):
+    def __init__(self, val):
+        self.lptype = gdb.lookup_type("struct linpool")
+        self.val = val.cast(self.lptype)
+        self.info = None
+
+    def count_chunk(self, which):
+        cnt = 0
+        chunk = self.val[which]
+        while str(chunk) != '0x0':
+            cnt += 1
+            chunk = chunk.dereference()["next"]
+        return cnt
+
+    def parse(self):
+        self.info = {
+                "std_chunks": self.count_chunk("first"),
+                "large_chunks": self.count_chunk("first_large"),
+                }
+
+    def memsize(self):
+        if self.info is None:
+            self.parse()
+
+        overhead = (8 - 8*self.val["use_pages"]) + gdb.lookup_type("struct lp_chunk").sizeof
+        return BIRDResourceSize(
+                self.val["total"] + self.val["total_large"],
+                (self.info["std_chunks"] + self.info["large_chunks"]) * overhead,
+                0)
+
+    def __str__(self):
+        if self.info is None:
+            self.parse()
+
+        return f"Linpool {self.val.address} with {self.info['std_chunks']} standard chunks of size {self.val['chunk_size']} and {self.info['large_chunks']} large chunks"
+
+class BIRDSlabResource(BIRDResource):
+    def __init__(self, val):
+        self.slabtype = gdb.lookup_type("struct slab")
+        self.val = val.cast(self.slabtype)
+        self.info = None
+
+    def count_heads_item(self, item):
+        self.hcnt += 1
+        self.used += item.dereference().cast(self.slheadtype)["num_full"]
+
+    def count_heads(self, which):
+        self.hcnt = 0
+        self.used = 0
+        BIRDList(self.val[which + "_heads"]).walk(self.count_heads_item)
+        self.info[which + "_heads"] = self.hcnt
+        self.info[which + "_used"] = self.used
+        return (self.hcnt, self.used)
+
+    def parse(self):
+        self.page_size = gdb.lookup_symbol("page_size")[0].value()
+        self.slheadtype = gdb.lookup_type("struct sl_head")
+        self.info = {}
+        self.count_heads("empty")
+        self.count_heads("partial")
+        self.count_heads("full")
+
+    def memsize(self):
+        if self.info is None:
+            self.parse()
+
+        total_used = self.info["empty_used"] + self.info["partial_used"] + self.info["full_used"]
+        total_heads = self.info["empty_heads"] + self.info["partial_heads"] + self.info["full_heads"]
+
+        eff_size = total_used * self.val["obj_size"]
+        free_size = self.info["empty_heads"] * self.page_size
+        total_size = total_heads * self.page_size + self.slabtype.sizeof
+
+        return BIRDResourceSize( eff_size, total_size - free_size - eff_size, free_size)
+
+    def __str__(self):
+        if self.info is None:
+            self.parse()
+
+        return f"Slab {self.val.address} " + ", ".join([
+            f"{self.info[x + '_heads']} {x} heads" for x in [ "empty", "partial", "full" ]]) + \
+                    f", {self.val['objs_per_slab']} objects of size {self.val['obj_size']} per head"
+
+
+class BIRDPoolResource(BIRDResource):
+    def __init__(self, val):
+        self.pooltype = gdb.lookup_type("struct pool")
+        self.resptrtype = gdb.lookup_type("struct resource").pointer()
+        self.page_size = gdb.lookup_symbol("page_size")[0].value()
+        self.val = val.cast(self.pooltype)
+        self.items = None
+
+    def parse_inside(self, val):
+        self.items.append(BIRDNewResource(val.cast(self.resptrtype).dereference()))
+
+    def parse(self):
+        self.items = []
+        BIRDList(self.val["inside"]).walk(self.parse_inside)
+
+    def free_pages(self):
+        if str(self.val['pages']) == '0x0':
+            return 0
+        else:
+            return self.val['pages'].dereference()['free']
+
+    def memsize(self):
+        if self.items is None:
+            self.parse()
+
+        sum = BIRDResourceSize(0, self.pooltype.sizeof, self.free_pages() * self.page_size)
+#        for i in self.items:
+#            sum += i.memsize()
+
+        return sum
+
+    def __str__(self):
+        if self.items is None:
+            self.parse()
+
+#        for i in self.items:
+#            print(i)
+
+        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self.items)} items and {self.free_pages()} free pages"
+
+BIRDResourceMap = {
+        "mbl_memsize": BIRDMBResource,
+        "pool_memsize": BIRDPoolResource,
+        "lp_memsize": BIRDLinPoolResource,
+        "slab_memsize": BIRDSlabResource,
+        }
+
+def BIRDNewResource(res):
+    cms = res["class"].dereference()["memsize"]
+    for cx in BIRDResourceMap:
+        if cms == gdb.lookup_symbol(cx)[0].value():
+            return BIRDResourceMap[cx](res)
+
+    return BIRDResource(res)
+
+
+class BIRDResourcePrinter(BIRDPrinter):
+    "Print BIRD's resource"
+    typeCode = gdb.TYPE_CODE_STRUCT
+    typeTag = "resource"
+
+    def __init__(self, val):
+        super(BIRDResourcePrinter, self).__init__(val)
+        self.resource = BIRDNewResource(val)
+        self.resource.parse()
+        self.resourcetype = gdb.lookup_type("struct resource")
+
+        if type(self.resource) == BIRDPoolResource:
+            self.children = self.pool_children
+
+    def pool_children(self):
+        return iter([ ("\n", i.val.cast(self.resourcetype)) for i in self.resource.items ])
+
+    def to_string(self):
+        return f"[ {str(self.resource.memsize())} ] {str(self.resource)}"
+
 
 def register_printers(objfile):
     objfile.pretty_printers.append(BIRDFInstPrinter.lookup)
@@ -260,6 +466,7 @@ def register_printers(objfile):
     objfile.pretty_printers.append(BIRDFLineItemPrinter.lookup)
     objfile.pretty_printers.append(BIRDFLinePrinter.lookup)
     objfile.pretty_printers.append(BIRDFExecStackPrinter.lookup)
+    objfile.pretty_printers.append(BIRDResourcePrinter.lookup)
 
 register_printers(gdb.current_objfile())
 

From ab0994a10c26bd76b4154a675267d96d19dfb509 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 24 Nov 2021 23:20:26 +0100
Subject: [PATCH 055/431] fixup of table reload bug

---
 nest/rt-table.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e4c85fd4..8566fbf8 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1349,6 +1349,7 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
 		  stats->updates_ignored++;
 		  rt_rte_trace_in(D_ROUTES, req, new, "ignored");
 		}
+	      return;
 	  }
 
 	*before_old = (*before_old)->next;

From 385b3ea3956aefc2868cdd838fc0a90f1d8a7857 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Nov 2021 18:16:49 +0100
Subject: [PATCH 056/431] For safer memory allocations, resources are bound to
 loops.

Also all loops have their basic resource pool for allocations which are
auto-freed when the loop is stopping.
---
 conf/conf.c           |   4 +-
 filter/tree_test.c    |   2 +-
 lib/event_test.c      |   2 +-
 lib/flowspec_test.c   |   8 ++-
 lib/hash_test.c       |   6 +-
 lib/io-loop.h         |  13 +++--
 lib/resource.c        | 132 ++++++++++++++++++++++++++++++++++++------
 lib/resource.h        |  15 ++++-
 nest/a-path_test.c    |  12 ++--
 nest/a-set_test.c     |  13 ++---
 nest/cli.c            |   8 +--
 nest/cmds.c           |   8 +--
 nest/config.Y         |   2 +-
 nest/iface.c          |   2 +-
 nest/proto.c          |  41 +++++++------
 nest/route.h          |   4 +-
 nest/rt-attr.c        |   4 +-
 nest/rt-table.c       |  69 +++++++++-------------
 proto/babel/babel.c   |   2 +-
 proto/bfd/bfd.c       |   8 +--
 proto/bfd/bfd.h       |   2 -
 proto/mrt/mrt.c       |   5 +-
 proto/mrt/mrt.h       |   1 +
 proto/ospf/iface.c    |   6 +-
 proto/ospf/neighbor.c |   4 +-
 proto/radv/radv.c     |   4 +-
 proto/rpki/rpki.c     |   2 +-
 sysdep/unix/io-loop.c |  74 ++++++++++++++++++-----
 sysdep/unix/io-loop.h |   3 +
 sysdep/unix/krt.c     |   2 +-
 sysdep/unix/main.c    |   2 +-
 test/bt-utils.c       |   2 +-
 32 files changed, 303 insertions(+), 159 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index 58abcde1..c6837a07 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -89,7 +89,7 @@ int undo_available;			/* Undo was not requested from last reconfiguration */
 struct config *
 config_alloc(const char *name)
 {
-  pool *p = rp_new(&root_pool, "Config");
+  pool *p = rp_new(&root_pool, &main_birdloop, "Config");
   linpool *l = lp_new_default(p);
   struct config *c = lp_allocz(l, sizeof(struct config));
 
@@ -196,7 +196,7 @@ void
 config_free(struct config *c)
 {
   if (c)
-    rfree(c->pool);
+    rp_free(c->pool, &root_pool);
 }
 
 void
diff --git a/filter/tree_test.c b/filter/tree_test.c
index 6472d17e..883d13bf 100644
--- a/filter/tree_test.c
+++ b/filter/tree_test.c
@@ -20,7 +20,7 @@ start_conf_env(void)
 {
   bt_bird_init();
 
-  pool *p = rp_new(&root_pool, "helper_pool");
+  pool *p = rp_new(&root_pool, &main_birdloop, "helper_pool");
   linpool *l = lp_new_default(p);
   cfg_mem = l;
 }
diff --git a/lib/event_test.c b/lib/event_test.c
index 9dda3e2a..f8bb303b 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -57,8 +57,8 @@ t_ev_run_list(void)
 
   resource_sys_init();
   resource_init();
-  olock_init();
   birdloop_init();
+  olock_init();
   io_init();
   rt_init();
   if_init();
diff --git a/lib/flowspec_test.c b/lib/flowspec_test.c
index f7f70982..518b8fc7 100644
--- a/lib/flowspec_test.c
+++ b/lib/flowspec_test.c
@@ -8,6 +8,7 @@
 
 #include "test/birdtest.h"
 #include "lib/flowspec.h"
+#include "lib/io-loop.h"
 
 #define NET_ADDR_FLOW4_(what,prefix,pxlen,data_)	\
   do 							\
@@ -446,8 +447,6 @@ t_validation6(void)
 static int
 t_builder4(void)
 {
-  resource_init();
-
   struct flow_builder *fb = flow_builder_init(&root_pool);
   linpool *lp = lp_new_default(&root_pool);
 
@@ -529,7 +528,6 @@ t_builder6(void)
 {
   net_addr_ip6 ip;
 
-  resource_init();
   linpool *lp = lp_new_default(&root_pool);
   struct flow_builder *fb = flow_builder_init(&root_pool);
   fb->ipv6 = 1;
@@ -673,6 +671,9 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
   resource_sys_init();
+  resource_init();
+  the_bird_lock();
+  birdloop_init();
 
   bt_test_suite(t_read_length,  "Testing get NLRI length");
   bt_test_suite(t_write_length, "Testing set NLRI length");
@@ -688,5 +689,6 @@ main(int argc, char *argv[])
   bt_test_suite(t_formatting4,  "Formatting Flow Specification (IPv4) into text representation");
   bt_test_suite(t_formatting6,  "Formatting Flow Specification (IPv6) into text representation");
 
+  the_bird_unlock();
   return bt_exit_value();
 }
diff --git a/lib/hash_test.c b/lib/hash_test.c
index 59beb7c0..7ef54662 100644
--- a/lib/hash_test.c
+++ b/lib/hash_test.c
@@ -9,7 +9,9 @@
 #undef LOCAL_DEBUG
 
 #include "test/birdtest.h"
+#include "test/bt-utils.h"
 
+#include "lib/io-loop.h"
 #include "lib/hash.h"
 
 struct test_node {
@@ -61,8 +63,7 @@ dump_nodes(void)
 static void
 init_hash_(uint order)
 {
-  resource_init();
-  my_pool = rp_new(&root_pool, "Test pool");
+  my_pool = rp_new(&root_pool, &main_birdloop, "Test pool");
 
   HASH_INIT(hash, my_pool, order);
 
@@ -290,6 +291,7 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  bt_bird_init();
 
   bt_test_suite(t_insert_find, 		"HASH_INSERT and HASH_FIND");
   bt_test_suite(t_insert_find_random, 	"HASH_INSERT pseudo-random keys and HASH_FIND");
diff --git a/lib/io-loop.h b/lib/io-loop.h
index 25f1b2a3..386a31d5 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -20,15 +20,15 @@ void sk_reloop(sock *s, struct birdloop *loop);
 
 extern struct birdloop main_birdloop;
 
-/* Start a new birdloop owned by given pool and domain */
+/* Start a new birdloop owned by given pool and domain.
+ * The loop allocates its internal pool for local allocations
+ * which is freed when the loop itself is stopped. */
 struct birdloop *birdloop_new(pool *p, uint order, const char *name);
 
-/* Stop the loop. At the end, the @stopped callback is called unlocked in tail
- * position to finish cleanup. Run birdloop_free() from that callback to free
- * the loop itself. */
+/* Stop the loop. At the end, the @stopped callback is called with locked
+ * parent to finish cleanup. The loop then frees itself together with its pool. */
 void birdloop_stop(struct birdloop *loop, void (*stopped)(void *data), void *data);
 void birdloop_stop_self(struct birdloop *loop, void (*stopped)(void *data), void *data);
-void birdloop_free(struct birdloop *loop);
 
 /* Get birdloop's event list */
 event_list *birdloop_event_list(struct birdloop *loop);
@@ -36,6 +36,9 @@ event_list *birdloop_event_list(struct birdloop *loop);
 /* Get birdloop's time heap */
 struct timeloop *birdloop_time_loop(struct birdloop *loop);
 
+/* Get birdloop's resource pool */
+pool *birdloop_pool(struct birdloop *loop);
+
 /* Enter and exit the birdloop */
 void birdloop_enter(struct birdloop *loop);
 void birdloop_leave(struct birdloop *loop);
diff --git a/lib/resource.c b/lib/resource.c
index 0651406f..c847d41a 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -14,6 +14,7 @@
 #include "lib/resource.h"
 #include "lib/string.h"
 #include "lib/rcu.h"
+#include "lib/io-loop.h"
 
 /**
  * DOC: Resource pools
@@ -29,13 +30,6 @@
  * is freed upon shutdown of the module.
  */
 
-struct pool {
-  resource r;
-  list inside;
-  struct pool_pages *pages;
-  const char *name;
-};
-
 struct pool_pages {
   uint free;
   uint used;
@@ -68,26 +62,39 @@ static int indent;
 /**
  * rp_new - create a resource pool
  * @p: parent pool
+ * @l: loop to assign
  * @name: pool name (to be included in debugging dumps)
  *
  * rp_new() creates a new resource pool inside the specified
  * parent pool.
  */
 pool *
-rp_new(pool *p, const char *name)
+rp_new(pool *p, struct birdloop *loop, const char *name)
 {
+  ASSERT_DIE(birdloop_inside(p->loop));
+  ASSERT_DIE(birdloop_inside(loop));
+
   pool *z = ralloc(p, &pool_class);
+  z->loop = loop;
   z->name = name;
   init_list(&z->inside);
   return z;
 }
 
+_Thread_local static pool *pool_parent = NULL;
+
 static void
 pool_free(resource *P)
 {
-  pool *p = (pool *) P;
-  resource *r, *rr;
+  ASSERT_DIE(pool_parent);
 
+  pool *p = (pool *) P;
+  ASSERT_DIE(birdloop_inside(p->loop));
+
+  pool *parent = pool_parent;
+  pool_parent = p;
+
+  resource *r, *rr;
   r = HEAD(p->inside);
   while (rr = (resource *) r->n.next)
     {
@@ -105,14 +112,25 @@ pool_free(resource *P)
 
       free_sys_page(p->pages);
     }
+
+  pool_parent = parent;
+}
+
+void
+rp_free(pool *p, pool *parent)
+{
+  ASSERT_DIE(pool_parent == NULL);
+  pool_parent = parent;
+  rfree(p);
+  ASSERT_DIE(pool_parent == parent);
+  pool_parent = NULL;
 }
 
 static void
-pool_dump(resource *P)
+pool_dump_locked(pool *p)
 {
-  pool *p = (pool *) P;
   resource *r;
-
+  
   debug("%s\n", p->name);
   indent += 3;
   WALK_LIST(r, p->inside)
@@ -120,10 +138,47 @@ pool_dump(resource *P)
   indent -= 3;
 }
 
-static size_t
-pool_memsize(resource *P)
+static void
+pool_dump(resource *P)
 {
   pool *p = (pool *) P;
+
+  if (p->loop != pool_parent->loop)
+    birdloop_enter(p->loop);
+
+  pool *parent = pool_parent;
+  pool_parent = p;
+
+  pool_dump_locked(p);
+
+  pool_parent = parent;
+
+  if (p->loop != pool_parent->loop)
+    birdloop_leave(p->loop);
+}
+
+void
+rp_dump(pool *p)
+{
+  int inside = birdloop_inside(p->loop);
+  if (!inside)
+    birdloop_enter(p->loop);
+
+  ASSERT_DIE(pool_parent == NULL);
+  pool_parent = p;
+
+  pool_dump_locked(p);
+
+  ASSERT_DIE(pool_parent == p);
+  pool_parent = NULL;
+
+  if (!inside)
+    birdloop_leave(p->loop);
+}
+
+static size_t
+pool_memsize_locked(pool *p)
+{
   resource *r;
   size_t sum = sizeof(pool) + ALLOC_OVERHEAD;
 
@@ -136,6 +191,46 @@ pool_memsize(resource *P)
   return sum;
 }
 
+static size_t
+pool_memsize(resource *P)
+{
+  pool *p = (pool *) P;
+
+  pool *parent = pool_parent;
+  pool_parent = p;
+
+  if (p->loop != parent->loop)
+    birdloop_enter(p->loop);
+
+  size_t sum = pool_memsize_locked(p);
+
+  if (p->loop != parent->loop)
+    birdloop_leave(p->loop);
+
+  pool_parent = parent;
+
+  return sum;
+}
+
+size_t
+rp_memsize(pool *p)
+{
+  int inside = birdloop_inside(p->loop);
+  if (!inside)
+    birdloop_enter(p->loop);
+
+  ASSERT_DIE(pool_parent == NULL);
+  pool_parent = p;
+  size_t sum = pool_memsize_locked(p);
+  ASSERT_DIE(pool_parent == p);
+  pool_parent = NULL;
+
+  if (!inside)
+    birdloop_leave(p->loop);
+
+  return sum;
+}
+
 static resource *
 pool_lookup(resource *P, unsigned long a)
 {
@@ -243,12 +338,15 @@ rmemsize(void *res)
 void *
 ralloc(pool *p, struct resclass *c)
 {
+  ASSERT_DIE(p);
+  ASSERT_DIE(birdloop_inside(p->loop));
+
   resource *r = xmalloc(c->size);
   bzero(r, c->size);
 
   r->class = c;
-  if (p)
-    add_tail(&p->inside, &r->n);
+  add_tail(&p->inside, &r->n);
+
   return r;
 }
 
diff --git a/lib/resource.h b/lib/resource.h
index 26030aea..7adde493 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -34,10 +34,16 @@ struct resclass {
 
 /* Generic resource manipulation */
 
-typedef struct pool pool;
+typedef struct pool {
+  resource r;
+  list inside;
+  struct pool_pages *pages;
+  struct birdloop *loop;
+  const char *name;
+} pool;
 
 void resource_init(void);
-pool *rp_new(pool *, const char *);	/* Create new pool */
+
 void rfree(void *);			/* Free single resource */
 void rdump(void *);			/* Dump to debug output */
 size_t rmemsize(void *res);		/* Return size of memory used by the resource */
@@ -46,6 +52,11 @@ void rmove(void *, pool *);		/* Move to a different pool */
 
 void *ralloc(pool *, struct resclass *);
 
+pool *rp_new(pool *, struct birdloop *loop, const char *);	/* Create new pool */
+void rp_free(pool *p, pool *parent);	/* Free parent pool */ 
+size_t rp_memsize(pool *p);		/* Return size of memory used by the pool */
+void rp_dump(pool *p);			/* Dump pool to debug output */
+
 extern pool root_pool;
 
 /* Normal memory blocks */
diff --git a/nest/a-path_test.c b/nest/a-path_test.c
index 2e6e4956..2e6683f2 100644
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@@ -12,6 +12,7 @@
 #include "nest/route.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
+#include "lib/io-loop.h"
 
 #define TESTS_NUM 30
 #define AS_PATH_LENGTH 1000
@@ -23,8 +24,6 @@
 static int
 t_as_path_match(void)
 {
-  resource_init();
-
   int round;
   for (round = 0; round < TESTS_NUM; round++)
   {
@@ -70,8 +69,6 @@ t_as_path_match(void)
 static int
 t_path_format(void)
 {
-  resource_init();
-
   struct adata empty_as_path = {};
   struct adata *as_path = &empty_as_path;
   struct linpool *lp = lp_new_default(&root_pool);
@@ -116,8 +113,6 @@ count_asn_in_array(const u32 *array, u32 asn)
 static int
 t_path_include(void)
 {
-  resource_init();
-
   struct adata empty_as_path = {};
   struct adata *as_path = &empty_as_path;
   struct linpool *lp = lp_new_default(&root_pool);
@@ -161,8 +156,6 @@ t_path_include(void)
 static int
 t_as_path_converting(void)
 {
-  resource_init();
-
   struct adata empty_as_path = {};
   struct adata *as_path = &empty_as_path;
   struct linpool *lp = lp_new_default(&root_pool);
@@ -211,6 +204,9 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
   resource_sys_init();
+  resource_init();
+  the_bird_lock();
+  birdloop_init();
 
   bt_test_suite(t_as_path_match, "Testing AS path matching and some a-path utilities.");
   bt_test_suite(t_path_format, "Testing formating as path into byte buffer");
diff --git a/nest/a-set_test.c b/nest/a-set_test.c
index efd1b67d..f8f6e781 100644
--- a/nest/a-set_test.c
+++ b/nest/a-set_test.c
@@ -13,6 +13,7 @@
 #include "nest/route.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
+#include "lib/io-loop.h"
 
 #define SET_SIZE 10
 static const struct adata *set_sequence;		/* <0; SET_SIZE) */
@@ -71,7 +72,6 @@ t_set_int_contains(void)
 {
   int i;
 
-  resource_init();
   generate_set_sequence(SET_TYPE_INT, SET_SIZE);
 
   bt_assert(int_set_get_size(set_sequence) == SET_SIZE);
@@ -92,7 +92,6 @@ t_set_int_contains(void)
 static int
 t_set_int_union(void)
 {
-  resource_init();
   generate_set_sequence(SET_TYPE_INT, SET_SIZE);
 
   const struct adata *set_union;
@@ -111,7 +110,6 @@ t_set_int_union(void)
 static int
 t_set_int_format(void)
 {
-  resource_init();
   generate_set_sequence(SET_TYPE_INT, SET_SIZE_FOR_FORMAT_OUTPUT);
 
   bt_assert(int_set_format(set_sequence, 0, 0, buf, BUFFER_SIZE) == 0);
@@ -132,7 +130,6 @@ t_set_int_format(void)
 static int
 t_set_int_delete(void)
 {
-  resource_init();
   generate_set_sequence(SET_TYPE_INT, SET_SIZE);
 
   const struct adata *deleting_sequence = set_sequence;
@@ -160,7 +157,6 @@ t_set_ec_contains(void)
 {
   u32 i;
 
-  resource_init();
   generate_set_sequence(SET_TYPE_EC, SET_SIZE);
 
   bt_assert(ec_set_get_size(set_sequence) == SET_SIZE);
@@ -181,7 +177,6 @@ t_set_ec_contains(void)
 static int
 t_set_ec_union(void)
 {
-  resource_init();
   generate_set_sequence(SET_TYPE_EC, SET_SIZE);
 
   const struct adata *set_union;
@@ -200,8 +195,6 @@ t_set_ec_union(void)
 static int
 t_set_ec_format(void)
 {
-  resource_init();
-
   const struct adata empty_as_path = {};
   set_sequence = set_sequence_same = set_sequence_higher = set_random = &empty_as_path;
   lp = lp_new_default(&root_pool);
@@ -222,7 +215,6 @@ t_set_ec_format(void)
 static int
 t_set_ec_delete(void)
 {
-  resource_init();
   generate_set_sequence(SET_TYPE_EC, SET_SIZE);
 
   const struct adata *deleting_sequence = set_sequence;
@@ -248,6 +240,9 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
   resource_sys_init();
+  resource_init();
+  the_bird_lock();
+  birdloop_init();
 
   bt_test_suite(t_set_int_contains, "Testing sets of integers: contains, get_data");
   bt_test_suite(t_set_int_format,   "Testing sets of integers: format");
diff --git a/nest/cli.c b/nest/cli.c
index b54a0d76..7e5d2151 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -262,7 +262,7 @@ cli_command(struct cli *c)
     log(L_TRACE "CLI: %s", c->rx_buf);
   bzero(&f, sizeof(f));
   f.mem = c->parser_pool;
-  f.pool = rp_new(c->pool, "Config");
+  f.pool = rp_new(c->pool, &main_birdloop, "Config");
   init_list(&f.symbols);
   cf_read_hook = cli_cmd_read_hook;
   cli_rh_pos = c->rx_buf;
@@ -308,7 +308,7 @@ cli_event(void *data)
 cli *
 cli_new(void *priv)
 {
-  pool *p = rp_new(cli_pool, "CLI");
+  pool *p = rp_new(cli_pool, &main_birdloop, "CLI");
   cli *c = mb_alloc(p, sizeof(cli));
 
   bzero(c, sizeof(cli));
@@ -413,7 +413,7 @@ cli_free(cli *c)
     c->cleanup(c);
   if (c == cmd_reconfig_stored_cli)
     cmd_reconfig_stored_cli = NULL;
-  rfree(c->pool);
+  rp_free(c->pool, &root_pool);
 }
 
 /**
@@ -425,7 +425,7 @@ cli_free(cli *c)
 void
 cli_init(void)
 {
-  cli_pool = rp_new(&root_pool, "CLI");
+  cli_pool = rp_new(&root_pool, &main_birdloop, "CLI");
   init_list(&cli_log_hooks);
   cli_log_inited = 1;
 }
diff --git a/nest/cmds.c b/nest/cmds.c
index 18f39eb5..2f2ad94c 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -88,10 +88,10 @@ void
 cmd_show_memory(void)
 {
   cli_msg(-1018, "BIRD memory usage");
-  print_size("Routing tables:", rmemsize(rt_table_pool));
-  print_size("Route attributes:", rmemsize(rta_pool));
-  print_size("Protocols:", rmemsize(proto_pool));
-  print_size("Total:", rmemsize(&root_pool));
+  print_size("Routing tables:", rp_memsize(rt_table_pool));
+  print_size("Route attributes:", rp_memsize(rta_pool));
+  print_size("Protocols:", rp_memsize(proto_pool));
+  print_size("Total:", rp_memsize(&root_pool));
   cli_msg(0, "");
 }
 
diff --git a/nest/config.Y b/nest/config.Y
index 0914048b..f9ed0e69 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -810,7 +810,7 @@ sym_args:
 
 CF_CLI_HELP(DUMP, ..., [[Dump debugging information]])
 CF_CLI(DUMP RESOURCES,,, [[Dump all allocated resource]])
-{ rdump(&root_pool); cli_msg(0, ""); } ;
+{ rp_dump(&root_pool); cli_msg(0, ""); } ;
 CF_CLI(DUMP SOCKETS,,, [[Dump open sockets]])
 { sk_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP EVENTS,,, [[Dump event log]])
diff --git a/nest/iface.c b/nest/iface.c
index 5cb9e814..dd4af243 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -713,7 +713,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 void
 if_init(void)
 {
-  if_pool = rp_new(&root_pool, "Interfaces");
+  if_pool = rp_new(&root_pool, &main_birdloop, "Interfaces");
   init_list(&iface_list);
   strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
diff --git a/nest/proto.c b/nest/proto.c
index 2d30e640..a18d9332 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -666,7 +666,10 @@ static uint channel_aux_imex(struct channel_aux_table *cat)
 static void
 channel_aux_stopped(void *data)
 {
-  struct channel_aux_table *cat = data;
+  struct channel_aux_table *cat;
+  RT_LOCKED((rtable *) data, t)
+    cat = t->config->owner;
+
   struct channel *c = cat->c;
 
   if (channel_aux_imex(cat))
@@ -674,7 +677,6 @@ channel_aux_stopped(void *data)
   else
     c->in_table = NULL;
 
-  rfree(cat->tab->priv.rp);
   mb_free(cat);
   channel_check_stopped(c);
 }
@@ -694,7 +696,7 @@ channel_aux_export_stopped(struct rt_export_request *req)
 
   int del;
   RT_LOCKED(cat->tab, t)
-    del = !!t->delete_event;
+    del = !!t->delete;
 
   if (del)
     return;
@@ -708,10 +710,7 @@ static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
   RT_LOCKED(cat->tab, t)
-  {
-    t->delete_event = ev_new_init(t->rp, channel_aux_stopped, cat);
-    t->delete_event->list = proto_event_list(cat->c->proto);
-  }
+    t->delete = channel_aux_stopped;
 
   cat->push_stopped = (event) {
     .hook = channel_aux_import_stopped,
@@ -889,6 +888,7 @@ channel_setup_in_table(struct channel *c, int best)
 
   bsprintf(cat->name, "%s.%s.import", c->proto->name, c->name);
 
+  cat->tab_cf.owner = cat;
   cat->tab_cf.name = cat->name;
   cat->tab_cf.addr_type = c->net_type;
   cat->tab_cf.cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
@@ -933,6 +933,7 @@ channel_setup_out_table(struct channel *c)
 
   bsprintf(cat->name, "%s.%s.export", c->proto->name, c->name);
 
+  cat->tab_cf.owner = cat;
   cat->tab_cf.name = cat->name;
   cat->tab_cf.addr_type = c->net_type;
   cat->tab_cf.cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
@@ -1387,9 +1388,6 @@ proto_configure_channel(struct proto *p, struct channel **pc, struct channel_con
 static void
 proto_cleanup(struct proto *p)
 {
-  rfree(p->pool);
-  p->pool = NULL;
-
   p->active = 0;
   proto_log_state_change(p);
   proto_rethink_goal(p);
@@ -1400,13 +1398,13 @@ proto_loop_stopped(void *ptr)
 {
   struct proto *p = ptr;
 
-  birdloop_enter(&main_birdloop);
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
 
   p->loop = &main_birdloop;
+  p->pool = NULL;
   p->event->list = NULL;
-  proto_cleanup(p);
 
-  birdloop_leave(&main_birdloop);
+  proto_cleanup(p);
 }
 
 static void
@@ -1426,7 +1424,11 @@ proto_event(void *ptr)
     if (p->loop != &main_birdloop)
       birdloop_stop_self(p->loop, proto_loop_stopped, p);
     else
+    {
+      rp_free(p->pool, proto_pool);
+      p->pool = NULL;
       proto_cleanup(p);
+    }
 }
 
 
@@ -1490,13 +1492,16 @@ proto_start(struct proto *p)
   void *nb = mb_alloc(proto_pool, ns);
   ASSERT_DIE(ns - 1 == bsnprintf(nb, ns, "Protocol %s", p->cf->name));
 
-  p->pool = rp_new(proto_pool, nb);
-
   if (graceful_restart_state == GRS_INIT)
     p->gr_recovery = 1;
 
-  if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
-    p->loop = birdloop_new(p->pool, p->cf->loop_order, nb);
+  if (p->cf->loop_order == DOMAIN_ORDER(the_bird))
+    p->pool = rp_new(proto_pool, &main_birdloop, nb);
+  else
+  {
+    p->loop = birdloop_new(proto_pool, p->cf->loop_order, nb);
+    p->pool = birdloop_pool(p->loop);
+  }
 
   p->event->list = proto_event_list(p);
 
@@ -2177,7 +2182,7 @@ protos_build(void)
   proto_build(&proto_perf);
 #endif
 
-  proto_pool = rp_new(&root_pool, "Protocols");
+  proto_pool = rp_new(&root_pool, &main_birdloop, "Protocols");
   proto_shutdown_timer = tm_new(proto_pool);
   proto_shutdown_timer->hook = proto_shutdown_loop;
 }
diff --git a/nest/route.h b/nest/route.h
index b5d44040..f060ad63 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -174,7 +174,7 @@ typedef struct rtable_private {
   struct event *announce_event;		/* Event to announce pending exports */
   struct event *ec_event;		/* Event to prune finished exports */
   struct event *hcu_event;		/* Event to update host cache */
-  struct event *delete_event;		/* Event to delete the table */
+  void (*delete)(void *);		/* Delete callback (in parent loop context) */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
@@ -212,7 +212,7 @@ typedef union {
 struct rtable_config {
   node n;
   char *name;
-  struct config *config;
+  void *owner;				/* Main config if global table, channel_aux_table if channel table */
   rtable *table;
   struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 9a5498ed..357cd216 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -117,7 +117,7 @@ static void
 rte_src_init(void)
 {
   src_domain = DOMAIN_NEW(attrs, "Route sources");
-  src_pool = rp_new(&root_pool, "Route sources");
+  src_pool = rp_new(&root_pool, &main_birdloop, "Route sources");
   rte_src_slab = sl_new(src_pool, sizeof(struct rte_src));
 
   idm_init(&src_ids, src_pool, SRC_ID_INIT_SIZE);
@@ -1534,7 +1534,7 @@ rta_init(void)
 {
   attrs_domain = DOMAIN_NEW(attrs, "Attributes");
 
-  rta_pool = rp_new(&root_pool, "Attributes");
+  rta_pool = rp_new(&root_pool, &main_birdloop, "Attributes");
 
   rta_slab_[0] = sl_new(rta_pool, sizeof(rta));
   rta_slab_[1] = sl_new(rta_pool, sizeof(rta) + sizeof(u32));
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8566fbf8..cd0d6291 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1695,7 +1695,7 @@ rt_export_stopped(void *data)
   RT_LOCKED(hook->table, tab)
   {
     /* Free the hook together with its coroutine. */
-    rfree(hook->pool);
+    rp_free(hook->pool, tab->rp);
     rt_unlock_table(tab);
 
     DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
@@ -1777,7 +1777,7 @@ rt_request_export(rtable *t, struct rt_export_request *req)
   rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
-  pool *p = rp_new(tab->rp, "Export hook");
+  pool *p = rp_new(tab->rp, tab->loop, "Export hook");
   struct rt_export_hook *hook = req->hook = mb_allocz(p, sizeof(struct rt_export_hook));
   hook->pool = p;
   
@@ -1935,7 +1935,7 @@ rt_dump(rtable *tab)
 {
   RT_LOCK(tab);
   rtable_private *t = RT_PRIV(tab);
-  debug("Dump of routing table <%s>%s\n", t->name, t->delete_event ? " (deleted)" : "");
+  debug("Dump of routing table <%s>%s\n", t->name, t->delete ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
 #endif
@@ -1969,7 +1969,7 @@ rt_dump_hooks(rtable *t)
 {
   RT_LOCK(t);
   rtable_private *tab = RT_PRIV(t);
-  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete_event ? " (deleted)" : "");
+  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete ? " (deleted)" : "");
   debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
       atomic_load(&tab->nhu_state), ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
@@ -2142,6 +2142,9 @@ rt_free(resource *_r)
   ASSERT_DIE(EMPTY_LIST(r->imports));
   ASSERT_DIE(EMPTY_LIST(r->exports));
 
+  if (r->hostcache)
+    rt_free_hostcache(r);
+
   /* Freed automagically by the resource pool
   fib_free(&r->fib);
   hmap_free(&r->id_map);
@@ -2175,10 +2178,14 @@ rt_setup(pool *pp, struct rtable_config *cf)
   void *nb = mb_alloc(pp, ns);
   ASSERT_DIE(ns - 1 == bsnprintf(nb, ns, "Routing table %s", cf->name));
 
-  pool *p = rp_new(pp, nb);
+  struct birdloop *l = birdloop_new(pp, DOMAIN_ORDER(rtable), nb);
+  pool *p = birdloop_pool(l);
+
+  birdloop_enter(l);
 
   rtable_private *t = ralloc(p, &rt_class);
   t->rp = p;
+  t->loop = l;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
 
@@ -2197,8 +2204,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
-  t->loop = birdloop_new(p, DOMAIN_ORDER(rtable), nb);
-
   t->announce_event = ev_new_init(p, rt_announce_exports, t);
   t->ec_event = ev_new_init(p, rt_export_cleanup, t);
   t->prune_event = ev_new_init(p, rt_prune_table, t);
@@ -2216,6 +2221,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->nhu_lp = lp_new_default(p);
 
   mb_move(nb, p);
+  birdloop_leave(l);
+
   return (rtable *) t;
 }
 
@@ -2229,7 +2236,7 @@ void
 rt_init(void)
 {
   rta_init();
-  rt_table_pool = rp_new(&root_pool, "Routing tables");
+  rt_table_pool = rp_new(&root_pool, &main_birdloop, "Routing tables");
   init_list(&routing_tables);
   ev_init_cork(&rt_cork, "Route Table Cork");
 }
@@ -2819,7 +2826,7 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->min_rr_settle_time = 30 S;
   c->max_rr_settle_time = 90 S;
   c->cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
-  c->config = new_config;
+  c->owner = new_config;
 
   add_tail(&new_config->tables, &c->n);
 
@@ -2844,18 +2851,6 @@ rt_lock_table(rtable_private *r)
   r->use_count++;
 }
 
-static void
-rt_loop_stopped(void *data)
-{
-  rtable_private *r = data;
-  birdloop_free(r->loop);
-  r->loop = NULL;
-  r->prune_event->list = r->ec_event->list = NULL;
-  r->nhu_event->list = r->hcu_event->list = NULL;
-  r->announce_event->list = NULL;
-  ev_send(r->delete_event->list, r->delete_event);
-}
-
 /**
  * rt_unlock_table - unlock a routing table
  * @r: routing table to be unlocked
@@ -2867,10 +2862,9 @@ rt_loop_stopped(void *data)
 void
 rt_unlock_table(rtable_private *r)
 {
-  if (!--r->use_count && r->delete_event &&
+  if (!--r->use_count && r->delete &&
       !r->prune_state && !atomic_load_explicit(&r->nhu_state, memory_order_acquire))
-    /* Delete the routing table by freeing its pool */
-    birdloop_stop_self(r->loop, rt_loop_stopped, r);
+    birdloop_stop_self(r->loop, r->delete, r);
 }
 
 static struct rtable_config *
@@ -2883,22 +2877,16 @@ rt_find_table_config(struct config *cf, char *name)
 static void
 rt_done(void *data)
 {
-  rtable_private *t = data;
-  ASSERT_DIE(t->loop == NULL);
+  RT_LOCKED((rtable *) data, t)
+  {
+    struct rtable_config *tc = t->config;
+    struct config *c = tc->owner;
 
-  struct rtable_config *tc = t->config;
-  struct config *c = tc->config;
+    tc->table = NULL;
+    rem_node(&t->n);
 
-  tc->table = NULL;
-  rem_node(&t->n);
-
-  if (t->hostcache)
-    rt_free_hostcache(t);
-
-  rfree(t->delete_event);
-  rfree(t->rp);
-
-  config_del_obstacle(c);
+    config_del_obstacle(c);
+  }
 }
 
 /**
@@ -2925,7 +2913,7 @@ rt_commit(struct config *new, struct config *old)
 	{
 	  RT_LOCK(o->table);
 	  rtable_private *ot = RT_PRIV(o->table);
-	  if (!ot->delete_event)
+	  if (!ot->delete)
 	    {
 	      r = rt_find_table_config(new, o->name);
 	      if (r && (r->addr_type == o->addr_type) && !new->shutdown)
@@ -2941,8 +2929,7 @@ rt_commit(struct config *new, struct config *old)
 		{
 		  DBG("\t%s: deleted\n", o->name);
 		  rt_lock_table(ot);
-		  ot->delete_event = ev_new_init(&root_pool, rt_done, ot);
-		  ot->delete_event->list = &global_event_list;
+		  ot->delete = rt_done;
 		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 40e85a16..515b27e5 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1747,7 +1747,7 @@ babel_add_iface(struct babel_proto *p, struct iface *new, struct babel_iface_con
 
   TRACE(D_EVENTS, "Adding interface %s", new->name);
 
-  pool *pool = rp_new(p->p.pool, new->name);
+  pool *pool = rp_new(p->p.pool, p->p.loop, new->name);
 
   ifa = mb_allocz(pool, sizeof(struct babel_iface));
   ifa->proto = p;
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index dd3488d4..c9b12aa1 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -452,8 +452,8 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
   s->passive = s->cf.passive;
   s->tx_csn = random_u32();
 
-  s->tx_timer = tm_new_init(p->tpool, bfd_tx_timer_hook, s, 0, 0);
-  s->hold_timer = tm_new_init(p->tpool, bfd_hold_timer_hook, s, 0, 0);
+  s->tx_timer = tm_new_init(p->p.pool, bfd_tx_timer_hook, s, 0, 0);
+  s->hold_timer = tm_new_init(p->p.pool, bfd_hold_timer_hook, s, 0, 0);
   bfd_session_update_tx_interval(s);
   bfd_session_control_tx_timer(s, 1);
 
@@ -581,7 +581,7 @@ bfd_get_iface(struct bfd_proto *p, ip_addr local, struct iface *iface)
   struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
   struct bfd_iface_config *ic = bfd_find_iface_config(cf, iface);
 
-  ifa = mb_allocz(p->tpool, sizeof(struct bfd_iface));
+  ifa = mb_allocz(p->p.pool, sizeof(struct bfd_iface));
   ifa->local = local;
   ifa->iface = iface;
   ifa->cf = ic;
@@ -1062,8 +1062,6 @@ bfd_start(struct proto *P)
 
   pthread_spin_init(&p->lock, PTHREAD_PROCESS_PRIVATE);
 
-  p->tpool = rp_new(P->pool, "BFD loop pool");
-
   p->session_slab = sl_new(P->pool, sizeof(struct bfd_session));
   HASH_INIT(p->session_hash_id, P->pool, 8);
   HASH_INIT(p->session_hash_ip, P->pool, 8);
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 8430064b..475b3a11 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -90,8 +90,6 @@ struct bfd_proto
 
   pthread_spinlock_t lock;
 
-  pool *tpool;
-
   node bfd_node;
 
   slab *session_slab;
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index b40592d2..e12f7743 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -561,10 +561,11 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
 static struct mrt_table_dump_state *
 mrt_table_dump_init(pool *pp)
 {
-  pool *pool = rp_new(pp, "MRT Table Dump");
+  pool *pool = rp_new(pp, &main_birdloop, "MRT Table Dump");
   struct mrt_table_dump_state *s = mb_allocz(pool, sizeof(struct mrt_table_dump_state));
 
   s->pool = pool;
+  s->parent = pp;
   s->linpool = lp_new(pool, 4080);
   s->peer_lp = lp_new(pool, 4080);
   mrt_buffer_init(&s->buf, pool, 2 * MRT_ATTR_BUFFER_SIZE);
@@ -601,7 +602,7 @@ mrt_table_dump_free(struct mrt_table_dump_state *s)
 
   config_del_obstacle(s->config);
 
-  rfree(s->pool);
+  rp_free(s->pool, s->parent);
 }
 
 
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index 04865089..2e616f6f 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -67,6 +67,7 @@ struct mrt_table_dump_state {
 
   /* Allocated by mrt_table_dump_init() */
   pool *pool;				/* Pool for table dump */
+  pool *parent;				/* Parent pool for cleanup */
   linpool *linpool;			/* Temporary linear pool */
   linpool *peer_lp;			/* Linear pool for peer entries in peer_hash */
   buffer buf;				/* Buffer for MRT messages */
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 4cd45033..2aae341a 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -311,7 +311,7 @@ ospf_iface_remove(struct ospf_iface *ifa)
 
   ospf_iface_sm(ifa, ISM_DOWN);
   rem_node(NODE ifa);
-  rfree(ifa->pool);
+  rp_free(ifa->pool, p->p.pool);
 }
 
 void
@@ -567,7 +567,7 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
     OSPF_TRACE(D_EVENTS, "Adding interface %s (%N) to area %R",
 	       iface->name, &addr->prefix, oa->areaid);
 
-  pool = rp_new(p->p.pool, "OSPF Interface");
+  pool = rp_new(p->p.pool, p->p.loop, "OSPF Interface");
   ifa = mb_allocz(pool, sizeof(struct ospf_iface));
   ifa->iface = iface;
   ifa->addr = addr;
@@ -687,7 +687,7 @@ ospf_iface_new_vlink(struct ospf_proto *p, struct ospf_iface_patt *ip)
 
   /* Vlink ifname is stored just after the ospf_iface structure */
 
-  pool = rp_new(p->p.pool, "OSPF Vlink");
+  pool = rp_new(p->p.pool, p->p.loop, "OSPF Vlink");
   ifa = mb_allocz(pool, sizeof(struct ospf_iface) + 16);
   ifa->oa = p->backbone;
   ifa->cf = ip;
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index ca369819..48e38556 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -80,7 +80,7 @@ struct ospf_neighbor *
 ospf_neighbor_new(struct ospf_iface *ifa)
 {
   struct ospf_proto *p = ifa->oa->po;
-  struct pool *pool = rp_new(p->p.pool, "OSPF Neighbor");
+  struct pool *pool = rp_new(p->p.pool, p->p.loop, "OSPF Neighbor");
   struct ospf_neighbor *n = mb_allocz(pool, sizeof(struct ospf_neighbor));
 
   n->pool = pool;
@@ -120,7 +120,7 @@ ospf_neigh_down(struct ospf_neighbor *n)
   s_get(&(n->dbsi));
   release_lsrtl(p, n);
   rem_node(NODE n);
-  rfree(n->pool);
+  rp_free(n->pool, p->p.pool);
 
   OSPF_TRACE(D_EVENTS, "Neighbor %R on %s removed", rid, ifa->ifname);
 }
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index d572c1b7..b0f15514 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -284,7 +284,7 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
 
   RADV_TRACE(D_EVENTS, "Adding interface %s", iface->name);
 
-  pool *pool = rp_new(p->p.pool, iface->name);
+  pool *pool = rp_new(p->p.pool, p->p.loop, iface->name);
   ifa = mb_allocz(pool, sizeof(struct radv_iface));
   ifa->pool = pool;
   ifa->ra = p;
@@ -317,7 +317,7 @@ radv_iface_remove(struct radv_iface *ifa)
 
   rem_node(NODE ifa);
 
-  rfree(ifa->pool);
+  rp_free(ifa->pool, p->p.pool);
 }
 
 static void
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index cc86ab6a..afba2216 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -596,7 +596,7 @@ rpki_check_expire_interval(uint seconds)
 static struct rpki_cache *
 rpki_init_cache(struct rpki_proto *p, struct rpki_config *cf)
 {
-  pool *pool = rp_new(p->p.pool, cf->hostname);
+  pool *pool = rp_new(p->p.pool, p->p.loop, cf->hostname);
 
   struct rpki_cache *cache = mb_allocz(pool, sizeof(struct rpki_cache));
 
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index c7cf4ad2..769f01ba 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -48,6 +48,12 @@ birdloop_time_loop(struct birdloop *loop)
   return &loop->time;
 }
 
+pool *
+birdloop_pool(struct birdloop *loop)
+{
+  return loop->pool;
+}
+
 _Bool
 birdloop_inside(struct birdloop *loop)
 {
@@ -333,31 +339,59 @@ birdloop_init(void)
   times_update();
   timers_init(&main_birdloop.time, &root_pool);
 
+  root_pool.loop = &main_birdloop;
+
   birdloop_enter_locked(&main_birdloop);
 }
 
 static void birdloop_main(void *arg);
 
+void
+birdloop_free(resource *r)
+{
+  struct birdloop *loop = (void *) r;
+
+  ASSERT_DIE(loop->links == 0);
+  domain_free(loop->time.domain);
+}
+
+void
+birdloop_dump(resource *r)
+{
+  struct birdloop *loop = (void *) r;
+
+  debug("%s\n", loop->pool->name);
+}
+
+struct resclass birdloop_class = {
+  .name = "IO Loop",
+  .size = sizeof(struct birdloop),
+  .free = birdloop_free,
+  .dump = birdloop_dump,
+};
+
 struct birdloop *
 birdloop_new(pool *pp, uint order, const char *name)
 {
   struct domain_generic *dg = domain_new(name, order);
 
-  pool *p = rp_new(pp, name);
-  struct birdloop *loop = mb_allocz(p, sizeof(struct birdloop));
-  loop->pool = p;
+  struct birdloop *loop = ralloc(pp, &birdloop_class);
 
   loop->time.domain = dg;
   loop->time.loop = loop;
 
   birdloop_enter(loop);
 
+  loop->pool = rp_new(pp, loop, name);
+  loop->parent = pp;
+  rmove(&loop->r, loop->pool);
+
   wakeup_init(loop);
   ev_init_list(&loop->event_list, loop, name);
-  timers_init(&loop->time, p);
+  timers_init(&loop->time, loop->pool);
   sockets_init(loop);
 
-  loop->time.coro = coro_run(p, birdloop_main, loop);
+  loop->time.coro = coro_run(loop->pool, birdloop_main, loop);
 
   birdloop_leave(loop);
 
@@ -389,14 +423,6 @@ birdloop_stop_self(struct birdloop *loop, void (*stopped)(void *data), void *dat
   birdloop_do_stop(loop, stopped, data);
 }
 
-void
-birdloop_free(struct birdloop *loop)
-{
-  ASSERT_DIE(loop->links == 0);
-  domain_free(loop->time.domain);
-  rfree(loop->pool);
-}
-
 static void
 birdloop_enter_locked(struct birdloop *loop)
 {
@@ -529,7 +555,25 @@ birdloop_main(void *arg)
   ASSERT_DIE(loop->sock_num == 0);
 
   birdloop_leave(loop);
+
+  /* Lock parent loop */
+  pool *parent = loop->parent;
+  birdloop_enter(parent->loop);
+
+  /* Move the loop temporarily to parent pool */
+  birdloop_enter(loop);
+  rmove(&loop->r, parent);
+  birdloop_leave(loop);
+
+  /* Announce loop stop */
   loop->stopped(loop->stop_data);
+
+  /* Free the pool and loop */
+  birdloop_enter(loop);
+  rp_free(loop->pool, parent);
+  birdloop_leave(loop);
+  rfree(&loop->r);
+
+  /* And finally leave the parent loop before finishing */
+  birdloop_leave(parent->loop);
 }
-
-
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 4024b6c5..3fccd520 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -9,7 +9,10 @@
 
 struct birdloop
 {
+  resource r;
+
   pool *pool;
+  pool *parent;
 
   struct timeloop time;
   event_list event_list;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 98c56391..c0f2e930 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -74,7 +74,7 @@ static list krt_proto_list;
 void
 krt_io_init(void)
 {
-  krt_pool = rp_new(&root_pool, "Kernel Syncer");
+  krt_pool = rp_new(&root_pool, &main_birdloop, "Kernel Syncer");
   krt_filter_lp = lp_new_default(krt_pool);
   init_list(&krt_proto_list);
   krt_sys_io_init();
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 5da27cb6..ca06611f 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -52,7 +52,7 @@ async_dump(void)
 {
   debug("INTERNAL STATE DUMP\n\n");
 
-  rdump(&root_pool);
+  rp_dump(&root_pool);
   sk_dump_all();
   // XXXX tm_dump_all();
   if_dump_all();
diff --git a/test/bt-utils.c b/test/bt-utils.c
index 90815e77..98aaed3d 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -65,8 +65,8 @@ bt_bird_init(void)
 
   the_bird_lock();
   resource_init();
-  olock_init();
   birdloop_init();
+  olock_init();
   io_init();
   rt_init();
   if_init();

From bb63e99d7877023667edaf26495dd657ec2fd57b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Nov 2021 23:57:14 +0100
Subject: [PATCH 057/431] Page allocator moved from pools to IO loops.

The resource pool system is highly hierarchical and keeping spare pages
in pools leads to unnecessarily complex memory management.

Loops have a flat hiearchy, at least for now, and it is therefore much
easier to keep care of pages, especially in cases of excessive virtual memory
fragmentation.
---
 lib/mempool.c           |   4 +-
 lib/resource.c          |  67 -----------
 lib/resource.h          |   4 +-
 lib/slab.c              |  13 +-
 nest/a-path_test.c      |   2 +
 nest/rt-table.c         |   6 +-
 sysdep/unix/alloc.c     | 261 +++++++++++++++++++++++++---------------
 sysdep/unix/coroutine.c |   3 +
 sysdep/unix/io-loop.c   |   5 +-
 sysdep/unix/io-loop.h   |  21 ++++
 sysdep/unix/io.c        |   3 -
 sysdep/unix/main.c      |  29 +----
 12 files changed, 206 insertions(+), 212 deletions(-)

diff --git a/lib/mempool.c b/lib/mempool.c
index 8f300b81..ed3ae8de 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -130,7 +130,7 @@ lp_alloc(linpool *m, uint size)
 	    {
 	      /* Need to allocate a new chunk */
 	      if (m->use_pages)
-		c = alloc_page(m->p);
+		c = alloc_page();
 	      else
 		c = xmalloc(sizeof(struct lp_chunk) + m->chunk_size);
 
@@ -271,7 +271,7 @@ lp_free(resource *r)
     {
       c = d->next;
       if (m->use_pages)
-	free_page(m->p, d);
+	free_page(d);
       else
 	xfree(d);
     }
diff --git a/lib/resource.c b/lib/resource.c
index c847d41a..d98cd4ff 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -30,14 +30,6 @@
  * is freed upon shutdown of the module.
  */
 
-struct pool_pages {
-  uint free;
-  uint used;
-  void *ptr[0];
-};
-
-#define POOL_PAGES_MAX	((page_size - sizeof(struct pool_pages)) / sizeof (void *))
-
 static void pool_dump(resource *);
 static void pool_free(resource *);
 static resource *pool_lookup(resource *, unsigned long);
@@ -54,9 +46,6 @@ static struct resclass pool_class = {
 
 pool root_pool;
 
-void *alloc_sys_page(void);
-int free_sys_page(void *);
-
 static int indent;
 
 /**
@@ -103,16 +92,6 @@ pool_free(resource *P)
       r = rr;
     }
 
-  if (p->pages)
-    {
-      ASSERT_DIE(!p->pages->used);
-
-      for (uint i = 0; i < p->pages->free; i++)
-	free_sys_page(p->pages->ptr[i]);
-
-      free_sys_page(p->pages);
-    }
-
   pool_parent = parent;
 }
 
@@ -185,9 +164,6 @@ pool_memsize_locked(pool *p)
   WALK_LIST(r, p->inside)
     sum += rmemsize(r);
 
-  if (p->pages)
-    sum += page_size * (p->pages->used + p->pages->free + 1);
-
   return sum;
 }
 
@@ -551,49 +527,6 @@ mb_free(void *m)
   rfree(b);
 }
 
-void *
-alloc_page(pool *p)
-{
-  if (!p->pages)
-  {
-    p->pages = alloc_sys_page();
-    p->pages->free = 0;
-    p->pages->used = 1;
-  }
-  else
-    p->pages->used++;
-
-  if (p->pages->free)
-  {
-    void *ptr = p->pages->ptr[--p->pages->free];
-    bzero(ptr, page_size);
-    return ptr;
-  }
-  else
-    return alloc_sys_page();
-}
-
-void
-free_page(pool *p, void *ptr)
-{
-  ASSERT_DIE(p->pages);
-  p->pages->used--;
-
-  ASSERT_DIE(p->pages->free <= POOL_PAGES_MAX);
-
-  if (p->pages->free == POOL_PAGES_MAX)
-  {
-    const unsigned long keep = POOL_PAGES_MAX / 4;
-
-    for (uint i = keep; i < p->pages->free; i++)
-      free_sys_page(p->pages->ptr[i]);
-
-    p->pages->free = keep;
-  }
-
-  p->pages->ptr[p->pages->free++] = ptr;
-}
-
 
 #define STEP_UP(x) ((x) + (x)/2 + 4)
 
diff --git a/lib/resource.h b/lib/resource.h
index 7adde493..9d7dae69 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -108,8 +108,8 @@ void buffer_realloc(void **buf, unsigned *size, unsigned need, unsigned item_siz
 extern long page_size;
 
 /* Allocator of whole pages; for use in slabs and other high-level allocators. */
-void *alloc_page(pool *);
-void free_page(pool *, void *);
+void *alloc_page(void);
+void free_page(void *);
 #define PAGE_HEAD(x)	((void *) (((intptr_t) (x)) & ~(page_size-1)))
 
 #ifdef HAVE_LIBDMALLOC
diff --git a/lib/slab.c b/lib/slab.c
index 6348e29b..32e241e4 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -269,7 +269,7 @@ no_partial:
       s->num_empty_heads--;
       goto okay;
     }
-  h = alloc_page(s->p);
+  h = alloc_page();
 #ifdef POISON
   memset(h, 0xba, page_size);
 #endif
@@ -332,7 +332,7 @@ sl_free(slab *s, void *oo)
 #ifdef POISON
 	memset(h, 0xde, page_size);
 #endif
-	free_page(s->p, h);
+	free_page(h);
       }
       else
 	{
@@ -349,11 +349,11 @@ slab_free(resource *r)
   struct sl_head *h, *g;
 
   WALK_LIST_DELSAFE(h, g, s->empty_heads)
-    free_page(s->p, h);
+    free_page(h);
   WALK_LIST_DELSAFE(h, g, s->partial_heads)
-    free_page(s->p, h);
+    free_page(h);
   WALK_LIST_DELSAFE(h, g, s->full_heads)
-    free_page(s->p, h);
+    free_page(h);
 }
 
 static void
@@ -386,8 +386,7 @@ slab_memsize(resource *r)
   WALK_LIST(h, s->full_heads)
     heads++;
 
-//  return ALLOC_OVERHEAD + sizeof(struct slab) + heads * (ALLOC_OVERHEAD + page_size);
-  return ALLOC_OVERHEAD + sizeof(struct slab); /* The page sizes are accounted for in the pool */
+  return ALLOC_OVERHEAD + sizeof(struct slab) + heads * page_size;
 }
 
 static resource *
diff --git a/nest/a-path_test.c b/nest/a-path_test.c
index 2e6683f2..2533dbae 100644
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@@ -198,6 +198,7 @@ t_as_path_converting(void)
 #endif
 
 void resource_sys_init(void);
+void io_init(void);
 
 int
 main(int argc, char *argv[])
@@ -207,6 +208,7 @@ main(int argc, char *argv[])
   resource_init();
   the_bird_lock();
   birdloop_init();
+  io_init();
 
   bt_test_suite(t_as_path_match, "Testing AS path matching and some a-path utilities.");
   bt_test_suite(t_path_format, "Testing formating as path into byte buffer");
diff --git a/nest/rt-table.c b/nest/rt-table.c
index cd0d6291..ada54396 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1057,7 +1057,7 @@ rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_
 
   if (!rpeb)
   {
-    rpeb = alloc_page(tab->rp);
+    rpeb = alloc_page();
     *rpeb = (struct rt_export_block) {};
     add_tail(&tab->pending_exports, &rpeb->n);
   }
@@ -2157,7 +2157,7 @@ rt_free(resource *_r)
 static void
 rt_res_dump(resource *_r)
 {
-  RT_LOCKED((rtable *) _r, r)
+  rtable_private *r = RT_PRIV((rtable *) _r);
   debug("name \"%s\", addr_type=%s, rt_count=%u, use_count=%d\n",
       r->name, net_label[r->addr_type], r->rt_count, r->use_count);
 }
@@ -2484,7 +2484,7 @@ rt_export_cleanup(void *data)
       memset(reb, 0xbe, page_size);
 #endif
 
-      free_page(tab->rp, reb);
+      free_page(reb);
 
       if (EMPTY_LIST(tab->pending_exports))
       {
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 61360e73..77c504e3 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -9,6 +9,8 @@
 #include "nest/bird.h"
 #include "lib/resource.h"
 
+#include "sysdep/unix/io-loop.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdatomic.h>
@@ -19,86 +21,47 @@
 #endif
 
 long page_size = 0;
-_Bool alloc_multipage = 0;
-
-static _Atomic int global_page_list_not_empty;
-static list global_page_list;
-static _Atomic int global_page_spinlock;
-
-#define	GLOBAL_PAGE_SPIN_LOCK	for (int v = 0; !atomic_compare_exchange_weak_explicit(&global_page_spinlock, &v, 1, memory_order_acq_rel, memory_order_acquire); v = 0)
-#define GLOBAL_PAGE_SPIN_UNLOCK	do { int v = 1; ASSERT_DIE(atomic_compare_exchange_strong_explicit(&global_page_spinlock, &v, 0, memory_order_acq_rel, memory_order_acquire)); } while (0)
 
 #ifdef HAVE_MMAP
+#if DEBUGGING
+#define FP_NODE_OFFSET	42
+#else
+#define FP_NODE_OFFSET   1
+#endif
 static _Bool use_fake = 0;
 #else
 static _Bool use_fake = 1;
 #endif
 
-void resource_sys_init(void)
+static void *
+alloc_sys_page(void)
 {
-#ifdef HAVE_MMAP
-  init_list(&global_page_list);
+  void *ptr = mmap(NULL, page_size, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
-  if (!(page_size = sysconf(_SC_PAGESIZE)))
-    die("System page size must be non-zero");
+  if (ptr == MAP_FAILED)
+    bug("mmap(%lu) failed: %m", page_size);
 
-  if ((u64_popcount(page_size) > 1) || (page_size > 16384))
-#endif
-  {
-    /* Too big or strange page, use the aligned allocator instead */
-    page_size = 4096;
-    use_fake = 1;
-  }
+  return ptr;
 }
 
 void *
-alloc_sys_page(void)
+alloc_page(void)
 {
 #ifdef HAVE_MMAP
   if (!use_fake)
   {
-    if (atomic_load_explicit(&global_page_list_not_empty, memory_order_relaxed))
-    {
-      GLOBAL_PAGE_SPIN_LOCK;
-      if (!EMPTY_LIST(global_page_list))
-      {
-	node *ret = HEAD(global_page_list);
-	rem_node(ret);
-	if (EMPTY_LIST(global_page_list))
-	  atomic_store_explicit(&global_page_list_not_empty, 0, memory_order_relaxed);
-	GLOBAL_PAGE_SPIN_UNLOCK;
-	memset(ret, 0, sizeof(node));
-	return (void *) ret;
-      }
-      GLOBAL_PAGE_SPIN_UNLOCK;
-    }
+    struct free_pages *fp = &birdloop_current->pages;
+    if (!fp->cnt)
+      return alloc_sys_page();
+    
+    node *n = HEAD(fp->list);
+    rem_node(n);
+    if (--fp->cnt < fp->min)
+      ev_send(&global_work_list, fp->cleanup);
 
-    if (alloc_multipage)
-    {
-      void *big = mmap(NULL, page_size * 2, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (big == MAP_FAILED)
-	bug("mmap(%lu) failed: %m", page_size);
-
-      uintptr_t offset = ((uintptr_t) big) % page_size;
-      if (offset)
-      {
-	void *ret = big + page_size - offset;
-	munmap(big, page_size - offset);
-	munmap(ret + page_size, offset);
-	return ret;
-      }
-      else
-      {
-	munmap(big + page_size, page_size);
-	return big;
-      }
-    }
-
-    void *ret = mmap(NULL, page_size, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    if (ret == MAP_FAILED)
-      bug("mmap(%lu) failed: %m", page_size);
-
-    return ret;
+    void *ptr = n - FP_NODE_OFFSET;
+    memset(ptr, 0, page_size);
+    return ptr;
   }
   else
 #endif
@@ -111,56 +74,156 @@ alloc_sys_page(void)
 }
 
 void
-free_sys_page(void *ptr)
+free_page(void *ptr)
 {
 #ifdef HAVE_MMAP
   if (!use_fake)
   {
-    if (munmap(ptr, page_size) < 0)
-#ifdef ENOMEM
-      if (errno == ENOMEM)
-      {
-	memset(ptr, 0, page_size);
+    struct free_pages *fp = &birdloop_current->pages;
+    struct node *n = ptr;
+    n += FP_NODE_OFFSET;
 
-	GLOBAL_PAGE_SPIN_LOCK;
-	add_tail(&global_page_list, (node *) ptr);
-	atomic_store_explicit(&global_page_list_not_empty, 1, memory_order_relaxed);
-	GLOBAL_PAGE_SPIN_UNLOCK;
-      }
-      else
-#endif
-	bug("munmap(%p) failed: %m", ptr);
+    memset(n, 0, sizeof(node));
+    add_tail(&fp->list, n);
+    if (++fp->cnt > fp->max)
+      ev_send(&global_work_list, fp->cleanup);
   }
   else
 #endif
     free(ptr);
 }
 
+#ifdef HAVE_MMAP
+
+#define GFP (&main_birdloop.pages)
+
 void
-check_stored_pages(void)
+flush_pages(struct birdloop *loop)
 {
-#ifdef ENOMEM
-  if (atomic_load_explicit(&global_page_list_not_empty, memory_order_relaxed) == 0)
-    return;
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
 
-  for (uint limit = 0; limit < 256; limit++)
-  {
-    GLOBAL_PAGE_SPIN_LOCK;
-    void *ptr = HEAD(global_page_list);
-    if (!NODE_VALID(ptr))
-    {
-      atomic_store_explicit(&global_page_list_not_empty, 0, memory_order_relaxed);
-      GLOBAL_PAGE_SPIN_UNLOCK;
-      return;
-    }
+  add_tail_list(&GFP->list, &loop->pages.list);
+  GFP->cnt += loop->pages.cnt;
+  
+  loop->pages.cnt = 0;
+  loop->pages.list = (list) {};
+  loop->pages.min = 0;
+  loop->pages.max = 0;
 
-    rem_node(ptr);
-    if (munmap(ptr, page_size) < 0)
-      if (errno == ENOMEM)
-	add_tail(&global_page_list, ptr);
-      else
-	bug("munmap(%p) failed: %m", ptr);
-    GLOBAL_PAGE_SPIN_UNLOCK;
-  }
-#endif
+  rfree(loop->pages.cleanup);
+  loop->pages.cleanup = NULL;
 }
+
+static void
+cleanup_pages(void *data)
+{
+  struct birdloop *loop = data;
+  birdloop_enter(loop);
+
+  struct free_pages *fp = &birdloop_current->pages;
+
+  while ((fp->cnt < fp->min) && (GFP->cnt > GFP->min))
+  {
+    node *n = HEAD(GFP->list);
+    rem_node(n);
+    add_tail(&fp->list, n);
+    fp->cnt++;
+    GFP->cnt--;
+  }
+  
+  while (fp->cnt < fp->min)
+  {
+    node *n = alloc_sys_page();
+    add_tail(&fp->list, n + FP_NODE_OFFSET);
+    fp->cnt++;
+  }
+
+  while (fp->cnt > fp->max)
+  {
+    node *n = HEAD(fp->list);
+    rem_node(n);
+    add_tail(&GFP->list, n);
+    fp->cnt--;
+    GFP->cnt++;
+  }
+
+  birdloop_leave(loop);
+
+  if (GFP->cnt > GFP->max)
+    ev_send(&global_work_list, GFP->cleanup);
+}
+
+static void
+cleanup_global_pages(void *data UNUSED)
+{
+  while (GFP->cnt < GFP->max)
+  {
+    node *n = alloc_sys_page();
+    add_tail(&GFP->list, n + FP_NODE_OFFSET);
+    GFP->cnt++;
+  }
+
+  for (uint limit = GFP->cnt; (limit > 0) && (GFP->cnt > GFP->max); limit--)
+  {
+    node *n = TAIL(GFP->list);
+    rem_node(n);
+
+    if (munmap(n - FP_NODE_OFFSET, page_size) == 0)
+      GFP->cnt--;
+    else if (errno == ENOMEM)
+      add_head(&GFP->list, n);
+    else
+      bug("munmap(%p) failed: %m", n - FP_NODE_OFFSET);
+  }
+}
+
+void
+init_pages(struct birdloop *loop)
+{
+  struct free_pages *fp = &loop->pages;
+
+  init_list(&fp->list);
+  fp->cleanup = ev_new_init(&root_pool, cleanup_pages, loop);
+  fp->min = 4;
+  fp->max = 16;
+
+  for (fp->cnt = 0; fp->cnt < fp->min; fp->cnt++)
+  {
+    node *n = alloc_sys_page();
+    add_tail(&fp->list, n + FP_NODE_OFFSET);
+  }
+}
+
+static event global_free_pages_cleanup_event = { .hook = cleanup_global_pages };
+
+void resource_sys_init(void)
+{
+  if (!(page_size = sysconf(_SC_PAGESIZE)))
+    die("System page size must be non-zero");
+
+  if (u64_popcount(page_size) == 1)
+  {
+    init_list(&GFP->list);
+    GFP->cleanup = &global_free_pages_cleanup_event;
+    GFP->min = 0;
+    GFP->max = 256;
+    return;
+  }
+
+  log(L_WARN "Got strange memory page size (%lu), using the aligned allocator instead", page_size);
+
+  /* Too big or strange page, use the aligned allocator instead */
+  page_size = 4096;
+  use_fake = 1;
+}
+
+#else
+
+void
+resource_sys_init(void)
+{
+  page_size = 4096;
+  use_fake = 1;
+}
+
+#endif
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 12ba55d8..e4657157 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -145,10 +145,13 @@ static void coro_free(resource *r)
   coro_cleaned_up = 1;
 }
 
+static void coro_dump(resource *r UNUSED) { }
+
 static struct resclass coro_class = {
   .name = "Coroutine",
   .size = sizeof(struct coroutine),
   .free = coro_free,
+  .dump = coro_dump,
 };
 
 _Thread_local struct coroutine *this_coro = NULL;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 769f01ba..732ea64d 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -32,7 +32,7 @@
  *	Current thread context
  */
 
-_Thread_local struct birdloop *birdloop_current;
+_Thread_local struct birdloop *birdloop_current = NULL;
 static _Thread_local struct birdloop *birdloop_wakeup_masked;
 static _Thread_local uint birdloop_wakeup_masked_count;
 
@@ -391,6 +391,8 @@ birdloop_new(pool *pp, uint order, const char *name)
   timers_init(&loop->time, loop->pool);
   sockets_init(loop);
 
+  init_pages(loop);
+
   loop->time.coro = coro_run(loop->pool, birdloop_main, loop);
 
   birdloop_leave(loop);
@@ -571,6 +573,7 @@ birdloop_main(void *arg)
   /* Free the pool and loop */
   birdloop_enter(loop);
   rp_free(loop->pool, parent);
+  flush_pages(loop);
   birdloop_leave(loop);
   rfree(&loop->r);
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 3fccd520..e5af52d1 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -7,6 +7,20 @@
 #ifndef _BIRD_SYSDEP_UNIX_IO_LOOP_H_
 #define _BIRD_SYSDEP_UNIX_IO_LOOP_H_
 
+#include "nest/bird.h"
+
+#include "lib/lists.h"
+#include "lib/event.h"
+#include "lib/timer.h"
+
+struct free_pages
+{
+  list list;		/* List of empty pages */
+  event *cleanup;	/* Event to call when number of pages is outside bounds */
+  u16 min, max;		/* Minimal and maximal number of free pages kept */
+  uint cnt;		/* Number of empty pages */
+};
+
 struct birdloop
 {
   resource r;
@@ -29,10 +43,17 @@ struct birdloop
 
   uint links;
 
+  struct free_pages pages;
+
   void (*stopped)(void *data);
   void *stop_data;
 
   struct birdloop *prev_loop;
 };
 
+extern _Thread_local struct birdloop *birdloop_current;
+
+void init_pages(struct birdloop *loop);
+void flush_pages(struct birdloop *loop);
+
 #endif
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 91d717d0..eee7b586 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2216,9 +2216,6 @@ io_loop(void)
       timers_fire(&main_birdloop.time, 1);
       io_close_event();
 
-      /* Try to release some memory if possible */
-      check_stored_pages();
-
       // FIXME
       poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
       if (t = timers_first(&main_birdloop.time))
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index ca06611f..57c51c99 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -683,7 +683,7 @@ signal_init(void)
  *	Parsing of command-line arguments
  */
 
-static char *opt_list = "B:c:dD:ps:P:u:g:flRh";
+static char *opt_list = "c:dD:ps:P:u:g:flRh";
 int parse_and_exit;
 char *bird_name;
 static char *use_user;
@@ -704,7 +704,6 @@ display_help(void)
   fprintf(stderr,
     "\n"
     "Options: \n"
-    "  -B <block-size>	    Use 2^this number as memory allocation block size (default: 12)\n"
     "  -c <config-file>     Use given configuration file instead of\n"
     "                       "  PATH_CONFIG_FILE "\n"
     "  -d                   Enable debug messages and run bird in foreground\n"
@@ -791,15 +790,12 @@ get_gid(const char *s)
   return gr->gr_gid;
 }
 
-extern _Bool alloc_multipage;
-
 static void
 parse_args(int argc, char **argv)
 {
   int config_changed = 0;
   int socket_changed = 0;
   int c;
-  int bp;
 
   bird_name = get_bird_name(argv[0], "bird");
   if (argc == 2)
@@ -812,29 +808,6 @@ parse_args(int argc, char **argv)
   while ((c = getopt(argc, argv, opt_list)) >= 0)
     switch (c)
       {
-      case 'B':
-	bp = atoi(optarg);
-	if (bp < 1)
-	{
-	  fprintf(stderr, "Strange block size power %d\n\n", bp);
-	  display_usage();
-	  exit(1);
-	}
-
-	if ((1 << bp) < page_size)
-	{
-	  fprintf(stderr, "Requested block size %ld is lesser than page size %ld\n\n", (1L<<bp), page_size);
-	  display_usage();
-	  exit(1);
-	}
-
-	if ((1L << bp) > page_size)
-	{
-	  alloc_multipage = 1;
-	  page_size = (1L << bp);
-	}
-
-	break;
       case 'c':
 	config_name = optarg;
 	config_changed = 1;

From 55ee9961e0d130bb16b22b7b5acffd815f266d63 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Dec 2021 10:46:49 +0100
Subject: [PATCH 058/431] Fix of shutdown: premature log cleanup led to
 use-after-free

---
 sysdep/unix/log.c  | 20 ++++++++++++++++----
 sysdep/unix/main.c |  5 ++++-
 sysdep/unix/unix.h |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index f48588b6..68a04e78 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -387,6 +387,21 @@ default_log_list(int initial, const char **syslog_name)
   return &log_list;
 }
 
+void
+log_cleanup(int syslog)
+{
+  struct log_config *l;
+
+  if (current_log_list)
+    WALK_LIST(l, *current_log_list)
+      if (l->rf)
+	log_close(l);
+
+  if (syslog && current_syslog_name)
+    closelog();
+}
+
+
 void
 log_switch(int initial, list *logs, const char *new_syslog_name)
 {
@@ -399,10 +414,7 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
     logs = default_log_list(initial, &new_syslog_name);
 
   /* Close the logs to avoid pinning them on disk when deleted */
-  if (current_log_list)
-    WALK_LIST(l, *current_log_list)
-      if (l->rf)
-	log_close(l);
+  log_cleanup(0);
 
   /* Reopen the logs, needed for 'configure undo' */
   if (logs)
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 57c51c99..c326ba2b 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -202,7 +202,9 @@ sysdep_preconfig(struct config *c)
 int
 sysdep_commit(struct config *new, struct config *old UNUSED)
 {
-  log_switch(0, &new->logfiles, new->syslog_name);
+  if (!new->shutdown)
+    log_switch(0, &new->logfiles, new->syslog_name);
+
   return 0;
 }
 
@@ -613,6 +615,7 @@ sysdep_shutdown_done(void)
   unlink_pid_file();
   unlink(path_control_socket);
   log_msg(L_FATAL "Shutdown completed");
+  log_cleanup(1);
   exit(0);
 }
 
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index ad85d1ea..51ec1b1e 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -122,6 +122,7 @@ void krt_io_init(void);
 void main_thread_init(void);
 void log_init_debug(char *);		/* Initialize debug dump to given file (NULL=stderr, ""=off) */
 void log_switch(int initial, list *l, const char *);
+void log_cleanup(int syslog);
 
 struct log_config {
   node n;

From 7092bdc0c9fa77b5cad1c29b342b81f01ba087be Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Thu, 25 Nov 2021 20:21:58 +0000
Subject: [PATCH 059/431] fixed duplicate routes propagation

---
 nest/route.h    |  1 -
 nest/rt-table.c | 35 +++++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index f060ad63..9f09ae3a 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -519,7 +519,6 @@ void rt_refresh_end(struct rt_import_request *);
 void rt_schedule_prune(rtable_private *t);
 void rte_dump(struct rte_storage *);
 void rte_free(struct rte_storage *, rtable_private *);
-struct rte_storage *rte_store(const rte *, net *net, rtable_private *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ada54396..e231b9a3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -341,7 +341,7 @@ rte_find(net *net, struct rte_src *src)
 }
 
 
-struct rte_storage *
+static struct rte_storage *
 rte_store(const rte *r, net *net, rtable_private *tab)
 {
   struct rte_storage *e = sl_alloc(tab->rte_slab);
@@ -351,11 +351,6 @@ rte_store(const rte *r, net *net, rtable_private *tab)
 
   rt_lock_source(e->rte.src);
 
-  if (e->rte.attrs->cached)
-    e->rte.attrs = rta_clone(e->rte.attrs);
-  else
-    e->rte.attrs = rta_lookup(e->rte.attrs);
-
   return e;
 }
 
@@ -1294,10 +1289,11 @@ rte_validate(struct channel *ch, rte *e)
 static int
 rte_same(rte *x, rte *y)
 {
+  ASSERT_DIE(x->attrs->cached && y->attrs->cached);
+
   /* rte.flags are not checked, as they are mostly internal to rtable */
   return
     x->attrs == y->attrs &&
-    x->pflags == y->pflags &&
     x->src == y->src &&
     rte_is_filtered(x) == rte_is_filtered(y);
 }
@@ -1320,6 +1316,15 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
   /* Find and remove original route from the same protocol */
   struct rte_storage **before_old = rte_find(net, src);
 
+  if (!*before_old && !new)
+    {
+      stats->withdraws_ignored++;
+      return;
+    }
+
+  if (new)
+    new->attrs = rta_is_cached(new->attrs) ? rta_clone(new->attrs) : rta_lookup(new->attrs);
+
   if (*before_old)
     {
       old = &(old_stored = (*before_old))->rte;
@@ -1349,6 +1354,8 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
 		  stats->updates_ignored++;
 		  rt_rte_trace_in(D_ROUTES, req, new, "ignored");
 		}
+
+	      rta_free(new->attrs);
 	      return;
 	  }
 
@@ -1356,12 +1363,6 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
 	table->rt_count--;
     }
 
-  if (!old && !new)
-    {
-      stats->withdraws_ignored++;
-      return;
-    }
-
   if (req->preimport)
     new = req->preimport(req, new, old);
 
@@ -1523,7 +1524,10 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
   {
     if (new && !old)
       if (CHANNEL_LIMIT_PUSH(c, RX))
+      {
+	rta_free(new->attrs);
 	return NULL;
+      }
 
     if (!new && old)
       CHANNEL_LIMIT_POP(c, RX);
@@ -1540,7 +1544,10 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 	return new;
       }
       else
+      {
+	rta_free(new->attrs);
 	return NULL;
+      }
 
   if (!new_in && old_in)
     CHANNEL_LIMIT_POP(c, IN);
@@ -2671,7 +2678,7 @@ rt_next_hop_update_rte(rtable_private *tab, net *n, rte *old)
   a->cached = 0;
 
   rte e0 = *old;
-  e0.attrs = a;
+  e0.attrs = rta_lookup(a);
 
   return rte_store(&e0, n, tab);
 }

From 5f94d684d0ae07306002c319d9a2e921b28b13cf Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Wed, 1 Dec 2021 16:21:35 +0000
Subject: [PATCH 060/431] Table prune routines request export announcements
 directly

---
 nest/rt-table.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e231b9a3..39b9f0ac 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1498,8 +1498,6 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
   rte_announce(table, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
-  ev_send(req->list, c->export_announce_event);
-
   if (!net->routes &&
       (table->gc_counter++ >= table->config->gc_max_ops) &&
       (table->gc_time + table->config->gc_min_time <= current_time()))
@@ -1653,6 +1651,11 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
 
   /* And recalculate the best route */
   rte_recalculate(tab, hook, nn, new, src);
+
+  /* Schedule export announcement */
+  ev_send(req->list, hook->export_announce_event);
+
+  /* Done! */
   RT_UNLOCK(tab);
 }
 
@@ -2318,6 +2321,7 @@ again:
 	      {
 		FIB_ITERATE_PUT(fit);
 		ev_send_loop(tab->loop, tab->prune_event);
+		ev_send_loop(tab->loop, tab->announce_event);
 		rt_unlock_table(tab);
 		return;
 	      }
@@ -2371,6 +2375,7 @@ again:
   if (EMPTY_LIST(tab->exports) && flushed_channels)
     rt_export_cleanup(tab);
 
+  ev_send_loop(tab->loop, tab->announce_event);
   rt_unlock_table(tab);
 }
 

From 387b279f605c096c6ecb16d6608c700c533edb13 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Wed, 1 Dec 2021 21:33:38 +0000
Subject: [PATCH 061/431] Faster prune on table deletion

---
 nest/route.h    |  1 +
 nest/rt-table.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/nest/route.h b/nest/route.h
index 9f09ae3a..afd7a783 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -164,6 +164,7 @@ typedef struct rtable_private {
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
   u32 rr_count;				/* Number of running route refresh requests */
+  u32 imports_up;			/* Number of imports in TIS_UP state */
 
   list imports;				/* Registered route importers */
   list exports;				/* Registered route exporters */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 39b9f0ac..2c0f1c63 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -66,6 +66,7 @@ static void rt_notify_hostcache(rtable_private *tab, net *net);
 static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(void *tab);
 static inline void rt_prune_table(void *tab);
+static void rt_fast_prune_check(rtable_private *tab);
 static inline void rt_schedule_notify(rtable_private *tab);
 static void rt_feed_channel(void *);
 
@@ -1708,6 +1709,8 @@ rt_export_stopped(void *data)
     rp_free(hook->pool, tab->rp);
     rt_unlock_table(tab);
 
+    rt_fast_prune_check(tab);
+
     DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
   }
 }
@@ -1740,6 +1743,8 @@ rt_request_import(rtable *t, struct rt_import_request *req)
   rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
+  ASSERT_DIE(!tab->delete);
+
   struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
 
   DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
@@ -1756,6 +1761,7 @@ rt_request_import(rtable *t, struct rt_import_request *req)
 
   hook->n = (node) {};
   add_tail(&tab->imports, &hook->n);
+  tab->imports_up++;
 
   RT_UNLOCK(t);
 }
@@ -1770,7 +1776,11 @@ rt_stop_import(struct rt_import_request *req, event *stopped)
 
   rt_schedule_prune(tab);
 
+  tab->imports_up--;
+  rt_fast_prune_check(tab);
+
   rt_set_import_state(hook, TIS_STOP);
+
   hook->stopped = stopped;
 
   if (hook->stale_set < hook->stale_valid)
@@ -2041,6 +2051,22 @@ rt_schedule_prune(rtable_private *tab)
   tab->prune_state |= 1;
 }
 
+static int
+rt_fast_prune_ready(rtable_private *tab)
+{
+  return EMPTY_LIST(tab->pending_exports) && EMPTY_LIST(tab->exports) && !tab->imports_up;
+}
+
+static void
+rt_fast_prune_check(rtable_private *tab)
+{
+  if (tab->delete && rt_fast_prune_ready(tab))
+  {
+    tab->prune_state |= 1;
+    ev_send_loop(tab->loop, tab->prune_event);
+  }
+}
+
 void
 rt_export_used(rtable_private *tab)
 {
@@ -2272,7 +2298,7 @@ rt_prune_table(void *data)
   ASSERT_DIE(birdloop_inside(tab->loop));
 
   struct fib_iterator *fit = &tab->prune_fit;
-  int limit = 512;
+  int limit = tab->delete ? 16384 : 512;
 
   struct rt_import_hook *ih;
   node *n, *x;
@@ -2289,6 +2315,12 @@ rt_prune_table(void *data)
 
   if (tab->prune_state == 1)
   {
+    if (tab->delete && !rt_fast_prune_ready(tab))
+    {
+      rt_unlock_table(tab);
+      return;
+    }
+
     /* Mark channels to flush */
     WALK_LIST2(ih, n, tab->imports, n)
       if (ih->import_state == TIS_STOP)
@@ -2308,6 +2340,27 @@ rt_prune_table(void *data)
 again:
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
+      if (tab->delete)
+      {
+	ASSERT_DIE(!n->first);
+
+	for (struct rte_storage *e = n->routes, *next; e; e = next)
+	{
+	  next = e->next;
+
+	  struct rt_import_request *req = e->rte.sender->req;
+	  if (req->preimport)
+	    req->preimport(req, NULL, &e->rte);
+
+	  tab->rt_count--;
+	  hmap_clear(&tab->id_map, e->rte.id);
+	  rte_free(e, tab);
+	  limit--;
+	}
+
+	n->routes = NULL;
+      }
+      else
     rescan:
       for (struct rte_storage *e=n->routes; e; e=e->next)
       {
@@ -2547,6 +2600,8 @@ done:;
     if (config->table_debug)
       log(L_TRACE "%s: cork released", tab->name);
   }
+
+  rt_fast_prune_check(tab);
 }
 
 void

From b2bac7ae91253b0bd27e9b03ec5fc30ac1522928 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Wed, 1 Dec 2021 21:52:55 +0000
Subject: [PATCH 062/431] Faster shutdown and cleanups by freeing route
 attributes strictly from main loop

---
 nest/route.h            | 14 ++++++--
 nest/rt-attr.c          | 80 +++++++++++++++++++++++++++--------------
 sysdep/unix/coroutine.c |  3 +-
 3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index afd7a783..9093108b 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -883,14 +883,22 @@ static inline rta *rta_clone(rta *r) {
   return r;
 }
 
-void rta__free(rta *r);
+#define RTA_OBSOLETE_LIMIT 512
+
+extern _Atomic u32 rta_obsolete_count;
+extern event rta_cleanup_event;
+
 static inline void rta_free(rta *r) {
   if (!r)
     return;
 
   u32 uc = atomic_fetch_sub_explicit(&r->uc, 1, memory_order_acq_rel);
-  if (uc == 1)
-    rta__free(r);
+  if (uc > 1)
+    return;
+
+  u32 obs = atomic_fetch_add_explicit(&rta_obsolete_count, 1, memory_order_acq_rel);
+  if (obs == RTA_OBSOLETE_LIMIT)
+    ev_send(&global_work_list, &rta_cleanup_event);
 }
 
 rta *rta_do_cow(rta *o, linpool *lp);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 357cd216..be563491 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1384,52 +1384,78 @@ rta_lookup(rta *o)
   return r;
 }
 
-void
-rta__free(rta *a)
+static void
+rta_cleanup(void *data UNUSED)
 {
-  ASSERT(a->cached);
+  u32 count = 0;
+  rta *ax[RTA_OBSOLETE_LIMIT];
 
   RTA_LOCK;
   struct rta_cache *c = atomic_load_explicit(&rta_cache, memory_order_acquire);
 
-  if (atomic_load_explicit(&a->uc, memory_order_acquire))
-  {
-    /* Acquired inbetween */
-    RTA_UNLOCK;
-    return;
-  }
+  for(u32 h=0; h<c->size; h++)
+    for(rta *a = atomic_load_explicit(&c->table[h], memory_order_acquire), *next;
+	a;
+	a = next)
+    {
+      next = atomic_load_explicit(&a->next, memory_order_acquire);
+      if (atomic_load_explicit(&a->uc, memory_order_acquire) > 0)
+	continue;
 
-  /* Relink the forward pointer */
-  rta *next = atomic_load_explicit(&a->next, memory_order_acquire);
-  atomic_store_explicit(a->pprev, next, memory_order_release);
+      /* Check if the cleanup fits in the buffer */
+      if (count == RTA_OBSOLETE_LIMIT)
+      {
+	ev_send(&global_work_list, &rta_cleanup_event);
+	goto wait;
+      }
 
-  /* Relink the backwards pointer */
-  if (next)
-    next->pprev = a->pprev;
+      /* Relink the forward pointer */
+      atomic_store_explicit(a->pprev, next, memory_order_release);
 
+      /* Relink the backwards pointer */
+      if (next)
+	next->pprev = a->pprev;
+
+      /* Store for freeing and go to the next */
+      ax[count++] = a;
+      a = next;
+    }
+
+wait:
   /* Wait until nobody knows about us */
   synchronize_rcu();
 
-  if (atomic_load_explicit(&a->uc, memory_order_acquire))
+  u32 freed = 0;
+
+  for (u32 i=0; i<count; i++)
   {
+    rta *a = ax[i];
     /* Acquired inbetween, relink back */
-    rta_insert(a, c);
-    RTA_UNLOCK;
-    return;
+    if (atomic_load_explicit(&a->uc, memory_order_acquire))
+    {
+      rta_insert(a, c);
+      continue;
+    }
+
+    /* Cleared to free the memory */
+    rt_unlock_hostentry(a->hostentry);
+    if (a->nh.next)
+      nexthop_free(a->nh.next);
+    ea_free(a->eattrs);
+    a->cached = 0;
+    c->count--;
+    sl_free(rta_slab(a), a);
+    freed++;
   }
 
-  /* Cleared to free the memory */
-  rt_unlock_hostentry(a->hostentry);
-  if (a->nh.next)
-    nexthop_free(a->nh.next);
-  ea_free(a->eattrs);
-  a->cached = 0;
-  c->count--;
-  sl_free(rta_slab(a), a);
+  atomic_fetch_sub_explicit(&rta_obsolete_count, freed, memory_order_release);
 
   RTA_UNLOCK;
 }
 
+_Atomic u32 rta_obsolete_count;
+event rta_cleanup_event = { .hook = rta_cleanup, .list = &global_work_list };
+
 rta *
 rta_do_cow(rta *o, linpool *lp)
 {
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index e4657157..4747d01a 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -201,5 +201,6 @@ struct coroutine *coro_run(pool *p, void (*entry)(void *), void *data)
 void
 coro_yield(void)
 {
-  usleep(100);
+  const struct timespec req = { .tv_nsec = 100 };
+  nanosleep(&req, NULL);
 }

From 38278d94ba0a179d5eeb061a59850a4e1c150e5b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Wed, 1 Dec 2021 22:02:42 +0000
Subject: [PATCH 063/431] No memory unmapping when shutting down

All the memory is just freed implicitly on exit, no need for
page-by-page unmapping.
---
 sysdep/unix/alloc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index d18f286b..99bf349c 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -46,6 +46,8 @@ alloc_sys_page(void)
   return ptr;
 }
 
+extern int shutting_down; /* Shutdown requested. */
+
 void *
 alloc_page(void)
 {
@@ -58,7 +60,7 @@ alloc_page(void)
     
     node *n = HEAD(fp->list);
     rem_node(n);
-    if (--fp->cnt < fp->min)
+    if (!shutting_down && (--fp->cnt < fp->min))
       ev_send(&global_work_list, fp->cleanup);
 
     void *ptr = n - FP_NODE_OFFSET;
@@ -87,7 +89,7 @@ free_page(void *ptr)
 
     memset(n, 0, sizeof(node));
     add_tail(&fp->list, n);
-    if (++fp->cnt > fp->max)
+    if (!shutting_down && (++fp->cnt > fp->max))
       ev_send(&global_work_list, fp->cleanup);
   }
   else
@@ -151,7 +153,7 @@ cleanup_pages(void *data)
 
   birdloop_leave(loop);
 
-  if (GFP->cnt > GFP->max)
+  if (!shutting_down && (GFP->cnt > GFP->max))
     ev_send(&global_work_list, GFP->cleanup);
 }
 

From c5b6b184135b898a22c2a5ab9690c570c3def603 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Thu, 2 Dec 2021 11:29:59 +0000
Subject: [PATCH 064/431] Standby memory pages are accounted for as overhead in
 show memory command

---
 sysdep/unix/io-loop.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index a9927b39..0611e096 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -364,11 +364,22 @@ birdloop_dump(resource *r)
   debug("%s\n", loop->pool->name);
 }
 
+struct resmem birdloop_memsize(resource *r)
+{
+  struct birdloop *loop = (void *) r;
+
+  return (struct resmem) {
+    .effective = sizeof(struct birdloop) - sizeof(resource) - ALLOC_OVERHEAD,
+    .overhead = ALLOC_OVERHEAD + sizeof(resource) + page_size * list_length(&loop->pages.list),
+  };
+}
+
 struct resclass birdloop_class = {
   .name = "IO Loop",
   .size = sizeof(struct birdloop),
   .free = birdloop_free,
   .dump = birdloop_dump,
+  .memsize = birdloop_memsize,
 };
 
 struct birdloop *

From 2117864a87cf9c83d645e5ed1b0863b0e9e95f9a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Thu, 2 Dec 2021 11:41:53 +0000
Subject: [PATCH 065/431] Main IO loop shouldn't skip sockets when ping is
 received

---
 sysdep/unix/io.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index eee7b586..cb6a0754 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2200,6 +2200,7 @@ io_loop(void)
 {
   int poll_tout, timeout;
   int nfds, events, pout;
+  int reload_requested = 0;
   timer *t;
   sock *s;
   node *n;
@@ -2216,8 +2217,9 @@ io_loop(void)
       timers_fire(&main_birdloop.time, 1);
       io_close_event();
 
+restart_poll:
       // FIXME
-      poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
+      poll_tout = ((reload_requested || events) ? 0 : 3000); /* Time in milliseconds */
       if (t = timers_first(&main_birdloop.time))
       {
 	times_update();
@@ -2300,16 +2302,23 @@ io_loop(void)
 	    continue;
 	  die("poll: %m");
 	}
+
+      if (pout && (pfd[0].revents & POLLIN))
+      {
+	/* IO loop reload requested */
+	pipe_drain(main_birdloop.wakeup_fds[0]);
+	reload_requested = 1;
+	goto restart_poll;
+      }
+
+      if (reload_requested)
+      {
+	reload_requested = 0;
+	atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
+      }
+
       if (pout)
 	{
-	  if (pfd[0].revents & POLLIN)
-	  {
-	    /* IO loop reload requested */
-	    pipe_drain(main_birdloop.wakeup_fds[0]);
-	    atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
-	    continue;
-	  }
-
 	  times_update();
 
 	  /* guaranteed to be non-empty */

From e32eafaaa76c27fe5cae496e500e257a5dede7f3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Dec 2021 13:04:00 +0100
Subject: [PATCH 066/431] Using more Python-ish constructions in BIRD
 linked-list accessors

---
 bird-gdb.py | 81 ++++++++++++++++++++---------------------------------
 1 file changed, 30 insertions(+), 51 deletions(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index fe7827fe..5ed99259 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -1,3 +1,6 @@
+import itertools
+import functools
+
 class BIRDPrinter:
     def __init__(self, val):
         self.val = val
@@ -198,12 +201,20 @@ class BIRDList:
         if str(self.tail_node["prev"].address) == '0x0':
             raise Exception("List tail is NULL")
 
-    def walk(self, do):
+    def __iter__(self):
         cur = self.head
         while cur.dereference() != self.tail_node:
-            do(cur)
+            yield cur
             cur = cur.dereference()["next"]
 
+    def __len__(self):
+        return sum([1 for _ in self])
+
+    def __getitem__(self, key):
+        for item in itertools.islice(self, key):
+            return item
+
+        raise KeyError("Not enough elements in list")
 
 class BIRDListLength(gdb.Function):
     """Returns length of the list, as in
@@ -211,13 +222,8 @@ class BIRDListLength(gdb.Function):
     def __init__(self):
         super(BIRDListLength, self).__init__("list_length")
 
-    def count(self, _):
-        self.cnt += 1
-
     def invoke(self, l):
-        self.cnt = 0
-        BIRDList(l).walk(self.count)
-        return self.cnt
+        return len(BIRDList(l))
 
 BIRDListLength()
 
@@ -226,30 +232,11 @@ class BIRDListItem(gdb.Function):
     def __init__(self):
         super(BIRDListItem, self).__init__("list_item")
 
-    class BLException(Exception):
-        def __init__(self, node, msg):
-            Exception.__init__(self, msg)
-            self.node = node
-
-    def count(self, node):
-        if self.cnt == self.pos:
-            raise self.BLException(node, "Node found")
-
-        self.cnt += 1
-
     def invoke(self, l, n, t=None, item="n"):
-        self.cnt = 0
-        self.pos = n
-        bl = BIRDList(l)
-        try:
-            bl.walk(self.count)
-        except self.BLException as e:
-            if t is None:
-                return e.node
-            else:
-                return BIRD.skip_back(t, item, e.node)
-
-        raise Exception("List too short")
+        if t is None:
+            return BIRDList(l)[n]
+        else:
+            return BIRD.skip_back(t, item, BIRDList(l)[n])
 
 BIRDListItem()
 
@@ -340,14 +327,13 @@ class BIRDSlabResource(BIRDResource):
         self.val = val.cast(self.slabtype)
         self.info = None
 
-    def count_heads_item(self, item):
-        self.hcnt += 1
-        self.used += item.dereference().cast(self.slheadtype)["num_full"]
-
     def count_heads(self, which):
         self.hcnt = 0
         self.used = 0
-        BIRDList(self.val[which + "_heads"]).walk(self.count_heads_item)
+        for item in BIRDList(self.val[which + "_heads"]):
+            self.hcnt += 1
+            self.used += item.dereference().cast(self.slheadtype)["num_full"]
+
         self.info[which + "_heads"] = self.hcnt
         self.info[which + "_used"] = self.used
         return (self.hcnt, self.used)
@@ -388,14 +374,14 @@ class BIRDPoolResource(BIRDResource):
         self.resptrtype = gdb.lookup_type("struct resource").pointer()
         self.page_size = gdb.lookup_symbol("page_size")[0].value()
         self.val = val.cast(self.pooltype)
-        self.items = None
+        self.inside = BIRDList(self.val["inside"])
 
-    def parse_inside(self, val):
-        self.items.append(BIRDNewResource(val.cast(self.resptrtype).dereference()))
+    def __iter__(self):
+        for val in self.inside:
+            yield BIRDNewResource(val.cast(self.resptrtype).dereference())
 
-    def parse(self):
-        self.items = []
-        BIRDList(self.val["inside"]).walk(self.parse_inside)
+    def __len__(self):
+        return len(self.inside)
 
     def free_pages(self):
         if str(self.val['pages']) == '0x0':
@@ -404,9 +390,6 @@ class BIRDPoolResource(BIRDResource):
             return self.val['pages'].dereference()['free']
 
     def memsize(self):
-        if self.items is None:
-            self.parse()
-
         sum = BIRDResourceSize(0, self.pooltype.sizeof, self.free_pages() * self.page_size)
 #        for i in self.items:
 #            sum += i.memsize()
@@ -414,13 +397,10 @@ class BIRDPoolResource(BIRDResource):
         return sum
 
     def __str__(self):
-        if self.items is None:
-            self.parse()
-
 #        for i in self.items:
 #            print(i)
 
-        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self.items)} items and {self.free_pages()} free pages"
+        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self)} items and {self.free_pages()} free pages"
 
 BIRDResourceMap = {
         "mbl_memsize": BIRDMBResource,
@@ -446,14 +426,13 @@ class BIRDResourcePrinter(BIRDPrinter):
     def __init__(self, val):
         super(BIRDResourcePrinter, self).__init__(val)
         self.resource = BIRDNewResource(val)
-        self.resource.parse()
         self.resourcetype = gdb.lookup_type("struct resource")
 
         if type(self.resource) == BIRDPoolResource:
             self.children = self.pool_children
 
     def pool_children(self):
-        return iter([ ("\n", i.val.cast(self.resourcetype)) for i in self.resource.items ])
+        return iter([ ("\n", i.val.cast(self.resourcetype)) for i in self.resource ])
 
     def to_string(self):
         return f"[ {str(self.resource.memsize())} ] {str(self.resource)}"

From 4f43d326b4ab8c8ddd4bc00152859e768c27590a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 6 Dec 2021 19:03:00 +0100
Subject: [PATCH 067/431] Event list asserts to prevent running into rotten
 data

---
 lib/event.c | 1 +
 lib/lists.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lib/event.c b/lib/event.c
index 5031f314..766ffa15 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -182,6 +182,7 @@ ev_run_list(event_list *l)
   WALK_LIST_FIRST(n, tmp_list)
     {
       event *e = SKIP_BACK(event, n, n);
+      ASSERT_DIE(n->next->prev == n);
 
       if (legacy)
       {
diff --git a/lib/lists.c b/lib/lists.c
index dc2e4cbb..2f92defe 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -208,6 +208,9 @@ add_tail_list(list *to, list *l)
   EXPENSIVE_CHECK(check_list(to, NULL));
   EXPENSIVE_CHECK(check_list(l, NULL));
 
+  ASSERT_DIE(l->head->prev == &l->head_node);
+  ASSERT_DIE(l->tail->next == &l->tail_node);
+
   node *p = to->tail;
   node *q = l->head;
 

From a9efce68b59efa1d2ceb89a2c19f9e2bf50391ea Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Dec 2021 12:47:42 +0100
Subject: [PATCH 068/431] Fixed a race condition in channel aux table cleanup

---
 nest/proto.c    | 40 ++++++++++++++++++++++++++++++++--------
 nest/protocol.h |  1 +
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index a18d9332..341581ab 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -667,9 +667,14 @@ static void
 channel_aux_stopped(void *data)
 {
   struct channel_aux_table *cat;
+
   RT_LOCKED((rtable *) data, t)
     cat = t->config->owner;
 
+  ASSERT_DIE(cat->push.hook == NULL);
+  ASSERT_DIE(cat->get.hook == NULL);
+  ASSERT_DIE(cat->stop_pending);
+
   struct channel *c = cat->c;
 
   if (channel_aux_imex(cat))
@@ -685,7 +690,15 @@ static void
 channel_aux_import_stopped(void *_cat)
 {
   struct channel_aux_table *cat = _cat;
+
   cat->push.hook = NULL;
+
+  if (!cat->get.hook)
+    RT_LOCKED(cat->tab, t)
+    {
+      t->delete = channel_aux_stopped;
+      rt_unlock_table(t);
+    }
 }
 
 static void
@@ -694,23 +707,31 @@ channel_aux_export_stopped(struct rt_export_request *req)
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
-  int del;
-  RT_LOCKED(cat->tab, t)
-    del = !!t->delete;
+  if (cat->refeed_pending && !cat->stop_pending)
+  {
+    cat->refeed_pending = 0;
+    rt_request_export(cat->tab, req);
 
-  if (del)
     return;
+  }
 
-  ASSERT_DIE(cat->refeed_pending);
-  cat->refeed_pending = 0;
-  rt_request_export(cat->tab, req);
+  if (!cat->push.hook)
+    RT_LOCKED(cat->tab, t)
+    {
+      t->delete = channel_aux_stopped;
+      rt_unlock_table(t);
+    }
 }
 
 static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
+  ASSERT_DIE(!cat->stop_pending);
+
+  cat->stop_pending = 1;
+
   RT_LOCKED(cat->tab, t)
-    t->delete = channel_aux_stopped;
+    rt_lock_table(t);
 
   cat->push_stopped = (event) {
     .hook = channel_aux_import_stopped,
@@ -966,6 +987,9 @@ channel_setup_out_table(struct channel *c)
 static void
 channel_aux_request_refeed(struct channel_aux_table *cat)
 {
+  if (cat->stop_pending)
+    return;
+
   cat->refeed_pending = 1;
   rt_stop_export(&cat->get, channel_aux_export_stopped);
 }
diff --git a/nest/protocol.h b/nest/protocol.h
index 1d4f2059..f07bb4df 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -572,6 +572,7 @@ struct channel_aux_table {
   rtable *tab;
   event *stop;
   u8 refeed_pending;
+  u8 stop_pending;
 };
 
 /*

From 542f24555d9f7c98830ffbca29efc17151bed13b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@jmq.cz>
Date: Tue, 7 Dec 2021 11:49:35 +0000
Subject: [PATCH 069/431] GDB: io loop printing support in resource dumps,
 better iterating over linpool chunks

---
 bird-gdb.py | 52 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index 5ed99259..e11f9757 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -290,19 +290,26 @@ class BIRDLinPoolResource(BIRDResource):
         self.lptype = gdb.lookup_type("struct linpool")
         self.val = val.cast(self.lptype)
         self.info = None
+        self.std = self.ChunkList(self.val["first"])
+        self.large = self.ChunkList(self.val["first_large"])
 
-    def count_chunk(self, which):
-        cnt = 0
-        chunk = self.val[which]
-        while str(chunk) != '0x0':
-            cnt += 1
-            chunk = chunk.dereference()["next"]
-        return cnt
+    class ChunkList:
+        def __init__(self, val):
+            self.val = val
+
+        def __iter__(self):
+            chunk = self.val
+            while str(chunk) != 0x0:
+                yield chunk
+                chunk = chunk.dereference()["next"]
+
+        def __len__(self):
+            return sum([1 for _ in self])
 
     def parse(self):
         self.info = {
-                "std_chunks": self.count_chunk("first"),
-                "large_chunks": self.count_chunk("first_large"),
+                "std_chunks": len(self.std),
+                "large_chunks": len(self.large),
                 }
 
     def memsize(self):
@@ -368,11 +375,25 @@ class BIRDSlabResource(BIRDResource):
                     f", {self.val['objs_per_slab']} objects of size {self.val['obj_size']} per head"
 
 
+class BIRDIOLoopResource(BIRDResource):
+    def __init__(self, val):
+        self.iolooptype = gdb.lookup_type("struct birdloop")
+        self.val = val.cast(self.iolooptype)
+        self.pages = self.val["pages"]
+        self.page_size = gdb.lookup_symbol("page_size")[0].value()
+
+    def memsize(self):
+        return BIRDResourceSize(0, self.iolooptype.sizeof, self.pages['cnt'] * self.page_size)
+
+    def __str__(self):
+        return f"IO Loop {self.val.address} containing {self.pages['cnt']} free pages (min {self.pages['min']} max {self.pages['max']}), cleanup event {self.pages['cleanup'].dereference().address}: " + \
+                ", ".join([ str(p) for p in BIRDList(self.pages["list"])])
+
+
 class BIRDPoolResource(BIRDResource):
     def __init__(self, val):
         self.pooltype = gdb.lookup_type("struct pool")
         self.resptrtype = gdb.lookup_type("struct resource").pointer()
-        self.page_size = gdb.lookup_symbol("page_size")[0].value()
         self.val = val.cast(self.pooltype)
         self.inside = BIRDList(self.val["inside"])
 
@@ -383,14 +404,8 @@ class BIRDPoolResource(BIRDResource):
     def __len__(self):
         return len(self.inside)
 
-    def free_pages(self):
-        if str(self.val['pages']) == '0x0':
-            return 0
-        else:
-            return self.val['pages'].dereference()['free']
-
     def memsize(self):
-        sum = BIRDResourceSize(0, self.pooltype.sizeof, self.free_pages() * self.page_size)
+        sum = BIRDResourceSize(0, self.pooltype.sizeof, 0)
 #        for i in self.items:
 #            sum += i.memsize()
 
@@ -400,13 +415,14 @@ class BIRDPoolResource(BIRDResource):
 #        for i in self.items:
 #            print(i)
 
-        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self)} items and {self.free_pages()} free pages"
+        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self)} items"
 
 BIRDResourceMap = {
         "mbl_memsize": BIRDMBResource,
         "pool_memsize": BIRDPoolResource,
         "lp_memsize": BIRDLinPoolResource,
         "slab_memsize": BIRDSlabResource,
+        "birdloop_memsize": BIRDIOLoopResource,
         }
 
 def BIRDNewResource(res):

From f9e098c98af98096c8f47a054b57cff63d345074 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Dec 2021 14:55:27 +0100
Subject: [PATCH 070/431] Fixed standby memory page counters on shutdown

Bug introduced by commit 38278d94ba0a179d5eeb061a59850a4e1c150e5b.
---
 sysdep/unix/alloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 99bf349c..81cd19b4 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -60,7 +60,7 @@ alloc_page(void)
     
     node *n = HEAD(fp->list);
     rem_node(n);
-    if (!shutting_down && (--fp->cnt < fp->min))
+    if ((--fp->cnt < fp->min) && !shutting_down)
       ev_send(&global_work_list, fp->cleanup);
 
     void *ptr = n - FP_NODE_OFFSET;
@@ -89,7 +89,7 @@ free_page(void *ptr)
 
     memset(n, 0, sizeof(node));
     add_tail(&fp->list, n);
-    if (!shutting_down && (++fp->cnt > fp->max))
+    if ((++fp->cnt > fp->max) && !shutting_down)
       ev_send(&global_work_list, fp->cleanup);
   }
   else

From 493d45d95076ea1f375346942a1ce4e21dcc55e6 Mon Sep 17 00:00:00 2001
From: Maria Jan Matejka <mq@jmq.cz>
Date: Tue, 7 Dec 2021 16:59:44 +0000
Subject: [PATCH 071/431] Fixed build errors for OpenBSD

---
 sysdep/bsd/krt-sock.c | 31 ++++++++++++++-----------------
 sysdep/unix/alloc.c   |  8 ++++++++
 sysdep/unix/krt.c     | 13 +++++++------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 6f788ac2..1d0a8e1b 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -197,9 +197,9 @@ sockaddr_fill_dl(struct sockaddr_dl *sa, struct iface *ifa)
 }
 
 static int
-krt_send_route(struct krt_proto *p, int cmd, rte *e)
+krt_send_route(struct krt_proto *p, int cmd, const rte *e)
 {
-  net *net = e->net;
+  const net_addr *net = e->net;
   rta *a = e->attrs;
   static int msg_seq;
   struct iface *j, *i = a->nh.iface;
@@ -208,7 +208,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
   char *body = (char *)msg.buf;
   sockaddr gate, mask, dst;
 
-  DBG("krt-sock: send %I/%d via %I\n", net->n.prefix, net->n.pxlen, a->gw);
+//  DBG("krt-sock: send %I/%d via %I\n", net->prefix, net->pxlen, a->gw);
 
   bzero(&msg,sizeof (struct rt_msghdr));
   msg.rtm.rtm_version = RTM_VERSION;
@@ -218,7 +218,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
   msg.rtm.rtm_flags = RTF_UP | RTF_PROTO1;
 
   /* XXXX */
-  if (net_pxlen(net->n.addr) == net_max_prefix_length[net->n.addr->type])
+  if (net_pxlen(net) == net_max_prefix_length[net->type])
     msg.rtm.rtm_flags |= RTF_HOST;
   else
     msg.rtm.rtm_addrs |= RTA_NETMASK;
@@ -260,7 +260,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 
   int af = AF_UNSPEC;
 
-  switch (net->n.addr->type) {
+  switch (net->type) {
     case NET_IP4:
       af = AF_INET;
       break;
@@ -268,12 +268,12 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
       af = AF_INET6;
       break;
     default:
-      log(L_ERR "KRT: Not sending route %N to kernel", net->n.addr);
+      log(L_ERR "KRT: Not sending route %N to kernel", net);
       return -1;
   }
 
-  sockaddr_fill(&dst,  af, net_prefix(net->n.addr), NULL, 0);
-  sockaddr_fill(&mask, af, net_pxmask(net->n.addr), NULL, 0);
+  sockaddr_fill(&dst,  af, net_prefix(net), NULL, 0);
+  sockaddr_fill(&mask, af, net_pxmask(net), NULL, 0);
 
   switch (a->dest)
   {
@@ -303,7 +303,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 
 #if __OpenBSD__
     /* Keeping temporarily old code for OpenBSD */
-    struct ifa *addr = (net->n.addr->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
+    struct ifa *addr = (net->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
 
     if (!addr)
     {
@@ -339,7 +339,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
   msg.rtm.rtm_msglen = l;
 
   if ((l = write(p->sys.sk->fd, (char *)&msg, l)) < 0) {
-    log(L_ERR "KRT: Error sending route %N to kernel: %m", net->n.addr);
+    log(L_ERR "KRT: Error sending route %N to kernel: %m", net);
     return -1;
   }
 
@@ -347,7 +347,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 }
 
 void
-krt_replace_rte(struct krt_proto *p, net *n, rte *new, rte *old)
+krt_replace_rte(struct krt_proto *p, const net_addr *n UNUSED, rte *new, const rte *old)
 {
   int err = 0;
 
@@ -374,7 +374,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   /* p is NULL iff KRT_SHARED_SOCKET and !scan */
 
   int ipv6;
-  net *net;
   sockaddr dst, gate, mask;
   ip_addr idst, igate, imask;
   net_addr ndst;
@@ -491,8 +490,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   else
     src = KRT_SRC_KERNEL;
 
-  net = net_get(p->p.main_channel->table, &ndst);
-
   rta a = {
     .source = RTS_INHERIT,
     .scope = SCOPE_UNIVERSE,
@@ -519,7 +516,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   if (!a.nh.iface)
     {
       log(L_ERR "KRT: Received route %N with unknown ifindex %u",
-	  net->n.addr, msg->rtm.rtm_index);
+	  &ndst, msg->rtm.rtm_index);
       return;
     }
 
@@ -542,13 +539,13 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
           return;
 
 	log(L_ERR "KRT: Received route %N with strange next-hop %I",
-	    net->n.addr, a.nh.gw);
+	    &ndst, a.nh.gw);
 	return;
       }
   }
 
  done:;
-  rte e0 = { .attrs = &a, .net = net, };
+  rte e0 = { .attrs = &a, .net = &ndst, };
 
   ea_list *ea = alloca(sizeof(ea_list) + 1 * sizeof(eattr));
   *ea = (ea_list) { .count = 1, .next = e0.attrs->eattrs };
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 81cd19b4..24384d0e 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -70,10 +70,14 @@ alloc_page(void)
   else
 #endif
   {
+#ifdef HAVE_ALIGNED_ALLOC
     void *ret = aligned_alloc(page_size, page_size);
     if (!ret)
       bug("aligned_alloc(%lu) failed", page_size);
     return ret;
+#else
+    bug("BIRD should have already died on fatal error.");
+#endif
   }
 }
 
@@ -214,7 +218,11 @@ void resource_sys_init(void)
     return;
   }
 
+#ifdef HAVE_ALIGNED_ALLOC
   log(L_WARN "Got strange memory page size (%lu), using the aligned allocator instead", page_size);
+#else
+  die("Got strange memory page size (%lu) and aligned_alloc is not available", page_size);
+#endif
 
   /* Too big or strange page, use the aligned allocator instead */
   page_size = 4096;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index c0f2e930..0cb86213 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -681,7 +681,11 @@ static int
 krt_preexport(struct channel *c, rte *e)
 {
   if (e->src->owner == &c->proto->sources)
+#ifdef CONFIG_SINGLE_ROUTE
+    return 1; /* Passing the route directly for rt_notify() to ignore */
+#else
     return -1;
+#endif
 
   if (!krt_capable(e))
     return -1;
@@ -700,13 +704,10 @@ krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
 
 #ifdef CONFIG_SINGLE_ROUTE
   /*
-   * Implicit withdraw - when the imported kernel route becomes the best one,
-   * we know that the previous one exported to the kernel was already removed,
-   * but if we processed the update as usual, we would send withdraw to the
-   * kernel, which would remove the new imported route instead.
+   * When the imported kernel route becomes the best one, we get it directly and
+   * we simply know that it is already there. Nothing to do.
    */
-  rte *best = net->routes;
-  if (!new && best && (best->attrs->src->proto == P))
+  if (new->src->owner == &P->sources)
     return;
 #endif
 

From f459deee9f494ae8f741cc3b04e0e0db94a77c53 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 4 Mar 2021 20:11:26 +0100
Subject: [PATCH 072/431] Thread documentation: chapters 0, 1 and 2

---
 doc/threads/00_filter_structure.png           | Bin 0 -> 307458 bytes
 doc/threads/00_the_name_of_the_game.md        | 114 +++++
 .../01_the_route_and_its_attributes.md        | 159 +++++++
 doc/threads/02_asynchronous_export.md         | 437 ++++++++++++++++++
 doc/threads/Makefile                          |  15 +
 5 files changed, 725 insertions(+)
 create mode 100644 doc/threads/00_filter_structure.png
 create mode 100644 doc/threads/00_the_name_of_the_game.md
 create mode 100644 doc/threads/01_the_route_and_its_attributes.md
 create mode 100644 doc/threads/02_asynchronous_export.md
 create mode 100644 doc/threads/Makefile

diff --git a/doc/threads/00_filter_structure.png b/doc/threads/00_filter_structure.png
new file mode 100644
index 0000000000000000000000000000000000000000..a61603cb853b2f3c43b0d45f6a67d6c06dc5cfe7
GIT binary patch
literal 307458
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

literal 0
HcmV?d00001

diff --git a/doc/threads/00_the_name_of_the_game.md b/doc/threads/00_the_name_of_the_game.md
new file mode 100644
index 00000000..ddc4f638
--- /dev/null
+++ b/doc/threads/00_the_name_of_the_game.md
@@ -0,0 +1,114 @@
+# BIRD Journey to Threads. Chapter 0: The Reason Why.
+
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. Its concept of multiple routing
+tables with pipes between them, as well as a procedural filtering language,
+has been unique for a long time and is still one of main reasons why people use
+BIRD for big loads of routing data.
+
+## IPv4 / IPv6 duality: Solved
+
+The original design of BIRD has also some drawbacks. One of these was an idea
+of two separate daemons – one BIRD for IPv4 and another BIRD for IPv6, built from the same
+codebase, cleverly using `#ifdef IPV6` constructions to implement the
+common parts of BIRD algorithms and data structures only once.
+If IPv6 adoption went forward as people thought in that time,
+it would work; after finishing the worldwide transition to IPv6, people could
+just stop building BIRD for IPv4 and drop the `#ifdef`-ed code.
+
+The history went other way, however. BIRD developers therefore decided to *integrate*
+these two versions into one daemon capable of any address family, allowing for
+not only IPv6 but for virtually anything. This rework brought quite a lot of
+backward-incompatible changes, therefore we decided to release it as a version 2.0.
+This work was mostly finished in 2018 and as for March 2021, we have already
+switched the 1.6.x branch to a bugfix-only mode.
+
+## BIRD is single-threaded now
+
+The second drawback is a single-threaded design. Looking back to 1998, this was
+a good idea. A common PC had one single core and BIRD was targeting exactly
+this segment. As the years went by, the manufacturers launched multicore x86 chips
+(AMD Opteron in 2004, Intel Pentium D in 2005). This ultimately led to a world
+where as of March 2021, there is virtually no new PC sold with a single-core CPU.
+
+Together with these changes, the speed of one single core has not been growing as fast
+as the Internet is growing. BIRD is still capable to handle the full BGP table 
+(868k IPv4 routes in March 2021) with one core, anyway when BIRD starts, it may take
+long minutes to converge.
+
+## Intermezzo: Filters
+
+In 2018, we took some data we had from large internet exchanges  and simulated
+a cold start of BIRD as a route server. We used `linux-perf` to find most time-critical
+parts of BIRD and it pointed very clearly to the filtering code. It also showed that the
+IPv4 version of BIRD v1.6.x is substantially faster than the *integrated* version, while
+the IPv6 version was quite as fast as the *integrated* one.
+
+Here we should show a little bit more about how the filters really work. Let's use
+an example of a simple filter:
+
+```
+filter foo {
+  if net ~ [10.0.0.0/8+] then reject;
+  preference = 2 * preference - 41;
+  accept;
+}
+```
+
+This filter gets translated to an infix internal structure.
+
+![Example of filter internal representation](00_filter_structure.png)
+
+When executing, the filter interpreter just walks the filter internal structure recursively in the
+right order, executes the instructions, collects their results and finishes by
+either rejection or acceptation of the route
+
+## Filter rework
+
+Further analysis of the filter code revealed an absurdly-looking result. The
+most executed parts of the interpreter function were the `push` CPU
+instructions on its very beginning and the `pop` CPU instructions on its very
+end. This came from the fact that the interpreter function was quite long, yet
+most of the filter instructions used an extremely short path, doing all the
+stack manipulation at the beginning, branching by the filter instruction type,
+then it executed just several CPU instructions, popped everything from the
+stack back and returned.
+
+After some thoughts how to minimize stack manipulation when everything you need
+is to take two numbers and multiply them, we decided to preprocess the filter
+internal structure to another structure which is much easier to execute. The
+interpreter is now using a data stack and behaves generally as a
+postfix-ordered language. We also thought about Lua which showed up to be quite
+a lot of work implementing all the glue achieving about the same performance.
+
+After these changes, we managed to reduce the filter execution time by 10–40%,
+depending on how complex the filter is.
+Anyway, even this reduction is quite too little when there is one CPU core
+running for several minutes while others are sleeping.
+
+## We need more threads
+
+As a side effect of the rework, the new filter interpreter is also completely
+thread-safe. It seemed to be the way to go – running the filters in parallel
+while keeping everything else single-threaded. The main problem of this
+solution is a too fine granularity of parallel jobs. We would spend lots of
+time on synchronization overhead.
+
+The only filter parallel execution was also too one-sided, useful only for
+configurations with complex filters. In other cases, the major problem is best
+route recalculation, OSPF recalculation or also kernel synchronization.
+It also turned out to be dirty a lot from the code cleanliness' point of view.
+
+Therefore we chose to make BIRD multithreaded completely. We designed a way how
+to gradually enable parallel computation and best usage of all available CPU
+cores. Our goals are three:
+
+* We want to keep current functionality. Parallel computation should never drop
+  a useful feature.
+* We want to do little steps. No big reworks, even though even the smallest
+  possible step will need quite a lot of refactoring before.
+* We want to be backwards compatible as much as possible.
+
+*It's still a long road to the version 2.1. This series of texts should document
+what is needed to be changed, why we do it and how. In the next chapter, we're
+going to describe the structures for routes and their attributes. Stay tuned!*
diff --git a/doc/threads/01_the_route_and_its_attributes.md b/doc/threads/01_the_route_and_its_attributes.md
new file mode 100644
index 00000000..079eb365
--- /dev/null
+++ b/doc/threads/01_the_route_and_its_attributes.md
@@ -0,0 +1,159 @@
+# BIRD Journey to Threads. Chapter 1: The Route and its Attributes
+
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. We're doing a significant amount of
+BIRD's internal structure changes to make it possible to run in multiple
+threads in parallel. This chapter covers necessary changes of data structures
+which store every single routing data.
+
+*If you want to see the changes in code, look (basically) into the
+`route-storage-updates` branch. Not all of them are already implemented, anyway
+most of them are pretty finished as of end of March, 2021.*
+
+## How routes are stored
+
+BIRD routing table is just a hierarchical noSQL database. On top level, the
+routes are keyed by their destination, called *net*. Due to historic reasons,
+the *net* is not only *IPv4 prefix*, *IPv6 prefix*, *IPv4 VPN prefix* etc.,
+but also *MPLS label*, *ROA information* or *BGP Flowspec record*. As there may
+be several routes for each *net*, an obligatory part of the key is *src* aka.
+*route source*. The route source is a tuple of the originating protocol
+instance and a 32-bit unsigned integer. If a protocol wants to withdraw a route,
+it is enough and necessary to have the *net* and *src* to identify what route
+is to be withdrawn.
+
+The route itself consists of (basically) a list of key-value records, with
+value types ranging from a 16-bit unsigned integer for preference to a complex
+BGP path structure. The keys are pre-defined by protocols (e.g. BGP path or
+OSPF metrics), or by BIRD core itself (preference, route gateway).
+Finally, the user can declare their own attribute keys using the keyword
+`attribute` in config.
+
+## Attribute list implementation
+
+Currently, there are three layers of route attributes. We call them *route*
+(*rte*), *attributes* (*rta*) and *extended attributes* (*ea*, *eattr*).
+
+The first layer, *rte*, contains the *net* pointer, several fixed-size route
+attributes (mostly preference and protocol-specific metrics), flags, lastmod
+time and a pointer to *rta*.
+
+The second layer, *rta*, contains the *src* (a pointer to a singleton instance),
+a route gateway, several other fixed-size route attributes and a pointer to
+*ea* list.
+
+The third layer, *ea* list, is a variable-length list of key-value attributes,
+containing all the remaining route attributes.
+
+Distribution of the route attributes between the attribute layers is somehow
+arbitrary. Mostly, in the first and second layer, there are attributes that
+were thought to be accessed frequently (e.g. in best route selection) and
+filled in in most routes, while the third layer is for infrequently used
+and/or infrequently accessed route attributes.
+
+## Attribute list deduplication
+
+When protocols originate routes, there are commonly more routes with the
+same attribute list. BIRD could ignore this fact, anyway if you have several
+tables connected with pipes, it is more memory-efficient to store the same
+attribute lists only once.
+
+Therefore, the two lower layers (*rta* and *ea*) are hashed and stored in a 
+BIRD-global database. Routes (*rte*) contain a pointer to *rta* in this
+database, maintaining a use-count of each *rta*. Attributes (*rta*) contain
+a pointer to normalized (sorted by numerical key ID) *ea*.
+
+## Attribute list rework
+
+The first thing to change is the distribution of route attributes between
+attribute list layers. We decided to make the first layer (*rte*) only the key
+and other per-record internal technical information. Therefore we move *src* to
+*rte* and preference to *rta* (beside other things). *This is already done.*
+
+We also found out that the nexthop (gateway), originally one single IP address
+and an interface, has evolved to a complex attribute with several sub-attributes;
+not only considering multipath routing but also MPLS stacks and other per-route
+attributes. This has led to a too complex data structure holding the nexthop set.
+
+We decided finally to squash *rta* and *ea* to one type of data structure,
+allowing for completely dynamic route attribute lists. This is also supported
+by adding other *net* types (BGP FlowSpec or ROA) where lots of the fields make
+no sense at all, yet we still want to use the same data structures and implementation
+as we don't like duplicating code. *Multithreading doesn't depend on this change,
+anyway this change is going to happen soon anyway.*
+
+## Route storage
+
+The process of route import from protocol into a table can be divided into several phases:
+
+1. (In protocol code.) Create the route itself (typically from
+   protocol-internal data) and choose the right channel to use.
+2. (In protocol code.) Create the *rta* and *ea* and obtain an appropriate
+   hashed pointer. Allocate the *rte* structure and fill it in. 
+3. (Optionally.) Store the route to the *import table*.
+4. Run filters. If reject, free everything.
+5. Check whether this is a real change (it may be idempotent). If not, free everything and do nothing more.
+6. Run the best route selection algorithm.
+7. Execute exports if needed.
+
+We found out that the *rte* structure allocation is done too early. BIRD uses
+global optimized allocators for fixed-size blocks (which *rte* is) to reduce
+its memory footprint, therefore the allocation of *rte* structure would be a
+synchronization point in multithreaded environment.
+
+The common code is also much more complicated when we have to track whether the
+current *rte* has to be freed or not. This is more a problem in export than in
+import as the export filter can also change the route (and therefore allocate
+another *rte*). The changed route must be therefore freed after use. All the
+route changing code must also track whether this route is writable or
+read-only.
+
+We therefore introduce a variant of *rte* called *rte_storage*. Both of these
+hold the same, the layer-1 route information (destination, author, cached
+attribute pointer, flags etc.), anyway *rte* is always local and *rte_storage*
+is intended to be put in global data structures.
+
+This change allows us to remove lots of the code which only tracks whether any
+*rte* is to be freed as *rte*'s are almost always allocated on-stack, naturally
+limiting their lifetime. If not on-stack, it's the responsibility of the owner
+to free the *rte* after import is done.
+
+This change also removes the need for *rte* allocation in protocol code and
+also *rta* can be safely allocated on-stack. As a result, protocols can simply
+allocate all the data on stack, call the update routine and the common code in
+BIRD's *nest* does all the storage for them.
+
+Allocating *rta* on-stack is however not required. BGP and OSPF use this to
+import several routes with the same attribute list. In BGP, this is due to the
+format of BGP update messages containing first the attributes and then the
+destinations (BGP NLRI's). In OSPF, in addition to *rta* deduplication, it is
+also presumed that no import filter (or at most some trivial changes) is applied
+as OSPF would typically not work well when filtered.
+
+*This change is already done.*
+
+## Route cleanup and table maintenance
+
+In some cases, the route update is not originated by a protocol/channel code.
+When the channel shuts down, all routes originated by that channel are simply
+cleaned up. Also routes with recursive routes may get changed without import,
+simply by changing the IGP route. 
+
+This is currently done by a `rt_event` (see `nest/rt-table.c` for source code)
+which is to be converted to a parallel thread, running when nobody imports any
+route. *This change is freshly done in branch `guernsey`.*
+
+## Parallel protocol execution
+
+The long-term goal of these reworks is to allow for completely independent
+execution of all the protocols. Typically, there is no direct interaction
+between protocols; everything is done thought BIRD's *nest*. Protocols should
+therefore run in parallel in future and wait/lock only when something is needed
+to do externally.
+
+We also aim for a clean and documented protocol API.
+
+*It's still a long road to the version 2.1. This series of texts should document
+what is needed to be changed, why we do it and how. In the next chapter, we're
+going to describe how the route is exported from table to protocols and how this
+process is changing. Stay tuned!*
diff --git a/doc/threads/02_asynchronous_export.md b/doc/threads/02_asynchronous_export.md
new file mode 100644
index 00000000..5a10ce5a
--- /dev/null
+++ b/doc/threads/02_asynchronous_export.md
@@ -0,0 +1,437 @@
+# BIRD Journey to Threads. Chapter 2: Asynchronous route export
+
+Route export is a core algorithm of BIRD. This chapter covers how we are making
+this procedure multithreaded. Desired outcomes are mostly lower latency of
+route import, flap dampening and also faster route processing in large
+configurations with lots of export from one table.
+
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. We're doing a significant amount of
+BIRD's internal structure changes to make it possible to run in multiple
+threads in parallel.
+
+## How routes are propagated through BIRD
+
+In the [previous chapter](https://en.blog.nic.cz/2021/03/23/bird-journey-to-threads-chapter-1-the-route-and-its-attributes/), you could learn how the route import works. We should
+now extend that process by the route export.
+
+1. (In protocol code.) Create the route itself and propagate it through the
+   right channel by calling `rte_update`.
+2. The channel runs its import filter.
+3. New best route is selected.
+4. For each channel:
+    1. The channel runs its preexport hook and export filter.
+    2. (Optionally.) The channel merges the nexthops to create an ECMP route.
+    3. The channel calls the protocol's `rt_notify` hook.
+5. After all exports are finished, the `rte_update` call finally returns and
+   the source protocol may do anything else.
+
+Let's imagine that all the protocols are running in parallel. There are two
+protocols with a route prepared to import. One of those wins the table lock,
+does the import and then the export touches the other protocol which must
+either:
+
+* store the route export until it finishes its own imports, or
+* have independent import and export parts.
+
+Both of these conditions are infeasible for common use. Implementing them would
+make protocols much more complicated with lots of new code to test and release
+at once and also quite a lot of corner cases. Risk of deadlocks is also worth
+mentioning.
+
+## Asynchronous route export
+
+We decided to make it easier for protocols and decouple the import and export
+this way:
+
+1. The import is done.
+2. Best route is selected.
+3. Resulting changes are stored.
+
+Then, after the importing protocol returns, the exports are processed for each
+exporting channel. In future, this will be possible in parallel: Some protocols
+may process the export directly after it is stored, other protocols will wait
+until they finish another job.
+
+This eliminates the risk of deadlocks and all protocols' `rt_notify` hooks can
+rely on their independence. There is only one question. How to store the changes?
+
+## Route export modes
+
+To find a good data structure for route export storage, we shall first know the
+readers. The exporters may request different modes of route export.
+
+### Export everything
+
+This is the most simple route export mode. The exporter wants to know about all
+the routes as they're changing. We therefore simply store the old route until
+the change is fully exported and then we free the old stored route.
+
+To manage this, we can simply queue the changes one after another and postpone 
+old route cleanup after all channels have exported the change. The queue member
+would look like this:
+
+```
+struct {
+  struct rte_storage *new;
+  struct rte_storage *old;
+};
+```
+
+### Export best
+
+This is another simple route export mode. We check whether the best route has
+changed; if not, no export happens. Otherwise, the export is propagated as the
+old best route changing to the new best route. 
+
+To manage this, we could use the queue from the previous point by adding new
+best and old best pointers. It is guaranteed that both the old best and new
+best pointers are always valid in time of export as all the changes in them
+must be stored in future changes which have not been exported yet by this
+channel and therefore not freed yet.
+
+```
+struct {
+  struct rte_storage *new;
+  struct rte_storage *new_best;
+  struct rte_storage *old;
+  struct rte_storage *old_best;
+};
+```
+
+Anyway, we're getting to the complicated export modes where this simple
+structure is simply not enough.
+
+### Export merged
+
+Here we're getting to some kind of problems. The exporting channel requests not
+only the best route but also all routes that are good enough to be considered
+ECMP-eligible (we call these routes *mergable*). The export is then just one
+route with just the nexthops merged.  Export filters are executed before
+merging and if the best route is rejected, nothing is exported at all.
+
+To achieve this, we have to re-evaluate export filters any time the best route
+or any mergable route changes. Until now, the export could just do what it wanted
+as there was only one thread working. To change this, we need to access the
+whole route list and process it.
+
+### Export first accepted
+
+In this mode, the channel runs export filters on a sorted list of routes, best first.
+If the best route gets rejected, it asks for the next one until it finds an
+acceptable route or exhausts the list. This export mode requires a sorted table.
+BIRD users will know this export mode as `secondary` in BGP.
+
+For now, BIRD stores two bits per route for each channel. The *export bit* is set
+if the route has been really exported to that channel. The *reject bit* is set
+if the route was rejected by the export filter.
+
+When processing a route change for accepted, the algorithm first checks the
+export bit for the old route. If this bit is set, the old route is that one
+exported so we have to find the right one to export. Therefore the sorted route
+list is walked best to worst to find a new route to export, using the reject
+bit to evaluate only routes which weren't rejected in previous runs of this
+algorithm.
+
+If the old route bit is not set, the algorithm walks the sorted route list best
+to worst, checking the position of new route with respect to the exported route.
+If the new route is worse, nothing happens, otherwise the new route is sent to
+filters and finally exported if passes.
+
+### Export by feed
+
+To resolve problems arising from previous two export modes (merged and first accepted),
+we introduce a way to process a whole route list without locking the table
+while export filters are running. To achieve this, we follow this algorithm:
+
+1. The exporting channel sees a pending export.
+2. *The table is locked.*
+3. The channel counts all the routes for the given destination.
+4. The channel stores pointers to that routes to a local array.
+5. *The table is unlocked.*
+6. The channel processes the local array of route pointers.
+7. The pending export is marked as processed by this channel.
+
+After unlocking the table, the pointed-to routes are implicitly guarded by the
+sole fact that the pending export has not yet been processed by all channels
+and the cleanup routine never frees any resource related to a pending export.
+
+## Pending export data structure
+
+As the two complicated export modes use the export-by-feed algorithm, the
+pending export data structure may be quite minimalistic.
+
+```
+struct rt_pending_export {
+  struct rt_pending_export * _Atomic next;	/* Next export for the same destination */
+  struct rte_storage *new;			/* New route */
+  struct rte_storage *new_best;			/* New best route in unsorted table */
+  struct rte_storage *old;			/* Old route */
+  struct rte_storage *old_best;			/* Old best route in unsorted table */
+  _Atomic u64 seq;				/* Sequential ID (table-local) of the pending export */
+};
+```
+
+To allow for squashing outdated pending exports (e.g. for flap dampening
+purposes), there is a `next` pointer to the next export for the same
+destination. This is also needed for the export-by-feed algorithm: if there are
+several exports for one net at once, all of them are processed by one
+export-by-feed automatically marked as done.
+
+We should also add several items into `struct channel`.
+
+```
+  struct coroutine *export_coro;			/* Exporter and feeder coroutine */
+  struct bsem *export_sem;				/* Exporter and feeder semaphore */
+  struct rt_pending_export * _Atomic last_export;	/* Last export processed */
+  struct bmap export_seen_map;				/* Keeps track which exports were already processed */
+  u64 flush_seq;					/* Table export seq when the channel announced flushing */
+```
+
+To run the exports in parallel, `export_coro` is run and `export_sem` is
+used for signalling new exports to it. The exporter coroutine also marks all
+seen sequential IDs in its `export_seen_map` to make it possible to skip over
+them if seen again.
+
+There is also a table cleaner routine
+(see [previous chapter](https://en.blog.nic.cz/2021/03/23/bird-journey-to-threads-chapter-1-the-route-and-its-attributes/))
+which must cleanup also the pending exports after all the channels are finished with them.
+To signal that, there is `last_export` working as a release point: the channel
+guarantees that it doesn't touch the pointed-to pending export, nor any data
+from it.
+
+The last tricky point is channel flushing. When any channel stops, all its
+routes are automatically freed and withdrawals are exported if appropriate.
+Until now, the routes could be flushed synchronously, anyway now flush has
+several phases:
+
+1. Flush started (here the channel stores the `seq` of last current pending export).
+2. All routes unlinked yet not freed, withdrawals pending.
+3. Pending withdrawals processed and cleaned up. Channel may safely stop and free its structures.
+
+Finally, some additional information has to be stored in tables:
+
+```
+  _Atomic byte export_used;				/* Export journal cleanup scheduled */ \
+  struct rt_pending_export * _Atomic first_export;	/* First export to announce */ \
+  byte export_scheduled;				/* Export is scheduled */
+  list pending_exports;					/* List of packed struct rt_pending_export */
+  struct fib export_fib;				/* Auxiliary fib for storing pending exports */
+  u64 next_export_seq;					/* The next export will have this ID */
+```
+
+The exports are:
+1. Assigned the `next_export_seq` sequential ID, incrementing this item by one.
+2. Put into `pending_exports` and `export_fib` for both sequential and by-destination access.
+3. Signalled by setting `export_scheduled` and also `first_export` if not `NULL`.
+
+After processing several exports, `export_used` is set and route table maintenance
+coroutine is woken up to possibly do cleanup.
+
+The `struct rt_pending_export` seems to be best allocated by requesting a whole
+memory page, containing a common list node, a simple header and packed all the
+structures in the rest of the page. This may save a significant amount of memory.
+In case of congestion, there will be lots of exports and every spare kilobyte
+counts. If BIRD is almost idle, the optimization does nothing on the overall performance.
+
+## Export algorithm
+
+As we have explained at the beginning, the current export algorithm is
+table-driven. The table walks the channel list and propagates the update.
+The now export algorithm is channel-driven. The table just indicates that it
+has something new in export queue and the channel decides what to do with that and when.
+
+### Pushing an export
+
+When a table has something to export, it enqueues an appropriate instance of
+`struct rt_pending_export`. Then it pings its maintenance coroutine
+(`rt_event`) to notify the exporting channels about a new route. This coroutine
+runs with only the table locked so the protocol may e.g. prepare the next route inbetween.
+The maintenance coroutine, when it wakes up, walks the list of channels and
+wakes their export coroutines.
+
+These two levels of asynchronicity are here for two reasons.
+
+1. There may be lots of channels (hundreds of them) and we don't want to
+   inefficiently iterate the list for each export.
+2. The notification is going to wait until the route author finishes, hopefully
+   importing more routes and therefore allowing more exports to be processed at once.
+
+The table also stores the first and last exports for every destination. These
+come handy mostly for cleanup purposes and for channel feeding.
+
+### Processing an export
+
+After these two pings, the channel finally knows that there is an export pending.
+The channel checks whether there is a `last_export` stored. If yes, it proceeds
+with the next one, otherwise it takes `first_export` from the table (which is
+atomic for this reason).
+
+1. The channel checks its `export_seen_map` whether this export has been
+   already processed. If so, it skips to the next export. No action is needed.
+2. The export chain is scanned for the current first and last export. This is
+   done by following the `next` pointer in the exports as accessing the
+   auxiliary export fib needs locking.
+3. In the best-only and all-routes export mode, the changes are processed
+   without further table locking.
+4. If export-by-feed is used, the current state of routes in table are fetched.
+   Then the table is unlocked and the changes are processed without further locking.
+5. All processed exports are marked as seen.
+6. The channel stores the `last_export` and returns to beginning.to wait for next export.
+
+## The full route life-cycle
+
+Until now, we're always assuming that the channels *just exist*. In real life,
+any channel may go up or down and we must handle it, flushing the routes
+appropriately and freeing all the memory just in time to avoid both
+use-after-free and memory leaks. It should be noted here explicitly that BIRD
+is written in C which has no garbage collector or other modern features alike.
+
+### Protocols and channels as viewed from a route
+
+BIRD consists effectively of protocols and tables. **Protocols** are active parts,
+kind-of subprocesses manipulating routes and other data. **Tables** are passive,
+serving as a database of routes. To connect a protocol to a table, a
+**channel** is created.
+
+Every route has its `sender` storing the channel which has put the route into
+the current table. This comes handy when the channel goes down to know which
+routes to flush.
+
+Every route also has its `src`, a route source allocated by the protocol which
+originated it first. This is kept when a route is passed through a *pipe*.
+
+Both `src` and `sender` must point to active protocols and channels as inactive
+protocols and channels may be deleted in any time.
+
+### Protocol and channel lifecycle
+
+In the beginning, all channels and protocols are down. Until they fully start,
+no route from them is allowed to any table. When the protocol and channel is up,
+they may originate routes freely. However, the transitions are worth mentioning.
+
+### Channel startup and feed
+
+When protocols and channels start, they need to get the current state of the
+appropriate table. Therefore, after a protocol and channel start, also the
+export-feed coroutine is initiated.
+
+Tables can contain millions of routes. It may lead to long import latency if a channel
+was feeding itself in one step. The table structure is (at least for now) too
+complicated to be implemented as lockless, thus even read access needs locking.
+To mitigate this, the feeds are split to allow for regular route propagation
+with a reasonable latency.
+
+When the exports were synchronous, we simply didn't care and just announced the
+exports to the channels from the time they started feeding. When making exports
+asynchronous, it was crucial to avoid most of the possible race conditions
+which could arise from simultaneous feed and export. As the feeder routines had
+to be rewritten, it was a good opportunity to make this precise.
+
+Therefore, when a channel goes up, it also starts exports:
+
+1. Start the feed-export coroutine.
+2. *Lock the table.*
+3. Store the last export in queue.
+4. Read a limited number of routes to local memory together with their pending exports.
+5. If there are some routes to process:
+   1. *Unlock the table.*
+   2. Process the loaded routes.
+   3. Set the appropriate pending exports as seen.
+   4. *Lock the table*
+   5. Go to 4. to continue feeding.
+6. If there was a last export stored, load the next one to be processed. Otherwise take the table's `first_export`.
+7. *Unlock the table.*
+8. Run the exporter loop.
+
+*Note: There are some nuances not mentioned here how to do things in right
+order to avoid missing some events while changing state. Precise description
+would be too detailed for this text.*
+
+When the feeder loop finishes, it continues smoothly to process all the exports
+that have been queued while the feed was running. Step 5.3 ensures that already
+seen exports are skipped, steps 3 and 6 ensure that no export is missed.
+
+### Channel flush
+
+Protocols and channels need to stop for a handful of reasons, All of these
+cases follow the same routine.
+
+1. (Maybe.) The protocol requests to go down or restart.
+2. The channel requests to go down or restart.
+3. The channel requests to stop export.
+4. In the feed-export coroutine:
+   1. At a designated cancellation point, check cancellation.
+   2. Clean up local data.
+   3. *Lock main BIRD context locked*
+   4. If shutdown requested, switch the channel to *flushing* state and request table maintenance.
+5. In the table maintenance coroutine:
+   1. Walk across all channels and check them for *flushing* state.
+   2. Walk across the table (split to allow for low latency updates) and
+      generate a withdrawal for each route sent by the flushing channels.
+   3. Wait until all the withdrawals are processed.
+   4. Mark the flushing channels as *down* and eventually proceed to the protocol shutdown or restart.
+
+There is also a separate routine that handles bulk cleanup of `src`'s which
+contain a pointer to the originating protocol. This routine may get reworked in
+future, yet for now it is good enough.
+
+### Route export cleanup
+
+Last but not least is the export cleanup routine. Until now, the withdrawn
+routes were exported synchronously and freed directly after the import was
+done. This is not possible anymore. The export is stored and the import returns
+to let the importing protocol continue its work. We therefore need a routine to
+cleanup the withdrawn routes and also the processed exports.
+
+First of all, this routine refuses to cleanup when any export is feeding or
+shutting down. This may change in future, anyway for now we aren't sure about
+possible race conditions.
+
+Anyway, when all the exports are in a steady state, the routine works as follows:
+
+1. Walk the active exports and find a minimum (oldest export) between their `last_export` values.
+2. If there is nothing to clear between the actual oldest export and channels' oldest export, do nothing.
+3. Find the table's new `first_export` and set it. Now there is nobody pointing to the old exports.
+4. Free the withdrawn routes.
+5. Free the old exports, removing them also from the first-last list of exports for the same destination.
+
+## Results of these changes
+
+This step is a first major step to move forward. Using just this version may be
+still as slow as the single-threaded version, at least if your export filters are trivial.
+Anyway, the main purpose of this step is not an immediate speedup. It is more
+of a base for the next steps:
+
+* Unlocking of pipes should enable parallel execution of all the filters on
+  pipes, limited solely by the principle *one thread for every direction of
+  pipe*.
+* Conversion of CLI's `show route` to the new feed-export coroutines should
+  enable faster table queries. Moreover, this approach will allow for
+  better splitting of model and view in CLI with a good opportunity to
+  implement more output formats, e.g. JSON.
+* Unlocking of kernel route synchronization should fix latency issues induced
+  by long-lasting kernel queries.
+* Partial unlocking of BGP packet processing should finally allow for parallel
+  execution in almost all phases of BGP route propagation.
+
+The development is now being done mostly in the branch `alderney`. If you asked
+why such strange branch names like `jersey`, `guernsey` and `alderney`, here is
+a kind-of reason. Yes, these names could be named `mq-async-export`,
+`mq-async-export-new`, `mq-async-export-new-new`, `mq-another-async-export` and
+so on. That's so ugly, isn't it? 
+
+Also why so many branches? The development process is quite messy. BIRD's code
+heavily depends on single-threaded approach. This is exceptionally good for
+performance, as long as you have one thread only. On the other hand, lots of
+these assumptions are not documented so in many cases one desired
+change yields a chain of other unforeseen changes which must precede. This brings
+lots of backtracking, branch rebasing and other Git magic. There is always a
+can of worms somewhere in the code.
+
+*It's still a long road to the version 2.1. This series of texts should document
+what is needed to be changed, why we do it and how. The
+[previous chapter](https://en.blog.nic.cz/2021/03/23/bird-journey-to-threads-chapter-1-the-route-and-its-attributes/)
+showed the necessary changes in route storage. In the next chapter, we're going
+to describe how the coroutines are implemented and what kind of locking system
+are we employing to prevent deadlocks. Stay tuned!*
diff --git a/doc/threads/Makefile b/doc/threads/Makefile
new file mode 100644
index 00000000..f5198be7
--- /dev/null
+++ b/doc/threads/Makefile
@@ -0,0 +1,15 @@
+SUFFICES := .pdf -wordpress.html
+CHAPTERS := 00_the_name_of_the_game 01_the_route_and_its_attributes 02_asynchronous_export
+
+all: $(foreach ch,$(CHAPTERS),$(addprefix $(ch),$(SUFFICES)))
+
+00_the_name_of_the_game.pdf: 00_filter_structure.png
+
+%.pdf: %.md
+	pandoc -f markdown -t latex -o $@ $<
+
+%.html: %.md
+	pandoc -f markdown -t html5 -o $@ $<
+
+%-wordpress.html: %.html Makefile
+	sed -r 's#</p>#\n#g; s#<p>##g; s#<(/?)code>#<\1tt>#g; s#<pre><tt>#<code>#g; s#</tt></pre>#</code>#g; s#</?figure>##g; s#<figcaption>#<p style="text-align: center">#; s#</figcaption>#</p>#; ' $< > $@

From b6612ec792a1539a22163429080967c9c416cae6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Jun 2021 18:14:10 +0200
Subject: [PATCH 073/431] Thread documentation: chapter 3, coroutines and
 locking

---
 doc/threads/03_coroutines.md | 122 +++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 doc/threads/03_coroutines.md

diff --git a/doc/threads/03_coroutines.md b/doc/threads/03_coroutines.md
new file mode 100644
index 00000000..33b337f7
--- /dev/null
+++ b/doc/threads/03_coroutines.md
@@ -0,0 +1,122 @@
+# BIRD Journey to Threads. Chapter 3: Coroutines and Locking
+
+Parallel execution in BIRD uses an underlying mechanism of coroutines and
+locks. This chapter covers these two internal modules and their principles.
+Knowing this is a need if you want to create any non-trivial extension to
+future BIRD.
+
+## BIRD's internal logical structure
+
+The authors of original BIRD concepts wisely chose a highly modular structure.
+We can therefore use this structure with minimal rework needed. This structure is roughly:
+
+1. Reconfiguration routines
+2. Protocols
+3. BFD
+4. Private routing tables
+5. Standalone routing tables
+6. Route attribute cache
+
+This order is important for locking. Most actions in BIRD are called
+top-to-bottom in this list, e.g. a reconfiguration triggers protocol action,
+this triggers BFD update, then a routing table update which in turn calls route
+attribute cache. The major locking decision for BIRD is enforcement of this order.
+
+We're not sure yet about where the interface list and `protocol device` should
+be. For now, it is somewhere between 1 and 2, as the interface updates are
+synchronous. It may move in future to 2+5 after implementing asynchronous
+interface updates.
+
+## Locking
+
+BIRD is split into so-called *domains*. These consist of data structures
+logically bound together. These domains should have their own lock guarding
+access to them. These domains are divided into the categories mentioned above.
+
+Currently, lots of domains don't have their own lock. Last changes in branch
+`alderney` assigned locks to routing tables and route attribute cache (4, 5 and 6).
+BFD has had its own lock since it was added to BIRD as it needs much lower
+latency than BIRD typically allows. The rest of BIRD (reconfiguration,
+protocols and CLI) has one common lock, called `the_bird_lock`. This is going to change later.
+
+Locking and unlocking is heavily checked. BIRD always stores the thread's
+locking stack at one place for debug and consistency checking purposes. The
+locking stack is limited to the number of categories. All domains must be
+locked top-to-bottom in this order and unlocked bottom-to-top. No thread is
+allowed to lock more than one domain in each category.
+
+This brings some possible problems in communication between tables (recursive
+nexthop updates had to be thoroughly checked) and it also needs the last big
+change, the asynchronous export. If any data needs to be handed from down to
+up, it must use some kind of asynchronicity to unlock the lower domain before
+accesing the higher level. On the other hand, data flow from up to down is
+straightforward as it is possible to just lock and call the appropriate function.
+
+## Coroutines
+
+There are three principal types of coroutines. One-shot tasks, workers
+and IO handlers. They all share one coroutine data type, anyway the
+synchronization mechanisms are different.
+
+### One-shot tasks
+
+The simplest coroutine type is a one-shot task. Some part of BIRD requests a
+one-time CPU-intensive work. This is used in reconfiguration rework. When
+reconfig is requested, BIRD starts a reconfig coroutine which first parses the
+file (which can take tens of seconds if you have a gigabyte of config files).
+Then this coroutine locks everything and applies the parsed configuration.
+
+One-shot tasks simply start when they are requested and stop when they are
+done. To cancel them prematurely, it is typically enough to set/check an atomic
+variable.
+
+### Workers
+
+In lots of cases, a module has to wait for some supplied data. This is used in
+the channel feed-export coroutine. When feed-export is requested, BIRD starts a
+coroutine which waits on semaphore to get exports, processes the exports and
+then jumps back to wait on semaphore for more work.
+
+These coroutines must be woken up by their semaphore after setting the
+cancellation variable. Then the coroutine cleans up and calls what is required
+next after its cleanup, until finally exiting.
+
+### IO handlers
+
+BIRD needs IO. It is possible to handle almost all IO events in parallel and
+these coroutines will take care of that. There is currently only one such
+thread, it is a low-latency BFD thread handling its own socket.
+
+IO coroutines are also possibly timer coroutines as the `poll` call typically
+has a timeout option. In future, there should be independent IO coroutines for
+each protocol instance to handle IO bottlenecks. It should be noted that e.g.
+in BGP, the protocol synchronously advertises and withdraws routes directly
+from the receive handler.
+
+These coroutines sometimes have to be updated (protocol shuts down, timer is
+modified), therefore every IO coroutine needs its own *fifo* which it polls for
+read. On any update, one byte is sent to this fifo, effectively waking up the
+poll. The fifo is always checked first for changes; if there are some, the poll
+is reloaded before looking at anything else.
+
+### The Main Loop
+
+Currently, BIRD executes everything (with exception of those parts already
+moved to their threads) in one single loop. There are all the sockets with a
+magic round-robin selection of what socket we're going to read from next. This
+loop also runs all the timers and other "asynchronous" events to handle the
+risk that some code would tamper with the caller's data structures badly.
+
+This loop should gradually lose its work to do when more and more routines get
+moved to their own domains and coroutines. After all, possibly the last task
+for the main loop would be signal handling and maybe basic CLI handling.
+
+The main loop dismantling is a long term goal. Before that, we have to do lots of
+changes, allowing for more and more code to run independently. Since [route
+exports are now asynchronous](TODO), there is no more obstacle in adopting the
+locking order as shown here.
+
+*This chapter is last at least for a while. There will be more posts on BIRD
+internals in future, you may expect e.g. protocol API description and maybe
+also a tutorial how to create your own protocol. Thank you all for your support.
+It helps us make your BIRD run smooth and fast.*

From 827c78297e624ff8489f2c61204a42a9a59c7e8d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 9 Jun 2021 07:10:13 +0200
Subject: [PATCH 074/431] Final version of asynchronous export documentation

---
 doc/threads/02_asynchronous_export.md | 174 +++++++++++++++-----------
 doc/threads/Makefile                  |   2 +-
 2 files changed, 101 insertions(+), 75 deletions(-)

diff --git a/doc/threads/02_asynchronous_export.md b/doc/threads/02_asynchronous_export.md
index 5a10ce5a..62e4ea9f 100644
--- a/doc/threads/02_asynchronous_export.md
+++ b/doc/threads/02_asynchronous_export.md
@@ -49,8 +49,8 @@ this way:
 3. Resulting changes are stored.
 
 Then, after the importing protocol returns, the exports are processed for each
-exporting channel. In future, this will be possible in parallel: Some protocols
-may process the export directly after it is stored, other protocols will wait
+exporting channel in parallel: Some protocols
+may process the export directly after it is stored, other protocols wait
 until they finish another job.
 
 This eliminates the risk of deadlocks and all protocols' `rt_notify` hooks can
@@ -120,7 +120,7 @@ whole route list and process it.
 In this mode, the channel runs export filters on a sorted list of routes, best first.
 If the best route gets rejected, it asks for the next one until it finds an
 acceptable route or exhausts the list. This export mode requires a sorted table.
-BIRD users will know this export mode as `secondary` in BGP.
+BIRD users may know this export mode as `secondary` in BGP.
 
 For now, BIRD stores two bits per route for each channel. The *export bit* is set
 if the route has been really exported to that channel. The *reject bit* is set
@@ -146,15 +146,22 @@ while export filters are running. To achieve this, we follow this algorithm:
 
 1. The exporting channel sees a pending export.
 2. *The table is locked.*
-3. The channel counts all the routes for the given destination.
-4. The channel stores pointers to that routes to a local array.
+3. All routes (pointers) for the given destination are dumped to a local array.
+4. Also first and last pending exports for the given destination are stored.
 5. *The table is unlocked.*
 6. The channel processes the local array of route pointers.
-7. The pending export is marked as processed by this channel.
+7. All pending exports between the first and last stored (incl.) are marked as processed to allow for cleanup.
 
 After unlocking the table, the pointed-to routes are implicitly guarded by the
-sole fact that the pending export has not yet been processed by all channels
-and the cleanup routine never frees any resource related to a pending export.
+sole fact that no pending export has not yet been processed by all channels
+and the cleanup routine frees only resources after being processed.
+
+The pending export range must be stored together with the feed. While
+processing export filters for the feed, another export may come in. We
+must process the export once again as the feed is now outdated, therefore we
+must mark only these exports that were pending for this destination when the
+feed was being stored. We also can't mark them before actually processing them
+as they would get freed inbetween.
 
 ## Pending export data structure
 
@@ -174,9 +181,8 @@ struct rt_pending_export {
 
 To allow for squashing outdated pending exports (e.g. for flap dampening
 purposes), there is a `next` pointer to the next export for the same
-destination. This is also needed for the export-by-feed algorithm: if there are
-several exports for one net at once, all of them are processed by one
-export-by-feed automatically marked as done.
+destination. This is also needed for the export-by-feed algorithm to traverse
+the list of pending exports.
 
 We should also add several items into `struct channel`.
 
@@ -191,23 +197,26 @@ We should also add several items into `struct channel`.
 To run the exports in parallel, `export_coro` is run and `export_sem` is
 used for signalling new exports to it. The exporter coroutine also marks all
 seen sequential IDs in its `export_seen_map` to make it possible to skip over
-them if seen again.
+them if seen again. The exporter coroutine is started when export is requested
+and stopped when export is stopped.
 
 There is also a table cleaner routine
 (see [previous chapter](https://en.blog.nic.cz/2021/03/23/bird-journey-to-threads-chapter-1-the-route-and-its-attributes/))
 which must cleanup also the pending exports after all the channels are finished with them.
 To signal that, there is `last_export` working as a release point: the channel
-guarantees that it doesn't touch the pointed-to pending export, nor any data
+guarantees that it doesn't touch the pointed-to pending export (or any older), nor any data
 from it.
 
-The last tricky point is channel flushing. When any channel stops, all its
+The last tricky point here is channel flushing. When any channel stops, all its
 routes are automatically freed and withdrawals are exported if appropriate.
 Until now, the routes could be flushed synchronously, anyway now flush has
-several phases:
+several phases, stored in `flush_active` channel variable:
 
-1. Flush started (here the channel stores the `seq` of last current pending export).
-2. All routes unlinked yet not freed, withdrawals pending.
-3. Pending withdrawals processed and cleaned up. Channel may safely stop and free its structures.
+1. Flush started.
+2. Withdrawals for all the channel's routes are issued. 
+   Here the channel stores the `seq` of last current pending export to `flush_seq`)
+3. When the table's cleanup routine cleans up the withdrawal with `flush_seq`,
+   the channel may safely stop and free its structures as all `sender` pointers in routes are now gone.
 
 Finally, some additional information has to be stored in tables:
 
@@ -223,7 +232,7 @@ Finally, some additional information has to be stored in tables:
 The exports are:
 1. Assigned the `next_export_seq` sequential ID, incrementing this item by one.
 2. Put into `pending_exports` and `export_fib` for both sequential and by-destination access.
-3. Signalled by setting `export_scheduled` and also `first_export` if not `NULL`.
+3. Signalled by setting `export_scheduled` and `first_export`.
 
 After processing several exports, `export_used` is set and route table maintenance
 coroutine is woken up to possibly do cleanup.
@@ -237,55 +246,64 @@ counts. If BIRD is almost idle, the optimization does nothing on the overall per
 ## Export algorithm
 
 As we have explained at the beginning, the current export algorithm is
-table-driven. The table walks the channel list and propagates the update.
-The now export algorithm is channel-driven. The table just indicates that it
+synchronous and table-driven. The table walks the channel list and propagates the update.
+The new export algorithm is channel-driven. The table just indicates that it
 has something new in export queue and the channel decides what to do with that and when.
 
 ### Pushing an export
 
-When a table has something to export, it enqueues an appropriate instance of
-`struct rt_pending_export`. Then it pings its maintenance coroutine
-(`rt_event`) to notify the exporting channels about a new route. This coroutine
-runs with only the table locked so the protocol may e.g. prepare the next route inbetween.
+When a table has something to export, it enqueues an instance of
+`struct rt_pending_export` together with updating the `last` pointer (and
+possibly also `first`) for this destination's pending exports.
+
+Then it pings its maintenance coroutine (`rt_event`) to notify the exporting
+channels about a new route. Before the maintenance coroutine acquires the table
+lock, the importing protocol may e.g. prepare the next route inbetween.
 The maintenance coroutine, when it wakes up, walks the list of channels and
 wakes their export coroutines.
 
-These two levels of asynchronicity are here for two reasons.
+These two levels of asynchronicity are here for an efficiency reason.
 
-1. There may be lots of channels (hundreds of them) and we don't want to
-   inefficiently iterate the list for each export.
-2. The notification is going to wait until the route author finishes, hopefully
-   importing more routes and therefore allowing more exports to be processed at once.
-
-The table also stores the first and last exports for every destination. These
-come handy mostly for cleanup purposes and for channel feeding.
+1. In case of low table load, the export is announced just after the import happens.
+2. In case of table congestion, the export notification locks the table as well
+   as all route importers, effectively reducing the number of channel list traversals.
 
 ### Processing an export
 
 After these two pings, the channel finally knows that there is an export pending.
-The channel checks whether there is a `last_export` stored. If yes, it proceeds
-with the next one, otherwise it takes `first_export` from the table (which is
-atomic for this reason).
 
-1. The channel checks its `export_seen_map` whether this export has been
-   already processed. If so, it skips to the next export. No action is needed.
-2. The export chain is scanned for the current first and last export. This is
-   done by following the `next` pointer in the exports as accessing the
-   auxiliary export fib needs locking.
-3. In the best-only and all-routes export mode, the changes are processed
-   without further table locking.
-4. If export-by-feed is used, the current state of routes in table are fetched.
-   Then the table is unlocked and the changes are processed without further locking.
-5. All processed exports are marked as seen.
-6. The channel stores the `last_export` and returns to beginning.to wait for next export.
+1. The channel waits for a semaphore. This semaphore is posted by the table
+   maintenance coroutine.
+2. The channel checks whether there is a `last_export` stored.
+   1. If yes, it proceeds with the next one.
+   2. Otherwise it takes `first_export` from the table. This special
+      pointer is atomic and can be accessed without locking and also without clashing
+      with the export cleanup routine.
+3. The channel checks its `export_seen_map` whether this export has been
+   already processed. If so, it goes back to 1. to get the next export. No
+   action is needed with this one.
+4. As now the export is clearly new, the export chain (single-linked list) is
+   scanned for the current first and last export. This is done by following the
+   `next` pointer in the exports.
+5. If all-routes mode is used, the exports are processed one-by-one. In future
+   versions, we may employ some simple flap-dampening by checking the pending
+   export list for the same route src. *No table locking happens.*
+6. If best-only mode is employed, just the first and last exports are
+   considered to find the old and new best routes. The inbetween exports do nothing. *No table locking happens.*
+7. If export-by-feed is used, the current state of routes in table are fetched and processed
+   as described above in the "Export by feed" section.
+8. All processed exports are marked as seen.
+9. The channel stores the first processed export to `last_export` and returns
+   to beginning.to wait for next exports. The latter exports are then skipped by
+   step 3 when the export coroutine gets to them.
 
-## The full route life-cycle
+## The full life-cycle of routes 
 
 Until now, we're always assuming that the channels *just exist*. In real life,
 any channel may go up or down and we must handle it, flushing the routes
 appropriately and freeing all the memory just in time to avoid both
-use-after-free and memory leaks. It should be noted here explicitly that BIRD
-is written in C which has no garbage collector or other modern features alike.
+use-after-free and memory leaks. BIRD is written in C which has no garbage
+collector or other modern features alike so memory management is a thing.
 
 ### Protocols and channels as viewed from a route
 
@@ -295,20 +313,21 @@ serving as a database of routes. To connect a protocol to a table, a
 **channel** is created.
 
 Every route has its `sender` storing the channel which has put the route into
-the current table. This comes handy when the channel goes down to know which
-routes to flush.
+the current table. Therefore we know which routes to flush when a channel goes down.
 
 Every route also has its `src`, a route source allocated by the protocol which
-originated it first. This is kept when a route is passed through a *pipe*.
+originated it first. This is kept when a route is passed through a *pipe*. The
+route source is always bound to protocol; it is possible that a protocol
+announces routes via several channels using the same src.
 
 Both `src` and `sender` must point to active protocols and channels as inactive
-protocols and channels may be deleted in any time.
+protocols and channels may be deleted any time.
 
 ### Protocol and channel lifecycle
 
 In the beginning, all channels and protocols are down. Until they fully start,
 no route from them is allowed to any table. When the protocol and channel is up,
-they may originate routes freely. However, the transitions are worth mentioning.
+they may originate and receive routes freely. However, the transitions are worth mentioning.
 
 ### Channel startup and feed
 
@@ -324,9 +343,9 @@ with a reasonable latency.
 
 When the exports were synchronous, we simply didn't care and just announced the
 exports to the channels from the time they started feeding. When making exports
-asynchronous, it was crucial to avoid most of the possible race conditions
+asynchronous, it is crucial to avoid (hopefully) all the possible race conditions
 which could arise from simultaneous feed and export. As the feeder routines had
-to be rewritten, it was a good opportunity to make this precise.
+to be rewritten, it is a good opportunity to make this precise.
 
 Therefore, when a channel goes up, it also starts exports:
 
@@ -345,8 +364,8 @@ Therefore, when a channel goes up, it also starts exports:
 8. Run the exporter loop.
 
 *Note: There are some nuances not mentioned here how to do things in right
-order to avoid missing some events while changing state. Precise description
-would be too detailed for this text.*
+order to avoid missing some events while changing state. For specifics, look
+into the code in `nest/rt-table.c` in branch `alderney`.*
 
 When the feeder loop finishes, it continues smoothly to process all the exports
 that have been queued while the feed was running. Step 5.3 ensures that already
@@ -363,18 +382,21 @@ cases follow the same routine.
 4. In the feed-export coroutine:
    1. At a designated cancellation point, check cancellation.
    2. Clean up local data.
-   3. *Lock main BIRD context locked*
+   3. *Lock main BIRD context*
    4. If shutdown requested, switch the channel to *flushing* state and request table maintenance.
+   5. *Stop the coroutine and unlock main BIRD context.*
 5. In the table maintenance coroutine:
-   1. Walk across all channels and check them for *flushing* state.
+   1. Walk across all channels and check them for *flushing* state, setting `flush_active` to 1.
    2. Walk across the table (split to allow for low latency updates) and
       generate a withdrawal for each route sent by the flushing channels.
-   3. Wait until all the withdrawals are processed.
+   3. When all the table is traversed, the flushing channels' `flush_active` is set to 2 and
+      `flush_seq` is set to the current last export seq.
+   3. Wait until all the withdrawals are processed by checking the `flush_seq`.
    4. Mark the flushing channels as *down* and eventually proceed to the protocol shutdown or restart.
 
 There is also a separate routine that handles bulk cleanup of `src`'s which
 contain a pointer to the originating protocol. This routine may get reworked in
-future, yet for now it is good enough.
+future; for now it is good enough.
 
 ### Route export cleanup
 
@@ -385,8 +407,8 @@ to let the importing protocol continue its work. We therefore need a routine to
 cleanup the withdrawn routes and also the processed exports.
 
 First of all, this routine refuses to cleanup when any export is feeding or
-shutting down. This may change in future, anyway for now we aren't sure about
-possible race conditions.
+shutting down. In future, cleanup while feeding should be possible, anyway for
+now we aren't sure about possible race conditions.
 
 Anyway, when all the exports are in a steady state, the routine works as follows:
 
@@ -412,22 +434,26 @@ of a base for the next steps:
   implement more output formats, e.g. JSON.
 * Unlocking of kernel route synchronization should fix latency issues induced
   by long-lasting kernel queries.
-* Partial unlocking of BGP packet processing should finally allow for parallel
+* Partial unlocking of BGP packet processing should allow for parallel
   execution in almost all phases of BGP route propagation.
+* Partial unlocking of OSPF route recalculation should raise the useful
+  maximums of topology size.
 
 The development is now being done mostly in the branch `alderney`. If you asked
 why such strange branch names like `jersey`, `guernsey` and `alderney`, here is
-a kind-of reason. Yes, these names could be named `mq-async-export`,
+a kind-of reason. Yes, these branches could be named `mq-async-export`,
 `mq-async-export-new`, `mq-async-export-new-new`, `mq-another-async-export` and
-so on. That's so ugly, isn't it? 
+so on. That's so ugly, isn't it? Let's be creative. *Jersey* is an island where a
+same-named knit was first produced – and knits are made of *threads*. Then, you
+just look into a map and find nearby islands.
 
 Also why so many branches? The development process is quite messy. BIRD's code
-heavily depends on single-threaded approach. This is exceptionally good for
-performance, as long as you have one thread only. On the other hand, lots of
-these assumptions are not documented so in many cases one desired
-change yields a chain of other unforeseen changes which must precede. This brings
-lots of backtracking, branch rebasing and other Git magic. There is always a
-can of worms somewhere in the code.
+heavily depends on single-threaded approach. This is (in this case)
+exceptionally good for performance, as long as you have one thread only. On the
+other hand, lots of these assumptions are not documented so in many cases one
+desired change yields a chain of other unforeseen changes which must precede.
+This brings lots of backtracking, branch rebasing and other Git magic. There is
+always a can of worms somewhere in the code.
 
 *It's still a long road to the version 2.1. This series of texts should document
 what is needed to be changed, why we do it and how. The
diff --git a/doc/threads/Makefile b/doc/threads/Makefile
index f5198be7..abad50ab 100644
--- a/doc/threads/Makefile
+++ b/doc/threads/Makefile
@@ -1,5 +1,5 @@
 SUFFICES := .pdf -wordpress.html
-CHAPTERS := 00_the_name_of_the_game 01_the_route_and_its_attributes 02_asynchronous_export
+CHAPTERS := 00_the_name_of_the_game 01_the_route_and_its_attributes 02_asynchronous_export 03_coroutines
 
 all: $(foreach ch,$(CHAPTERS),$(addprefix $(ch),$(SUFFICES)))
 

From a840170e84b004b398552687f8e3fd54816ae2a5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 8 Dec 2021 20:31:12 +0100
Subject: [PATCH 075/431] Thread documentation: Completely rewritten chapter 3
 on loops and locks

---
 doc/threads/03_coroutines.md | 305 ++++++++++++++++++++++++-----------
 1 file changed, 211 insertions(+), 94 deletions(-)

diff --git a/doc/threads/03_coroutines.md b/doc/threads/03_coroutines.md
index 33b337f7..94ea3eda 100644
--- a/doc/threads/03_coroutines.md
+++ b/doc/threads/03_coroutines.md
@@ -1,122 +1,239 @@
-# BIRD Journey to Threads. Chapter 3: Coroutines and Locking
+# BIRD Journey to Threads. Chapter 3: Parallel execution and message passing.
 
-Parallel execution in BIRD uses an underlying mechanism of coroutines and
-locks. This chapter covers these two internal modules and their principles.
-Knowing this is a need if you want to create any non-trivial extension to
-future BIRD.
+Parallel execution in BIRD uses an underlying mechanism of dedicated IO loops
+and hierarchical locks. The original event scheduling module has been converted
+to do message passing in multithreaded environment. These mechanisms are
+crucial for understanding what happens inside BIRD and how the protocol API changes.
 
-## BIRD's internal logical structure
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. We're doing a significant amount of
+BIRD's internal structure changes to make it run in multiple threads in parallel.
 
-The authors of original BIRD concepts wisely chose a highly modular structure.
-We can therefore use this structure with minimal rework needed. This structure is roughly:
+## Locking and deadlock prevention
 
-1. Reconfiguration routines
-2. Protocols
-3. BFD
-4. Private routing tables
-5. Standalone routing tables
-6. Route attribute cache
+Most of BIRD data structures and algorithms are thread-unsafe and not even
+reentrant. Checking and possibly updating all of these would take an
+unreasonable amount of time, thus the multithreaded version uses standard mutexes
+to lock all the parts which have not been checked and updated yet.
 
-This order is important for locking. Most actions in BIRD are called
-top-to-bottom in this list, e.g. a reconfiguration triggers protocol action,
-this triggers BFD update, then a routing table update which in turn calls route
-attribute cache. The major locking decision for BIRD is enforcement of this order.
+The authors of original BIRD concepts wisely chose a highly modular structure
+which allows to create a hierarchy for locks. The main chokepoint was between
+protocols and tables which has been solved by implementing asynchronous exports
+as described in the [previous chapter](https://en.blog.nic.cz/2021/06/14/bird-journey-to-threads-chapter-2-asynchronous-route-export/).
 
-We're not sure yet about where the interface list and `protocol device` should
-be. For now, it is somewhere between 1 and 2, as the interface updates are
-synchronous. It may move in future to 2+5 after implementing asynchronous
-interface updates.
+Locks in BIRD (called domains, as they always lock some defined part of BIRD)
+are partially ordered. Every *domain* has its *type* and all threads are
+strictly required to lock the domains in the order of their respective types.
+The full order is defined in `lib/locking.h`. It's forbidden to lock more than
+one domain of a type (these domains are uncomparable) and recursive locking as well.
 
-## Locking
+The locking hiearchy is (as of December 2021) like this:
 
-BIRD is split into so-called *domains*. These consist of data structures
-logically bound together. These domains should have their own lock guarding
-access to them. These domains are divided into the categories mentioned above.
+1. The BIRD Lock (for everything not yet checked and/or updated)
+2. Protocols (as of December 2021, it is BFD, RPKI and Pipe)
+3. Routing tables
+4. Global route attribute cache
+5. Message passing
+6. Internals
 
-Currently, lots of domains don't have their own lock. Last changes in branch
-`alderney` assigned locks to routing tables and route attribute cache (4, 5 and 6).
-BFD has had its own lock since it was added to BIRD as it needs much lower
-latency than BIRD typically allows. The rest of BIRD (reconfiguration,
-protocols and CLI) has one common lock, called `the_bird_lock`. This is going to change later.
+There are heavy checks to ensure proper locking and to help debugging any
+problem when any code violates the hierarchy rules. This impedes performance
+depending on how much that domain is contended and in some cases I have already
+implemented lockless (or partially lockless) data structures to overcome this.
 
-Locking and unlocking is heavily checked. BIRD always stores the thread's
-locking stack at one place for debug and consistency checking purposes. The
-locking stack is limited to the number of categories. All domains must be
-locked top-to-bottom in this order and unlocked bottom-to-top. No thread is
-allowed to lock more than one domain in each category.
+You may ask, why are these heavy checks then employed in production builds?
+Risks arising from dropping some locking checks include:
 
-This brings some possible problems in communication between tables (recursive
-nexthop updates had to be thoroughly checked) and it also needs the last big
-change, the asynchronous export. If any data needs to be handed from down to
-up, it must use some kind of asynchronicity to unlock the lower domain before
-accesing the higher level. On the other hand, data flow from up to down is
-straightforward as it is possible to just lock and call the appropriate function.
+* deadlocks; these are deadly in BIRD anyway so it should just fail with a meaningful message, or
+* data corruption; it either kills BIRD anyway, or it results into a slow and vicious death,
+  leaving undebuggable corefiles behind.
 
-## Coroutines
+To be honest, I believe in principles like "there is also one more bug somewhere"
+and I just don't trust my future self or anybody else to write bugless code when
+it comes to proper locking. I believe that if a lock becomes a bottle-neck,
+then we should think about what is locked inside and how to optimize that, instead
+of dropping thorough consistency checks.
 
-There are three principal types of coroutines. One-shot tasks, workers
-and IO handlers. They all share one coroutine data type, anyway the
-synchronization mechanisms are different.
+## IO Loop
 
-### One-shot tasks
+There has been a protocol, BFD, running in its own thread since 2013. This
+separation has a good reason; it needs low latency and the main BIRD loop just
+walks round-robin around all the available sockets which may last for a long
+time. BFD had its own IO loop implementation and simple message passing
+routines. This code could be easily updated for general use so I did it.
 
-The simplest coroutine type is a one-shot task. Some part of BIRD requests a
-one-time CPU-intensive work. This is used in reconfiguration rework. When
-reconfig is requested, BIRD starts a reconfig coroutine which first parses the
-file (which can take tens of seconds if you have a gigabyte of config files).
-Then this coroutine locks everything and applies the parsed configuration.
+To understand the internal principles, we should say that in the `master`
+branch, there is a big loop centered around a `poll()` call, dispatching and
+executing everything as needed. There are several means how to get something dispatched from the main loop.
 
-One-shot tasks simply start when they are requested and stop when they are
-done. To cancel them prematurely, it is typically enough to set/check an atomic
-variable.
+1. Requesting to read from a socket makes the main loop call your hook when there is some data received.
+   The same happens when a socket refuses to write data. Then the data is buffered and you are called when
+   the buffer is free. There is also a third callback, an error hook, for obvious reasons.
 
-### Workers
+2. Requesting to be called back after a given amount of time. The callback may
+   be delayed by any amount of time, anyway when it exceeds 5 seconds (default,
+   configurable) at least the user gets a warning. This is called *timer*.
 
-In lots of cases, a module has to wait for some supplied data. This is used in
-the channel feed-export coroutine. When feed-export is requested, BIRD starts a
-coroutine which waits on semaphore to get exports, processes the exports and
-then jumps back to wait on semaphore for more work.
+3. Requesting to be called back when possible. This is useful to run anything
+   not reentrant which might mess with the caller's data, e.g. when a protocol
+   decides to shutdown due to some inconsistency in received data. This is called *event*.
 
-These coroutines must be woken up by their semaphore after setting the
-cancellation variable. Then the coroutine cleans up and calls what is required
-next after its cleanup, until finally exiting.
+4. Requesting to do some work when possible. These are also events, there is only
+   a difference where this event is enqueued; in the main loop, there is a
+   special *work queue* with an execution limit, allowing sockets and timers to be
+   handled with a reasonable latency while still doing all the work needed.
 
-### IO handlers
+All these, sockets, timers and events, are tightly bound to some domain.
+Sockets typically belong to a protocol, timers and events to a protocol or table.
+With the modular structure of BIRD, the easy and convenient approach to multithreading
+is to get more IO loops bound to specific domains, running their events, timers and
+socket hooks in their threads.
 
-BIRD needs IO. It is possible to handle almost all IO events in parallel and
-these coroutines will take care of that. There is currently only one such
-thread, it is a low-latency BFD thread handling its own socket.
+## Message passing and loop entering
 
-IO coroutines are also possibly timer coroutines as the `poll` call typically
-has a timeout option. In future, there should be independent IO coroutines for
-each protocol instance to handle IO bottlenecks. It should be noted that e.g.
-in BGP, the protocol synchronously advertises and withdraws routes directly
-from the receive handler.
+To request some work in another module, the standard way is to pass a message.
+For this purpose, events have been modified to be sent to a given loop without
+locking that loop's domain. In fact, every event queue has its own lock with a
+low priority, allowing to pass messages from almost any part of BIRD, and also
+an assigned loop which executes the events enqueued. When a message is passed
+to a queue executed by another loop, that target loop must be woken up so we
+must know what loop to wake up to avoid unnecessary delays.
 
-These coroutines sometimes have to be updated (protocol shuts down, timer is
-modified), therefore every IO coroutine needs its own *fifo* which it polls for
-read. On any update, one byte is sent to this fifo, effectively waking up the
-poll. The fifo is always checked first for changes; if there are some, the poll
-is reloaded before looking at anything else.
+The other way is faster but not always possible. When the target loop domain
+may be locked from the original loop domain, we may simply *enter the target loop*,
+do the work and then *leave the loop*. Route import uses this approach to
+directly update the best route in the target table. In the other direction,
+loop entering is not possible and events must be used to pass messages.
 
-### The Main Loop
+Asynchronous message passing is expensive. It involves sending a byte to a pipe
+to wakeup a loop from `poll` to execute the message. If we had to send a ping
+for every route we import to every channel to export it, we'd spend more time
+pinging than computing the best route. The route update routines therefore
+employ a double-indirect delayed route announcement:
 
-Currently, BIRD executes everything (with exception of those parts already
-moved to their threads) in one single loop. There are all the sockets with a
-magic round-robin selection of what socket we're going to read from next. This
-loop also runs all the timers and other "asynchronous" events to handle the
-risk that some code would tamper with the caller's data structures badly.
+1. When a channel imports a route by entering a loop, it sends an event to its
+   own loop (no ping needed in such case). This operation is idempotent, thus
+   for several routes, only one event is enqueued.
+2. After all packet parsing is done, the channel import announcement event is
+   executed, sending another event to the table's loop. There may have been
+   multiple imports in the same time but the exports have to get a ping just once.
+3. The table's announcement event is executed from its loop, enqueuing export
+   events for all connected channels, finally initiating route exports.
 
-This loop should gradually lose its work to do when more and more routines get
-moved to their own domains and coroutines. After all, possibly the last task
-for the main loop would be signal handling and maybe basic CLI handling.
+This may seem overly complicated, yet it also allows the incoming changes to
+settle down before exports are finished, reducing also cache invalidation
+between importing and exporting threads.
 
-The main loop dismantling is a long term goal. Before that, we have to do lots of
-changes, allowing for more and more code to run independently. Since [route
-exports are now asynchronous](TODO), there is no more obstacle in adopting the
-locking order as shown here.
+## Choosing the right locking order
 
-*This chapter is last at least for a while. There will be more posts on BIRD
-internals in future, you may expect e.g. protocol API description and maybe
-also a tutorial how to create your own protocol. Thank you all for your support.
-It helps us make your BIRD run smooth and fast.*
+When considering the locking order of protocols and route tables, the answer was quite easy.
+If route tables could enter protocol loops, they would have to either directly
+execute protocol code, one export after another, or send whole routes by messages.
+Setting this other way around (protocol entering route tables), protocols do
+everything on their time, minimizing table time. Tables are contention points.
+
+The third major lock level is The BIRD Lock, containing virtually everything
+else. It is also established that BFD is after The BIRD Lock, as BFD is
+low-latency and can't wait until The BIRD gets unlocked. Thus it would be
+convenient to have all protocols on the same level, getting The BIRD Lock on top.
+
+The BIRD Lock also runs CLI, reconfiguration and other high-level tasks,
+requiring access to everything. Having The BIRD Lock anywhere else, these
+high-level tasks, scattered all around BIRD source code, would have to be split
+out to some super-loop.
+
+## Route tables
+
+BFD could be split out thanks to its special nature. There are no BFD routes,
+therefore no route tables are accessed. To split out any other protocol, we
+need the protocol to be able to directly access routing tables. Therefore
+route tables have to be split out first, to make space for protocols to go
+between tables and The BIRD main loop.
+
+Route tables are primarily data structures, yet they have their maintenance
+routines. Their purpose is (among others) to cleanup export buffers, update
+recursive routes and delete obsolete routes. This all may take lots of time
+occasionally so it makes sense to have a dedicated thread for these.
+
+In previous versions, I had a special type of event loop based on semaphores,
+contrary to the loop originating in BFD, based on `poll`. This was
+unnecessarily complicated, thus I rewrote that finally to use the universal IO
+loop, just with no sockets at all.
+
+There are some drawbacks of this, notably the number of filedescriptors BIRD
+now uses. The user should also check the maximum limit on threads per process.
+
+This change also means that imports and exports are started and stopped
+asynchronously. Stopping an import needs to wait until all its routes are gone.
+This induced some changes in the protocol state machine.
+
+## Protocols
+
+After tables were running in their own loops, the simplest protocol to split
+out was Pipe. There are still no sockets, just events. This also means that
+every single filter assigned to a pipe is run in its own thread, not blocking
+others. (To be precise, both directions of a pipe share the same thread.)
+
+When RPKI is in use, we want it to load the ROAs as soon as possible. Its table
+is independent and the protocol itself is so simple that it could be put into
+its own thread easily.
+
+Other protocols are pending (Kernel) or in progress (BGP).
+
+I tried to make the conversion also as easy as possible, implementing most of
+the code in the generic functions in `nest/proto.c`. There are some
+synchronization points in the protocol state machine; we can't simply delete
+all protocol data when there is another thread running. Together with the
+asynchronous import/export stopping, it is quite messy and it might need some
+future cleanup. Anyway, moving a protocol to its own thread should be now as simple
+as setting its locking level in its `config.Y` file and stopping all timers
+before shutting down.
+(See commits `4f3fa1623f66acd24c227cf0cc5a4af2f5133b6c`
+and `3fd1f46184aa74d8ab7ed65c9ab6954f7e49d309`.)
+
+## Cork
+
+In the old versions with synchronous route propagation, all the buffering
+happened after exporting routes to BGP. When a packet arrived, all the work was
+done in BGP receive hook – parsing, importing into a table, running all the
+filters and possibly sending to the peers. No more routes until the previous
+was done. This doesn't work any more.
+
+Route table import now returns immediately after inserting the route into a
+table, creating a buffer there. These buffers have to be processed by other protocols'
+export events, typically queued in the *global work queue* to be limited for lower latency.
+There is therefore no inherent limit for table export buffers which may lead
+(and occasionally leads) to memory bloating. This is even worse in configurations with pipes,
+as these multiply the exports by propagating them all the way down to other tables.
+
+There is therefore a cork to make this stop. Every table is checking how many
+exports it has pending, and when adding a new route, it may apply a cork,
+saying simply "please stop the flow for a while". When the exports are then processed, it uncorks.
+
+On the other side, there may be events and sockets with a cork assigned. When
+trying to enqueue an event and the cork is applied, the event is instead put
+into the cork's queue and released only when the cork is released. In case of
+sockets, when `poll` arguments are recalculated, the corked socket is not
+checked for received packets, effectively keeping them in the TCP queue and
+slowing down the flow.
+
+Both events and sockets have some delay before they get to the cork. This is
+intentional; the purpose of cork is to slow down and allow for exports.
+
+The cork implementation is probably due to some future changes after BGP gets
+split out of the main loop, depending on how it is going to perform. I suppose
+that the best way should be to implement a proper table API to allow for
+explicit backpressure on both sides:
+
+* (table to protocol) please do not import
+* (table to protocol) you may resume imports
+* (protocol to table) not processing any exports
+* (protocol to table) resuming export processing
+
+Anyway, for now it is good enough as it is.
+
+*It's still a long road to the version 2.1. This series of texts should document
+what is needed to be changed, why we do it and how. The
+[previous chapter](https://en.blog.nic.cz/2021/06/14/bird-journey-to-threads-chapter-2-asynchronous-route-export/)
+showed how the route export had to change to allow parallel execution. In the next chapter, we're most likely going
+to show performance difference between BIRD v2.0.8 and the parallelized implementation. Stay tuned!*

From ffa6a51c58e7880a330e2bc3da22e5e5174e2100 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 22 Dec 2021 15:35:29 +0100
Subject: [PATCH 076/431] Thread documentation: Chapter 4 on memory management

---
 doc/threads/03_coroutines.md        |   4 +-
 doc/threads/04_memory_management.md | 223 ++++++++++++++++++++++++++++
 lib/resource.h                      |   1 -
 3 files changed, 225 insertions(+), 3 deletions(-)
 create mode 100644 doc/threads/04_memory_management.md

diff --git a/doc/threads/03_coroutines.md b/doc/threads/03_coroutines.md
index 94ea3eda..fccc3bbf 100644
--- a/doc/threads/03_coroutines.md
+++ b/doc/threads/03_coroutines.md
@@ -235,5 +235,5 @@ Anyway, for now it is good enough as it is.
 *It's still a long road to the version 2.1. This series of texts should document
 what is needed to be changed, why we do it and how. The
 [previous chapter](https://en.blog.nic.cz/2021/06/14/bird-journey-to-threads-chapter-2-asynchronous-route-export/)
-showed how the route export had to change to allow parallel execution. In the next chapter, we're most likely going
-to show performance difference between BIRD v2.0.8 and the parallelized implementation. Stay tuned!*
+showed how the route export had to change to allow parallel execution. In the next chapter, some memory management
+details are to be explained together with the reasons why memory management matters. Stay tuned!*
diff --git a/doc/threads/04_memory_management.md b/doc/threads/04_memory_management.md
new file mode 100644
index 00000000..24ef89d3
--- /dev/null
+++ b/doc/threads/04_memory_management.md
@@ -0,0 +1,223 @@
+# BIRD Journey to Threads. Chapter 4: Memory and other resource management.
+
+BIRD is mostly a large specialized database engine, storing mega/gigabytes of
+Internet routing data in memory. To keep accounts of every byte of allocated data,
+BIRD has its own resource management system which must be adapted to the
+multithreaded environment. The resource system has not changed much, yet it
+deserves a short chapter.
+
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. We're doing a significant amount of
+BIRD's internal structure changes to make it run in multiple threads in parallel.
+
+## Resources
+
+Inside BIRD, (almost) every piece of allocated memory is a resource. To achieve this,
+every such memory block includes a generic `struct resource` header. The node
+is enlisted inside a linked list of a *resource pool* (see below), the class
+pointer defines basic operations done on resources.
+
+```
+typedef struct resource {
+  node n;				/* Inside resource pool */
+  struct resclass *class;		/* Resource class */
+} resource;
+
+struct resclass {
+  char *name;				/* Resource class name */
+  unsigned size;			/* Standard size of single resource */
+  void (*free)(resource *);		/* Freeing function */
+  void (*dump)(resource *);		/* Dump to debug output */
+  resource *(*lookup)(resource *, unsigned long);	/* Look up address (only for debugging) */
+  struct resmem (*memsize)(resource *);	/* Return size of memory used by the resource, may be NULL */
+};
+
+void *ralloc(pool *, struct resclass *);
+```
+
+Resource cycle begins with an allocation of a resource. To do that, you should call `ralloc()`,
+passing the parent pool and the appropriate resource class as arguments. BIRD
+allocates a memory block of size given by the given class member `size`.
+Beginning of the block is reserved for `struct resource` itself and initialized
+by the given arguments. Therefore, you may sometimes see an idiom where a structure
+has a first member `struct resource r;`, indicating that this item should be
+allocated as a resource.
+
+The counterpart is resource freeing. This may be implicit (by resource pool
+freeing) or explicit (by `rfree()`). In both cases, the `free()` function of
+the appropriate class is called to cleanup the resource before final freeing.
+
+To account for `dump` and `memsize` calls, there are CLI commands `dump
+resources` and `show memory`, using these to dump resources or show memory
+usage as perceived by BIRD.
+
+The last, `lookup`, is quite an obsolete way to identify a specific pointer
+from a debug interface. You may call `rlookup(pointer)` and BIRD should dump
+that resource to the debug output. This mechanism is probably incomplete as no
+developer uses it actively for debugging.
+
+Resources can be also moved between pools by `rmove` when needed.
+
+## Resource pools
+
+The first internal resource class is a recursive resource – a resource pool. In
+the singlethreaded version, this is just a simple structure:
+
+```
+struct pool {
+  resource r;
+  list inside;
+  struct birdloop *loop;  /* In multithreaded version only */
+  const char *name;
+};
+```
+
+Resource pools are used for grouping resources together. There are pools everywhere
+and it is a common idiom inside BIRD to just `rfree` the appropriate pool when
+e.g. a protocol or table is going down. Everything left there is cleaned up.
+
+There are anyway several classes which must be freed with care. In the
+singlethreaded version, the *slab* allocator (see below) must be empty before
+it may be freed and this is kept to the multithreaded version while other
+restrictions have been added.
+
+There is also a global pool, `root_pool`, containing every single resource BIRD
+knows about, either directly or via another resource pool.
+
+### Thread safety in resource pools
+
+In the multithreaded version, every resource pool is bound to a specific IO
+loop and therefore includes an IO loop pointer. This is important for allocations
+as the resource list inside the pool is thread-unsafe. All pool operations
+therefore require the IO loop to be entered to do anything with them, if possible.
+(In case of `rfree`, the pool data structure is not accessed at all so no
+assert is possible. We're currently relying on the caller to ensure proper locking.
+In future, this may change.)
+
+Each IO loop also has its base resource pool for its allocations. All pools
+inside the IO loop pool must belong to the same loop or to a loop with a
+subordinate lock (see the previous chapter for lock ordering). If there is a
+need for multiple IO loops to access one shared data structure, it must be
+locked by another lock and allocated in such a way that is independent on these
+accessor loops.
+
+The pool structure should follow the locking order. Any pool should belong to
+either the same loop as its parent or its loop lock should be after its parent
+loop lock in the locking order. This is not enforced explicitly, yet it is
+virtually impossible to write some working code violating this recommendation.
+
+### Resource pools in the wilderness
+
+Root pool contains (among others):
+
+* route attributes and sources
+* routing tables
+* protocols
+* interfaces
+* configuration data
+
+Each table has its IO loop and uses the loop base pool for allocations.
+The same holds for protocols. Each protocol has its pool; it is either its IO
+loop base pool or an ordinary pool bound to main loop.
+
+## Memory allocators
+
+BIRD stores data in memory blocks allocated by several allocators. There are 3
+of them: simple memory blocks, linear pools and slabs.
+
+### Simple memory block
+
+When just a chunk of memory is needed, `mb_alloc()` or `mb_allocz()` is used
+to get it. The first with `malloc()` semantics, the other is also zeroed.
+There is also `mb_realloc()` available, `mb_free()` to explicitly free such a
+memory and `mb_move()` to move that memory to another pool.
+
+Simple memory blocks consume a fixed amount of overhead memory (32 bytes on
+systems with 64-bit pointers) so they are suitable mostly for big chunks,
+taking advantage of the default *stdlib* allocator which is used by this
+allocation strategy. There are anyway some parts of BIRD (in all versions)
+where this allocator is used for little blocks. This will be fixed some day.
+
+### Linear pools
+
+Sometimes, memory is allocated temporarily. When the data may just sit on
+stack, we put it there. Anyway, many tasks need more structured execution where
+stack allocation is incovenient or even impossible (e.g. when callbacks from
+parsers are involved). For such a case, a *linpool* is the best choice.
+
+This data structure allocates memory blocks of requested size with negligible
+overhead in functions `lp_alloc()` (uninitialized) or `lp_allocz()` (zeroed).
+There is anyway no `realloc` and no `free` call; to have a larger chunk, you
+need to allocate another block. All this memory is freed at once by `lp_flush()`
+when it is no longer needed.
+
+You may see linpools in parsers (BGP, Linux netlink, config) or in filters.
+
+In the multithreaded version, linpools have received an update, allocating
+memory pages directly by `mmap()` instead of calling `malloc()`. More on memory
+pages below.
+
+### Slabs
+
+To allocate lots of same-sized objects, a [slab allocator](https://en.wikipedia.org/wiki/Slab_allocation)
+is an ideal choice. In versions until 2.0.8, our slab allocator used blocks
+allocated by `malloc()`, every object included a *slab head* pointer and free objects
+were linked into a single-linked list. This led to memory inefficiency and to
+contra-intuitive behavior where a use-after-free bug could do lots of damage
+before finally crashing.
+
+Versions from 2.0.9, and also all the multithreaded versions, are coming with
+slabs using directly allocated memory pages and usage bitmaps instead of
+single-linking the free objects. This approach however relies on the fact that
+pointers returned by `mmap()` are always divisible by page size. Freeing of a
+slab object involves zeroing (mostly) 13 least significant bits of its pointer
+to get the page pointer where the slab head resides.
+
+This update helps with memory consumption by about 5% compared to previous
+versions; exact numbers depend on the usage pattern.
+
+## Raw memory pages
+
+Until 2.0.8 (incl.), BIRD allocated all memory by `malloc()`. This method is
+suitable for lots of use cases, yet when gigabytes of memory should be
+allocated by little pieces, BIRD uses its internal allocators to keep track
+about everything. This brings some ineffectivity as stdlib allocator has its
+own overhead and doesn't allocate aligned memory unless asked for.
+
+Slabs and linear pools are backed by blocks of memory of kilobyte sizes. As a
+typical memory page size is 4 kB, it is a logical step to drop stdlib
+allocation from these allocators and to use `mmap()` directly. This however has
+some drawbacks, most notably the need of a syscall for every memory mapping and
+unmapping. For allocations, this is not much a case and the syscall time is typically 
+negligible compared to computation time. When freeing memory, this is much
+worse as BIRD sometimes frees gigabytes of data in a blink of eye.
+
+To minimize the needed number of syscalls, there is a per-thread page cache,
+keeping pages for future use:
+
+* When a new page is requested, first the page cache is tried.
+* When a page is freed, the per-thread page cache keeps it without telling the kernel.
+* When the number of pages in any per-thread page cache leaves a pre-defined range,
+  a cleanup routine is scheduled to free excessive pages or request more in advance.
+
+This method gives the multithreaded BIRD not only faster memory management than
+ever before but also almost immediate shutdown times as the cleanup routine is
+not scheduled on shutdown at all.
+
+## Other resources
+
+Some objects are not only a piece of memory; notable items are sockets, owning
+the underlying mechanism of I/O, and *object locks*, owning *the right to use a
+specific I/O*. This ensures that collisions on e.g. TCP port numbers and
+addresses are resolved in a predictable way.
+
+All these resources should be used with the same locking principles as the
+memory blocks. There aren't many checks inside BIRD code to ensure that yet,
+nevertheless violating this recommendation may lead to multiple-access issues.
+
+*It's still a long road to the version 2.1. This series of texts should document
+what is needed to be changed, why we do it and how. The
+[previous chapter](TODO)
+showed the locking system and how the parallel execution is done.
+The next chapter will cover a bit more detailed explanation about route sources
+and route attributes and how lockless data structures are employed there. Stay tuned!*
diff --git a/lib/resource.h b/lib/resource.h
index b80ff8c6..3e589e32 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -43,7 +43,6 @@ struct resclass {
 typedef struct pool {
   resource r;
   list inside;
-  struct pool_pages *pages;
   struct birdloop *loop;
   const char *name;
 } pool;

From 935b0b7124a72e561b3151bfce7cab6b9c7bd255 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Dec 2021 21:53:00 +0100
Subject: [PATCH 077/431] Performance data of sark vs. v2.0.8 with a chart
 generator

---
 doc/threads/.gitignore            |    2 +
 doc/threads/Makefile              |   14 +
 doc/threads/stats-draw.gnuplot    |   41 +
 doc/threads/stats-filter-2d.pl    |  137 ++
 doc/threads/stats-filter.pl       |   84 ++
 doc/threads/stats-longfilters.csv | 1964 +++++++++++++++++++++++++++++
 6 files changed, 2242 insertions(+)
 create mode 100644 doc/threads/.gitignore
 create mode 100644 doc/threads/stats-draw.gnuplot
 create mode 100644 doc/threads/stats-filter-2d.pl
 create mode 100644 doc/threads/stats-filter.pl
 create mode 100644 doc/threads/stats-longfilters.csv

diff --git a/doc/threads/.gitignore b/doc/threads/.gitignore
new file mode 100644
index 00000000..23f832b7
--- /dev/null
+++ b/doc/threads/.gitignore
@@ -0,0 +1,2 @@
+*.html
+*.pdf
diff --git a/doc/threads/Makefile b/doc/threads/Makefile
index abad50ab..fafb8d47 100644
--- a/doc/threads/Makefile
+++ b/doc/threads/Makefile
@@ -13,3 +13,17 @@ all: $(foreach ch,$(CHAPTERS),$(addprefix $(ch),$(SUFFICES)))
 
 %-wordpress.html: %.html Makefile
 	sed -r 's#</p>#\n#g; s#<p>##g; s#<(/?)code>#<\1tt>#g; s#<pre><tt>#<code>#g; s#</tt></pre>#</code>#g; s#</?figure>##g; s#<figcaption>#<p style="text-align: center">#; s#</figcaption>#</p>#; ' $< > $@
+
+stats-%.csv: stats.csv stats-filter.pl
+	perl stats-filter.pl $< $* > $@
+
+STATS_VARIANTS := multi imex mulimex single
+stats-all: $(patsubst %,stats-%.csv,$(STATS_VARIANTS))
+
+stats-2d-%.pdf: stats.csv stats-filter-2d.pl
+	perl stats-filter-2d.pl $< $* $@
+
+stats-2d-%.png: stats-2d-%.pdf
+	gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -sOutputFile=$@ -r300 $<
+
+stats-all-2d: $(foreach suf,pdf png,$(patsubst %,stats-2d-%.$(suf),$(STATS_VARIANTS)))
diff --git a/doc/threads/stats-draw.gnuplot b/doc/threads/stats-draw.gnuplot
new file mode 100644
index 00000000..734f14a6
--- /dev/null
+++ b/doc/threads/stats-draw.gnuplot
@@ -0,0 +1,41 @@
+set datafile columnheaders
+set datafile separator ";"
+#set isosample 15
+set dgrid3d 8,8
+set logscale
+set view 80,15,1,1
+set autoscale xy
+#set pm3d
+
+set term pdfcairo size 20cm,15cm
+
+set xlabel "TOTAL ROUTES" offset 0,-1.5
+set xrange [10000:320000]
+set xtics offset 0,-0.5
+set xtics (10000,15000,30000,50000,100000,150000,300000)
+
+set ylabel "PEERS"
+#set yrange [10:320]
+#set ytics (10,15,30,50,100,150,300)
+set yrange [10:320]
+set ytics (10,15,30,50,100,150,300)
+
+set zrange [1:2000]
+set xyplane at 1
+
+set border 895
+
+#set grid ztics lt 20
+
+set output ARG1 . "-" . ARG4 . ".pdf"
+
+splot \
+  ARG1 . ".csv" \
+    using "TOTAL_ROUTES":"PEERS":ARG2."/".ARG4 \
+    with lines \
+    title ARG2."/".ARG4, \
+  "" \
+    using "TOTAL_ROUTES":"PEERS":ARG3."/".ARG4 \
+    with lines \
+    title ARG3."/".ARG4
+
diff --git a/doc/threads/stats-filter-2d.pl b/doc/threads/stats-filter-2d.pl
new file mode 100644
index 00000000..70ce335a
--- /dev/null
+++ b/doc/threads/stats-filter-2d.pl
@@ -0,0 +1,137 @@
+#!/usr/bin/perl
+
+use common::sense;
+use Data::Dump;
+use List::Util;
+
+my @GROUP_BY = qw/VERSION PEERS TOTAL_ROUTES/;
+my @VALUES = qw/TIMEDIF/;
+
+my ($FILE, $TYPE, $OUTPUT) = @ARGV;
+
+### Load data ###
+my %data;
+open F, "<", $FILE or die $!;
+my @header = split /;/, <F>;
+chomp @header;
+
+my $line = undef;
+while ($line = <F>)
+{
+  chomp $line;
+  $line =~ s/;;(.*);;/;;\1;/;
+  $line =~ s/v2\.0\.8-1[89][^;]+/bgp/;
+  $line =~ s/v2\.0\.8-[^;]+/sark/;
+  $line =~ s/master;/v2.0.8;/;
+  my %row;
+  @row{@header} = split /;/, $line;
+  push @{$data{join ";", @row{@GROUP_BY}}}, { %row } if $row{TYPE} eq $TYPE;
+}
+
+### Do statistics ###
+sub avg {
+  return List::Util::sum(@_) / @_;
+}
+
+sub stdev {
+  my $avg = shift;
+  return 0 if @_ <= 1;
+  return sqrt(List::Util::sum(map { ($avg - $_)**2 } @_) / (@_-1));
+}
+
+my %output;
+my %vers;
+my %peers;
+
+STATS:
+foreach my $k (keys %data)
+{
+  my %cols = map { my $vk = $_; $vk => [ map { $_->{$vk} } @{$data{$k}} ]; } @VALUES;
+
+  my %avg = map { $_ => avg(@{$cols{$_}})} @VALUES;
+  my %stdev = map { $_ => stdev($avg{$_}, @{$cols{$_}})} @VALUES;
+
+  foreach my $v (@VALUES) {
+    next if $stdev{$v} / $avg{$v} < 0.035;
+
+    for (my $i=0; $i<@{$cols{$v}}; $i++)
+    {
+      my $dif = $cols{$v}[$i] - $avg{$v};
+      next if $dif < $stdev{$v} * 2 and $dif > $stdev{$v} * (-2);
+=cut
+      printf "Removing an outlier for %s/%s: avg=%f, stdev=%f, variance=%.1f%%, val=%f, valratio=%.1f%%\n",
+	$k, $v, $avg{$v}, $stdev{$v}, (100 * $stdev{$v} / $avg{$v}), $cols{$v}[$i], (100 * $dif / $stdev{$v});
+=cut
+      splice @{$data{$k}}, $i, 1, ();
+      redo STATS;
+    }
+  }
+
+  $vers{$data{$k}[0]{VERSION}}++;
+  $peers{$data{$k}[0]{PEERS}}++;
+  $output{$data{$k}[0]{VERSION}}{$data{$k}[0]{PEERS}}{$data{$k}[0]{TOTAL_ROUTES}} = { %avg };
+}
+
+(3 == scalar %vers) and $vers{sark} and $vers{bgp} and $vers{"v2.0.8"} or die "vers size is " . (scalar %vers) . ", items ", join ", ", keys %vers;
+
+### Export the data ###
+
+open PLOT, "|-", "gnuplot" or die $!;
+
+say PLOT <<EOF;
+set logscale
+
+set term pdfcairo size 20cm,15cm
+
+set xlabel "Total number of routes" offset 0,-1.5
+set xrange [10000:1500000]
+set xtics offset 0,-0.5
+set xtics (10000,15000,30000,50000,100000,150000,300000,500000,1000000)
+
+set ylabel "Time to converge (s)"
+set yrange [0.5:10800]
+
+set grid
+
+set key right bottom
+
+set output "$OUTPUT"
+EOF
+
+my @colors = (
+  [ 1, 0.3, 0.3 ],
+  [ 1, 0.7, 0 ],
+  [ 0.3, 1, 0 ],
+  [ 0, 1, 0.3 ],
+  [ 0, 0.7, 1 ],
+  [ 0.3, 0.3, 1 ],
+);
+
+my $steps = (scalar %peers) - 1;
+
+my @plot_data;
+foreach my $v (sort keys %vers) {
+  my $color = shift @colors;
+  my $endcolor = shift @colors;
+  my $stepcolor = [ map +( ($endcolor->[$_] - $color->[$_]) / $steps ), (0, 1, 2) ];
+
+  foreach my $p (sort { int $a <=> int $b } keys %peers) {
+    my $vnodot = $v; $vnodot =~ s/\.//g;
+    say PLOT "\$data_${vnodot}_${p} << EOD";
+    foreach my $tr (sort { int $a <=> int $b } keys %{$output{$v}{$p}}) {
+      say PLOT "$tr $output{$v}{$p}{$tr}{TIMEDIF}";
+    }
+    say PLOT "EOD";
+
+    my $colorstr = sprintf "linecolor rgbcolor \"#%02x%02x%02x\"", map +( int($color->[$_] * 255 + 0.5)), (0, 1, 2);
+    push @plot_data, "\$data_${vnodot}_${p} using 1:2 with lines $colorstr linewidth 2 title \"$v, $p peers\"";
+    $color = [ map +( $color->[$_] + $stepcolor->[$_] ), (0, 1, 2) ];
+  }
+}
+
+push @plot_data, "2 with lines lt 1 dashtype 2 title \"Measurement instability\"";
+
+say PLOT "plot ", join ", ", @plot_data;
+close PLOT;
+
+
diff --git a/doc/threads/stats-filter.pl b/doc/threads/stats-filter.pl
new file mode 100644
index 00000000..51690651
--- /dev/null
+++ b/doc/threads/stats-filter.pl
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+use common::sense;
+use Data::Dump;
+use List::Util;
+
+my @GROUP_BY = qw/VERSION PEERS TOTAL_ROUTES/;
+my @VALUES = qw/RSS SZ VSZ TIMEDIF/;
+
+my ($FILE, $TYPE) = @ARGV;
+
+### Load data ###
+my %data;
+open F, "<", $FILE or die $!;
+my @header = split /;/, <F>;
+chomp @header;
+
+my $line = undef;
+while ($line = <F>)
+{
+  chomp $line;
+  my %row;
+  @row{@header} = split /;/, $line;
+  push @{$data{join ";", @row{@GROUP_BY}}}, { %row } if $row{TYPE} eq $TYPE;
+}
+
+### Do statistics ###
+sub avg {
+  return List::Util::sum(@_) / @_;
+}
+
+sub stdev {
+  my $avg = shift;
+  return 0 if @_ <= 1;
+  return sqrt(List::Util::sum(map { ($avg - $_)**2 } @_) / (@_-1));
+}
+
+my %output;
+my %vers;
+
+STATS:
+foreach my $k (keys %data)
+{
+  my %cols = map { my $vk = $_; $vk => [ map { $_->{$vk} } @{$data{$k}} ]; } @VALUES;
+
+  my %avg = map { $_ => avg(@{$cols{$_}})} @VALUES;
+  my %stdev = map { $_ => stdev($avg{$_}, @{$cols{$_}})} @VALUES;
+
+  foreach my $v (@VALUES) {
+    next if $stdev{$v} / $avg{$v} < 0.035;
+
+    for (my $i=0; $i<@{$cols{$v}}; $i++)
+    {
+      my $dif = $cols{$v}[$i] - $avg{$v};
+      next if $dif < $stdev{$v} * 2 and $dif > $stdev{$v} * (-2);
+=cut
+      printf "Removing an outlier for %s/%s: avg=%f, stdev=%f, variance=%.1f%%, val=%f, valratio=%.1f%%\n",
+	$k, $v, $avg{$v}, $stdev{$v}, (100 * $stdev{$v} / $avg{$v}), $cols{$v}[$i], (100 * $dif / $stdev{$v});
+=cut
+      splice @{$data{$k}}, $i, 1, ();
+      redo STATS;
+    }
+  }
+
+  $vers{$data{$k}[0]{VERSION}}++;
+  $output{"$data{$k}[0]{PEERS};$data{$k}[0]{TOTAL_ROUTES}"}{$data{$k}[0]{VERSION}} = { %avg };
+}
+
+### Export the data ###
+
+say "PEERS;TOTAL_ROUTES;" . join ";", ( map { my $vk = $_; map { "$_/$vk" } keys %vers; } @VALUES );
+
+sub keysort {
+  my ($pa, $ta) = split /;/, $_[0];
+  my ($pb, $tb) = split /;/, $_[1];
+
+  return (int $ta) <=> (int $tb) if $pa eq $pb;
+  return (int $pa) <=> (int $pb);
+}
+  
+foreach my $k (sort { keysort($a, $b); } keys %output)
+{
+  say "$k;" . join ";", ( map { my $vk = $_; map { $output{$k}{$_}{$vk}; } keys %vers; } @VALUES );
+}
diff --git a/doc/threads/stats-longfilters.csv b/doc/threads/stats-longfilters.csv
new file mode 100644
index 00000000..3b794e53
--- /dev/null
+++ b/doc/threads/stats-longfilters.csv
@@ -0,0 +1,1964 @@
+VERSION;TYPE;PEERS;ROUTES;BLOCKSIZE;TOTAL_ROUTES;TOTAL_PREFICES;RSS;SZ;VSZ;i;TIMEDIF;DATETIME
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;21320;187203;748812;20;4.301861676
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;21140;187190;748760;22;4.735876270
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;21044;187207;748828;20;4.304013846
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;20772;187196;748784;19;4.084681546
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;20772;187188;748752;21;4.524855352
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;20800;187197;748788;19;4.089552928
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;21072;187192;748768;20;4.301069856
+v2.0.8-161-ga788372e;multi;10;10000;;12925;6245;21148;187192;748768;18;3.870419206
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19392;6769;27076;24;5.186131393
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19456;6749;26996;24;5.171237831
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19528;6754;27016;25;5.404748204
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19292;6768;27072;24;5.170694801
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19396;6760;27040;27;5.838374799
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19508;6777;27108;25;5.402606133
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19284;6752;27008;24;5.182178320
+v2.0.8-161-ga788372e;imex;10;10000;;12925;6245;19548;6763;27052;24;5.174747059
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;6968;3344;13376;26;5.608568489
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7224;3377;13508;26;5.615165423;2021-12-06@14:05:32
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7316;3375;13500;26;5.618026061;2021-12-06@14:06:00
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7260;3352;13408;23;4.961829208;2021-12-06@14:06:27
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7252;3369;13476;25;5.388673471;2021-12-06@14:06:55
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7288;3350;13400;26;5.621786939;2021-12-06@14:07:23
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7188;3369;13476;26;5.609636187;2021-12-06@14:07:51
+v2.0.8-161-ga788372e;single;10;10000;;12925;6245;;7316;3364;13456;24;5.172085664;2021-12-06@14:08:19
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;31332;189917;759668;17;3.659687724;2021-12-06@14:08:45
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30948;189945;759780;22;4.730535289;2021-12-06@14:09:11
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30540;189905;759620;20;4.306343387;2021-12-06@14:09:38
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30444;189942;759768;20;4.302684747;2021-12-06@14:10:06
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30808;189919;759676;18;3.875768252;2021-12-06@14:10:32
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30272;189907;759628;19;4.086659602;2021-12-06@14:10:58
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30672;189903;759612;20;4.302416044;2021-12-06@14:11:25
+v2.0.8-161-ga788372e;mulimex;10;10000;;12925;6245;30368;189886;759544;21;4.518095173;2021-12-06@14:11:52
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33640;321631;1286524;19;4.085633944;2021-12-06@14:12:21
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33060;321630;1286520;21;4.516950872;2021-12-06@14:12:53
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;32888;321622;1286488;20;4.307035392;2021-12-06@14:13:24
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;32536;321610;1286440;18;3.875851167;2021-12-06@14:13:54
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33352;321615;1286460;22;4.739828577;2021-12-06@14:14:24
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33432;321630;1286520;18;3.879518698;2021-12-06@14:14:56
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33368;321637;1286548;21;4.519740200;2021-12-06@14:15:25
+v2.0.8-161-ga788372e;multi;18;10000;;15314;6305;33268;321610;1286440;20;4.305856029;2021-12-06@14:15:56
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27564;9030;36120;40;8.684061410;2021-12-06@14:16:30
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27752;9060;36240;38;8.233427802;2021-12-06@14:17:06
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27436;9051;36204;41;8.896879840;2021-12-06@14:17:40
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27672;9067;36268;40;8.668315617;2021-12-06@14:18:14
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27552;9055;36220;40;8.673992917;2021-12-06@14:18:49
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27768;9070;36280;40;8.675525863;2021-12-06@14:19:23
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27604;9063;36252;41;8.896695554;2021-12-06@14:19:58
+v2.0.8-161-ga788372e;imex;18;10000;;15314;6305;27620;9068;36272;37;8.026595858;2021-12-06@14:20:35
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8164;3609;14436;38;8.246006718;2021-12-06@14:21:08
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8240;3616;14464;39;8.451448843;2021-12-06@14:21:42
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8312;3630;14520;41;8.885674030;2021-12-06@14:22:17
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8256;3608;14432;39;8.452951862;2021-12-06@14:22:51
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8296;3612;14448;39;8.447394502;2021-12-06@14:23:26
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8224;3611;14444;39;8.461078185;2021-12-06@14:24:01
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8172;3599;14396;40;8.671040923;2021-12-06@14:24:35
+v2.0.8-161-ga788372e;single;18;10000;;15314;6305;;8272;3606;14424;41;8.892147820;2021-12-06@14:25:09
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49120;326319;1305276;19;4.089241311;2021-12-06@14:25:40
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49224;326251;1305004;22;4.737475091;2021-12-06@14:26:10
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49192;326268;1305072;17;3.657795376;2021-12-06@14:26:40
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49432;326269;1305076;21;4.520732609;2021-12-06@14:27:10
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;48564;326226;1304904;20;4.310730874;2021-12-06@14:27:40
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49160;326273;1305092;19;4.090173008;2021-12-06@14:28:11
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49368;326279;1305116;20;4.307600202;2021-12-06@14:28:41
+v2.0.8-161-ga788372e;mulimex;18;10000;;15314;6305;49696;326329;1305316;22;4.746332733;2021-12-06@14:29:11
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;53904;556871;2227484;22;4.744210933;2021-12-06@14:29:47
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;53844;556877;2227508;19;4.092227972;2021-12-06@14:30:25
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;54532;556860;2227440;22;4.737008659;2021-12-06@14:31:04
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;55396;556884;2227536;19;4.102128776;2021-12-06@14:31:43
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;55708;556931;2227724;21;4.530517178;2021-12-06@14:32:23
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;54508;556848;2227392;18;3.875664935;2021-12-06@14:33:02
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;54032;556799;2227196;18;3.878299866;2021-12-06@14:33:40
+v2.0.8-161-ga788372e;multi;32;10000;;16892;6334;54284;556884;2227536;19;4.092237866;2021-12-06@14:34:18
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40140;12621;50484;65;14.149852026;2021-12-06@14:35:06
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40324;12634;50536;64;13.926114889;2021-12-06@14:35:54
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40184;12618;50472;65;14.145470802;2021-12-06@14:36:44
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40572;12700;50800;64;13.919928624;2021-12-06@14:37:31
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40176;12619;50476;66;14.370538072;2021-12-06@14:38:19
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40308;12612;50448;63;13.718296061;2021-12-06@14:39:07
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40296;12626;50504;65;14.138538412;2021-12-06@14:39:55
+v2.0.8-161-ga788372e;imex;32;10000;;16892;6334;40156;12614;50456;63;13.717587900;2021-12-06@14:40:43
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9324;3886;15544;69;15.006621142;2021-12-06@14:41:34
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9044;3874;15496;67;14.576172686;2021-12-06@14:42:22
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9168;3877;15508;67;14.580721314;2021-12-06@14:43:09
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9360;3874;15496;70;15.215318150;2021-12-06@14:43:57
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9092;3861;15444;67;14.565809392;2021-12-06@14:44:45
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;8948;3852;15408;67;14.565712451;2021-12-06@14:45:32
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9308;3908;15632;68;14.795375802;2021-12-06@14:46:22
+v2.0.8-161-ga788372e;single;32;10000;;16892;6334;;9080;3881;15524;65;14.137421494;2021-12-06@14:47:10
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;82076;564613;2258452;21;4.522385738;2021-12-06@14:47:48
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;83560;564925;2259700;20;4.309231785;2021-12-06@14:48:28
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;82556;564756;2259024;22;4.740118038;2021-12-06@14:49:08
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;81832;564848;2259392;20;4.307002878;2021-12-06@14:49:48
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;81964;564749;2258996;20;4.308891257;2021-12-06@14:50:28
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;82512;564788;2259152;19;4.095858857;2021-12-06@14:51:07
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;81600;564683;2258732;18;3.878144182;2021-12-06@14:51:46
+v2.0.8-161-ga788372e;mulimex;32;10000;;16892;6334;81688;564605;2258420;18;3.880192724;2021-12-06@14:52:23
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;90636;960532;3842128;25;5.413937245;2021-12-06@14:53:11
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;90560;960331;3841324;26;5.625838555;2021-12-06@14:54:04
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;90656;960231;3840924;26;5.622985139;2021-12-06@14:54:54
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;88600;959985;3839940;25;5.421197146;2021-12-06@14:55:44
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;92224;960576;3842304;25;5.412104972;2021-12-06@14:56:36
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;90032;960088;3840352;25;5.429419527;2021-12-06@14:57:28
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;88716;960064;3840256;25;5.409571988;2021-12-06@14:58:19
+v2.0.8-161-ga788372e;multi;56;10000;;17919;6345;89904;959874;3839496;25;5.402138865;2021-12-06@14:59:09
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60804;18448;73792;113;24.614735142;2021-12-06@15:00:42
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;61532;18608;74432;109;23.732816525;2021-12-06@15:01:53
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60684;18462;73848;109;23.745012029;2021-12-06@15:03:09
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60824;18483;73932;111;24.182505333;2021-12-06@15:04:22
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60740;18485;73940;109;23.743722383;2021-12-06@15:05:37
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60708;18482;73928;109;23.737597586;2021-12-06@15:06:54
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60812;18493;73972;111;24.171849671;2021-12-06@15:08:12
+v2.0.8-161-ga788372e;imex;56;10000;;17919;6345;60624;18453;73812;109;23.750090485;2021-12-06@15:09:30
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10500;4193;16772;115;25.090458989;2021-12-06@15:10:45
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10576;4198;16792;115;25.053933566;2021-12-06@15:12:01
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10440;4175;16700;114;24.832875853;2021-12-06@15:13:17
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10672;4178;16712;114;24.838940159;2021-12-06@15:14:34
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10424;4191;16764;114;24.845332591;2021-12-06@15:15:51
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10536;4185;16740;114;24.842495171;2021-12-06@15:17:09
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10660;4192;16768;114;24.835230118;2021-12-06@15:18:21
+v2.0.8-161-ga788372e;single;56;10000;;17919;6345;10452;4176;16704;114;24.824440064;2021-12-06@15:19:36
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;133784;973094;3892376;26;5.639381304;2021-12-06@15:20:34
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;134832;973308;3893232;27;5.856331757;2021-12-06@15:21:24
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;136404;973067;3892268;26;5.637067908;2021-12-06@15:22:18
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;133332;973120;3892480;27;5.855872096;2021-12-06@15:23:10
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;134404;973226;3892904;27;5.855301093;2021-12-06@15:24:02
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;137088;973290;3893160;27;5.860414051;2021-12-06@15:24:53
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;136044;973191;3892764;29;6.296841111;2021-12-06@15:25:48
+v2.0.8-161-ga788372e;mulimex;56;10000;;17919;6345;134192;973279;3893116;27;5.865426200;2021-12-06@15:26:41
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;157228;1699840;6799360;47;10.243395607;2021-12-06@15:27:58
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;153884;1699446;6797784;47;10.260627518;2021-12-06@15:29:21
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;154424;1699521;6798084;47;10.232038900;2021-12-06@15:30:40
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;156488;1699984;6799936;46;10.006832801;2021-12-06@15:31:59
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;155764;1700064;6800256;47;10.238049395;2021-12-06@15:33:18
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;158156;1700036;6800144;48;10.447295937;2021-12-06@15:34:39
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;153812;1699510;6798040;47;10.240523586;2021-12-06@15:36:01
+v2.0.8-161-ga788372e;multi;100;10000;;18563;6381;155628;1699815;6799260;46;10.007345700;2021-12-06@15:37:21
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;97528;28982;115928;192;41.865100099;2021-12-06@15:39:15
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;97660;28982;115928;196;42.765122043;2021-12-06@15:41:08
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;98328;29160;116640;196;42.776826745;2021-12-06@15:43:00
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;98092;29098;116392;193;42.113227186;2021-12-06@15:44:55
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;98024;29079;116316;191;41.670385310;2021-12-06@15:46:51
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;97596;28975;115900;194;42.347403585;2021-12-06@15:48:41
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;97940;29089;116356;193;42.124749758;2021-12-06@15:50:32
+v2.0.8-161-ga788372e;imex;100;10000;;18563;6381;98340;29184;116736;194;42.340088089;2021-12-06@15:52:25
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12396;4685;18740;201;43.886697347;2021-12-06@15:54:18
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12416;4650;18600;204;44.557125113;2021-12-06@15:56:12
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12360;4669;18676;203;44.345104651;2021-12-06@15:58:07
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12288;4668;18672;202;44.111571144;2021-12-06@16:00:02
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12372;4679;18716;217;47.417960550;2021-12-06@16:02:00
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12424;4684;18736;204;44.541854720;2021-12-06@16:03:52
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12428;4681;18724;205;44.783031958;2021-12-06@16:05:47
+v2.0.8-161-ga788372e;single;100;10000;;18563;6381;12372;4665;18660;204;44.552089966;2021-12-06@16:07:42
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;238176;1723216;6892864;49;10.710845221;2021-12-06@16:09:01
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;235456;1722775;6891100;50;10.916215590;2021-12-06@16:10:30
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;238756;1723260;6893040;50;10.921517102;2021-12-06@16:11:50
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;235632;1722288;6889152;51;11.104239267;2021-12-06@16:13:14
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;235808;1723028;6892112;50;10.924535204;2021-12-06@16:14:36
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;234916;1722808;6891232;50;10.932362482;2021-12-06@16:15:58
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;234384;1722756;6891024;49;10.673398292;2021-12-06@16:17:19
+v2.0.8-161-ga788372e;mulimex;100;10000;;18563;6381;232416;1722182;6888728;49;10.756571900;2021-12-06@16:18:41
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;274016;2159350;8637400;86;18.810143685;2021-12-06@16:20:41
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;275624;2159202;8636808;85;18.604219427;2021-12-06@16:22:51
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;275532;2159255;8637020;85;18.592356953;2021-12-06@16:25:02
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;270780;2158573;8634292;86;18.833227881;2021-12-06@16:27:11
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;267068;2157881;8631524;84;18.480694418;2021-12-06@16:29:22
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;269316;2159098;8636392;86;18.836943286;2021-12-06@16:31:34
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;270220;2159439;8637756;85;18.572625658;2021-12-06@16:33:45
+v2.0.8-161-ga788372e;multi;178;10000;;19033;6531;274572;2159315;8637260;86;18.796062554;2021-12-06@16:35:55
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;168512;49056;196224;372;81.435064869;2021-12-06@16:39:09
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;167024;48697;194788;368;80.558510744;2021-12-06@16:42:38
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;166748;48570;194280;368;80.585125026;2021-12-06@16:45:55
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;165476;48336;193344;374;81.875080009;2021-12-06@16:49:14
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;167888;48908;195632;383;83.810889861;2021-12-06@16:52:25
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;165844;48383;193532;372;81.602119381;2021-12-06@16:55:38
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;165848;48333;193332;362;79.242521109;2021-12-06@16:58:57
+v2.0.8-161-ga788372e;imex;178;10000;;19033;6531;166668;48572;194288;374;81.881825688;2021-12-06@17:02:05
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15676;5487;21948;381;83.730208659;2021-12-06@17:05:13
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15500;5482;21928;378;82.901160368;2021-12-06@17:08:21
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15760;5464;21856;398;87.240639421;2021-12-06@17:11:32
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15612;5481;21924;379;83.040451555;2021-12-06@17:14:42
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15696;5476;21904;385;84.677077832;2021-12-06@17:17:49
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15576;5473;21892;387;84.804172913;2021-12-06@17:21:00
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15804;5479;21916;388;85.163903295;2021-12-06@17:24:09
+v2.0.8-161-ga788372e;single;178;10000;;19033;6531;15612;5484;21936;381;83.447983331;2021-12-06@17:27:20
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;420112;2201113;8804452;90;19.734871982;2021-12-06@17:29:24
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;416132;2199642;8798568;91;19.886417571;2021-12-06@17:31:28
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;419452;2200580;8802320;91;19.890319401;2021-12-06@17:33:33
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;414268;2199304;8797216;91;19.893538266;2021-12-06@17:46:46
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;414816;2199111;8796444;91;19.908762754;2021-12-06@17:48:53
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;413064;2199621;8798484;92;20.170746382;2021-12-06@17:51:06
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;416784;2199609;8798436;91;19.914442486;2021-12-06@17:53:12
+v2.0.8-161-ga788372e;mulimex;178;10000;;19033;6531;414452;2200847;8803388;91;19.897780806;2021-12-06@17:55:19
+v2.0.8-161-ga788372e;multi;316;10000;;19553;6638;473272;2217524;8870096;160;35.109724230;2021-12-06@17:58:43
+v2.0.8-161-ga788372e;multi;316;10000;;19553;6638;489336;2216918;8867672;160;35.036585681;2021-12-06@18:02:37
+v2.0.8-161-ga788372e;multi;316;10000;;19553;6638;499536;2219768;8879072;166;36.453827085;2021-12-06@18:06:33
+v2.0.8-163-ge813cd67;multi;316;10000;;19553;6638;486876;2217561;8870244;165;36.219933598;2021-12-06@18:10:27
+v2.0.8-163-ge813cd67;multi;316;10000;;19553;6638;492756;2219329;8877316;168;36.803414011;2021-12-06@18:14:27
+v2.0.8-163-ge813cd67;multi;316;10000;;19553;6638;484292;2217366;8869464;167;36.641744843;2021-12-06@18:18:42
+v2.0.8-163-ge813cd67;multi;316;10000;;19553;6638;499180;2219884;8879536;166;36.367060291;2021-12-06@18:22:38
+v2.0.8-163-ge813cd67;multi;316;10000;;19553;6638;491808;2220103;8880412;166;36.263668177;2021-12-06@18:26:35
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;284668;82254;329016;739;162.528245515;2021-12-06@18:33:29
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;294544;84701;338804;729;160.674302810;2021-12-06@18:39:20
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;285424;82451;329804;785;172.657519651;2021-12-06@18:45:21
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;294592;84674;338696;734;161.864779166;2021-12-06@18:51:13
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;283944;82114;328456;731;161.452744341;2021-12-06@18:57:03
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;284620;82202;328808;726;159.871484038;2021-12-06@19:02:50
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;288772;83257;333028;747;164.672569104;2021-12-06@19:08:43
+v2.0.8-163-ge813cd67;imex;316;10000;;19553;6638;289132;83339;333356;723;159.327889660;2021-12-06@19:14:28
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21032;6826;27304;799;176.389544066;2021-12-06@19:20:35
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21096;6802;27208;771;170.469001660;2021-12-06@19:26:40
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21228;6838;27352;771;170.445679124;2021-12-06@19:32:48
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;20984;6789;27156;782;173.457854715;2021-12-06@19:38:50
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21096;6831;27324;781;172.483058648;2021-12-06@19:44:54
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;20852;6799;27196;775;170.973709728;2021-12-06@19:50:55
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21016;6810;27240;767;169.147439080;2021-12-06@19:56:53
+v2.0.8-163-ge813cd67;single;316;10000;;19553;6638;21044;6811;27244;782;172.726994658;2021-12-06@20:02:55
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;747296;2293442;9173768;177;38.934544160;2021-12-06@20:06:41
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;748264;2294413;9177652;178;39.279433773;2021-12-06@20:07:22
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;740736;2292451;9169804;181;39.838252438;2021-12-06@20:08:03
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;742224;2292343;9169372;182;40.215076390;2021-12-06@20:08:45
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;740520;2291831;9167324;181;39.731890394;2021-12-06@20:09:26
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;734676;2290626;9162504;179;39.293273175;2021-12-06@20:10:07
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;753600;2294869;9179476;181;39.738133835;2021-12-06@20:10:49
+v2.0.8-163-ge813cd67;mulimex;316;10000;;19553;6638;741224;2292737;9170948;183;40.225612561;2021-12-06@20:11:30
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43220;192073;768292;16;3.501894537;2021-12-06@20:13:05
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43196;192024;768096;18;3.930211244;2021-12-06@20:13:11
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43300;192041;768164;19;4.153959610;2021-12-06@20:13:16
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43332;192050;768200;19;4.154886280;2021-12-06@20:13:22
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43324;192054;768216;19;4.156487913;2021-12-06@20:13:28
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43536;192058;768232;19;4.155744364;2021-12-06@20:13:33
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43232;192053;768212;19;4.158111188;2021-12-06@20:13:39
+v2.0.8-163-ge813cd67;multi;10;17783;;29952;12293;43076;192027;768108;19;4.151844965;2021-12-06@20:13:45
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36312;11009;44036;45;9.845653838;2021-12-06@20:14:05
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36424;11000;44000;46;10.105034944;2021-12-06@20:14:17
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36384;10999;43996;45;9.875427425;2021-12-06@20:14:28
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36440;10994;43976;47;10.319987275;2021-12-06@20:14:40
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36260;11007;44028;46;10.097267729;2021-12-06@20:14:52
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36300;11006;44024;47;10.315758143;2021-12-06@20:15:04
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36388;10993;43972;47;10.325056653;2021-12-06@20:15:15
+v2.0.8-163-ge813cd67;imex;10;17783;;29952;12293;36600;11025;44100;46;10.097867454;2021-12-06@20:15:27
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11824;4515;18060;46;10.075913204;2021-12-06@20:15:46
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11460;4504;18016;50;10.976056302;2021-12-06@20:15:58
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11708;4512;18048;48;10.537367488;2021-12-06@20:16:10
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11492;4504;18016;46;10.095178399;2021-12-06@20:16:22
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11744;4502;18008;46;10.090156325;2021-12-06@20:16:33
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11840;4532;18128;47;10.326571395;2021-12-06@20:16:45
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11748;4522;18088;47;10.317123405;2021-12-06@20:16:57
+v2.0.8-163-ge813cd67;single;10;17783;;29952;12293;11860;4533;18132;47;10.317285413;2021-12-06@20:17:09
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;62000;197033;788132;19;4.096507190;2021-12-06@20:17:22
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;61496;197049;788196;19;4.159589447;2021-12-06@20:17:28
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;61528;197013;788052;19;4.157080121;2021-12-06@20:17:33
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;61336;197054;788216;20;4.375605851;2021-12-06@20:17:39
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;61960;197035;788140;19;4.158493927;2021-12-06@20:17:45
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;62100;197061;788244;19;4.153872220;2021-12-06@20:17:50
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;62156;197028;788112;19;4.158705283;2021-12-06@20:17:56
+v2.0.8-163-ge813cd67;mulimex;10;17783;;29952;12293;61480;197031;788124;19;4.148763160;2021-12-06@20:18:02
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;64672;328806;1315224;20;4.318850415;2021-12-06@20:18:17
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;64820;329049;1316196;22;4.815345088;2021-12-06@20:18:23
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;65324;328908;1315632;22;4.818446147;2021-12-06@20:18:30
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;65360;328856;1315424;22;4.817503278;2021-12-06@20:18:36
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;64740;328777;1315108;23;5.041512642;2021-12-06@20:18:43
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;64620;328807;1315228;22;4.812746187;2021-12-06@20:18:49
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;65080;328962;1315848;23;5.036722026;2021-12-06@20:18:55
+v2.0.8-163-ge813cd67;multi;18;17783;;31744;12312;65008;328785;1315140;22;4.814744526;2021-12-06@20:19:02
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49696;14547;58188;76;16.710933951;2021-12-06@20:19:31
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49616;14539;58156;76;16.719335322;2021-12-06@20:19:49
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49788;14561;58244;76;16.720804601;2021-12-06@20:20:08
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49420;14537;58148;74;16.291328611;2021-12-06@20:20:25
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49760;14542;58168;75;16.506797991;2021-12-06@20:20:43
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49460;14543;58172;75;16.510428069;2021-12-06@20:21:01
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49488;14565;58260;78;17.159815365;2021-12-06@20:21:20
+v2.0.8-163-ge813cd67;imex;18;17783;;31744;12312;49628;14539;58156;77;16.937557715;2021-12-06@20:21:38
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12664;4752;19008;78;17.150778775;2021-12-06@20:22:09
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12852;4752;19008;75;16.572674042;2021-12-06@20:22:27
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12696;4735;18940;74;16.284344401;2021-12-06@20:22:45
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12684;4743;18972;77;16.958014917;2021-12-06@20:23:03
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12856;4766;19064;76;16.736716239;2021-12-06@20:23:21
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12708;4750;19000;76;16.724097892;2021-12-06@20:23:40
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12792;4758;19032;80;17.605004747;2021-12-06@20:23:59
+v2.0.8-163-ge813cd67;single;18;17783;;31744;12312;12812;4759;19036;79;17.394453901;2021-12-06@20:24:18
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;95888;336939;1347756;21;4.545320025;2021-12-06@20:24:36
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;95048;336946;1347784;23;5.043875112;2021-12-06@20:24:42
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;94508;336884;1347536;23;5.047837888;2021-12-06@20:24:49
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;94472;336843;1347372;23;5.044710659;2021-12-06@20:24:55
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;94740;336885;1347540;23;5.043086984;2021-12-06@20:25:02
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;94692;336878;1347512;24;5.263748739;2021-12-06@20:25:09
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;94916;336884;1347536;23;5.038846352;2021-12-06@20:25:15
+v2.0.8-163-ge813cd67;mulimex;18;17783;;31744;12312;95928;336986;1347944;23;5.045801500;2021-12-06@20:25:22
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;102200;568266;2273064;27;5.889785287;2021-12-06@20:25:48
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;103496;568251;2273004;33;7.254135647;2021-12-06@20:25:57
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;103060;568155;2272620;33;7.258544791;2021-12-06@20:26:05
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;103120;568281;2273124;33;7.259433077;2021-12-06@20:26:14
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;102232;568193;2272772;33;7.260431843;2021-12-06@20:26:23
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;103408;568131;2272524;33;7.257202648;2021-12-06@20:26:32
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;102248;568195;2272780;32;7.033852291;2021-12-06@20:26:40
+v2.0.8-163-ge813cd67;multi;32;17783;;32894;12393;103584;568271;2273084;33;7.250038875;2021-12-06@20:26:49
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71536;20480;81920;130;28.634837924;2021-12-06@20:27:41
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71828;20484;81936;127;27.989196410;2021-12-06@20:28:11
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71440;20475;81900;128;28.197493992;2021-12-06@20:28:41
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71676;20476;81904;129;28.434298098;2021-12-06@20:29:11
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71684;20463;81852;128;28.214101359;2021-12-06@20:29:41
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71496;20481;81924;127;28.004319718;2021-12-06@20:30:10
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71432;20462;81848;128;28.211302327;2021-12-06@20:30:40
+v2.0.8-163-ge813cd67;imex;32;17783;;32894;12393;71788;20486;81944;129;28.440937824;2021-12-06@20:31:10
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;13788;5053;20212;138;30.418650112;2021-12-06@20:32:03
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;14100;5056;20224;130;28.650281365;2021-12-06@20:32:33
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;14112;5053;20212;132;29.096653304;2021-12-06@20:33:04
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;13752;5054;20216;133;29.323401255;2021-12-06@20:33:34
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;14000;5051;20204;130;28.640473480;2021-12-06@20:34:06
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;13808;5053;20212;128;28.205272779;2021-12-06@20:34:36
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;13872;5066;20264;129;28.431496100;2021-12-06@20:35:06
+v2.0.8-163-ge813cd67;single;32;17783;;32894;12393;13728;5058;20232;134;29.531467650;2021-12-06@20:35:37
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;152396;581787;2327148;29;6.324602926;2021-12-06@20:36:04
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;153572;581745;2326980;34;7.484398688;2021-12-06@20:36:13
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;153808;581826;2327304;34;7.483412616;2021-12-06@20:36:22
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;153264;581724;2326896;34;7.485421176;2021-12-06@20:36:30
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;152912;581772;2327088;34;7.483382201;2021-12-06@20:36:39
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;153932;581737;2326948;34;7.481120459;2021-12-06@20:36:48
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;152668;581760;2327040;35;7.705629881;2021-12-06@20:36:58
+v2.0.8-163-ge813cd67;mulimex;32;17783;;32894;12393;153600;581890;2327560;33;7.260312320;2021-12-06@20:37:06
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;167480;978389;3913556;46;10.121600957;2021-12-06@20:37:47
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;167404;978474;3913896;51;11.233279854;2021-12-06@20:38:00
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;168088;978336;3913344;51;11.248628932;2021-12-06@20:38:13
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;168432;978410;3913640;52;11.469414891;2021-12-06@20:38:26
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;169440;978712;3914848;52;11.480132192;2021-12-06@20:38:39
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;168784;978638;3914552;53;11.694225140;2021-12-06@20:38:52
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;165712;978262;3913048;52;11.480888442;2021-12-06@20:39:05
+v2.0.8-163-ge813cd67;multi;56;17783;;33578;12411;166332;978182;3912728;51;11.254613500;2021-12-06@20:39:18
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108252;30352;121408;217;47.854685718;2021-12-06@20:40:46
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108100;30371;121484;222;48.990026257;2021-12-06@20:41:36
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108020;30302;121208;214;47.192668348;2021-12-06@20:42:25
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108024;30293;121172;211;46.537644076;2021-12-06@20:43:13
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108008;30312;121248;229;50.482256930;2021-12-06@20:44:05
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108220;30354;121416;220;48.511016057;2021-12-06@20:44:55
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108432;30316;121264;219;48.295091310;2021-12-06@20:45:45
+v2.0.8-163-ge813cd67;imex;56;17783;;33578;12411;108204;30357;121428;222;48.979834405;2021-12-06@20:46:35
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15228;5432;21728;240;52.940262022;2021-12-06@20:48:04
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15304;5435;21740;228;50.303076962;2021-12-06@20:48:56
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15548;5459;21836;220;48.554455486;2021-12-06@20:49:47
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15308;5444;21776;222;49.008509564;2021-12-06@20:50:38
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15428;5452;21808;221;48.781160247;2021-12-06@20:51:31
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15228;5455;21820;217;47.883786884;2021-12-06@20:52:21
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15288;5426;21704;258;56.958597239;2021-12-06@20:53:19
+v2.0.8-163-ge813cd67;single;56;17783;;33578;12411;15500;5451;21804;222;48.989794059;2021-12-06@20:54:09
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;250968;1001355;4005420;50;11.060636581;2021-12-06@20:54:56
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;252784;1001514;4006056;55;12.152078628;2021-12-06@20:55:10
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;252052;1001277;4005108;56;12.374197611;2021-12-06@20:55:26
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;250648;1001277;4005108;54;11.926556592;2021-12-06@20:55:41
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;250812;1001283;4005132;55;12.158614198;2021-12-06@20:55:57
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;252516;1001220;4004880;56;12.367040358;2021-12-06@20:56:13
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;252056;1001418;4005672;57;12.576237327;2021-12-06@20:56:29
+v2.0.8-163-ge813cd67;mulimex;56;17783;;33578;12411;252780;1001270;4005080;57;12.599500941;2021-12-06@20:56:45
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;286552;1730237;6920948;87;19.241520785;2021-12-06@20:58:01
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;288848;1731029;6924116;92;20.325654482;2021-12-06@20:58:23
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;288908;1730865;6923460;93;20.556020913;2021-12-06@20:58:45
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;284360;1730148;6920592;92;20.374314073;2021-12-06@20:59:08
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;289104;1730877;6923508;95;21.010108917;2021-12-06@20:59:31
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;288204;1731890;6927560;94;20.817362860;2021-12-06@20:59:54
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;289448;1731094;6924376;88;19.514472725;2021-12-06@21:00:16
+v2.0.8-163-ge813cd67;multi;100;17783;;33951;12499;284968;1730647;6922588;92;20.373575097;2021-12-06@21:00:39
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;175420;48437;193748;393;86.931550083;2021-12-06@21:03:13
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;175680;48530;194120;389;86.047319063;2021-12-06@21:04:40
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;174932;48333;193332;389;86.042806907;2021-12-06@21:06:08
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;175256;48409;193636;374;82.686947744;2021-12-06@21:07:32
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;174264;48227;192908;391;86.534293120;2021-12-06@21:09:00
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;175164;48321;193284;395;87.429189880;2021-12-06@21:10:29
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;174788;48355;193420;386;85.434448517;2021-12-06@21:11:56
+v2.0.8-163-ge813cd67;imex;100;17783;;33951;12499;174720;48348;193392;377;83.379206264;2021-12-06@21:13:21
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17808;6029;24116;409;90.665509842;2021-12-06@21:15:57
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17564;6010;24040;406;90.077951916;2021-12-06@21:17:29
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17840;6006;24024;409;90.699169533;2021-12-06@21:19:01
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17744;6054;24216;400;88.774242984;2021-12-06@21:20:32
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17516;5977;23908;420;93.218086288;2021-12-06@21:22:06
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17516;5966;23864;403;89.497769150;2021-12-06@21:23:37
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17776;6063;24252;409;90.766893951;2021-12-06@21:25:09
+v2.0.8-163-ge813cd67;single;100;17783;;33951;12499;17440;5989;23956;411;91.293720343;2021-12-06@21:26:42
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;434020;1770411;7081644;92;20.374003266;2021-12-06@21:28:07
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;433596;1770884;7083536;97;21.449047419;2021-12-06@21:28:29
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;432756;1770333;7081332;98;21.788378714;2021-12-06@21:28:53
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;432368;1770376;7081504;98;21.669638297;2021-12-06@21:29:16
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;432388;1770464;7081856;98;21.721247625;2021-12-06@21:29:39
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;433992;1770388;7081552;98;21.706651846;2021-12-06@21:30:02
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;432252;1770500;7082000;97;21.460912763;2021-12-06@21:30:25
+v2.0.8-163-ge813cd67;mulimex;100;17783;;33951;12499;431716;1770274;7081096;98;21.706835494;2021-12-06@21:30:48
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;493224;2211142;8844568;156;34.631798281;2021-12-06@21:33:00
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;495676;2211991;8847964;162;35.912034559;2021-12-06@21:33:37
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;491824;2211005;8844020;162;35.949107695;2021-12-06@21:34:15
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;493592;2211067;8844268;164;36.282322167;2021-12-06@21:34:52
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;499688;2212468;8849872;163;36.084842565;2021-12-06@21:35:30
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;499512;2212139;8848556;163;36.161966909;2021-12-06@21:36:08
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;498736;2212306;8849224;161;35.698107826;2021-12-06@21:36:45
+v2.0.8-163-ge813cd67;multi;178;17783;;34156;12582;497008;2212270;8849080;164;36.357921824;2021-12-06@21:37:23
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;294084;80485;321940;713;158.285876408;2021-12-06@21:42:00
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;292964;80178;320712;696;154.492668580;2021-12-06@21:44:36
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;294524;80562;322248;701;155.776462026;2021-12-06@21:47:14
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;293552;80305;321220;733;163.349949427;2021-12-06@21:49:58
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;295016;80685;322740;681;151.631866600;2021-12-06@21:52:32
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;292956;80171;320684;680;150.936769125;2021-12-06@21:55:04
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;294468;80503;322012;672;149.162057416;2021-12-06@21:57:35
+v2.0.8-163-ge813cd67;imex;178;17783;;34156;12582;294588;80557;322228;703;156.113833841;2021-12-06@22:00:12
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21020;6899;27596;750;166.981207920;2021-12-06@22:04:52
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21268;6893;27572;765;170.676730082;2021-12-06@22:07:44
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21032;6867;27468;724;161.047044019;2021-12-06@22:10:27
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21076;6867;27468;746;166.213513958;2021-12-06@22:13:14
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21252;6880;27520;702;156.176459554;2021-12-06@22:15:53
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21252;6906;27624;745;165.893160710;2021-12-06@22:18:41
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21328;6885;27540;716;159.211054427;2021-12-06@22:21:22
+v2.0.8-163-ge813cd67;single;178;17783;;34156;12582;21372;6912;27648;753;167.677584181;2021-12-06@22:24:12
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;761996;2283589;9134356;158;35.077615140;2021-12-06@22:26:35
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;757388;2282014;9128056;173;38.366688669;2021-12-06@22:27:15
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;760388;2283387;9133548;172;38.185089177;2021-12-06@22:27:54
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;754976;2281953;9127812;169;37.510356497;2021-12-06@22:28:33
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;757304;2282234;9128936;170;37.729832892;2021-12-06@22:29:13
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;756040;2281805;9127220;174;38.618450690;2021-12-06@22:29:53
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;760120;2283030;9132120;169;37.503847768;2021-12-06@22:30:32
+v2.0.8-163-ge813cd67;mulimex;178;17783;;34156;12582;761100;2283870;9135480;169;37.636358569;2021-12-06@22:31:11
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;876356;2311836;9247344;293;65.392363755;2021-12-06@22:35:12
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;867084;2310575;9242300;291;65.238325685;2021-12-06@22:36:20
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;876580;2311633;9246532;298;66.139101648;2021-12-06@22:37:27
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;864840;2309843;9239372;285;63.312026602;2021-12-06@22:38:32
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;875652;2311655;9246620;293;65.272628546;2021-12-06@22:39:39
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;864216;2309545;9238180;291;64.769997895;2021-12-06@22:40:45
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;858300;2308839;9235356;293;65.119980084;2021-12-06@22:41:52
+v2.0.8-163-ge813cd67;multi;316;17783;;34574;12710;873928;2311692;9246768;299;66.837449563;2021-12-06@22:43:01
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;508512;138198;552792;1319;294.454130761;2021-12-06@22:51:14
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;506972;137849;551396;1320;295.056020887;2021-12-06@22:56:11
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;515604;140023;560092;1291;288.661181754;2021-12-06@23:01:01
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;507152;137844;551376;1278;285.510122239;2021-12-06@23:06:03
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;506552;137709;550836;1321;294.923234433;2021-12-06@23:11:00
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;511720;138992;555968;1282;287.720350930;2021-12-06@23:15:49
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;506536;137741;550964;1340;300.026245249;2021-12-06@23:20:51
+v2.0.8-163-ge813cd67;imex;316;17783;;34574;12710;515792;139964;559856;1269;284.149055276;2021-12-06@23:25:36
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27536;8477;33908;1375;307.628461075;2021-12-06@23:34:13
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27484;8425;33700;1372;307.259035026;2021-12-06@23:39:22
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27340;8435;33740;1395;312.356857004;2021-12-06@23:44:36
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27532;8441;33764;1377;308.193987236;2021-12-06@23:49:46
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27304;8441;33764;1398;312.486161392;2021-12-06@23:55:00
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27448;8468;33872;1391;311.376580435;2021-12-07@00:00:12
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27408;8488;33952;1415;316.358885819;2021-12-07@00:05:30
+v2.0.8-163-ge813cd67;single;316;17783;;34574;12710;27208;8411;33644;1395;312.665274985;2021-12-07@00:10:44
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1345012;2437790;9751160;303;67.809636965;2021-12-07@00:15:15
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1343316;2438145;9752580;310;68.863045109;2021-12-07@00:16:26
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1333476;2436939;9747756;313;69.917316184;2021-12-07@00:17:37
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1339004;2437407;9749628;311;69.161857163;2021-12-07@00:18:49
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1339604;2436905;9747620;305;67.833680449;2021-12-07@00:19:58
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1340520;2438025;9752100;312;69.367867416;2021-12-07@00:21:09
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1350528;2439559;9758236;309;68.616446795;2021-12-07@00:22:20
+v2.0.8-163-ge813cd67;mulimex;316;17783;;34574;12710;1342512;2438486;9753944;311;69.337702741;2021-12-07@00:23:31
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76764;199484;797936;25;5.577802708;2021-12-07@00:25:14
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76900;199458;797832;26;5.788412392;2021-12-07@00:25:21
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76992;199475;797900;27;6.017407981;2021-12-07@00:25:29
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76676;199483;797932;27;6.020662961;2021-12-07@00:25:36
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76620;199481;797924;27;6.020711463;2021-12-07@00:25:44
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76740;199655;798620;26;5.783806234;2021-12-07@00:25:51
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76904;199527;798108;27;6.026277832;2021-12-07@00:25:58
+v2.0.8-163-ge813cd67;multi;10;31623;;54425;24231;76908;199483;797932;27;6.022514340;2021-12-07@00:26:06
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64644;18025;72100;77;17.226446663;2021-12-07@00:26:32
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64444;18016;72064;80;17.907633542;2021-12-07@00:26:51
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64408;18007;72028;80;17.926030627;2021-12-07@00:27:11
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64464;18013;72052;77;17.233416684;2021-12-07@00:27:29
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64412;18030;72120;79;17.687326143;2021-12-07@00:27:49
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64364;18005;72020;81;18.123377453;2021-12-07@00:28:08
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64440;18016;72064;82;18.364293282;2021-12-07@00:28:28
+v2.0.8-163-ge813cd67;imex;10;31623;;54425;24231;64492;18000;72000;76;17.009441753;2021-12-07@00:28:47
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18460;6167;24668;81;18.101138551;2021-12-07@00:29:13
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18504;6168;24672;78;17.458490078;2021-12-07@00:29:32
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18448;6194;24776;80;17.911326333;2021-12-07@00:29:51
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18436;6177;24708;81;18.146125845;2021-12-07@00:30:11
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18556;6169;24676;78;17.452083239;2021-12-07@00:30:30
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18480;6176;24704;79;17.677930319;2021-12-07@00:30:49
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18460;6170;24680;81;18.121845008;2021-12-07@00:31:09
+v2.0.8-163-ge813cd67;single;10;31623;;54425;24231;18420;6170;24680;79;17.678617968;2021-12-07@00:31:28
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;112172;208924;835696;25;5.495750793;2021-12-07@00:31:42
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;111604;208478;833912;27;6.021183973;2021-12-07@00:31:50
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;111644;208531;834124;27;6.019107549;2021-12-07@00:31:58
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;112108;208522;834088;27;6.025052294;2021-12-07@00:32:05
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;111708;208578;834312;27;6.023775603;2021-12-07@00:32:13
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;112200;208933;835732;28;6.250478218;2021-12-07@00:32:20
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;111696;208506;834024;27;6.022541521;2021-12-07@00:32:28
+v2.0.8-163-ge813cd67;mulimex;10;31623;;54425;24231;111580;208581;834324;27;6.020572487;2021-12-07@00:32:36
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116424;340481;1361924;29;6.400766487;2021-12-07@00:32:53
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116692;340571;1362284;33;7.379586660;2021-12-07@00:33:02
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116604;340586;1362344;33;7.381501958;2021-12-07@00:33:11
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116620;340566;1362264;33;7.381369677;2021-12-07@00:33:20
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116664;340622;1362488;33;7.384938356;2021-12-07@00:33:28
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;117200;340835;1363340;33;7.373041717;2021-12-07@00:33:37
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116348;340492;1361968;33;7.389839125;2021-12-07@00:33:46
+v2.0.8-163-ge813cd67;multi;18;31623;;57202;24252;116464;340628;1362512;33;7.379063027;2021-12-07@00:33:55
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88760;24347;97388;134;30.083540487;2021-12-07@00:34:38
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88600;24339;97356;135;30.306881467;2021-12-07@00:35:10
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88580;24323;97292;136;30.533026576;2021-12-07@00:35:42
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88728;24308;97232;145;32.572913302;2021-12-07@00:36:16
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88696;24332;97328;136;30.525377490;2021-12-07@00:36:48
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88808;24349;97396;131;29.401545980;2021-12-07@00:37:19
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88932;24318;97272;136;30.529224325;2021-12-07@00:37:51
+v2.0.8-163-ge813cd67;imex;18;31623;;57202;24252;88752;24336;97344;134;30.071959037;2021-12-07@00:38:22
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19868;6518;26072;136;30.477845740;2021-12-07@00:39:08
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19816;6510;26040;135;30.291957133;2021-12-07@00:39:40
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19812;6532;26128;134;30.058306208;2021-12-07@00:40:12
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19824;6503;26012;134;30.088943675;2021-12-07@00:40:43
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19744;6516;26064;137;30.729689582;2021-12-07@00:41:15
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19864;6523;26092;135;30.302545625;2021-12-07@00:41:47
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19836;6506;26024;135;30.299142632;2021-12-07@00:42:19
+v2.0.8-163-ge813cd67;single;18;31623;;57202;24252;19816;6503;26012;133;29.843170551;2021-12-07@00:42:50
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;173404;355989;1423956;31;6.885606766;2021-12-07@00:43:10
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;172724;355300;1421200;35;7.833118953;2021-12-07@00:43:19
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;173084;355306;1421224;35;7.847829123;2021-12-07@00:43:29
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;172604;355301;1421204;35;7.830660423;2021-12-07@00:43:38
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;173664;355321;1421284;34;7.621537193;2021-12-07@00:43:47
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;173276;355327;1421308;35;7.841106487;2021-12-07@00:43:56
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;173584;355401;1421604;35;7.844758686;2021-12-07@00:44:06
+v2.0.8-163-ge813cd67;mulimex;18;31623;;57202;24252;174300;355426;1421704;35;7.845561359;2021-12-07@00:44:15
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;182716;587123;2348492;47;10.579153166;2021-12-07@00:44:43
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;184024;587074;2348296;51;11.463146307;2021-12-07@00:44:56
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;184800;586959;2347836;53;11.911091684;2021-12-07@00:45:10
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;184032;587062;2348248;52;11.692711266;2021-12-07@00:45:23
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;186044;587247;2348988;52;11.695563953;2021-12-07@00:45:36
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;184560;588183;2352732;52;11.701077247;2021-12-07@00:45:49
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;185772;588521;2354084;52;11.689344915;2021-12-07@00:46:02
+v2.0.8-163-ge813cd67;multi;32;31623;;58800;24186;185504;587566;2350264;52;11.690960133;2021-12-07@00:46:16
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128752;34758;139032;237;53.312138122;2021-12-07@00:47:30
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128692;34777;139108;228;51.235768652;2021-12-07@00:48:23
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;129096;34807;139228;234;52.648362874;2021-12-07@00:49:17
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128696;34741;138964;232;52.133848451;2021-12-07@00:50:10
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128676;34775;139100;229;51.523463627;2021-12-07@00:51:03
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128924;34766;139064;234;52.616067758;2021-12-07@00:51:58
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;128692;34772;139088;236;53.036605963;2021-12-07@00:52:52
+v2.0.8-163-ge813cd67;imex;32;31623;;58800;24186;129244;34831;139324;230;51.705653714;2021-12-07@00:53:45
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21324;6853;27412;245;55.167119391;2021-12-07@00:55:01
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21180;6852;27408;236;53.172595220;2021-12-07@00:55:56
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21072;6862;27448;242;54.524588789;2021-12-07@00:56:52
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21176;6855;27420;236;53.161102168;2021-12-07@00:57:47
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21320;6848;27392;232;52.259276307;2021-12-07@00:58:40
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21052;6873;27492;232;52.266579352;2021-12-07@00:59:34
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21088;6856;27424;233;52.467697369;2021-12-07@01:00:28
+v2.0.8-163-ge813cd67;single;32;31623;;58800;24186;21468;6856;27424;237;53.383505884;2021-12-07@01:01:23
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278572;611752;2447008;52;11.653541875;2021-12-07@01:01:58
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278404;612760;2451040;55;12.368262406;2021-12-07@01:02:12
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;279616;612778;2451112;53;11.911194767;2021-12-07@01:02:25
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278372;611777;2447108;55;12.368401746;2021-12-07@01:02:39
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278708;611731;2446924;55;12.381498100;2021-12-07@01:02:53
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278272;611671;2446684;54;12.134275556;2021-12-07@01:03:07
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278436;611804;2447216;55;12.363755621;2021-12-07@01:03:21
+v2.0.8-163-ge813cd67;mulimex;32;31623;;58800;24186;278860;611664;2446656;55;12.360190208;2021-12-07@01:03:35
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;300868;1011829;4047316;79;17.841550637;2021-12-07@01:04:22
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;301204;1009790;4039160;85;19.150460681;2021-12-07@01:04:42
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;301884;1009931;4039724;85;19.156987935;2021-12-07@01:05:03
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;303212;1011935;4047740;85;19.168569429;2021-12-07@01:05:24
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;302832;1009878;4039512;85;19.152589510;2021-12-07@01:05:44
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;301332;1009520;4038080;85;19.156489738;2021-12-07@01:06:05
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;304196;1010217;4040868;86;19.419680958;2021-12-07@01:06:26
+v2.0.8-163-ge813cd67;multi;56;31623;;59758;24285;302612;1010067;4040268;85;19.179914363;2021-12-07@01:06:47
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197272;52561;210244;411;92.667699750;2021-12-07@01:08:57
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197560;52712;210848;392;88.400097042;2021-12-07@01:10:27
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197332;52624;210496;393;88.657107917;2021-12-07@01:11:57
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197476;52616;210464;395;89.129672065;2021-12-07@01:13:28
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197100;52596;210384;410;92.483124898;2021-12-07@01:15:02
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197380;52585;210340;390;87.999132200;2021-12-07@01:16:32
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197308;52606;210424;388;87.613169021;2021-12-07@01:18:01
+v2.0.8-163-ge813cd67;imex;56;31623;;59758;24285;197384;52611;210444;389;87.708007347;2021-12-07@01:19:30
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;22788;7301;29204;418;94.321222264;2021-12-07@01:21:40
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;22700;7295;29180;410;92.585081943;2021-12-07@01:23:14
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;23016;7326;29304;411;92.781088585;2021-12-07@01:24:48
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;23032;7295;29180;403;90.937158773;2021-12-07@01:26:21
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;23032;7290;29160;411;92.785834058;2021-12-07@01:27:55
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;22900;7280;29120;402;90.704430019;2021-12-07@01:29:27
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;22868;7305;29220;407;91.854492069;2021-12-07@01:31:01
+v2.0.8-163-ge813cd67;single;56;31623;;59758;24285;22860;7289;29156;409;92.300350374;2021-12-07@01:32:34
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;461260;1053358;4213432;87;19.699291229;2021-12-07@01:33:30
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;460912;1051415;4205660;92;20.785507756;2021-12-07@01:33:53
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;461152;1053291;4213164;87;19.726254969;2021-12-07@01:34:29
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;459876;1051307;4205228;92;20.775752567;2021-12-07@01:34:51
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;460072;1051324;4205296;91;20.555773537;2021-12-07@01:35:13
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;460996;1053211;4212844;91;20.528760828;2021-12-07@01:35:35
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;459916;1051392;4205568;92;20.781245594;2021-12-07@01:35:58
+v2.0.8-163-ge813cd67;mulimex;56;31623;;59758;24285;459308;1053332;4213328;92;20.789469705;2021-12-07@01:36:20
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;517380;1784173;7136692;153;34.416894304;2021-12-07@01:37:47
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;515612;1787609;7150436;157;35.405846288;2021-12-07@01:38:24
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;515420;1787527;7150108;154;34.881555762;2021-12-07@01:39:01
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;516432;1784413;7137652;155;35.032807443;2021-12-07@01:39:37
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;513816;1783791;7135164;155;35.070035286;2021-12-07@01:40:14
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;515732;1788102;7152408;157;35.566989248;2021-12-07@01:40:51
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;515368;1787864;7151456;152;34.373459724;2021-12-07@01:41:27
+v2.0.8-163-ge813cd67;multi;100;31623;;60390;24233;514820;1783941;7135764;158;35.657870096;2021-12-07@01:42:04
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;320068;84718;338872;709;160.467395019;2021-12-07@01:45:52
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;320124;84653;338612;719;162.870144403;2021-12-07@01:48:36
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;320528;84778;339112;695;157.321678340;2021-12-07@01:51:15
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;321228;84926;339704;710;160.900969657;2021-12-07@01:53:57
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;320524;84759;339036;714;161.734540286;2021-12-07@01:56:41
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;321320;84981;339924;734;166.062190793;2021-12-07@01:59:28
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;319704;84544;338176;783;177.636056130;2021-12-07@02:02:27
+v2.0.8-163-ge813cd67;imex;100;31623;;60390;24233;320308;84771;339084;725;164.311025332;2021-12-07@02:05:13
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25224;7915;31660;737;166.981266478;2021-12-07@02:09:01
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25580;7940;31760;720;163.318866170;2021-12-07@02:11:46
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25420;7917;31668;723;164.033187130;2021-12-07@02:14:32
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25660;7925;31700;752;170.489334259;2021-12-07@02:17:24
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25400;7944;31776;725;164.360053176;2021-12-07@02:20:10
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25464;7929;31716;752;170.679482590;2021-12-07@02:23:02
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25596;7948;31792;743;168.575556044;2021-12-07@02:25:52
+v2.0.8-163-ge813cd67;single;100;31623;;60390;24233;25720;7942;31768;725;164.418423815;2021-12-07@02:28:38
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;789592;1856704;7426816;159;36.027172624;2021-12-07@02:30:20
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;793800;1857106;7428424;166;37.648918435;2021-12-07@02:30:59
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;794172;1857583;7430332;168;38.092730405;2021-12-07@02:31:39
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;793608;1857138;7428552;166;37.684220950;2021-12-07@02:32:18
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;791064;1856783;7427132;169;38.270562574;2021-12-07@02:32:58
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;792100;1856917;7427668;164;37.153277285;2021-12-07@02:33:37
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;794384;1857127;7428508;165;37.381511046;2021-12-07@02:34:15
+v2.0.8-163-ge813cd67;mulimex;100;31623;;60390;24233;792788;1860509;7442036;164;37.170801259;2021-12-07@02:34:54
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;898856;2306688;9226752;282;63.485166959;2021-12-07@02:37:34
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;896396;2306813;9227252;285;64.147590879;2021-12-07@02:38:40
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;894276;2305744;9222976;289;64.815940230;2021-12-07@02:39:46
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;892804;2305880;9223520;288;65.236804114;2021-12-07@02:40:53
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;891536;2305180;9220720;284;64.155186868;2021-12-07@02:41:58
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;896172;2306350;9225400;288;64.981371702;2021-12-07@02:43:05
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;899116;2306601;9226404;286;64.785877279;2021-12-07@02:44:11
+v2.0.8-163-ge813cd67;multi;178;31623;;60806;24427;894444;2305725;9222900;286;64.495302153;2021-12-07@02:45:17
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;545384;143317;573268;1322;301.218931787;2021-12-07@02:52:17
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;542120;142445;569780;1271;289.021362138;2021-12-07@02:57:07
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;540200;142046;568184;1246;283.686969006;2021-12-07@03:01:53
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;545040;143179;572716;1275;290.751202239;2021-12-07@03:06:45
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;541324;142212;568848;1296;294.315330410;2021-12-07@03:11:41
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;545964;143497;573988;1328;302.179796484;2021-12-07@03:16:44
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;541064;142169;568676;1219;277.303647172;2021-12-07@03:21:23
+v2.0.8-163-ge813cd67;imex;178;31623;;60806;24427;543708;142865;571460;1219;277.251790644;2021-12-07@03:26:02
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29568;8953;35812;1381;314.933741822;2021-12-07@03:33:15
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29852;8987;35948;1381;314.884152091;2021-12-07@03:38:31
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29464;8955;35820;1315;299.610186275;2021-12-07@03:43:32
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29584;9000;36000;1341;305.879601392;2021-12-07@03:48:40
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29728;8974;35896;1327;302.430958846;2021-12-07@03:53:44
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29684;8987;35948;1340;305.636436267;2021-12-07@03:58:51
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29636;8994;35976;1343;306.805716527;2021-12-07@04:03:59
+v2.0.8-163-ge813cd67;single;178;31623;;60806;24427;29812;8938;35752;1358;309.108867395;2021-12-07@04:09:10
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1383884;2433999;9735996;288;65.782263965;2021-12-07@04:12:09
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1387548;2440387;9761548;296;67.251556543;2021-12-07@04:13:18
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1380996;2439256;9757024;289;65.705329339;2021-12-07@04:14:25
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1386556;2434621;9738484;303;68.836958194;2021-12-07@04:15:36
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1394092;2436329;9745316;302;67.997739998;2021-12-07@04:16:46
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1390056;2435491;9741964;304;68.100654920;2021-12-07@04:17:56
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1386112;2434454;9737816;298;67.415780839;2021-12-07@04:19:05
+v2.0.8-163-ge813cd67;mulimex;178;31623;;60806;24427;1387456;2435007;9740028;298;67.383057018;2021-12-07@04:20:14
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1564356;2475939;9903756;494;113.081628459;2021-12-07@04:25:05
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1561796;2484820;9939280;499;114.135198074;2021-12-07@04:27:01
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1568952;2476967;9907868;495;113.669964646;2021-12-07@04:28:57
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1569832;2477406;9909624;497;113.601881144;2021-12-07@04:30:52
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1558324;2474234;9896936;496;113.867045197;2021-12-07@04:32:48
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1568836;2477533;9910132;497;113.782203885;2021-12-07@04:34:43
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1565824;2485586;9942344;501;114.821111493;2021-12-07@04:36:40
+v2.0.8-163-ge813cd67;multi;316;31623;;61364;24592;1565860;2485028;9940112;498;114.275231717;2021-12-07@04:38:36
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;936584;245198;980792;2427;554.549783224;2021-12-07@04:51:18
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;933528;244480;977920;2295;524.808953460;2021-12-07@05:00:04
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;932280;244185;976740;2408;550.042429410;2021-12-07@05:09:16
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;932532;244198;976792;2362;540.242527510;2021-12-07@05:18:17
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;934304;244660;978640;2331;532.427188477;2021-12-07@05:27:11
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;931900;244106;976424;2330;532.685504183;2021-12-07@05:36:06
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;933356;244429;977716;2394;547.319692755;2021-12-07@05:45:15
+v2.0.8-163-ge813cd67;imex;316;31623;;61364;24592;936964;245256;981024;2406;550.548794255;2021-12-07@05:54:27
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36176;10588;42352;2521;579.773663369;2021-12-07@06:07:43
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36132;10623;42492;2531;581.015621061;2021-12-07@06:17:26
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36304;10607;42428;2965;681.686200617;2021-12-07@06:28:49
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36136;10581;42324;2474;567.921765651;2021-12-07@06:38:19
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36072;10599;42396;2499;574.871336843;2021-12-07@06:47:56
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36136;10570;42280;2496;572.756761287;2021-12-07@06:57:31
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36184;10618;42472;2534;582.963105866;2021-12-07@07:07:15
+v2.0.8-163-ge813cd67;single;316;31623;;61364;24592;36368;10586;42344;2635;605.514667353;2021-12-07@07:17:23
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2440152;2704646;10818584;514;118.361277565;2021-12-07@07:22:53
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2440672;2704599;10818396;525;121.075359678;2021-12-07@07:24:56
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2438684;2703467;10813868;507;116.389648303;2021-12-07@07:26:55
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2438696;2703819;10815276;526;120.279403573;2021-12-07@07:28:58
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2436868;2704424;10817696;529;121.009792457;2021-12-07@07:31:02
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2434668;2703865;10815460;538;123.069886967;2021-12-07@07:33:08
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2442272;2704834;10819336;526;120.496355730;2021-12-07@07:35:11
+v2.0.8-163-ge813cd67;mulimex;316;31623;;61364;24592;2453404;2707315;10829260;530;121.430644180;2021-12-07@07:37:15
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115296;208015;832060;35;7.964320633;2021-12-07@07:39:04
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115392;208046;832184;40;9.061927972;2021-12-07@07:39:15
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115584;208101;832404;39;8.861481273;2021-12-07@07:39:25
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115808;208032;832128;40;9.087204592;2021-12-07@07:39:37
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;114916;207983;831932;39;8.854858360;2021-12-07@07:39:47
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115424;208018;832072;37;8.382687618;2021-12-07@07:39:58
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115200;208007;832028;39;8.853871091;2021-12-07@07:40:09
+v2.0.8-163-ge813cd67;multi;10;56234;;89496;27046;115720;208002;832008;39;8.843495349;2021-12-07@07:40:20
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88528;24052;96208;105;23.752201886;2021-12-07@07:40:54
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88760;24119;96476;103;23.401243122;2021-12-07@07:41:19
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88500;24097;96388;107;24.256920240;2021-12-07@07:41:46
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88764;24076;96304;107;24.270016785;2021-12-07@07:42:12
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88716;24084;96336;110;24.958964455;2021-12-07@07:42:39
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88480;24077;96308;107;24.241826574;2021-12-07@07:43:05
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88784;24091;96364;108;24.480520406;2021-12-07@07:43:31
+v2.0.8-163-ge813cd67;imex;10;56234;;89496;27046;88632;24079;96316;101;22.900378385;2021-12-07@07:43:56
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;26988;8345;33380;100;22.622742114;2021-12-07@07:44:31
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;26904;8347;33388;106;23.991849353;2021-12-07@07:44:56
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;27128;8372;33488;104;23.537595240;2021-12-07@07:45:22
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;27180;8370;33480;102;23.085544094;2021-12-07@07:45:47
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;27188;8338;33352;105;23.766262802;2021-12-07@07:46:13
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;26888;8316;33264;99;22.415114825;2021-12-07@07:46:37
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;27184;8353;33412;104;23.534318273;2021-12-07@07:47:03
+v2.0.8-163-ge813cd67;single;10;56234;;89496;27046;27276;8349;33396;101;22.862244797;2021-12-07@07:47:28
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;159200;219579;878316;35;7.880039793;2021-12-07@07:47:47
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;158340;219577;878308;39;8.847610285;2021-12-07@07:47:58
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;159336;219258;877032;39;8.847539392;2021-12-07@07:48:09
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;158620;219218;876872;39;8.842679114;2021-12-07@07:48:19
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;158760;219148;876592;39;8.850127546;2021-12-07@07:48:30
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;159036;219249;876996;39;8.859018830;2021-12-07@07:48:41
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;158632;219554;878216;40;9.080298570;2021-12-07@07:48:52
+v2.0.8-163-ge813cd67;mulimex;10;56234;;89496;27046;159272;219188;876752;40;9.066372626;2021-12-07@07:49:03
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;180020;355792;1423168;45;10.252088614;2021-12-07@07:49:27
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;179936;355063;1420252;50;11.404137946;2021-12-07@07:49:41
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;179824;355089;1420356;50;11.401650838;2021-12-07@07:49:55
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;179456;355171;1420684;50;11.398196284;2021-12-07@07:50:08
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;180000;355172;1420688;50;11.412623440;2021-12-07@07:50:22
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;180060;355055;1420220;52;11.851081639;2021-12-07@07:50:36
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;179836;355133;1420532;50;11.389664351;2021-12-07@07:50:49
+v2.0.8-163-ge813cd67;multi;18;56234;;97395;27048;179984;355132;1420528;50;11.394968365;2021-12-07@07:51:02
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118140;31722;126888;171;38.854328830;2021-12-07@07:51:55
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118220;31706;126824;179;40.659294292;2021-12-07@07:52:38
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118380;31713;126852;174;39.493578984;2021-12-07@07:53:19
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118156;31700;126800;160;36.332082074;2021-12-07@07:53:58
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118272;31718;126872;169;38.345543683;2021-12-07@07:54:39
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118144;31699;126796;199;45.193881902;2021-12-07@07:55:26
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118020;31693;126772;174;39.485973693;2021-12-07@07:56:07
+v2.0.8-163-ge813cd67;imex;18;56234;;97395;27048;118172;31714;126856;168;38.135301926;2021-12-07@07:56:47
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29640;9005;36020;170;38.655581121;2021-12-07@07:57:39
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29516;9008;36032;167;37.870671823;2021-12-07@07:58:19
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29532;9039;36156;171;38.780162600;2021-12-07@07:59:00
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29860;9012;36048;164;37.199583477;2021-12-07@07:59:39
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29868;8998;35992;166;37.707089883;2021-12-07@08:00:19
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29808;9031;36124;175;39.737176961;2021-12-07@08:01:01
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29848;9013;36052;169;38.326010963;2021-12-07@08:01:42
+v2.0.8-163-ge813cd67;single;18;56234;;97395;27048;29672;9030;36120;172;39.010369791;2021-12-07@08:02:23
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248892;372880;1491520;51;11.584644703;2021-12-07@08:02:49
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248688;372802;1491208;53;12.101671580;2021-12-07@08:03:03
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248012;372784;1491136;53;12.091223498;2021-12-07@08:03:17
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248136;372837;1491348;53;12.074483306;2021-12-07@08:03:31
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248840;372806;1491224;54;12.316975303;2021-12-07@08:03:45
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248908;372818;1491272;53;12.092308627;2021-12-07@08:03:59
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;247540;372767;1491068;54;12.316622179;2021-12-07@08:04:14
+v2.0.8-163-ge813cd67;mulimex;18;56234;;97395;27048;248624;372819;1491276;53;12.088563447;2021-12-07@08:04:28
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;288504;611952;2447808;76;17.420087629;2021-12-07@08:05:04
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;289068;611974;2447896;82;18.784716667;2021-12-07@08:05:26
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;288008;611915;2447660;82;18.757279283;2021-12-07@08:05:47
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;290032;612135;2448540;82;18.765192718;2021-12-07@08:06:07
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;289108;611925;2447700;83;19.006998407;2021-12-07@08:06:28
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;289168;612061;2448244;82;18.743200002;2021-12-07@08:06:49
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;289596;613163;2452652;82;18.786777734;2021-12-07@08:07:10
+v2.0.8-163-ge813cd67;multi;32;56234;;102105;27070;289352;611957;2447828;82;18.748140821;2021-12-07@08:07:31
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165428;60299;241196;298;67.814870127;2021-12-07@08:09:03
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165268;43900;175600;288;65.519232477;2021-12-07@08:10:10
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165328;43940;175760;285;64.825333771;2021-12-07@08:11:17
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165452;43944;175776;288;65.533378214;2021-12-07@08:12:24
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165556;43928;175712;281;63.928891601;2021-12-07@08:13:30
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165512;43906;175624;293;66.626425942;2021-12-07@08:14:39
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165300;43910;175640;292;66.444412953;2021-12-07@08:15:47
+v2.0.8-163-ge813cd67;imex;32;56234;;102105;27070;165232;43895;175580;279;63.615950535;2021-12-07@08:16:53
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32284;9704;38816;309;70.313180065;2021-12-07@08:18:25
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32480;9695;38780;286;65.090268007;2021-12-07@08:19:31
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32448;9709;38836;289;65.764155421;2021-12-07@08:20:39
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32572;9717;38868;298;67.857454848;2021-12-07@08:21:49
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32424;9707;38828;291;66.291291684;2021-12-07@08:22:57
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32332;9710;38840;290;65.987048128;2021-12-07@08:24:05
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32376;9711;38844;296;67.354610963;2021-12-07@08:25:14
+v2.0.8-162-ge38c4f44;single;32;56234;;102105;27070;32468;9705;38820;292;66.471219031;2021-12-07@08:26:23
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;399988;640722;2562888;80;18.315275334;2021-12-07@08:27:05
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;401032;640741;2562964;86;19.745304123;2021-12-07@08:27:27
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;400200;640797;2563188;86;19.709803601;2021-12-07@08:27:49
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;400900;640769;2563076;86;19.712992622;2021-12-07@08:28:10
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;401784;641902;2567608;86;19.730745754;2021-12-07@08:28:32
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;400576;640761;2563044;86;19.710070855;2021-12-07@08:28:53
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;400468;641860;2567440;86;19.725508931;2021-12-07@08:29:15
+v2.0.8-162-ge38c4f44;mulimex;32;56234;;102105;27070;400156;640855;2563420;86;19.685491649;2021-12-07@08:29:36
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;472304;1051438;4205752;128;29.336743114;2021-12-07@08:30:38
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;473268;1051443;4205772;138;31.614622262;2021-12-07@08:31:11
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;472792;1051883;4207532;138;31.621249639;2021-12-07@08:31:45
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;473360;1051686;4206744;138;31.650159319;2021-12-07@08:32:18
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;473688;1051629;4206516;140;32.054780508;2021-12-07@08:32:52
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;472152;1051817;4207268;138;31.622437078;2021-12-07@08:33:26
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;475672;1052130;4208520;138;31.608018473;2021-12-07@08:34:00
+v2.0.8-162-ge38c4f44;multi;56;56234;;104619;27074;472132;1053356;4213424;139;31.900961027;2021-12-07@08:34:34
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241460;63734;254936;517;118.660453291;2021-12-07@08:37:12
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241788;63721;254884;506;116.235448544;2021-12-07@08:39:10
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241892;63776;255104;506;116.242797190;2021-12-07@08:41:08
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241796;63694;254776;533;122.374036110;2021-12-07@08:43:13
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241788;63730;254920;514;118.073074039;2021-12-07@08:45:13
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241920;63719;254876;562;129.107215328;2021-12-07@08:47:24
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241844;63742;254968;511;117.165818186;2021-12-07@08:49:23
+v2.0.8-162-ge38c4f44;imex;56;56234;;104619;27074;241660;63742;254968;520;119.408303814;2021-12-07@08:51:25
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35340;10420;41680;536;123.008833467;2021-12-07@08:54:05
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35388;10398;41592;506;116.171004341;2021-12-07@08:56:03
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35412;10415;41660;513;117.736765623;2021-12-07@08:58:03
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35020;10396;41584;510;117.098314999;2021-12-07@09:00:02
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35344;10414;41656;508;116.602622562;2021-12-07@09:02:01
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35256;10407;41628;504;115.710585524;2021-12-07@09:03:59
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35440;10387;41548;515;118.263812415;2021-12-07@09:05:58
+v2.0.8-162-ge38c4f44;single;56;56234;;104619;27074;35212;10398;41592;510;117.028292461;2021-12-07@09:07:57
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;655972;1098948;4395792;142;32.684225987;2021-12-07@09:09:09
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;655612;1098977;4395908;146;33.577192836;2021-12-07@09:09:44
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;653968;1099129;4396516;147;33.828639319;2021-12-07@09:10:20
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;655868;1099055;4396220;146;33.566925798;2021-12-07@09:10:55
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;656528;1099089;4396356;149;34.258436479;2021-12-07@09:11:31
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;656372;1098978;4395912;148;34.008267792;2021-12-07@09:12:07
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;656588;1099016;4396064;147;33.823526772;2021-12-07@09:12:42
+v2.0.8-162-ge38c4f44;mulimex;56;56234;;104619;27074;656684;1098952;4395808;149;34.287582292;2021-12-07@09:13:18
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;811812;1857150;7428600;239;54.898294672;2021-12-07@09:15:05
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;811388;1857159;7428636;254;58.536591543;2021-12-07@09:16:06
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;815456;1858215;7432860;260;59.849598349;2021-12-07@09:17:07
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;815236;1858048;7432192;252;57.905388552;2021-12-07@09:18:06
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;813824;1858011;7432044;256;58.755406119;2021-12-07@09:19:07
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;816012;1858205;7432820;255;58.591220082;2021-12-07@09:20:07
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;815116;1858126;7432504;247;56.701459625;2021-12-07@09:21:05
+v2.0.8-162-ge38c4f44;multi;100;56234;;106396;27105;815352;1858086;7432344;255;58.561547021;2021-12-07@09:22:06
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380556;99721;398884;961;220.884274678;2021-12-07@09:26:53
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380972;99845;399380;945;217.191170823;2021-12-07@09:30:33
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380196;99712;398848;959;220.711569329;2021-12-07@09:34:16
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380916;99833;399332;926;213.098811443;2021-12-07@09:37:50
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380296;99674;398696;878;202.018146974;2021-12-07@09:41:15
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380496;99755;399020;883;203.084252840;2021-12-07@09:44:40
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380480;99710;398840;885;203.519919601;2021-12-07@09:48:05
+v2.0.8-162-ge38c4f44;imex;100;56234;;106396;27105;380476;99770;399080;884;203.587421629;2021-12-07@09:51:31
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39076;11373;45492;953;220.067987661;2021-12-07@09:56:16
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39044;11381;45524;934;216.386786625;2021-12-07@09:59:55
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39272;11404;45616;988;228.136814978;2021-12-07@10:03:45
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39180;11403;45612;936;216.213162155;2021-12-07@10:07:24
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39288;11402;45608;973;225.237349413;2021-12-07@10:11:11
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39356;11382;45528;1099;254.545626069;2021-12-07@10:15:28
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39172;11398;45592;987;228.431737878;2021-12-07@10:19:18
+v2.0.8-162-ge38c4f44;single;100;56234;;106396;27105;39092;11382;45528;1012;234.441023614;2021-12-07@10:23:15
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1126108;1939306;7757224;263;60.607039104;2021-12-07@10:25:20
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1125028;1939386;7757544;271;62.383007883;2021-12-07@10:26:24
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1127300;1939684;7758736;270;62.210629062;2021-12-07@10:27:29
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1126772;1939524;7758096;269;61.916333402;2021-12-07@10:28:33
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1126724;1939454;7757816;273;62.782615139;2021-12-07@10:29:38
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1126352;1939422;7757688;269;62.016610175;2021-12-07@10:30:43
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1127524;1939638;7758552;270;62.140153398;2021-12-07@10:31:47
+v2.0.8-162-ge38c4f44;mulimex;100;56234;;106396;27105;1125708;1939467;7757868;271;62.329646487;2021-12-07@10:32:52
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1412368;2434437;9737748;452;105.074120590;2021-12-07@10:36:13
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1415832;2435204;9740816;467;108.303104105;2021-12-07@10:38:03
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1408988;2433879;9735516;463;107.237797066;2021-12-07@10:39:53
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1407728;2433286;9733144;464;107.756021722;2021-12-07@10:41:43
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1415320;2435237;9740948;462;106.905256557;2021-12-07@10:43:32
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1415976;2435191;9740764;451;104.395056517;2021-12-07@10:45:18
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1411576;2434361;9737444;469;108.176752682;2021-12-07@10:47:09
+v2.0.8-162-ge38c4f44;multi;178;56234;;107469;27173;1410640;2433821;9735284;448;103.802910023;2021-12-07@10:48:55
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;626100;163488;653952;1741;401.900251645;2021-12-07@10:57:30
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;627192;163714;654856;1668;386.070966366;2021-12-07@11:03:59
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;626188;163543;654172;1717;396.937292355;2021-12-07@11:10:37
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;627636;163849;655396;1680;388.250700679;2021-12-07@11:17:07
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;626516;163584;654336;1732;400.114119250;2021-12-07@11:23:50
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;624596;163102;652408;1657;382.726705351;2021-12-07@11:30:14
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;625544;163339;653356;1691;390.508581231;2021-12-07@11:36:46
+v2.0.8-162-ge38c4f44;imex;178;56234;;107469;27173;625824;163424;653696;1764;406.973139329;2021-12-07@11:43:35
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;44764;12815;51260;1841;425.529791376;2021-12-07@11:52:32
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;45216;12848;51392;1623;375.002273344;2021-12-07@11:58:48
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;45104;12831;51324;1764;408.716158792;2021-12-07@12:05:39
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;45132;12832;51328;1731;400.106162572;2021-12-07@12:12:20
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;44740;12809;51236;1703;393.154512921;2021-12-07@12:18:55
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;44968;12843;51372;1622;374.993661126;2021-12-07@12:25:12
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;44808;12812;51248;1679;387.739081506;2021-12-07@12:31:41
+v2.0.8-162-ge38c4f44;single;178;56234;;107469;27173;45140;12834;51336;1608;372.600897973;2021-12-07@12:37:55
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1958068;2577134;10308536;464;107.705177588;2021-12-07@12:41:37
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1966572;2578759;10315036;468;107.885290589;2021-12-07@12:43:41
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1962524;2578133;10312532;462;107.137076114;2021-12-07@12:45:45
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1962600;2578118;10312472;462;107.717835010;2021-12-07@12:47:49
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1964796;2578613;10314452;471;108.260140050;2021-12-07@12:49:54
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1963108;2578321;10313284;468;108.541680736;2021-12-07@12:51:59
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1967808;2578469;10313876;468;108.124198194;2021-12-07@12:54:04
+v2.0.8-163-g542f2455;mulimex;178;56234;;107469;27173;1960704;2577558;10310232;461;107.053603216;2021-12-07@12:56:08
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2467048;2700998;10803992;797;186.242743507;2021-12-07@13:02:31
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2470612;2702008;10808032;807;188.098883875;2021-12-07@13:05:41
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2472368;2702141;10808564;805;187.476945648;2021-12-07@13:08:53
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2470252;2701710;10806840;870;199.900663013;2021-12-07@13:12:25
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2460868;2700067;10800268;1481;352.265841873;2021-12-07@13:22:30
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2477616;2703931;10815724;865;197.814149617;2021-12-07@13:25:50
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2474776;2703214;10812856;854;196.335411369;2021-12-07@13:29:10
+v2.0.8-163-g542f2455;multi;316;56234;;108134;27288;2477244;2703571;10814284;854;196.148596118;2021-12-07@13:32:30
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1061240;276415;1105660;2920;675.382400523;2021-12-07@13:46:56
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1062464;276715;1106860;2961;687.321316322;2021-12-07@13:58:40
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1059872;276093;1104372;2953;683.802078276;2021-12-07@14:10:21
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1060332;276189;1104756;2977;692.262919920;2021-12-07@14:21:55
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1059680;275992;1103968;2775;644.806413846;2021-12-07@14:32:41
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1063264;276848;1107392;2850;663.890224686;2021-12-07@14:43:47
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1062584;276719;1106876;2987;700.474717231;2021-12-07@14:55:29
+v2.0.8-163-g542f2455;imex;316;56234;;108134;27288;1059304;275920;1103680;3107;721.580970601;2021-12-07@15:07:32
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53612;14987;59948;3183;738.604693202;2021-12-07@15:22:59
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53816;15048;60192;3110;722.117562203;2021-12-07@15:35:03
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53888;15090;60360;3088;715.782867904;2021-12-07@15:47:01
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53684;14999;59996;3182;739.619192441;2021-12-07@15:59:22
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;52940;14884;59536;3155;732.560875442;2021-12-07@16:11:36
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53484;14970;59880;3177;734.713577511;2021-12-07@16:23:53
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53624;14993;59972;3197;742.265836951;2021-12-07@16:36:17
+v2.0.8-164-gf9e098c9;single;316;56234;;108134;27288;53708;14985;59940;3121;724.805608268;2021-12-07@16:48:24
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3441604;2954812;11819248;842;196.066017728;2021-12-07@16:55:02
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3455192;2958203;11832812;858;198.019355689;2021-12-07@16:58:23
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3449340;2955449;11821796;848;198.250545793;2021-12-07@17:01:44
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3441232;2954377;11817508;851;198.632521435;2021-12-07@17:05:05
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3436228;2953826;11815304;843;196.740888733;2021-12-07@17:08:24
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3441636;2954579;11818316;858;198.089961540;2021-12-07@17:11:45
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3455548;2957054;11828216;882;202.311464004;2021-12-07@17:15:10
+v2.0.8-164-gf9e098c9;mulimex;316;56234;;108134;27288;3441240;2954245;11816980;854;197.640247363;2021-12-07@17:18:31
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170308;220940;883760;43;10.211327539;2021-12-07@17:20:05
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170292;220949;883796;48;11.308742392;2021-12-07@17:20:18
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170792;220967;883868;49;11.507060210;2021-12-07@17:20:32
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170224;220977;883908;48;11.295528774;2021-12-07@17:20:45
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170200;220955;883820;48;11.298329429;2021-12-07@17:20:59
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170944;220957;883828;49;11.578842286;2021-12-07@17:21:12
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170532;220930;883720;49;11.571323611;2021-12-07@17:21:26
+v2.0.8-164-gf9e098c9;multi;10;100000;;126751;52385;170440;221038;884152;48;11.306314950;2021-12-07@17:21:40
+v2.0.8;multi;10;10000;;12925;6245;25444;7867;31468;34;7.380314168;2021-12-07@17:23:59
+v2.0.8;multi;10;10000;;12925;6245;25580;7913;31652;36;7.824798988;2021-12-07@17:24:09
+v2.0.8;multi;10;10000;;12925;6245;25632;7929;31716;37;8.046475550;2021-12-07@17:24:19
+v2.0.8;multi;10;10000;;12925;6245;25648;7940;31760;36;7.832148685;2021-12-07@17:24:30
+v2.0.8;multi;10;10000;;12925;6245;25468;7925;31700;36;7.822049309;2021-12-07@17:24:39
+v2.0.8;multi;10;10000;;12925;6245;25604;7916;31664;36;7.827260141;2021-12-07@17:24:49
+v2.0.8;multi;10;10000;;12925;6245;25480;7923;31692;37;8.038343117;2021-12-07@17:24:59
+v2.0.8;multi;10;10000;;12925;6245;25524;7921;31684;36;7.826981949;2021-12-07@17:25:09
+v2.0.8;imex;10;10000;;12925;6245;21536;6929;27716;26;5.636593475;2021-12-07@17:25:24
+v2.0.8;imex;10;10000;;12925;6245;21332;6929;27716;28;6.082880960;2021-12-07@17:25:32
+v2.0.8;imex;10;10000;;12925;6245;21516;6949;27796;28;6.087306502;2021-12-07@17:25:40
+v2.0.8;imex;10;10000;;12925;6245;21476;6948;27792;27;5.862203072;2021-12-07@17:25:48
+v2.0.8;imex;10;10000;;12925;6245;21844;6948;27792;28;6.077918495;2021-12-07@17:25:56
+v2.0.8;imex;10;10000;;12925;6245;21688;6929;27716;28;6.075490031;2021-12-07@17:26:04
+v2.0.8;imex;10;10000;;12925;6245;21416;6948;27792;28;6.079226967;2021-12-07@17:26:12
+v2.0.8;imex;10;10000;;12925;6245;21528;6942;27768;27;5.861203295;2021-12-07@17:26:20
+v2.0.8;single;10;10000;;12925;6245;;8332;3571;14284;27;5.834713449;2021-12-07@17:26:35
+v2.0.8;single;10;10000;;12925;6245;;8268;3602;14408;28;6.076678459;2021-12-07@17:26:43
+v2.0.8;single;10;10000;;12925;6245;;8280;3606;14424;29;6.295831071;2021-12-07@17:26:51
+v2.0.8;single;10;10000;;12925;6245;;8248;3610;14440;28;6.078340521;2021-12-07@17:26:59
+v2.0.8;single;10;10000;;12925;6245;;8488;3603;14412;29;6.298977355;2021-12-07@17:27:07
+v2.0.8;single;10;10000;;12925;6245;;8608;3627;14508;28;6.077737605;2021-12-07@17:27:15
+v2.0.8;single;10;10000;;12925;6245;;8172;3616;14464;28;6.082737448;2021-12-07@17:27:24
+v2.0.8;single;10;10000;;12925;6245;;8080;3611;14444;28;6.076552437;2021-12-07@17:27:32
+v2.0.8;mulimex;10;10000;;12925;6245;34896;10274;41096;34;7.375614892;2021-12-07@17:27:48
+v2.0.8;mulimex;10;10000;;12925;6245;35116;10319;41276;36;7.823989090;2021-12-07@17:27:58
+v2.0.8;mulimex;10;10000;;12925;6245;34828;10280;41120;36;7.824985758;2021-12-07@17:28:07
+v2.0.8;mulimex;10;10000;;12925;6245;35012;10264;41056;36;7.826464961;2021-12-07@17:28:17
+v2.0.8;mulimex;10;10000;;12925;6245;35172;10318;41272;37;8.047223876;2021-12-07@17:28:27
+v2.0.8;mulimex;10;10000;;12925;6245;34900;10281;41124;36;7.827521230;2021-12-07@17:28:38
+v2.0.8;mulimex;10;10000;;12925;6245;35060;10311;41244;36;7.829890366;2021-12-07@17:28:48
+v2.0.8;mulimex;10;10000;;12925;6245;34824;10284;41136;37;8.047637860;2021-12-07@17:28:58
+v2.0.8;multi;18;10000;;15314;6305;40776;11686;46744;62;13.504565080;2021-12-07@17:29:23
+v2.0.8;multi;18;10000;;15314;6305;40652;11669;46676;68;14.824318024;2021-12-07@17:29:40
+v2.0.8;multi;18;10000;;15314;6305;40536;11675;46700;69;15.039503816;2021-12-07@17:29:57
+v2.0.8;multi;18;10000;;15314;6305;40684;11651;46604;69;15.031619656;2021-12-07@17:30:14
+v2.0.8;multi;18;10000;;15314;6305;40720;11666;46664;68;14.813683180;2021-12-07@17:30:31
+v2.0.8;multi;18;10000;;15314;6305;40604;11669;46676;68;14.819970770;2021-12-07@17:30:48
+v2.0.8;multi;18;10000;;15314;6305;40572;11705;46820;68;14.827298019;2021-12-07@17:31:05
+v2.0.8;multi;18;10000;;15314;6305;40792;11671;46684;68;14.818596799;2021-12-07@17:31:21
+v2.0.8;imex;18;10000;;15314;6305;30360;9066;36264;41;8.899544407;2021-12-07@17:31:44
+v2.0.8;imex;18;10000;;15314;6305;29852;9072;36288;46;10.014288271;2021-12-07@17:31:56
+v2.0.8;imex;18;10000;;15314;6305;29916;9050;36200;45;9.795407102;2021-12-07@17:32:08
+v2.0.8;imex;18;10000;;15314;6305;29844;9045;36180;53;11.542368727;2021-12-07@17:32:22
+v2.0.8;imex;18;10000;;15314;6305;29852;9064;36256;44;9.577087526;2021-12-07@17:32:33
+v2.0.8;imex;18;10000;;15314;6305;29820;9076;36304;45;9.798265252;2021-12-07@17:32:45
+v2.0.8;imex;18;10000;;15314;6305;30148;9060;36240;44;9.575457314;2021-12-07@17:32:57
+v2.0.8;imex;18;10000;;15314;6305;30036;9066;36264;44;9.586265262;2021-12-07@17:33:08
+v2.0.8;single;18;10000;;15314;6305;;9212;3896;15584;45;9.787583814;2021-12-07@17:33:31
+v2.0.8;single;18;10000;;15314;6305;;9520;3946;15784;45;9.805247929;2021-12-07@17:33:43
+v2.0.8;single;18;10000;;15314;6305;;9568;3949;15796;45;9.798459050;2021-12-07@17:33:55
+v2.0.8;single;18;10000;;15314;6305;;9532;3955;15820;45;9.796275112;2021-12-07@17:34:06
+v2.0.8;single;18;10000;;15314;6305;;9588;3952;15808;45;9.796876411;2021-12-07@17:34:18
+v2.0.8;single;18;10000;;15314;6305;;9580;3929;15716;47;10.237484116;2021-12-07@17:34:30
+v2.0.8;single;18;10000;;15314;6305;;9796;3949;15796;46;10.021432268;2021-12-07@17:34:42
+v2.0.8;single;18;10000;;15314;6305;;9576;3965;15860;47;10.236391708;2021-12-07@17:34:55
+v2.0.8;mulimex;18;10000;;15314;6305;56628;15661;62644;62;13.504603988;2021-12-07@17:35:22
+v2.0.8;mulimex;18;10000;;15314;6305;56464;15687;62748;69;15.044574303;2021-12-07@17:35:38
+v2.0.8;mulimex;18;10000;;15314;6305;56692;15704;62816;69;15.045876645;2021-12-07@17:35:55
+v2.0.8;mulimex;18;10000;;15314;6305;56540;15693;62772;68;14.828177143;2021-12-07@17:36:12
+v2.0.8;mulimex;18;10000;;15314;6305;56720;15711;62844;69;15.049092830;2021-12-07@17:36:29
+v2.0.8;mulimex;18;10000;;15314;6305;56704;15682;62728;68;14.829925213;2021-12-07@17:36:46
+v2.0.8;mulimex;18;10000;;15314;6305;56632;15685;62740;69;15.041653552;2021-12-07@17:37:03
+v2.0.8;mulimex;18;10000;;15314;6305;56640;15690;62760;69;15.043299739;2021-12-07@17:37:20
+v2.0.8;multi;32;10000;;16892;6334;65688;18025;72100;120;26.180747823;2021-12-07@17:38:04
+v2.0.8;multi;32;10000;;16892;6334;65708;18023;72092;126;27.504178252;2021-12-07@17:38:33
+v2.0.8;multi;32;10000;;16892;6334;66120;18032;72128;127;27.724581477;2021-12-07@17:39:03
+v2.0.8;multi;32;10000;;16892;6334;65772;18016;72064;128;27.945166100;2021-12-07@17:39:33
+v2.0.8;multi;32;10000;;16892;6334;65960;18025;72100;127;27.691722123;2021-12-07@17:40:02
+v2.0.8;multi;32;10000;;16892;6334;65896;18022;72088;127;27.724702119;2021-12-07@17:40:32
+v2.0.8;multi;32;10000;;16892;6334;65876;18020;72080;127;27.721962977;2021-12-07@17:41:02
+v2.0.8;multi;32;10000;;16892;6334;65960;17997;71988;132;28.798228462;2021-12-07@17:41:32
+v2.0.8;imex;32;10000;;16892;6334;42900;12250;49000;71;15.460228949;2021-12-07@17:42:10
+v2.0.8;imex;32;10000;;16892;6334;42992;12277;49108;75;16.343240470;2021-12-07@17:42:28
+v2.0.8;imex;32;10000;;16892;6334;42632;12259;49036;73;15.915448156;2021-12-07@17:42:45
+v2.0.8;imex;32;10000;;16892;6334;42736;12264;49056;79;17.229714688;2021-12-07@17:43:05
+v2.0.8;imex;32;10000;;16892;6334;42892;12289;49156;74;16.132911122;2021-12-07@17:43:23
+v2.0.8;imex;32;10000;;16892;6334;42924;12270;49080;74;16.146408568;2021-12-07@17:43:41
+v2.0.8;imex;32;10000;;16892;6334;42740;12269;49076;73;15.900375136;2021-12-07@17:43:59
+v2.0.8;imex;32;10000;;16892;6334;42796;12260;49040;77;16.775149691;2021-12-07@17:44:18
+v2.0.8;single;32;10000;;16892;6334;10964;4276;17104;74;16.109957913;2021-12-07@17:44:56
+v2.0.8;single;32;10000;;16892;6334;11056;4247;16988;80;17.443506335;2021-12-07@17:45:15
+v2.0.8;single;32;10000;;16892;6334;10828;4272;17088;78;17.011778950;2021-12-07@17:45:35
+v2.0.8;single;32;10000;;16892;6334;10776;4262;17048;75;16.352763608;2021-12-07@17:45:53
+v2.0.8;single;32;10000;;16892;6334;10912;4264;17056;75;16.360266090;2021-12-07@17:46:11
+v2.0.8;single;32;10000;;16892;6334;11036;4268;17072;76;16.572461117;2021-12-07@17:46:30
+v2.0.8;single;32;10000;;16892;6334;10916;4253;17012;76;16.576309170;2021-12-07@17:46:49
+v2.0.8;single;32;10000;;16892;6334;10956;4292;17168;76;16.567794493;2021-12-07@17:47:08
+v2.0.8;mulimex;32;10000;;16892;6334;92792;24750;99000;122;26.624865322;2021-12-07@17:47:56
+v2.0.8;mulimex;32;10000;;16892;6334;92832;24742;98968;127;27.752408830;2021-12-07@17:48:26
+v2.0.8;mulimex;32;10000;;16892;6334;92836;24742;98968;127;27.669849538;2021-12-07@17:48:56
+v2.0.8;mulimex;32;10000;;16892;6334;92840;24769;99076;127;27.736230391;2021-12-07@17:49:26
+v2.0.8;mulimex;32;10000;;16892;6334;93364;24845;99380;127;27.730842065;2021-12-07@17:49:55
+v2.0.8;mulimex;32;10000;;16892;6334;92756;24745;98980;126;27.500146233;2021-12-07@17:50:25
+v2.0.8;mulimex;32;10000;;16892;6334;92752;24725;98900;127;27.748070578;2021-12-07@17:50:55
+v2.0.8;mulimex;32;10000;;16892;6334;92896;24759;99036;127;27.751678200;2021-12-07@17:51:24
+v2.0.8;multi;56;10000;;17919;6345;108424;28620;114480;222;48.428642973;2021-12-07@17:52:43
+v2.0.8;multi;56;10000;;17919;6345;115212;30384;121536;230;50.093778564;2021-12-07@17:53:35
+v2.0.8;multi;56;10000;;17919;6345;116512;30660;122640;229;49.944954914;2021-12-07@17:54:26
+v2.0.8;multi;56;10000;;17919;6345;118292;31090;124360;230;50.010190612;2021-12-07@17:55:20
+v2.0.8;multi;56;10000;;17919;6345;115404;30413;121652;229;50.077709971;2021-12-07@17:56:13
+v2.0.8;multi;56;10000;;17919;6345;122112;32020;128080;231;50.186404896;2021-12-07@17:57:05
+v2.0.8;multi;56;10000;;17919;6345;111028;29302;117208;229;49.958732992;2021-12-07@17:57:57
+v2.0.8;multi;56;10000;;17919;6345;116172;30616;122464;230;50.011137354;2021-12-07@17:58:49
+v2.0.8;imex;56;10000;;17919;6345;63352;17388;69552;123;26.857051411;2021-12-07@17:59:53
+v2.0.8;imex;56;10000;;17919;6345;63264;17387;69548;125;27.310443534;2021-12-07@18:00:22
+v2.0.8;imex;56;10000;;17919;6345;63308;17368;69472;124;27.085014487;2021-12-07@18:00:52
+v2.0.8;imex;56;10000;;17919;6345;63232;17376;69504;124;27.078020642;2021-12-07@18:01:20
+v2.0.8;imex;56;10000;;17919;6345;63080;17351;69404;124;27.093878431;2021-12-07@18:01:50
+v2.0.8;imex;56;10000;;17919;6345;63208;17360;69440;123;26.864556296;2021-12-07@18:02:19
+v2.0.8;imex;56;10000;;17919;6345;63272;17378;69512;124;27.080865302;2021-12-07@18:02:48
+v2.0.8;imex;56;10000;;17919;6345;63292;17401;69604;127;27.746670444;2021-12-07@18:03:17
+v2.0.8;single;56;10000;;17919;6345;12728;4720;18880;127;27.688249077;2021-12-07@18:04:23
+v2.0.8;single;56;10000;;17919;6345;12528;4671;18684;129;28.168592390;2021-12-07@18:04:53
+v2.0.8;single;56;10000;;17919;6345;12460;4667;18668;132;28.816726827;2021-12-07@18:05:24
+v2.0.8;single;56;10000;;17919;6345;13100;4730;18920;131;28.612050555;2021-12-07@18:05:55
+v2.0.8;single;56;10000;;17919;6345;12676;4734;18936;129;28.179133677;2021-12-07@18:06:25
+v2.0.8;single;56;10000;;17919;6345;12628;4677;18708;131;28.600839303;2021-12-07@18:06:56
+v2.0.8;single;56;10000;;17919;6345;12860;4724;18896;130;28.390482520;2021-12-07@18:07:27
+v2.0.8;single;56;10000;;17919;6345;12608;4682;18728;130;28.383924062;2021-12-07@18:07:58
+v2.0.8;mulimex;56;10000;;17919;6345;153720;39990;159960;222;48.558125010;2021-12-07@18:09:24
+v2.0.8;mulimex;56;10000;;17919;6345;173452;44911;179644;229;49.819159265;2021-12-07@18:10:17
+v2.0.8;mulimex;56;10000;;17919;6345;161572;41947;167788;229;50.037428440;2021-12-07@18:11:09
+v2.0.8;mulimex;56;10000;;17919;6345;162396;42118;168472;228;50.001794469;2021-12-07@18:12:01
+v2.0.8;mulimex;56;10000;;17919;6345;164284;42560;170240;229;49.904116030;2021-12-07@18:12:53
+v2.0.8;mulimex;56;10000;;17919;6345;165128;42803;171212;230;50.055860076;2021-12-07@18:13:45
+v2.0.8;mulimex;56;10000;;17919;6345;162508;42198;168792;229;49.858875896;2021-12-07@18:14:37
+v2.0.8;mulimex;56;10000;;17919;6345;163648;42476;169904;229;49.865987762;2021-12-07@18:15:29
+v2.0.8;multi;100;10000;;18563;6381;185588;47943;191772;407;89.336977668;2021-12-07@18:17:51
+v2.0.8;multi;100;10000;;18563;6381;185588;47911;191644;413;90.664938942;2021-12-07@18:19:24
+v2.0.8;multi;100;10000;;18563;6381;185424;47920;191680;408;89.688455243;2021-12-07@18:21:10
+v2.0.8;multi;100;10000;;18563;6381;185604;47932;191728;412;90.489482553;2021-12-07@18:22:44
+v2.0.8;multi;100;10000;;18563;6381;185740;47923;191692;412;90.682941706;2021-12-07@18:24:17
+v2.0.8;multi;100;10000;;18563;6381;185560;47922;191688;412;90.483333839;2021-12-07@18:25:50
+v2.0.8;multi;100;10000;;18563;6381;185712;47937;191748;413;90.720244470;2021-12-07@18:27:23
+v2.0.8;multi;100;10000;;18563;6381;185464;47917;191668;413;90.673136813;2021-12-07@18:28:56
+v2.0.8;imex;100;10000;;18563;6381;98996;26295;105180;228;49.772746849;2021-12-07@18:30:50
+v2.0.8;imex;100;10000;;18563;6381;99248;26325;105300;220;48.086806626;2021-12-07@18:31:41
+v2.0.8;imex;100;10000;;18563;6381;99472;26428;105712;225;49.166994106;2021-12-07@18:32:32
+v2.0.8;imex;100;10000;;18563;6381;99112;26308;105232;225;49.193044838;2021-12-07@18:33:24
+v2.0.8;imex;100;10000;;18563;6381;99320;26431;105724;218;48.375874157;2021-12-07@18:34:14
+v2.0.8;imex;100;10000;;18563;6381;99048;26358;105432;208;48.717563830;2021-12-07@18:35:06
+v2.0.8;imex;100;10000;;18563;6381;99212;26333;105332;220;48.239671818;2021-12-07@18:35:56
+v2.0.8;imex;100;10000;;18563;6381;98996;26308;105232;224;49.011486298;2021-12-07@18:36:47
+v2.0.8;single;100;10000;;18563;6381;14668;5186;20744;236;51.517662396;2021-12-07@18:38:41
+v2.0.8;single;100;10000;;18563;6381;14860;5231;20924;230;50.230503198;2021-12-07@18:39:33
+v2.0.8;single;100;10000;;18563;6381;14720;5196;20784;232;50.693102460;2021-12-07@18:40:26
+v2.0.8;single;100;10000;;18563;6381;14436;5152;20608;232;50.672487282;2021-12-07@18:41:18
+v2.0.8;single;100;10000;;18563;6381;14724;5223;20892;230;50.228859148;2021-12-07@18:42:11
+v2.0.8;single;100;10000;;18563;6381;14828;5214;20856;227;49.603268658;2021-12-07@18:43:02
+v2.0.8;single;100;10000;;18563;6381;14240;5155;20620;231;50.441219511;2021-12-07@18:43:55
+v2.0.8;single;100;10000;;18563;6381;14660;5165;20660;231;50.458875466;2021-12-07@18:44:47
+v2.0.8;mulimex;100;10000;;18563;6381;264512;67636;270544;408;89.573877427;2021-12-07@18:47:19
+v2.0.8;mulimex;100;10000;;18563;6381;264788;67650;270600;413;90.670580332;2021-12-07@18:48:52
+v2.0.8;mulimex;100;10000;;18563;6381;264352;67649;270596;415;91.098431472;2021-12-07@18:50:25
+v2.0.8;mulimex;100;10000;;18563;6381;264312;67631;270524;414;90.901171045;2021-12-07@18:51:58
+v2.0.8;mulimex;100;10000;;18563;6381;264372;67615;270460;415;91.116916145;2021-12-07@18:53:33
+v2.0.8;mulimex;100;10000;;18563;6381;264688;67689;270756;415;91.105156060;2021-12-07@18:55:07
+v2.0.8;mulimex;100;10000;;18563;6381;264284;67647;270588;415;91.104647172;2021-12-07@18:56:42
+v2.0.8;mulimex;100;10000;;18563;6381;264340;67658;270632;415;91.050613393;2021-12-07@18:58:15
+v2.0.8;multi;178;10000;;19033;6531;323688;82470;329880;737;162.869679370;2021-12-07@19:02:32
+v2.0.8;multi;178;10000;;19033;6531;323716;82499;329996;749;165.194929662;2021-12-07@19:05:19
+v2.0.8;multi;178;10000;;19033;6531;323924;82481;329924;747;164.678245748;2021-12-07@19:08:07
+v2.0.8;multi;178;10000;;19033;6531;323808;82478;329912;746;164.419681992;2021-12-07@19:10:54
+v2.0.8;multi;178;10000;;19033;6531;323624;82452;329808;747;164.624263970;2021-12-07@19:13:41
+v2.0.8;multi;178;10000;;19033;6531;323784;82445;329780;759;167.370843808;2021-12-07@19:16:31
+v2.0.8;multi;178;10000;;19033;6531;323920;82453;329812;747;164.679852071;2021-12-07@19:19:19
+v2.0.8;multi;178;10000;;19033;6531;323780;82453;329812;747;164.670572918;2021-12-07@19:22:06
+v2.0.8;imex;178;10000;;19033;6531;165764;43006;172024;440;96.468907431;2021-12-07@19:25:39
+v2.0.8;imex;178;10000;;19033;6531;166300;43086;172344;428;93.906688190;2021-12-07@19:27:15
+v2.0.8;imex;178;10000;;19033;6531;166080;43045;172180;422;92.639551274;2021-12-07@19:28:51
+v2.0.8;imex;178;10000;;19033;6531;165964;43079;172316;420;92.106320314;2021-12-07@19:30:25
+v2.0.8;imex;178;10000;;19033;6531;165980;43025;172100;419;92.364277190;2021-12-07@19:31:59
+v2.0.8;imex;178;10000;;19033;6531;165724;43023;172092;431;94.616677919;2021-12-07@19:33:36
+v2.0.8;imex;178;10000;;19033;6531;165772;43017;172068;426;93.487271096;2021-12-07@19:35:12
+v2.0.8;imex;178;10000;;19033;6531;166000;43072;172288;424;93.016330089;2021-12-07@19:36:47
+v2.0.8;single;178;10000;;19033;6531;18628;6166;24664;457;100.596303996;2021-12-07@19:40:12
+v2.0.8;single;178;10000;;19033;6531;19388;6353;25412;442;97.137298157;2021-12-07@19:41:52
+v2.0.8;single;178;10000;;19033;6531;19456;6384;25536;441;96.715050045;2021-12-07@19:43:30
+v2.0.8;single;178;10000;;19033;6531;19164;6313;25252;439;96.296256213;2021-12-07@19:45:09
+v2.0.8;single;178;10000;;19033;6531;19184;6364;25456;446;97.855675289;2021-12-07@19:46:49
+v2.0.8;single;178;10000;;19033;6531;19396;6347;25388;450;98.684735012;2021-12-07@19:48:29
+v2.0.8;single;178;10000;;19033;6531;19348;6328;25312;450;98.714682791;2021-12-07@19:50:10
+v2.0.8;single;178;10000;;19033;6531;19448;6444;25776;447;98.041881310;2021-12-07@19:51:50
+v2.0.8;mulimex;178;10000;;19033;6531;465480;117905;471620;741;163.492284571;2021-12-07@19:56:20
+v2.0.8;mulimex;178;10000;;19033;6531;465412;117893;471572;752;165.821125164;2021-12-07@19:59:08
+v2.0.8;mulimex;178;10000;;19033;6531;465540;117933;471732;749;165.118394046;2021-12-07@20:01:56
+v2.0.8;mulimex;178;10000;;19033;6531;485248;122800;491200;753;165.268371616;2021-12-07@20:04:43
+v2.0.8;mulimex;178;10000;;19033;6531;465580;117927;471708;749;165.185756859;2021-12-07@20:07:31
+v2.0.8;mulimex;178;10000;;19033;6531;465668;117924;471696;748;164.826062978;2021-12-07@20:10:18
+v2.0.8;mulimex;178;10000;;19033;6531;465340;117874;471496;749;165.087836049;2021-12-07@20:13:06
+v2.0.8;mulimex;178;10000;;19033;6531;465368;117911;471644;748;164.828776379;2021-12-07@20:15:53
+v2.0.8;multi;316;10000;;19553;6638;576412;145619;582476;1364;301.437332047;2021-12-07@20:23:50
+v2.0.8;multi;316;10000;;19553;6638;576120;145565;582260;1391;308.026027526;2021-12-07@20:29:01
+v2.0.8;multi;316;10000;;19553;6638;576256;145604;582416;1381;305.780135037;2021-12-07@20:34:10
+v2.0.8;multi;316;10000;;19553;6638;576476;145702;582808;1392;308.944966159;2021-12-07@20:39:22
+v2.0.8;multi;316;10000;;19553;6638;576724;145735;582940;1391;307.443356777;2021-12-07@20:44:32
+v2.0.8;multi;316;10000;;19553;6638;575996;145566;582264;1390;307.199272424;2021-12-07@20:49:43
+v2.0.8;multi;316;10000;;19553;6638;576796;145727;582908;1389;308.110883414;2021-12-07@20:54:54
+v2.0.8;multi;316;10000;;19553;6638;576512;145707;582828;1381;306.679623567;2021-12-07@21:00:04
+v2.0.8;imex;316;10000;;19553;6638;284180;72597;290388;1162;256.999570973;2021-12-07@21:07:58
+v2.0.8;imex;316;10000;;19553;6638;284108;72602;290408;837;185.575683561;2021-12-07@21:11:05
+v2.0.8;imex;316;10000;;19553;6638;284504;72667;290668;853;188.174848726;2021-12-07@21:14:16
+v2.0.8;imex;316;10000;;19553;6638;284452;72603;290412;858;189.552162419;2021-12-07@21:17:28
+v2.0.8;imex;316;10000;;19553;6638;283988;72571;290284;855;188.332651908;2021-12-07@21:20:38
+v2.0.8;imex;316;10000;;19553;6638;284152;72613;290452;865;190.454185115;2021-12-07@21:23:51
+v2.0.8;imex;316;10000;;19553;6638;284128;72581;290324;859;190.103712198;2021-12-07@21:27:04
+v2.0.8;imex;316;10000;;19553;6638;284100;72595;290380;843;186.871446146;2021-12-07@21:30:14
+v2.0.8;single;316;10000;;19553;6638;29668;8937;35748;1209;268.291747662;2021-12-07@21:38:13
+v2.0.8;single;316;10000;;19553;6638;29456;8870;35480;1157;256.729359927;2021-12-07@21:43:14
+v2.0.8;single;316;10000;;19553;6638;29436;8865;35460;897;198.441831717;2021-12-07@21:46:50
+v2.0.8;single;316;10000;;19553;6638;29372;8809;35236;1186;263.235567951;2021-12-07@21:51:55
+v2.0.8;single;316;10000;;19553;6638;29676;8923;35692;1138;251.997587950;2021-12-07@21:57:04
+v2.0.8;single;316;10000;;19553;6638;29676;8910;35640;1196;264.643353842;2021-12-07@22:03:48
+v2.0.8;single;316;10000;;19553;6638;28636;8658;34632;871;192.101982736;2021-12-07@22:07:02
+v2.0.8;single;316;10000;;19553;6638;28784;8702;34808;862;190.054995406;2021-12-07@22:10:14
+v2.0.8;mulimex;316;10000;;19553;6638;829616;208913;835652;1379;305.101826067;2021-12-07@22:18:30
+v2.0.8;mulimex;316;10000;;19553;6638;829692;208922;835688;1391;308.145536069;2021-12-07@22:23:43
+v2.0.8;mulimex;316;10000;;19553;6638;829244;208802;835208;1388;307.228636267;2021-12-07@22:28:53
+v2.0.8;mulimex;316;10000;;19553;6638;829120;208850;835400;1387;306.742807045;2021-12-07@22:34:03
+v2.0.8;mulimex;316;10000;;19553;6638;829216;208817;835268;1392;308.302072501;2021-12-07@22:39:15
+v2.0.8;mulimex;316;10000;;19553;6638;829748;208921;835684;1388;307.362917314;2021-12-07@22:44:25
+v2.0.8;mulimex;316;10000;;19553;6638;829208;208807;835228;1395;308.999325562;2021-12-07@22:49:38
+v2.0.8;mulimex;316;10000;;19553;6638;828944;208780;835120;1388;307.283899217;2021-12-07@22:54:49
+v2.0.8;multi;10;17783;;29952;12293;52600;14689;58756;68;14.981767531;2021-12-07@22:56:42
+v2.0.8;multi;10;17783;;29952;12293;52684;14698;58792;73;16.061628388;2021-12-07@22:57:00
+v2.0.8;multi;10;17783;;29952;12293;52960;14697;58788;73;16.066075809;2021-12-07@22:57:18
+v2.0.8;multi;10;17783;;29952;12293;52668;14714;58856;73;16.062526647;2021-12-07@22:57:36
+v2.0.8;multi;10;17783;;29952;12293;52928;14714;58856;73;16.069427309;2021-12-07@22:57:54
+v2.0.8;multi;10;17783;;29952;12293;52596;14700;58800;73;16.059685774;2021-12-07@22:58:12
+v2.0.8;multi;10;17783;;29952;12293;52448;14710;58840;73;16.065174594;2021-12-07@22:58:30
+v2.0.8;multi;10;17783;;29952;12293;52784;14706;58824;73;16.059399392;2021-12-07@22:58:48
+v2.0.8;imex;10;17783;;29952;12293;42096;12074;48296;47;10.279322481;2021-12-07@22:59:07
+v2.0.8;imex;10;17783;;29952;12293;42148;12090;48360;47;10.316036647;2021-12-07@22:59:19
+v2.0.8;imex;10;17783;;29952;12293;41948;12076;48304;48;10.541208636;2021-12-07@22:59:32
+v2.0.8;imex;10;17783;;29952;12293;42196;12091;48364;48;10.535102474;2021-12-07@22:59:44
+v2.0.8;imex;10;17783;;29952;12293;41976;12086;48344;48;10.536781737;2021-12-07@22:59:57
+v2.0.8;imex;10;17783;;29952;12293;42168;12098;48392;48;10.547518191;2021-12-07@23:00:09
+v2.0.8;imex;10;17783;;29952;12293;41840;12076;48304;48;10.536963398;2021-12-07@23:00:22
+v2.0.8;imex;10;17783;;29952;12293;42264;12092;48368;48;10.539528854;2021-12-07@23:00:34
+v2.0.8;single;10;17783;;29952;12293;14076;5068;20272;47;10.281822482;2021-12-07@23:00:54
+v2.0.8;single;10;17783;;29952;12293;14220;5098;20392;49;10.756095546;2021-12-07@23:01:07
+v2.0.8;single;10;17783;;29952;12293;14360;5123;20492;58;12.731911771;2021-12-07@23:01:22
+v2.0.8;single;10;17783;;29952;12293;14244;5121;20484;49;10.759502433;2021-12-07@23:01:34
+v2.0.8;single;10;17783;;29952;12293;14120;5090;20360;49;10.757031388;2021-12-07@23:01:47
+v2.0.8;single;10;17783;;29952;12293;14384;5101;20404;50;10.986469990;2021-12-07@23:02:00
+v2.0.8;single;10;17783;;29952;12293;14400;5092;20368;49;10.756130568;2021-12-07@23:02:13
+v2.0.8;single;10;17783;;29952;12293;14204;5121;20484;50;10.981860948;2021-12-07@23:02:26
+v2.0.8;mulimex;10;17783;;29952;12293;72284;19560;78240;68;14.956576090;2021-12-07@23:02:49
+v2.0.8;mulimex;10;17783;;29952;12293;72000;19545;78180;73;16.057923166;2021-12-07@23:03:08
+v2.0.8;mulimex;10;17783;;29952;12293;71980;19563;78252;73;16.062892732;2021-12-07@23:03:27
+v2.0.8;mulimex;10;17783;;29952;12293;72200;19545;78180;73;16.065900423;2021-12-07@23:03:45
+v2.0.8;mulimex;10;17783;;29952;12293;72108;19569;78276;73;16.065647037;2021-12-07@23:04:02
+v2.0.8;mulimex;10;17783;;29952;12293;72220;19553;78212;73;16.060401545;2021-12-07@23:04:20
+v2.0.8;mulimex;10;17783;;29952;12293;72092;19564;78256;73;16.065845448;2021-12-07@23:04:39
+v2.0.8;mulimex;10;17783;;29952;12293;71912;19576;78304;73;16.081175264;2021-12-07@23:04:57
+v2.0.8;multi;18;17783;;31744;12312;78796;21239;84956;128;28.210543448;2021-12-07@23:05:37
+v2.0.8;multi;18;17783;;31744;12312;78892;21236;84944;133;29.313785115;2021-12-07@23:06:08
+v2.0.8;multi;18;17783;;31744;12312;78860;21259;85036;132;29.089304016;2021-12-07@23:06:39
+v2.0.8;multi;18;17783;;31744;12312;78896;21234;84936;132;29.110696357;2021-12-07@23:07:10
+v2.0.8;multi;18;17783;;31744;12312;78660;21242;84968;132;29.113043019;2021-12-07@23:07:41
+v2.0.8;multi;18;17783;;31744;12312;78820;21249;84996;132;29.098402324;2021-12-07@23:08:12
+v2.0.8;multi;18;17783;;31744;12312;79132;21254;85016;132;29.090970554;2021-12-07@23:08:43
+v2.0.8;multi;18;17783;;31744;12312;78908;21241;84964;132;29.089269354;2021-12-07@23:09:14
+v2.0.8;imex;18;17783;;31744;12312;56100;15548;62192;77;16.934970885;2021-12-07@23:09:45
+v2.0.8;imex;18;17783;;31744;12312;55912;15563;62252;78;17.183357570;2021-12-07@23:10:04
+v2.0.8;imex;18;17783;;31744;12312;55996;15558;62232;78;17.176566163;2021-12-07@23:10:23
+v2.0.8;imex;18;17783;;31744;12312;56012;15556;62224;79;17.397583590;2021-12-07@23:10:43
+v2.0.8;imex;18;17783;;31744;12312;56136;15556;62224;79;17.389481949;2021-12-07@23:11:02
+v2.0.8;imex;18;17783;;31744;12312;56132;15552;62208;78;17.179822082;2021-12-07@23:11:21
+v2.0.8;imex;18;17783;;31744;12312;56024;15544;62176;79;17.384813456;2021-12-07@23:11:41
+v2.0.8;imex;18;17783;;31744;12312;56252;15565;62260;79;17.396236983;2021-12-07@23:12:00
+v2.0.8;single;18;17783;;31744;12312;15444;5423;21692;82;18.007927575;2021-12-07@23:12:32
+v2.0.8;single;18;17783;;31744;12312;15464;5421;21684;82;18.045997939;2021-12-07@23:12:52
+v2.0.8;single;18;17783;;31744;12312;15400;5422;21688;82;18.033770437;2021-12-07@23:13:12
+v2.0.8;single;18;17783;;31744;12312;15596;5421;21684;81;17.816019585;2021-12-07@23:13:31
+v2.0.8;single;18;17783;;31744;12312;15820;5431;21724;82;18.047372275;2021-12-07@23:13:52
+v2.0.8;single;18;17783;;31744;12312;15744;5429;21716;82;18.047277703;2021-12-07@23:14:12
+v2.0.8;single;18;17783;;31744;12312;15704;5434;21736;81;17.802801021;2021-12-07@23:14:32
+v2.0.8;single;18;17783;;31744;12312;15572;5426;21704;84;18.500995532;2021-12-07@23:14:52
+v2.0.8;mulimex;18;17783;;31744;12312;110216;29085;116340;126;27.863846148;2021-12-07@23:15:34
+v2.0.8;mulimex;18;17783;;31744;12312;110224;29085;116340;132;29.110628931;2021-12-07@23:16:06
+v2.0.8;mulimex;18;17783;;31744;12312;110368;29059;116236;139;30.647025097;2021-12-07@23:16:38
+v2.0.8;mulimex;18;17783;;31744;12312;110052;29075;116300;132;29.103343787;2021-12-07@23:17:09
+v2.0.8;mulimex;18;17783;;31744;12312;110556;29070;116280;132;29.119485992;2021-12-07@23:17:40
+v2.0.8;mulimex;18;17783;;31744;12312;110232;29079;116316;132;29.107660152;2021-12-07@23:18:11
+v2.0.8;mulimex;18;17783;;31744;12312;110112;29070;116280;132;29.122564770;2021-12-07@23:18:43
+v2.0.8;mulimex;18;17783;;31744;12312;110428;29097;116388;133;29.338075528;2021-12-07@23:19:15
+v2.0.8;multi;32;17783;;32894;12393;123888;32500;130000;231;51.025597980;2021-12-07@23:20:26
+v2.0.8;multi;32;17783;;32894;12393;123880;32488;129952;236;52.143516022;2021-12-07@23:21:20
+v2.0.8;multi;32;17783;;32894;12393;124060;32473;129892;236;52.153346593;2021-12-07@23:22:14
+v2.0.8;multi;32;17783;;32894;12393;123876;32480;129920;236;52.130243958;2021-12-07@23:23:08
+v2.0.8;multi;32;17783;;32894;12393;123792;32499;129996;236;52.117796364;2021-12-07@23:24:02
+v2.0.8;multi;32;17783;;32894;12393;123876;32501;130004;236;52.127692385;2021-12-07@23:24:55
+v2.0.8;multi;32;17783;;32894;12393;123756;32485;129940;236;52.132111841;2021-12-07@23:25:49
+v2.0.8;multi;32;17783;;32894;12393;123744;32491;129964;236;52.154881655;2021-12-07@23:26:43
+v2.0.8;imex;32;17783;;32894;12393;78876;21268;85072;133;29.291456317;2021-12-07@23:27:35
+v2.0.8;imex;32;17783;;32894;12393;78948;21281;85124;133;29.312148251;2021-12-07@23:28:06
+v2.0.8;imex;32;17783;;32894;12393;79072;21251;85004;134;29.546412078;2021-12-07@23:28:37
+v2.0.8;imex;32;17783;;32894;12393;78724;21291;85164;133;29.311076537;2021-12-07@23:29:09
+v2.0.8;imex;32;17783;;32894;12393;79204;21285;85140;133;29.322697128;2021-12-07@23:29:40
+v2.0.8;imex;32;17783;;32894;12393;78736;21266;85064;133;29.330312741;2021-12-07@23:30:11
+v2.0.8;imex;32;17783;;32894;12393;78648;21252;85008;134;29.545044913;2021-12-07@23:30:43
+v2.0.8;imex;32;17783;;32894;12393;78892;21269;85076;132;29.095177339;2021-12-07@23:31:14
+v2.0.8;single;32;17783;;32894;12393;16984;5785;23140;139;30.613300128;2021-12-07@23:32:07
+v2.0.8;single;32;17783;;32894;12393;17048;5794;23176;138;30.414009306;2021-12-07@23:32:39
+v2.0.8;single;32;17783;;32894;12393;16940;5800;23200;140;30.867701920;2021-12-07@23:33:12
+v2.0.8;single;32;17783;;32894;12393;16812;5793;23172;138;30.428487508;2021-12-07@23:33:45
+v2.0.8;single;32;17783;;32894;12393;16980;5783;23132;137;30.204243693;2021-12-07@23:34:17
+v2.0.8;single;32;17783;;32894;12393;16856;5789;23156;140;30.853967292;2021-12-07@23:34:50
+v2.0.8;single;32;17783;;32894;12393;17232;5817;23268;140;30.865001918;2021-12-07@23:35:23
+v2.0.8;single;32;17783;;32894;12393;16964;5823;23292;138;30.411766172;2021-12-07@23:35:55
+v2.0.8;mulimex;32;17783;;32894;12393;176232;45555;182220;233;51.453441508;2021-12-07@23:37:08
+v2.0.8;mulimex;32;17783;;32894;12393;176196;45575;182300;237;52.306092287;2021-12-07@23:38:03
+v2.0.8;mulimex;32;17783;;32894;12393;176072;45557;182228;237;52.360627637;2021-12-07@23:38:57
+v2.0.8;mulimex;32;17783;;32894;12393;176280;45563;182252;237;52.329645269;2021-12-07@23:39:52
+v2.0.8;mulimex;32;17783;;32894;12393;176180;45571;182284;237;52.334679469;2021-12-07@23:40:46
+v2.0.8;mulimex;32;17783;;32894;12393;175936;45551;182204;237;52.266928195;2021-12-07@23:41:41
+v2.0.8;mulimex;32;17783;;32894;12393;176080;45553;182212;237;52.361941135;2021-12-07@23:42:35
+v2.0.8;mulimex;32;17783;;32894;12393;176028;45536;182144;237;52.321463733;2021-12-07@23:43:29
+v2.0.8;multi;56;17783;;33578;12411;199572;51429;205716;410;90.709436502;2021-12-07@23:45:30
+v2.0.8;multi;56;17783;;33578;12411;202084;52088;208352;416;92.071376431;2021-12-07@23:47:05
+v2.0.8;multi;56;17783;;33578;12411;201836;52041;208164;427;94.509872876;2021-12-07@23:48:42
+v2.0.8;multi;56;17783;;33578;12411;202932;52236;208944;418;92.201157262;2021-12-07@23:50:16
+v2.0.8;multi;56;17783;;33578;12411;203200;52327;209308;517;114.540884193;2021-12-07@23:52:13
+v2.0.8;multi;56;17783;;33578;12411;201932;51992;207968;417;92.309036585;2021-12-07@23:53:47
+v2.0.8;multi;56;17783;;33578;12411;199492;51395;205580;416;92.126528983;2021-12-07@23:55:22
+v2.0.8;multi;56;17783;;33578;12411;205612;52988;211952;518;114.650827855;2021-12-07@23:57:19
+v2.0.8;imex;56;17783;;33578;12411;116292;30634;122536;227;50.028597511;2021-12-07@23:58:47
+v2.0.8;imex;56;17783;;33578;12411;116492;30623;122492;224;49.454963126;2021-12-07@23:59:39
+v2.0.8;imex;56;17783;;33578;12411;116344;30604;122416;224;49.430264565;2021-12-08@00:00:30
+v2.0.8;imex;56;17783;;33578;12411;116284;30628;122512;232;51.179389336;2021-12-08@00:01:24
+v2.0.8;imex;56;17783;;33578;12411;116292;30635;122540;232;51.184033626;2021-12-08@00:02:17
+v2.0.8;imex;56;17783;;33578;12411;116428;30608;122432;226;49.924571322;2021-12-08@00:03:09
+v2.0.8;imex;56;17783;;33578;12411;116116;30601;122404;225;49.642720352;2021-12-08@00:04:00
+v2.0.8;imex;56;17783;;33578;12411;116044;30611;122444;231;50.976736588;2021-12-08@00:04:54
+v2.0.8;single;56;17783;;33578;12411;18916;6267;25068;238;52.491792706;2021-12-08@00:06:23
+v2.0.8;single;56;17783;;33578;12411;18848;6246;24984;234;51.655042864;2021-12-08@00:07:17
+v2.0.8;single;56;17783;;33578;12411;18964;6281;25124;236;52.079049228;2021-12-08@00:08:11
+v2.0.8;single;56;17783;;33578;12411;18848;6248;24992;233;51.420948875;2021-12-08@00:09:04
+v2.0.8;single;56;17783;;33578;12411;18876;6311;25244;234;51.679661905;2021-12-08@00:09:58
+v2.0.8;single;56;17783;;33578;12411;18568;6235;24940;234;51.654971494;2021-12-08@00:10:51
+v2.0.8;single;56;17783;;33578;12411;19012;6241;24964;244;53.827829759;2021-12-08@00:11:47
+v2.0.8;single;56;17783;;33578;12411;18868;6268;25072;234;51.656667337;2021-12-08@00:12:41
+v2.0.8;mulimex;56;17783;;33578;12411;291268;74389;297556;411;90.828744403;2021-12-08@00:14:49
+v2.0.8;mulimex;56;17783;;33578;12411;288980;73784;295136;416;92.179599742;2021-12-08@00:16:23
+v2.0.8;mulimex;56;17783;;33578;12411;288208;73555;294220;417;92.196572792;2021-12-08@00:17:58
+v2.0.8;mulimex;56;17783;;33578;12411;290044;74056;296224;416;92.284506559;2021-12-08@00:19:33
+v2.0.8;mulimex;56;17783;;33578;12411;291748;74514;298056;417;92.166442512;2021-12-08@00:21:07
+v2.0.8;mulimex;56;17783;;33578;12411;290960;74215;296860;417;92.124233886;2021-12-08@00:22:42
+v2.0.8;mulimex;56;17783;;33578;12411;288884;73789;295156;417;92.200807914;2021-12-08@00:24:16
+v2.0.8;mulimex;56;17783;;33578;12411;290012;74004;296016;418;92.364635929;2021-12-08@00:25:51
+v2.0.8;multi;100;17783;;33951;12499;337100;85821;343284;737;163.537420557;2021-12-08@00:29:28
+v2.0.8;multi;100;17783;;33951;12499;380704;96687;386748;754;166.096816473;2021-12-08@00:32:16
+v2.0.8;multi;100;17783;;33951;12499;374888;95225;380900;751;166.000934873;2021-12-08@00:35:05
+v2.0.8;multi;100;17783;;33951;12499;375784;95511;382044;751;165.967554851;2021-12-08@00:37:57
+v2.0.8;multi;100;17783;;33951;12499;338612;86179;344716;739;163.883216607;2021-12-08@00:40:57
+v2.0.8;multi;100;17783;;33951;12499;375588;95469;381876;454;100.667637280;2021-12-08@00:43:46
+v2.0.8;multi;100;17783;;33951;12499;375468;95448;381792;752;166.204631750;2021-12-08@00:46:35
+v2.0.8;multi;100;17783;;33951;12499;368620;93677;374708;452;100.455355480;2021-12-08@00:49:23
+v2.0.8;imex;100;17783;;33951;12499;184684;47733;190932;417;92.236102418;2021-12-08@00:52:00
+v2.0.8;imex;100;17783;;33951;12499;184704;47737;190948;411;91.056504584;2021-12-08@00:53:34
+v2.0.8;imex;100;17783;;33951;12499;184752;47729;190916;419;92.899060561;2021-12-08@00:55:08
+v2.0.8;imex;100;17783;;33951;12499;184808;47731;190924;417;92.277196693;2021-12-08@00:56:42
+v2.0.8;imex;100;17783;;33951;12499;184832;47742;190968;414;91.628513044;2021-12-08@00:58:16
+v2.0.8;imex;100;17783;;33951;12499;184684;47746;190984;412;91.207421323;2021-12-08@00:59:49
+v2.0.8;imex;100;17783;;33951;12499;184824;47744;190976;406;89.856505062;2021-12-08@01:01:21
+v2.0.8;imex;100;17783;;33951;12499;184500;47701;190804;408;90.295013261;2021-12-08@01:02:53
+v2.0.8;single;100;17783;;33951;12499;21448;6903;27612;432;95.548503721;2021-12-08@01:05:30
+v2.0.8;single;100;17783;;33951;12499;21712;6932;27728;438;96.989551953;2021-12-08@01:07:09
+v2.0.8;single;100;17783;;33951;12499;21444;6930;27720;422;93.446610267;2021-12-08@01:08:44
+v2.0.8;single;100;17783;;33951;12499;21764;6951;27804;420;92.991451896;2021-12-08@01:10:19
+v2.0.8;single;100;17783;;33951;12499;21408;6932;27728;424;93.896027936;2021-12-08@01:11:55
+v2.0.8;single;100;17783;;33951;12499;21408;6879;27516;428;94.736583603;2021-12-08@01:13:32
+v2.0.8;single;100;17783;;33951;12499;21588;6928;27712;422;93.414625593;2021-12-08@01:15:07
+v2.0.8;single;100;17783;;33951;12499;21120;6867;27468;428;94.866818099;2021-12-08@01:16:44
+v2.0.8;mulimex;100;17783;;33951;12499;490120;124106;496424;738;164.269970695;2021-12-08@01:20:29
+v2.0.8;mulimex;100;17783;;33951;12499;549020;138821;555284;455;99.813440827;2021-12-08@01:23:18
+v2.0.8;mulimex;100;17783;;33951;12499;545632;137969;551876;455;100.004036697;2021-12-08@01:26:06
+v2.0.8;mulimex;100;17783;;33951;12499;541404;136885;547540;451;100.153725312;2021-12-08@01:28:55
+v2.0.8;mulimex;100;17783;;33951;12499;540380;136614;546456;452;100.417072126;2021-12-08@01:31:43
+v2.0.8;mulimex;100;17783;;33951;12499;541076;136810;547240;455;100.331728609;2021-12-08@01:34:32
+v2.0.8;mulimex;100;17783;;33951;12499;544456;137644;550576;453;100.029168896;2021-12-08@01:37:20
+v2.0.8;mulimex;100;17783;;33951;12499;540284;136511;546044;449;100.207336557;2021-12-08@01:40:08
+v2.0.8;multi;178;17783;;34156;12582;580792;146746;586984;1370;306.165294100;2021-12-08@01:46:51
+v2.0.8;multi;178;17783;;34156;12582;580356;146654;586616;1551;347.958025333;2021-12-08@01:52:42
+v2.0.8;multi;178;17783;;34156;12582;580288;146613;586452;1556;348.992405464;2021-12-08@01:58:33
+v2.0.8;multi;178;17783;;34156;12582;583052;147269;589076;1360;303.963340554;2021-12-08@02:03:40
+v2.0.8;multi;178;17783;;34156;12582;580092;146595;586380;1358;303.804616588;2021-12-08@02:08:47
+v2.0.8;multi;178;17783;;34156;12582;580392;146626;586504;1360;303.917704343;2021-12-08@02:13:54
+v2.0.8;multi;178;17783;;34156;12582;580660;146639;586556;1360;304.079597270;2021-12-08@02:19:01
+v2.0.8;multi;178;17783;;34156;12582;580336;146615;586460;1355;302.795462304;2021-12-08@02:24:06
+v2.0.8;imex;178;17783;;34156;12582;305088;77832;311328;777;172.466694965;2021-12-08@02:28:57
+v2.0.8;imex;178;17783;;34156;12582;305332;77899;311596;733;162.621100016;2021-12-08@02:31:42
+v2.0.8;imex;178;17783;;34156;12582;305312;77923;311692;757;168.184861654;2021-12-08@02:34:33
+v2.0.8;imex;178;17783;;34156;12582;305420;77906;311624;749;166.092477614;2021-12-08@02:37:21
+v2.0.8;imex;178;17783;;34156;12582;305408;77912;311648;720;159.758593918;2021-12-08@02:40:03
+v2.0.8;imex;178;17783;;34156;12582;305424;77912;311648;759;168.331348384;2021-12-08@02:42:53
+v2.0.8;imex;178;17783;;34156;12582;305576;77921;311684;769;170.463281707;2021-12-08@02:45:46
+v2.0.8;imex;178;17783;;34156;12582;305560;77939;311756;742;164.691179161;2021-12-08@02:48:33
+v2.0.8;single;178;17783;;34156;12582;25572;7941;31764;801;178.038615746;2021-12-08@02:53:15
+v2.0.8;single;178;17783;;34156;12582;25516;7942;31768;746;166.299921978;2021-12-08@02:56:03
+v2.0.8;single;178;17783;;34156;12582;25436;7898;31592;762;169.129662317;2021-12-08@02:58:54
+v2.0.8;single;178;17783;;34156;12582;25392;7848;31392;774;171.813185791;2021-12-08@03:01:48
+v2.0.8;single;178;17783;;34156;12582;25468;7888;31552;763;169.405391931;2021-12-08@03:04:40
+v2.0.8;single;178;17783;;34156;12582;25984;7995;31980;762;169.368580681;2021-12-08@03:07:31
+v2.0.8;single;178;17783;;34156;12582;25324;7862;31448;767;170.154276387;2021-12-08@03:10:23
+v2.0.8;single;178;17783;;34156;12582;26012;7989;31956;771;171.319508879;2021-12-08@03:13:16
+v2.0.8;mulimex;178;17783;;34156;12582;850224;214038;856152;1352;302.580194981;2021-12-08@03:20:04
+v2.0.8;mulimex;178;17783;;34156;12582;849928;213999;855996;1368;305.720676944;2021-12-08@03:25:13
+v2.0.8;mulimex;178;17783;;34156;12582;849720;214004;856016;1359;304.264812969;2021-12-08@03:30:21
+v2.0.8;mulimex;178;17783;;34156;12582;849892;214041;856164;1364;304.962652047;2021-12-08@03:35:30
+v2.0.8;mulimex;178;17783;;34156;12582;850140;214062;856248;1359;303.756259177;2021-12-08@03:40:36
+v2.0.8;mulimex;178;17783;;34156;12582;850068;214111;856444;1356;303.201357056;2021-12-08@03:45:43
+v2.0.8;mulimex;178;17783;;34156;12582;849968;214056;856224;461;101.320614191;2021-12-08@03:50:50
+v2.0.8;mulimex;178;17783;;34156;12582;850000;214075;856300;1360;302.886359514;2021-12-08@03:55:56
+v2.0.8;multi;316;17783;;34574;12710;1017108;255823;1023292;2936;661.001866960;2021-12-08@04:09:53
+v2.0.8;multi;316;17783;;34574;12710;1017140;255807;1023228;2376;533.394451529;2021-12-08@04:18:51
+v2.0.8;multi;316;17783;;34574;12710;1017404;255856;1023424;2381;535.857541385;2021-12-08@04:27:51
+v2.0.8;multi;316;17783;;34574;12710;1017200;255855;1023420;2361;529.716934273;2021-12-08@04:36:45
+v2.0.8;multi;316;17783;;34574;12710;1017236;255840;1023360;2375;533.717903276;2021-12-08@04:45:42
+v2.0.8;multi;316;17783;;34574;12710;1017072;255794;1023176;2385;536.516402253;2021-12-08@04:54:43
+v2.0.8;multi;316;17783;;34574;12710;1017548;255881;1023524;2372;534.219961926;2021-12-08@05:03:41
+v2.0.8;multi;316;17783;;34574;12710;1017056;255853;1023412;2378;535.330217231;2021-12-08@05:12:40
+v2.0.8;imex;316;17783;;34574;12710;524428;132600;530400;1574;353.785847633;2021-12-08@05:22:13
+v2.0.8;imex;316;17783;;34574;12710;522096;132027;528108;1452;324.136401718;2021-12-08@05:27:39
+v2.0.8;imex;316;17783;;34574;12710;521836;131995;527980;1675;376.266049845;2021-12-08@05:33:58
+v2.0.8;imex;316;17783;;34574;12710;521712;131998;527992;1735;388.377112181;2021-12-08@05:40:29
+v2.0.8;imex;316;17783;;34574;12710;522420;132138;528552;1441;321.706880621;2021-12-08@05:45:53
+v2.0.8;imex;316;17783;;34574;12710;521548;131975;527900;1448;323.891415141;2021-12-08@05:51:19
+v2.0.8;imex;316;17783;;34574;12710;522536;132211;528844;1439;321.977521834;2021-12-08@05:56:44
+v2.0.8;imex;316;17783;;34574;12710;521972;132022;528088;1645;368.637133013;2021-12-08@06:02:55
+v2.0.8;single;316;17783;;34574;12710;32900;9744;38976;1648;369.471450326;2021-12-08@06:12:16
+v2.0.8;single;316;17783;;34574;12710;35192;10379;41516;1522;341.706180958;2021-12-08@06:18:00
+v2.0.8;single;316;17783;;34574;12710;31904;9478;37912;1738;389.427384637;2021-12-08@06:24:31
+v2.0.8;single;316;17783;;34574;12710;33784;9933;39732;1523;339.824139183;2021-12-08@06:30:13
+v2.0.8;single;316;17783;;34574;12710;32060;9574;38296;1538;343.246728738;2021-12-08@06:35:58
+v2.0.8;single;316;17783;;34574;12710;32748;9677;38708;1734;387.685683063;2021-12-08@06:42:27
+v2.0.8;single;316;17783;;34574;12710;34916;10277;41108;1759;394.525265765;2021-12-08@06:49:04
+v2.0.8;single;316;17783;;34574;12710;34888;10247;40988;1512;336.965964558;2021-12-08@06:54:43
+v2.0.8;mulimex;316;17783;;34574;12710;1496456;375646;1502584;2606;586.344607203;2021-12-08@07:07:40
+v2.0.8;mulimex;316;17783;;34574;12710;1496384;375639;1502556;1368;305.659665680;2021-12-08@07:16:39
+v2.0.8;mulimex;316;17783;;34574;12710;1496368;375586;1502344;2393;535.508388759;2021-12-08@07:25:40
+v2.0.8;mulimex;316;17783;;34574;12710;1496864;375710;1502840;2364;531.096878086;2021-12-08@07:34:36
+v2.0.8;mulimex;316;17783;;34574;12710;1496264;375640;1502560;2402;537.854836184;2021-12-08@07:43:39
+v2.0.8;mulimex;316;17783;;34574;12710;1496384;375654;1502616;2386;535.118076245;2021-12-08@07:52:39
+v2.0.8;mulimex;316;17783;;34574;12710;1496504;375617;1502468;2396;536.890438660;2021-12-08@08:01:41
+v2.0.8;mulimex;316;17783;;34574;12710;1496752;375656;1502624;2390;535.641925649;2021-12-08@08:10:41
+v2.0.8;multi;10;31623;;54425;24231;92936;24807;99228;117;26.368815866;2021-12-08@08:12:47
+v2.0.8;multi;10;31623;;54425;24231;93212;24810;99240;124;27.874472220;2021-12-08@08:13:18
+v2.0.8;multi;10;31623;;54425;24231;93140;24805;99220;124;27.872004940;2021-12-08@08:13:49
+v2.0.8;multi;10;31623;;54425;24231;92888;24813;99252;124;27.874111579;2021-12-08@08:14:21
+v2.0.8;multi;10;31623;;54425;24231;93128;24817;99268;124;27.884302590;2021-12-08@08:14:50
+v2.0.8;multi;10;31623;;54425;24231;93116;24796;99184;124;27.880850887;2021-12-08@08:15:20
+v2.0.8;multi;10;31623;;54425;24231;93092;24815;99260;124;27.897365927;2021-12-08@08:15:50
+v2.0.8;multi;10;31623;;54425;24231;92968;24810;99240;124;27.894408342;2021-12-08@08:16:20
+v2.0.8;imex;10;31623;;54425;24231;74980;20308;81232;78;17.411649311;2021-12-08@08:16:47
+v2.0.8;imex;10;31623;;54425;24231;75116;20318;81272;79;17.675904803;2021-12-08@08:17:06
+v2.0.8;imex;10;31623;;54425;24231;75088;20335;81340;80;17.889252699;2021-12-08@08:17:26
+v2.0.8;imex;10;31623;;54425;24231;74984;20340;81360;80;17.906519849;2021-12-08@08:17:46
+v2.0.8;imex;10;31623;;54425;24231;75232;20319;81276;81;18.117705616;2021-12-08@08:18:06
+v2.0.8;imex;10;31623;;54425;24231;75168;20343;81372;81;18.113592541;2021-12-08@08:18:26
+v2.0.8;imex;10;31623;;54425;24231;75096;20326;81304;80;17.896420267;2021-12-08@08:18:46
+v2.0.8;imex;10;31623;;54425;24231;74964;20316;81264;80;17.891189684;2021-12-08@08:19:05
+v2.0.8;single;10;31623;;54425;24231;23080;7273;29092;81;18.109329035;2021-12-08@08:19:34
+v2.0.8;single;10;31623;;54425;24231;22916;7291;29164;85;19.012704115;2021-12-08@08:19:55
+v2.0.8;single;10;31623;;54425;24231;23080;7303;29212;83;18.569219327;2021-12-08@08:20:16
+v2.0.8;single;10;31623;;54425;24231;22892;7305;29220;84;18.806752030;2021-12-08@08:20:37
+v2.0.8;single;10;31623;;54425;24231;22984;7316;29264;84;18.790478733;2021-12-08@08:20:57
+v2.0.8;single;10;31623;;54425;24231;22956;7287;29148;84;18.773703064;2021-12-08@08:21:18
+v2.0.8;single;10;31623;;54425;24231;23016;7298;29192;83;18.562210551;2021-12-08@08:21:38
+v2.0.8;single;10;31623;;54425;24231;22972;7321;29284;84;18.787685160;2021-12-08@08:21:59
+v2.0.8;mulimex;10;31623;;54425;24231;130520;34147;136588;119;26.772858515;2021-12-08@08:22:35
+v2.0.8;mulimex;10;31623;;54425;24231;130304;34167;136668;124;27.888189765;2021-12-08@08:23:05
+v2.0.8;mulimex;10;31623;;54425;24231;130364;34166;136664;124;27.899722939;2021-12-08@08:23:35
+v2.0.8;mulimex;10;31623;;54425;24231;130504;34162;136648;124;27.890003623;2021-12-08@08:24:05
+v2.0.8;mulimex;10;31623;;54425;24231;130420;34140;136560;124;27.884966947;2021-12-08@08:24:34
+v2.0.8;mulimex;10;31623;;54425;24231;130460;34144;136576;124;27.913979295;2021-12-08@08:25:04
+v2.0.8;mulimex;10;31623;;54425;24231;130512;34131;136524;124;27.880353152;2021-12-08@08:25:34
+v2.0.8;mulimex;10;31623;;54425;24231;130412;34144;136576;124;27.910615175;2021-12-08@08:26:03
+v2.0.8;multi;18;31623;;57202;24252;140280;36577;146308;221;49.758809558;2021-12-08@08:27:06
+v2.0.8;multi;18;31623;;57202;24252;140092;36550;146200;227;51.115461302;2021-12-08@08:27:59
+v2.0.8;multi;18;31623;;57202;24252;139988;36551;146204;227;51.180680346;2021-12-08@08:28:52
+v2.0.8;multi;18;31623;;57202;24252;140024;36539;146156;227;51.120056180;2021-12-08@08:29:45
+v2.0.8;multi;18;31623;;57202;24252;140192;36536;146144;227;51.170873079;2021-12-08@08:30:38
+v2.0.8;multi;18;31623;;57202;24252;140168;36560;146240;227;51.129130081;2021-12-08@08:31:31
+v2.0.8;multi;18;31623;;57202;24252;139892;36541;146164;227;51.134665995;2021-12-08@08:32:24
+v2.0.8;multi;18;31623;;57202;24252;140144;36546;146184;227;51.143209579;2021-12-08@08:33:17
+v2.0.8;imex;18;31623;;57202;24252;101252;26842;107368;137;30.709332501;2021-12-08@08:34:02
+v2.0.8;imex;18;31623;;57202;24252;101180;26880;107520;136;30.519154328;2021-12-08@08:34:34
+v2.0.8;imex;18;31623;;57202;24252;101280;26867;107468;139;31.184962472;2021-12-08@08:35:07
+v2.0.8;imex;18;31623;;57202;24252;101304;26871;107484;137;30.719885872;2021-12-08@08:35:40
+v2.0.8;imex;18;31623;;57202;24252;101452;26898;107592;138;30.967063958;2021-12-08@08:36:13
+v2.0.8;imex;18;31623;;57202;24252;101128;26872;107488;135;30.354842019;2021-12-08@08:36:45
+v2.0.8;imex;18;31623;;57202;24252;101180;26883;107532;139;31.176447833;2021-12-08@08:37:19
+v2.0.8;imex;18;31623;;57202;24252;101452;26865;107460;138;30.961640338;2021-12-08@08:37:53
+v2.0.8;single;18;31623;;57202;24252;24944;7793;31172;142;31.858615482;2021-12-08@08:38:40
+v2.0.8;single;18;31623;;57202;24252;24756;7760;31040;141;31.651175859;2021-12-08@08:39:14
+v2.0.8;single;18;31623;;57202;24252;24872;7778;31112;140;31.411432215;2021-12-08@08:39:47
+v2.0.8;single;18;31623;;57202;24252;24924;7775;31100;141;31.683337224;2021-12-08@08:40:21
+v2.0.8;single;18;31623;;57202;24252;24840;7774;31096;144;32.310743085;2021-12-08@08:40:55
+v2.0.8;single;18;31623;;57202;24252;24672;7774;31096;145;32.517663232;2021-12-08@08:41:29
+v2.0.8;single;18;31623;;57202;24252;24928;7769;31076;143;32.093836004;2021-12-08@08:42:03
+v2.0.8;single;18;31623;;57202;24252;25088;7802;31208;143;32.075427826;2021-12-08@08:42:37
+v2.0.8;mulimex;18;31623;;57202;24252;200848;51737;206948;223;50.241548010;2021-12-08@08:43:41
+v2.0.8;mulimex;18;31623;;57202;24252;200536;51708;206832;228;51.381461937;2021-12-08@08:44:34
+v2.0.8;mulimex;18;31623;;57202;24252;200512;51700;206800;228;51.383348517;2021-12-08@08:45:28
+v2.0.8;mulimex;18;31623;;57202;24252;200948;51709;206836;228;51.373186780;2021-12-08@08:46:21
+v2.0.8;mulimex;18;31623;;57202;24252;200620;51731;206924;228;51.385071771;2021-12-08@08:47:15
+v2.0.8;mulimex;18;31623;;57202;24252;200988;51716;206864;228;51.366925804;2021-12-08@08:48:08
+v2.0.8;mulimex;18;31623;;57202;24252;200900;51729;206916;282;63.554246095;2021-12-08@08:49:14
+v2.0.8;mulimex;18;31623;;57202;24252;200568;51726;206904;228;51.413892532;2021-12-08@08:50:07
+v2.0.8;multi;32;31623;;58800;24186;219516;56418;225672;401;90.740418873;2021-12-08@08:51:57
+v2.0.8;multi;32;31623;;58800;24186;219696;56439;225756;407;92.058291025;2021-12-08@08:53:32
+v2.0.8;multi;32;31623;;58800;24186;219404;56407;225628;407;92.057910792;2021-12-08@08:55:06
+v2.0.8;multi;32;31623;;58800;24186;219400;56454;225816;408;92.147867635;2021-12-08@08:56:40
+v2.0.8;multi;32;31623;;58800;24186;219516;56422;225688;407;92.059075489;2021-12-08@08:58:14
+v2.0.8;multi;32;31623;;58800;24186;219464;56448;225792;408;92.235867675;2021-12-08@08:59:49
+v2.0.8;multi;32;31623;;58800;24186;219820;56422;225688;407;92.062971760;2021-12-08@09:01:23
+v2.0.8;multi;32;31623;;58800;24186;219684;56458;225832;408;92.163197655;2021-12-08@09:02:57
+v2.0.8;imex;32;31623;;58800;24186;143972;37508;150032;239;53.774679488;2021-12-08@09:04:14
+v2.0.8;imex;32;31623;;58800;24186;143696;37491;149964;237;53.290428657;2021-12-08@09:05:09
+v2.0.8;imex;32;31623;;58800;24186;143900;37493;149972;236;53.082550593;2021-12-08@09:06:04
+v2.0.8;imex;32;31623;;58800;24186;143824;37539;150156;240;53.956441175;2021-12-08@09:07:00
+v2.0.8;imex;32;31623;;58800;24186;143620;37503;150012;236;53.063892848;2021-12-08@09:07:55
+v2.0.8;imex;32;31623;;58800;24186;143804;37497;149988;237;53.310853415;2021-12-08@09:08:50
+v2.0.8;imex;32;31623;;58800;24186;143736;37487;149948;239;53.768769316;2021-12-08@09:09:46
+v2.0.8;imex;32;31623;;58800;24186;143488;37487;149948;236;53.037211619;2021-12-08@09:10:41
+v2.0.8;single;32;31623;;58800;24186;26920;8188;32752;248;55.736633070;2021-12-08@09:11:59
+v2.0.8;single;32;31623;;58800;24186;26496;8218;32872;246;55.345376662;2021-12-08@09:12:56
+v2.0.8;single;32;31623;;58800;24186;26452;8203;32812;245;55.150783123;2021-12-08@09:13:53
+v2.0.8;single;32;31623;;58800;24186;26528;8201;32804;247;55.586255114;2021-12-08@09:14:51
+v2.0.8;single;32;31623;;58800;24186;26828;8224;32896;246;55.392899527;2021-12-08@09:15:48
+v2.0.8;single;32;31623;;58800;24186;26568;8213;32852;246;55.352709793;2021-12-08@09:16:46
+v2.0.8;single;32;31623;;58800;24186;26512;8212;32848;245;55.098677291;2021-12-08@09:17:42
+v2.0.8;single;32;31623;;58800;24186;26876;8250;33000;251;56.466797543;2021-12-08@09:18:41
+v2.0.8;mulimex;32;31623;;58800;24186;320124;81618;326472;402;90.828775110;2021-12-08@09:20:35
+v2.0.8;mulimex;32;31623;;58800;24186;320184;81579;326316;409;92.431039536;2021-12-08@09:22:10
+v2.0.8;mulimex;32;31623;;58800;24186;320260;81559;326236;414;93.547639538;2021-12-08@09:23:45
+v2.0.8;mulimex;32;31623;;58800;24186;320064;81571;326284;409;92.398306196;2021-12-08@09:25:20
+v2.0.8;mulimex;32;31623;;58800;24186;320328;81576;326304;409;92.358358164;2021-12-08@09:26:55
+v2.0.8;mulimex;32;31623;;58800;24186;319840;81548;326192;409;92.453979741;2021-12-08@09:28:29
+v2.0.8;mulimex;32;31623;;58800;24186;319872;81540;326160;409;92.411970574;2021-12-08@09:30:04
+v2.0.8;mulimex;32;31623;;58800;24186;319924;81569;326276;409;92.389010192;2021-12-08@09:31:39
+v2.0.8;multi;56;31623;;59758;24285;354688;90225;360900;715;161.882937029;2021-12-08@09:34:52
+v2.0.8;multi;56;31623;;59758;24285;354564;90209;360836;717;162.852905444;2021-12-08@09:37:37
+v2.0.8;multi;56;31623;;59758;24285;354656;90227;360908;719;162.936763656;2021-12-08@09:40:22
+v2.0.8;multi;56;31623;;59758;24285;354896;90267;361068;718;162.651194717;2021-12-08@09:43:06
+v2.0.8;multi;56;31623;;59758;24285;354808;90262;361048;717;162.643113485;2021-12-08@09:45:51
+v2.0.8;multi;56;31623;;59758;24285;354728;90229;360916;717;162.501436861;2021-12-08@09:48:35
+v2.0.8;multi;56;31623;;59758;24285;354612;90231;360924;715;162.355517930;2021-12-08@09:51:19
+v2.0.8;multi;56;31623;;59758;24285;354792;90236;360944;719;163.046735284;2021-12-08@09:54:04
+v2.0.8;imex;56;31623;;59758;24285;215568;55455;221820;414;93.411149256;2021-12-08@09:56:14
+v2.0.8;imex;56;31623;;59758;24285;215940;55529;222116;407;91.881835857;2021-12-08@09:57:48
+v2.0.8;imex;56;31623;;59758;24285;215916;55494;221976;408;92.077494877;2021-12-08@09:59:23
+v2.0.8;imex;56;31623;;59758;24285;215576;55475;221900;409;92.359334313;2021-12-08@10:00:57
+v2.0.8;imex;56;31623;;59758;24285;215524;55487;221948;409;92.385897340;2021-12-08@10:02:32
+v2.0.8;imex;56;31623;;59758;24285;215732;55497;221988;441;99.625898648;2021-12-08@10:04:14
+v2.0.8;imex;56;31623;;59758;24285;215648;55511;222044;406;91.681708219;2021-12-08@10:05:48
+v2.0.8;imex;56;31623;;59758;24285;215984;55486;221944;408;92.104395465;2021-12-08@10:07:23
+v2.0.8;single;56;31623;;59758;24285;28992;8831;35324;433;97.751392193;2021-12-08@10:09:37
+v2.0.8;single;56;31623;;59758;24285;29156;8814;35256;427;96.402729970;2021-12-08@10:11:16
+v2.0.8;single;56;31623;;59758;24285;29028;8788;35152;427;96.397286775;2021-12-08@10:12:54
+v2.0.8;single;56;31623;;59758;24285;29072;8852;35408;425;95.973269697;2021-12-08@10:14:33
+v2.0.8;single;56;31623;;59758;24285;28788;8754;35016;420;94.841135407;2021-12-08@10:16:10
+v2.0.8;single;56;31623;;59758;24285;28968;8787;35148;429;96.885858180;2021-12-08@10:17:49
+v2.0.8;single;56;31623;;59758;24285;29084;8815;35260;430;97.200190073;2021-12-08@10:19:28
+v2.0.8;single;56;31623;;59758;24285;29232;8816;35264;422;95.318085951;2021-12-08@10:21:05
+v2.0.8;mulimex;56;31623;;59758;24285;524208;132570;530280;716;161.948015906;2021-12-08@10:24:24
+v2.0.8;mulimex;56;31623;;59758;24285;524228;132589;530356;718;163.061667192;2021-12-08@10:27:10
+v2.0.8;mulimex;56;31623;;59758;24285;524176;132580;530320;720;162.980213869;2021-12-08@10:29:55
+v2.0.8;mulimex;56;31623;;59758;24285;524280;132610;530440;720;163.224117724;2021-12-08@10:32:42
+v2.0.8;mulimex;56;31623;;59758;24285;525116;132875;531500;720;163.238807927;2021-12-08@10:35:28
+v2.0.8;mulimex;56;31623;;59758;24285;524284;132589;530356;719;163.292320790;2021-12-08@10:38:14
+v2.0.8;mulimex;56;31623;;59758;24285;524116;132572;530288;720;163.067451590;2021-12-08@10:41:00
+v2.0.8;mulimex;56;31623;;59758;24285;524388;132639;530556;720;163.206057859;2021-12-08@10:43:47
+v2.0.8;multi;100;31623;;60390;24233;601344;151833;607332;1513;344.883511822;2021-12-08@10:50:26
+v2.0.8;multi;100;31623;;60390;24233;624400;157645;630580;1165;268.780763274;2021-12-08@10:56:03
+v2.0.8;multi;100;31623;;60390;24233;623584;157430;629720;1377;313.470390920;2021-12-08@11:01:21
+v2.0.8;multi;100;31623;;60390;24233;621912;156976;627904;1245;288.208275459;2021-12-08@11:07:17
+v2.0.8;multi;100;31623;;60390;24233;617444;155895;623580;1230;283.293392755;2021-12-08@11:13:09
+v2.0.8;multi;100;31623;;60390;24233;612280;154578;618312;1496;341.697738777;2021-12-08@11:18:54
+v2.0.8;multi;100;31623;;60390;24233;616216;155535;622140;1219;282.210077287;2021-12-08@11:24:44
+v2.0.8;multi;100;31623;;60390;24233;610368;154137;616548;1346;307.148932535;2021-12-08@11:29:55
+v2.0.8;imex;100;31623;;60390;24233;344400;87650;350600;756;171.078737269;2021-12-08@11:33:53
+v2.0.8;imex;100;31623;;60390;24233;344428;87661;350644;734;166.334170376;2021-12-08@11:36:42
+v2.0.8;imex;100;31623;;60390;24233;344884;87749;350996;734;166.429060944;2021-12-08@11:39:30
+v2.0.8;imex;100;31623;;60390;24233;343984;87595;350380;729;165.233216802;2021-12-08@11:42:18
+v2.0.8;imex;100;31623;;60390;24233;344632;87697;350788;733;166.079004371;2021-12-08@11:45:06
+v2.0.8;imex;100;31623;;60390;24233;344520;87649;350596;728;165.027959638;2021-12-08@11:47:53
+v2.0.8;imex;100;31623;;60390;24233;344444;87679;350716;734;166.313666528;2021-12-08@11:50:42
+v2.0.8;imex;100;31623;;60390;24233;344544;87714;350856;742;168.042208415;2021-12-08@11:53:33
+v2.0.8;single;100;31623;;60390;24233;32512;9612;38448;775;175.458575666;2021-12-08@11:57:31
+v2.0.8;single;100;31623;;60390;24233;31908;9567;38268;761;172.604947657;2021-12-08@12:00:25
+v2.0.8;single;100;31623;;60390;24233;32140;9563;38252;752;170.498530623;2021-12-08@12:03:17
+v2.0.8;single;100;31623;;60390;24233;31796;9534;38136;756;171.451913360;2021-12-08@12:06:10
+v2.0.8;single;100;31623;;60390;24233;32340;9575;38300;761;172.493975304;2021-12-08@12:09:04
+v2.0.8;single;100;31623;;60390;24233;32116;9537;38148;760;172.280034669;2021-12-08@12:11:58
+v2.0.8;single;100;31623;;60390;24233;32516;9591;38364;763;172.952830973;2021-12-08@12:14:53
+v2.0.8;single;100;31623;;60390;24233;32552;9629;38516;788;178.451672749;2021-12-08@12:17:53
+v2.0.8;mulimex;100;31623;;60390;24233;916628;230687;922748;1425;325.732562101;2021-12-08@12:24:19
+v2.0.8;mulimex;100;31623;;60390;24233;932556;234656;938624;1161;267.619864333;2021-12-08@12:29:55
+v2.0.8;mulimex;100;31623;;60390;24233;926924;233216;932864;1461;333.811069823;2021-12-08@12:35:32
+v2.0.8;mulimex;100;31623;;60390;24233;929632;233976;935904;1100;253.630645455;2021-12-08@12:40:54
+v2.0.8;mulimex;100;31623;;60390;24233;928928;233787;935148;1260;290.833195027;2021-12-08@12:46:53
+v2.0.8;mulimex;100;31623;;60390;24233;913212;229879;919516;1492;341.626259673;2021-12-08@12:52:38
+v2.0.8;mulimex;100;31623;;60390;24233;917728;230936;923744;1384;315.460346912;2021-12-08@12:57:56
+v2.0.8;mulimex;100;31623;;60390;24233;911564;229425;917700;1529;349.187945591;2021-12-08@13:03:49
+v2.0.8;multi;178;31623;;60806;24427;1036860;260700;1042800;2811;646.972937321;2021-12-08@13:16:10
+v2.0.8;multi;178;31623;;60806;24427;1115996;280495;1121980;2035;468.615300090;2021-12-08@13:30:04
+v2.0.8;multi;178;31623;;60806;24427;1057076;265842;1063368;2272;525.077433498;2021-12-08@13:41:04
+v2.0.8;multi;178;31623;;60806;24427;1054104;265004;1060016;1940;445.469762335;2021-12-08@13:50:44
+v2.0.8;multi;178;31623;;60806;24427;1086820;273284;1093136;2527;576.678661107;2021-12-08@14:00:24
+v2.0.8;multi;178;31623;;60806;24427;1059064;266319;1065276;2347;539.411727796;2021-12-08@14:11:38
+v2.0.8;multi;178;31623;;60806;24427;1081752;271998;1087992;2553;581.829601419;2021-12-08@14:21:23
+v2.0.8;multi;178;31623;;60806;24427;1036788;260791;1043164;2642;609.570901367;2021-12-08@14:32:43
+v2.0.8;imex;178;31623;;60806;24427;575180;145340;581360;1481;336.651069271;2021-12-08@14:40:17
+v2.0.8;imex;178;31623;;60806;24427;575636;145445;581780;1338;304.413725084;2021-12-08@14:45:24
+v2.0.8;imex;178;31623;;60806;24427;575072;145286;581144;1542;354.070235998;2021-12-08@14:51:21
+v2.0.8;imex;178;31623;;60806;24427;575116;145294;581176;1355;308.168328292;2021-12-08@14:56:31
+v2.0.8;imex;178;31623;;60806;24427;575432;145462;581848;1326;301.578053363;2021-12-08@15:01:35
+v2.0.8;imex;178;31623;;60806;24427;575928;145487;581948;1500;341.408838533;2021-12-08@15:07:19
+v2.0.8;imex;178;31623;;60806;24427;574992;145311;581244;1420;322.526401057;2021-12-08@15:12:44
+v2.0.8;imex;178;31623;;60806;24427;575280;145320;581280;1414;321.301434860;2021-12-08@15:18:08
+v2.0.8;single;178;31623;;60806;24427;38084;11030;44120;1515;345.289206830;2021-12-08@15:25:40
+v2.0.8;single;178;31623;;60806;24427;37424;10899;43596;1477;336.220475529;2021-12-08@15:31:18
+v2.0.8;single;178;31623;;60806;24427;37612;10900;43600;1598;366.610944496;2021-12-08@15:37:28
+v2.0.8;single;178;31623;;60806;24427;37036;10827;43308;1398;318.190836344;2021-12-08@15:42:48
+v2.0.8;single;178;31623;;60806;24427;37712;10921;43684;1415;321.954921245;2021-12-08@15:48:12
+v2.0.8;single;178;31623;;60806;24427;37636;10960;43840;1400;318.999584610;2021-12-08@15:53:33
+v2.0.8;single;178;31623;;60806;24427;37396;10804;43216;1373;312.399063378;2021-12-08@15:58:47
+v2.0.8;single;178;31623;;60806;24427;37112;10810;43240;1430;325.478678293;2021-12-08@16:04:15
+v2.0.8;mulimex;178;31623;;60806;24427;1653752;414960;1659840;2441;555.587873145;2021-12-08@16:15:18
+v2.0.8;mulimex;178;31623;;60806;24427;1593268;399833;1599332;2624;604.267722703;2021-12-08@16:25:27
+v2.0.8;mulimex;178;31623;;60806;24427;1587784;398538;1594152;2413;554.220212078;2021-12-08@16:34:46
+v2.0.8;mulimex;178;31623;;60806;24427;1557124;390857;1563428;2570;590.778817550;2021-12-08@16:44:42
+v2.0.8;mulimex;178;31623;;60806;24427;1597168;400850;1603400;2602;598.768923543;2021-12-08@16:54:46
+v2.0.8;mulimex;178;31623;;60806;24427;1599004;401244;1604976;1649;379.945126131;2021-12-08@17:04:46
+v2.0.8;mulimex;178;31623;;60806;24427;1584080;397580;1590320;2595;594.474870469;2021-12-08@17:14:45
+v2.0.8;mulimex;178;31623;;60806;24427;1591412;399453;1597812;2635;602.206602542;2021-12-08@17:24:53
+v2.0.8;multi;316;31623;;61364;24592;1817408;455885;1823540;4079;940.025651339;2021-12-08@17:43:31
+v2.0.8;multi;316;31623;;61364;24592;1817380;455894;1823576;4088;940.532223102;2021-12-08@17:59:17
+v2.0.8;multi;316;31623;;61364;24592;1817440;455922;1823688;4108;944.262149929;2021-12-08@18:15:07
+v2.0.8;multi;316;31623;;61364;24592;1817604;455939;1823756;4096;940.907790885;2021-12-08@18:30:54
+v2.0.8;multi;316;31623;;61364;24592;1817448;455894;1823576;4060;938.543177206;2021-12-08@18:46:39
+v2.0.8;multi;316;31623;;61364;24592;1817976;456045;1824180;4107;945.413934584;2021-12-08@19:02:31
+v2.0.8;multi;316;31623;;61364;24592;1817576;455937;1823748;4079;940.798451355;2021-12-08@19:18:17
+v2.0.8;multi;316;31623;;61364;24592;1847160;463294;1853176;3885;890.428946122;2021-12-08@19:44:11
+v2.0.8;imex;316;31623;;61364;24592;984560;247723;990892;2788;637.817606902;2021-12-08@19:58:29
+v2.0.8;imex;316;31623;;61364;24592;983444;247418;989672;2572;588.050905900;2021-12-08@20:08:21
+v2.0.8;imex;316;31623;;61364;24592;984100;247575;990300;2601;592.756215016;2021-12-08@20:18:16
+v2.0.8;imex;316;31623;;61364;24592;983544;247402;989608;2595;592.259221360;2021-12-08@20:28:11
+v2.0.8;imex;316;31623;;61364;24592;983388;247426;989704;2538;582.954021881;2021-12-08@20:37:56
+v2.0.8;imex;316;31623;;61364;24592;983320;247400;989600;2879;660.381515865;2021-12-08@20:48:59
+v2.0.8;imex;316;31623;;61364;24592;984616;247705;990820;2628;600.677377561;2021-12-08@20:59:02
+v2.0.8;imex;316;31623;;61364;24592;984460;247649;990596;2436;556.008854656;2021-12-08@21:08:21
+v2.0.8;single;316;31623;;61364;24592;43508;12472;49888;2884;657.314033765;2021-12-08@21:22:35
+v2.0.8;single;316;31623;;61364;24592;44604;12646;50584;2721;621.343520425;2021-12-08@21:32:58
+v2.0.8;single;316;31623;;61364;24592;44628;12665;50660;2978;684.008287181;2021-12-08@21:44:24
+v2.0.8;single;316;31623;;61364;24592;44908;12694;50776;2821;646.099908630;2021-12-08@21:55:13
+v2.0.8;single;316;31623;;61364;24592;44468;12599;50396;2640;601.153770946;2021-12-08@22:05:16
+v2.0.8;single;316;31623;;61364;24592;44252;12564;50256;2851;650.704807431;2021-12-08@23:00:27
+v2.0.8;single;316;31623;;61364;24592;43760;12441;49764;2778;633.012615648;2021-12-08@23:11:03
+v2.0.8;single;316;31623;;61364;24592;43780;12507;50028;2715;622.376185441;2021-12-08@23:21:30
+v2.0.8;mulimex;316;31623;;61364;24592;2738700;686198;2744792;4099;943.279600625;2021-12-08@23:40:30
+v2.0.8;mulimex;316;31623;;61364;24592;2738684;686236;2744944;4114;946.200502053;2021-12-08@23:56:25
+v2.0.8;mulimex;316;31623;;61364;24592;2740232;686610;2746440;4118;947.239619301;2021-12-09@00:12:22
+v2.0.8;mulimex;316;31623;;61364;24592;2740516;686654;2746616;4092;941.296457258;2021-12-09@00:28:13
+v2.0.8;mulimex;316;31623;;61364;24592;2739040;686269;2745076;4110;946.010538983;2021-12-09@00:44:08
+v2.0.8;mulimex;316;31623;;61364;24592;2738760;686210;2744840;4095;947.546542409;2021-12-09@01:00:05
+v2.0.8;mulimex;316;31623;;61364;24592;2739056;686287;2745148;4107;945.049324731;2021-12-09@01:16:00
+v2.0.8;mulimex;316;31623;;61364;24592;2739096;686292;2745168;3286;759.732133419;2021-12-09@01:31:57
+v2.0.8;multi;10;56234;;89496;27046;142696;37222;148888;187;43.076460176;2021-12-09@01:34:17
+v2.0.8;multi;10;56234;;89496;27046;142692;37217;148868;194;44.610942153;2021-12-09@01:35:05
+v2.0.8;multi;10;56234;;89496;27046;142788;37191;148764;193;44.413673811;2021-12-09@01:35:53
+v2.0.8;multi;10;56234;;89496;27046;142752;37212;148848;193;44.373585357;2021-12-09@01:36:41
+v2.0.8;multi;10;56234;;89496;27046;142580;37212;148848;193;44.385711186;2021-12-09@01:37:29
+v2.0.8;multi;10;56234;;89496;27046;142560;37221;148884;193;44.464580964;2021-12-09@01:38:17
+v2.0.8;multi;10;56234;;89496;27046;142652;37204;148816;193;44.421442437;2021-12-09@01:39:05
+v2.0.8;multi;10;56234;;89496;27046;142916;37200;148800;193;44.419207089;2021-12-09@01:39:53
+v2.0.8;imex;10;56234;;89496;27046;105644;27935;111740;100;22.747002538;2021-12-09@01:40:30
+v2.0.8;imex;10;56234;;89496;27046;105388;27918;111672;105;23.876284289;2021-12-09@01:40:57
+v2.0.8;imex;10;56234;;89496;27046;105468;27907;111628;102;23.225126913;2021-12-09@01:41:24
+v2.0.8;imex;10;56234;;89496;27046;105416;27891;111564;123;27.996070618;2021-12-09@01:41:56
+v2.0.8;imex;10;56234;;89496;27046;105440;27907;111628;106;24.117040667;2021-12-09@01:42:24
+v2.0.8;imex;10;56234;;89496;27046;105388;27937;111748;106;24.162428072;2021-12-09@01:42:51
+v2.0.8;imex;10;56234;;89496;27046;105340;27892;111568;101;22.983686177;2021-12-09@01:43:18
+v2.0.8;imex;10;56234;;89496;27046;105516;27945;111780;104;23.691121022;2021-12-09@01:43:46
+v2.0.8;single;10;56234;;89496;27046;34692;10169;40676;102;23.223283493;2021-12-09@01:44:23
+v2.0.8;single;10;56234;;89496;27046;34636;10185;40740;109;24.834617029;2021-12-09@01:44:51
+v2.0.8;single;10;56234;;89496;27046;34708;10197;40788;108;24.619898505;2021-12-09@01:45:19
+v2.0.8;single;10;56234;;89496;27046;34840;10184;40736;109;24.840966122;2021-12-09@01:45:48
+v2.0.8;single;10;56234;;89496;27046;34500;10189;40756;110;25.044417012;2021-12-09@01:46:17
+v2.0.8;single;10;56234;;89496;27046;34560;10245;40980;103;23.456869516;2021-12-09@01:46:44
+v2.0.8;single;10;56234;;89496;27046;34680;10208;40832;105;23.928176334;2021-12-09@01:47:11
+v2.0.8;single;10;56234;;89496;27046;34760;10202;40808;106;24.150051670;2021-12-09@01:47:39
+v2.0.8;mulimex;10;56234;;89496;27046;189712;49024;196096;188;43.298753541;2021-12-09@01:48:36
+v2.0.8;mulimex;10;56234;;89496;27046;189896;48995;195980;194;44.652787154;2021-12-09@01:49:24
+v2.0.8;mulimex;10;56234;;89496;27046;189904;49007;196028;194;44.645481839;2021-12-09@01:50:13
+v2.0.8;mulimex;10;56234;;89496;27046;189740;49000;196000;195;44.824372111;2021-12-09@01:51:01
+v2.0.8;mulimex;10;56234;;89496;27046;189940;49022;196088;194;44.643335669;2021-12-09@01:51:50
+v2.0.8;mulimex;10;56234;;89496;27046;190076;49002;196008;194;44.636194098;2021-12-09@01:52:38
+v2.0.8;mulimex;10;56234;;89496;27046;189788;49011;196044;195;44.867962880;2021-12-09@01:53:27
+v2.0.8;mulimex;10;56234;;89496;27046;189940;49000;196000;194;44.655484407;2021-12-09@01:54:15
+v2.0.8;multi;18;56234;;97395;27048;220856;56793;227172;365;84.242500491;2021-12-09@01:55:56
+v2.0.8;multi;18;56234;;97395;27048;220944;56797;227188;370;85.299469540;2021-12-09@01:57:25
+v2.0.8;multi;18;56234;;97395;27048;221188;56814;227256;371;85.548376086;2021-12-09@01:58:55
+v2.0.8;multi;18;56234;;97395;27048;221100;56785;227140;370;85.294809720;2021-12-09@02:00:24
+v2.0.8;multi;18;56234;;97395;27048;221248;56814;227256;370;85.313751432;2021-12-09@02:01:53
+v2.0.8;multi;18;56234;;97395;27048;220880;56800;227200;370;85.418382552;2021-12-09@02:03:23
+v2.0.8;multi;18;56234;;97395;27048;220896;56802;227208;371;85.577290839;2021-12-09@02:04:52
+v2.0.8;multi;18;56234;;97395;27048;220920;56825;227300;371;85.487229091;2021-12-09@02:06:22
+v2.0.8;imex;18;56234;;97395;27048;138196;36107;144428;174;39.863860580;2021-12-09@02:07:19
+v2.0.8;imex;18;56234;;97395;27048;138404;36103;144412;177;40.446869642;2021-12-09@02:08:03
+v2.0.8;imex;18;56234;;97395;27048;138384;36080;144320;170;38.827586332;2021-12-09@02:08:46
+v2.0.8;imex;18;56234;;97395;27048;138184;36077;144308;173;39.501912238;2021-12-09@02:09:29
+v2.0.8;imex;18;56234;;97395;27048;138212;36113;144452;167;38.114783504;2021-12-09@02:10:11
+v2.0.8;imex;18;56234;;97395;27048;138320;36096;144384;172;39.300459014;2021-12-09@02:10:54
+v2.0.8;imex;18;56234;;97395;27048;138060;36080;144320;172;39.272846939;2021-12-09@02:11:37
+v2.0.8;imex;18;56234;;97395;27048;138360;36110;144440;172;39.298479669;2021-12-09@02:12:20
+v2.0.8;single;18;56234;;97395;27048;38092;11076;44304;177;40.405539648;2021-12-09@02:13:17
+v2.0.8;single;18;56234;;97395;27048;38104;11088;44352;179;40.849114995;2021-12-09@02:14:02
+v2.0.8;single;18;56234;;97395;27048;38236;11085;44340;179;40.876602451;2021-12-09@02:14:46
+v2.0.8;single;18;56234;;97395;27048;38228;11092;44368;171;39.087449223;2021-12-09@02:15:29
+v2.0.8;single;18;56234;;97395;27048;38348;11091;44364;177;40.396962129;2021-12-09@02:16:13
+v2.0.8;single;18;56234;;97395;27048;38184;11086;44344;219;49.987324884;2021-12-09@02:17:07
+v2.0.8;single;18;56234;;97395;27048;38188;11098;44392;177;40.386130004;2021-12-09@02:17:51
+v2.0.8;single;18;56234;;97395;27048;38240;11095;44380;179;40.872568173;2021-12-09@02:18:35
+v2.0.8;mulimex;18;56234;;97395;27048;294980;75268;301072;368;84.825866604;2021-12-09@02:20:17
+v2.0.8;mulimex;18;56234;;97395;27048;294844;75261;301044;378;87.147814315;2021-12-09@02:21:48
+v2.0.8;mulimex;18;56234;;97395;27048;295148;75264;301056;372;85.749551801;2021-12-09@02:23:18
+v2.0.8;mulimex;18;56234;;97395;27048;294764;75250;301000;373;86.102422714;2021-12-09@02:24:48
+v2.0.8;mulimex;18;56234;;97395;27048;294928;75268;301072;372;85.750423733;2021-12-09@02:26:18
+v2.0.8;mulimex;18;56234;;97395;27048;294912;75279;301116;376;86.669508184;2021-12-09@02:27:48
+v2.0.8;mulimex;18;56234;;97395;27048;294756;75265;301060;372;85.807379445;2021-12-09@02:29:18
+v2.0.8;mulimex;18;56234;;97395;27048;294792;75240;300960;372;85.856400355;2021-12-09@02:30:48
+v2.0.8;multi;32;56234;;102105;27070;352820;89735;358940;679;156.724959930;2021-12-09@02:33:47
+v2.0.8;multi;32;56234;;102105;27070;352900;89768;359072;685;158.022130913;2021-12-09@02:36:29
+v2.0.8;multi;32;56234;;102105;27070;352724;89723;358892;682;157.578659868;2021-12-09@02:39:11
+v2.0.8;multi;32;56234;;102105;27070;352744;89750;359000;684;157.865235335;2021-12-09@02:41:53
+v2.0.8;multi;32;56234;;102105;27070;352952;89751;359004;683;157.586056618;2021-12-09@02:44:35
+v2.0.8;multi;32;56234;;102105;27070;352916;89739;358956;684;157.860741247;2021-12-09@02:47:17
+v2.0.8;multi;32;56234;;102105;27070;352768;89712;358848;684;157.830419550;2021-12-09@02:49:59
+v2.0.8;multi;32;56234;;102105;27070;353076;89768;359072;685;157.965420749;2021-12-09@02:52:41
+v2.0.8;imex;32;56234;;102105;27070;188048;48630;194520;301;68.873587314;2021-12-09@02:54:14
+v2.0.8;imex;32;56234;;102105;27070;188232;48612;194448;296;67.775865835;2021-12-09@02:55:25
+v2.0.8;imex;32;56234;;102105;27070;188232;48635;194540;296;67.713965671;2021-12-09@02:56:37
+v2.0.8;imex;32;56234;;102105;27070;188308;48595;194380;294;67.300473996;2021-12-09@02:57:48
+v2.0.8;imex;32;56234;;102105;27070;188196;48604;194416;297;67.966663623;2021-12-09@02:59:00
+v2.0.8;imex;32;56234;;102105;27070;188212;48593;194372;299;68.506095881;2021-12-09@03:00:12
+v2.0.8;imex;32;56234;;102105;27070;188260;48609;194436;296;67.765148938;2021-12-09@03:01:23
+v2.0.8;imex;32;56234;;102105;27070;188300;48624;194496;295;67.689075853;2021-12-09@03:02:35
+v2.0.8;single;32;56234;;102105;27070;41008;11845;47380;314;71.812278825;2021-12-09@03:04:09
+v2.0.8;single;32;56234;;102105;27070;41468;11856;47424;307;70.206675400;2021-12-09@03:05:23
+v2.0.8;single;32;56234;;102105;27070;41492;11852;47408;308;70.420815006;2021-12-09@03:06:37
+v2.0.8;single;32;56234;;102105;27070;41152;11852;47408;307;70.215297931;2021-12-09@03:07:51
+v2.0.8;single;32;56234;;102105;27070;41376;11871;47484;303;69.291348679;2021-12-09@03:09:04
+v2.0.8;single;32;56234;;102105;27070;41360;11840;47360;305;69.714203976;2021-12-09@03:10:18
+v2.0.8;single;32;56234;;102105;27070;41244;11849;47396;311;71.085526216;2021-12-09@03:11:32
+v2.0.8;single;32;56234;;102105;27070;41204;11869;47476;318;72.743029581;2021-12-09@03:12:49
+v2.0.8;mulimex;32;56234;;102105;27070;471504;119440;477760;682;157.544319694;2021-12-09@03:15:49
+v2.0.8;mulimex;32;56234;;102105;27070;471784;119493;477972;687;158.368983008;2021-12-09@03:18:32
+v2.0.8;mulimex;32;56234;;102105;27070;471812;119469;477876;687;158.386644390;2021-12-09@03:21:14
+v2.0.8;mulimex;32;56234;;102105;27070;471448;119446;477784;686;158.194186036;2021-12-09@03:23:57
+v2.0.8;mulimex;32;56234;;102105;27070;471520;119452;477808;686;158.401780461;2021-12-09@03:26:40
+v2.0.8;mulimex;32;56234;;102105;27070;471372;119407;477628;685;158.096997037;2021-12-09@03:29:22
+v2.0.8;mulimex;32;56234;;102105;27070;471640;119440;477760;687;158.530682276;2021-12-09@03:32:05
+v2.0.8;mulimex;32;56234;;102105;27070;471584;119483;477932;687;158.541124463;2021-12-09@03:34:48
+v2.0.8;multi;56;56234;;104619;27074;573900;145002;580008;1215;280.398077334;2021-12-09@03:40:00
+v2.0.8;multi;56;56234;;104619;27074;574072;145022;580088;1221;281.968479587;2021-12-09@03:44:47
+v2.0.8;multi;56;56234;;104619;27074;574052;145064;580256;1219;281.554420970;2021-12-09@03:49:33
+v2.0.8;multi;56;56234;;104619;27074;573896;145016;580064;1222;282.031923643;2021-12-09@03:54:20
+v2.0.8;multi;56;56234;;104619;27074;573760;145016;580064;1224;281.715512892;2021-12-09@03:59:06
+v2.0.8;multi;56;56234;;104619;27074;573972;145030;580120;1221;281.836097055;2021-12-09@04:03:53
+v2.0.8;multi;56;56234;;104619;27074;573812;144986;579944;1223;281.716253380;2021-12-09@04:08:39
+v2.0.8;multi;56;56234;;104619;27074;573896;144994;579976;1224;281.764882679;2021-12-09@04:13:26
+v2.0.8;imex;56;56234;;104619;27074;269332;68886;275544;535;122.765102225;2021-12-09@04:16:06
+v2.0.8;imex;56;56234;;104619;27074;269336;68875;275500;517;118.646660092;2021-12-09@04:18:08
+v2.0.8;imex;56;56234;;104619;27074;269236;68805;275220;512;117.515803180;2021-12-09@04:20:10
+v2.0.8;imex;56;56234;;104619;27074;269028;68830;275320;528;121.109350145;2021-12-09@04:22:15
+v2.0.8;imex;56;56234;;104619;27074;269552;68896;275584;514;117.963522291;2021-12-09@04:24:16
+v2.0.8;imex;56;56234;;104619;27074;268996;68817;275268;512;117.517070977;2021-12-09@04:26:18
+v2.0.8;imex;56;56234;;104619;27074;269356;68844;275376;511;117.291517129;2021-12-09@04:28:19
+v2.0.8;imex;56;56234;;104619;27074;269040;68836;275344;506;116.166008720;2021-12-09@04:30:19
+v2.0.8;single;56;56234;;104619;27074;44348;12626;50504;547;125.502251256;2021-12-09@04:33:01
+v2.0.8;single;56;56234;;104619;27074;44324;12620;50480;531;121.833247022;2021-12-09@04:35:07
+v2.0.8;single;56;56234;;104619;27074;44236;12633;50532;533;122.328728488;2021-12-09@04:37:13
+v2.0.8;single;56;56234;;104619;27074;44172;12622;50488;531;121.834201032;2021-12-09@04:39:18
+v2.0.8;single;56;56234;;104619;27074;44068;12602;50408;533;122.345329114;2021-12-09@04:41:24
+v2.0.8;single;56;56234;;104619;27074;44580;12638;50552;539;123.687200017;2021-12-09@04:43:31
+v2.0.8;single;56;56234;;104619;27074;44320;12611;50444;536;123.013284308;2021-12-09@04:45:38
+v2.0.8;single;56;56234;;104619;27074;44476;12642;50568;537;123.200488144;2021-12-09@04:47:45
+v2.0.8;mulimex;56;56234;;104619;27074;769032;193772;775088;1220;281.545428608;2021-12-09@04:53:03
+v2.0.8;mulimex;56;56234;;104619;27074;768960;193794;775176;1224;282.635176476;2021-12-09@04:57:51
+v2.0.8;mulimex;56;56234;;104619;27074;768900;193760;775040;1223;282.262223337;2021-12-09@05:02:38
+v2.0.8;mulimex;56;56234;;104619;27074;768984;193788;775152;1224;282.584243331;2021-12-09@05:07:26
+v2.0.8;mulimex;56;56234;;104619;27074;769200;193764;775056;1224;282.551595087;2021-12-09@05:12:14
+v2.0.8;mulimex;56;56234;;104619;27074;769172;193781;775124;1223;282.503140269;2021-12-09@05:17:01
+v2.0.8;mulimex;56;56234;;104619;27074;769276;193781;775124;1223;282.592751664;2021-12-09@05:21:49
+v2.0.8;mulimex;56;56234;;104619;27074;769024;193813;775252;1225;282.793893968;2021-12-09@05:26:37
+v2.0.8;multi;100;56234;;106396;27105;977892;246003;984012;2267;523.926696862;2021-12-09@05:36:14
+v2.0.8;multi;100;56234;;106396;27105;978152;246036;984144;2246;519.895864941;2021-12-09@05:45:00
+v2.0.8;multi;100;56234;;106396;27105;978028;245997;983988;2253;520.939267948;2021-12-09@05:53:46
+v2.0.8;multi;100;56234;;106396;27105;977692;245961;983844;2884;667.416313194;2021-12-09@06:05:00
+v2.0.8;multi;100;56234;;106396;27105;978300;246075;984300;2235;517.771739337;2021-12-09@06:13:43
+v2.0.8;multi;100;56234;;106396;27105;978076;246075;984300;2506;584.021092673;2021-12-09@06:23:33
+v2.0.8;multi;100;56234;;106396;27105;977724;246026;984104;2244;520.745145256;2021-12-09@06:32:19
+v2.0.8;multi;100;56234;;106396;27105;977984;246053;984212;2254;522.625676561;2021-12-09@06:41:08
+v2.0.8;imex;100;56234;;106396;27105;415120;105351;421404;954;219.437474200;2021-12-09@06:45:52
+v2.0.8;imex;100;56234;;106396;27105;414796;105291;421164;911;209.829620794;2021-12-09@06:49:26
+v2.0.8;imex;100;56234;;106396;27105;414812;105273;421092;904;208.213314639;2021-12-09@06:52:58
+v2.0.8;imex;100;56234;;106396;27105;414948;105270;421080;914;210.435671631;2021-12-09@06:56:33
+v2.0.8;imex;100;56234;;106396;27105;414520;105205;420820;907;208.992456957;2021-12-09@07:00:06
+v2.0.8;imex;100;56234;;106396;27105;415104;105332;421328;914;210.359145899;2021-12-09@07:03:40
+v2.0.8;imex;100;56234;;106396;27105;414936;105244;420976;916;210.990511293;2021-12-09@07:07:15
+v2.0.8;imex;100;56234;;106396;27105;415236;105322;421288;924;212.864787628;2021-12-09@07:10:52
+v2.0.8;single;100;56234;;106396;27105;48900;13689;54756;988;227.390902194;2021-12-09@07:15:39
+v2.0.8;single;100;56234;;106396;27105;48656;13705;54820;947;218.178643096;2021-12-09@07:19:21
+v2.0.8;single;100;56234;;106396;27105;48380;13698;54792;953;219.684324595;2021-12-09@07:23:04
+v2.0.8;single;100;56234;;106396;27105;48636;13725;54900;964;221.989491097;2021-12-09@07:26:50
+v2.0.8;single;100;56234;;106396;27105;48760;13733;54932;947;218.187075110;2021-12-09@07:30:32
+v2.0.8;single;100;56234;;106396;27105;48632;13708;54832;942;216.990504838;2021-12-09@07:34:13
+v2.0.8;single;100;56234;;106396;27105;48592;13712;54848;950;219.023368140;2021-12-09@07:37:55
+v2.0.8;single;100;56234;;106396;27105;48516;13691;54764;950;218.824297595;2021-12-09@07:41:38
+v2.0.8;mulimex;100;56234;;106396;27105;1312932;329766;1319064;2241;519.681333288;2021-12-09@07:51:17
+v2.0.8;mulimex;100;56234;;106396;27105;1312936;329759;1319036;2261;524.523725959;2021-12-09@08:00:08
+v2.0.8;mulimex;100;56234;;106396;27105;1316704;330724;1322896;2271;526.067791525;2021-12-09@08:09:00
+v2.0.8;mulimex;100;56234;;106396;27105;1313008;329725;1318900;2287;529.322695333;2021-12-09@08:17:56
+v2.0.8;mulimex;100;56234;;106396;27105;1312720;329748;1318992;2261;523.545375331;2021-12-09@08:26:46
+v2.0.8;mulimex;100;56234;;106396;27105;1312852;329770;1319080;2253;522.250997383;2021-12-09@08:35:34
+v2.0.8;mulimex;100;56234;;106396;27105;1312464;329681;1318724;2317;536.325125812;2021-12-09@08:44:37
+v2.0.8;mulimex;100;56234;;106396;27105;1313072;329739;1318956;1224;281.675648409;2021-12-09@08:53:27
+v2.0.8;multi;178;56234;;107469;27173;1699680;426462;1705848;4006;933.640679377;2021-12-09@09:10:35
+v2.0.8;multi;178;56234;;107469;27173;1691980;424509;1698036;4202;975.480960960;2021-12-09@09:30:38
+v2.0.8;multi;178;56234;;107469;27173;1692056;424544;1698176;4393;1022.885671784;2021-12-09@09:47:48
+v2.0.8;multi;178;56234;;107469;27173;1692112;424567;1698268;4216;980.464629212;2021-12-09@10:04:17
+v2.0.8;multi;178;56234;;107469;27173;1726688;433203;1732812;4271;990.155722730;2021-12-09@10:20:55
+v2.0.8;multi;178;56234;;107469;27173;1704360;427584;1710336;4171;967.545148543;2021-12-09@10:37:10
+v2.0.8;multi;178;56234;;107469;27173;1692696;424629;1698516;4215;979.130552574;2021-12-09@10:53:37
+v2.0.8;multi;178;56234;;107469;27173;1722412;432171;1728684;4198;972.045807733;2021-12-09@11:09:57
+v2.0.8;imex;178;56234;;107469;27173;670004;169039;676156;1776;410.361222060;2021-12-09@11:18:44
+v2.0.8;imex;178;56234;;107469;27173;671636;169440;677760;1800;415.415158479;2021-12-09@11:25:44
+v2.0.8;imex;178;56234;;107469;27173;669736;169005;676020;1682;388.352625214;2021-12-09@11:32:17
+v2.0.8;imex;178;56234;;107469;27173;669652;168949;675796;1636;378.256284325;2021-12-09@11:38:39
+v2.0.8;imex;178;56234;;107469;27173;670184;169133;676532;1638;378.576819179;2021-12-09@11:45:02
+v2.0.8;imex;178;56234;;107469;27173;670484;169175;676700;1685;389.622863147;2021-12-09@11:51:36
+v2.0.8;imex;178;56234;;107469;27173;670116;169067;676268;1645;380.161810258;2021-12-09@11:58:00
+v2.0.8;imex;178;56234;;107469;27173;670572;169206;676824;1670;386.420856463;2021-12-09@12:04:31
+v2.0.8;single;178;56234;;107469;27173;54052;14997;59988;1852;426.861549282;2021-12-09@12:13:23
+v2.0.8;single;178;56234;;107469;27173;53752;15012;60048;1713;395.364411427;2021-12-09@12:20:02
+v2.0.8;single;178;56234;;107469;27173;53760;14989;59956;1733;400.594933515;2021-12-09@12:26:46
+v2.0.8;single;178;56234;;107469;27173;53684;14977;59908;1694;391.627934647;2021-12-09@12:33:22
+v2.0.8;single;178;56234;;107469;27173;53544;14904;59616;1709;394.959460176;2021-12-09@12:40:00
+v2.0.8;single;178;56234;;107469;27173;53800;15024;60096;1722;397.759941738;2021-12-09@12:46:42
+v2.0.8;single;178;56234;;107469;27173;53860;15046;60184;1692;391.594794102;2021-12-09@12:53:17
+v2.0.8;single;178;56234;;107469;27173;53880;14950;59800;1692;390.680971967;2021-12-09@12:59:51
+v2.0.8;mulimex;178;56234;;107469;27173;2338648;586215;2344860;4023;936.017445147;2021-12-09@13:17:13
+v2.0.8;mulimex;178;56234;;107469;27173;2337864;585988;2343952;4041;940.990618366;2021-12-09@13:33:02
+v2.0.8;mulimex;178;56234;;107469;27173;2277424;570870;2283480;4039;936.371529079;2021-12-09@13:48:47
+v2.0.8;mulimex;178;56234;;107469;27173;2290092;574028;2296112;3700;865.724553463;2021-12-09@14:07:01
+v2.0.8;mulimex;178;56234;;107469;27173;2280928;571721;2286884;4165;975.368066359;2021-12-09@14:23:25
+v2.0.8;mulimex;178;56234;;107469;27173;2275232;570339;2281356;4037;942.583291360;2021-12-09@14:39:16
+v2.0.8;mulimex;178;56234;;107469;27173;2275076;570335;2281340;4059;948.040280054;2021-12-09@14:55:13
+v2.0.8;mulimex;178;56234;;107469;27173;2317016;580747;2322988;4008;934.728786925;2021-12-09@15:10:57
+v2.0.8;multi;316;56234;;108134;27288;2982428;747178;2988712;7069;1645.763423739;2021-12-09@15:41:16
+v2.0.8;multi;316;56234;;108134;27288;3021724;756982;3027928;7376;1723.483024098;2021-12-09@16:10:11
+v2.0.8;multi;316;56234;;108134;27288;2975452;745339;2981356;7056;1651.955468093;2021-12-09@16:37:54
+v2.0.8;multi;316;56234;;108134;27288;2954964;740284;2961136;7524;1755.771361504;2021-12-09@17:15:26
+v2.0.8;multi;316;56234;;108134;27288;3039412;761385;3045540;6925;1620.905531083;2021-12-09@17:52:38
+v2.0.8;multi;316;56234;;108134;27288;2954708;740192;2960768;7259;1695.924555217;2021-12-09@18:37:24
+v2.0.8;multi;316;56234;;108134;27288;2954412;740119;2960476;7262;1695.996853746;2021-12-09@19:05:52
+v2.0.8;multi;316;56234;;108134;27288;3008228;753575;3014300;6266;1465.627322403;2021-12-09@19:34:09
+v2.0.8;imex;316;56234;;108134;27288;1120464;281684;1126736;3427;796.432706981;2021-12-09@19:51:03
+v2.0.8;imex;316;56234;;108134;27288;1121164;281804;1127216;3342;772.079363080;2021-12-09@20:04:00
+v2.0.8;imex;316;56234;;108134;27288;1120360;281661;1126644;3204;742.032109509;2021-12-09@20:16:27
+v2.0.8;imex;316;56234;;108134;27288;1121228;281838;1127352;3501;810.484132004;2021-12-09@20:30:02
+v2.0.8;imex;316;56234;;108134;27288;1120212;281561;1126244;3423;790.724751814;2021-12-09@20:43:18
+v2.0.8;imex;316;56234;;108134;27288;1121304;281817;1127268;3132;724.962736472;2021-12-09@20:55:28
+v2.0.8;imex;316;56234;;108134;27288;1120072;281579;1126316;3276;756.808201315;2021-12-09@21:08:10
+v2.0.8;imex;316;56234;;108134;27288;1121312;281887;1127548;3423;791.096044598;2021-12-09@21:21:26
+v2.0.8;single;316;56234;;108134;27288;63192;17328;69312;3526;820.375490660;2021-12-09@21:38:21
+v2.0.8;single;316;56234;;108134;27288;62120;17071;68284;3767;872.360939351;2021-12-09@21:52:58
+v2.0.8;single;316;56234;;108134;27288;64692;17647;70588;3222;746.195466983;2021-12-09@22:05:28
+v2.0.8;single;316;56234;;108134;27288;64096;17519;70076;3208;743.262772134;2021-12-09@22:17:55
+v2.0.8;single;316;56234;;108134;27288;63044;17309;69236;3366;778.216515068;2021-12-09@22:30:57
+v2.0.8;single;316;56234;;108134;27288;63388;17308;69232;3357;777.614062224;2021-12-09@22:43:59
+v2.0.8;single;316;56234;;108134;27288;63032;17284;69136;3472;803.113882265;2021-12-09@22:57:26
+v2.0.8;single;316;56234;;108134;27288;63600;17364;69456;3264;756.433835243;2021-12-09@23:10:06
+v2.0.8;mulimex;316;56234;;108134;27288;4015060;1005320;4021280;6419;1498.673693895;2021-12-09@23:45:35
+v2.0.8;mulimex;316;56234;;108134;27288;4023336;1007386;4029544;7218;1693.209656559;2021-12-10@00:14:02
+v2.0.8;mulimex;316;56234;;108134;27288;4145892;1038037;4152148;7027;1647.495303583;2021-12-10@00:52:48
+v2.0.8;mulimex;316;56234;;108134;27288;4067076;1018274;4073096;6475;1515.253848630;2021-12-10@01:52:01
+v2.0.8;mulimex;316;56234;;108134;27288;4013040;1004824;4019296;7229;1691.493952292;2021-12-10@02:20:26
+v2.0.8;mulimex;316;56234;;108134;27288;4077188;1020810;4083240;7200;1691.526918780;2021-12-10@02:48:50
+v2.0.8;mulimex;316;56234;;108134;27288;3979960;996552;3986208;7216;1689.235991590;2021-12-10@03:17:14
+v2.0.8;mulimex;316;56234;;108134;27288;4064952;1017712;4070848;7188;1684.878327657;2021-12-10@03:45:32
+v2.0.8;multi;10;100000;;126751;52385;207180;53289;213156;256;61.422379061;2021-12-10@08:03:21
+v2.0.8;multi;10;100000;;126751;52385;207144;53317;213268;261;62.598339789;2021-12-10@08:04:27
+v2.0.8;multi;10;100000;;126751;52385;207032;53330;213320;263;63.008616201;2021-12-10@08:05:34
+v2.0.8;multi;10;100000;;126751;52385;206892;53313;213252;261;62.584602089;2021-12-10@08:06:40
+v2.0.8;multi;10;100000;;126751;52385;207060;53318;213272;262;62.757940658;2021-12-10@08:07:46
+v2.0.8;multi;10;100000;;126751;52385;207268;53372;213488;261;62.566563125;2021-12-10@08:08:53
+v2.0.8;multi;10;100000;;126751;52385;206964;53300;213200;261;62.595160233;2021-12-10@08:09:59
+v2.0.8;multi;10;100000;;126751;52385;207200;53363;213452;262;62.802329236;2021-12-10@08:11:06
+v2.0.8;imex;10;100000;;126751;52385;163032;42279;169116;163;38.670607040;2021-12-10@08:11:59
+v2.0.8;imex;10;100000;;126751;52385;162836;42296;169184;168;39.786845618;2021-12-10@08:12:43
+v2.0.8;imex;10;100000;;126751;52385;163364;42331;169324;166;39.358378706;2021-12-10@08:13:26
+v2.0.8;imex;10;100000;;126751;52385;163460;42382;169528;161;38.226190489;2021-12-10@08:14:08
+v2.0.8;imex;10;100000;;126751;52385;162920;42306;169224;166;39.361520596;2021-12-10@08:14:51
+v2.0.8;imex;10;100000;;126751;52385;163020;42303;169212;163;38.668722105;2021-12-10@08:15:34
+v2.0.8;imex;10;100000;;126751;52385;163000;42309;169236;163;38.630222251;2021-12-10@08:16:16
+v2.0.8;imex;10;100000;;126751;52385;163076;42274;169096;164;38.886226544;2021-12-10@08:16:59
+v2.0.8;single;10;100000;;126751;52385;47720;13496;53984;168;39.846843594;2021-12-10@08:17:54
+v2.0.8;single;10;100000;;126751;52385;48836;13737;54948;175;41.502038251;2021-12-10@08:18:39
+v2.0.8;single;10;100000;;126751;52385;48248;13613;54452;170;40.374474078;2021-12-10@08:19:23
+v2.0.8;single;10;100000;;126751;52385;48360;13602;54408;169;40.093415604;2021-12-10@08:20:07
+v2.0.8;single;10;100000;;126751;52385;48164;13594;54376;172;40.808377893;2021-12-10@08:20:51
+v2.0.8;single;10;100000;;126751;52385;48628;13649;54596;171;40.625741570;2021-12-10@08:21:36
+v2.0.8;single;10;100000;;126751;52385;48124;13611;54444;172;40.809039751;2021-12-10@08:22:20
+v2.0.8;single;10;100000;;126751;52385;48320;13623;54492;172;40.768748838;2021-12-10@08:23:04
+v2.0.8;mulimex;10;100000;;126751;52385;289288;73837;295348;257;61.657009484;2021-12-10@08:24:21
+v2.0.8;mulimex;10;100000;;126751;52385;289728;73964;295856;263;63.020400014;2021-12-10@08:25:28
+v2.0.8;mulimex;10;100000;;126751;52385;289948;74059;296236;262;62.793233488;2021-12-10@08:26:35
+v2.0.8;mulimex;10;100000;;126751;52385;289432;73931;295724;262;62.793702903;2021-12-10@08:27:42
+v2.0.8;mulimex;10;100000;;126751;52385;289612;73934;295736;262;62.771316175;2021-12-10@08:28:49
+v2.0.8;mulimex;10;100000;;126751;52385;289408;73867;295468;262;62.766908632;2021-12-10@08:29:55
+v2.0.8;mulimex;10;100000;;126751;52385;289184;73836;295344;262;62.795311186;2021-12-10@08:31:02
+v2.0.8;mulimex;10;100000;;126751;52385;289220;73862;295448;262;62.817272413;2021-12-10@08:32:09
+v2.0.8;multi;18;100000;;150528;52561;348400;88666;354664;540;130.489324272;2021-12-10@08:34:38
+v2.0.8;multi;18;100000;;150528;52561;348608;88660;354640;544;131.511207725;2021-12-10@08:36:54
+v2.0.8;multi;18;100000;;150528;52561;348680;88699;354796;545;131.566437230;2021-12-10@08:39:09
+v2.0.8;multi;18;100000;;150528;52561;348608;88663;354652;543;131.309395814;2021-12-10@08:41:25
+v2.0.8;multi;18;100000;;150528;52561;348844;88705;354820;543;131.294875974;2021-12-10@08:43:40
+v2.0.8;multi;18;100000;;150528;52561;348508;88681;354724;545;131.490671970;2021-12-10@08:45:55
+v2.0.8;multi;18;100000;;150528;52561;348424;88666;354664;545;131.502302428;2021-12-10@08:48:11
+v2.0.8;multi;18;100000;;150528;52561;348624;88687;354748;544;131.281956301;2021-12-10@08:50:26
+v2.0.8;imex;18;100000;;150528;52561;233052;59800;239200;287;68.101859285;2021-12-10@08:51:53
+v2.0.8;imex;18;100000;;150528;52561;232932;59756;239024;286;67.936193661;2021-12-10@08:53:05
+v2.0.8;imex;18;100000;;150528;52561;232692;59766;239064;286;67.894212419;2021-12-10@08:54:17
+v2.0.8;imex;18;100000;;150528;52561;232976;59748;238992;280;66.430536606;2021-12-10@08:55:27
+v2.0.8;imex;18;100000;;150528;52561;232712;59779;239116;292;69.312523916;2021-12-10@08:56:40
+v2.0.8;imex;18;100000;;150528;52561;233000;59786;239144;278;65.995881891;2021-12-10@08:57:50
+v2.0.8;imex;18;100000;;150528;52561;232784;59760;239040;282;66.905117325;2021-12-10@08:59:01
+v2.0.8;imex;18;100000;;150528;52561;232896;59776;239104;284;67.408694626;2021-12-10@09:00:12
+v2.0.8;single;18;100000;;150528;52561;57280;15824;63296;303;71.852114708;2021-12-10@09:01:42
+v2.0.8;single;18;100000;;150528;52561;56848;15818;63272;290;68.923846922;2021-12-10@09:02:55
+v2.0.8;single;18;100000;;150528;52561;57160;15822;63288;297;70.530116768;2021-12-10@09:04:09
+v2.0.8;single;18;100000;;150528;52561;57368;15846;63384;299;71.041915062;2021-12-10@09:05:24
+v2.0.8;single;18;100000;;150528;52561;57188;15830;63320;294;69.797519612;2021-12-10@09:06:37
+v2.0.8;single;18;100000;;150528;52561;57468;15876;63504;291;69.110833238;2021-12-10@09:07:50
+v2.0.8;single;18;100000;;150528;52561;57140;15847;63388;289;68.639002772;2021-12-10@09:09:02
+v2.0.8;single;18;100000;;150528;52561;57388;15846;63384;290;68.913569080;2021-12-10@09:10:15
+v2.0.8;mulimex;18;100000;;150528;52561;484416;122686;490744;540;130.553837694;2021-12-10@09:12:44
+v2.0.8;mulimex;18;100000;;150528;52561;484712;122676;490704;546;131.948042431;2021-12-10@09:15:00
+v2.0.8;mulimex;18;100000;;150528;52561;484424;122663;490652;546;132.018527845;2021-12-10@09:17:17
+v2.0.8;mulimex;18;100000;;150528;52561;484424;122686;490744;547;132.011198043;2021-12-10@09:19:33
+v2.0.8;mulimex;18;100000;;150528;52561;484524;122668;490672;547;132.034137333;2021-12-10@09:21:50
+v2.0.8;mulimex;18;100000;;150528;52561;484512;122680;490720;546;132.034952063;2021-12-10@09:24:06
+v2.0.8;mulimex;18;100000;;150528;52561;484608;122668;490672;545;131.694100866;2021-12-10@09:26:22
+v2.0.8;mulimex;18;100000;;150528;52561;484616;122655;490620;546;131.893197937;2021-12-10@09:28:38
+v2.0.8;multi;32;100000;;166748;52697;585500;147903;591612;1051;255.532629359;2021-12-10@09:33:18
+v2.0.8;multi;32;100000;;166748;52697;585464;147907;591628;1058;257.244346435;2021-12-10@09:37:40
+v2.0.8;multi;32;100000;;166748;52697;585556;147929;591716;1059;256.961497659;2021-12-10@09:42:01
+v2.0.8;multi;32;100000;;166748;52697;585472;147906;591624;1058;257.112199514;2021-12-10@09:46:23
+v2.0.8;multi;32;100000;;166748;52697;585676;147898;591592;1058;257.040912680;2021-12-10@09:50:45
+v2.0.8;multi;32;100000;;166748;52697;585416;147907;591628;1061;257.313266247;2021-12-10@09:55:07
+v2.0.8;multi;32;100000;;166748;52697;585332;147915;591660;1058;256.777926722;2021-12-10@09:59:28
+v2.0.8;multi;32;100000;;166748;52697;585756;147908;591632;1057;256.952081928;2021-12-10@10:03:50
+v2.0.8;imex;32;100000;;166748;52697;335240;85338;341352;506;120.751991642;2021-12-10@10:06:15
+v2.0.8;imex;32;100000;;166748;52697;334992;85336;341344;490;117.016551039;2021-12-10@10:08:16
+v2.0.8;imex;32;100000;;166748;52697;334944;85283;341132;486;115.992463342;2021-12-10@10:10:16
+v2.0.8;imex;32;100000;;166748;52697;335032;85300;341200;489;116.814684184;2021-12-10@10:12:17
+v2.0.8;imex;32;100000;;166748;52697;335028;85344;341376;510;121.783557333;2021-12-10@10:14:23
+v2.0.8;imex;32;100000;;166748;52697;334816;85284;341136;501;119.658040761;2021-12-10@10:16:26
+v2.0.8;imex;32;100000;;166748;52697;335148;85322;341288;497;118.590825695;2021-12-10@10:18:29
+v2.0.8;imex;32;100000;;166748;52697;334820;85317;341268;494;117.897587677;2021-12-10@10:20:31
+v2.0.8;single;32;100000;;166748;52697;64448;17675;70700;516;123.079794369;2021-12-10@10:22:58
+v2.0.8;single;32;100000;;166748;52697;64328;17686;70744;515;122.978158421;2021-12-10@10:25:05
+v2.0.8;single;32;100000;;166748;52697;64728;17699;70796;511;122.010874127;2021-12-10@10:27:11
+v2.0.8;single;32;100000;;166748;52697;64688;17656;70624;518;123.722731594;2021-12-10@10:29:18
+v2.0.8;single;32;100000;;166748;52697;64608;17704;70816;516;123.277272432;2021-12-10@10:31:25
+v2.0.8;single;32;100000;;166748;52697;64692;17693;70772;538;128.386620522;2021-12-10@10:33:37
+v2.0.8;single;32;100000;;166748;52697;64284;17685;70740;523;125.010457036;2021-12-10@10:35:46
+v2.0.8;single;32;100000;;166748;52697;64428;17712;70848;521;124.345744319;2021-12-10@10:37:54
+v2.0.8;mulimex;32;100000;;166748;52697;810824;204281;817124;1055;256.240882417;2021-12-10@10:42:34
+v2.0.8;mulimex;32;100000;;166748;52697;811256;204335;817340;1064;258.026130780;2021-12-10@10:46:57
+v2.0.8;mulimex;32;100000;;166748;52697;810872;204263;817052;1081;262.522433325;2021-12-10@10:51:24
+v2.0.8;mulimex;32;100000;;166748;52697;811256;204320;817280;1065;258.100905345;2021-12-10@10:55:47
+v2.0.8;mulimex;32;100000;;166748;52697;810972;204291;817164;1064;258.029904559;2021-12-10@11:00:10
+v2.0.8;mulimex;32;100000;;166748;52697;811280;204341;817364;1064;257.757754508;2021-12-10@11:04:33
+v2.0.8;mulimex;32;100000;;166748;52697;810812;204298;817192;1060;257.598729297;2021-12-10@11:08:55
+v2.0.8;mulimex;32;100000;;166748;52697;810768;204268;817072;1060;257.926354176;2021-12-10@11:13:18
+v2.0.8;multi;56;100000;;177146;52712;984564;247728;990912;1951;474.865680018;2021-12-10@11:21:47
+v2.0.8;multi;56;100000;;177146;52712;984792;247753;991012;1957;476.222394144;2021-12-10@11:29:49
+v2.0.8;multi;56;100000;;177146;52712;984952;247740;990960;1956;475.570635848;2021-12-10@11:37:50
+v2.0.8;multi;56;100000;;177146;52712;984900;247746;990984;1955;475.899522714;2021-12-10@11:45:51
+v2.0.8;multi;56;100000;;177146;52712;984628;247704;990816;1951;475.012637040;2021-12-10@11:53:52
+v2.0.8;multi;56;100000;;177146;52712;985000;247761;991044;1957;475.580521729;2021-12-10@12:01:53
+v2.0.8;multi;56;100000;;177146;52712;984672;247748;990992;1956;475.372066988;2021-12-10@12:09:53
+v2.0.8;multi;56;100000;;177146;52712;984836;247726;990904;1953;475.463190947;2021-12-10@12:17:54
+v2.0.8;imex;56;100000;;177146;52712;495208;125394;501576;898;215.066937792;2021-12-10@12:22:08
+v2.0.8;imex;56;100000;;177146;52712;495296;125334;501336;875;209.791672186;2021-12-10@12:25:42
+v2.0.8;imex;56;100000;;177146;52712;495128;125329;501316;873;209.367687161;2021-12-10@12:29:15
+v2.0.8;imex;56;100000;;177146;52712;495064;125323;501292;879;210.591852481;2021-12-10@12:32:50
+v2.0.8;imex;56;100000;;177146;52712;494948;125370;501480;876;209.979222487;2021-12-10@12:36:24
+v2.0.8;imex;56;100000;;177146;52712;495420;125388;501552;894;214.054642518;2021-12-10@12:40:02
+v2.0.8;imex;56;100000;;177146;52712;495308;125350;501400;878;210.553936800;2021-12-10@12:43:37
+v2.0.8;imex;56;100000;;177146;52712;495248;125352;501408;877;210.188968617;2021-12-10@12:47:11
+v2.0.8;single;56;100000;;177146;52712;71520;19403;77612;928;222.447862729;2021-12-10@12:51:30
+v2.0.8;single;56;100000;;177146;52712;71228;19345;77380;914;219.315697798;2021-12-10@12:55:13
+v2.0.8;single;56;100000;;177146;52712;71064;19374;77496;912;218.750667689;2021-12-10@12:58:56
+v2.0.8;single;56;100000;;177146;52712;71480;19388;77552;907;217.554823544;2021-12-10@13:02:37
+v2.0.8;single;56;100000;;177146;52712;71136;19358;77432;911;218.584815827;2021-12-10@13:06:19
+v2.0.8;single;56;100000;;177146;52712;71192;19369;77476;904;216.944834447;2021-12-10@13:10:00
+v2.0.8;single;56;100000;;177146;52712;71256;19381;77524;903;216.670268354;2021-12-10@13:13:40
+v2.0.8;single;56;100000;;177146;52712;71444;19349;77396;912;218.676539322;2021-12-10@13:17:23
+v2.0.8;mulimex;56;100000;;177146;52712;1359512;341403;1365612;1965;477.751909531;2021-12-10@13:25:57
+v2.0.8;mulimex;56;100000;;177146;52712;1359596;341468;1365872;1962;476.908165405;2021-12-10@13:34:00
+v2.0.8;mulimex;56;100000;;177146;52712;1359608;341465;1365860;1963;477.112198559;2021-12-10@13:42:04
+v2.0.8;mulimex;56;100000;;177146;52712;1359636;341419;1365676;1963;476.525478906;2021-12-10@13:50:07
+v2.0.8;mulimex;56;100000;;177146;52712;1359428;341396;1365584;1966;476.638603907;2021-12-10@13:58:09
+v2.0.8;mulimex;56;100000;;177146;52712;1359680;341480;1365920;1963;476.941676967;2021-12-10@14:06:13
+v2.0.8;mulimex;56;100000;;177146;52712;1359436;341431;1365724;1972;478.641511070;2021-12-10@14:14:17
+v2.0.8;mulimex;56;100000;;177146;52712;1359416;341414;1365656;1966;476.988056518;2021-12-10@14:22:21
+v2.0.8;multi;100;100000;;184114;52738;1713960;430068;1720272;3688;895.861507387;2021-12-10@14:38:11
+v2.0.8;multi;100;100000;;184114;52738;1713576;429937;1719748;3701;897.690082290;2021-12-10@14:53:16
+v2.0.8;multi;100;100000;;184114;52738;1713444;429927;1719708;3727;902.033207677;2021-12-10@15:08:26
+v2.0.8;multi;100;100000;;184114;52738;1713916;429976;1719904;3738;908.741144363;2021-12-10@15:23:42
+v2.0.8;multi;100;100000;;184114;52738;1714008;430015;1720060;3671;892.649549515;2021-12-10@15:38:42
+v2.0.8;multi;100;100000;;184114;52738;1713960;430016;1720064;3680;894.382012011;2021-12-10@15:53:44
+v2.0.8;multi;100;100000;;184114;52738;1713612;429948;1719792;3681;892.489340561;2021-12-10@16:08:44
+v2.0.8;multi;100;100000;;184114;52738;1713832;430002;1720008;3680;894.560041411;2021-12-10@16:23:46
+v2.0.8;imex;100;100000;;184114;52738;778156;196073;784292;1642;395.720583362;2021-12-10@16:31:28
+v2.0.8;imex;100;100000;;184114;52738;778344;196093;784372;1576;380.524516560;2021-12-10@16:37:53
+v2.0.8;imex;100;100000;;184114;52738;778224;196098;784392;1597;385.367538117;2021-12-10@16:44:23
+v2.0.8;imex;100;100000;;184114;52738;778408;196116;784464;1591;384.051018325;2021-12-10@16:50:51
+v2.0.8;imex;100;100000;;184114;52738;778596;196153;784612;1580;381.401205690;2021-12-10@16:57:17
+v2.0.8;imex;100;100000;;184114;52738;778212;196060;784240;1586;382.982382295;2021-12-10@17:03:45
+v2.0.8;imex;100;100000;;184114;52738;778436;196138;784552;1598;385.675210805;2021-12-10@17:10:14
+v2.0.8;imex;100;100000;;184114;52738;778044;196084;784336;1589;383.708026852;2021-12-10@17:16:42
+v2.0.8;single;100;100000;;184114;52738;78280;21122;84488;1719;414.137664009;2021-12-10@17:24:39
+v2.0.8;single;100;100000;;184114;52738;78364;21131;84524;1660;400.072047378;2021-12-10@17:31:23
+v2.0.8;single;100;100000;;184114;52738;78500;21173;84692;1652;398.091613145;2021-12-10@17:38:04
+v2.0.8;single;100;100000;;184114;52738;78536;21153;84612;1665;401.142907638;2021-12-10@17:44:49
+v2.0.8;single;100;100000;;184114;52738;78692;21221;84884;1655;398.961981207;2021-12-10@17:51:32
+v2.0.8;single;100;100000;;184114;52738;78540;21170;84680;1667;401.595647385;2021-12-10@17:58:17
+v2.0.8;single;100;100000;;184114;52738;78584;21170;84680;1733;417.163083625;2021-12-10@18:05:18
+v2.0.8;single;100;100000;;184114;52738;78460;21182;84728;1721;414.237359917;2021-12-10@18:12:16
+v2.0.8;mulimex;100;100000;;184114;52738;2360520;591716;2366864;3696;899.183164293;2021-12-10@18:28:17
+v2.0.8;mulimex;100;100000;;184114;52738;2360316;591657;2366628;3702;900.338327312;2021-12-10@18:43:26
+v2.0.8;mulimex;100;100000;;184114;52738;2360372;591623;2366492;3705;899.887592162;2021-12-10@18:58:35
+v2.0.8;mulimex;100;100000;;184114;52738;2359972;591564;2366256;3720;902.877746033;2021-12-10@19:13:46
+v2.0.8;mulimex;100;100000;;184114;52738;2360200;591648;2366592;3668;892.048996541;2021-12-10@19:28:47
+v2.0.8;mulimex;100;100000;;184114;52738;2360332;591607;2366428;2819;691.300006844;2021-12-10@19:43:51
+v2.0.8;mulimex;100;100000;;184114;52738;2360680;591670;2366680;3704;899.521566115;2021-12-10@19:59:00
+v2.0.8;mulimex;100;100000;;184114;52738;2360496;591655;2366620;3686;893.689240674;2021-12-10@20:14:02
+v2.0.8;multi;178;100000;;188000;52864;3018772;756202;3024808;6621;1622.367983252;2021-12-10@20:42:40
+v2.0.8;multi;178;100000;;188000;52864;2996336;750655;3002620;6889;1676.610774038;2021-12-10@21:10:48
+v2.0.8;multi;178;100000;;188000;52864;3005988;753029;3012116;5803;1423.152525213;2021-12-10@21:38:02

From ee84ff14a10ebae1e000946be56ff1d1277ca7d5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Jan 2022 16:04:03 +0100
Subject: [PATCH 078/431] Removing periodic wakeup of mainloop in debug version
 to search for notification issues

---
 sysdep/unix/io.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index cb6a0754..d18dbca4 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2051,6 +2051,7 @@ static btime loop_time;
 static void
 io_update_time(void)
 {
+  times_update();
   last_io_time = current_time();
 
   if (event_open)
@@ -2217,9 +2218,14 @@ io_loop(void)
       timers_fire(&main_birdloop.time, 1);
       io_close_event();
 
+#if DEBUGGING
+#define PERIODIC_WAKEUP	86400000
+#else
+#define PERIODIC_WAKEUP 3000
+#endif
 restart_poll:
       // FIXME
-      poll_tout = ((reload_requested || events) ? 0 : 3000); /* Time in milliseconds */
+      poll_tout = ((reload_requested || events) ? 0 : PERIODIC_WAKEUP); /* Time in milliseconds */
       if (t = timers_first(&main_birdloop.time))
       {
 	times_update();

From 3cf5e0f1443a1438ae3a84d0e91d7ad098590897 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 09:30:46 +0100
Subject: [PATCH 079/431] Dropping a nonsensical assert which broke Babel

---
 nest/rt-table.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2c0f1c63..2ed622cc 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -614,9 +614,6 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
   if (old && !bmap_test(&c->export_map, old->id))
     old = NULL;
 
-  if (old && (old->sender == c->in_req.hook))
-    bug("bad-behaved pipe");
-
   if (!new && !old)
     return;
 

From f22bab98186a52f6e7247422ead4332f4c37e0ce Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 10:30:55 +0100
Subject: [PATCH 080/431] Babel: fixed interface pool removal

---
 proto/babel/babel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 515b27e5..e56a6328 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1799,7 +1799,7 @@ babel_remove_iface(struct babel_proto *p, struct babel_iface *ifa)
 
   rem_node(NODE ifa);
 
-  rfree(ifa->pool); /* contains ifa itself, locks, socket, etc */
+  rp_free(ifa->pool, p->p.pool);  /* contains ifa itself, locks, socket, etc */
 }
 
 static int

From 87512ccdff9cb95847e3bec36893665558db5c95 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Jan 2022 13:10:01 +0100
Subject: [PATCH 081/431] Route table fast prune fixup

---
 nest/rt-table.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2ed622cc..5f1e1679 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2308,16 +2308,13 @@ rt_prune_table(void *data)
   if (tab->prune_state == 0)
     return;
 
+  if (tab->delete && !rt_fast_prune_ready(tab))
+    return;
+
   rt_lock_table(tab);
 
   if (tab->prune_state == 1)
   {
-    if (tab->delete && !rt_fast_prune_ready(tab))
-    {
-      rt_unlock_table(tab);
-      return;
-    }
-
     /* Mark channels to flush */
     WALK_LIST2(ih, n, tab->imports, n)
       if (ih->import_state == TIS_STOP)

From b5155d5cea6af783619144ca49648ad743cf4e38 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 14:49:58 +0100
Subject: [PATCH 082/431] Page cleanup routines updated to allow nested
 birdloops

---
 sysdep/unix/alloc.c | 49 ++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 24384d0e..c09a8356 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -61,7 +61,7 @@ alloc_page(void)
     node *n = HEAD(fp->list);
     rem_node(n);
     if ((--fp->cnt < fp->min) && !shutting_down)
-      ev_send(&global_work_list, fp->cleanup);
+      ev_send(fp->cleanup->list, fp->cleanup);
 
     void *ptr = n - FP_NODE_OFFSET;
     memset(ptr, 0, page_size);
@@ -94,7 +94,7 @@ free_page(void *ptr)
     memset(n, 0, sizeof(node));
     add_tail(&fp->list, n);
     if ((++fp->cnt > fp->max) && !shutting_down)
-      ev_send(&global_work_list, fp->cleanup);
+      ev_send(fp->cleanup->list, fp->cleanup);
   }
   else
 #endif
@@ -108,18 +108,21 @@ free_page(void *ptr)
 void
 flush_pages(struct birdloop *loop)
 {
-  ASSERT_DIE(birdloop_inside(&main_birdloop));
+  ASSERT_DIE(birdloop_inside(loop->parent->loop));
 
-  add_tail_list(&GFP->list, &loop->pages.list);
-  GFP->cnt += loop->pages.cnt;
+  struct free_pages *fp = &loop->pages;
+  struct free_pages *pfp = &loop->parent->loop->pages;
+
+  add_tail_list(&pfp->list, &fp->list);
+  pfp->cnt += fp->cnt;
   
-  loop->pages.cnt = 0;
-  loop->pages.list = (list) {};
-  loop->pages.min = 0;
-  loop->pages.max = 0;
+  fp->cnt = 0;
+  fp->list = (list) {};
+  fp->min = 0;
+  fp->max = 0;
 
-  rfree(loop->pages.cleanup);
-  loop->pages.cleanup = NULL;
+  rfree(fp->cleanup);
+  fp->cleanup = NULL;
 }
 
 static void
@@ -128,15 +131,18 @@ cleanup_pages(void *data)
   struct birdloop *loop = data;
   birdloop_enter(loop);
 
-  struct free_pages *fp = &birdloop_current->pages;
+  ASSERT_DIE(birdloop_inside(loop->parent->loop));
 
-  while ((fp->cnt < fp->min) && (GFP->cnt > GFP->min))
+  struct free_pages *fp = &loop->pages;
+  struct free_pages *pfp = &loop->parent->loop->pages;
+
+  while ((fp->cnt < fp->min) && (pfp->cnt > pfp->min))
   {
-    node *n = HEAD(GFP->list);
+    node *n = HEAD(pfp->list);
     rem_node(n);
     add_tail(&fp->list, n);
     fp->cnt++;
-    GFP->cnt--;
+    pfp->cnt--;
   }
   
   while (fp->cnt < fp->min)
@@ -150,15 +156,15 @@ cleanup_pages(void *data)
   {
     node *n = HEAD(fp->list);
     rem_node(n);
-    add_tail(&GFP->list, n);
+    add_tail(&pfp->list, n);
     fp->cnt--;
-    GFP->cnt++;
+    pfp->cnt++;
   }
 
   birdloop_leave(loop);
 
-  if (!shutting_down && (GFP->cnt > GFP->max))
-    ev_send(&global_work_list, GFP->cleanup);
+  if (!shutting_down && (pfp->cnt > pfp->max))
+    ev_send(pfp->cleanup->list, pfp->cleanup);
 }
 
 static void
@@ -191,7 +197,8 @@ init_pages(struct birdloop *loop)
   struct free_pages *fp = &loop->pages;
 
   init_list(&fp->list);
-  fp->cleanup = ev_new_init(&root_pool, cleanup_pages, loop);
+  fp->cleanup = ev_new_init(loop->parent->loop->pool, cleanup_pages, loop);
+  fp->cleanup->list = (loop->parent->loop == &main_birdloop) ? &global_work_list : birdloop_event_list(loop->parent->loop);
   fp->min = 4;
   fp->max = 16;
 
@@ -202,7 +209,7 @@ init_pages(struct birdloop *loop)
   }
 }
 
-static event global_free_pages_cleanup_event = { .hook = cleanup_global_pages };
+static event global_free_pages_cleanup_event = { .hook = cleanup_global_pages, .list = &global_work_list };
 
 void resource_sys_init(void)
 {

From b6c9263543060141d79e205e1b3408099ad1afc4 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Jan 2022 14:06:49 +0100
Subject: [PATCH 083/431] Interfaces and neighbor notifications do properly
 enter protocol loops

---
 nest/iface.c    |  6 ++++--
 nest/neighbor.c | 10 ++++++++--
 nest/proto.c    | 15 ++++-----------
 nest/protocol.h | 12 ++++++++++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index dd4af243..bd2bb39a 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -166,7 +166,8 @@ ifa_notify_change_(unsigned c, struct ifa *a)
   DBG("IFA change notification (%x) for %s:%I\n", c, a->iface->name, a->ip);
 
   WALK_LIST(p, proto_list)
-    ifa_send_notify(p, c, a);
+    PROTO_LOCKED_FROM_MAIN(p)
+      ifa_send_notify(p, c, a);
 }
 
 static inline void
@@ -226,7 +227,8 @@ if_notify_change(unsigned c, struct iface *i)
       ifa_notify_change_(IF_CHANGE_DOWN, a);
 
   WALK_LIST(p, proto_list)
-    if_send_notify(p, c, i);
+    PROTO_LOCKED_FROM_MAIN(p)
+      if_send_notify(p, c, i);
 
   if (c & IF_CHANGE_UP)
     WALK_LIST(a, i->addrs)
diff --git a/nest/neighbor.c b/nest/neighbor.c
index cb2d1b2b..e10413bd 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -210,6 +210,8 @@ if_intersect(struct iface *ia, struct iface *ib)
 neighbor *
 neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
   neighbor *n;
   int class, scope = -1;
   uint h = neigh_hash(p, a, iface);
@@ -308,8 +310,12 @@ neigh_dump_all(void)
 static inline void
 neigh_notify(neighbor *n)
 {
-  if (n->proto->neigh_notify && (n->proto->proto_state != PS_STOP))
-    n->proto->neigh_notify(n);
+  if (!n->proto->neigh_notify)
+    return;
+
+  PROTO_LOCKED_FROM_MAIN(n->proto)
+    if (n->proto->proto_state != PS_STOP)
+      n->proto->neigh_notify(n);
 }
 
 static void
diff --git a/nest/proto.c b/nest/proto.c
index 341581ab..1e7f5560 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -70,17 +70,6 @@ static inline event_list *proto_work_list(struct proto *p)
 static inline void proto_send_event(struct proto *p)
 { ev_send(proto_event_list(p), p->event); }
 
-#define PROTO_ENTER_FROM_MAIN(p)    ({ \
-    ASSERT_DIE(birdloop_inside(&main_birdloop)); \
-    struct birdloop *_loop = (p)->loop; \
-    if (_loop != &main_birdloop) birdloop_enter(_loop); \
-    _loop; \
-    })
-
-#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
-
-#define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
-
 
 static inline int channel_is_active(struct channel *c)
 { return (c->channel_state != CS_DOWN); }
@@ -2389,6 +2378,8 @@ static struct rte_owner_class default_rte_owner_class;
 static inline void
 proto_do_start(struct proto *p)
 {
+  ASSERT_DIE(birdloop_inside(p->loop));
+
   p->active = 1;
 
   rt_init_sources(&p->sources, p->name, proto_work_list(p));
@@ -2402,6 +2393,8 @@ proto_do_start(struct proto *p)
 static void
 proto_do_up(struct proto *p)
 {
+  ASSERT_DIE(birdloop_inside(p->loop));
+
   if (!p->main_source)
     p->main_source = rt_get_source(p, 0);
     // Locked automaticaly
diff --git a/nest/protocol.h b/nest/protocol.h
index f07bb4df..a4b6152b 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -268,6 +268,18 @@ struct proto *proto_iterate_named(struct symbol *sym, struct protocol *proto, st
 #define PROTO_WALK_CMD(sym,pr,p) for(struct proto *p = NULL; p = proto_iterate_named(sym, pr, p); )
 
 
+#define PROTO_ENTER_FROM_MAIN(p)    ({ \
+    ASSERT_DIE(birdloop_inside(&main_birdloop)); \
+    struct birdloop *_loop = (p)->loop; \
+    if (_loop != &main_birdloop) birdloop_enter(_loop); \
+    _loop; \
+    })
+
+#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
+
+#define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
+
+
 #define CMD_RELOAD	0
 #define CMD_RELOAD_IN	1
 #define CMD_RELOAD_OUT	2

From c651cef737c7c7578c26bd787c0abd3c364bf4b8 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Jan 2022 10:01:10 +0100
Subject: [PATCH 084/431] Global interface list renamed to not clash with local
 lists

---
 nest/iface.c           | 32 ++++++++++++++++----------------
 nest/iface.h           |  2 +-
 nest/neighbor.c        |  6 +++---
 proto/babel/babel.c    |  2 +-
 proto/ospf/iface.c     |  4 ++--
 proto/radv/radv.c      |  2 +-
 proto/rip/rip.c        |  2 +-
 sysdep/bsd/krt-sock.c  |  2 +-
 sysdep/linux/netlink.c |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index bd2bb39a..61b99a91 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -36,7 +36,7 @@
 
 static pool *if_pool;
 
-list iface_list;
+list global_iface_list;
 struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
@@ -111,7 +111,7 @@ if_dump_all(void)
   struct iface *i;
 
   debug("Known network interfaces:\n");
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if_dump(i);
   debug("Router ID: %08x\n", config->router_id);
 }
@@ -307,7 +307,7 @@ if_update(struct iface *new)
   if (!new->master)
     new->master = &default_vrf;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(new->name, i->name))
       {
 	new->flags = if_recalc_flags(new, new->flags);
@@ -340,7 +340,7 @@ if_update(struct iface *new)
 newif:
   init_list(&i->neighbors);
   i->flags |= IF_UPDATED | IF_TMP_DOWN;		/* Tmp down as we don't have addresses yet */
-  add_tail(&iface_list, &i->n);
+  add_tail(&global_iface_list, &i->n);
   return i;
 }
 
@@ -350,7 +350,7 @@ if_start_update(void)
   struct iface *i;
   struct ifa *a;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       i->flags &= ~IF_UPDATED;
       WALK_LIST(a, i->addrs)
@@ -374,7 +374,7 @@ if_end_update(void)
   struct iface *i;
   struct ifa *a, *b;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       if (!(i->flags & IF_UPDATED))
 	if_change_flags(i, (i->flags & ~IF_ADMIN_UP) | IF_SHUTDOWN);
@@ -413,7 +413,7 @@ if_feed_baby(struct proto *p)
   if (!p->if_notify && !p->ifa_notify)	/* shortcut */
     return;
   DBG("Announcing interfaces to new protocol %s\n", p->name);
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       if_send_notify(p, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), i);
       if (i->flags & IF_UP)
@@ -435,7 +435,7 @@ if_find_by_index(unsigned idx)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (i->index == idx && !(i->flags & IF_SHUTDOWN))
       return i;
   return NULL;
@@ -454,7 +454,7 @@ if_find_by_name(const char *name)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name) && !(i->flags & IF_SHUTDOWN))
       return i;
   return NULL;
@@ -465,7 +465,7 @@ if_get_by_name(const char *name)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name))
       return i;
 
@@ -475,7 +475,7 @@ if_get_by_name(const char *name)
   i->flags = IF_SHUTDOWN;
   init_list(&i->addrs);
   init_list(&i->neighbors);
-  add_tail(&iface_list, &i->n);
+  add_tail(&global_iface_list, &i->n);
   return i;
 }
 
@@ -561,7 +561,7 @@ if_recalc_all_preferred_addresses(void)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
   {
     if_recalc_preferred(i);
 
@@ -669,7 +669,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
   struct ifa *a, *b;
 
   b = NULL;
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       if (!(i->flags & IF_ADMIN_UP) ||
 	  (i->flags & IF_SHUTDOWN))
@@ -716,7 +716,7 @@ void
 if_init(void)
 {
   if_pool = rp_new(&root_pool, &main_birdloop, "Interfaces");
-  init_list(&iface_list);
+  init_list(&global_iface_list);
   strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
 }
@@ -844,7 +844,7 @@ if_show(void)
   struct ifa *a;
   char *type;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       if (i->flags & IF_SHUTDOWN)
 	continue;
@@ -887,7 +887,7 @@ if_show_summary(void)
   struct iface *i;
 
   cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       byte a4[IPA_MAX_TEXT_LENGTH + 17];
       byte a6[IPA_MAX_TEXT_LENGTH + 17];
diff --git a/nest/iface.h b/nest/iface.h
index 13f3bd12..b3dcc408 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -12,7 +12,7 @@
 #include "lib/lists.h"
 #include "lib/ip.h"
 
-extern list iface_list;
+extern list global_iface_list;
 
 struct proto;
 struct pool;
diff --git a/nest/neighbor.c b/nest/neighbor.c
index e10413bd..50defb96 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -152,7 +152,7 @@ if_connected_any(ip_addr a, struct iface *vrf, struct iface **iface, struct ifa
   *addr = NULL;
 
   /* Prefer SCOPE_HOST or longer prefix */
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if ((!vrf || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
       if (scope_better(s, scope) || (scope_remote(s, scope) && ifa_better(b, *addr)))
       {
@@ -440,7 +440,7 @@ neigh_if_up(struct iface *i)
   node *x, *y;
 
   /* Update neighbors that might be better off with the new iface */
-  WALK_LIST(ii, iface_list)
+  WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && (ii != i) && if_intersect(i, ii))
       WALK_LIST2_DELSAFE(n, x, y, ii->neighbors, if_n)
 	neigh_update(n, i);
@@ -502,7 +502,7 @@ neigh_ifa_up(struct ifa *a)
   node *x, *y;
 
   /* Update neighbors that might be better off with the new ifa */
-  WALK_LIST(ii, iface_list)
+  WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && ifa_intersect(a, ii))
       WALK_LIST2_DELSAFE(n, x, y, ii->neighbors, if_n)
 	neigh_update(n, i);
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index e56a6328..8d80d7cd 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1907,7 +1907,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
 {
   struct iface *iface;
 
-  WALK_LIST(iface, iface_list)
+  WALK_LIST(iface, global_iface_list)
   {
     if (!(iface->flags & IF_UP))
       continue;
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 2aae341a..b8c40c9b 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -1225,7 +1225,7 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p)
   struct iface *iface;
   struct ifa *a;
 
-  WALK_LIST(iface, iface_list)
+  WALK_LIST(iface, global_iface_list)
   {
     if (! (iface->flags & IF_UP))
       continue;
@@ -1271,7 +1271,7 @@ ospf_reconfigure_ifaces3(struct ospf_proto *p)
   struct iface *iface;
   struct ifa *a;
 
-  WALK_LIST(iface, iface_list)
+  WALK_LIST(iface, global_iface_list)
   {
     if (! (iface->flags & IF_UP))
       continue;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index b0f15514..63549c77 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -664,7 +664,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
     channel_request_feeding(p->p.main_channel);
 
   struct iface *iface;
-  WALK_LIST(iface, iface_list)
+  WALK_LIST(iface, global_iface_list)
   {
     if (!(iface->flags & IF_UP))
       continue;
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index ee05f058..b4c702ae 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -776,7 +776,7 @@ rip_reconfigure_ifaces(struct rip_proto *p, struct rip_config *cf)
 {
   struct iface *iface;
 
-  WALK_LIST(iface, iface_list)
+  WALK_LIST(iface, global_iface_list)
   {
     if (!(iface->flags & IF_UP))
       continue;
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 1d0a8e1b..a0f6a7cb 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -242,7 +242,7 @@ krt_send_route(struct krt_proto *p, int cmd, const rte *e)
    */
   if (!i)
   {
-    WALK_LIST(j, iface_list)
+    WALK_LIST(j, global_iface_list)
     {
       if (j->flags & IF_LOOPBACK)
       {
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index bff2d579..9b7b502d 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1148,7 +1148,7 @@ kif_do_scan(struct kif_proto *p UNUSED)
 
   /* Re-resolve master interface for slaves */
   struct iface *i;
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (i->master_index)
     {
       struct iface f = {

From d37513a372b0d5b133f59293af185ec831e2456f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Jan 2022 15:48:18 +0100
Subject: [PATCH 085/431] Neighbors: Locking and asynchronous notifications

---
 nest/iface.c           | 66 ++++++++++++++++++++++++++++++++--
 nest/iface.h           | 11 ++++++
 nest/neighbor.c        | 81 ++++++++++++++++++++++++++++++++++++------
 nest/rt-attr.c         |  1 -
 proto/babel/babel.c    |  1 +
 proto/ospf/iface.c     |  2 ++
 proto/radv/radv.c      |  1 +
 proto/rip/rip.c        |  1 +
 sysdep/bsd/krt-sock.c  |  2 ++
 sysdep/linux/netlink.c |  1 +
 10 files changed, 154 insertions(+), 13 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index 61b99a91..4c017f50 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -36,10 +36,12 @@
 
 static pool *if_pool;
 
+DOMAIN(attrs) iface_domain;
 list global_iface_list;
 struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
+static void ifa_delete_locked(struct ifa *a);
 
 /**
  * ifa_dump - dump interface address
@@ -50,6 +52,7 @@ static void if_recalc_preferred(struct iface *i);
 void
 ifa_dump(struct ifa *a)
 {
+  IFACE_LEGACY_ACCESS;
   debug("\t%I, net %N bc %I -> %I%s%s%s%s\n", a->ip, &a->prefix, a->brd, a->opposite,
 	(a->flags & IA_PRIMARY) ? " PRIMARY" : "",
 	(a->flags & IA_SECONDARY) ? " SEC" : "",
@@ -69,6 +72,7 @@ if_dump(struct iface *i)
 {
   struct ifa *a;
 
+  IFACE_LEGACY_ACCESS;
   debug("IF%d: %s", i->index, i->name);
   if (i->flags & IF_SHUTDOWN)
     debug(" SHUTDOWN");
@@ -110,6 +114,7 @@ if_dump_all(void)
 {
   struct iface *i;
 
+  IFACE_LEGACY_ACCESS;
   debug("Known network interfaces:\n");
   WALK_LIST(i, global_iface_list)
     if_dump(i);
@@ -307,6 +312,9 @@ if_update(struct iface *new)
   if (!new->master)
     new->master = &default_vrf;
 
+  IFACE_LEGACY_ACCESS;
+  IFACE_LOCK;
+
   WALK_LIST(i, global_iface_list)
     if (!strcmp(new->name, i->name))
       {
@@ -328,6 +336,8 @@ if_update(struct iface *new)
 	  }
 
 	if_copy(i, new);
+	IFACE_UNLOCK;
+
 	if (c)
 	  if_notify_change(c, i);
 
@@ -341,6 +351,8 @@ newif:
   init_list(&i->neighbors);
   i->flags |= IF_UPDATED | IF_TMP_DOWN;		/* Tmp down as we don't have addresses yet */
   add_tail(&global_iface_list, &i->n);
+  IFACE_UNLOCK;
+
   return i;
 }
 
@@ -350,6 +362,7 @@ if_start_update(void)
   struct iface *i;
   struct ifa *a;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(i, global_iface_list)
     {
       i->flags &= ~IF_UPDATED;
@@ -361,6 +374,8 @@ if_start_update(void)
 void
 if_end_partial_update(struct iface *i)
 {
+  IFACE_LEGACY_ACCESS;
+
   if (i->flags & IF_NEEDS_RECALC)
     if_recalc_preferred(i);
 
@@ -374,6 +389,7 @@ if_end_update(void)
   struct iface *i;
   struct ifa *a, *b;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(i, global_iface_list)
     {
       if (!(i->flags & IF_UPDATED))
@@ -382,7 +398,11 @@ if_end_update(void)
 	{
 	  WALK_LIST_DELSAFE(a, b, i->addrs)
 	    if (!(a->flags & IA_UPDATED))
-	      ifa_delete(a);
+	    {
+	      IFACE_LOCK;
+	      ifa_delete_locked(a);
+	      IFACE_UNLOCK;
+	    }
 	  if_end_partial_update(i);
 	}
     }
@@ -391,6 +411,7 @@ if_end_update(void)
 void
 if_flush_ifaces(struct proto *p)
 {
+  IFACE_LEGACY_ACCESS;
   if (p->debug & D_EVENTS)
     log(L_TRACE "%s: Flushing interfaces", p->name);
   if_start_update();
@@ -410,6 +431,8 @@ if_feed_baby(struct proto *p)
   struct iface *i;
   struct ifa *a;
 
+  IFACE_LEGACY_ACCESS;
+
   if (!p->if_notify && !p->ifa_notify)	/* shortcut */
     return;
   DBG("Announcing interfaces to new protocol %s\n", p->name);
@@ -435,9 +458,15 @@ if_find_by_index(unsigned idx)
 {
   struct iface *i;
 
+  IFACE_LOCK;
   WALK_LIST(i, global_iface_list)
     if (i->index == idx && !(i->flags & IF_SHUTDOWN))
+    {
+      IFACE_UNLOCK;
       return i;
+    }
+
+  IFACE_UNLOCK;
   return NULL;
 }
 
@@ -454,9 +483,15 @@ if_find_by_name(const char *name)
 {
   struct iface *i;
 
+  IFACE_LOCK;
   WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name) && !(i->flags & IF_SHUTDOWN))
+    {
+      IFACE_UNLOCK;
       return i;
+    }
+
+  IFACE_UNLOCK;
   return NULL;
 }
 
@@ -465,17 +500,21 @@ if_get_by_name(const char *name)
 {
   struct iface *i;
 
+  IFACE_LEGACY_ACCESS;
+
   WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name))
       return i;
 
   /* No active iface, create a dummy */
+  IFACE_LOCK;
   i = mb_allocz(if_pool, sizeof(struct iface));
   strncpy(i->name, name, sizeof(i->name)-1);
   i->flags = IF_SHUTDOWN;
   init_list(&i->addrs);
   init_list(&i->neighbors);
   add_tail(&global_iface_list, &i->n);
+  IFACE_UNLOCK;
   return i;
 }
 
@@ -561,6 +600,8 @@ if_recalc_all_preferred_addresses(void)
 {
   struct iface *i;
 
+  IFACE_LEGACY_ACCESS;
+
   WALK_LIST(i, global_iface_list)
   {
     if_recalc_preferred(i);
@@ -591,6 +632,8 @@ ifa_update(struct ifa *a)
   struct iface *i = a->iface;
   struct ifa *b;
 
+  IFACE_LEGACY_ACCESS;
+
   WALK_LIST(b, i->addrs)
     if (ifa_same(b, a))
       {
@@ -609,10 +652,12 @@ ifa_update(struct ifa *a)
   if ((a->prefix.type == NET_IP4) && (i->flags & IF_BROADCAST) && ipa_zero(a->brd))
     log(L_WARN "Missing broadcast address for interface %s", i->name);
 
+  IFACE_LOCK;
   b = mb_alloc(if_pool, sizeof(struct ifa));
   memcpy(b, a, sizeof(struct ifa));
   add_tail(&i->addrs, &b->n);
   b->flags |= IA_UPDATED;
+  IFACE_UNLOCK;
 
   i->flags |= IF_NEEDS_RECALC;
   if (i->flags & IF_UP)
@@ -637,6 +682,17 @@ ifa_delete(struct ifa *a)
   WALK_LIST(b, i->addrs)
     if (ifa_same(b, a))
       {
+	IFACE_LOCK;
+	ifa_delete_locked(b);
+	IFACE_UNLOCK;
+	return;
+      }
+}
+
+static void
+ifa_delete_locked(struct ifa *b)
+{
+	struct iface *i = b->iface;
 	rem_node(&b->n);
 
 	if (b->flags & IA_PRIMARY)
@@ -659,7 +715,6 @@ ifa_delete(struct ifa *a)
 
 	mb_free(b);
 	return;
-      }
 }
 
 u32
@@ -668,6 +723,8 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
   struct iface *i;
   struct ifa *a, *b;
 
+  IFACE_LEGACY_ACCESS;
+
   b = NULL;
   WALK_LIST(i, global_iface_list)
     {
@@ -715,6 +772,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 void
 if_init(void)
 {
+  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
   if_pool = rp_new(&root_pool, &main_birdloop, "Interfaces");
   init_list(&global_iface_list);
   strcpy(default_vrf.name, "default");
@@ -844,6 +902,8 @@ if_show(void)
   struct ifa *a;
   char *type;
 
+  IFACE_LEGACY_ACCESS;
+
   WALK_LIST(i, global_iface_list)
     {
       if (i->flags & IF_SHUTDOWN)
@@ -886,6 +946,8 @@ if_show_summary(void)
 {
   struct iface *i;
 
+  IFACE_LEGACY_ACCESS;
+
   cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
   WALK_LIST(i, global_iface_list)
     {
diff --git a/nest/iface.h b/nest/iface.h
index b3dcc408..5deb5432 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -9,10 +9,20 @@
 #ifndef _BIRD_IFACE_H_
 #define _BIRD_IFACE_H_
 
+#include "lib/event.h"
 #include "lib/lists.h"
 #include "lib/ip.h"
+#include "lib/locking.h"
 
+DEFINE_DOMAIN(attrs);
 extern list global_iface_list;
+extern DOMAIN(attrs) iface_domain;
+
+#define IFACE_LEGACY_ACCESS	ASSERT_DIE(birdloop_inside(&main_birdloop))
+
+#define IFACE_LOCK	  LOCK_DOMAIN(attrs, iface_domain)
+#define IFACE_UNLOCK	UNLOCK_DOMAIN(attrs, iface_domain)
+#define ASSERT_IFACE_LOCKED	ASSERT_DIE(DOMAIN_IS_LOCKED(attrs, iface_domain))
 
 struct proto;
 struct pool;
@@ -131,6 +141,7 @@ typedef struct neighbor {
   struct ifa *ifa;			/* Ifa on related iface */
   struct iface *iface;			/* Interface it's connected to */
   struct iface *ifreq;			/* Requested iface, NULL for any */
+  struct event event;			/* Notification event */
   struct proto *proto;			/* Protocol this belongs to */
   void *data;				/* Protocol-specific data */
   uint aux;				/* Protocol-specific data */
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 50defb96..7466e510 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -59,6 +59,7 @@
 
 static slab *neigh_slab;
 static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list;
+static void neigh_do_notify(void *);
 
 static inline uint
 neigh_hash(struct proto *p, ip_addr a, struct iface *i)
@@ -210,36 +211,40 @@ if_intersect(struct iface *ia, struct iface *ib)
 neighbor *
 neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
 {
-  ASSERT_DIE(birdloop_inside(&main_birdloop));
-
   neighbor *n;
   int class, scope = -1;
   uint h = neigh_hash(p, a, iface);
   struct iface *ifreq = iface;
   struct ifa *addr = NULL;
 
+  IFACE_LOCK;
   WALK_LIST(n, neigh_hash_table[h])	/* Search the cache */
     if ((n->proto == p) && ipa_equal(n->addr, a) && (n->ifreq == iface))
+    {
+      IFACE_UNLOCK;
       return n;
+    }
+
+#define NOT_FOUND goto not_found
 
   if (flags & NEF_IFACE)
   {
     if (ipa_nonzero(a) || !iface)
-      return NULL;
+      NOT_FOUND;
   }
   else
   {
     class = ipa_classify(a);
     if (class < 0)			/* Invalid address */
-      return NULL;
+      NOT_FOUND;
     if (((class & IADDR_SCOPE_MASK) == SCOPE_HOST) ||
 	(((class & IADDR_SCOPE_MASK) == SCOPE_LINK) && !iface) ||
 	!(class & IADDR_HOST))
-      return NULL;			/* Bad scope or a somecast */
+      NOT_FOUND;			/* Bad scope or a somecast */
   }
 
   if ((flags & NEF_ONLINK) && !iface)
-      return NULL;
+    NOT_FOUND;
 
   if (iface)
   {
@@ -253,7 +258,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   /* scope >= 0  <=>  iface != NULL */
 
   if ((scope < 0) && !(flags & NEF_STICKY))
-    return NULL;
+    NOT_FOUND;
 
   n = sl_allocz(neigh_slab);
   add_tail(&neigh_hash_table[h], &n->n);
@@ -265,8 +270,23 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   n->proto = p;
   n->flags = flags;
   n->scope = scope;
+  n->event = (event) { .hook = neigh_do_notify, .data = n };
+  ASSERT_DIE(birdloop_inside(p->loop));
 
+  if (p->loop == &main_birdloop)
+    n->event.list = &global_event_list;
+  else
+  {
+    birdloop_link(p->loop);
+    n->event.list = birdloop_event_list(p->loop);
+  }
+
+  IFACE_UNLOCK;
   return n;
+
+not_found:
+  IFACE_UNLOCK;
+  return NULL;
 }
 
 /**
@@ -300,11 +320,15 @@ neigh_dump_all(void)
   neighbor *n;
   int i;
 
+  IFACE_LOCK;
+
   debug("Known neighbors:\n");
   for(i=0; i<NEIGH_HASH_SIZE; i++)
     WALK_LIST(n, neigh_hash_table[i])
       neigh_dump(n);
   debug("\n");
+
+  IFACE_UNLOCK;
 }
 
 static inline void
@@ -313,9 +337,18 @@ neigh_notify(neighbor *n)
   if (!n->proto->neigh_notify)
     return;
 
-  PROTO_LOCKED_FROM_MAIN(n->proto)
-    if (n->proto->proto_state != PS_STOP)
-      n->proto->neigh_notify(n);
+  ev_send(n->event.list, &n->event);
+}
+
+static void
+neigh_do_notify(void *data)
+{
+  neighbor *n = data;
+
+  ASSERT_DIE(birdloop_inside(n->proto->loop));
+
+  if (n->proto->proto_state != PS_STOP)
+    n->proto->neigh_notify(n);
 }
 
 static void
@@ -351,6 +384,8 @@ neigh_free(neighbor *n)
 {
   rem_node(&n->n);
   rem_node(&n->if_n);
+  ev_postpone(&n->event);
+  birdloop_unlink(n->proto->loop);
   sl_free(neigh_slab, n);
 }
 
@@ -366,6 +401,8 @@ neigh_free(neighbor *n)
 void
 neigh_update(neighbor *n, struct iface *iface)
 {
+  ASSERT_IFACE_LOCKED;
+
   struct proto *p = n->proto;
   struct ifa *ifa = NULL;
   int scope = -1;
@@ -439,6 +476,8 @@ neigh_if_up(struct iface *i)
   neighbor *n;
   node *x, *y;
 
+  IFACE_LOCK;
+
   /* Update neighbors that might be better off with the new iface */
   WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && (ii != i) && if_intersect(i, ii))
@@ -447,6 +486,8 @@ neigh_if_up(struct iface *i)
 
   WALK_LIST2_DELSAFE(n, x, y, sticky_neigh_list, if_n)
     neigh_update(n, i);
+
+  IFACE_UNLOCK;
 }
 
 /**
@@ -463,8 +504,12 @@ neigh_if_down(struct iface *i)
   neighbor *n;
   node *x, *y;
 
+  IFACE_LOCK;
+
   WALK_LIST2_DELSAFE(n, x, y, i->neighbors, if_n)
     neigh_update(n, i);
+
+  IFACE_UNLOCK;
 }
 
 /**
@@ -480,8 +525,12 @@ neigh_if_link(struct iface *i)
   neighbor *n;
   node *x, *y;
 
+  IFACE_LOCK;
+
   WALK_LIST2_DELSAFE(n, x, y, i->neighbors, if_n)
     neigh_notify(n);
+
+  IFACE_UNLOCK;
 }
 
 /**
@@ -501,6 +550,8 @@ neigh_ifa_up(struct ifa *a)
   neighbor *n;
   node *x, *y;
 
+  IFACE_LOCK;
+
   /* Update neighbors that might be better off with the new ifa */
   WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && ifa_intersect(a, ii))
@@ -510,6 +561,8 @@ neigh_ifa_up(struct ifa *a)
   /* Wake up all sticky neighbors that are reachable now */
   WALK_LIST2_DELSAFE(n, x, y, sticky_neigh_list, if_n)
     neigh_update(n, i);
+
+  IFACE_UNLOCK;
 }
 
 void
@@ -519,10 +572,14 @@ neigh_ifa_down(struct ifa *a)
   neighbor *n;
   node *x, *y;
 
+  IFACE_LOCK;
+
   /* Update all neighbors whose scope has changed */
   WALK_LIST2_DELSAFE(n, x, y, i->neighbors, if_n)
     if (n->ifa == a)
       neigh_update(n, i);
+
+  IFACE_UNLOCK;
 }
 
 static inline void
@@ -548,10 +605,14 @@ neigh_prune(void)
   node *m;
   int i;
 
+  IFACE_LOCK;
+
   DBG("Pruning neighbors\n");
   for(i=0; i<NEIGH_HASH_SIZE; i++)
     WALK_LIST_DELSAFE(n, m, neigh_hash_table[i])
       neigh_prune_one(n);
+
+  IFACE_UNLOCK;
 }
 
 /**
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index be563491..c3da4782 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -86,7 +86,6 @@ const char * rta_dest_names[RTD_MAX] = {
   [RTD_PROHIBIT]	= "prohibited",
 };
 
-DEFINE_DOMAIN(attrs);
 static DOMAIN(attrs) src_domain;
 
 #define SRC_LOCK	LOCK_DOMAIN(attrs, src_domain)
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 8d80d7cd..6d2a593e 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1907,6 +1907,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
 {
   struct iface *iface;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(iface, global_iface_list)
   {
     if (!(iface->flags & IF_UP))
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index b8c40c9b..049030ac 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -1225,6 +1225,7 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p)
   struct iface *iface;
   struct ifa *a;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(iface, global_iface_list)
   {
     if (! (iface->flags & IF_UP))
@@ -1271,6 +1272,7 @@ ospf_reconfigure_ifaces3(struct ospf_proto *p)
   struct iface *iface;
   struct ifa *a;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(iface, global_iface_list)
   {
     if (! (iface->flags & IF_UP))
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 63549c77..15673555 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -663,6 +663,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
   if (!old->propagate_routes && new->propagate_routes)
     channel_request_feeding(p->p.main_channel);
 
+  IFACE_LEGACY_ACCESS;
   struct iface *iface;
   WALK_LIST(iface, global_iface_list)
   {
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index b4c702ae..ffb7779b 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -776,6 +776,7 @@ rip_reconfigure_ifaces(struct rip_proto *p, struct rip_config *cf)
 {
   struct iface *iface;
 
+  IFACE_LEGACY_ACCESS;
   WALK_LIST(iface, global_iface_list)
   {
     if (!(iface->flags & IF_UP))
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index a0f6a7cb..923001bf 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -242,6 +242,7 @@ krt_send_route(struct krt_proto *p, int cmd, const rte *e)
    */
   if (!i)
   {
+    IFACE_LOCK;
     WALK_LIST(j, global_iface_list)
     {
       if (j->flags & IF_LOOPBACK)
@@ -250,6 +251,7 @@ krt_send_route(struct krt_proto *p, int cmd, const rte *e)
         break;
       }
     }
+    IFACE_UNLOCK;
 
     if (!i)
     {
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 9b7b502d..f52a796f 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1147,6 +1147,7 @@ kif_do_scan(struct kif_proto *p UNUSED)
       log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
 
   /* Re-resolve master interface for slaves */
+  IFACE_LEGACY_ACCESS;
   struct iface *i;
   WALK_LIST(i, global_iface_list)
     if (i->master_index)

From 0f6ea957541dc59b15f4e8a42e9ed006345a2a70 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 13:03:15 +0100
Subject: [PATCH 086/431] Explicitly storing and checking loop information in
 sockets

---
 lib/socket.h           |  1 +
 proto/bfd/bfd.c        |  1 +
 proto/bfd/packets.c    |  2 ++
 proto/rpki/transport.c |  1 +
 sysdep/unix/io-loop.c  | 38 +++++++++++++++-----------------------
 sysdep/unix/io-loop.h  |  1 -
 sysdep/unix/io.c       | 36 ++++++++++++++++++++++++++++++------
 7 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/lib/socket.h b/lib/socket.h
index ff07660f..17d647f3 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -40,6 +40,7 @@ struct ssh_sock {
 typedef struct birdsock {
   resource r;
   pool *pool;				/* Pool where incoming connections should be allocated (for SK_xxx_PASSIVE) */
+  struct birdloop *loop;		/* The birdloop where this socket belongs to */
   int type;				/* Socket type */
   int subtype;				/* Socket subtype */
   void *data;				/* User data */
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index c9b12aa1..b04d7030 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -1025,6 +1025,7 @@ bfd_notify_init(struct bfd_proto *p)
   sk->fd = pfds[1];
   sk->data = p;
   sk->flags = SKF_THREAD;
+  sk->loop = p->p.loop;
   if (sk_open(sk) < 0)
     die("bfd: sk_open failed");
   p->notify_ws = sk;
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index 37d77f37..73cb38f4 100644
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -425,6 +425,7 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop, int af)
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->priority = sk_priority_control;
   sk->flags = SKF_THREAD | SKF_LADDR_RX | (!multihop ? SKF_TTL_RX : 0);
+  sk->loop = p->p.loop;
 
   if (sk_open(sk) < 0)
     goto err;
@@ -457,6 +458,7 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
   sk->priority = sk_priority_control;
   sk->ttl = ifa ? 255 : -1;
   sk->flags = SKF_THREAD | SKF_BIND | SKF_HIGH_PORT;
+  sk->loop = p->p.loop;
 
   if (sk_open(sk) < 0)
     goto err;
diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c
index b52495dc..26609764 100644
--- a/proto/rpki/transport.c
+++ b/proto/rpki/transport.c
@@ -86,6 +86,7 @@ rpki_tr_open(struct rpki_tr_sock *tr)
   sk->tbsize = RPKI_TX_BUFFER_SIZE;
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->flags |= SKF_THREAD;
+  sk->loop = cache->p->p.loop;
 
   if (ipa_zero(sk->daddr) && sk->host)
   {
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 0611e096..ec805dce 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -170,9 +170,12 @@ sockets_init(struct birdloop *loop)
 static void
 sockets_add(struct birdloop *loop, sock *s)
 {
+  ASSERT_DIE(!enlisted(&s->n));
+
   add_tail(&loop->sock_list, &s->n);
   loop->sock_num++;
 
+  s->loop = loop;
   s->index = -1;
   loop->poll_changed = 1;
 
@@ -189,6 +192,11 @@ sk_start(sock *s)
 static void
 sockets_remove(struct birdloop *loop, sock *s)
 {
+  ASSERT_DIE(s->loop == loop);
+
+  if (!enlisted(&s->n))
+    return;
+
   rem_node(&s->n);
   loop->sock_num--;
 
@@ -197,11 +205,10 @@ sockets_remove(struct birdloop *loop, sock *s)
     loop->poll_sk.data[s->index] = NULL;
     s->index = -1;
     loop->poll_changed = 1;
-    loop->close_scheduled = 1;
     birdloop_ping(loop);
   }
-  else
-    close(s->fd);
+
+  s->loop = NULL;
 }
 
 void
@@ -263,21 +270,6 @@ sockets_prepare(struct birdloop *loop)
   loop->poll_changed = 0;
 }
 
-static void
-sockets_close_fds(struct birdloop *loop)
-{
-  struct pollfd *pfd = loop->poll_fd.data;
-  sock **psk = loop->poll_sk.data;
-  int poll_num = loop->poll_fd.used - 1;
-
-  int i;
-  for (i = 0; i < poll_num; i++)
-    if (psk[i] == NULL)
-      close(pfd[i].fd);
-
-  loop->close_scheduled = 0;
-}
-
 int sk_read(sock *s, int revents);
 int sk_write(sock *s);
 
@@ -297,13 +289,16 @@ sockets_fire(struct birdloop *loop)
   int i;
   for (i = 0; i < poll_num; pfd++, psk++, i++)
   {
-    int e = 1;
+    if (!*psk)
+      continue;
 
     if (! pfd->revents)
       continue;
 
     if (pfd->revents & POLLNVAL)
-      die("poll: invalid fd %d", pfd->fd);
+      bug("poll: invalid fd %d", pfd->fd);
+
+    int e = 1;
 
     if (pfd->revents & POLLIN)
       while (e && *psk && (*psk)->rx_hook)
@@ -546,9 +541,6 @@ birdloop_main(void *arg)
 
     birdloop_enter(loop);
 
-    if (loop->close_scheduled)
-      sockets_close_fds(loop);
-
     if (loop->stopped)
       break;
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index e5af52d1..1727637a 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -36,7 +36,6 @@ struct birdloop
   BUFFER(sock *) poll_sk;
   BUFFER(struct pollfd) poll_fd;
   u8 poll_changed;
-  u8 close_scheduled;
 
   _Atomic u32 ping_sent;
   int wakeup_fds[2];
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index d18dbca4..b57e5894 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -794,6 +794,7 @@ sk_free(resource *r)
 {
   sock *s = (sock *) r;
 
+  ASSERT_DIE(!s->loop || birdloop_inside(s->loop));
   sk_free_bufs(s);
 
 #ifdef HAVE_LIBSSH
@@ -804,13 +805,20 @@ sk_free(resource *r)
   if ((s->fd < 0) || (s->flags & SKF_THREAD))
     return;
 
-  if (s == current_sock)
-    current_sock = sk_next(s);
-  if (s == stored_sock)
-    stored_sock = sk_next(s);
+  if (!s->loop)
+    ;
+  else if (s->flags & SKF_THREAD)
+    sk_stop(s);
+  else
+  {
+    if (s == current_sock)
+      current_sock = sk_next(s);
+    if (s == stored_sock)
+      stored_sock = sk_next(s);
 
-  if (enlisted(&s->n))
-    rem_node(&s->n);
+    if (enlisted(&s->n))
+      rem_node(&s->n);
+  }
 
   if (s->type != SK_SSH && s->type != SK_SSH_ACTIVE)
     close(s->fd);
@@ -1106,7 +1114,11 @@ sk_passive_connected(sock *s, int type)
   if (s->flags & SKF_PASSIVE_THREAD)
     t->flags |= SKF_THREAD;
   else
+  {
+    ASSERT_DIE(s->loop == &main_birdloop);
+    t->loop = &main_birdloop;
     sk_insert(t);
+  }
 
   sk_alloc_bufs(t);
   s->rx_hook(t, 0);
@@ -1328,6 +1340,17 @@ sk_open(sock *s)
   ip_addr bind_addr = IPA_NONE;
   sockaddr sa;
 
+  if (s->flags & SKF_THREAD)
+  {
+    ASSERT_DIE(s->loop && (s->loop != &main_birdloop));
+    ASSERT_DIE(birdloop_inside(s->loop));
+  }
+  else
+  {
+    ASSERT_DIE(!s->loop);
+    s->loop = &main_birdloop;
+  }
+
   if (s->type <= SK_IP)
   {
     /*
@@ -1507,6 +1530,7 @@ sk_open_unix(sock *s, char *name)
     return -1;
 
   s->fd = fd;
+  s->loop = &main_birdloop;
   sk_insert(s);
   return 0;
 }

From 127862f626f39d52b758084931e0fbdc91db745c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 26 Jan 2022 21:16:19 +0100
Subject: [PATCH 087/431] Asynchronous neighbor notifications fixes

---
 nest/iface.h          |  1 +
 nest/neighbor.c       | 41 ++++++++++++++++++++++++++++++++++++-----
 proto/bgp/bgp.c       |  2 +-
 sysdep/unix/io-loop.c |  6 ++++--
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/nest/iface.h b/nest/iface.h
index 5deb5432..6e8c8448 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -153,6 +153,7 @@ typedef struct neighbor {
 #define NEF_STICKY	1
 #define NEF_ONLINK	2
 #define NEF_IFACE	4		/* Entry for whole iface */
+#define NEF_NOTIFY_MAIN	0x100		/* Notify from main_birdloop context */
 
 
 neighbor *neigh_find(struct proto *p, ip_addr a, struct iface *ifa, uint flags);
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 7466e510..e4d42b4d 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -60,6 +60,7 @@
 static slab *neigh_slab;
 static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list;
 static void neigh_do_notify(void *);
+static void neigh_do_notify_main(void *);
 
 static inline uint
 neigh_hash(struct proto *p, ip_addr a, struct iface *i)
@@ -270,15 +271,29 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   n->proto = p;
   n->flags = flags;
   n->scope = scope;
-  n->event = (event) { .hook = neigh_do_notify, .data = n };
+
   ASSERT_DIE(birdloop_inside(p->loop));
 
-  if (p->loop == &main_birdloop)
-    n->event.list = &global_event_list;
+  if (flags & NEF_NOTIFY_MAIN)
+    n->event = (event) {
+      .hook = neigh_do_notify_main,
+      .data = n,
+      .list = &global_event_list,
+    };
+  else if (p->loop == &main_birdloop)
+    n->event = (event) {
+      .hook = neigh_do_notify,
+      .data = n,
+      .list = &global_event_list,
+    };
   else
   {
     birdloop_link(p->loop);
-    n->event.list = birdloop_event_list(p->loop);
+    n->event = (event) {
+      .hook = neigh_do_notify,
+      .data = n,
+      .list = birdloop_event_list(p->loop),
+    };
   }
 
   IFACE_UNLOCK;
@@ -340,6 +355,14 @@ neigh_notify(neighbor *n)
   ev_send(n->event.list, &n->event);
 }
 
+static void
+neigh_do_notify_main(void *data)
+{
+  neighbor *n = data;
+  PROTO_LOCKED_FROM_MAIN(n->proto)
+    neigh_do_notify(data);
+}
+
 static void
 neigh_do_notify(void *data)
 {
@@ -382,10 +405,18 @@ neigh_down(neighbor *n)
 static inline void
 neigh_free(neighbor *n)
 {
+  ASSERT_DIE(birdloop_inside(n->proto->loop));
+
+  if (n->flags & NEF_NOTIFY_MAIN)
+    ASSERT_DIE(birdloop_inside(&main_birdloop));
+
   rem_node(&n->n);
   rem_node(&n->if_n);
+
+  if (n->event.list != &global_event_list)
+    birdloop_unlink(n->proto->loop);
+
   ev_postpone(&n->event);
-  birdloop_unlink(n->proto->loop);
   sl_free(neigh_slab, n);
 }
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index b825f778..7e803f64 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1541,7 +1541,7 @@ bgp_start_locked(struct object_lock *lock)
     return;
   }
 
-  neighbor *n = neigh_find(&p->p, p->remote_ip, cf->iface, NEF_STICKY);
+  neighbor *n = neigh_find(&p->p, p->remote_ip, cf->iface, NEF_STICKY | NEF_NOTIFY_MAIN);
   if (!n)
   {
     log(L_ERR "%s: Invalid remote address %I%J", p->p.name, p->remote_ip, cf->iface);
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index ec805dce..1d3a555f 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -498,7 +498,9 @@ void
 birdloop_unlink(struct birdloop *loop)
 {
   ASSERT_DIE(birdloop_inside(loop));
-  loop->links--;
+  ASSERT_DIE(loop->links);
+  if (!--loop->links)
+    birdloop_ping(loop);
 }
 
 static void
@@ -541,7 +543,7 @@ birdloop_main(void *arg)
 
     birdloop_enter(loop);
 
-    if (loop->stopped)
+    if (loop->stopped && !loop->links)
       break;
 
     loop_begin = current_time();

From 8447b24e59bcb6bf1f5d0c2a00880b74bde748fd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Feb 2022 09:45:50 +0100
Subject: [PATCH 088/431] Socket cork fixes

---
 lib/event.c           | 10 ++++++++--
 lib/event.h           |  2 ++
 lib/io-loop.h         |  1 +
 lib/socket.h          |  1 +
 sysdep/unix/io-loop.c | 34 +++++++++++++++++++++++++++++++++-
 sysdep/unix/io.c      | 31 ++++++++++++++++++++++++++++---
 6 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/lib/event.c b/lib/event.c
index 766ffa15..10f83c28 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -283,7 +283,13 @@ void ev_uncork(struct event_cork *ec)
       birdloop_ping(el->loop);
     }
 
-  UNLOCK_DOMAIN(cork, ec->lock);
+  struct birdsock *sk;
+  WALK_LIST_FIRST2(sk, cork_node, ec->sockets)
+    {
+//      log(L_TRACE "Socket %p uncorked", sk);
+      rem_node(&sk->cork_node);
+      sk_ping(sk);
+    }
 
-  birdloop_ping(&main_birdloop);
+  UNLOCK_DOMAIN(cork, ec->lock);
 }
diff --git a/lib/event.h b/lib/event.h
index cd85bf78..3af33a7f 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -38,6 +38,7 @@ struct event_cork {
   DOMAIN(cork) lock;
   u32 count;
   list events;
+  list sockets;
 };
 
 extern event_list global_event_list;
@@ -56,6 +57,7 @@ static inline void ev_init_list(event_list *el, struct birdloop *loop, const cha
 static inline void ev_init_cork(struct event_cork *ec, const char *name)
 {
   init_list(&ec->events);
+  init_list(&ec->sockets);
   ec->lock = DOMAIN_NEW(cork, name);
   ec->count = 0;
 };
diff --git a/lib/io-loop.h b/lib/io-loop.h
index 386a31d5..d60fb1ae 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -17,6 +17,7 @@
 void sk_start(sock *s);
 void sk_stop(sock *s);
 void sk_reloop(sock *s, struct birdloop *loop);
+void sk_ping(sock *s);
 
 extern struct birdloop main_birdloop;
 
diff --git a/lib/socket.h b/lib/socket.h
index 17d647f3..89398edf 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -59,6 +59,7 @@ typedef struct birdsock {
   uint rbsize;
   int (*rx_hook)(struct birdsock *, uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */
   struct event_cork *cork;		/* Cork to temporarily stop receiving data */
+  node cork_node;			/* Node in cork list */
 
   byte *tbuf, *tpos;			/* NULL=allocate automatically */
   byte *ttx;				/* Internal */
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 1d3a555f..5ab93b31 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -218,7 +218,36 @@ sk_stop(sock *s)
 }
 
 static inline uint sk_want_events(sock *s)
-{ return ((s->rx_hook && !ev_corked(s->cork)) ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
+{
+  uint out = ((s->ttx != s->tpos) ? POLLOUT : 0);
+  if (s->rx_hook)
+    if (s->cork)
+    {
+      LOCK_DOMAIN(cork, s->cork->lock);
+      if (!enlisted(&s->cork_node))
+	if (s->cork->count)
+	{
+//	    log(L_TRACE "Socket %p corked", s);
+	  add_tail(&s->cork->sockets, &s->cork_node);
+	}
+	else
+	  out |= POLLIN;
+      UNLOCK_DOMAIN(cork, s->cork->lock);
+    }
+    else
+      out |= POLLIN;
+
+//  log(L_TRACE "sk_want_events(%p) = %x", s, out);
+  return out;
+}
+
+
+void
+sk_ping(sock *s)
+{
+  s->loop->poll_changed = 1;
+  birdloop_ping(s->loop);
+}
 
 /*
 FIXME: this should be called from sock code
@@ -284,7 +313,10 @@ sockets_fire(struct birdloop *loop)
 
   /* Last fd is internal wakeup fd */
   if (pfd[poll_num].revents & POLLIN)
+  {
     wakeup_drain(loop);
+    loop->poll_changed = 1;
+  }
 
   int i;
   for (i = 0; i < poll_num; pfd++, psk++, i++)
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index b57e5894..fa836f28 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -802,8 +802,13 @@ sk_free(resource *r)
     sk_ssh_free(s);
 #endif
 
-  if ((s->fd < 0) || (s->flags & SKF_THREAD))
-    return;
+  if (s->cork)
+  {
+    LOCK_DOMAIN(cork, s->cork->lock);
+    if (enlisted(&s->cork_node))
+      rem_node(&s->cork_node);
+    UNLOCK_DOMAIN(cork, s->cork->lock);
+  }
 
   if (!s->loop)
     ;
@@ -820,7 +825,7 @@ sk_free(resource *r)
       rem_node(&s->n);
   }
 
-  if (s->type != SK_SSH && s->type != SK_SSH_ACTIVE)
+  if (s->type != SK_SSH && s->type != SK_SSH_ACTIVE && s->fd != -1)
     close(s->fd);
 
   s->fd = -1;
@@ -1710,6 +1715,7 @@ sk_maybe_write(sock *s)
 	  s->err_hook(s, (errno != EPIPE) ? errno : 0);
 	  return -1;
 	}
+	sk_ping(s);
 	return 0;
       }
       s->ttx += e;
@@ -1917,6 +1923,25 @@ sk_read(sock *s, int revents)
   case SK_TCP:
   case SK_UNIX:
     {
+      if (s->cork)
+      {
+	int cont = 0;
+	LOCK_DOMAIN(cork, s->cork->lock);
+	if (!enlisted(&s->cork_node))
+	  if (s->cork->count)
+	  {
+//	    log(L_TRACE "Socket %p corked", s);
+	    add_tail(&s->cork->sockets, &s->cork_node);
+	    sk_ping(s);
+	  }
+	  else
+	    cont = 1;
+	UNLOCK_DOMAIN(cork, s->cork->lock);
+
+	if (!cont)
+	  return 0;
+      }
+
       int c = read(s->fd, s->rpos, s->rbuf + s->rbsize - s->rpos);
 
       if (c < 0)

From fccaeb0141136b192884f76edd0a53575f47d87e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 09:31:27 +0100
Subject: [PATCH 089/431] BGP: Static global linpools replaced by private
 linpools

---
 lib/lists.h         |  1 +
 proto/bgp/attrs.c   | 12 +++++-------
 proto/bgp/bgp.c     | 28 ++++------------------------
 proto/bgp/bgp.h     |  4 +---
 proto/bgp/packets.c |  4 ++--
 5 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/lib/lists.h b/lib/lists.h
index dc49ec8a..f36c051c 100644
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -42,6 +42,7 @@ typedef union list {			/* In fact two overlayed nodes */
   };
 } list;
 
+#define STATIC_LIST_INIT(name)	name = { .head = &name.tail_node, .tail = &name.head_node, .null = NULL }
 
 #define NODE (node *)
 #define HEAD(list) ((void *)((list).head))
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1080db77..02b07410 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1847,13 +1847,11 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
 
   if (new)
   {
-    struct ea_list *attrs = bgp_update_attrs(p, c, new, new->attrs->eattrs, bgp_linpool2);
+    struct ea_list *attrs = bgp_update_attrs(p, c, new, new->attrs->eattrs, C->rte_update_pool);
 
     /* If attributes are invalid, we fail back to withdraw */
     buck = attrs ? bgp_get_bucket(c, attrs) : bgp_get_withdraw_bucket(c);
     path = new->src->global_id;
-
-    lp_flush(bgp_linpool2);
   }
   else
   {
@@ -2293,14 +2291,14 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt
       rte_import(&c->c.in_req, n, &e0, r->src);
 
     else {
-      rta *a = e0.attrs = rta_do_cow(r->attrs, bgp_linpool);
+      rta *a = e0.attrs = rta_do_cow(r->attrs, c->c.rte_update_pool);
 
-      bgp_set_attr_ptr(&(a->eattrs), bgp_linpool, BA_COMMUNITY, flags,
-	  int_set_add(bgp_linpool, ad, BGP_COMM_LLGR_STALE));
+      bgp_set_attr_ptr(&(a->eattrs), c->c.rte_update_pool, BA_COMMUNITY, flags,
+	  int_set_add(c->c.rte_update_pool, ad, BGP_COMM_LLGR_STALE));
       e0.pflags |= BGP_REF_STALE;
 
       rte_import(&c->c.in_req, n, &e0, r->src);
-      lp_flush(bgp_linpool);
+      lp_flush(c->c.rte_update_pool);
     }
   } while (count);
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 7e803f64..c453b176 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -124,11 +124,8 @@
 
 #include "bgp.h"
 
-
-struct linpool *bgp_linpool;		/* Global temporary pool */
-struct linpool *bgp_linpool2;		/* Global temporary pool for bgp_rt_notify() */
-static list bgp_sockets;		/* Global list of listening sockets */
-
+/* Global list of listening sockets */
+static list STATIC_LIST_INIT(bgp_sockets);
 
 static void bgp_connect(struct bgp_proto *p);
 static void bgp_active(struct bgp_proto *p);
@@ -167,10 +164,6 @@ bgp_open(struct bgp_proto *p)
     (p->ipv4 ? IPA_NONE4 : IPA_NONE6);
   uint port = p->cf->local_port;
 
-  /* FIXME: Add some global init? */
-  if (!bgp_linpool)
-    init_list(&bgp_sockets);
-
   /* We assume that cf->iface is defined iff cf->local_ip is link-local */
 
   WALK_LIST(bs, bgp_sockets)
@@ -207,12 +200,6 @@ bgp_open(struct bgp_proto *p)
 
   add_tail(&bgp_sockets, &bs->n);
 
-  if (!bgp_linpool)
-  {
-    bgp_linpool  = lp_new_default(proto_pool);
-    bgp_linpool2 = lp_new_default(proto_pool);
-  }
-
   return 0;
 
 err:
@@ -241,15 +228,6 @@ bgp_close(struct bgp_proto *p)
   rfree(bs->sk);
   rem_node(&bs->n);
   mb_free(bs);
-
-  if (!EMPTY_LIST(bgp_sockets))
-    return;
-
-  rfree(bgp_linpool);
-  bgp_linpool = NULL;
-
-  rfree(bgp_linpool2);
-  bgp_linpool2 = NULL;
 }
 
 static inline int
@@ -1602,6 +1580,8 @@ bgp_start(struct proto *P)
   p->startup_timer = tm_new_init(p->p.pool, bgp_startup_timeout, p, 0, 0);
   p->gr_timer = tm_new_init(p->p.pool, bgp_graceful_restart_timeout, p, 0, 0);
 
+  p->rx_lp = lp_new_default(p->p.pool);
+
   p->local_id = proto_get_router_id(P->cf);
   if (p->rr_client)
     p->rr_cluster_id = p->cf->rr_cluster_id ? p->cf->rr_cluster_id : p->local_id;
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 60f93bce..56360a9f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -312,6 +312,7 @@ struct bgp_proto {
   struct bgp_conn *conn;		/* Connection we have established */
   struct bgp_conn outgoing_conn;	/* Outgoing connection we're working with */
   struct bgp_conn incoming_conn;	/* Incoming connection we have neither accepted nor rejected yet */
+  struct linpool *rx_lp;		/* Linpool for parsing received updates */
   struct object_lock *lock;		/* Lock for neighbor connection */
   struct neighbor *neigh;		/* Neighbor entry corresponding to remote ip, NULL if multihop */
   struct bgp_socket *sock;		/* Shared listening socket */
@@ -494,9 +495,6 @@ bgp_parse_error(struct bgp_parse_state *s, uint subcode)
   longjmp(s->err_jmpbuf, 1);
 }
 
-extern struct linpool *bgp_linpool;
-extern struct linpool *bgp_linpool2;
-
 
 void bgp_start_timer(timer *t, uint value);
 void bgp_check_config(struct bgp_config *c);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index ea9adb4c..de4f70c1 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2295,7 +2295,7 @@ again: ;
   struct bgp_write_state s = {
     .proto = p,
     .channel = c,
-    .pool = bgp_linpool,
+    .pool = c->c.rte_update_pool,
     .mp_reach = (c->afi != BGP_AF_IPV4) || c->ext_next_hop,
     .as4_session = p->as4_session,
     .add_path = c->add_path_tx,
@@ -2480,7 +2480,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
   /* Initialize parse state */
   struct bgp_parse_state s = {
     .proto = p,
-    .pool = bgp_linpool,
+    .pool = p->rx_lp,
     .as4_session = p->as4_session,
   };
 

From aca4c3fc8e4a6043cafcb8778055d9a505283376 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 10 Jan 2022 11:43:21 +0100
Subject: [PATCH 090/431] BGP now runs in its own thread

---
 proto/bgp/bgp.c     | 85 ++++++++++++++++++++++++++++++++++-----------
 proto/bgp/bgp.h     | 10 ++++--
 proto/bgp/config.Y  |  1 +
 proto/bgp/packets.c | 14 ++++----
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index c453b176..5645e424 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -158,6 +158,8 @@ static inline void channel_refresh_end_reload(struct channel *c)
 static int
 bgp_open(struct bgp_proto *p)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
   struct bgp_socket *bs = NULL;
   struct iface *ifa = p->cf->strict_bind ? p->cf->iface : NULL;
   ip_addr addr = p->cf->strict_bind ? p->cf->local_ip :
@@ -182,7 +184,7 @@ bgp_open(struct bgp_proto *p)
   sk->sport = port;
   sk->iface = ifa;
   sk->vrf = p->p.vrf;
-  sk->flags = 0;
+  sk->flags = SKF_PASSIVE_THREAD;
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->rbsize = BGP_RX_BUFFER_SIZE;
   sk->tbsize = BGP_TX_BUFFER_SIZE;
@@ -218,6 +220,7 @@ err:
 static void
 bgp_close(struct bgp_proto *p)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
   struct bgp_socket *bs = p->sock;
 
   ASSERT(bs && bs->uc);
@@ -312,7 +315,7 @@ bgp_initiate(struct bgp_proto *p)
   {
     p->start_state = BSS_DELAY;
     BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds due to errors", p->startup_delay);
-    bgp_start_timer(p->startup_timer, p->startup_delay);
+    bgp_start_timer(p, p->startup_timer, p->startup_delay);
   }
   else
     bgp_startup(p);
@@ -333,6 +336,7 @@ err1:
 
 /**
  * bgp_start_timer - start a BGP timer
+ * @p: bgp_proto which the timer belongs to
  * @t: timer
  * @value: time (in seconds) to fire (0 to disable the timer)
  *
@@ -341,14 +345,16 @@ err1:
  * timers.
  */
 void
-bgp_start_timer(timer *t, uint value)
+bgp_start_timer(struct bgp_proto *p, timer *t, uint value)
 {
+  BGP_ASSERT_INSIDE(p);
+
   if (value)
   {
     /* The randomization procedure is specified in RFC 4271 section 10 */
     btime time = value S;
     btime randomize = random() % ((time / 4) + 1);
-    tm_start(t, time - randomize);
+    tm_start_in(t, time - randomize, p->p.loop);
   }
   else
     tm_stop(t);
@@ -364,7 +370,7 @@ bgp_start_timer(timer *t, uint value)
 void
 bgp_close_conn(struct bgp_conn *conn)
 {
-  // struct bgp_proto *p = conn->bgp;
+  BGP_ASSERT_INSIDE(conn->bgp);
 
   DBG("BGP: Closing connection\n");
   conn->packets_to_send = 0;
@@ -456,6 +462,8 @@ bgp_graceful_close_conn(struct bgp_conn *conn, int subcode, byte *data, uint len
 static void
 bgp_down(struct bgp_proto *p)
 {
+  bgp_start_timer(p, p->startup_timer, 0);
+
   if (p->start_state > BSS_PREPARE)
   {
     bgp_setup_auth(p, 0);
@@ -469,21 +477,34 @@ bgp_down(struct bgp_proto *p)
 }
 
 static void
-bgp_decision(void *vp)
+bgp_active_event(void *vp)
 {
   struct bgp_proto *p = vp;
 
-  DBG("BGP: Decision start\n");
+  BGP_ASSERT_INSIDE(p);
+
+  DBG("%s: Decision start\n", p->p.name);
   if ((p->p.proto_state == PS_START) &&
       (p->outgoing_conn.state == BS_IDLE) &&
       (p->incoming_conn.state != BS_OPENCONFIRM) &&
       !p->passive)
     bgp_active(p);
+}
 
+static void
+bgp_down_event(void *vp)
+{
+  struct bgp_proto *p = vp;
+
+  BGP_ENTER(p);
+
+  DBG("%s: Down event\n", p->p.name);
   if ((p->p.proto_state == PS_STOP) &&
       (p->outgoing_conn.state == BS_IDLE) &&
       (p->incoming_conn.state == BS_IDLE))
     bgp_down(p);
+
+  BGP_LEAVE(p);
 }
 
 static struct bgp_proto *
@@ -515,7 +536,7 @@ bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len)
   proto_notify_state(&p->p, PS_STOP);
   bgp_graceful_close_conn(&p->outgoing_conn, subcode, data, len);
   bgp_graceful_close_conn(&p->incoming_conn, subcode, data, len);
-  ev_schedule(p->event);
+  ev_send_loop(&main_birdloop, p->down_event);
 }
 
 static inline void
@@ -707,7 +728,7 @@ bgp_conn_enter_close_state(struct bgp_conn *conn)
   conn->sk->rx_hook = NULL;
 
   /* Timeout for CLOSE state, if we cannot send notification soon then we just hangup */
-  bgp_start_timer(conn->hold_timer, 10);
+  bgp_start_timer(p, conn->hold_timer, 10);
 
   if (os == BS_ESTABLISHED)
     bgp_conn_leave_established_state(p);
@@ -721,7 +742,8 @@ bgp_conn_enter_idle_state(struct bgp_conn *conn)
 
   bgp_close_conn(conn);
   bgp_conn_set_state(conn, BS_IDLE);
-  ev_schedule(p->event);
+  ev_send_loop(p->p.loop, p->active_event);
+  ev_send_loop(&main_birdloop, p->down_event);
 
   if (os == BS_ESTABLISHED)
     bgp_conn_leave_established_state(p);
@@ -796,7 +818,7 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
   ASSERT(p->gr_active_num > 0);
 
   proto_notify_state(&p->p, PS_START);
-  tm_start(p->gr_timer, p->conn->remote_caps->gr_time S);
+  tm_start_in(p->gr_timer, p->conn->remote_caps->gr_time S, p->p.loop);
 }
 
 static void
@@ -911,7 +933,7 @@ bgp_graceful_restart_timeout(timer *t)
 
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
-      tm_start(c->stale_timer, c->stale_time S);
+      tm_start_in(c->stale_timer, c->stale_time S, p->p.loop);
       bgp_graceful_restart_feed(c);
     }
   }
@@ -988,7 +1010,7 @@ bgp_send_open(struct bgp_conn *conn)
   bgp_prepare_capabilities(conn);
   bgp_schedule_packet(conn, NULL, PKT_OPEN);
   bgp_conn_set_state(conn, BS_OPENSENT);
-  bgp_start_timer(conn->hold_timer, conn->bgp->cf->initial_hold_time);
+  bgp_start_timer(conn->bgp, conn->hold_timer, conn->bgp->cf->initial_hold_time);
 }
 
 static void
@@ -1065,7 +1087,7 @@ bgp_hold_timeout(timer *t)
      and perhaps just not processed BGP packets in time. */
 
   if (sk_rx_ready(conn->sk) > 0)
-    bgp_start_timer(conn->hold_timer, 10);
+    bgp_start_timer(p, conn->hold_timer, 10);
   else if ((conn->state == BS_ESTABLISHED) && p->llgr_ready)
   {
     BGP_TRACE(D_EVENTS, "Hold timer expired");
@@ -1110,10 +1132,12 @@ bgp_setup_conn(struct bgp_proto *p, struct bgp_conn *conn)
 static void
 bgp_setup_sk(struct bgp_conn *conn, sock *s)
 {
+  ASSERT_DIE(s->flags & SKF_THREAD);
   s->data = conn;
   s->err_hook = bgp_sock_err;
   s->fast_rx = 1;
   conn->sk = s;
+  sk_start(s);
 }
 
 static void
@@ -1122,10 +1146,12 @@ bgp_active(struct bgp_proto *p)
   int delay = MAX(1, p->cf->connect_delay_time);
   struct bgp_conn *conn = &p->outgoing_conn;
 
+  BGP_ASSERT_INSIDE(p);
+
   BGP_TRACE(D_EVENTS, "Connect delayed by %d seconds", delay);
   bgp_setup_conn(p, conn);
   bgp_conn_set_state(conn, BS_ACTIVE);
-  bgp_start_timer(conn->connect_timer, delay);
+  bgp_start_timer(p, conn->connect_timer, delay);
 }
 
 /**
@@ -1142,9 +1168,12 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
   struct bgp_conn *conn = &p->outgoing_conn;
   int hops = p->cf->multihop ? : 1;
 
+  BGP_ASSERT_INSIDE(p);
+
   DBG("BGP: Connecting\n");
   sock *s = sk_new(p->p.pool);
   s->type = SK_TCP_ACTIVE;
+  s->flags |= SKF_THREAD;
   s->saddr = p->local_ip;
   s->daddr = p->remote_ip;
   s->dport = p->cf->remote_port;
@@ -1172,7 +1201,7 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
       goto err;
 
   DBG("BGP: Waiting for connect success\n");
-  bgp_start_timer(conn->connect_timer, p->cf->connect_retry_time);
+  bgp_start_timer(p, conn->connect_timer, p->cf->connect_retry_time);
   return;
 
 err:
@@ -1244,6 +1273,8 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
     return 0;
   }
 
+  BGP_ENTER(p);
+
   /*
    * BIRD should keep multiple incoming connections in OpenSent state (for
    * details RFC 4271 8.2.1 par 3), but it keeps just one. Duplicate incoming
@@ -1273,6 +1304,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
   if (!acc)
   {
     rfree(sk);
+    BGP_LEAVE(p);
     return 0;
   }
 
@@ -1298,6 +1330,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
     p = bgp_spawn(p, sk->daddr);
     p->postponed_sk = sk;
     rmove(sk, p->p.pool);
+    BGP_LEAVE(p);
     return 0;
   }
 
@@ -1305,12 +1338,14 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
   bgp_setup_conn(p, &p->incoming_conn);
   bgp_setup_sk(&p->incoming_conn, sk);
   bgp_send_open(&p->incoming_conn);
+  BGP_LEAVE(p);
   return 0;
 
 err:
   sk_log_error(sk, p->p.name);
   log(L_ERR "%s: Incoming connection aborted", p->p.name);
   rfree(sk);
+  BGP_LEAVE(p);
   return 0;
 }
 
@@ -1345,10 +1380,9 @@ bgp_neigh_notify(neighbor *n)
   struct bgp_proto *p = (struct bgp_proto *) n->proto;
   int ps = p->p.proto_state;
 
-  if (n != p->neigh)
-    return;
+  BGP_ASSERT_INSIDE(p);
 
-  if ((ps == PS_DOWN) || (ps == PS_STOP))
+  if ((n != p->neigh) || (ps == PS_DOWN) || (ps == PS_STOP))
     return;
 
   int prepare = (ps == PS_START) && (p->start_state == BSS_PREPARE);
@@ -1504,9 +1538,12 @@ bgp_start_locked(struct object_lock *lock)
   struct bgp_proto *p = lock->data;
   const struct bgp_config *cf = p->cf;
 
+  BGP_ENTER(p);
+
   if (p->p.proto_state != PS_START)
   {
     DBG("BGP: Got lock in different state %d\n", p->p.proto_state);
+    BGP_LEAVE(p);
     return;
   }
 
@@ -1516,6 +1553,7 @@ bgp_start_locked(struct object_lock *lock)
   {
     /* Multi-hop sessions do not use neighbor entries */
     bgp_initiate(p);
+    BGP_LEAVE(p);
     return;
   }
 
@@ -1527,6 +1565,7 @@ bgp_start_locked(struct object_lock *lock)
     p->p.disabled = 1;
     bgp_store_error(p, NULL, BE_MISC, BEM_INVALID_NEXT_HOP);
     proto_notify_state(&p->p, PS_DOWN);
+    BGP_LEAVE(p);
     return;
   }
 
@@ -1538,6 +1577,8 @@ bgp_start_locked(struct object_lock *lock)
     BGP_TRACE(D_EVENTS, "Waiting for link on %s", n->iface->name);
   else
     bgp_start_neighbor(p);
+
+  BGP_LEAVE(p);
 }
 
 static int
@@ -1576,7 +1617,8 @@ bgp_start(struct proto *P)
   p->stats.rx_bytes = p->stats.tx_bytes = 0;
   p->last_rx_update = 0;
 
-  p->event = ev_new_init(p->p.pool, bgp_decision, p);
+  p->active_event = ev_new_init(p->p.pool, bgp_active_event, p);
+  p->down_event = ev_new_init(p->p.pool, bgp_down_event, p);
   p->startup_timer = tm_new_init(p->p.pool, bgp_startup_timeout, p, 0, 0);
   p->gr_timer = tm_new_init(p->p.pool, bgp_graceful_restart_timeout, p, 0, 0);
 
@@ -2472,6 +2514,9 @@ bgp_show_proto_info(struct proto *P)
 {
   struct bgp_proto *p = (struct bgp_proto *) P;
 
+  if (p->p.proto_state != PS_DOWN)
+    BGP_ASSERT_INSIDE(p);
+
   cli_msg(-1006, "  BGP state:          %s", bgp_state_dsc(p));
 
   if (bgp_is_dynamic(p) && p->cf->remote_range)
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 56360a9f..d5ac3bd9 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -322,7 +322,8 @@ struct bgp_proto {
   btime last_established;		/* Last time of enter/leave of established state */
   btime last_rx_update;			/* Last time of RX update */
   ip_addr link_addr;			/* Link-local version of local_ip */
-  event *event;				/* Event for respawning and shutting process */
+  event *active_event;			/* Event for respawning */
+  event *down_event;			/* Event to shut down */
   timer *startup_timer;			/* Timer used to delay protocol startup due to previous errors (startup_delay) */
   timer *gr_timer;			/* Timer waiting for reestablishment after graceful restart */
   int dynamic_name_counter;		/* Counter for dynamic BGP names */
@@ -496,7 +497,7 @@ bgp_parse_error(struct bgp_parse_state *s, uint subcode)
 }
 
 
-void bgp_start_timer(timer *t, uint value);
+void bgp_start_timer(struct bgp_proto *p, timer *t, uint value);
 void bgp_check_config(struct bgp_config *c);
 void bgp_error(struct bgp_conn *c, unsigned code, unsigned subcode, byte *data, int len);
 void bgp_close_conn(struct bgp_conn *c);
@@ -760,5 +761,10 @@ void bgp_update_next_hop(struct bgp_export_state *s, eattr *a, ea_list **to);
 #define ORIGIN_EGP		1
 #define ORIGIN_INCOMPLETE	2
 
+/* Loop */
+
+#define BGP_ENTER(bgp)	birdloop_enter(bgp->p.loop)
+#define BGP_LEAVE(bgp)	birdloop_leave(bgp->p.loop)
+#define BGP_ASSERT_INSIDE(bgp)	ASSERT_DIE((bgp->p.loop != &main_birdloop) && birdloop_inside(bgp->p.loop))
 
 #endif
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 2dfbdca9..8e42bbdb 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -48,6 +48,7 @@ proto: bgp_proto '}'  ;
 
 bgp_proto_start: proto_start BGP {
      this_proto = proto_config_new(&proto_bgp, $1);
+     this_proto->loop_order = DOMAIN_ORDER(proto);
      BGP_CFG->local_port = BGP_PORT;
      BGP_CFG->remote_port = BGP_PORT;
      BGP_CFG->multihop = -1;	/* undefined */
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index de4f70c1..88b66040 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -914,7 +914,7 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, uint len)
       conn->hold_time, conn->keepalive_time, p->remote_as, p->remote_id, conn->as4_session);
 
   bgp_schedule_packet(conn, NULL, PKT_KEEPALIVE);
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
   bgp_conn_enter_openconfirm_state(conn);
 }
 
@@ -2475,7 +2475,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
   if (conn->state != BS_ESTABLISHED)
   { bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0); return; }
 
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
 
   /* Initialize parse state */
   struct bgp_parse_state s = {
@@ -2811,7 +2811,7 @@ bgp_fire_tx(struct bgp_conn *conn)
   {
     conn->packets_to_send &= ~(1 << PKT_KEEPALIVE);
     BGP_TRACE(D_PACKETS, "Sending KEEPALIVE");
-    bgp_start_timer(conn->keepalive_timer, conn->keepalive_time);
+    bgp_start_timer(p, conn->keepalive_timer, conn->keepalive_time);
     return bgp_send(conn, PKT_KEEPALIVE, BGP_HEADER_LENGTH);
   }
   else while (conn->channels_to_send)
@@ -2896,7 +2896,7 @@ bgp_schedule_packet(struct bgp_conn *conn, struct bgp_channel *c, int type)
     conn->packets_to_send |= 1 << type;
 
   if ((conn->sk->tpos == conn->sk->tbuf) && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    ev_send_loop(conn->bgp->p.loop, conn->tx_ev);
 }
 void
 bgp_kick_tx(void *vconn)
@@ -2909,7 +2909,7 @@ bgp_kick_tx(void *vconn)
     ;
 
   if (!max && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    ev_send_loop(conn->bgp->p.loop, conn->tx_ev);
 }
 
 void
@@ -2923,7 +2923,7 @@ bgp_tx(sock *sk)
     ;
 
   if (!max && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    ev_send_loop(conn->bgp->p.loop, conn->tx_ev);
 }
 
 
@@ -3105,7 +3105,7 @@ bgp_rx_keepalive(struct bgp_conn *conn)
   struct bgp_proto *p = conn->bgp;
 
   BGP_TRACE(D_PACKETS, "Got KEEPALIVE");
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
 
   if (conn->state == BS_OPENCONFIRM)
   { bgp_conn_enter_established_state(conn); return; }

From c019008383a439b5e5cf46dc71f902f335a0a9df Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Feb 2022 14:53:38 +0100
Subject: [PATCH 091/431] IO loop duration fixup

---
 lib/timer.h           | 1 +
 sysdep/unix/io-loop.c | 4 ++--
 sysdep/unix/io.c      | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/timer.h b/lib/timer.h
index 04544ace..161e39d3 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -55,6 +55,7 @@ static inline timer *timers_first(struct timeloop *loop)
 
 #define current_time()		atomic_load_explicit(&last_time, memory_order_acquire)
 #define current_real_time()	atomic_load_explicit(&real_time, memory_order_acquire)
+#define current_time_update()	({ times_update(); current_time(); })
 
 //#define now (current_time() TO_S)
 //#define now_real (current_real_time() TO_S)
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 5ab93b31..9b107a1a 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -558,7 +558,7 @@ birdloop_main(void *arg)
     if (loop->poll_changed)
       sockets_prepare(loop);
 
-    btime duration = current_time() - loop_begin;
+    btime duration = current_time_update() - loop_begin;
     if (duration > config->watchdog_warning)
       log(L_WARN "I/O loop cycle took %d ms", (int) (duration TO_MS));
 
@@ -578,7 +578,7 @@ birdloop_main(void *arg)
     if (loop->stopped && !loop->links)
       break;
 
-    loop_begin = current_time();
+    loop_begin = current_time_update();
 
     if (rv)
       sockets_fire(loop);
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index fa836f28..e3e388af 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2100,8 +2100,7 @@ static btime loop_time;
 static void
 io_update_time(void)
 {
-  times_update();
-  last_io_time = current_time();
+  last_io_time = current_time_update();
 
   if (event_open)
   {

From 09380db594e1befb991be626b36783cae525d823 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Feb 2022 14:54:03 +0100
Subject: [PATCH 092/431] Neighbor prune fixup

---
 nest/iface.h    |  2 +-
 nest/neighbor.c | 17 ++++++++---------
 nest/proto.c    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nest/iface.h b/nest/iface.h
index 6e8c8448..87ad86cf 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -160,7 +160,7 @@ neighbor *neigh_find(struct proto *p, ip_addr a, struct iface *ifa, uint flags);
 
 void neigh_dump(neighbor *);
 void neigh_dump_all(void);
-void neigh_prune(void);
+void neigh_prune(struct proto *p);
 void neigh_if_up(struct iface *);
 void neigh_if_down(struct iface *);
 void neigh_if_link(struct iface *);
diff --git a/nest/neighbor.c b/nest/neighbor.c
index e4d42b4d..7b951366 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -61,6 +61,7 @@ static slab *neigh_slab;
 static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list;
 static void neigh_do_notify(void *);
 static void neigh_do_notify_main(void *);
+static void neigh_free(neighbor *n);
 
 static inline uint
 neigh_hash(struct proto *p, ip_addr a, struct iface *i)
@@ -372,6 +373,9 @@ neigh_do_notify(void *data)
 
   if (n->proto->proto_state != PS_STOP)
     n->proto->neigh_notify(n);
+
+  if ((n->scope < 0) && !(n->flags & NEF_STICKY))
+    neigh_free(n);
 }
 
 static void
@@ -402,7 +406,7 @@ neigh_down(neighbor *n)
   neigh_notify(n);
 }
 
-static inline void
+static void
 neigh_free(neighbor *n)
 {
   ASSERT_DIE(birdloop_inside(n->proto->loop));
@@ -480,12 +484,6 @@ neigh_update(neighbor *n, struct iface *iface)
   if (n->scope >= 0)
     neigh_down(n);
 
-  if ((n->scope < 0) && !(n->flags & NEF_STICKY))
-  {
-    neigh_free(n);
-    return;
-  }
-
   if (scope >= 0)
     neigh_up(n, iface, ifa, scope);
 }
@@ -630,7 +628,7 @@ neigh_prune_one(neighbor *n)
  * is shut down to get rid of all its heritage.
  */
 void
-neigh_prune(void)
+neigh_prune(struct proto *p)
 {
   neighbor *n;
   node *m;
@@ -641,7 +639,8 @@ neigh_prune(void)
   DBG("Pruning neighbors\n");
   for(i=0; i<NEIGH_HASH_SIZE; i++)
     WALK_LIST_DELSAFE(n, m, neigh_hash_table[i])
-      neigh_prune_one(n);
+      if (n->proto == p)
+	neigh_prune_one(n);
 
   IFACE_UNLOCK;
 }
diff --git a/nest/proto.c b/nest/proto.c
index 1e7f5560..3ba8ac5c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -2434,7 +2434,7 @@ static void
 proto_do_down(struct proto *p)
 {
   p->down_code = 0;
-  neigh_prune();
+  neigh_prune(p);
 
   /* Shutdown is finished in the protocol event */
   if (proto_is_done(p))

From d262695d4e8ddee7b9408bb726b4100f68d217d7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 2 Feb 2022 11:20:53 +0100
Subject: [PATCH 093/431] BFD: direct notifications to protocol loops

---
 lib/event.h           |   1 +
 nest/bfd.h            |  12 +-
 nest/proto.c          |  10 +-
 proto/bfd/bfd.c       | 386 ++++++++++++++++--------------------------
 proto/bfd/bfd.h       |  23 +--
 proto/bfd/packets.c   |  15 +-
 proto/bgp/bgp.c       |   2 +-
 proto/ospf/neighbor.c |   2 +-
 proto/rip/rip.c       |   2 +-
 proto/static/static.c |   2 +-
 10 files changed, 182 insertions(+), 273 deletions(-)

diff --git a/lib/event.h b/lib/event.h
index 3af33a7f..cbabfc66 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -63,6 +63,7 @@ static inline void ev_init_cork(struct event_cork *ec, const char *name)
 };
 
 void ev_send(event_list *, event *);
+#define ev_send_self(e)	({ ASSERT_DIE((e)->list); ev_send((e)->list, (e)); })
 #define ev_send_loop(l, e) ev_send(birdloop_event_list((l)), (e))
 
 #define ev_schedule(e) ({ ASSERT_THE_BIRD_LOCKED; if (!ev_active((e))) ev_send(&global_event_list, (e)); })
diff --git a/nest/bfd.h b/nest/bfd.h
index 37561266..c91d6648 100644
--- a/nest/bfd.h
+++ b/nest/bfd.h
@@ -23,6 +23,11 @@ struct bfd_options {
   u8 mode;
 };
 
+struct bfd_session_state {
+  u8 state;
+  u8 diag;
+};
+
 struct bfd_request {
   resource r;
   node n;
@@ -35,12 +40,12 @@ struct bfd_request {
 
   void (*hook)(struct bfd_request *);
   void *data;
+  event event;
 
   struct bfd_session *session;
-
+  struct bfd_session_state old_state;
   u8 state;
   u8 diag;
-  u8 old_state;
   u8 down;
 };
 
@@ -51,13 +56,12 @@ struct bfd_request {
 #define BFD_STATE_INIT		2
 #define BFD_STATE_UP		3
 
-
 static inline struct bfd_options * bfd_new_options(void)
 { return cfg_allocz(sizeof(struct bfd_options)); }
 
 #ifdef CONFIG_BFD
 
-struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data, const struct bfd_options *opts);
+struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data, struct event_list *list, const struct bfd_options *opts);
 void bfd_update_request(struct bfd_request *req, const struct bfd_options *opts);
 
 static inline void cf_check_bfd(int use UNUSED) { }
diff --git a/nest/proto.c b/nest/proto.c
index 3ba8ac5c..c350d1cb 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1762,8 +1762,14 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
 	nc->proto = p;
 
 	/* We will try to reconfigure protocol p */
-	if (! force_reconfig && proto_reconfigure(p, oc, nc, type))
-	  continue;
+	if (!force_reconfig)
+	{
+	  int ok;
+	  PROTO_LOCKED_FROM_MAIN(p)
+	    ok = proto_reconfigure(p, oc, nc, type);
+	  if (ok)
+	    continue;
+	}
 
 	if (nc->parent)
 	{
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index b04d7030..63e0deff 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -116,20 +116,23 @@
 DEFINE_DOMAIN(rtable);
 #define BFD_LOCK	LOCK_DOMAIN(rtable, bfd_global.lock)
 #define BFD_UNLOCK	UNLOCK_DOMAIN(rtable, bfd_global.lock)
+#define BFD_ASSERT_LOCKED	ASSERT_DIE(DOMAIN_IS_LOCKED(rtable, bfd_global.lock))
 
 static struct {
   DOMAIN(rtable) lock;
   list wait_list;
-  list pickup_list;
   list proto_list;
 } bfd_global;
 
+static struct bfd_session bfd_admin_down = { .loc = { .state = BFD_STATE_ADMIN_DOWN }, };
+
 const char *bfd_state_names[] = { "AdminDown", "Down", "Init", "Up" };
 
 static void bfd_session_set_min_tx(struct bfd_session *s, u32 val);
 static struct bfd_iface *bfd_get_iface(struct bfd_proto *p, ip_addr local, struct iface *iface);
 static void bfd_free_iface(struct bfd_iface *ifa);
-static inline void bfd_notify_kick(struct bfd_proto *p);
+static void bfd_remove_session(struct bfd_proto *p, struct bfd_session *s);
+static void bfd_reconfigure_session_hook(void *vsession);
 
 
 /*
@@ -148,37 +151,57 @@ bfd_merge_options(const struct bfd_iface_config *cf, const struct bfd_options *o
   };
 }
 
-static void
+static int
 bfd_session_update_state(struct bfd_session *s, uint state, uint diag)
 {
   struct bfd_proto *p = s->ifa->bfd;
-  uint old_state = s->loc_state;
-  int notify;
+  uint old_state = BFD_LOC_STATE(s).state;
 
   if (state == old_state)
-    return;
+  {
+    if (current_time() > s->last_reqlist_check + 5 S)
+    {
+      BFD_LOCK;
+      if (EMPTY_LIST(s->request_list))
+      {
+	bfd_remove_session(p, s);
+	BFD_UNLOCK;
+	return 1;
+      }
+
+      s->last_reqlist_check = current_time();
+      BFD_UNLOCK;
+    }
+    return 0;
+  }
 
   TRACE(D_EVENTS, "Session to %I changed state from %s to %s",
 	s->addr, bfd_state_names[old_state], bfd_state_names[state]);
 
-  bfd_lock_sessions(p);
-  s->loc_state = state;
-  s->loc_diag = diag;
+  atomic_store_explicit(&s->loc, ((struct bfd_session_state) { .state = state, .diag = diag }), memory_order_release);
   s->last_state_change = current_time();
 
-  notify = !NODE_VALID(&s->n);
-  if (notify)
-    add_tail(&p->notify_list, &s->n);
-  bfd_unlock_sessions(p);
-
   if (state == BFD_STATE_UP)
     bfd_session_set_min_tx(s, s->cf.min_tx_int);
 
   if (old_state == BFD_STATE_UP)
     bfd_session_set_min_tx(s, s->cf.idle_tx_int);
 
-  if (notify)
-    bfd_notify_kick(p);
+  BFD_LOCK;
+  if (EMPTY_LIST(s->request_list))
+  {
+    bfd_remove_session(p, s);
+    BFD_UNLOCK;
+    return 1;
+  }
+
+  struct bfd_request *req;
+  node *nn;
+  WALK_LIST2(req, nn, s->request_list, n)
+    ev_send_self(&req->event);
+
+  BFD_UNLOCK;
+  return 0;
 }
 
 static void
@@ -223,8 +246,8 @@ bfd_session_control_tx_timer(struct bfd_session *s, int reset)
 
   if (s->rem_demand_mode &&
       !s->poll_active &&
-      (s->loc_state == BFD_STATE_UP) &&
-      (s->rem_state == BFD_STATE_UP))
+      (BFD_LOC_STATE(s).state == BFD_STATE_UP) &&
+      (s->rem.state == BFD_STATE_UP))
     goto stop;
 
   if (s->rem_min_rx_int == 0)
@@ -294,28 +317,29 @@ bfd_session_process_ctl(struct bfd_session *s, u8 flags, u32 old_tx_int, u32 old
   int next_state = 0;
   int diag = BFD_DIAG_NOTHING;
 
-  switch (s->loc_state)
+  switch (BFD_LOC_STATE(s).state)
   {
   case BFD_STATE_ADMIN_DOWN:
     return;
 
   case BFD_STATE_DOWN:
-    if (s->rem_state == BFD_STATE_DOWN)		next_state = BFD_STATE_INIT;
-    else if (s->rem_state == BFD_STATE_INIT)	next_state = BFD_STATE_UP;
+    if (s->rem.state == BFD_STATE_DOWN)		next_state = BFD_STATE_INIT;
+    else if (s->rem.state == BFD_STATE_INIT)	next_state = BFD_STATE_UP;
     break;
 
   case BFD_STATE_INIT:
-    if (s->rem_state == BFD_STATE_ADMIN_DOWN)	next_state = BFD_STATE_DOWN, diag = BFD_DIAG_NEIGHBOR_DOWN;
-    else if (s->rem_state >= BFD_STATE_INIT)	next_state = BFD_STATE_UP;
+    if (s->rem.state == BFD_STATE_ADMIN_DOWN)	next_state = BFD_STATE_DOWN, diag = BFD_DIAG_NEIGHBOR_DOWN;
+    else if (s->rem.state >= BFD_STATE_INIT)	next_state = BFD_STATE_UP;
     break;
 
   case BFD_STATE_UP:
-    if (s->rem_state <= BFD_STATE_DOWN)		next_state = BFD_STATE_DOWN, diag = BFD_DIAG_NEIGHBOR_DOWN;
+    if (s->rem.state <= BFD_STATE_DOWN)		next_state = BFD_STATE_DOWN, diag = BFD_DIAG_NEIGHBOR_DOWN;
     break;
   }
 
   if (next_state)
-    bfd_session_update_state(s, next_state, diag);
+    if (bfd_session_update_state(s, next_state, diag))
+      return;
 
   bfd_session_control_tx_timer(s, 0);
 
@@ -330,7 +354,7 @@ bfd_session_timeout(struct bfd_session *s)
 
   TRACE(D_EVENTS, "Session to %I expired", s->addr);
 
-  s->rem_state = BFD_STATE_DOWN;
+  s->rem.state = BFD_STATE_DOWN;
   s->rem_id = 0;
   s->rem_min_tx_int = 0;
   s->rem_min_rx_int = 1;
@@ -341,7 +365,8 @@ bfd_session_timeout(struct bfd_session *s)
   s->poll_active = 0;
   s->poll_scheduled = 0;
 
-  bfd_session_update_state(s, BFD_STATE_DOWN, BFD_DIAG_TIMEOUT);
+  if (bfd_session_update_state(s, BFD_STATE_DOWN, BFD_DIAG_TIMEOUT))
+    return;
 
   bfd_session_control_tx_timer(s, 1);
 }
@@ -357,7 +382,7 @@ bfd_session_set_min_tx(struct bfd_session *s, u32 val)
   s->des_min_tx_new = val;
 
   /* Postpone timer update if des_min_tx_int increases and the session is up */
-  if ((s->loc_state != BFD_STATE_UP) || (val < s->des_min_tx_int))
+  if ((BFD_LOC_STATE(s).state != BFD_STATE_UP) || (val < s->des_min_tx_int))
   {
     s->des_min_tx_int = val;
     bfd_session_update_tx_interval(s);
@@ -377,7 +402,7 @@ bfd_session_set_min_rx(struct bfd_session *s, u32 val)
   s->req_min_rx_new = val;
 
   /* Postpone timer update if req_min_rx_int decreases and the session is up */
-  if ((s->loc_state != BFD_STATE_UP) || (val > s->req_min_rx_int))
+  if ((BFD_LOC_STATE(s).state != BFD_STATE_UP) || (val > s->req_min_rx_int))
   {
     s->req_min_rx_int = val;
     bfd_session_update_detection_time(s, 0);
@@ -389,12 +414,14 @@ bfd_session_set_min_rx(struct bfd_session *s, u32 val)
 struct bfd_session *
 bfd_find_session_by_id(struct bfd_proto *p, u32 id)
 {
+  ASSERT_DIE(birdloop_inside(p->p.loop));
   return HASH_FIND(p->session_hash_id, HASH_ID, id);
 }
 
 struct bfd_session *
 bfd_find_session_by_addr(struct bfd_proto *p, ip_addr addr, uint ifindex)
 {
+  ASSERT_DIE(birdloop_inside(p->p.loop));
   return HASH_FIND(p->session_hash_ip, HASH_IP, addr, ifindex);
 }
 
@@ -428,6 +455,7 @@ static struct bfd_session *
 bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *iface, struct bfd_options *opts)
 {
   ASSERT_DIE(birdloop_inside(p->p.loop));
+  BFD_ASSERT_LOCKED;
 
   struct bfd_iface *ifa = bfd_get_iface(p, local, iface);
 
@@ -441,10 +469,15 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
   HASH_INSERT(p->session_hash_ip, HASH_IP, s);
 
   s->cf = bfd_merge_options(ifa->cf, opts);
+  s->update_event = (event) {
+    .hook = bfd_reconfigure_session_hook,
+    .data = s,
+    .list = birdloop_event_list(p->p.loop),
+  };
 
   /* Initialization of state variables - see RFC 5880 6.8.1 */
-  s->loc_state = BFD_STATE_DOWN;
-  s->rem_state = BFD_STATE_DOWN;
+  atomic_store_explicit(&s->loc, ((struct bfd_session_state) { .state = BFD_STATE_DOWN }), memory_order_relaxed);
+  s->rem.state = BFD_STATE_DOWN;
   s->des_min_tx_int = s->des_min_tx_new = s->cf.idle_tx_int;
   s->req_min_rx_int = s->req_min_rx_new = s->cf.min_rx_int;
   s->rem_min_rx_int = 1;
@@ -465,42 +498,12 @@ bfd_add_session(struct bfd_proto *p, ip_addr addr, ip_addr local, struct iface *
   return s;
 }
 
-/*
 static void
-bfd_open_session(struct bfd_proto *p, struct bfd_session *s, ip_addr local, struct iface *ifa)
+bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
 {
-  birdloop_enter(p->p.loop);
-
-  s->opened = 1;
-
-  bfd_session_control_tx_timer(s);
-
-  birdloop_leave(p->p.loop);
-}
-
-static void
-bfd_close_session(struct bfd_proto *p, struct bfd_session *s)
-{
-  birdloop_enter(p->p.loop);
-
-  s->opened = 0;
-
-  bfd_session_update_state(s, BFD_STATE_DOWN, BFD_DIAG_PATH_DOWN);
-  bfd_session_control_tx_timer(s);
-
-  birdloop_leave(p->p.loop);
-}
-*/
-
-static void
-bfd_remove_session_locked(struct bfd_proto *p, struct bfd_session *s)
-{
-  /* Caller should ensure that request list is empty */
-
-  /* Remove session from notify list if scheduled for notification */
-  /* No need for bfd_lock_sessions(), we are already protected by birdloop_enter() */
-  if (NODE_VALID(&s->n))
-    rem_node(&s->n);
+  ASSERT_DIE(birdloop_inside(p->p.loop));
+  BFD_ASSERT_LOCKED;
+  ASSERT_DIE(EMPTY_LIST(s->request_list));
 
   bfd_free_iface(s->ifa);
 
@@ -515,26 +518,22 @@ bfd_remove_session_locked(struct bfd_proto *p, struct bfd_session *s)
   sl_free(p->session_slab, s);
 }
 
-static void
-bfd_remove_session(struct bfd_proto *p, struct bfd_session *s)
-{
-  birdloop_enter(p->p.loop);
-  bfd_remove_session_locked(p, s);
-  birdloop_leave(p->p.loop);
-}
-
 static void
 bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
 {
+  ASSERT_DIE(birdloop_inside(p->p.loop));
+  BFD_LOCK;
   if (EMPTY_LIST(s->request_list))
+  {
+    bfd_remove_session(p, s);
+    BFD_UNLOCK;
     return;
-
-  birdloop_enter(p->p.loop);
+  }
 
   struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(s->request_list));
   s->cf = bfd_merge_options(s->ifa->cf, &req->opts);
 
-  u32 tx = (s->loc_state == BFD_STATE_UP) ? s->cf.min_tx_int : s->cf.idle_tx_int;
+  u32 tx = (BFD_LOC_STATE(s).state == BFD_STATE_UP) ? s->cf.min_tx_int : s->cf.idle_tx_int;
   bfd_session_set_min_tx(s, tx);
   bfd_session_set_min_rx(s, s->cf.min_rx_int);
   s->detect_mult = s->cf.multiplier;
@@ -542,9 +541,15 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
 
   bfd_session_control_tx_timer(s, 0);
 
-  birdloop_leave(p->p.loop);
-
   TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
+  BFD_UNLOCK;
+}
+
+static void
+bfd_reconfigure_session_hook(void *data)
+{
+  struct bfd_session *s = data;
+  return bfd_reconfigure_session(s->ifa->bfd, s);
 }
 
 
@@ -612,7 +617,7 @@ bfd_free_iface(struct bfd_iface *ifa)
 }
 
 static void
-bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_config *nc)
+bfd_reconfigure_iface(struct bfd_proto *p UNUSED, struct bfd_iface *ifa, struct bfd_config *nc)
 {
   struct bfd_iface_config *new = bfd_find_iface_config(nc, ifa->iface);
   struct bfd_iface_config *old = ifa->cf;
@@ -626,9 +631,7 @@ bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_con
     (new->passive != old->passive);
 
   /* This should be probably changed to not access ifa->cf from the BFD thread */
-  birdloop_enter(p->p.loop);
   ifa->cf = new;
-  birdloop_leave(p->p.loop);
 }
 
 
@@ -637,17 +640,22 @@ bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_con
  */
 
 static void
-bfd_request_notify(struct bfd_request *req, u8 state, u8 diag)
+bfd_request_notify(void *data)
 {
-  u8 old_state = req->state;
+  struct bfd_request *req = data;
+  struct bfd_session_state old = req->old_state;
 
-  if (state == old_state)
+  BFD_LOCK; /* Needed to safely access req->session */
+  struct bfd_session_state new = atomic_load_explicit(&req->session->loc, memory_order_acquire);
+  BFD_UNLOCK;
+
+  if (new.state == old.state)
     return;
 
-  req->state = state;
-  req->diag = diag;
-  req->old_state = old_state;
-  req->down = (old_state == BFD_STATE_UP) && (state == BFD_STATE_DOWN);
+  req->state = new.state;
+  req->diag = new.diag;
+  req->old_state = new;
+  req->down = (old.state == BFD_STATE_UP) && (new.state == BFD_STATE_DOWN);
 
   if (req->hook)
     req->hook(req);
@@ -656,6 +664,9 @@ bfd_request_notify(struct bfd_request *req, u8 state, u8 diag)
 static int
 bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 {
+  BFD_ASSERT_LOCKED;
+  ASSERT_DIE(req->session == &bfd_admin_down);
+
   struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
 
   if (p->p.vrf && (p->p.vrf != req->vrf))
@@ -669,7 +680,6 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 
   uint ifindex = req->iface ? req->iface->index : 0;
   struct bfd_session *s = bfd_find_session_by_addr(p, req->addr, ifindex);
-  u8 state, diag;
 
   if (!s)
     s = bfd_add_session(p, req->addr, req->local, req->iface, &req->opts);
@@ -678,12 +688,7 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
   add_tail(&s->request_list, &req->n);
   req->session = s;
 
-  bfd_lock_sessions(p);
-  state = s->loc_state;
-  diag = s->loc_diag;
-  bfd_unlock_sessions(p);
-
-  bfd_request_notify(req, state, diag);
+  ev_send_self(&req->event);
 
   return 1;
 }
@@ -691,41 +696,35 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 static void
 bfd_pickup_requests(void *_data UNUSED)
 {
-  node *n;
-  WALK_LIST(n, bfd_global.proto_list)
+  struct bfd_proto *p;
+  node *nn;
+  WALK_LIST2(p, nn, bfd_global.proto_list, bfd_node)
   {
-    struct bfd_proto *p = SKIP_BACK(struct bfd_proto, bfd_node, n);
     birdloop_enter(p->p.loop);
     BFD_LOCK;
 
+    struct bfd_request *req;
     node *rn, *rnxt;
-    WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
-      bfd_add_request(p, SKIP_BACK(struct bfd_request, n, rn));
+    WALK_LIST2_DELSAFE(req, rn, rnxt, bfd_global.wait_list, n)
+      bfd_add_request(p, req);
 
     BFD_UNLOCK;
+    birdloop_ping(p->p.loop);
     birdloop_leave(p->p.loop);
   }
-
-  BFD_LOCK;
-  node *rn, *rnxt;
-  WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
-  {
-    rem_node(rn);
-    add_tail(&bfd_global.wait_list, rn);
-    bfd_request_notify(SKIP_BACK(struct bfd_request, n, rn), BFD_STATE_ADMIN_DOWN, 0);
-  }
-  BFD_UNLOCK;
 }
 
 static event bfd_pickup_event = { .hook = bfd_pickup_requests };
+#define bfd_schedule_pickup()	ev_send(&global_event_list, &bfd_pickup_event)
 
 static void
 bfd_take_requests(struct bfd_proto *p)
 {
+  struct bfd_request *req;
   node *n, *nn;
   BFD_LOCK;
-  WALK_LIST_DELSAFE(n, nn, bfd_global.wait_list)
-    bfd_add_request(p, SKIP_BACK(struct bfd_request, n, n));
+  WALK_LIST2_DELSAFE(req, n, nn, bfd_global.wait_list, n)
+    bfd_add_request(p, req);
   BFD_UNLOCK;
 }
 
@@ -740,14 +739,13 @@ bfd_drop_requests(struct bfd_proto *p)
     {
       struct bfd_request *req = SKIP_BACK(struct bfd_request, n, n);
       rem_node(&req->n);
-      add_tail(&bfd_global.pickup_list, &req->n);
-      req->session = NULL;
-      bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
+      add_tail(&bfd_global.wait_list, &req->n);
+      req->session = &bfd_admin_down;
+      ev_send_self(&req->event);
     }
 
-    ev_send(&global_event_list, &bfd_pickup_event);
-
-    bfd_remove_session_locked(p, s);
+    bfd_schedule_pickup();
+    bfd_remove_session(p, s);
   }
   HASH_WALK_END;
   BFD_UNLOCK;
@@ -759,6 +757,7 @@ struct bfd_request *
 bfd_request_session(pool *p, ip_addr addr, ip_addr local,
 		    struct iface *iface, struct iface *vrf,
 		    void (*hook)(struct bfd_request *), void *data,
+		    struct event_list *list,
 		    const struct bfd_options *opts)
 {
   struct bfd_request *req = ralloc(p, &bfd_request_class);
@@ -773,12 +772,16 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
 
   req->hook = hook;
   req->data = data;
-
-  req->session = NULL;
+  req->event = (event) {
+    .hook = bfd_request_notify,
+    .data = req,
+    .list = list,
+  };
 
   BFD_LOCK;
-  add_tail(&bfd_global.pickup_list, &req->n);
-  ev_send(&global_event_list, &bfd_pickup_event);
+  req->session = &bfd_admin_down;
+  add_tail(&bfd_global.wait_list, &req->n);
+  bfd_schedule_pickup();
   BFD_UNLOCK;
 
   return req;
@@ -787,30 +790,29 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
 void
 bfd_update_request(struct bfd_request *req, const struct bfd_options *opts)
 {
-  struct bfd_session *s = req->session;
-
   if (!memcmp(opts, &req->opts, sizeof(const struct bfd_options)))
     return;
 
+  BFD_LOCK;
   req->opts = *opts;
 
-  if (s)
-    bfd_reconfigure_session(s->ifa->bfd, s);
+  struct bfd_session *s = req->session;
+  if (s != &bfd_admin_down)
+    ev_send_self(&s->update_event);
+
+  BFD_UNLOCK;
 }
 
 static void
 bfd_request_free(resource *r)
 {
   struct bfd_request *req = (struct bfd_request *) r;
-  struct bfd_session *s = req->session;
 
+  BFD_LOCK;
   rem_node(&req->n);
+  BFD_UNLOCK;
 
-  /* Remove the session if there is no request for it. Skip that if
-     inside notify hooks, will be handled by bfd_notify_hook() itself */
-
-  if (s && EMPTY_LIST(s->request_list) && !s->notify_running)
-    bfd_remove_session(s->ifa->bfd, s);
+  ev_postpone(&req->event);
 }
 
 static void
@@ -847,7 +849,7 @@ bfd_neigh_notify(struct neighbor *nb)
   if ((nb->scope > 0) && !n->req)
   {
     ip_addr local = ipa_nonzero(n->local) ? n->local : nb->ifa->ip;
-    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, p->p.vrf, NULL, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, p->p.vrf, NULL, NULL, birdloop_event_list(p->p.loop), NULL);
   }
 
   if ((nb->scope <= 0) && n->req)
@@ -864,7 +866,7 @@ bfd_start_neighbor(struct bfd_proto *p, struct bfd_neighbor *n)
 
   if (n->multihop)
   {
-    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, p->p.vrf, NULL, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, p->p.vrf, NULL, NULL, birdloop_event_list(p->p.loop), NULL);
     return;
   }
 
@@ -938,100 +940,6 @@ bfd_reconfigure_neighbors(struct bfd_proto *p, struct bfd_config *new)
 }
 
 
-/*
- *	BFD notify socket
- */
-
-/* This core notify code should be replaced after main loop transition to birdloop */
-
-int pipe(int pipefd[2]);
-void pipe_drain(int fd);
-void pipe_kick(int fd);
-
-static int
-bfd_notify_hook(sock *sk, uint len UNUSED)
-{
-  struct bfd_proto *p = sk->data;
-  struct bfd_session *s;
-  list tmp_list;
-  u8 state, diag;
-  node *n, *nn;
-
-  pipe_drain(sk->fd);
-
-  bfd_lock_sessions(p);
-  init_list(&tmp_list);
-  add_tail_list(&tmp_list, &p->notify_list);
-  init_list(&p->notify_list);
-  bfd_unlock_sessions(p);
-
-  WALK_LIST_FIRST(s, tmp_list)
-  {
-    bfd_lock_sessions(p);
-    rem_node(&s->n);
-    state = s->loc_state;
-    diag = s->loc_diag;
-    bfd_unlock_sessions(p);
-
-    s->notify_running = 1;
-    WALK_LIST_DELSAFE(n, nn, s->request_list)
-      bfd_request_notify(SKIP_BACK(struct bfd_request, n, n), state, diag);
-    s->notify_running = 0;
-
-    /* Remove the session if all requests were removed in notify hooks */
-    if (EMPTY_LIST(s->request_list))
-      bfd_remove_session(p, s);
-  }
-
-  return 0;
-}
-
-static inline void
-bfd_notify_kick(struct bfd_proto *p)
-{
-  pipe_kick(p->notify_ws->fd);
-}
-
-static void
-bfd_noterr_hook(sock *sk, int err)
-{
-  struct bfd_proto *p = sk->data;
-  log(L_ERR "%s: Notify socket error: %m", p->p.name, err);
-}
-
-static void
-bfd_notify_init(struct bfd_proto *p)
-{
-  int pfds[2];
-  sock *sk;
-
-  int rv = pipe(pfds);
-  if (rv < 0)
-    die("pipe: %m");
-
-  sk = sk_new(p->p.pool);
-  sk->type = SK_MAGIC;
-  sk->rx_hook = bfd_notify_hook;
-  sk->err_hook = bfd_noterr_hook;
-  sk->fd = pfds[0];
-  sk->data = p;
-  if (sk_open(sk) < 0)
-    die("bfd: sk_open failed");
-  p->notify_rs = sk;
-
-  /* The write sock is not added to any event loop */
-  sk = sk_new(p->p.pool);
-  sk->type = SK_MAGIC;
-  sk->fd = pfds[1];
-  sk->data = p;
-  sk->flags = SKF_THREAD;
-  sk->loop = p->p.loop;
-  if (sk_open(sk) < 0)
-    die("bfd: sk_open failed");
-  p->notify_ws = sk;
-}
-
-
 /*
  *	BFD protocol glue
  */
@@ -1041,7 +949,6 @@ bfd_init_all(void)
 {
   bfd_global.lock = DOMAIN_NEW(rtable, "BFD Global");
   init_list(&bfd_global.wait_list);
-  init_list(&bfd_global.pickup_list);
   init_list(&bfd_global.proto_list);
 }
 
@@ -1061,17 +968,12 @@ bfd_start(struct proto *P)
   struct bfd_proto *p = (struct bfd_proto *) P;
   struct bfd_config *cf = (struct bfd_config *) (P->cf);
 
-  pthread_spin_init(&p->lock, PTHREAD_PROCESS_PRIVATE);
-
   p->session_slab = sl_new(P->pool, sizeof(struct bfd_session));
   HASH_INIT(p->session_hash_id, P->pool, 8);
   HASH_INIT(p->session_hash_ip, P->pool, 8);
 
   init_list(&p->iface_list);
 
-  init_list(&p->notify_list);
-  bfd_notify_init(p);
-
   add_tail(&bfd_global.proto_list, &p->bfd_node);
 
   if (cf->accept_ipv4 && cf->accept_direct)
@@ -1125,6 +1027,8 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
   struct bfd_config *new = (struct bfd_config *) c;
   struct bfd_iface *ifa;
 
+  ASSERT_DIE(birdloop_inside(P->loop));
+
   /* TODO: Improve accept reconfiguration */
   if ((new->accept_ipv4 != old->accept_ipv4) ||
       (new->accept_ipv6 != old->accept_ipv6) ||
@@ -1137,12 +1041,12 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
   WALK_LIST(ifa, p->iface_list)
     bfd_reconfigure_iface(p, ifa, new);
 
-  HASH_WALK(p->session_hash_id, next_id, s)
+  HASH_WALK_DELSAFE(p->session_hash_id, next_id, s)
   {
     if (s->ifa->changed)
       bfd_reconfigure_session(p, s);
   }
-  HASH_WALK_END;
+  HASH_WALK_DELSAFE_END;
 
   bfd_reconfigure_neighbors(p, new);
 
@@ -1167,13 +1071,14 @@ bfd_show_sessions(struct proto *P)
 {
   byte tbuf[TM_DATETIME_BUFFER_SIZE];
   struct bfd_proto *p = (struct bfd_proto *) P;
-  uint state, diag UNUSED;
   btime tx_int, timeout;
   const char *ifname;
 
+  birdloop_enter(P->loop);
   if (p->p.proto_state != PS_UP)
   {
     cli_msg(-1020, "%s: is not up", p->p.name);
+    birdloop_leave(P->loop);
     return;
   }
 
@@ -1181,12 +1086,9 @@ bfd_show_sessions(struct proto *P)
   cli_msg(-1020, "%-25s %-10s %-10s %-12s  %8s %8s",
 	  "IP address", "Interface", "State", "Since", "Interval", "Timeout");
 
-
   HASH_WALK(p->session_hash_id, next_id, s)
   {
-    /* FIXME: this is thread-unsafe, but perhaps harmless */
-    state = s->loc_state;
-    diag = s->loc_diag;
+    uint state = BFD_LOC_STATE(s).state;
     ifname = (s->ifa && s->ifa->iface) ? s->ifa->iface->name : "---";
     tx_int = s->last_tx ? MAX(s->des_min_tx_int, s->rem_min_rx_int) : 0;
     timeout = (btime) MAX(s->req_min_rx_int, s->rem_min_tx_int) * s->rem_detect_mult;
@@ -1198,6 +1100,8 @@ bfd_show_sessions(struct proto *P)
 	    s->addr, ifname, bfd_state_names[state], tbuf, tx_int, timeout);
   }
   HASH_WALK_END;
+
+  birdloop_leave(P->loop);
 }
 
 
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 475b3a11..b3266857 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -88,18 +88,12 @@ struct bfd_proto
 {
   struct proto p;
 
-  pthread_spinlock_t lock;
-
   node bfd_node;
 
   slab *session_slab;
   HASH(struct bfd_session) session_hash_id;
   HASH(struct bfd_session) session_hash_ip;
 
-  sock *notify_rs;
-  sock *notify_ws;
-  list notify_list;
-
   sock *rx4_1;
   sock *rx6_1;
   sock *rx4_m;
@@ -122,7 +116,6 @@ struct bfd_iface
 
 struct bfd_session
 {
-  node n;
   ip_addr addr;				/* Address of session */
   struct bfd_iface *ifa;		/* Iface associated with session */
   struct bfd_session *next_id;		/* Next in bfd.session_hash_id */
@@ -133,14 +126,15 @@ struct bfd_session
   u8 poll_active;
   u8 poll_scheduled;
 
-  u8 loc_state;
-  u8 rem_state;
-  u8 loc_diag;
-  u8 rem_diag;
+  _Atomic struct bfd_session_state loc;
+  struct bfd_session_state rem;
+#define BFD_LOC_STATE(s)	atomic_load_explicit(&(s)->loc, memory_order_relaxed)
+
   u32 loc_id;				/* Local session ID (local discriminator) */
   u32 rem_id;				/* Remote session ID (remote discriminator) */
 
-  struct bfd_session_config cf;		/* Static configuration parameters */
+  struct bfd_session_config cf;		/* Static configuration parameers */
+  event update_event;			/* Reconfiguration requested */
 
   u32 des_min_tx_int;			/* Desired min rx interval, local option */
   u32 des_min_tx_new;			/* Used for des_min_tx_int change */
@@ -162,6 +156,7 @@ struct bfd_session
 
   list request_list;			/* List of client requests (struct bfd_request) */
   btime last_state_change;		/* Time of last state change */
+  btime last_reqlist_check;		/* Time of last check whether the request list is not empty */
   u8 notify_running;			/* 1 if notify hooks are running */
 
   u8 rx_csn_known;			/* Received crypto sequence number is known */
@@ -208,10 +203,6 @@ extern const char *bfd_state_names[];
 
 extern const u8 bfd_auth_type_to_hash_alg[];
 
-
-static inline void bfd_lock_sessions(struct bfd_proto *p) { pthread_spin_lock(&p->lock); }
-static inline void bfd_unlock_sessions(struct bfd_proto *p) { pthread_spin_unlock(&p->lock); }
-
 /* bfd.c */
 struct bfd_session * bfd_find_session_by_id(struct bfd_proto *p, u32 id);
 struct bfd_session * bfd_find_session_by_addr(struct bfd_proto *p, ip_addr addr, uint ifindex);
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index 73cb38f4..893d582d 100644
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -290,9 +290,11 @@ bfd_send_ctl(struct bfd_proto *p, struct bfd_session *s, int final)
   if (!sk)
     return;
 
+  struct bfd_session_state loc = BFD_LOC_STATE(s);
+
   pkt = (struct bfd_ctl_packet *) sk->tbuf;
-  pkt->vdiag = bfd_pack_vdiag(1, s->loc_diag);
-  pkt->flags = bfd_pack_flags(s->loc_state, 0);
+  pkt->vdiag = bfd_pack_vdiag(1, loc.diag);
+  pkt->flags = bfd_pack_flags(loc.state, 0);
   pkt->detect_mult = s->detect_mult;
   pkt->length = BFD_BASE_LEN;
   pkt->snd_id = htonl(s->loc_id);
@@ -313,7 +315,7 @@ bfd_send_ctl(struct bfd_proto *p, struct bfd_session *s, int final)
     log(L_WARN "%s: Old packet overwritten in TX buffer", p->p.name);
 
   TRACE(D_PACKETS, "Sending CTL to %I [%s%s]", s->addr,
-	bfd_state_names[s->loc_state], bfd_format_flags(pkt->flags, fb));
+	bfd_state_names[loc.state], bfd_format_flags(pkt->flags, fb));
 
   sk_send_to(sk, pkt->length, s->addr, sk->dport);
 }
@@ -382,16 +384,17 @@ bfd_rx_hook(sock *sk, uint len)
   u32 old_rx_int = s->rem_min_rx_int;
 
   s->rem_id= ntohl(pkt->snd_id);
-  s->rem_state = bfd_pkt_get_state(pkt);
-  s->rem_diag = bfd_pkt_get_diag(pkt);
+  s->rem.state = bfd_pkt_get_state(pkt);
+  s->rem.diag = bfd_pkt_get_diag(pkt);
   s->rem_demand_mode = pkt->flags & BFD_FLAG_DEMAND;
   s->rem_min_tx_int = ntohl(pkt->des_min_tx_int);
   s->rem_min_rx_int = ntohl(pkt->req_min_rx_int);
   s->rem_detect_mult = pkt->detect_mult;
 
   TRACE(D_PACKETS, "CTL received from %I [%s%s]", sk->faddr,
-	bfd_state_names[s->rem_state], bfd_format_flags(pkt->flags, fb));
+	bfd_state_names[s->rem.state], bfd_format_flags(pkt->flags, fb));
 
+  /* This call may drop the session, must be called in tail position */
   bfd_session_process_ctl(s, pkt->flags, old_tx_int, old_rx_int);
   return 1;
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5645e424..f427ded1 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1460,7 +1460,7 @@ bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd)
   if (bfd && !p->bfd_req && !bgp_is_dynamic(p))
     p->bfd_req = bfd_request_session(p->p.pool, p->remote_ip, p->local_ip,
 				     p->cf->multihop ? NULL : p->neigh->iface,
-				     p->p.vrf, bgp_bfd_notify, p, bfd);
+				     p->p.vrf, bgp_bfd_notify, p, birdloop_event_list(p->p.loop), bfd);
 
   if (!bfd && p->bfd_req)
   {
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 48e38556..4ae0d3fa 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -777,7 +777,7 @@ ospf_neigh_update_bfd(struct ospf_neighbor *n, int use_bfd)
   if (use_bfd && !n->bfd_req)
     n->bfd_req = bfd_request_session(n->pool, n->ip, n->ifa->addr->ip,
 				     n->ifa->iface, p->p.vrf,
-				     ospf_neigh_bfd_hook, n, NULL);
+				     ospf_neigh_bfd_hook, n, birdloop_event_list(p->p.loop), NULL);
 
   if (!use_bfd && n->bfd_req)
   {
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index ffb7779b..0f8b10ad 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -513,7 +513,7 @@ rip_update_bfd(struct rip_proto *p, struct rip_neighbor *n)
     ip_addr saddr = rip_is_v2(p) ? n->ifa->sk->saddr : n->nbr->ifa->ip;
     n->bfd_req = bfd_request_session(p->p.pool, n->nbr->addr, saddr,
 				     n->nbr->iface, p->p.vrf,
-				     rip_bfd_notify, n, NULL);
+				     rip_bfd_notify, n, birdloop_event_list(p->p.loop), NULL);
   }
 
   if (!use_bfd && n->bfd_req)
diff --git a/proto/static/static.c b/proto/static/static.c
index bd7f3f5b..d89ca8b0 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -206,7 +206,7 @@ static_update_bfd(struct static_proto *p, struct static_route *r)
     // ip_addr local = ipa_nonzero(r->local) ? r->local : nb->ifa->ip;
     r->bfd_req = bfd_request_session(p->p.pool, r->via, nb->ifa->ip,
 				     nb->iface, p->p.vrf,
-				     static_bfd_notify, r, NULL);
+				     static_bfd_notify, r, birdloop_event_list(p->p.loop), NULL);
   }
 
   if (!bfd_up && r->bfd_req)

From 216bcb7c68fadcd2a363bf912db743b00b155459 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 2 Feb 2022 15:36:22 +0100
Subject: [PATCH 094/431] Protocol limit restart/down must be callable from
 protocol context

---
 nest/proto.c    | 14 ++++++++------
 proto/bgp/bgp.c | 10 ++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index c350d1cb..2546e812 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -32,7 +32,6 @@ struct protocol *class_to_protocol[PROTOCOL__MAX];
 #define CD(c, msg, args...) ({ if (c->debug & D_STATES) log(L_TRACE "%s.%s: " msg, c->proto->name, c->name ?: "?", ## args); })
 #define PD(p, msg, args...) ({ if (p->debug & D_STATES) log(L_TRACE "%s: " msg, p->name, ## args); })
 
-static timer *proto_shutdown_timer;
 static timer *gr_wait_timer;
 
 #define GRS_NONE	0
@@ -49,7 +48,6 @@ static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
 extern struct protocol proto_unix_iface;
 
 static void channel_aux_request_refeed(struct channel_aux_table *cat);
-static void proto_shutdown_loop(timer *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
 static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
@@ -2202,8 +2200,6 @@ protos_build(void)
 #endif
 
   proto_pool = rp_new(&root_pool, &main_birdloop, "Protocols");
-  proto_shutdown_timer = tm_new(proto_pool);
-  proto_shutdown_timer->hook = proto_shutdown_loop;
 }
 
 
@@ -2211,7 +2207,7 @@ protos_build(void)
 int proto_restart;
 
 static void
-proto_shutdown_loop(timer *t UNUSED)
+proto_shutdown_loop(void *data UNUSED)
 {
   struct proto *p, *p_next;
 
@@ -2230,6 +2226,11 @@ proto_shutdown_loop(timer *t UNUSED)
     }
 }
 
+static event proto_schedule_down_event = {
+  .hook = proto_shutdown_loop,
+  .list = &global_event_list,
+};
+
 static inline void
 proto_schedule_down(struct proto *p, byte restart, byte code)
 {
@@ -2242,7 +2243,8 @@ proto_schedule_down(struct proto *p, byte restart, byte code)
 
   p->down_sched = restart ? PDS_RESTART : PDS_DISABLE;
   p->down_code = code;
-  tm_start_max(proto_shutdown_timer, restart ? 250 MS : 0);
+
+  ev_send_self(&proto_schedule_down_event);
 }
 
 /**
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index f427ded1..65cc3a40 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1273,6 +1273,16 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
     return 0;
   }
 
+  if (p->p.loop == &main_birdloop)
+  {
+    /* Protocol is down for whatever reason. No need for locking. */
+    BGP_TRACE(D_EVENTS, "Incoming connection from %I%J (port %d) rejected (protocol is down)",
+	    sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL,
+	    sk->dport);
+    rfree(sk);
+    return 0;
+  }
+
   BGP_ENTER(p);
 
   /*

From 765c940094e8e070212ef66b7a77e86829b0cf60 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 3 Feb 2022 22:42:26 +0100
Subject: [PATCH 095/431] Thread documentation: Rewritten chapter 3 on loops
 and locks once again

---
 doc/threads/03_coroutines.md | 214 ++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 116 deletions(-)

diff --git a/doc/threads/03_coroutines.md b/doc/threads/03_coroutines.md
index fccc3bbf..d49314eb 100644
--- a/doc/threads/03_coroutines.md
+++ b/doc/threads/03_coroutines.md
@@ -25,16 +25,17 @@ Locks in BIRD (called domains, as they always lock some defined part of BIRD)
 are partially ordered. Every *domain* has its *type* and all threads are
 strictly required to lock the domains in the order of their respective types.
 The full order is defined in `lib/locking.h`. It's forbidden to lock more than
-one domain of a type (these domains are uncomparable) and recursive locking as well.
+one domain of a type (these domains are uncomparable) and recursive locking is
+forbidden as well.
 
-The locking hiearchy is (as of December 2021) like this:
+The locking hiearchy is (roughly; as of February 2022) like this:
 
 1. The BIRD Lock (for everything not yet checked and/or updated)
-2. Protocols (as of December 2021, it is BFD, RPKI and Pipe)
+2. Protocols (as of February 2022, it is BFD, RPKI, Pipe and BGP)
 3. Routing tables
 4. Global route attribute cache
 5. Message passing
-6. Internals
+6. Internals and memory management
 
 There are heavy checks to ensure proper locking and to help debugging any
 problem when any code violates the hierarchy rules. This impedes performance
@@ -48,11 +49,33 @@ Risks arising from dropping some locking checks include:
 * data corruption; it either kills BIRD anyway, or it results into a slow and vicious death,
   leaving undebuggable corefiles behind.
 
-To be honest, I believe in principles like "there is also one more bug somewhere"
-and I just don't trust my future self or anybody else to write bugless code when
-it comes to proper locking. I believe that if a lock becomes a bottle-neck,
-then we should think about what is locked inside and how to optimize that, instead
-of dropping thorough consistency checks.
+To be honest, I believe in principles like *"every nontrivial software has at least one bug"*
+and I also don't trust my future self or anybody else to always write bugless code when
+it comes to proper locking. I also believe that if a lock becomes a bottle-neck,
+then we should think about what is locked inside and how to optimize that,
+possibly implementing a lockless or waitless data structure instead of dropping
+thorough consistency checks, especially in a multithreaded environment.
+
+### Choosing the right locking order
+
+When considering the locking order of protocols and route tables, the answer
+was quite easy. We had to make either import or export asynchronous (or both).
+Major reasons for asynchronous export have been stated in the previous chapter,
+therefore it makes little sense to allow entering protocol context from table code.
+
+As I write further in this text, even accessing table context from protocol
+code leads to contention on table locks, yet for now, it is good enough and the
+lock order features routing tables after protocols to make the multithreading
+goal easier to achieve.
+
+The major lock level is still The BIRD Lock, containing not only the
+not-yet-converted protocols (like Babel, OSPF or RIP) but also processing CLI
+commands and reconfiguration. This involves an awful lot of direct access into
+other contexts which would be unnecessarily complicated to implement by message
+passing. Therefore, this lock is simply *"the director"*, sitting on the top.
+
+The lower lock levels are mostly for shared global data structures accessed
+from everywhere. We'll address some of these later.
 
 ## IO Loop
 
@@ -64,15 +87,13 @@ routines. This code could be easily updated for general use so I did it.
 
 To understand the internal principles, we should say that in the `master`
 branch, there is a big loop centered around a `poll()` call, dispatching and
-executing everything as needed. There are several means how to get something dispatched from the main loop.
+executing everything as needed. There are several means how to get something dispatched from a loop.
 
 1. Requesting to read from a socket makes the main loop call your hook when there is some data received.
    The same happens when a socket refuses to write data. Then the data is buffered and you are called when
    the buffer is free. There is also a third callback, an error hook, for obvious reasons.
 
-2. Requesting to be called back after a given amount of time. The callback may
-   be delayed by any amount of time, anyway when it exceeds 5 seconds (default,
-   configurable) at least the user gets a warning. This is called *timer*.
+2. Requesting to be called back after a given amount of time. This is called *timer*.
 
 3. Requesting to be called back when possible. This is useful to run anything
    not reentrant which might mess with the caller's data, e.g. when a protocol
@@ -97,118 +118,82 @@ locking that loop's domain. In fact, every event queue has its own lock with a
 low priority, allowing to pass messages from almost any part of BIRD, and also
 an assigned loop which executes the events enqueued. When a message is passed
 to a queue executed by another loop, that target loop must be woken up so we
-must know what loop to wake up to avoid unnecessary delays.
+must know what loop to wake up to avoid unnecessary delays. Then the target
+loop opens its mailbox and processes the task in its context.
 
-The other way is faster but not always possible. When the target loop domain
-may be locked from the original loop domain, we may simply *enter the target loop*,
-do the work and then *leave the loop*. Route import uses this approach to
-directly update the best route in the target table. In the other direction,
-loop entering is not possible and events must be used to pass messages.
+The other way is a direct access of another domain. This approach blocks the
+appropriate loop from doing anything and we call it *entering a birdloop* to
+remember that the task must be fast and *leave the birdloop* as soon as possible.
+Route import is done via direct access from protocols to tables; in large
+setups with fast filters, this is a major point of contention (after filters
+have been parallelized) and will be addressed in future optimization efforts.
+Reconfiguration and interface updates also use direct access; more on that later.
+In general, this approach should be avoided unless there are good reasons to use it.
 
-Asynchronous message passing is expensive. It involves sending a byte to a pipe
-to wakeup a loop from `poll` to execute the message. If we had to send a ping
-for every route we import to every channel to export it, we'd spend more time
-pinging than computing the best route. The route update routines therefore
-employ a double-indirect delayed route announcement:
+Even though direct access is bad, sending lots of messages may be even worse.
+Imagine one thousand post(wo)men, coming one by one every minute, ringing your
+doorbell and delivering one letter each to you. Horrible! Asynchronous message
+passing works exactly this way. After queuing the message, the source sends a
+byte to a pipe to wakeup the target loop to process the task. We could also
+periodically poll for messages instead of waking up the targets, yet it would
+add quite a lot of latency which we also don't like.
 
-1. When a channel imports a route by entering a loop, it sends an event to its
-   own loop (no ping needed in such case). This operation is idempotent, thus
-   for several routes, only one event is enqueued.
-2. After all packet parsing is done, the channel import announcement event is
-   executed, sending another event to the table's loop. There may have been
-   multiple imports in the same time but the exports have to get a ping just once.
-3. The table's announcement event is executed from its loop, enqueuing export
-   events for all connected channels, finally initiating route exports.
+Messages in BIRD don't typically suffer from the problem of amount and the
+overhead is negligible compared to the overall CPU consumption. With one notable
+exception: route import/export.
 
-This may seem overly complicated, yet it also allows the incoming changes to
-settle down before exports are finished, reducing also cache invalidation
-between importing and exporting threads.
+### Route export message passing
 
-## Choosing the right locking order
+If we had to send a ping for every route we import to every exporting channel,
+we'd spend more time pinging than doing anything else. Been there, seen
+those unbelievable 80%-like figures in Perf output. Never more.
 
-When considering the locking order of protocols and route tables, the answer was quite easy.
-If route tables could enter protocol loops, they would have to either directly
-execute protocol code, one export after another, or send whole routes by messages.
-Setting this other way around (protocol entering route tables), protocols do
-everything on their time, minimizing table time. Tables are contention points.
+Route update is quite a complicated process. BIRD must handle large-scale
+configurations with lots of importers and exporters. Therefore, a
+triple-indirect delayed route announcement is employed:
 
-The third major lock level is The BIRD Lock, containing virtually everything
-else. It is also established that BFD is after The BIRD Lock, as BFD is
-low-latency and can't wait until The BIRD gets unlocked. Thus it would be
-convenient to have all protocols on the same level, getting The BIRD Lock on top.
+1. First, when a channel imports a route by entering a loop, it sends an event
+   to its own loop (no ping needed in such case). This operation is idempotent,
+   thus for several routes in a row, only one event is enqueued. This reduces
+   several route imports (even hundreds in case of massive BGP withdrawals) to
+   one single event.
+2. When the channel is done importing (or at least takes a coffee break and
+   checks its mailbox), the scheduled event in its own loop is run, sending
+   another event to the table's loop, saying basically *"Hey, table, I've just
+   imported something."*. This event is also idempotent and further reduces
+   route imports from multiple sources to one single event.
+3. The table's announcement event is then executed from its loop, enqueuing export
+   events for all connected channels, finally initiating route exports. As we
+   already know, imports are done by direct access, therefore if protocols keep
+   importing, export announcements must wait.
 
-The BIRD Lock also runs CLI, reconfiguration and other high-level tasks,
-requiring access to everything. Having The BIRD Lock anywhere else, these
-high-level tasks, scattered all around BIRD source code, would have to be split
-out to some super-loop.
-
-## Route tables
-
-BFD could be split out thanks to its special nature. There are no BFD routes,
-therefore no route tables are accessed. To split out any other protocol, we
-need the protocol to be able to directly access routing tables. Therefore
-route tables have to be split out first, to make space for protocols to go
-between tables and The BIRD main loop.
-
-Route tables are primarily data structures, yet they have their maintenance
-routines. Their purpose is (among others) to cleanup export buffers, update
-recursive routes and delete obsolete routes. This all may take lots of time
-occasionally so it makes sense to have a dedicated thread for these.
-
-In previous versions, I had a special type of event loop based on semaphores,
-contrary to the loop originating in BFD, based on `poll`. This was
-unnecessarily complicated, thus I rewrote that finally to use the universal IO
-loop, just with no sockets at all.
-
-There are some drawbacks of this, notably the number of filedescriptors BIRD
-now uses. The user should also check the maximum limit on threads per process.
-
-This change also means that imports and exports are started and stopped
-asynchronously. Stopping an import needs to wait until all its routes are gone.
-This induced some changes in the protocol state machine.
-
-## Protocols
-
-After tables were running in their own loops, the simplest protocol to split
-out was Pipe. There are still no sockets, just events. This also means that
-every single filter assigned to a pipe is run in its own thread, not blocking
-others. (To be precise, both directions of a pipe share the same thread.)
-
-When RPKI is in use, we want it to load the ROAs as soon as possible. Its table
-is independent and the protocol itself is so simple that it could be put into
-its own thread easily.
-
-Other protocols are pending (Kernel) or in progress (BGP).
-
-I tried to make the conversion also as easy as possible, implementing most of
-the code in the generic functions in `nest/proto.c`. There are some
-synchronization points in the protocol state machine; we can't simply delete
-all protocol data when there is another thread running. Together with the
-asynchronous import/export stopping, it is quite messy and it might need some
-future cleanup. Anyway, moving a protocol to its own thread should be now as simple
-as setting its locking level in its `config.Y` file and stopping all timers
-before shutting down.
-(See commits `4f3fa1623f66acd24c227cf0cc5a4af2f5133b6c`
-and `3fd1f46184aa74d8ab7ed65c9ab6954f7e49d309`.)
+This may seem overly complicated, yet it should work and it seems to work. In
+case of low load, all these notifications just come through smoothly. In case
+of high load, it's common that multiple updates come for the same destination.
+Delaying the exports allows for the updates to settle down and export just the
+final result, reducing CPU load and export traffic.
 
 ## Cork
 
+Route propagation is involved in yet another problem which has to be addressed.
 In the old versions with synchronous route propagation, all the buffering
 happened after exporting routes to BGP. When a packet arrived, all the work was
 done in BGP receive hook – parsing, importing into a table, running all the
 filters and possibly sending to the peers. No more routes until the previous
-was done. This doesn't work any more.
+was done. This self-regulating mechanism doesn't work any more.
 
 Route table import now returns immediately after inserting the route into a
 table, creating a buffer there. These buffers have to be processed by other protocols'
-export events, typically queued in the *global work queue* to be limited for lower latency.
-There is therefore no inherent limit for table export buffers which may lead
-(and occasionally leads) to memory bloating. This is even worse in configurations with pipes,
-as these multiply the exports by propagating them all the way down to other tables.
+export events. In large-scale configurations, one route import has to be
+processed by hundreds, even thousands of exports. Unlimited imports are a major
+cause of buffer bloating. This is even worse in configurations with pipes,
+as these multiply the exports by propagating them all the way down to other
+tables, eventually eating about twice the amount of memory than the single-threaded version.
 
 There is therefore a cork to make this stop. Every table is checking how many
-exports it has pending, and when adding a new route, it may apply a cork,
-saying simply "please stop the flow for a while". When the exports are then processed, it uncorks.
+exports it has pending, and when adding a new export to the queue, it may apply
+a cork, saying simply "please stop the flow for a while". When the exports are
+then processed, it uncorks.
 
 On the other side, there may be events and sockets with a cork assigned. When
 trying to enqueue an event and the cork is applied, the event is instead put
@@ -217,23 +202,20 @@ sockets, when `poll` arguments are recalculated, the corked socket is not
 checked for received packets, effectively keeping them in the TCP queue and
 slowing down the flow.
 
-Both events and sockets have some delay before they get to the cork. This is
-intentional; the purpose of cork is to slow down and allow for exports.
-
-The cork implementation is probably due to some future changes after BGP gets
-split out of the main loop, depending on how it is going to perform. I suppose
-that the best way should be to implement a proper table API to allow for
-explicit backpressure on both sides:
+The cork implementation is quite crude and rough and fragile. It may get some
+rework while stabilizing the multi-threaded version of BIRD or we may even
+completely drop it for some better mechanism. One of these candidates is this
+kind of API:
 
 * (table to protocol) please do not import
 * (table to protocol) you may resume imports
 * (protocol to table) not processing any exports
 * (protocol to table) resuming export processing
 
-Anyway, for now it is good enough as it is.
+Anyway, cork works as intended in most cases at least for now.
 
-*It's still a long road to the version 2.1. This series of texts should document
-what is needed to be changed, why we do it and how. The
+*It's a long road to the version 2.1. This series of texts should document what
+is changing, why we do it and how. The
 [previous chapter](https://en.blog.nic.cz/2021/06/14/bird-journey-to-threads-chapter-2-asynchronous-route-export/)
-showed how the route export had to change to allow parallel execution. In the next chapter, some memory management
+shows how the route export had to change to allow parallel execution. In the next chapter, some memory management
 details are to be explained together with the reasons why memory management matters. Stay tuned!*

From b554457e5e99f2a5e9ac70bbd866384299dc2f14 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 15:18:06 +0100
Subject: [PATCH 096/431] Thread documentation: Final version of chapter 3

---
 doc/threads/03_coroutines.md | 68 ++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/doc/threads/03_coroutines.md b/doc/threads/03_coroutines.md
index d49314eb..8d8e6c96 100644
--- a/doc/threads/03_coroutines.md
+++ b/doc/threads/03_coroutines.md
@@ -3,7 +3,7 @@
 Parallel execution in BIRD uses an underlying mechanism of dedicated IO loops
 and hierarchical locks. The original event scheduling module has been converted
 to do message passing in multithreaded environment. These mechanisms are
-crucial for understanding what happens inside BIRD and how the protocol API changes.
+crucial for understanding what happens inside BIRD and how its internal API changes.
 
 BIRD is a fast, robust and memory-efficient routing daemon designed and
 implemented at the end of 20th century. We're doing a significant amount of
@@ -18,7 +18,7 @@ to lock all the parts which have not been checked and updated yet.
 
 The authors of original BIRD concepts wisely chose a highly modular structure
 which allows to create a hierarchy for locks. The main chokepoint was between
-protocols and tables which has been solved by implementing asynchronous exports
+protocols and tables and it has been removed by implementing asynchronous exports
 as described in the [previous chapter](https://en.blog.nic.cz/2021/06/14/bird-journey-to-threads-chapter-2-asynchronous-route-export/).
 
 Locks in BIRD (called domains, as they always lock some defined part of BIRD)
@@ -72,42 +72,53 @@ The major lock level is still The BIRD Lock, containing not only the
 not-yet-converted protocols (like Babel, OSPF or RIP) but also processing CLI
 commands and reconfiguration. This involves an awful lot of direct access into
 other contexts which would be unnecessarily complicated to implement by message
-passing. Therefore, this lock is simply *"the director"*, sitting on the top.
+passing. Therefore, this lock is simply *"the director"*, sitting on the top
+with its own category. 
 
-The lower lock levels are mostly for shared global data structures accessed
-from everywhere. We'll address some of these later.
+The lower lock levels under routing tables are mostly for shared global data
+structures accessed from everywhere. We'll address some of these later.
 
 ## IO Loop
 
 There has been a protocol, BFD, running in its own thread since 2013. This
 separation has a good reason; it needs low latency and the main BIRD loop just
-walks round-robin around all the available sockets which may last for a long
-time. BFD had its own IO loop implementation and simple message passing
-routines. This code could be easily updated for general use so I did it.
+walks round-robin around all the available sockets and one round-trip may take
+a long time (even more than a minute with large configurations). BFD had its
+own IO loop implementation and simple message passing routines. This code could
+be easily updated for general use so I did it.
 
 To understand the internal principles, we should say that in the `master`
 branch, there is a big loop centered around a `poll()` call, dispatching and
-executing everything as needed. There are several means how to get something dispatched from a loop.
+executing everything as needed. In the `sark` branch, there are multiple loops
+of this kind. BIRD has several means how to get something dispatched from a
+loop.
 
-1. Requesting to read from a socket makes the main loop call your hook when there is some data received.
+1. Requesting to read from a **socket** makes the main loop call your hook when there is some data received.
    The same happens when a socket refuses to write data. Then the data is buffered and you are called when
-   the buffer is free. There is also a third callback, an error hook, for obvious reasons.
+   the buffer is free to continue writing. There is also a third callback, an error hook, for obvious reasons.
 
-2. Requesting to be called back after a given amount of time. This is called *timer*.
+2. Requesting to be called back after a given amount of time. This is called **timer**.
+   As is common with all timers, they aren't precise and the callback may be
+   delayed significantly. This was also the reason to have BFD loop separate
+   since the very beginning, yet now the abundance of threads may lead to
+   problems with BFD latency in large-scale configurations. We haven't tested
+   this yet.
 
-3. Requesting to be called back when possible. This is useful to run anything
-   not reentrant which might mess with the caller's data, e.g. when a protocol
-   decides to shutdown due to some inconsistency in received data. This is called *event*.
+3. Requesting to be called back from a clean context when possible. This is
+   useful to run anything not reentrant which might mess with the caller's
+   data, e.g. when a protocol decides to shutdown due to some inconsistency
+   in received data. This is called **event**.
 
 4. Requesting to do some work when possible. These are also events, there is only
    a difference where this event is enqueued; in the main loop, there is a
    special *work queue* with an execution limit, allowing sockets and timers to be
    handled with a reasonable latency while still doing all the work needed.
+   Other loops don't have designated work queues (we may add them later).
 
 All these, sockets, timers and events, are tightly bound to some domain.
 Sockets typically belong to a protocol, timers and events to a protocol or table.
 With the modular structure of BIRD, the easy and convenient approach to multithreading
-is to get more IO loops bound to specific domains, running their events, timers and
+is to get more IO loops, each bound to a specific domain, running their events, timers and
 socket hooks in their threads.
 
 ## Message passing and loop entering
@@ -155,17 +166,20 @@ triple-indirect delayed route announcement is employed:
 1. First, when a channel imports a route by entering a loop, it sends an event
    to its own loop (no ping needed in such case). This operation is idempotent,
    thus for several routes in a row, only one event is enqueued. This reduces
-   several route imports (even hundreds in case of massive BGP withdrawals) to
-   one single event.
+   several route import announcements (even hundreds in case of massive BGP
+   withdrawals) to one single event.
 2. When the channel is done importing (or at least takes a coffee break and
    checks its mailbox), the scheduled event in its own loop is run, sending
    another event to the table's loop, saying basically *"Hey, table, I've just
    imported something."*. This event is also idempotent and further reduces
-   route imports from multiple sources to one single event.
+   route import announcements from multiple sources to one single event.
 3. The table's announcement event is then executed from its loop, enqueuing export
    events for all connected channels, finally initiating route exports. As we
    already know, imports are done by direct access, therefore if protocols keep
-   importing, export announcements must wait.
+   importing, export announcements are slowed down.
+4. The actual data on what has been updated is stored in a table journal. This
+   peculiar technique is used only for informing the exporting channels that
+   *"there is something to do"*.
 
 This may seem overly complicated, yet it should work and it seems to work. In
 case of low load, all these notifications just come through smoothly. In case
@@ -191,16 +205,16 @@ as these multiply the exports by propagating them all the way down to other
 tables, eventually eating about twice the amount of memory than the single-threaded version.
 
 There is therefore a cork to make this stop. Every table is checking how many
-exports it has pending, and when adding a new export to the queue, it may apply
-a cork, saying simply "please stop the flow for a while". When the exports are
-then processed, it uncorks.
+exports it has pending, and when adding a new export to the queue, it may request
+a cork, saying simply "please stop the flow for a while". When the export buffer
+size is reduced low enough, the table uncorks.
 
-On the other side, there may be events and sockets with a cork assigned. When
+On the other side, there are events and sockets with a cork assigned. When
 trying to enqueue an event and the cork is applied, the event is instead put
 into the cork's queue and released only when the cork is released. In case of
-sockets, when `poll` arguments are recalculated, the corked socket is not
-checked for received packets, effectively keeping them in the TCP queue and
-slowing down the flow.
+sockets, when read is indicated or when `poll` arguments are recalculated,
+the corked socket is simply not checked for received packets, effectively
+keeping them in the TCP queue and slowing down the flow until cork is released.
 
 The cork implementation is quite crude and rough and fragile. It may get some
 rework while stabilizing the multi-threaded version of BIRD or we may even

From d62a3d0274b9c1ccfbbc4302bb2ca56159696f8b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 15:18:44 +0100
Subject: [PATCH 097/431] Thread performance: Moved graph key to left top
 corner where it fits better

---
 doc/threads/stats-filter-2d.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/threads/stats-filter-2d.pl b/doc/threads/stats-filter-2d.pl
index 70ce335a..59eda26b 100644
--- a/doc/threads/stats-filter-2d.pl
+++ b/doc/threads/stats-filter-2d.pl
@@ -93,7 +93,7 @@ set yrange [0.5:10800]
 
 set grid
 
-set key right bottom
+set key left top
 
 set output "$OUTPUT"
 EOF

From cc73726620da84a8ed79cf852384226aa05e5458 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 15:42:04 +0100
Subject: [PATCH 098/431] Compilation fixes for CLang

---
 proto/bfd/bfd.c | 2 +-
 proto/bfd/bfd.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 63e0deff..479c1510 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -124,7 +124,7 @@ static struct {
   list proto_list;
 } bfd_global;
 
-static struct bfd_session bfd_admin_down = { .loc = { .state = BFD_STATE_ADMIN_DOWN }, };
+static struct bfd_session bfd_admin_down = { .loc = ATOMIC_VAR_INIT((struct bfd_session_state) { .state = BFD_STATE_ADMIN_DOWN }), };
 
 const char *bfd_state_names[] = { "AdminDown", "Down", "Init", "Up" };
 
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index b3266857..ffb1c43f 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -128,7 +128,7 @@ struct bfd_session
 
   _Atomic struct bfd_session_state loc;
   struct bfd_session_state rem;
-#define BFD_LOC_STATE(s)	atomic_load_explicit(&(s)->loc, memory_order_relaxed)
+#define BFD_LOC_STATE(s)	({ struct bfd_session_state _bss = atomic_load_explicit(&(s)->loc, memory_order_relaxed); _bss; })
 
   u32 loc_id;				/* Local session ID (local discriminator) */
   u32 rem_id;				/* Remote session ID (remote discriminator) */

From 5a65ae45e5da06b9e7c6a690aa7c4afdd08dca6c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 15:50:21 +0100
Subject: [PATCH 099/431] Tamed harmless i368 warnings

---
 lib/slab.c              | 2 +-
 sysdep/unix/coroutine.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/slab.c b/lib/slab.c
index c3947162..c4ccbd37 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -213,7 +213,7 @@ sl_new(pool *p, uint size)
       + sizeof(u32) * s->head_bitfield_len
       + align - 1)
     / align * align;
-  } while (s->objs_per_slab * size + s->head_size > page_size);
+  } while (s->objs_per_slab * size + s->head_size > (uint) page_size);
 
   if (!s->objs_per_slab)
     bug("Slab: object too large");
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/coroutine.c
index 4747d01a..2068afd5 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/coroutine.c
@@ -86,7 +86,7 @@ uint dg_order(struct domain_generic *dg)
 
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 {
-  if ((char *) lsp - (char *) &locking_stack != dg->order)
+  if ((char *) lsp - (char *) &locking_stack != (int) dg->order)
     bug("Trying to lock on bad position: order=%u, lsp=%p, base=%p", dg->order, lsp, &locking_stack);
 
   if (lsp <= last_locked)
@@ -110,7 +110,7 @@ void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 
 void do_unlock(struct domain_generic *dg, struct domain_generic **lsp)
 {
-  if ((char *) lsp - (char *) &locking_stack != dg->order)
+  if ((char *) lsp - (char *) &locking_stack != (int) dg->order)
     bug("Trying to unlock on bad position: order=%u, lsp=%p, base=%p", dg->order, lsp, &locking_stack);
 
   if (dg->locked_by != &locking_stack)

From c9aa53eaf5d10b37c6f056b6aec156c60ef91b9c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 16:47:39 +0100
Subject: [PATCH 100/431] Build test default timeout raised to allow for tests
 on slow virtual machines

---
 test/birdtest.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/birdtest.h b/test/birdtest.h
index caec529b..23557122 100644
--- a/test/birdtest.h
+++ b/test/birdtest.h
@@ -39,7 +39,7 @@ static inline u64 bt_random(void)
 void bt_log_suite_result(int result, const char *fmt, ...);
 void bt_log_suite_case_result(int result, const char *fmt, ...);
 
-#define BT_TIMEOUT 			5	/* Default timeout in seconds */
+#define BT_TIMEOUT 			30	/* Default timeout in seconds */
 #define BT_FORKING 			1	/* Forking is enabled in default */
 
 #define BT_RANDOM_SEED 			0x5097d2bb

From 3f6462ad35ca49dc4898546bba59147792481b25 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 4 Feb 2022 17:04:18 +0100
Subject: [PATCH 101/431] Dropping (end-of-life) Debian 8 automated tests

---
 .gitlab-ci.yml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59add088..fefb6fa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,16 +32,6 @@ stages:
   # That's Docker in Docker
   - dind
 
-docker_debian-8-amd64:
-  variables:
-    IMG_NAME: "debian-8-amd64"
-  <<: *docker_build
-
-docker_debian-8-i386:
-  variables:
-    IMG_NAME: "debian-8-i386"
-  <<: *docker_build
-
 docker_debian-9-amd64:
   variables:
     IMG_NAME: "debian-9-amd64"
@@ -222,14 +212,6 @@ docker_opensuse-15.3-amd64:
     - linux
     - amd64
 
-build-debian-8-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-8-amd64
-
-build-debian-8-i386:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-8-i386
-
 build-debian-9-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:debian-9-amd64
@@ -386,18 +368,6 @@ build-freebsd-11-i386:
     paths:
       - pkg/pkgs/*
 
-# Dpkg error: PATH is not set
-#pkg-debian-8-amd64:
-#  <<: *pkg-deb
-#  needs: [build-debian-8-amd64]
-#  image: registry.nic.cz/labs/bird:debian-8-amd64
-
-# Dpkg error: PATH is not set
-#pkg-debian-8-i386:
-#  <<: *pkg-deb
-#  needs: [build-debian-8-i386]
-#  image: registry.nic.cz/labs/bird:debian-8-i386
-
 # Dpkg error: PATH is not set
 pkg-debian-9-amd64:
   <<: *pkg-deb

From a6fc31f153f4d6ad2fa7f63a4ba137fc263f4200 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 7 Feb 2022 22:27:42 +0100
Subject: [PATCH 102/431] Blogpost about performance + data.

---
 doc/threads/03b_performance.md       |  153 ++
 doc/threads/03b_stats_2d_imex.pdf    |  Bin 0 -> 12378 bytes
 doc/threads/03b_stats_2d_imex.png    |  Bin 0 -> 163309 bytes
 doc/threads/03b_stats_2d_mulimex.pdf |  Bin 0 -> 12250 bytes
 doc/threads/03b_stats_2d_mulimex.png |  Bin 0 -> 153022 bytes
 doc/threads/03b_stats_2d_multi.pdf   |  Bin 0 -> 12325 bytes
 doc/threads/03b_stats_2d_multi.png   |  Bin 0 -> 150443 bytes
 doc/threads/03b_stats_2d_single.pdf  |  Bin 0 -> 12531 bytes
 doc/threads/03b_stats_2d_single.png  |  Bin 0 -> 164586 bytes
 doc/threads/Makefile                 |    2 +-
 doc/threads/stats-filter-2d.pl       |   75 +-
 doc/threads/stats.csv                | 2086 ++++++++++++++++++++++++++
 12 files changed, 2287 insertions(+), 29 deletions(-)
 create mode 100644 doc/threads/03b_performance.md
 create mode 100644 doc/threads/03b_stats_2d_imex.pdf
 create mode 100644 doc/threads/03b_stats_2d_imex.png
 create mode 100644 doc/threads/03b_stats_2d_mulimex.pdf
 create mode 100644 doc/threads/03b_stats_2d_mulimex.png
 create mode 100644 doc/threads/03b_stats_2d_multi.pdf
 create mode 100644 doc/threads/03b_stats_2d_multi.png
 create mode 100644 doc/threads/03b_stats_2d_single.pdf
 create mode 100644 doc/threads/03b_stats_2d_single.png
 create mode 100644 doc/threads/stats.csv

diff --git a/doc/threads/03b_performance.md b/doc/threads/03b_performance.md
new file mode 100644
index 00000000..07fd5bb0
--- /dev/null
+++ b/doc/threads/03b_performance.md
@@ -0,0 +1,153 @@
+# BIRD Journey to Threads. Chapter 3½: Route server performance
+
+All the work on multithreading shall be justified by performance improvements.
+This chapter tries to compare times reached by version 3.0-alpha0 and 2.0.8,
+showing some data and thinking about them.
+
+BIRD is a fast, robust and memory-efficient routing daemon designed and
+implemented at the end of 20th century. We're doing a significant amount of
+BIRD's internal structure changes to make it run in multiple threads in parallel.
+
+## Testing setup
+
+There are two machines in one rack. One of these simulates the peers of
+a route server, the other runs BIRD in a route server configuration. First, the
+peers are launched, then the route server is started and one of the peers
+measures the convergence time until routes are fully propagated. Other peers
+drop all incoming routes.
+
+There are four configurations. *Single* where all BGPs are directly
+connected to the main table, *Multi* where every BGP has its own table and
+filters are done on pipes between them, and finally *Imex* and *Mulimex* which are
+effectively *Single* and *Multi* where all BGPs have also their auxiliary
+import and export tables enabled.
+
+All of these use the same short dummy filter for route import to provide a
+consistent load. This filter includes no meaningful logic, it's just some dummy
+data to run the CPU with no memory contention. Real filters also do not suffer from
+memory contention, with an exception of ROA checks. Optimization of ROA is a
+task for another day.
+
+There is also other stuff in BIRD waiting for performance assessment. As the
+(by far) most demanding setup of BIRD is route server in IXP, we chose to
+optimize and measure BGP and filters first.
+
+Hardware used for testing is Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz with 8
+physical cores, two hyperthreads on each. Memory is 32 GB RAM.
+
+## Test parameters and statistics
+
+BIRD setup may scale on two major axes. Number of peers and number of routes /
+destinations. *(There are more axes, e.g.: complexity of filters, routes /
+destinations ratio, topology size in IGP)*
+
+Scaling the test on route count is easy, just by adding more routes to the
+testing peers. Currently, the largest test data I feed BIRD with is about 2M
+routes for around 800K destinations, due to memory limitations. The routes /
+destinations ratio is around 2.5 in this testing setup, trying to get close to
+real-world routing servers.[^1]
+
+[^1]: BIRD can handle much more in real life, the actual software limit is currently
+      a 32-bit unsigned route counter in the table structure. Hardware capabilities
+      are already there and checking how BIRD handles more than 4G routes is
+      certainly going to be a real thing soon.
+
+Scaling the test on peer count is easy, until you get to higher numbers. When I
+was setting up the test, I configured one Linux network namespace for each peer,
+connecting them by virtual links to a bridge and by a GRE tunnel to the other
+machine. This works well for 10 peers but setting up and removing 1000 network
+namespaces takes more than 15 minutes in total. (Note to myself: try this with
+a newer Linux kernel than 4.9.)
+
+Another problem of test scaling is bandwidth. With 10 peers, everything is OK.
+With 1000 peers, version 3.0-alpha0 does more than 600 Mbps traffic in peak
+which is just about the bandwidth of the whole setup. I'm planning to design a
+better test setup with less chokepoints in future.
+
+## Hypothesis
+
+There are two versions subjected to the test. One of these is `2.0.8` as an
+initial testpoint. The other is version 3.0-alpha0, named `bgp` as parallel BGP
+is implemented there.
+
+The major problem of large-scale BIRD setups is convergence time on startup. We
+assume that a multithreaded version should reduce the overall convergence time,
+at most by a factor equal to number of cores involved. Here we have 16
+hyperthreads, in theory we should reduce the times up to 16-fold, yet this is
+almost impossible as a non-negligible amount of time is spent in bottleneck
+code like best route selection or some cleanup routines. This has become a
+bottleneck by making other parts parallel.
+
+## Data
+
+Four charts are included here, one for each setup. All axes have a
+logarithmic scale. The route count on X scale is the total route count in
+tested BIRD, different color shades belong to different versions and peer
+counts. Time is plotted on Y scale.
+
+Raw data is available in Git, as well as the chart generator. Strange results
+caused by testbed bugs are already omitted.
+
+There is also a line drawn on a 2-second mark. Convergence is checked by
+periodically requesting `birdc show route count` on one of the peers and BGP
+peers have also a 1-second connect delay time (default is 5 seconds). All
+measured times shorter than 2 seconds are highly unreliable.
+
+![Plotted data for Single](03b_stats_2d_single.png)
+[Plotted data for Single in PDF](03b_stats_2d_single.pdf)
+
+Single-table setup has times reduced to about 1/8 when comparing 3.0-alpha0 to
+2.0.8. Speedup for 10-peer setup is slightly worse than expected and there is
+still some room for improvement, yet 8-fold speedup on 8 physical cores and 16
+hyperthreads is good for me now.
+
+The most demanding case with 2M routes and 1k peers failed. On 2.0.8, my
+configuration converges after almost two hours on 2.0.8, with the speed of
+route processing steadily decreasing until only several routes per second are
+done. Version 3.0-alpha0 is memory-bloating for some non-obvious reason and
+couldn't fit into 32G RAM. There is definitely some work ahead to stabilize
+BIRD behavior with extreme setups.
+
+![Plotted data for Multi](03b_stats_2d_multi.png)
+[Plotted data for Multi in PDF](03b_stats_2d_multi.pdf)
+
+Multi-table setup got the same speedup as single-table setup, no big
+surprise. Largest cases were not tested at all as they don't fit well into 32G
+RAM even with 2.0.8.
+
+![Plotted data for Imex](03b_stats_2d_imex.png)
+[Plotted data for Imex in PDF](03b_stats_2d_imex.pdf)
+
+![Plotted data for Mulimex](03b_stats_2d_mulimex.png)
+[Plotted data for Mulimex in PDF](03b_stats_2d_mulimex.pdf)
+
+Setups with import / export tables are also sped up by a factor
+about 6-8. Data on largest setups (2M routes) are showing some strangely
+ineffective behaviour. Considering that both single-table and multi-table
+setups yield similar performance data, there is probably some unwanted
+inefficiency in the auxiliary table code.
+
+## Conclusion
+
+BIRD 3.0-alpha0 is a good version for preliminary testing in IXPs. There is
+some speedup in every testcase and code stability is enough to handle typical
+use cases. Some test scenarios went out of available memory and there is
+definitely a lot of work to stabilize this, yet for now it makes no sense to
+postpone this alpha version any more.
+
+We don't recommend upgrading a production machine to this version
+yet, anyway if you have a test setup, getting version 3.0-alpha0 there and
+reporting bugs is much welcome.
+
+Notice: Multithreaded BIRD, at least in version 3.0-alpha0, doesn't limit its number of
+threads. It will spawn at least one thread per every BGP, RPKI and Pipe
+protocol, one thread per every routing table (including auxiliary tables) and
+possibly several more. It's up to the machine administrator to setup a limit on
+CPU core usage by BIRD. When running with many threads and protocols, you may
+need also to raise the filedescriptor limit: BIRD uses 2 filedescriptors per
+every thread for internal messaging.
+
+*It's a long road to the version 3. By releasing this alpha version, we'd like
+to encourage every user to try this preview. If you want to know more about
+what is being done and why, you may also check the full
+[blogpost series about multithreaded BIRD](https://en.blog.nic.cz/2021/03/15/bird-journey-to-threads-chapter-0-the-reason-why/). Thank you for your ongoing support!*
diff --git a/doc/threads/03b_stats_2d_imex.pdf b/doc/threads/03b_stats_2d_imex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..dda4e97b0184c369adc3c76b0a7fe9fb2535fde4
GIT binary patch
literal 12378
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
Cg(zJB

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_imex.png b/doc/threads/03b_stats_2d_imex.png
new file mode 100644
index 0000000000000000000000000000000000000000..be198b040e10625b6bab8ed869aeee007d27fb92
GIT binary patch
literal 163309
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
CkzB$6

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_mulimex.pdf b/doc/threads/03b_stats_2d_mulimex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b418562563e252d19eaf4be82ebf5eab94e1d81b
GIT binary patch
literal 12250
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
CDC@5P

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_mulimex.png b/doc/threads/03b_stats_2d_mulimex.png
new file mode 100644
index 0000000000000000000000000000000000000000..917d8fee6fa2cdc2cf7d020a57901c71d0ff3d33
GIT binary patch
literal 153022
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%0D6Y;rsFSNq$nEA&n2%aLh
zI|u6UP8Q~xTQphoc{7=j{}l(T<NpPTASUT6yJRpx0pB%{5Jc<+ki<o6j*{L7&hwp<
z(DP6Ahur-u(lo;t95SE9a!eKSb>2WoRA5XUaDY??_g-<`^{W+h<dJe!kkBj&9+KB3
zoP-0lbapTG(}F%pdc$aYX3Ep&Mb1Ko^guGCi;sPO@6(3dYw)1WMpd;l(1{{DZ*ZAH
zpS?)a<{d?jFE)){9S#I$A}uA+yaf~T=BQg%>em57#f=)hRZ*&y2qV?m==WeoOy#oJ
zcI*<5a!mgtw)-#lKUQ_78hO|)f@U#Pv<5*2vWZ))V6QZ1qk`6dmLnfBRHp^t3&KsP
z^9<z7CY%=KGMR-`$<sa|>%4t4N3J84&sz_Iik~WfzqJ8+#Ga1k`{C5J=WVB{QjM*P
z*t~4skG<K~*x?dxHoOD5Xx9$PNDL56UT01$Djjn5013!&<{~k^&=O<$O*prGcM|w#
zw4&?D9fvv)+V#e1pvUirx0!G~0GA&xaAt)3iYqqTo)iPLYQwjGd@klHz-5Mod1w7%
z+_T;<?lp&1(B;;m`JiGgX8Uky(8;taGqbrMJ)Ud_7<j@}UQP9#`H<b!czO=Bi<a4I
zw~=nSr~XsjbEI3|{)OZC08*pp`Iuq+xj3CN^EAfpEw^*h_hJzoP|m4D<?`l=)$k7_
z%scU6uZ<%L@cP@5emvf9^y5KQPRPY_7>UhiUT%%_)OQi1GiWTwA_4}tbb`djTLG5C
zmXc+>Tc(hs1h)a&73CGzO}G#et~qv9sBU7QL$VL;xDAZTGH3baOI7oV6-fg`!f7NP
zSwJYJT7n5NIkhZM;N<B}kf3JR|3Z>bZ;6!AlRCzR*3i%Sh?m~7o%5{EP2w)fjbmx`
z16ums6%yD+$68q_4%uD5_%CE=>dMvho285VoveWim;4|<hD=E^TUE5{f#1x)g3T*k
z#Tns+5xGk!&Hy16vp^Xx((`1X`XgaB!r&G5%(OMG?`@nDiNLg8mgntnpd`LM{Q-JT
z2<RdRXpT%0&5_RpFq?md$WLKGx(7<au#d_AT9busZJtg+iB?q{X@Q@NPhI**iyeT8
zx`Bw+^47KzU=x}pIXVBv{xWYDW>A$q^06F_bVHdsl0T2@F{Artl#p^ABx0a-nQ$RB
z%Mb9d|Fr3va@WAEj5SECh6|{#ryjQrcMw8JZy`p%66nR<M6&U@pL9<R7B8bvgl{q{
zdMUshmkGaY2nr20qcRtgRs~idlaQN~lE#EHvw-_{ED;G9&}<W#_L`(QKNM<kTq&IY
zKyfB!cKezK)A*GWJ5d_eABY5RcEJV&XMynC(QI`c4fYop*aUA2P)n5@N<!hy^OPFR
za$kN0H$fBZ^q&Pni8+-`xK8nsei+=}YJOCYkqI{YJj%M~0+q^6f}m(XRw^*=x>$^$
zM2%jX-T~9!OxA07g_rv8IzT$C%<ZHF#Jxrb4Y*wr{J0ZMCgg1<UDM-X|3%G||L`IL
z)VuFHf2zqmi$t{GSQ7sg%-9?Wk;_wz1*6G?120_*g8!T)VkC40%+Hw>26&u*Box;K
z9uw`bC+N&rjwb+EGV8&jObGdeIO)1DG&rkRX4FkYAx<Sn5Go<{gZtrNOL+(#QW4@Q
zCyg8y<*TS+`$;S~lEnW3qt&`ZXVP5rutiB!Fdnp_>STaKW~Bih1^0TVHV!=Gt}=f`
z7PMEbwt2n9;`=Us+rP+|&G6TmX6WBT{l!Jp9!11Lsq{8eRYTlZ0tYEkB@1EcP7I~h
z*6n5HLZ%VaeVF#iIWA@sx;?#1J^jMmMWo=asS2G05d_&vbgQf9B@XzmDB|RFREogA
zU&t-%kge*_!3*@e@!pIoG@<^26kG`X<N#*9&L1akD4u+mKc2?X^$d>RPEwQ^bhTRQ
zcIt76E7Z;ode16QvHgcHyVHPt$#|%BKI+_Dw0LQ>hFeJpi9p*SZ=Ir92uP1Q!Y3^g
z?C%Kd?~9dL09P^$gwaN-QJKb1N}9YgNx(X~63Ft`v5Q`zymzaAwNNM3+$9z!Jhv<q
zzciJNJhchoO1dXC`o<y{JN%sC>xWSO21>(0Vz@YUV0%@<`R_OHV@YU+1vR=@B-J-3
z{ECv>zqj3o?i;aY`NfG9&RIQ<>I2~kZ|5q#er9J!NrF8XC9KNG3BLEWp%;L>@4(^S
z>b(EDI5F!}6IAEzr{`LMDbX{%2h4uXnO1uVM+PWspTzPLuWtbt&<{@f|LFU`gMta!
z&?05yNtBy(R@S+z?3Ps2eS_J~ZYycSmcOTc#^3X2-t21pNxeAfii?`a_*jA;tH+t`
zWK!s)xdbiOjS_%b3(LcFva8jkL{5~i>8l*j4zPR_5ce)TkD3GMpa2dorKM0>il(g`
zB4A;~{nWjJETM1EC43Y}km_UvsG^2-eWO8@6qj)gB(rlLwvc_42a8Ike@U1?n{YLc
zlNN)MQE<NN!Dt@-Ftz=0^%YFOuhR{&9hYupxVyo6l|l1I8ddktVktcYC3%x50!&gh
z(+q@yZ4gQJDaK<|CVK`})dAn|wxD|&zX8cUwm1<u+5?YzS7udVTyVW%6(1<45-ClA
z11@jcK!zeA7WIUn_;kX-R7#tQ8oSoD(!ZWtOF4PPNJA{Q!!b2Mx6dE*D9cl;?5W|W
z2l}5vIPM;8{<X}xBIo{gqea#e-c1Nef&wClv3lYZxPf3v%D)E0311PYzna-QrKdAO
z*vVPdq`dhX{ExHOQ`-<$0i(<gD6uN+Dimg->wq6`pF0(TAjX{gi4eX!FNjbpD%;;P
zfm$8F&?o%Ki~r*nCKCN9<I&Soexvc_RE7dxV8ltXK1wTgvJT$mqLCDP<7g6${g_oX
z)VO^LRSEKj|0sgCP@NY*2Fdt>x=ro^#!RztaYN-|QUU*Av!SB!l!v!si9p+%Q(RcU
za!zj!|KBTaVA^*NUvEpkW7U39rM@Ye?UqDtCZh(Nu(kT3gTo~)(GydJwAEMkLZ)eM
z^e!n73C8!uH5>^FCTn^$8)Dz|9lvae!N~}zan%pL(4wRrF&r?iC9AN%lZ^7}hcW}S
zcWn%YAU^B(6so8X(!T?o>7R}$l6-O#I!=$tVVQ*{#bHNTOZb1o>Dwamlo9Y)19_3c
zM5np<(i9YcKKpZEzmds}drfk&r}veRtYA-%9PiX-Wh7woSvJ&;^fTqBgF1Z8W4l#^
z!o@=~bxqkg89v3rBH)95p9=0kS<5BMycFb^)xH!A!JtyW)V{NO24z<Kk8I+v$2ap5
zH*AOeRiArh+CIf{)-SHp1jx(Ag|w90dGHC>JorpuB&(X4T+Ed0#cc94ZNYv3%opc1
zhonR#U^`1j-=0D(W&)zXg%F*-;%wC?<fp^hCQ?1KINg5|eThIV<J<%vP8_s!rAK9n
z%0T&M4O_W+wrujKl!_a^cEN7@#jWx7t$E02ga4#=&xNPV9!`4d2-L;EzOM)4#fgw0
zEJa@d@=TDPfu?;p=$7F>IR}q2B`y=#4*M!_{yZ@KGSA{s7O)s9S7@cYj2ZYMSJze_
z*)LzeGU@6OnX<C#idQ?DVU9&HU4K_u8H+T{ohBz(=iD=gN3=9NyX^CY#nB&`2eRSC
z%qcJ7gerBc>1XmPI>_Gv81j1<(KmBvy{KL1uJB)aYtIb~;dcOkozK2up@yYbFo6Z@
zb8+Uf;a4XlL7+wUR?qqO8=drqwMQqgoF|y0W5l#unc3iV&}#ZV>gT0|OYb@<j%Oxy
zABF#F+&;MKS<tvbf@0=TN~f-+LCnO++9Ba6)+O`Kn&%anK>n++s<KD-ZFn*T0Gvic
z^&>ZtxdI43*7n5I@k}#y8cGrQA_-9(0#`myU&Mg0y)Bk~##2G^MkyWR3Z-;zKzs*6
zPP^2@o4ZTk)ux@OImBtf!Tj3eMvUkP{+S00LH5*PLzXcgA88zqA}8Ed5Sh<ezRcrz
z`-NmeK8h5!6%_5)(i9Z}-gK3O5P&K}>gw_{dY|DF<w-yw+Eya3Vsh4;^~dy|88}i!
zti;vUoE-v<3}!Ox5O~T(q=Hua2ZBi1FQh<`e*RDM$(+w)b0^)s420Y;k;(dg>Y)=x
zL9ihaV>z~`QW>^Fgi1nM^gEHJg%^k^P+nVu`PMuYHB@Skz38BC;-nd%<*dHzk@l>O
zK_4b1Y|aY_rJtPzkWw@RDAKxtOyf|yB<oR9^2tFjV(n4Tr@z!<@vZmO`q}s;5cbml
zZ2m>i0Wif`O(`GOc}x3DFa-A@gWEL3rrC)vd(?sP3{3DF`<Rp`nWt1j+gs`z!*xOp
zfu;WE1xO%!=GI|#L}C~`GOe{ra<H$zaHBP3yH(RW?81doFP+WUoC?8Uejxe&4nMcP
zS&AoFdOzi8{a8%t8Qjk@MSZ2@@po>v5Vk`D;htWTtdD^mIW5QV|1E{Bh7r3Qd3WUe
z;lI>jRqHT`^}qRY)(I{HH~%}9;kjvZG&=Tn<5;1*Ys=EhK>vtlyL9j1`p=(5vwhQ^
zBFRH`k`R3Dz&BJ1z^AAr3rDZs{8<$4$Tm--_xW&|#`1&S=f{H6*eW;pQuv6j<jdKu
z)s7sIF0{=%uvSWea@m`fiOtZH&|RRpUt_8KNk-|QVikTuo4YmH;nYT2%G2EGr~892
z<ddNXnWW(`Kx(2qVV3$}7|1<zW(#W%vzbKJIQKpDWUqp!hfsH~MaFEVWT{u9pdEMc
ztma|t`0N%S6gVHB`o6_PG(eOetr=&1Z0g9F;Lka7&VGKjBV@Mk$Lx$})ioNgy(_}#
z<(WAV?Ar$Eys+F#{ssl9$3>VQ?iU-$^ZO+C`(@K>W^od;#Jrxp`%*s|-kA8w#pj;F
zMXo9Sn<B~d9ZRSVZY7~Tde2GbqYpK!^qyOJ>h9@MN0Vdw>0^62o`+KLZ6(Sd%vv4R
z#dcR_R)_1VwdU5zURX149=x#bMfR>rvh-*`sZhaVRs7a7hvWX^waxp-{xvSE{n!4?
z(5(&&J1&n|;dLx2Bo8Ge^gUKIIkP+1eawD%$eeM!m8WprOJh0ava+_)04%-(*yi|q
zoE*?SG|wDD+^ng>%r|Qu)f*zuNuAxQ@Z9Y<5{HGh;ruN20zA6g1*`Agba4OW*LZHt
zyfJ*#YI9UybClq@@3|Kgar9V&`4}X!<zlC(28q(z|CTss4SU$Gx9@PgHFhL&T<6I#
z&s(_}E48b(A9gf)d=z#RaJ*A<{LRy*rPN~Bf%ryp=YNMZ%-#Cz{4T0taL-p)a&^nH
zKIB{nTgcK7vHFd3DNngR;mr08rr!OkRqX_-%9(@mHkxJLr3S)Xcejo(gMU+%%y;+1
zE8N05XYo*ZXf^*Wf12wjep!?i;upFm#`<T*3p0E{?Pp8<%eds}(NdsxqxmR0E&i)d
zewtqB<*JmFvAirr83^5veU<?lNNuR>>wFHW*L&E~^$}muXVrs^%{LwQQIdWgb$*Fj
zdTK^Y)unyOo}HJ9A5gFhH)%B;c88tI-m{gAA<q7LYhIy>;c$x_2jE%9nd2)sY^Z=p
zL=L)R6ZQTebo5s+zAZ}H6>!>YjRB4T^dFtX46n%qNTz(~E`8mX;rBN|+N@V|MWY!v
zWBi|<0Ye*eo?cQsPO2Ov!9~Xs1WTqElXEvUcNkvkS4KJ?_pv)Tqe!~p)G~fdb++R~
zOa0sBMhz697ynGbo@!$n`PWRS?QbK&AbX&`5VZOJxcG^T+6VvThTvbtSR@tZyvdyQ
zx&7nS8aBgC*bs*S)oCp^l33U7c@O(~y%NajT7oixncEB7raykhDaoNckNin&=E{DQ
zi<(O$1tzpgw*aslXfu}sCA8qx4CrubPcuR+0DFX7G?PT!29lbJW)sgyP$Yd>Pt?BN
zZ_!o=K9s^u2;xo?7Z8zE$m8yVivM4k^~wNF<spigNmVj|UziTnsSDG`csGjbI1xO#
zyCNOTkB5da9g{Qbc320s2m%+qSdQa@<N0RkCBTt$--GQ3d0@hB|KCgf0?6iibpQ?B
z6dqSL7UW@}6;(usQ5tFNHiqqf_qv*s0k%-k&gu+`8(J!g&}I`{u_+&=y;Y^x{pWu|
z>0+J^kbp7uJ5X1hHlkUet#Z=FK@GwzbvcgWh)xxCgrsFn0=n~@WUJstjm)1yVXB0Y
zHC}5Y@y-{>shfv>;O$vns%lYgXzx~Eoau^C<j*U$FW~mhBvaEN)4vZypU5X&dc7YS
z?ciPTqK5G_qv0JpRbJ=H&&9;xj6DcAYuMU}c~snDB=C9TEpZtfGcu#?ohlrLk3f?x
z5K%!FANVU+jtEW}pu<l3+MjJgUNu{$t7YGogGGDFO?ZS`1-EMm1%8`>s=<E7Pno_I
z>_i7#_?YFil*J;^C1?vo&v&_{av1r9OywnMveXqahb*KWLfaXl&N%Q0nfogyL2;`C
z48Mnt0Xgac(>cjoBGZ_aTqd)7_)ym*MQHAfxhzUnUqK1pjpv;5$>IA)KX;nYgK|l{
zcK(?|?WmPsoQ&^<lg7@E)J_mabHO!~{ophmQ(l}f;Ys(IlaL6-wTvh%35-L<q@9|N
zr4Zs+M?6jFf21hm+W!<YxaZvY%SXOQ!3{O1>)3FLboH=C6GD*gu!Gm@7wp#;7KbWs
zK>LZ4>U3f!^=9`d!9ihy04i!P2Xkaz_a9~*Qg@Sl{ECkvG#sS=Q7H|?!+=X7O>h&M
zrtM=Lp3d8~r^L|(Stu)*j%r*W0f9g%X7EU$_#u5PLY_V&Ko#kz`6&4tFwDH?H~IMN
zM_~ONX<=V`2)|kmo_uM9$L5+{Lu?H5_c28+K$W=CNiZdG%K(|84-!U6UxV?}F0oe1
z2j<1#0<^=U-Fe~+=DZQX=l6ku@kfu`kohlxEv_A<JP-+Z%oZn8$K;Qsg*=g>|08*N
z|08))#lgZqif8*Z!a#qKd)jP`Tg}-P)exJY<*~20K-OH}wh>ccg(Eacjjl0w|28qb
z{p&!S)%<DBh|4zv=CSpvVE$|9F*MknT&p{3h^0jkjL7H?WHZTQIAZ@dNgx?bCSav(
z@>*5Lb5<|*M+gg8(|V7=r{VYmArX#a5_;NKw1)R<mBG?}_$Bd4Azl83^GnF;eHz_(
z1c_mt(o31|zsdHWOiwvsG`4s&WWR6O-ylZMI>)%H{4~8y^23zuqc&Zl%T?3O7<xf%
zb9hAwFv9|2Cf2q0(t0km`l&F5NC<cZ!E^Q+e-|-{y4sfNCWxxJ#hPDYF1pg{XV{kz
zxsY%vK`q+8=i7Rtr8OU()pqB71IZ2^R%2+Lgg@w;o-o0i->yqTGiL=v&$R>(P9`yA
z^zs>@m-3~7qQ2NCJ?w^x`CcVf0oJRxo-VLnbo=anIzjj-)L_*#b+g7ZU%I@fW?Qm)
zmIq#N01@H3#1rgf!Og6U1VPX$5(EK5gaTCFnY6??R|Hn$DDME(RsU4E2{BgMQOtQk
zOGn4^=3xIAf^wf34qm~8pi$k@15jT!DKN$?o$8xn;E*tzFy-`8z6@{m<KJ7Al~~1m
ztHbQK;4z;6B4F6cd~eTTB7n?`1i72RAM-a<_r$x3jMzDOwm8-auP4M>PqELe*=VO%
zY`!c=tFx}NZU#%VU!3hCH147Ou!}@7kt@g0Nv(K-kLO)(+Dt@2ufpyq+1alrUVC6`
z-Zw#1UefP+4^pU*Jt|55i+Ro}RGvJ_Yne9=jR?|;`xp*Vy%ZW^r6M+F>&ckM=O9VN
z5>X*DOin5A75Ho^%^wX>GTJe=p7$Qh(CjSi31HjM2MJ6AN&NMclaIeC%C#{ZJKb=B
zyC>ZLJb*ch73P1fiWvj`%}TdpDCp0R4X*(6xEJ37sp2!Uu!@}o<)F3w)Bk0RoHeeK
zCcRemBCJ?EvSO|8hj}{SQpuvP@>C-Tw6M7u>>`(1f3Wf1hIwNtdD><UU_Z+2#9G%O
z5EBWCdgWMBg3n{fVVUVvuRGE}dno8(R?!BrP1G3i^-G*Op|yn{2Ph6D-)rtz(Q-?!
zZ-<G9+X+n??fD+B`c`3VSJ>BJZDgaT|BlZ)lvw>|k#|)y-N!3k1PLDL%XoyweTLn#
z*=M}i_pNd~&s7P=l%a4!b+G9+!iINXEFlR>otZ=!SPcGJJ1>~`*VEl?-D`TV>=MaG
z@dY6|G>;<_)DSKTChF=>(FM&bp1gx%+NJV>iEwF(!8rsrh<ty?St)|}Sw=KZ-OQIu
zN8G$>z_-~vzClTRS~}qX4_&j}kh1#w><wM8lTpkH!PFE|UPcxnzE+CJO*q+s)fx5O
zrLn{k5kCc8wq6uIB<>&`faD8lLvpjrIzCBkaq?$~yQ1D&Lj4sznHBt~1)i7HLMrKg
zD*85Eih^nvN;;aS*MAe+V>4i6!Y<b={kRvik6rdfb<);5vRku5!ZrutV(}=NkM~PZ
z#islh12MH=e>XW&eRkv?hBY_pwb6J4HGRB~Up}6e^8Ga32hhv??tOs^&jS0@tg~~|
zqamxq8@&Gzq`T^p7k~G9jN>N45ptqJeL5;CT|7h@2Jo1b4TabTrYi7)<gleqx45R9
z&tojnbKo=?_e^XP%-z2TbA)n6V0-Cs@Vuvidv2jURv<^jd+9u~8mmWmy08A}h-JS|
zBPZd4dDXA-X2dLs<G%Qm1%}B+ftw`~Ov?cZP9tv{AplA<qfw~PhamGvC4J-!(GBix
z<rXIb*Zlg)WTf=xqlf$=p3N>yfNpO{wyHnHC60Sp0t0i`DOM!LsgSZ3kqKL}gygd;
zp(e<G{FaDNOrz3?Abasy-bS+r6@rlDA0O&8<Hr-O;Gjm4I&Q^6Ab|ZO>V!-bprjEd
z&P)k$u6%h5JVu~mzJ8`DcAHV3J=F)O@wj%NsyoTa4q2Th%*f3qDqknDX{(0=y3CPR
z#J}wd9oNeU>!L%K8Er%}dWiD6`wXlj7&E|$#Q2U~C-gM*xALB!1#+AVwbHCfZLT*^
zYTUoDxh6I9O|hONFP!eP%xZFir@kTW7Y&>9jGb+OQ52g|Vz8lSGp_%9XpD>%wmDS>
z!R-AfF@;CEcXH%)?mW}5lQ2SjSP!?R!RoXY&nugbkUPAzsB;-aFkTxhK#Y8I{-MGi
z!|HRMQJ5}3exwwXShK^UGuW@?A0OV)K4*ga3C!p?BZ?1T{y4-ql^CG+>X8)j^XG_B
zuJe^M`nvy58#Fym7&ut276GRP%1X|sezHvX-V<uT8$3<!XKTCo8a}hSU->`t0N5D8
z4-8Y*0(R>JS+=uIW@H=Hd}@IAEzn*lum>YEfIZq?q|bpHN-=Lii$X2J4H?jm_(+%=
za4J699w#gjLKbLl9u3Beya@eIjk*j*laryk_<z^Ipj6V2%FbeLD-{B#InW*u_wq>V
zN5(59VhHETelHZ_%tH3h)(C#o9Ep=TBV95;EW+p~Q1jF)mp^g(BlG8k-S2uKU)C=i
z6-=Z#ptTS~kSHEZ7X7;zXIue^ev43hEq*9sLkO~TxvTgz)_mEM+ywVBAj`V5vKnLR
z;7y;44e+=gzJKA|^)xFU4yhVFa;~oxFrkh$MHW*bNOOo#Py>H=2K2e-ZFnfj+mk*@
z4cw^YAKXV8?zCKRmCBZr3UVwv$q(~k%*TY>z713_6@8XgO3Y*#N55F>ZL@Q)Iujy$
zPRrJvHJ099jrZc|L?p<ft$S+}gMd5SGV3c?<Jya=lRrf?^|q~+%PznnmH%`U2g7NC
z<V^S|w=DTn3BmmQ#RN7dR}#Y98LZ#VL+1ucwYbx-i3KEp{iMF!dNLl&gY+Ou#;JHn
zoG8>BD7t#oObBp~vNcf(T;M`X4-2F@5M}gtfjsGW+yUta^fr{Ms_T~~T8H#Mq?*X@
zsU`h4Q^QWp;!Oi9*d_LZ@_}f<M?!(NnuiH1zyEr*Ll57je;Q)l8aWec_RU0A$eH;5
zJO;R?h4|lAuN^uZg$%A=99)6petzbf-ZpI1S~&q~Q3-O0p(20D-}k0i{AbAXq>&Ni
z>u6Efu&`Y|H9Hnd+TH1U$gwE(VuYEh1GTN?E4K@rJJ$DRe{bQNXPP&=s-#)@-(KUZ
zuq*f)SZMdQINsJUfn?e5D<S1=zwl3wBP!1P&?bAKqE*-_sWbe&><jMgudkx9mnJQO
zzYxg}ndp2My72UN;?T{)=j{%cKY3`AcTl{zto&Vcg@&?pC9mL5a-81x-EFtz4y{kr
zQP7Ujn;F=Vn0dd5{vMo|*jy|?ez~C{3bb+6fTQFvX$p+K&|MqWs=2=}oZ;qul$U^c
zdA_*_&`yFSi#oR}4nNO>JqBQD)Z~l|jpqfCfWqqyJGGCkbE*b9hQBk;`s%c3!y&y?
znuXcOG5$tvn_)jZ>{~}2`TlzA7dOfkDsSpoQ}iO3s;xsUd0{^{Z!Hf}6x=f6rZIW9
zM1AXE9j37ydK%ZFuXj#K9q;eF%nWkR1V!<_Au_;`R6@o^jAqU$&T#2+%KY~(6-M9Y
z>h&7h(m0r>>SXv?hT9FUw1UpUPi<eZ5p;x4P~v52`@IY+(;aK)AT8cnI2HTmtzkpk
z@2ZHKfA$2TB5h9lnUl9kkv)#=y}IdLUCO?=7=L%qZNHNB_8HWT3U>MgCmYg6zxYn_
z8jj<27@OAf_$xqD<$3{DBF5X!p-i|>h}Qk--i^w@A=~N3)_NX3N^t%8#d&RCYi!%K
zQw!h&@gNSCJQ=T{>etI~$<ds%g8qU(6_$^9$Id=auCwD=dSP~@({V1TPCXYaLXxON
zpcQoW4P(S}=2ab;crSGd)qG(7F!tfRI0*>Ke@lMYIao$nQ5VuAS9mpT8F%^C(X~5K
z4Ti=|?w|U3(ft!{`K8}=A2SSg6(%osQm=CbN)QCQ7LpJzJTGPKuNvOp4VU|_V?D*N
zve-qJtt!^}yKlA_Af+oW>IS!`o{vQQSz%QTLgY}}{CK(d&W7f>$Gz^FtMhtM8$&pr
z_3F7vfi&TBm4W=#QS-O#4F4X)W`E4!fbzxkW^yLON}OWlJhIb)HiSe(7qnQez_ZiN
zS3Zi+YI_oZtK{)hAH*=L0=oBP5!GhLyW1MbtAG`SCO!Yj+v2TWT7jqv@5-30mD?W<
z0*g!fH*Ue3j2n#1mz|l=c_8Vkze+PA#6ROZZ19m;h=#%hV@YqsscidP+LV#sIyYR<
zWSF6obe(IJrA8*VtyeTvWXP7Zwt@{SGiaV+m1<sj!S?W$>t}g$g?rkYyEX2*Yr6zq
z0{ML&(HpxtV*(8W0?h687A}+{rs$dou>Mg_yJ;h9F<0(+X>IoS9{Tvw<P2OhqR-Bp
z`06*!{UFH|Hm^a5iG%I+a}8}c+yWgDv2XN<(JyRDelx%Y8TR!>zB$11yKQxHW~;ie
z%*zFId<D#gi_-Zbk9c7G`Ax1ms~%be?<$mm_X5mQ#^17NR>t-_h=kHC*&Bw<=%Zg*
z-FTFBRt1XZpBPCwy&hylEo52xUTYz1(WN__9XN2d98ja&P3iK<%4}4p;yZ<nQ|I53
ziWu*`WS8f`Me$(Lzp_v2%8dRPxjA}oFN!}ie8QAEhUzi$+iW!o(w2+dS4p3Q1@e0+
zro*}#rdbJ4@Gg5(D5Sj0HTM`sSGxs!(h!cXwHAI4pp(UA`@fY%GRVb%slJSc1RQTn
zQHw?7-umAUcv50f8@pRCn%K!uwHjtFlu0#R!&Hwhz-^CpLVQYK;zFT#WQBw2+SbF^
z4ka!eN@yR})7NygDCpdrY^WbWE;8|@Z)oQ0@eQ>UxHhFbc%MiB=L3c4i3RZ;Bc53x
z1eG6M|KRC(Glu#Kwii?`WV;8**!(iFozu~aADBn3sn!r!S09Q+S(;t`Nq{QjR3b?5
z%H7rO0T%(vYsTnXRz6{b>wIj7uKMDBS|I=STbq~wn!{J)gtqJ+4n3xfgp*3at04$N
z(~7#qjx}MgCa4XJguNExo^r+f0LOy@9>yS<O;Yjvd5gqm|G2Hue%!QX>7FZ$M+a5S
zkA1;5XMXe|tIsv9_bSPSLoAG$kaH2BblzwBDjoT=bW+ur?;%TJ>+y@vg2qlL+HmXq
z!NlQ$^YLN&^S(O&d>D6-Ot9hnrg&6w{`|rEfkAJP4R_G{+Q9esd*A8&aE^k!)&g(D
z<oKL?WPM3dF!&ucIyd}WKvC7{5D`3br#q9R5@hw5kZuCBUeR&IUrrJGP-zO(_$MK{
zr=RvOlOj)#xlGUL)Md(T&h;_2>hA>Ol89Y8ty}E8uAP2nu}-WxsI@o3HqiWST)je8
zyFY|T%zR<-1;aGc8b+VWW|6N%PpNWy_X@oN0A(h0S9Y-Z)045K^#}mK<9~!kPVOT>
z<=8_a2Gi2*Z|5;K2CX3_w=x5MNG(IpIc61!YikgkfX4@+Gt<SX(w$)SP@xg2P4~~Z
zmS7Z`Mew>5eKp}n(4%?97_Ku1!7oTPhRz>eUYevpU;S-8|KyBUw))FBre;0oH=b^3
zOR=JLinVdDGzRh7XV8%JahCWyBD_o5UI!?$g&;{u{^#YU^oC^R>4vt|UD<0<-t5eO
zhZ;o$?W9hl%;2J6WNDBhrla`wB<nr?ZdM$~?>xx!l8N4gbFXjh0n?524fM8se^I!6
zadC4v54?jDlKC26s0>tDA(l*+5DY68Vyjw=HHIF!@h7K<?)_2X!F+9)GMjs~yKVvb
zDO4wh<^tT7;MTcSKTCj3(#wk;K?ZYBJkr9SbwM$`7+tcYc(W(9*r`r2Ehw$xOw`w!
z>f%$ZUILtrZ4y7Y<NaScu1}}Ge#=DbRTyWARum6qCJ~23_$OkjJZAswOF_SBdlIEn
ze>(4qduPhF#i?Omve&tzy!t9)pQv3hStG`?S)LJWP?&B}w&WI1M3yyCLs-34A=IMF
zbW7$f{-C)*@Ui6ZHJ;X~J6ec0%IwtS3<|PO=6kD494l?Yl`(g$A}Y&C87+1;(kmMi
za5^;2@_Mf_&e;yQal<;eokh(B2NA+7$}-zwew~w;l!6Oi!&z1mb35c-2-~~AzF>Ap
ztkU8Dmvk9<YYq|#_zOqBkfh~bdepLwXQm)(y?jgG(Bsp|B5whZFpIryKkHQ~GSo@v
zGZ+a;D6`gLk;9w4=$A#Lq{802!?8du?3)v8nAG$9%g3`q?uTD(@>=wq_vTx=#nF0j
zH_nqB;}5jC^&JT(t(jlbOI6|;jkooS{_Mm>E#HN>R$j&#?5KR-7_&b<%+9Fmd+vs+
z%eenFhxUOeo&D}r>UOVac#}CZ7W3KB5-2n_L9p8flD?K$C-z)fGm;u6iyWb&lpJ~U
zAG8gh@)x&WpliWli4HlP(7fv4S-Bo|P><cI4s5DCyu9g~L4#(#?^z_xePsSGLov6!
zT<c&=Bd)PT8=~={?66Z9S{E@=c|MK(IJa_hC<Z<`vBiw@SJ#-Lr!@G84ehC>>8aMe
za_T?`bcWrlblu+YeoY}I`Vq39oDxT$eyifPcr&G%e*c60l46nTyJv85OH_v}QkF`q
zUzoKXK186jS!MowP>D#v3EHyJO>FT5h9!jG*`DS=9KGETyTA4lIi09?OTh`mFMjbv
zv51=RPKch$$)_*@xt*5S>YJjVII3;OoW<p#1RVqgb-ZaH*#a|0Fs3=W1X6}LsfF6<
zcp2Ge{s25?uN7e~n4Q_x-FeBLoC6M^^{?zT3+o!LGD>5GeLQdt2fAi(*R||7K0Nc>
zdj=5^m4_@!#lL*)9L$0Ohi*&_y)pcz=-(_2F4=KT?y12z!s{q*)zAdj@JE6*L^~|t
z3JP>y$Wn^9W>gd%(-M+6se3-Bgzmiu<>dd>DYPp)3MEcQEF6_{&*O?C6P?9cv#na%
z67j?F_=9TxnHDk+-cl}Pcq&m*)VjS?z@KXeF_>~4yrY7sBs;TDy2z<sBDTSjGKrHY
zzn3BIU##zDxSJ()<LhsfnY1W0OzuTz7Pd|3M{m6oM(1`$fB7Sz07$5m!c5H3Be_{f
zkX#Vo3%p#zL6t4Hl!S$sbZf(^RQ3}_2Wax8dpzz-DbL(zW153k_@fz`u+K^}LwErO
zLpW(g0)%5}Cq?l6J&vlhVC~f)@fj<?r$n_+zqWaV*Lfb$(AS1=+eu9KLx7kIq84wb
z=&pWdgI*VEcKZD;k8D-CwULM585vN(M~zGm@#Np>NuTq|-Gd32BQlRLu!y6)=#0Nv
z{M7l;9#gFI%J8P^@9MMtmIlFO5<5<r>2-?kmO&H@OkONYMFRdFdB?oyW9jZ=`{qep
zTU~&l*qS5=Y&#`L5<1oX>=`(Y0QxVNc`HBsUtwBB3eyTc>PZeW4NljTx&;>udL+>q
z9(Y#u*ySi4;gb@RmI)tsV)parePIpEvLP|g1v!0W$f++A)hSHkduwCz`nRmR+}NPp
zNaN{o_wEl_;kjg2W?Js7x}Qd>bpB+d15yZnKSbxcqV>jBwK$i<zz+Y<3!r!co2ar?
z|ImwUjpS*x8JBk4>w^+g&^OaPw0*CE)^+9^_Mwu9a8<MaTW}c+%c~F48y=7fp(`_x
zjCs*mwmx|BFLBM}FXD7ByQCB3=JaZ$zE}l24k@$j=KNdhqN+^)A^~poP}Rqh1w`k}
zf}oHl5`V&XfF|Y^l9uIN(kV34H{`p6NTtF;<Y467D_xNBDQD4${#q~XIzQ{M(QwdE
z%*qkdINd?zNgHIA4vm&{F3DDS@vzVRc36#cSdITcT#q)MdjoCF!f|?Wv_H={!R4X2
z46E3{6{^n5>s;7=r;VvgmOzcP-7pL7I_AjsbP#ybLs*`6R?xlscZdcy!)~usOC;jR
zW}nMpd={MQ&hezeA;neWAX`N7n{b(1j6MH~IUQd;mQ=vAfc3Kcn~({HX;dnAfxhEg
zIT#l)_)Vi_I)Mpt2ZQuMYp#s-?7_yce&z}nt2<>*OYQwd<iIp$hx05cN>@NdVgI71
z&<y2yyA&d}B~0QVEd408_xNrW(c>?4@0o$BN+CU%Q}3P~ntktjv^zATvHSwMmD?7A
z$Yc<`;mg4iUJWJ1hFC54{epF0k3GI^&iOE9_eANCSYN=`f0ci!@K^L7-Uv-Z`Zo$g
zH<ljPIz>4tgT;N0D3Ug=N?h^o51e0U?Umk|nc`y1li57p+?<Nn3sGBc6CNIe;AN_^
zJ2e-XB;Av?@<ZKvYFK33@+KJ$%C<6-J^{u`TF&(ZRacSkq#i~MS)x6SpvZuU8r5n4
zONDug+C`FsYdl{CyVC+2_4azJBk%T$Fm08!pv0c);$TYxo`-uGu_)iEQEw_p(tfmF
z)KJmqXj#l%d1xVfEZe9iu!arXFxWV5{^J?5F>7<cV<}{ogVfr;`>&8rjza*(x<0Qy
zdCRJ83A(0wHw~l5i$@Z*zleW5Lo(R7V6&Zr$EpbH)bDSKi$32qAbZHVZcpdM^1bzx
z)P*L4M{iHvpIR38Y{b3?4aCpkX^crS+qV67*}m|WiyB(arbIuDq4=)7T$sf0!TwFt
zv`27eZ&@$d>!r>k4c)9c3Z*=C*+=Pt#@8E>f`SdhEhDTu^#0Fw7ouK5rbVS57U&oM
zr7svz6ViqjxqrNZPi=08qr-DFNV21`w*J~s+(Dh4g1DNHOq3IQs{4%g`R<+H2)y@U
zg>!MI__U@WnFwAkdM+A}HBsu`e#t5z&daCaxpM|SN)?}rZ+=Fil2I)bE;Tzq(og=i
z^E3$Z9LDYTt#hhh!I+7ggz{0?;&)#eF?UrW=8v*8orphOge3SBGEyM{&EE*V4L?<k
zwr3RDvK4spS)|<fKazw!J0B*BP`1JV-4F!R$@q)UWmP1`()9AUcaSjujPj6XCe$Ul
zF$}e^_cfIgf!&6$;VU=cln1pHvd%C$bC)XUZkW(hH^GK#Z47*C^9tuK{{ZZO-?5u4
z#kMt+8n_Vy{xmA&$4fdh@z90v;u5&a%hfi&8A*0$%$bHXvUF7bRM;({a%+{vdwfYt
z^A&i?Vtd+874_V_XCTjce|j+Pbq^C&c?N^XcIuD(fCTT@4DWXBkOxx9t3BS#Nhf57
zkuMcomSP406ukRxsjY4RvoAW);nBPG`)?Sm<H2vbbL@~OlcGte1YXN>(zrso_h6<$
zvj5x&V8RW~?F%cnW1Gr4`)SZA+$@`&xbtf2(%Tw5m9f0c<_xC>;q>IQL>-oiwi9G2
zK`nGy{B0s_d9mCSVLtY+Lxbkx{I^32ncb}3UV$N3%Xm`l9n7*8_R|Qhp_LxP2%5`r
zob$l=1Q>PtJ$)E5dFDdBYL!t+)!zul81pNwl!KiUySCqo#;QofJX%S|EOl}=IK)yb
zRDSv8yJgs&GfQ|8%|OLE-zKa>teSunk3vmkQ^(8wtf8~;CKZX#0ZHqb@YB5&Xis1L
zbo|mp@b(NnR-hLnF4Vv^C8OjV;K5XOuH+=?-iUchD}kHl(uCyO_(1-n^+lRcgU`hz
z0?(Yj-`O1=`*plMSuR&1fF9zbNO_U!4=0!rd3tcl?HpjA1_j}?{lR=;%K9un@2lgx
zSiMb=XU{TgA!WLL^AvoB4zS1tLnj-C(5mqJa>zvhsIseff)iSRN~j$FCKp#Wt0`r$
zJiw>cWx7ab8|5?@$3)50*#^xFc_%)`ESc?yNn|Q%LmlRbC3v9Xi&?;$*V3vx_FF`b
zwpf)7(%^37xJ(YsvTfU;P&%<ETvz#+>s#p)7Q*bI@K0a$Loq){k_yJLO`f5KDMB=Z
zFXMJ}@U%GHUzaDNiv)0TggYY0?1?8XUAiM>@6=i*`jeySS^Cl}pX1_hpxovPdaqW!
z*?9LY#{^+KEH)SPO!N+qt%5!7bk}T+gdKb=-t#>0+^uJBmrPz5K<RwQywlaoW<&!6
zWpKYAuqp;lXL$i;1y9u0$I?1{SfULZ;Oi+mkb`n+F#p!Thq${W%1Tk3qEi`A22q6i
ztRJ9UQ5=Za5z8T_=RahCtup0y1c14h@oiGZU6!K5PWteZbXu{^(GhRE6Dtan*7T%j
zIRy7BD?D@jwUO+I`M!^Y<FF1;O{Z{qzA49Y2!8*P-6`DqeS*!lzWam4&#5$j-n?*2
zQ%+_0^j5rJN5tGkv`xt+1s@C>)}Voj8nRS8UY9vQ3Ew~eSFG4ppa_(m55b4q5-kmb
zkMo?nReAjmzOjiQWJv7=qi+^(W>umpiV7Xvw`3CV<3;!zJe_3mUL-SL6NnOIYdxh?
zT9Cw%Y1OIMu{O;zspef0Z`ven&3|*MQU$08!iZF1v~Dp0DWx#bVDuu5#Y9OZfGsyh
z;s9IPEuTh>Hw#L<w&vV^@Zw1@$LHd&IBbTk%Pm(<8r|AJ_~B+1mJ&v3rkwrlw-fN`
zPDnO^*$M>P?Q-F9hf8W$`KB!?szGxT|IjNs-W2^boE2O><gB*<)}<L1veJ~aP1D5_
z4yCVarVFx0mIK{kcb_2fYo2GEyZIh1P`N!{Gi8?X;S;vJ4YB$PWld#oa4N3I>0Y12
z9Q@;#38P5T8`jmuUz+kR(#ksk0c0(pc6O}!!3K-)=*3|Eh5%LvOYT{sM7dw>Q+dXh
zCfz=b<3dt(g`~<p_YfcLQb=;^{7?3#>;*Li`epS8`4`TW;Io<w-DRHYBihD~*PWJc
zfBb#B;Uw9JxO3HV9PGvXs>-18w|afb>ngNnpNn7os&v#k+Or65+VqV{oR&M@Pa^g&
zjviFdNvHvyZqIjYpP@$=YK=-Ml1Om>0<wPawM<mdcp{k!0Xq6-{W8-s<Uoo_Kw!!Y
z4FZx7dy>r7bt?kS=L?)-4rtu3x-IGhM_@p5DjZ0GZTqnl_gOn;b>=Zi-WT_A5(i+_
zMt<OvY+Lc{r-XFDm99sn0*utQLd}(mi!-h5{C$HaWVOY-?!EW*u2=mTB6kqkn-4jX
z>AqvhEy7-QrXe;YLyuu6Kg@3v&KDMG)-HUzgw;%N+o~hpy2r;qvrkYFb{IXTw(JMF
zgSu|0xU(cKP@Xzf4)9Ma<$26sE8pEU)l>A|(ZDm*pGL3!-@E%u+Gs3!C*Ul3d$H!o
z&xhzxw5GXMLPh*7Zt_lCE;zH)ee{_>XJh+PMM>4&y@MdBL~=?354hV`ZduznMJm5<
ztKIHq%qL*D;TnKoe&%Uw1t&du&(0(INSW?%6^h)SDfjj&q;@2jGy!z}0vbog*<YP^
z0AvSt#o-28W|P-B!n{-QG?~D)JE2qFeZvw*k<hl>89aRw7pf-<?T!nHPj#{?TX?w5
zYk}gThIi)56>Mcaa6F`qkE*Zcj{HjeBRzQ8c5(P&_YRHcjmh}ai>17ZFRuRmc_D-#
zftAKOVuQe#ZmE;_kBqfCqq(+Dp_E}LT>EEsSNJD^70nBox=V<%Sdne(L}7UF9C6FP
zmP|14>I-~o8qwT|oXm>0!l^7ILHyQ*ytI~O`4cGgk2jW7arzB~?n?dOo?*gt{wu^&
zN2E7=Yx5n{u+i+*G16Ywx7SRz>S<-ad~^gTkayO_ji<3^#B6B1NJTV0^aMza-<U4L
z-nZvvmZ9UeM@Rx&Yj}~%Ds!g2>xS<$-7U3gaWQkRoH7yYFv@|$4H<jjVpAEg6)8c3
ztXQ{mEP~-F_vi#b&>SQZWGwGbK+*+Mqprz2*9(UW1xn0Kn}&-FUhI$6zcgK=PozFC
zj$GsDwcY%(H*_;xF1dKvedqaB9WGzHp+PGF7XPA@1rK{`QJ>RyhK_LQdq7muHivh8
z>~{Le5cK#2{FDSDZt|0~ank}1y;%tz-1sBVBEt81mc&!?pbVe7@+Bs2PIr0T@qX64
zJFPgu_<0?plPl|L_YqFdi5P)4&qZGq4iE|Knq<;?+{&7(2;oOz%swP>Y+&G9(+CP0
z0u<!Kng=BD4G~C>xvo}uY5`nRK=@VSyO|<6LH^NF#h7apy=bE|p=%s^qs-y}WjKq{
zIe(HCrGt=qP+@s^PO9WuO4Tcxb2qSo{33(Gxx<V*t1G*jV~FrE0`c;f)}H%qbL!;U
zn;DzbrT-OsE}wKwpkp;J<b@Lpc3mVyo>>|qCZ*}GW|I=*r?x5!mmf_HS4In#xcg-8
z^Er{$z6XgkvA-i8p`<#Me|<S4;O{5bXU}^YTEyQ!p{X<<YIZ~jphqn~Vy~I%e6hO7
zQF^fd-MRZpedyb@B}E8Xw`8yA1XFZt70l~{4D2(=`l9z$h0UA(^;^Mi0^@Y}ZZ-g8
zry4Mf7C$d!%XzaO-!#fO9Nx$;Lf=j`=lpoF^Z$|c-tkz+-~0G&6tc5dMo0?TtIRSA
z5gJw*aU)wq#;r(MiOOD)P)6CwNJiP4P-H8c?D0L%yZ8I^dp{n(|9kYhJ;yoMxvuM+
zXAvh_1i=T|HC}P}g04ti>YdtJ;3t!qCfwJ#AT{#Dt3VvKYH<?;nFcj6Mflo#Y4!<2
zeUqWuc5UYI@xi!EC|^!%V1%U6fz#xcc8uU6L)S69toLwKD~^)4W}`_dS}}idoGpIP
zLt&#`_1+2bCxi3=!?8R|pGeRTkV8LU@1NS&FTy5hO{`vQ42R9pJh82gdE_fSo3;0g
z`?6}W*^}?sxHsR=jw`J;dGK>uAGtA{op&1$$~=6&Bgo12ga)w6Wx+~_rPSfDd;Y9x
zXP_0=A+!Yb!(Zjz%Orm8g0rjhs~=vZktGNJ%m*C)D49&+kOdrl`+qNTlo0|+Nlca9
z|8kf#-vpSH3&#@A!y-7G5*0dIWoSNF`tq=7>hZ2OIe&T95|sgza6^e5Q_)XJ6$L=Q
zjT#SqtxxAT+1TACCAyc7DoC0pB>Q2G{G?~WHt|iCw3lzuG_(<v{hLRKBloB)ljXD?
z3*xc^JU}w%6MM43NVuhltA*J8(zbzVqsma+5lG04$8j$~ajXyAz_&AhL^aYmH$$NZ
z2?Rn9YMuhdR0?jNw+GpX+wjvjtqEgxRVlRzAcYeXsBfV^@!v$zG9}O<)(9Yqhym3&
zp%A=CCeGk{t%4f;Su?jBdnL+zGN4Vg0@9v)WCjG0d<Y_5cm3Jq)}2oSgY$=eiRi7~
zHWyRu029_5t`$(;P7qgu5>v<|F5tfe?`y!(E~A0C728RI(1e*(>ebt^vuV2wT?HTP
z(}12}3RP-+KCe~vUFf{<U>vRuNOew47Cd?<*3^Xp*zRcJMOLT75@Uorpyhp)(c?7W
zfV?T2KYoITP`lUW+d5goBmC#o@t*@YYtTaYw8+86f|j{B4xpq1GdGxZg^;B}?!WQT
zES`u1i4Yy*NagG-hE@FYuw*=p%7JIuQm+vtigjZUA<7Ht(pGnXD_tV8eieBu@qFq@
zRyeIihw$ZED);v@IlZrph?6UqRu2D#_!M+{$tNEHNSmWGscYGC{(%wMYw1(iN({mT
z?;SGyhS@{y;A7Y3IjQB?tNvO($A9Y-bPTr2Ri!<N<nns}Pf>|_P$?zAb3bj(5@^I)
z>W%MbKK5D&0>{!QXD15KXjX;M(_<^?4>_%MEiGi#iNPAim+kGngSIwDD9>LFt%D2k
z1O0(JKkU+?T->t2+b#0)(!##f2nF*pB|E6HReN*)R~PcWGg@hf3E6GIyT=K&5lu8b
zO&XR&)S(7N@1WQBljXr9*EI9{j2v;!^L~9W(Fq<<vic&Zaa7E)O=M}JkV%bm)R%u@
z>$lk=xw!UD-_g7;_qR-cr0}WPnkB5A{4K{{?xz0Uhc}koz5eW_g<?vDV;^3^Kx5q}
zfTRz*Zm^{Znb%t@MRPfS)k&Sz#oiU{@2K1O{bqMn*XH1$LF++#Cvkj4&44V%!9(<O
zrdZ1ar_UlN^jEg7{4i>+r|6%N#!HPdDR;7{2Zaf%y`JtQ6%R*b19yCn`uN_9C!$0^
zn2P#TT<o-QBeOGbyt+NG=E7yNoiQMKWq<dX2q)PTp{Z#5QU7Gp@)03O9CtnRnEs-h
zRuVXwK+rG9RcH77QJ`KQVE(=ZztrY-RoZ~epo~N%{j+e5u@(QLc~BwE1LTiLMnngh
z#2;^HMHJ8JrBueN+xf>2zN$F(A2a92G!}_#qvWPZ<z9F8l8>AE*XtKYFtWft;m>}5
zQc1fh^s!M&ynjMW3Y-|V>%7QL+bXIa%c$$5TQUacn2uuOA&oDaojwW&)BVCYEKbkb
zUy|xdVgDbqZ^%_VqpDaf_iK!riA3SIu*OiDlHN3@lnqPxQt`ra%7QKKQ&35(me1jU
z2w-9?j1Is3!wgWy6V%_Qon$Ode~gEbodJvtnLsRX_3L<lH2~Wz)_|)6RhLPBHhdd*
zD@Qj$0G2)WLac*ctVEZm!(9TFWF{U|@5#+_#h+X1`)XN8{kU^;U@_v#CRdEgyw%;~
z@O$E~0cpe1T?j7i_X)J>_Zwr&Rc@y~IYWohyqJ<x5*iu#;5>v^&DGOnHzw8@UB{<n
zE<<`hwl_RE6nDMl5Fx^(!|_9DZb;EsO8Tm#&y94?ZdyPRsiE<XceY>6YkG3erWdcb
zvZbx0!2B$5m<+e}CS}~WY^f}M8H$RsHhwlW5#k*PQ18YC=qx>?y#sxwKB)|ex_!EL
zm<#=s`d=L$nW)D6!;FGGi@=@0FayWy^B{=5x!@3W)~>~~_)!5%2R~^b*g_N{KRk89
zj_m}6#GOxi;|6T6f~q<SQo{Cf0~4N1)ph`O?*DTH%wCiCr>1U!Um;U|hgotxm9<**
zKCK8njl-DK-OWy2QS;0L%`X2_v;L783T(<4jf*L-7&$UN+`WJ(e&!BZ2(S3E)cn~|
zd^KG0Y$CEaW7%3Mfr|!kr|*}x|4;m=;Xr$I^l>z)L?t;KnAFd=^uK?c;0#;s(2c(K
zDB(zuh#(@<)S+zgjjGt7_@1lq!T@-?MxYLv=u{P*oVKK!ZYFyzx)79^-ImvH*@-rR
zSd%2)esn~G^@CD*pH#>BC0Yc3)jp&3qEVzVN8)@966eR{A6-13ntenO%GG1=`5M~~
z?`=1Tede^ERnr{X`GEFfGYvSOJxJ@zmfj78OlAXIIxN=S0{%g#$1pW!>P6y)+=n1j
zIL6sLsUD#uQ`7;Tq~7-F5!0v%JvPmpX<-n6m!T@Ps+%!_Mgv_!25~Y!b?BtA9GWg4
zyADwe=OlS9glZ-}MH&Uy(E?Q23IDR=1|H+FC>TykC<VEXOMME;7<svN?XrtWO*S)#
znZ7UBF0|(@(rKpTL|V;w)jy3NA0b0$VR?f)n6dQSNZa{nHUxVt!*WDNKo>Ptde<x9
z8_9ONcroz+uf}(iZBC<c>XL#npm@sx)b21Kf}2t^1RT%}`!@{+{R{FO{eu&p?5+WI
z#hY&?{rCS#Qv9WTABIT5s@43cvy~COK^JuEd>r#Qym|l)VbmQA@MZ#?WmU*6x;!lw
z>yJ4xoBb95kKF@r7t0{hL<mVU)46J20iOIcOoJQrNkjOBWtB8hgAY+7Xfu(E#ta(e
zzGkjY_jvl(&(hOkjhZD%z+dw71k_BZVq!~K%)%rZvG`Dyi!2lY0d6*_(?)~_%urU1
zvRLl6cz&C|emL*j;<q0(RksE8(kY-81q8oqvBcdwMm0V~V>xzA*Z1K?4QHLf!_*;F
z#lgv5D=Rj9r7jcd+};?WD1{5*S}&U1npX6}A_?VyNfez9EzWSk6E1_O7BH?2X~l)}
z)`%kA#4)TlEvO4BQS;z9;?mfB2&82<@4a!I8)lk6I9N5wd;MflutPyXBjg+?84RvW
zjciB?=2WfKZeaFTE!o+?^iQN{Z0|tr>39)t-}^hvdslox$QZj#`9OQvngYP(R-)#D
zSx0c31*41EUi;;i-aD8>&Vg&+9B8`NeVe!yc;g^(OcI*H@#h?+c4%M$;vVtVz<hq>
zyCXgte~3LD0A|>|HA-!tey;2z5<#C%K)*rs%>%I=E+*{YhOa45I%SGPgZ8<cm!;Fc
zWdj{)`)>XlJb9QO22=C8OVwP!AF;^!ps&wJIQf5+u~d6t_fzP9#z*6&L0!6yma!ok
zl`mRRJMSO`f3PL0Nr=GO!~-F|+(tYT>-7?R2g%Y!EH;R~%Vw8m>OIO2X*TonC@C;l
z?R&wjoS9Jy0IuQ!2{rWsGP5&=*H0#7eF1u6Yw?ujG%n&)p|Dd`h3J30Q~!S*M&4rK
zp`X#`|L8Dqxyl^B7kH-~`|u^ruH@D*yNXuWGUY99!+GRvc<5Jm-4XLcuSC2)@n%jY
zIb7-m<Y{<3GO`+hbRlj4N~cQrPLEJr=Ou|KhM3V4A_Y;zVw};6KZH#AGEh*Pb3M5C
z@J2%7|0*)G+o^lhig-na&k&3+xD)}%<8uZnuoRtl0v>{n>vzICE2t!Wij)I$Paj0w
zY$IkWTjq=;vY7&}m(aA>CS!%SJ0yxA5PB^7cVp|aBj>$f&>(CFZ-9U*vuG&|+3whL
zCH-*7HJC-P9%x3rD+ZI7pr?xBT36nnw$=Au7_f$01jbKP#%kj8TX1)LGH6tW3<DR}
zoXGagp|CS_I1n&@Z!-+G8GHrhl#)meDBZMl%ZwGDPO!%asG{uBQ|iRP4wd`86ckd7
zFAsU{`~Sn-?*lTSpQ>&rG#+Y7%+E!TVxkNlJ%1GSs3G=#Ih&Zjeu=PuWfwTAVayj8
zq3TDAn@npVuI5-)BachOgCmsUTR{o0+Qlhw=RhFAvVEnLZ9Hv|eDmc~lP|bD*pil7
zE6L;!(nAF@Pk=~xWn3#oWOOKC1IYCI<@PmIwkHf9F986kv}laeWKg2~zN?;^4Ud@-
z;kHe*3T$JFUnZ$y-~NlXMVeA!W)#AJuNY38J7ZD_e0m{+T$Ao#$s4Vmz7-atDt$+b
zZNb^&?R$pu(M|#6&q6^JDugn-@XU>%O*j^zR;c8G5wsu>CRI-nEf%xBmX0!W->h;0
zH!D*!qWfCE9hBA*Y44vq9FWNhU>ftg9}5#zlG<<belyxxeyn(N{)p^UI}zokHqsfC
z*kFg~ug{dpj<nTXV%^pKPr~WDr_fR-?0%~{DC6m*zegACyq2L%0Q{bWsT*U9UaBgQ
zc!lg&G6+X2S<4rC3Ae0k3YoyBk$RFhaf~f~^QWoQ!C7}PpvoLlq}Q|KEAOOChsmK|
zq?10|kV$=HByRI%g6F>1=<pr%OKOUn9zjhdvz1YB81SoOJ>b{PXRt_a4BhcOFUW&k
z)2D=gt^T#OXnB)KO*rs|U3ui&kE~h!yUAoM-;X<}x87YjsK(_X+&a9m?UC7bSY5B0
z_bKa5gF`OTM9Gyn*tIL10%zC4r2pCWwhoRYu6TXbq8H0Vz)cKoTeqDY-pVz1_n(ui
z&f<(8)<WyfS0&eqQ@*iJk_s^EsM6rDEx-ER71h7m075!;e&)O=f=clw&=CJlN$1hS
zJ-3kZBX<U6|4Q}73&im`Hk5?gf1%vQB$D9kD3gpk%zssqT-;=`D8#o!A8~Wb+U~66
z1MeYx9YgZ^vflWW*DLIWJ_ary(+Qow!C7$onPsF2XMsFA>jH$@625l>6a!j>J)qf<
z$nA2N!2Kkp^GJ*%t`;{&^EO%%5!Ey5gEx{5itUyE*9$Oefijfv-$<t4`1-VCRGZFn
zp~wLuzn11gy*~HJ6D`DC=eOy7_g2!r`D|%$G0o(7z1+N7+F_jtmL!@7=N%vlcM6$9
zi6ERRj4I;(^$&~3R`70D1-UjY`lC2NTS@fj2khpZ8<=QRTjBzTi*r5Ri<x$;wp5%}
z?(=0Wm^oPTmrJ6Bx4a#^fAf;3nf<Qb`$LbTlYNzB3$@?JN2?S#I<O(#p%IHg?$_VX
zC-nOBb0E*$@}bp@LB>PwDWV{x^o&$fg~G6T<aE$^2=TEavG5QW^Kbs#Y~-Zc-8W`*
zB^!`;5E(s<1+-_9b|)*=^tZhOk@lyKFVg%Cn-^+H=0`*~Dpe*!!GCsbwfvRl5v&gI
z@JtU?+oTP@96}`mu$^j-%3@Z$j>VC!ctI#Vxf*dnfi3~82$yFtaqJ(9xR9FN-NKv0
z-~lDw`PixRC|I`2*;sbJ@!a26IBSA_z!QLc@}wM;QZJybqdnN^xjBFJnN{b}Mo*z4
z4#~z#78qq9TTIXJKIeLo_HFWb#p?j!1e<S_CDReA_@clGaemZ;kA6Qeu4R@c>3NH{
zHDpSRbkunkqyzhO@Q&Skfvdya0-f(>=lS#*-jk*MqJo5xgUd<q_N)NVA;X{Fnk-p?
z;U!3}N)n3fI2Cn8&7p?;S587HCsX0&I{9*@+LU>Q;s~HRg=bMg&=m{OU<jSa1p$ah
zr!OMMPwdNr;-)`LV2AR~Rm-N%W*;0@#9uZq$&GK1$5WuB;~d%DD^t=JhFax*Fr7Kv
z1(TO<k52!T%l7YB|D~{=QT@{3x_vqFB;l3N8rj=lW?atMmw)^V5n({mMFe9Re<fp{
zQ2X<Y)F{uU+ipFHAAX6f^ppjSuTHSWm-!KJNCE?3ohV59J;6bE|I_0?&n7|~$%ZJf
zOvJyDV&twUi_&TC+r8b@4(S%&-`|hNz%~8(D-dl`OyhO?gdI-lDYLF?FvB;#fr?m$
z&ay?VON4h1@7G?2Lo6tdngjyL%U#?)eN}x;Ar4~4okvBcyou|!9*1bM@7S#5ItOpA
zYFGKt|I$qT0!t-lrZH&S00Jp7HwfbWN(*kxt|KOZg6{1T>f8cXY1LCiUwy8PfJ!QD
zgPJ(L4W)P(nbZ*MC6^*}>og-E3p<ee$$xO{3T}vT*$lITOI;c?OBJK4vm-6w!BKh+
z#N;lvIq~2AxQdi=u^fGrcu^2kBk}>1LBfS{lB=bNlB;q0$eUEITUVvj{dV}PY#s>*
z11&bEZ3ym8D8d$7fFFf;D`hXC@Ajv$OHVTes(O$hx$;xpLtb!9a^7Gbj2hF1N}X01
zL&N8r(<aYtZelBM7s2#hDHznvWAs16q7iEFgo7%qm?>L?Oj%_%hw*>#gFJ-{F|dfP
zn9gyDll`Q)?tAr4%IbPH$`g62;OG9s$ayad(nFcbKMlZ2g;f}@0gP(H6Rwq;l#~n_
z!pzfP^0-b+a~lEwI=*==46h+<&d`sXM?s+H>>YvP#5;0_;&5r8!{Ivu1Umn9IC#23
z;!H9GpC0QmGKnNw6sbN+;N85qQ_+-f5B-XanYAycX#zg>5{m|?4mKwwXihjNs>>o0
zLn9?;RY#*R$l$O*%u|a`d>t-OYycE)26bUE)Cd80R##v7?y(G#!|vC?0La2O#TI`r
zVm|e;Qa4bX=V|^@p!3%M1phz`6-ZE99+~h-d_)Gf9|UAd`oKqVyE^r76+^`^uU=p7
zB>!yq7&$Xja1lU&-x1gOnczUGimqR}5#W<N^P22;YT586_Wv1hS56NpTfYjZRqH#7
zl@mv0*I)cw*Er6mM|zY@`GY0m%VL$|{0(&x_oGTu(rm%dahQO85+s#uD7aRs&>tq7
z!}11zkaIYYp*?rs*`eF?^^neORN`V~;5NOQd<|xBQ(^r756?pXm*H1|bvQhDP_vk8
zDE#}3W8M%5o~m1?CJM(H1dXe}W6VNm)O3gFX?d>KJFD+)YpDf6#I|p~Kk(qkz*jT>
zf%cQ%(vv@DMl~b^kY2`|0B0k&`3qzOO1(&Oh$Mc$x_XoI@6Fve{?-Qx)vJrilQoDj
z!_wjvj!0hUHqaxvBAaKkUfaAToB-7$v7e0>9tK~hCw6|mrs+9Y@+HWmA~PxkVr)8r
z25h7wx~YkZ2nDllnMzKGIa0|~A`nV`es0IHstHV%gB_yQuR0h-vMJJk|MKixm_BIB
zrlv*-z9{^CpOi0!k`1$^RFoh0?B#dGm6_-f_iR?UL_yTqtisIF{SIKwg3*sX(M1j$
zg4>d%#h96hB#+FFtD#Vn!`~l;gm-IjwW`K)B8CIYhLtPgssg5=?h$6R4vImug&nWz
z>BgM(DwO-0sh&_sFhscy*{F`n;;B?-_`sXh?}V%gaD(Lp*wmiRWe?tkPn*K0-zsCp
zLyAlvpWN;f*13BJ29f%PI5NJ=Gi_GSGgazGq8|R^T!>x?BIXBTz(+jwHjNAv19;EF
zNIO)acO&A?p9`IcYA9*X3~|H%@oWg);HZE~30k0dSz^wAY*XIO0{WZGGb3pdi%cm_
z!?u4XSQ4Jq?-gYJKswj12$D|VNdhPU)FsD}W#}C~LjFp)=&D(7T_euyOm#c;oAlBg
zC@G|G-8GP#)<=Ulp7jgbXGQ!zb3{_UeRhsJwAN2K*u{+l#C^3P(aUM({NF0;64rBt
zbX;#?<i;O+@GJfndy_<l;{`qaBRbR_VGmK2t&)Gc_v>OS&gRT0`_=Rw=`CNmrF4DG
z6eMF!$@B7b7!;p{3#14KT*(vvBt148F(_q}-zwjovK9%Gn|TGzC1-yr?c5~w&DY)f
zK5N{3i3hV7rC><uLLJ~=_cT7emk`Gbe!I?A8Pv~03X$n!w^WC_21Cma3eqXU=>o`3
z^m2(vpbVd(5hqg!-ckBJurBML!UoYP^*$cR6=_L@c|S7?pNp$J^Wlv>RCOCisA)A8
zCL=i|8zatR7C&^i(X-aQP9m$3hP?ApLug(Ct?GiMF5VV2(}V7Hrv7LcGBNBT6T|!2
zx2i4Y)3l$$nl`|i&SZvCAS?TXu!i(x{_uxe-~cPQhX1V4k#@6twB3^bin-&-8A-H3
zfpIWL%(ttuBp{O}$V8qlv<AZq+~vQZ;e3Eh;|kav777QlW@#d+7no_V0|2Qjyi@fC
zk-Bh-G=Lua_>`-ohXSo{sVNMCWFDXHttu`Pdr_67Z6Eesd;F+RZSm%ftrY(+%$EL3
z;?OB)U`dF1VD%+ulE=#Pqrn12a%F+Quq0inSIyISawzYT9wT?!P0XiI(W$BF>Ye;u
z^@Ek_jgh?r#RKQnMS)LA+2C>+E9b=T%6>9`89ET~gHe=oyWV@WgvD8is13Xosw$@p
zVRq7L)S2_@v6@R$HN__K-4#SmlX5dPMmt-T{?}rl4pkarv8?*~BmdS@V8vf>zZQAs
z-*Qds(olwk^Q;!CbFjg8t{2Y-MkGKd%O{P+NX@M-tzY9w8T0pQQP{;0^zit0?X~)^
z`0tWb|E;J#a3a}%hL6HD7|q_YauSYX+!I?K{I%avDlewY<AWZUpT<Pf5ED@`C{rZH
z7?7!R5_FY~qs52fJ$yR$OSpZ4A)RCLmv40^6A!8c{~_K>Avet+h+j`wQ9Ll|8rl2Y
zUNA}lgn*R6oJE__0-x#UvhoFiFIv=KnPjqtVz8DRXOwYy#H`fskEj1Z2WR$!GGITK
zrf#?zi0gpxe-<gQe_1HXtA)Xyjt$4Oy~86>?OP!3*k4dTPaK~KB(~kiEpt=4^~R3}
zKc$fF81a2$SSeaRyAx(tHuU4X9TjqmLsvGc_Gj9S?EAq4;m7kU%zo9TC!7$Y0^M(@
z{dt+E@;E^CB_)mU?Y!*a+Do0KFPW4vcFz=Mb%vxuJ4CbVSDvYnV~in)+Y00o?!isF
z&kCI|Z=Vow&%deq>kc%~=q_Aw|C`i8``Y*>m9D9N0_&r9kEI|@K{!_#&~nFxzQJri
z8b`qsDax(VQuF(v%!8XhegzvPK`hO?D)sJxAh#tI#8RL&EEJCaR6#a422Ak)6o?Lm
zS&TSa8^Qv6Xq{qaIog+ekrfy+#u7*;*RbQE6DoHVI?iWN$rK`mH2fCwMdvYb!0kWs
zol7HiRt0ey1*k1_+~dU#6Ma1`Oo8nE!jlf>c%@SitbFA4zn*JT0T9uAK^>}wky|uf
zfjkaOCLvXC6-dxtb>==Gf6@A&S)CC_AcK~|AhL;8B`iTTDayp}qY^eNZ-C++6;V7W
zV%+KVNZqM=%R$3}b)~b~9^=sbLfF{G5cLRE4GVUNtS0>X^F}dh->xwPF4pqCk35~o
zExB7LthZ{VZB$iJ@<GX%>Ij}SR>Pdt&Xs3>7;(8!GFm4_-XG0jftZ|i3H7)Hf1x!4
zQ_!pLMA)y;$nrIaYu(r8CU}-;vA;3mdM$hBg`r@Q`Di{lP_BBMw;z64UInJZMf>Ti
z)q5;ZHOZZ1Qxl@N7AjlFw2(6Bh&rt-lPn(WmS@<G3~o3c!{D6QJKKt`vfv|N9-_6_
zek=Z?wNC4#OQDk8-bix&zW6O}c5D-<TSYlri+_-mvuD#hPaLnJ7JL-@k*j+Dwp1j!
zzyh0m%)uD7O-eg>;c%DwtO~Lt5}G<X+29y39cQ~L(y2P+iON4>LnFtr2FacFhN>eA
ziwuH|=4-i=lR`M7*Ov_~O*AmdgAwtT*Mx9RpfQnXsw}u20kl7T6bVez($wr9UP`=#
zBIFnwT9%(0-krZF&B0UnJMgiRK7)IqZ`*jxXn%Ff0+d@jRqgOLPxa;(7H$cQ(reUK
z>R}$XeDGIC?sw3e>ZRoeME$kw`?MG(W57N!Gk$m4k)_~+)Tu98RmG<yB)H1g2^9gP
zyTjwyC|A^;8)&l{-dfP<s&)NIC}#<d@D>fMcm$_(<GC}4+t)5fpj7H5h7xKM?q3X0
zU*1ihY&p-JYuXibI39I2m$=!-!*RiUx(1yUjIJV*@SN4zsrpP&YtMzPF?te`#2UQk
zqh<^00u|59YZVVzr2CPVr}m;oN9*e6006ln4g@{IzE@iA34A+56EbPpF_wQbar<=g
zct9Vrd)$i^WQUrrj6_Wc+AJs~-HQt0CrTc{f++Whn2VQ5WfxkTC*+4*X#+Bgn{aD<
z5CS*vr|TT@L`XYJwfl3XNuCNcAHYZ(=9S<uQP1u5OsV{X4qWs<N=)V{@G;!--LF4*
z*{pZv#;}=+yKKByI71_M^?P;fDF80Dj7sxh6$rZNZ`Ks^^jGeKK6p(ud56Fx9}fGY
zF5pLANe?YKQUf(+_e*9Xxx(%*Fu)z}&`sYEKsWtoN>O5*z*@2ew1|A1*?E$8jv7@w
zx^M8^vct^dL*xt4h&_3XcjObdWW(m6+8;2l_Jc78Fb0nSa$viI{GTL?JLXjamVQ{<
zD62UndK!7_YcS47L7SR+Y>>^~N;l9(oT>^W4YljyoJxXA2-HHaB+zEITacG~WQLj%
zlMGsbPFC}IXS(@j6z}mphU0rBFZ}Me-z)@3uw3aNE1um)K>b7C1h@=)w16@}KsWQ+
z3e3JWAv`d1I^kK(Y?+Y~;dJ9`xE<U~EC3V7kJrBj#ob%(x<beFbpsF|ZD6vKHID>l
zl()$vGj>Utp*9>MV+SR=hA+E*`+#djCIxAmlG_#FA$lKqBr)dZfmig81AJ6irg}XI
zh6i#@*?`Pu1ovvPC62-K0^q6h=aLRtP^V6D+FMoW>M*)=;SBtQ^T3O_*990XXxR*#
z$U}Flc>qaJxY=?hSft8I4>=!&0HtmYEyNHR$uYY<XD{u_@?|VL2$hPypMmy=KdFq+
zyY$SktAz6ICl;EnLwOpKf-4Xk{-(cf;k6rwM#;1%8+J^OAf@8;?avPIYEBB2D+)Ar
zaeVZ0krwWA9S5w$`i$~z(67j)CZowqYu`if(e|s*c~bvrlnpY%vVqx!3Kxyf6YsMa
z{a`hgUP715FbQ&eVPBmG2hX6%QP!Mh;Q8+{66H0+xTAhDiQ;PjdnvOZH0h#yme_oO
zIN_{4OvR9H82%QNup8QccgtQ`6*|qaD*rmT!WQt|hVGpzaLXQ;VOO6NQI<~vSWCPD
zEf}4;S7e)%;jgiA#EbyFHa9S7g2o7dXX2Xjj}Bea_bf}N51Tvyv@fdW-+U}qdLv1Z
zuct@n8Bp(6lv8KL(5ZFSVPd$m0`uh@JmD!Rj08V;m|E0&-9_)G&AxKr7xr0XG5~F+
zO0IgQ;=Tz+CT{Iyj$X&j!j;K%8ASpPBp~6Q^Rmo(=C1X7_%~=Ar0&}IYj-Jnj^@8>
zI3(&wbr;nU5htRWb{1N3hnz=`LU}tvA@P_(GA#%;Wc321i@J(p@;W#hN_4{Tpc&Z8
ziV!lNNw%v4r_bPRi!lFX#=#ywhcAS1O^E*zB=!KM-7ASG_U>I75zQ{+Kdo1{*$DjG
zQC%($&3izyRF-V%npUwCV5ra<gp&=WPc|v(&yeZ?+a88?pPv?-Du1St0b{iBgZbK+
zGxC5fT?~D0o*BGyO{1XoltD!0jJN^|zMI+WH}}%hO+B~p%3D$m!<T^UhmIwtA2oMR
z@lFCpSrmi2*_$;TS-)7E@!kX)Bz`J=0f6pt=cJJ^R3C>7hK^y8Tg9k*?R_08v{G%E
zVA_#mo%#&+=@F3&E`0ymDmSz5WZic#_M*x*D}#dj9DpTJCO=WW9+e?Ix6@e|nQT;K
zGM0zh*$Ac#<uC9l;4VsflmqVN3`4kApf?*Je8MFhIan`5+3NP+i*7IS?Op5pEkd<>
zXM7`1CL)eF*x;>bNy$jK|49GlS+w*uugf0aigu|OQ~dU0?tF0k?oIs>T6n|01X?_m
zUtT_9%$`ShIxN8+HQ*EQSzRleen<%5+-wl!|Fx5XxKl5}5m@mhKv&W+Y_0Sst72&*
zI{8Qv`<!(FTBQofDE~}FHGoS=_zUDnTd0R2t;2`|v67;Cd{a7Awuf+sJ6@P7lK_7!
zn)4{4%?ZeR<`KA2w$9K|&kBjU^p5!X=wq||a>WEXN<Cb1EQv58zE|dCsQr^6rk~y>
z-0TBiO4fmLm#<ZpX4L+3UAo_q6CvM6f9E?`g3cZTlSF*!E^B--0{h{Z@5N9=@6)~_
zju%E{8YU(S0IiGsgg?FAm^BmhD#4|gnq(WFGO`|P;Ml4E6p6zXag<(JW4TW;ss&*&
zvXk;B*h|3jflGmYR?z^*R1eK#y$WSub62k*cP4;yP_hh9B_Og);dMPYU;<q{N7efQ
zb|iL-u;V}a4ulmE`GXCWt^uRw=Ih|y4uxBwHH2^Nju8?%<1!xMD}yK6V+y(zHeO@e
zGVa)f+&G;>h`{{j&$E{zDoF_KVxV_&cl#<3lLH1A6P#Gbnx=VpfA78bz%e+S6}k$1
zS=%4t_&j3t)&5jKA1)PBd*SW>eA%DiGW<XcKcz&_(!5p}bA>B#4KiF-{iAs*w+nLH
z&z;1HgO}isAvU@R%<Dc@F7U!nYhhh!^dpHe%n9h@;HP*7V@vJ^T!QoGXJz$O9=M*^
zCp+CQ5w$-F*4bNmNY=pgzxvjY`6F~9Ru^L4z5F}Zg{XqV5{zLC%$UMN$b4X&1=9*6
z0$sF+YHpw|yu)WutW^axOsR2kA@Rf2fpdk8hcWD+C$MSdOuui%O^c%VGFxfl%r~)p
z<^_0o&1^-*pB%}7sLO+*u1NwkaCn{l1aIf0qlSW=m9s_jJYbv^wY&yU)Did`Zl_$=
zx<kMaPCti97Ws^><W*3S*jQtX)g$6p0~SC&*>r2#Bn}Ryy14Rtm6`RCfE3XnNx-G|
zaNUj{haRHjH^yN~`uFkSHTORjiP+5j>3~dpLnN-`>m$QdJ}YVGUJnSf^JDSa!!ni!
zi{~U-CJy$PeC=)7FwR$@K`CMMZPV!ImG{2$0w9WN0?6)MjbeZ7UYAw=`&gFrP|-r-
z18YEIKDVSL(3;OzR1x&Ud;{OIU&_JNUwY*k2({-K!L|vD?!!;G1tt!M<Du#JbtnWR
z!06h$vvJhc(Y@9Qxp~X1p+n54-N^BTH`I@RKuRc04E*H$*GJ|SI7dB%F*bM4%j@5*
zwDXehhQlJ-b%gY4M0_aaT_zZ)wh*9O!Ta=MgQ5B3R$P!1ejCC|pqYQ<*Y9J0*S)?^
z-S24=r`u}3@O4U=P`h!pUDc)@g?u)6e9P@%+_7;lf8v;{qLD{O`ec|Wn`U+7+KIkF
zvu=2JtAFgViyPu4KF^*q#7|J*=9X#?j$?Kp7@Y$V`V+%o=9qe`OC_N$xNDqhpOjO3
z+xM{JZI~^&wKNIJZ;2{udVwwnd$mxo7Nlv?uO%kuQ@=SKJKo`b0ng&L1Fv{Cshv?`
z@ZSS&4X#YR`3=mqFl8Y%iZY$?F^jb4B*bDhKo{CS4Q`7oL&2|uN$k~;*T=pcHk$mK
zGYQ-^571Il>^H*mt$NsX_`bcR<mcwD$VRrNTTEs2(8s*Wu|7UkmI)AYMrVjJaA(ug
z0USQxC-FLXhZK}aFl44sRL%8Q=1msMBPabtyTB>PguyX_8DJ~s6gPPtGW1iPyJlyh
zHOG@&<iIDe-FMWA$k_v+kw@jF+nYEbA1i)}+Bpsa);_4$1QY!iRSj&Z-7+9qXBG%X
zQ<WEsHKE)8n`aqR0UNH<8>$K4fc`xR><wlxXZe=Ct)S<#zanlC%HU4Loq9?6_J;-a
z5#yfad969#Pb$!F^|X-Gv<@z-_1K6!uJ95xIF#;xdLhDjWA4x>yR2PXX(a<>#Z@vL
zsNA2O=iZpvXO#x=4}HEz`pKif+iw{=5$pL2g$2WD4?^w!Ae5C$0F$9Mzda@+00I`^
zXzn3nId`@4R$S%MgULZ~VsNiRHQCknn4wk+6MqHz7S&$R1i?6=tTA`>L!*Pw)2Dof
zj7im6f1Qpxd+)QcAe);s5v$w3`?-;$uUQW?(4sR5&_ME~C^EIzGvL!PIV(IxTB?7L
ztK0qd{0^W%2Sb1n91dLNOio*KL5Ifd#StmV^bV1d^Xy6MxsxNZI5n^V@5f0_>>7qI
zrvfi24UV#8TDm#w9`-h#Z<4y3cZFjN?i>y?I3!#Tqi1a9BXupf``hX~%ZLDueBFY&
zf&tnWFsYZ2>+i#=zX)%*Q0O&y`sb=tnBAu(`JTo?CdSA4-|Av58{TS6@+1#u$+DJX
zBzSy7j)j9e&Bj6$gUhh%Nvxg@XOWy9iYwcw|Aq)rbwk6nA3%tTq04BiwOQqz?~1Cc
zVFIYGvNOQ2dl&zAhoVkC>5#e+6Ybn$&ICEe(Xe<bIzpx6P<*73%iF&YX@|3a4thHC
zrTrgorjt9Uw=OTTDIG_hL-~e9;v8u{)Jqq-Y?|-s6?Mp~wW5u`a3awl>e}ZYk?l5r
zwMtl)wD3qYoQ!X~U=Ee)_=D%?c0)sd9U=0ah{K!HX&di?#Q>9b7-~N{?IH3pqqdX5
z|2w#LYs$d^l2mhr#SspH>twvvF!opMp|iFXx>we6`Doz5=2`u<V!O1J-C`fBv<*^w
z&G8k*fU7dDJ;Me=s7OyV07N}f$SDRwZD$s>$zucv`H-FC{m(7}G>ND-`8J&Y!v|;S
z!_g_st9ZW7Y&Mp93U6<C1M>`4McRS)7h#5#;CBqZ(GtsVTVYu=)7?doYCfyq!;|l1
z@Ga))*zRAdKFQVhu@BysirWdVo#hd=qq2bnHP6vi0xnE;XKuv%3l|+_y~qxhrSkUQ
zI52+-pDgulTZ|cvo#sY2a8v@lz@`%}s=e1v^lz|1VEc)nN|~Ebn+;sJ$G5EP^ZmbG
z0N9tCHRKM*m&|d%L3;QSVG%m^lNLfs8nC#_$30cQ{0NKxa)ZySr#NrW>H|x`H)0fv
z<a9SHULY3^oW+*&(yl4tkvoy7Z=k&ae<U%+Fib#u(t~|C)D)N_lO%-7FEM1Zk9>jr
z0R35NL-iFEj}?C>#F2^<V8N6O-8DZut}*~OVb6fGRBtu3JjEgz?544j)i;d1oi+S)
zqgT*jBzj8C7Xj3~iKQGEE$GD}B9-*X5o?A^0TajCjjnuN$}rKO+o!>be~lXmqoX_T
z*<fx#I8zLyY0-2;UZyJ>0sQ;t;IBmin8rN!LopJa;O{KfSjkB`X+@_3*X+DAQyC3J
zUApTxz)(TT=W!m0YP(U0`ae+AuXzenhVaFxs-_5X94j1kgr~B_P*Meoj%OL!>|-3S
z-GWZyoS?atbw&_t?|B_gb-67ceZcSv{J+arm~p_PzHtx`%Lq4cC4bTlf{#8Q-2L?A
z=3SXOQP9(y0UAL2+<4^DoWT`8xPx-tv>-jTtM~rAy>q9n%mbz5Th+iHG=xi+KQpGU
zh+aEosl{Edh&8q^j~)M?2_IBMWnABN{Q^$FJY9d6<aV?3*SBh+Oco**4fQl+BLLhI
z!{ysW0)0f#3aQXh=S4A7=Gv3!bo_P?yYN-ek9l&8ARsbU{0oRe_W0=|r#O^TvlC!R
zcE#5h_|Jd1JF>dHSl;Mncqg!kup-pnQvaG|09|<!m0WsI)h$M;VctWY)9X||ETnp*
zuO1T=cPhJ6JU{X{?XivW<-~y>&GFBFVM&VU#GQsXQgsFyuw6_qiX=ZoU$WnEZJ%xY
zT$s$DS1c}`d_wGa-_Qn8z4;=CVey#NyXzwDPJ8>9FwyCdgyc@m1|#DiHy8Xg6ssCi
zZs$toFHd8Ft-@|x@-7^|y_j2kR+K8$^&z#MC1n$>LRiAv(sI!^gQtH6f#j-PIQPIq
z8zcEltLc{YSHgS)iIz#r<sx~^4+`)14llyuRr$PamsCm(il*{{i>3(gzGvloFJuqv
z^*-}B@D-&1X{yGJk${iM7f|(DxW}bgZIgRWzG1z`@O8Mh63O1X%@KIWqCfc_WdH{A
zg2ksp-oZ#jMMWfTxJ;JuiT#}gBeA{fFFN=MM?eKBc$p%CGa5)w$~Iwtm6Yvm?RNIn
zYsMD?ZapUa{VjD{G!dB)S@=BN<R|XMz--p*o5XfN?)WqteHER)+GTL1FJ*F=ZGlw0
zU)OwOl{nt0_9k`i!D^xLIYkd0*AcRA=@HXaV7BKyPo47;QjgY8`+ckXVe&pVfy27=
zyW+*SKS?o5hdEyvi8Ngp`*X8E!{pk9*x8&-hOUp3w*`~estR5voWR&|#|cP<6(CJz
zO0mO5gc+q18P3{HdPpan5-0PU`&9FqaUZXTLx;vG1Vg6ZaU2ED?Zu10Z!~V++-f}7
zRP^^=5z*YHYyWhIyT7aMJqJdv)+piPQ_jV3(cbWzZ{seicM_NuN`~aE-gUv`NN>{Y
z(K~Mu!_>OpwvJ&3aSdUH&q5Mz!?ev*wGa>fY61GA9bj-&nzim&C0Oimd*!;e@cnOm
zXN63T1(0bpuRaMIQ<n=9{YL9WsyLCojatf8M>x!<^fpErp@qmt!HCCVZkQT8pqYI1
z7~R1mQg;=Mb?;h2-68YgTtn+?*lowGo}OW5|5XVq?z)Oz{+9DV)jROg)rZYTmej^=
z#U3(CZ4S|MQ(&*nlI<}QG1Q{Lr*RvGtS7w!PgtT&9xd$@CfYAW2oP#>GI%(uq-F;#
zC{pK5G_;-D;P^aHZdp;WyFP56U3zo#fD>aEhFk+2qMN$HD}lojKz6mZhA&^f8!Wtg
zNx0?tx1cyI4@URYH(ooJ4dwdSET7X=?Kr9mmbKkit}UCUoJ)W&BJyGc`ANAQ8d_aG
z5uxK^ag6!YQ`x;6ZK7|E^AN#Xy<cSswS`;{yq0vjMAmly3RzC)td2_`?3!6{6654R
z=Eo?7GJw&+F<u08pJPeWp?2^qgov*l+3~uVP=7F23tn`Bo{ODr^xZtyBSzA|Xj*bk
zz4bOM7$J|$M>E!5jTugfI8fKKp7sjJ_D&7ojX|$_?wsPVn9}Q)&ITeR?Ij~}3Solr
zSdx*|N4KR_%C@_$j^}b~OSspYR*e@OXQC(kGDFGj%QXp8J)$%XLQ{)aB-NGZW(t_X
z;*Aqc^KV>NgBvR=CdV6C`W(*Z>X9Dc+3ON3&>Pxq#_}1Y5?hZlO-Ut+!LepHx3IFc
zlcRR9eQkX9r{C5uQsYCI$IeSo>RMhYxxC3#f+fE<Q9a*k)U13M)8U0;h)<K;+Mk<C
z^v+2w;j*39ox<)JAqJ<1zkv%`{E+S`<9V&LT(?OVIFYFpa1P#2U)bL{E?;3*h<$u<
zt!qU&I<nmXUN7SzCFp^Uo6Yfd^?3!)zqz>X{nOKB-Q2VR{3CTSN3nLC4Q-OOs~gR^
zej5q?U*g3vJuRZF32lG7o9gSu4`7mn6%4YF*rch{{RG*ib3*^Pv3aIj&{KnF!}>q`
zdf27aF+Do4AL7D-(a?QTM(%!H)UHkXN8qg<cESEjla1|xMIkSgA4BJ>W2*4gbYAP{
z*JY(XC^nOgc|MMd*>F@L($>HK`3tK9Vq-B8!FujBE_?5OQ(`)fJ*56Dt(TFTFx6i@
zn&|}#@f}`7i!dlReDACd-Xsn_x+H8N7yV!xj4<`dFMjSaZWtVOrFohBX&K9!1<}rx
z&a2<DWDT-o)WW$0*~t1;8OsAc!hI0kSuRp+mR)z(qQ!1!{m`C;0OpwT-fiFeF_{Dg
zQzx%hFne|Tx8~50%|09W)6kE(^N>1(qu%9|Cv6gp%~Y6bNVHpZqX1Dj!Qy*RaS;tB
z>$TNUhL0~o8p?gNLT{-jeod+lJhsz8@GokSeoGUpEZUuW6h;W+diqpp12J}1k{4AT
z3Pue*eFIk{Uab*S&88*6fJ_hXUjwrK=K{SqRW%R7GyIiyO)#nJ@N~j&2aMbo=E9dC
zI4s_<Z_oL84Ac5v(otA~H2Pb3!nn1uc8jzSgD53&m94#txlrgn#?JOBba(dP4cTyV
zo7?jG6USeP)t8l@DnGOkIc_Ehgp(UNI=d7MrJR=`WVrQ5h_0?E=xC(c+KG_nmoQjP
zvo82o?4J6tJ)g3BKmGoVJ#AmMJKj4%QG}S{Tfm4Xx7m<Kh=sH<uWBx&7Gzk^VsOq6
zsXs<F-GqV0^^gdId0Hm?{X{SCZ=Ru(uEX?P73<8F3TTb&m`ANGi&ClSW@2_a&}Fhp
zAgB**_r3!epQIp&O8pC>XSl5ulh<uz8&e`qqW1x%3AH&2+6QENzW$hek)gOZ<6r1~
z{F)jDlU1HhoG`(-qLKr4$eB+Nj<r_n(enh_&sk&H##2VAyk0pOmt#H6g`|}+Jy+1N
z6+<^@yhN?FK9LQuadGFR^oDmY(`))w)o2J%8eW`G5#$cobyei==s5?KN)Y7JcrT;5
zAj@gp;)-UvawQ|I>S;`BLj(gFY$K0ylT(pqf=A}0vNVPAR6|{nz1Jm&TCHIWfv)j4
z-fiY$15xi2oP`DC?wzfv(_gsKM%b<_SAK>#t}H@%Op%v?eE1JH`LI&bJGCdAUaYQ3
zRgur(&);!@wl1IOYZ~bjDgcVzUNBnDnUD{gCN~FlsTf-jU?frNCN6|h;rx#?8<+Dh
z=lg$Fap?^KJYGa@TCl441;VF_EyhkL?mS2OF$0Nr6P7BaN=);zc6k&kVs=!9e_rc_
z4qXw=41pn;mGE(=&tT?96j@@mN6S@sgGGWnAT#3DoXMB+mzmQlwg*qc{4QUu-s`QF
z+z$P)y+`E4ff+r7OeMMju=p*Mt3erIE^fUEY;HN)J4!PTOv?u@!^Qo<00n`l0B_Na
zh(A!H&SWMii|`Ylgyom)zLXwM)*P&j+^3BYP={?!Hu7!2-ls)?8|gI!SA`QojRWP3
z13$Wop08Ez55yS%FdfX_5AD6#F(g9FM3CBmet`4&ht#(#E`Pn_#Q7-B?BD^LfMGn_
zs!l?Ru~v|ape@{v;vS5hNZj)gx3tg1P#`4uE0F*gdox%hUjHw|%Sx*VtzD@P%Qk9)
z%VkcNss_=E|GEEL?bIi?EE;3ISS%>ZPk=}NIJ0~|VTEx#uWe50O}~NdX{SX?XDyh=
z0tt;hCfl0`W01})&1Ce@>?hW8*yJw64s799+7-7|F$PLwroNR`B3*kF(1qM5Md3Ks
zi7gCx3)<Sss!3fDwG)<_YlWksBhstuxO{5DEfL<DC0!wu{J_d5N*y7@dwcJO&YAaM
zmiu+G@tFK{KG<Rt^*_C=XojH(nQs<;2=n>E!rYXesoq=JuQ5K1xp$j50XM#Vqn8ac
zdJiy|`j!=>PhrPXR|4a9nO{V{DXDxdl|FU7fJpcL1yok>Kwx(XtG%>&0mg|%Bw-(0
z^q914J>y)CPBP8kx{=Q4ZQC=G=Bm}}{dG)A_rzPhqvHD#Kz6!N4JkvOIY?40W;*++
z^AJNs(rSukRkYccACo8Qi(wiRE1(W%lj?V{MC@kZ$8b+n_WA;2#(Lw}#+^bQovobS
z>WhL?>*s;?>Z^2TkW}ul9UXS;K9z`duIa_GZv&6;m=#)jwMgvJW19S5s<!=Ywyymf
zS?_?-O`T#OeOJ*sm*?4dxI)tf99C0uF+1<(j#Psd9-GtH=5lWB;<|$^Ax2{G{X^|(
zm|FK(5eV<cA{eFHhdJrpqO}KEzXAVf2ieEweVfRN4by@(F{Z~%Os^%DDtj}zxsfLp
z<KEJm%EX3yUJ{QAOu5<DlkY_`dT(=|G^VbP6~v#MOtPVy`6$4S>yZGz-_(92Aag-x
zeL$9-R7e}saYF)5?GhnG=BG!f8zE4>_`)Cn4K{06W-OBY2i;IS-^H++KlRA`pd1M?
z>%QaR%7NwQP&x=9$Q0pUmGq=tRQEV6e|J&Ia}+T?*F}h}j&l9UMXb`rU;`Nss(f3|
zOWnC9m*_Tz2~uC9n^N#)^r4^6#La{BC_mM%1f1e4_DQIx#}m+X3Hta(*pGAkUqKya
z^=d%sBO*SfHv%F~s<mzfDXF!lb$Vx87@0PmS@iz;mj%E5-9<0qkY2A_5J2@oE2LMs
ztl#h5?p^SV*`MC*k^O0qm;EGD2!nlZNs{m~Dhor5k<k81S=@LUP+ysgtCgGOF1F@W
z{oXF)AaQ&d^WhFsIEXiikB~WcwGq4b^ktRD)@<ZT&1?DCq+W&7SJrD>9+ZFQoYfi)
z{s*w?J{uOb9ZZ>IkCqeU=_q>s{3!PKv4*zdx*wByB|=8=m{ipWcul*Y&lN|2DKdo#
zK1GRatG3Baj(er`K~SFz7L+7F#+akvNarbMGX>95xE?0_nbxbuG-1O)x)o9Kk4iCf
zvUbAJ&mnT&?YYzpvJ38~N|*aND|Q+5BgTddEaLkzA+>wmA&K+q$?6OO@Hw)>@dct+
z+G{e*5~W%vY<W|je;T!+lWI&$_;RjR8u?CF-#sNnCGy8TcR0lz?tWW_n={mzu!CFr
zp;-%7SR}egroycI4sLMv^$PdnQ}bp$>y6bXkxl+a_)*R_YDc3#?XD4*I1IshLgWl<
zAM)N!=tITpS!L+uOF52lr$C0v4jDIi(}+cu_M`4}%2JE)yW1|DO6m0TTA~DppoNS|
z5Hey|=5uDr;CM(2ltKFhkN)$GD7SK7S>D8IP}ga7XS0AV5<GdlqenX|$^KbIbJ}qG
zO17^;G`Zxm8!?UwtikO4?Qeg=g9GO7CY10uhHi6T#@^r8oQHKj`;92oB}$V;m-GfE
zN(zde-{~GuY)AP$UrQGKoBx(s(lf7Mo&1TO8y07l6H8Nf<;urnAy=7Ft*@qA36zQi
zn>4<O>H<VN(4%L4?5~nKYK}Nl@i1P-qwOX%FlqM=T{-0$bHY`z`Avg$cNZ~+3x3ac
z&a0IKm@(6X2lc;l=*=_Vj$On4!5IX`!RfmfLZalrN9WtMdUuQ4XXxTZdAi^4NX1>~
z4qn^|j}ImD6`5#@{!sWwa)c@CwOP&p&H0jJuC0fAzCo^vh*%5AGzz44_PLOH()~Q-
zN-F!60olCZV=kUvd`xz)(59b8?$Xq&Qw^K6g45pHnn{h%En|SLnjwW%kMIH%0L@c`
zTz1)zF$O#I9&z=lG8PBO-3X5w=zONHdBgvu8|8=|;E<Jy6eWF6QIEU}ScqQd@g8hD
zb4RT?QU=@ZD^aG`o5O`Lrp_m3715Z!`_wa!6O`LYs#F<6UbkkI&&_#jZ_*a`Ub>s3
zooXBNA<g+*MjB04bg#g2{|Yzt2{ab=`n!cQ;@4(u8c5<Z*B>nI=h=-7$ey)?0HPw?
zQ`deJql^Ejptxt@q$T5QhV~yN5A*pI-J!$q&Y+e%kLU3N)d{D)YqnUzj{&fSg%-n!
z{srbSsPC4BSXUe(RiOx)tee>EaUGAuQ&<SKv1{;=+G3ce*&VP>qN!iGCwA_q8UZGL
zOyD!W{rryQ?m1Y%eFVVitdE#xoH8a69zN@h!Dd(;m9!&KYJ`0vH|2c^C->3J>)TnL
zSp|PEu%=%ql)~SsX|`0EL{Os(qQ}8VixpI-hsYoWk)h?sWVy+uZhghe5FIe>uigXG
z$38q9>*-4Fo)*e%hQ|z-O$o3?Ry-rROyZ7oO6qf>b~=J>(FjzZNbB>qHOMNZP<|I2
zW^(8^V0(-8Nmq9(|Ce+!GiM+U3U?I!G3&@Rk=OU$%vDK(jk^usbIUa@f<*WL?*Jwd
zm2QxxqTowX+wIe;XMO?oC&7`_&M3{EtfT{FwS(Mueg|>=&f|>OCs6bX8HTNx_ptxY
zi}`Jm(7q{L8kGsKaZu?8{FPct{>VJwTRu)I!OdtnZG?qgyVA9RzNLcyR=)MAmI)`H
zM@Dwyb`haBFySw?CgA;oK!)9{R$B%BB4YQ?t*O!m!{tZQr#b{Gi|)9Sd6jWT1HC^i
zfwpc8S}zIqv;e=uN06fi+-E5)XFT#8JW3@r^Ip#eA9tX|q#`uf_;)o&8iS!ScWm(h
zLDT1AxdtlV*m&tGyZM1^P5uHs9HOD{;9BCPZN0Ah_6~0t-$QoOcZj!#UF@5Ey%Xfk
z0)P-^<!=VRP<e22vT8VGa;}-fdTLUX%SwwofdBbNssFq3u4g=B-nc4uzad<>q{+Fq
z-n?>;?GOe_1ha8m_C7!{hwB%Uo-#;~+wM5@k%VDfU-;c5A*0eM-smhn`AeF%3f4V@
za<(UDeV40quZ6|0PG1xS4M(0XO&y39A=OIm<2g;bi{2VpO!)gUuBV!}*z8-b*!(?4
z{<K)fb4_5Mlz+o9_CMF7;~A53{t_K#R0%D_Z4?OaJt-I6x3>8jJ&^1l0(spb!BGt}
zQ)YEk(e4DN+i}hxw{v|X2dk;!bmdX_rI_Z+({8J*{=JgaEMyWCmIdS8`&3mb(KbJE
zqNkudp#zu#_MpW?RJjbai|l0w`Fk9u$K?A5|8S$Ttd5_?bM`H%xG6)m3ghBA7>|>A
z0@tU(-<j@l1-4CkC4g}VF@G>(cr#p0paBdrSy3T1KfMQP51mc@1+Z5tQD(l~b$v1d
z9*0j8@`V`@FY>~Z{!rlme-$(_X18vbxf<*8x_~X|r%FA~kD&WU$S_9SanGffRaMAK
zA&+kg6C3@u?vU@~Z=q-12fm2)4T^CsdXK!JGA|7H2r({gto8{o6gD>(${s64JI(QT
z1YQ{(C?_d@?{=2`J3WAG$4R4j(t1LS8Gd+-Zaf<_@292fXS5QUdO%s1hbg)!)>$s~
zImnbT>Vr>97Ds9;0!piVfK;AAVRJ2nS&t901eQAM83enu2eHm$KnB3pwY4zF<rM4=
z50FO?43r(5m5Cv*c6XdJdHch3J9SXM@p-n1KAoaIrsgerlt-zN0lMq3v~qHjR};?A
zk-KAzPQ(eU+peGH6t^S6zP0E{q`p`8uaY2>f2HSb%Q8dBq4y#$*dl`mAN$0m=B`3*
zDoQTq78D`K+YzV^rMANC76}2PtC05awL2jd&8FkTwh-Of@hMvl>lk)3vEs_WtIDEm
zdi1^nHr?u#Z?g5}RZ&YuoYbIOPa@}qI0VWal`Pk;Y_;#`{!07levZEXkWwo|g*)R|
zz(j#`v~&>ooanH%rN9Wn7wzqU1fm5LiVFb`5+?QdRKut4sVQr0tfs5<TSlfn*K|6i
zQ+#yw3atx7+QS7zMp;0`G6ktV|K$YBYU^$5ML}WfB$ObF%C>g6rOp-_%+ja?7=F-l
zwk&(`D#Qt;BYqD6i4^|_iR?6Ba1RkYVA^5FrN^@sUhc*jgy}qElWc4~jLChj^&my#
zWyoTkPm8wCt(y&!YJO2`4|8wqjJKwiUdALsK6wX_Kn>_UdAgLl2ocmtM?7M$ZffY<
zKmEp#1|HoL^Gi^oORgIzci#8@YP3`J+kwp0Q}+4JcLfH&c9>5(EDvrCc5d>~GC#w=
z@P<J(@DwRU<TtXGUJi!Ek3XPSvgeB)W!vn^Ov>(-z7=rI_0-054<SbVP(8P6N1RF{
zQI7fZI>grf8`x+=zc@1Bt|RzeGWE0?CF<O#u}a-4SJYC;E}PGpNF4Z@I3X}1q<#6v
zwM+m5&hDTn{FTBanIjS5`0U2JVjDvzYFxjx^pr{0Q`+j=F3T4$&$fg=;Yi?d5Nd;*
zKE{sgyU4$CxlqxwyZ2Ozb$jDq(p#8&=YVC3fsH4-m+IneyC!-j8U|X5(qzTK5vM*A
z#Qp{Ubm*bTxMpc@Y6eDZ{2=**+<Rd3F#>Ax;)2a32vI$_|8xeXLhi#IPN+Cysi<Pn
z&lBYN*1~1sm9^z9%xEzm-PYo_$oiBO+jXDQj$H&oAEvX)gQURjP1hk)X;9V4x5gZc
zT<=~acGi*?cSTQI1-b&s#PggGUfrcEJ&LU@gmT#eB_g{B#5q&y2gc>mm!6qU`DA7S
zGt~ufeV6zrqvyCo6~R}^U&R@~_?=af=_Ac)2g1>lkc<o}CAOJkbA!WJ2!F#TELc78
zTRy!RG=QLJF;mz`LpS;cL<>gOH2w$?46X^~yi@{ouC2`%B*sd&t@#=M5EMbtxo~me
zu%E_K_tS*&!wMZd(hrk4yWv?5APyx^NxF_cRpg4fTgb{+b^8o&<QP#oM5s3olwzwN
zaz!T23P86S&pX@+Na*z@m!hfPotskbGH|NadRnT7!JNhajlnS&CuM?1U%oCE^>eYv
zDm$YuD>Yeb<S2l_R$9G^{kNPgls>6KaH8@A8(J@L67{P_1mJUd3+W^}<E;XbYlblV
zZdEmvOddWqxghL$s1ISko+Aj*Q;Ad*cyPb4oJcmk1Eou&+F8%>QDa0rnK%>91mZtq
zT>eI*(C0KEg%bH0J1Wz@OU-|RvMfivzrs;TK(Ya6929O?<A)hpO3~D%I`fAb3C})-
zOFLy0ufSM+Ocjnv>Pu8L>JmYX_P}K3E4{6~IShry32X9)+}ORL5kF<AHji<5-<T!)
zO=v<0uu<6bh4jB&AL35K$;b;HbEEEQ0k9nQbnUo4B0h^1c{Q!`+{)YA^Tr7R_=$nk
zYMytrHM+Q+{E{D|!~qd0;tyO43~q4i#8ktsLy$<*7TXmdU3<<F%|J~WThEzY=G9&%
zo2n2d>SuM;?zrmr`Yc&aI|>fTQUjNtb+D5+L|*uRP;l?D5VUQAf9Mwi$)%r+gHsl=
zT7+ff`BbuCkVM9p`eAw(XT&zsqN8mTpfi_Jatw|XwJFHt`7b5-@6!=fH!3ETgMRiV
zm%#m^*fVOC^FsUR&8lGFusqI-!1-jYEMga-@6wr4+|dVf-(NU5Y2&pS7CwLl#mC5A
zL%SxvAg6u+XbE=l^8e%NEd#RZmiOUJiHL%Vf|8;LqJ(s}l!TOpNK1!=D2*ucC@Cli
zNH<EiNGJj#DIrKJ-QD%hx_Qp;ocI4pKj_}~UTe+FHP>7-3nH3o?2{UeHsbPKY5ilE
znk9~)xrqpx4gVE+$Q6iQrgEHT2(1@8_7*t-LN8TC<_E!yPZj|&EYqjuCnTGXYgP$7
z8%Wm*>^)*#*f<gyarkNCqDy*n;csH6yNJO$bGQR^?ayDRCmBAsho2&S_99BpGYbhL
zkAu{uj><)B#bS;_;w4&kC1fx|g5sC046<k=qyer`T@1Bn6hLqEt6_-yqk9!JH9U3$
z&ugcXzxZ`&EdJIb7dnLhsNgd{UhRLh06<Y~gQQ-*{oHlPSdx?8NK#0{(Ir5qw%|DK
z)HYt<Pwo3!t(keDxaWC9$!n50hme=51!o1QK5v8u)jVcyedr1p>;g+ZBwYf3e?BSK
zV(IZuJwjI+ndM7MfI|)CYo_=r3ynG~_Twn)LU}gcZFG=`TOs8$V?`+!ZJl%wT&lNn
z+q14m;^vn%OmZ~j<$yVbSx@1H!xgHN(PKtG8}WHj@uHXqn8@f3rBQi~7lAsfPnp3G
zA$-=0l**0-pU5b-PmIn3jN<ts35GyXzq-)++{{0E+N+-(%Czh%ZjV8)4L!JO0TMR;
zn=9WumDmH=C8u@nL^TDJ^0j5(n`BttAGq$B`ePQ~>oQYlUi3v{uE(sbO?Cdau*eyx
zDmGc&cG)u7E<V7%ql=u5BNmWl9wnRtF<o<^P|<82ltj<R`Dqx(vA%tC!b}>v+#Uh7
zAzwNll3F33Vy~j2qlqVZ?5t7qX{VsLb}-n^jbmc>i9ZFWy&>+I_}ViFY)4`dtV`>~
z`XrqVl2Ww>h+uss#MJNu%0hbQjey;`O5u0K%m;|vneUwdBDOI#xcTJo`gm|$7PLw1
z`G-Wv^L3>_L9>rj?iBojs{T<C9Osyemc8j=)_C1N(r}bBcAh3xu6^^ozy~)SXkUnU
zbAwUOeBCgMoL707OJMG4ip!U@(i*6t`kXG1;|$O)@n~gk{dN$&UXol2+jj5_%a=&h
zB8+sCY3Cq}%%Osp5hBuzxwtKqe7$W%3#Ij4EwA=>X@2#rzqJ88T7`EpbSY)`trO?i
z0AdVNXj&zaS1>t3#|HuJ;}3YBtOzgAs_FD1wP$z3KJNJ^4U%ja*^E-g<gEr9ol_Hl
zSWcm~QdfxZVXXSA!@O_f1@Tq>sp&4=;;H={%3JVjFK3<MKh(<4RIK&*uO2NIH^OqR
zT6$*(3qQneqUsU&k0j#+hjdz@;sy<yKH6jKk}{_g$96m_+Xr{w?p9YWD{brT{H)yX
z+LHl5MI=6%E1R6t8%V0yz8d`cgCt$1Tzx73(|&|$f$extsmJBu;}PhFE76pmhZ$hh
z!`J?hKi%o*A61*%Sx%32V5YM8>k3yT3FCap1Mnp<X5esrl3R$_2=jfY3>tD#nZ*Gm
zP<;Ej|GO1#ML*BE?1B7u-W*rtvrzps6`(_1aqw&Mbm)wB&~{5c%<JAU*8+s@=fg(h
zku}<7Z%#?n56>-Kn;YNhATUM|T{{TZd+t@v1eG}+8=KoD@w6X;gYGsGMUD|A!hMe@
ze)E@WRU3}z_zxQQ(W*(ni3+lV0<~(CB4TLkiUKctD+TQk!-ja=Zj0?(lz(HSK*DRl
z045e()^Md%jRFBxRa7hnHv?c_#2Oy}mCmwFAqlTt;xV&#-RcfKY#Sz~U6#~rt(O6m
zWHtu4yd>p&sYap3`9XbYReV>J;a4;&sc?I^tqjhIbM&E+M*1(y!8u((&S~h%!PTOK
zip*awoMu{gGz$wVH7Dn7ib)(poaCJa*$*pid6{e@8^m#Aw-QIRq9ofnAa?}Rr|K7e
zuJt(;xF6pch-2S<BF)GMF~>v5-2t<3otgTw6|XPwD|v2gk=kB|0Nsq!L`p+I&MfR~
zK1H!Wpk{<lo`wz@WTfhsEh_Y4u6{6Xe_$_gZ<4^8Oc-P!bbqxY-7a()(KD&6t~IQn
z1XofFm)K(q6!q6w?4ecWCoOr8f7FFOjQ4v}+~X|ZdAce%z_qd8F5ubJW8_x+?Q*Hs
z3*##UtqJ4q!B5YA=lpx=5%nrf=HB`<tK-5?;Z^pJOFz8!Ls20Wr3XU`9`9*10k%p8
z8z(%5#c(R^WNy9IDb{-2H8ApChMBQZ2W?MEc$mRJt9ydgm3!nQD-ai`FK$0yK>?qO
z>>>|m@3yqKeANel#l9tBDM2;ab;xIUp(I%@4|;z(G$4!X3n*y)Noy{i5{+;6O4vV=
z2QHs4q-D!2WUGp^hkeauV`{wevzf4C006}c^l;U7k_rv~sAa~5`#;vSU8TBDa{}G!
zv<z`wyUVStEE&>zSCq6OhtUfaRM-(O>-uZCi9&6FXXEgX+3`$7TjXD*>fsH(t__8L
zJ(16UsG>ZBH|VAKpf)pDal(G)3e`tYeot8f_>|c~>1xvD>n0ow_~hmM+Hk4e;o3hp
zA+%HUt+w`$YP9@IhYVZ6+>2Ex(FtbhA^s7=fa`C4ePq<zM%+Y-%FG)wM%(ywsP$OR
zYP4<3?EJ3caD}UH5D_OzXki6lT4>h1szDPSGKwr&^B_Bi^rS}JfAnc}iHycSRcn`l
z^^=EqbhOuHCMS_Yfz}AFskn#G+QKKBQ5*gzo^oxmJzL|ItdpGX%PyGUE1<IaPKrj#
zXoLmTG-<}+L8ct9^+G`U&6k?4GknAyDnFY?fai%P25#~YsB9=o!~Cwyk}ZU7KLVGm
zmuNgTy2zL`+7L7z-9wrcupkVuTk2oN19L@ba@CbjIcv9UKEGlzw`pW?r?c8(-~_hi
zbd~zW(6p#E)H&8gFGVzjt<my@*Yok@#wNandcwLNQf)w$qZZP-Al_rYiyMMH;Ipqi
zMfb}!3bvstL>=+x%Mb~Gxl7l%LIqv{n>m<$(JEb^WR<>=mJ_uGlVSzhydqs8!XU1S
zNVlLlW>z@@T$&LBGBf)ul{<F8NQzMWx&Nk7RCpos`gK6P#GhgE#G~WrnV*j!_yEEb
zL|2Wmj@%cRZTLyM`R=udWIq%PZ`+gF=O&IJN|@BaELoTOQC}#W6R@rCf{by^@bih)
zrM2au-!Y}ep!kT2;n=Iqqx~o%ZFt>=NJ7@r-{yD)gh_S)H8Gsm@uE~<9@YF_?G-+F
z9l`0#*ds(kvGe*z5*#V#waC@JO!)yFKx;UFaz1YvclX#>lE@WDON1oyuEI?W7My2l
z0;-`-OWc3o<IOg`%ap13TT6@c*GMqQa|d7Z>|!YQ!tuNu)FZce?VOqs<UM*F<r>`z
z?B*XHctLjkL98d@$1Z3X;|7pwW1nMv7Eb!$i==GeheRj-)V+rEps7&Mzbe-uT_^43
zd>(&EnH$SGkLT3h(f{3ytH>Qa^$j}WdPE3O0`2r^x&LZ*w9Q(z%Xu$<yJ9WZlxs%V
z(Fb<?TpeAAuC1a5Y0$CLl!q$cT3)Y*JG*2`fs%PmS}gilwG!@0w##axL?P#)8ZN*&
z;{sgdm56J6H#dILwgYS68kdEbpF`9jUZOPZnwDdqp*Cv1xO-_5=9S9Qiduev0WWWk
z!wjZph%wdY3WcZ6crn#CCerM1!z3QJ7Z26eV~NYYvXh6TfLJSr-uA;oHOMOIN3<ik
zAB!1#6#R-Dwmt_kH=x)Avm{U*6O&wq;HUK9UJVC`_EO}C=)E{lsmxv2sYA!fsochR
zTl<8`UuN+bP%78(hCcxQ`}d!sBUP42#rEr`z1AJiFoC5K-!4-SEXnRk1-*fZUIm~R
zV-fSTY3VL4DlMb^vD+7WB=3QJd<yZ)X+{jw^+s{mcXhVit52EWI9tRUmD7wj@;Cw0
ziTWJv(BiU~(=qU~Lsaewz|ZzlzVDn;kUcD0qUgnxa=&hV5IM3%2JYnvu0EyH1`lC+
zdMi|pVpn!H#f-*##^&t1O1|VJPvSyN87>fbarA`>_LX4p!ij59KCweAzn8g4%OvTn
zfr39~r7+jWXxWn{bnX^sfW<&CT<JiKK!nz{X)_3uGtZLBaV=Eq`VUV*a8JVpcTF`&
zF|j9f2Zlhcz^pC+S8l*#Z!i)(TJ~0VfGTI)dF>BoFrazi`n|;G@YG0XpK2bZ+<taX
z9;nc(M<Ac1=L<p0CJaV=3Y|qQ80iT{tQK#4vh!B%n>S-di%cSFGEh;o+V;1-k909?
z6A7JbW~SOG=r$5igM9795eBL-bTNHmRZx^4NjV3&VnMkfGjMVS|KS$QA+tD)i|ldu
z^+~iUr<a&q0bKnZyQId$d6tg_{>o}oa0?06bmd^e+f{Hm2~8!X_cIec7-A9Nk=U?v
zU>FTN9X~v#;Tn%LBO8Z|#)W?r@`_QJxCZlf_Hyp@;bDSTafVy<nu%i5CpH*+ZfhSg
zW<>e;sW4(ks8vy=j%+enxRZH-Do;)2;8lMKSQ*)^pfC`^jjs~?!_Gm*CtCikQOPWk
zQHh-nEP75^gTsML0EOSG6KGq3N??N_EH8BiN?Ph5C73d{?9eg0BV$iW=a)bI$SLO-
zfrWm{!TA|G76$_I5uK=^zZ|4E^mFt%g8<c5urG{Z*ZK#*126|}GF?UpRK?-{kEsR%
zTWa#hlohHJH0zQ9P)fC71yI`2M`_epn#6Fi97eTb9Vg4RJQzsM%3QRbWte8f(~V;V
zhdMvb_@xF!mDkKp00&dUnbiNmDzlKP;8y}Q`XtE1loSW&d)r2k7Q&>3oe+!5N5EpW
z0hJ*@X~3;M^YsRVyz>%j7r^h4L%uh+%674wbC2p+m(uC{pw?zWUdWZd1*)$>_V+9}
zLY|Jr=BAqmxS<S)?A8A%aZv54?75)J)DVvuo{7xA$^gm;KaY%ly&*oPXdK63b4YCP
zQdL?hLC!C6h3A4%R#3pVkB<bmDumps9_RWp*qy|@AWx9Es<AyxW)6~m04K~2)i8i5
zB<cwZ5ucb1r}AAcrN_tgJr68{N`cuWRV9w~$sbS>Rgrc`!6#g|VSJ|UP<6q@yfo-J
z|GQ0S&+NmFflg$+hnC{;U4<W8`R}=Y1V>yM%hwbif$LYaptpeT@#9TJUt8E7EZYlb
zBssp2s+7{`Gx~i-^T^nCFg|q%KYkAxcg`aZX7Ywo+ZKFh(o403Xc9A+&inH0S)844
zd<}vIl`rmB%+cI&JN&nXGdgv2xxjQ{pUDp54)9R%I-n$ajo9Jb1%i$$K-Aoz+`XXD
zO7dT|$wvZesGtE2aF$Y34k|0=-IFC^bxp}@-ou0$b=^Yfv`X?EoK`0VX5rUmi>K|E
zD|9yMQ5K!y#4}OD*5{&h+V3IgBdBIz<Q{<v?X=e+C^5WKdo|dFaOh&rFw_I~?&OjV
zkEw~k$tn3agD30(DH-E|xl#N}5+u`p2@N`%iD}K6wE9^`L)}d{H9Tzij7*?|#!vks
z`d5c|;tb$y7E`{MnO6edvi8#B_Yu?A<^)gl+yNOJ&*E<>YiKC=RMvOe0&Wc9TU;i_
z;!+Se!>~d4g7C7*NAwFzs5UCA8)t}8)i#h&F8l*UX3G4$N6+BIIKvAVsAQTgd7x@z
zeVXpJf7Eu`!eV(kQdy-@)HVb5nupjFBYdb0EszW(1c83;(8WNl1X;(9xiL&v&L>ri
z&jkM3Wsh~ny25}RG@}$9f+vj{)BFCmk^j=J5D7wO6hWd)8p&!@HfT`23}$Ksb4g1L
zy&sOINxMoJu}=YKlxCz9T1lVxt3u+}AYhAo$Mdkj>D$27!Tf1$E}Le7+cPfIrB<2W
z>k4jRH=#bE!_4}iL+1hH*vB{aL_-pyS(*DJ!B^?a#?=R@lZj=ctStTw*_GO+8s1IZ
z-J}%>PG>}Xy~0w6!BJhNcHLb)4!4cL^$UU=_kgs=FqVi3ttgs}vW=)4cg4rdjpHsO
zn?A40YV}72A}}HrYKmXowPawD>!6k4WDl~7zktF9HG<ULIYY}mV1S-D1H6?KqJjH1
zm~a!!)PJ9BRGj#RdnyXF*XO1mih+yV!);ldCKP3#_`o7*p1!e!rv?pX^ThzqVsapZ
z`;`5L-DH~4uS1do<?V3XS3WyI;e{;?W@&~Sq_o;OfUuu{KJ6lI$8ZIK!p&R1VaqUG
zJX|m-(B*zfUo%|Sl-o+Gm2@D3AORV~M4Im9!H$zXCAnHBcJ7hiO@iCJAyB;%!7ZHB
zAX>OhBiV_P(hl7PFXAZ}yobI+x85hx;^6rQvqB4QaldA`$Ja4eGe8XKGuZfP&{6eC
z&zU>|3m-G#6HW}5<Fi425MeSx%^%C!_$vJ-W5Qi2O}12?AKwAq_f^yLkAB94(y56v
zICC+JHcrrl=auy#;F|2)e_7uXHe+{8Po*WROF}D;D|-fb05=f|QriiC*nQrdE7k$W
zksC<?H)8&v>@DxxH>;4CyZM5sNxCKTN6Rs=&d2bcq~I_(lxZ;j2S_9w-obH6fBp$x
zdxfsWWf6ROr0=Lph15Amw=mli-yx*W6i>YQ?!;^k6>fJTvos(yhVR5$By<-6eU|Vx
zp&Ic1P9##!-g(*sJ#S2#pla;-giEPOzwpCrUf>)eH9LYgG#iYGA5gjU#vGn}Eufmd
zTQD1APZ~}yJ}UYYz;1CF=2fqq5kMUiCG^s>&~cmmZ-8y~Lv_5k8eAO8M{&rj2*Aw^
zrfr%H0IP<a50&pFjv4ltoZ;(|u069~9<6P;St=eM9=5Hdpya1DbESX>uL&}BE~#Da
zcWtqwZsAUEA{t`#+_mm(JW5Y!f^5+22%M)7Tl1w@pE}-@<a(rlxyN-2CfFF^gc@FQ
zis+4lkfOGsT9xfA=ojosZ6K=iB|5gUx<c<F42(P!7Y~t%IZdx94|d|qo4_8UzW3xj
zCp=`0z=0(ngjb}ck=zCc{2zN)d8_<`XfU`Ia;dnNG#gbXfZuXkxa!!U^ZOixKc_3&
zkxzu3l{f>AOkc0LQ@g76eBbNPJ#feFo{X%Z$MD{QYQDO)hkumJ1+;GPnh;BKi;hB~
zE*VJd4u~a-D-oBR*yItwIwbz^8t~m}mkFpD0s1sgC9Bu*ql}RcoFvQ~_1=mA59YT{
zchf)0Pe>Oj%MO2uw*yzwhVn&FdIa46A9VnhA&08iSYfDgf*jih(V)3Fr8Q^OYdBG<
zJ^syx9ke;s^s~ySB1M_@6#a0DQuqDD^WIxPIt1q?LL^~0?GcEsQy7sShIP^_E!#;7
zLn247F4SlMj|TM^rF(ctn_Htd=R>vwUHBb;$y5+s#Xmh{Zs~?{k$i9&x>AtQjo<mL
zju-;D>?Ix}&L<@VO(2kW^8p$L%OSuy2`!F@H*ou>Sn}ip(8b!=;LGPh)rFxM9sNEx
zxp5G$@<#$aQh*u&b|nPU20=8jjTQvPh2h{PV-M#~80BAm8^JRS@4&U4tY?~H_7DoY
zz|gLbM=OKW{KU@#BOB1|%|-DJMbKsW?9*s&0Ic;U!hUmo{7KfPsJTt8G7(e=cqL0u
z3^)aK<4R$%vw;Hp^w!e+?;ThI-1CP@4npb?`i9p*XLB*y9w4U@R2q~OuFAkN3ulGP
z(RC#y#G`u|+z*+RbY41p*{#nQ)ezseshjA=nEC`pDZwlgctb9{A-1Hfud{~_^4q^<
zz%MHxDE2S2lM$lqn5Cj`7@iE8?OJ<G{vprA{rcG`Xv+I?#%Q3Pj#$IedYEd})x6_x
zfo-osmrQO8cB~i*ea^f|ovjQ!2qxfL6GxQpEOHhQ@r1sC0V38g4AO0MZYdg_q4AbX
z8}lW^F3C;fVaI`f_?Pe<>JCwKrjSV5z4-Rcs8Qh(Go=~}?07Lq_b7zFiK~tT62-?B
z_ptWBO#D>a(HKFPA!zm#Jk&93#^GukxQv08N90H2qpYUVUmW6CI54v4#XCTIw~hTD
z<m}=^f)Xr{G2**KjYo37k<gE*jm>va8&!;;>TV8_sz+Whu{)~J3FIuDy}3dEy2CgQ
z<h1NL9^23?(dFRe<<=rd8;isl_E|R%>BGfw{D)~p9$%RxfNaDN<U`Mr=6ieE3Nq`F
zL23oyT%)cE_iN8ryVuL2*xc@%Z>sD2Mog9t+JHK#7nkZxfNQ*uD9w{?Z;Jvg!GX=@
z0M*!(h^WTCnYe>ar<7luBZ(p)M0f#FcD%MZ88U5?qqlGO-Jjc1HnvY37kms+zU9D!
zQ7JLMa(^Y(P-n<S{7@35Z<o-aiPO!vlD=~qkrlF_49p%w5`fN}X9(Z9SyI(D#lM9Y
zsE$%Q$B;fXu{Rpun0frAfAnRa>EHDET4HeOvoC-XJV@kb*dxp?6)#Ynj8p*WJKGLE
zv4(%7-&s%8I@?_w&5ATom3Z1PV%IQAJ{1x2sSgs2ihvc-C1!_>Bdq&*31|aQF}nR>
z0QNDfwCr;TDc?_Act3`-+-r(Z!q4^fzk4b6dUGAT!gmQ$+ux`pameu&XJ;wDLDg~O
zzixyRutN_5*B}AvZo_*^2Be73i$Ny%qFzW6_z(l)MR2e-=jxL_zh=mr7^cw&E;HsU
z0hxY_x&tYM<C&<5B;5>fSf-bN$ZOUPIO%!x*xBUwD7Q^>42}r@QXJg!O2R~WmZ(c=
zf(?@9ra1_<N%JUXVcQ3fH-&B+7`-cPGlC}eiasU&Tm^=kVH%0~uVmjX)_ZYD<}85i
z@L3p^hT>}kks0blBjFEgN<?To-w1Yti?JKW+#Pic<Jv0wHKhk66(WFdxNPlg{ZH9E
zE&v6}2RMFK`Xa@#QEv)HfhCxJyOeW}$g!41jDoqKjiGmO8`Rc4T($2Ngx?kv{GuN<
zpGB<IIRbE`u1Fsxbo6Yp4u24U%BGWaMq|RAWBGZ05`#eTbxC;@eq!$EV0;`tj`FN%
zBhC@I7CY7Zs0OUP25iB3Ty#T~XE=VWu<jgNZ~Q7Z-__{FF^65Q9R<RkZ$v(F?;M>I
zUP*WuY5VOSchQ3@u;FM(Usi%08zcaudUaOi&Wk~G?ffT1Vf8ZXxz$8@3&UF(Rvn*R
zg_i?AjnX<Cs{NN87G;JUJi-l9Db|L%zVF0SRSKRzukVW|j;Wdc>Pb#o_uX2CfkP4&
zbG$>v8z}*-@X2NH$@?6KNz#oW9#EbYfga9v^||g7!ZsYBis+XUIsG&RXt-9A``47(
z{b;wqk9hIp3Ms7y_1C!k#8G&&86n^^O0JZI`@;+6MKpg~715t;B|@XU+)B8N-`JnE
znt_^mELzPj=EG%5n|E`mp6mZqg(J_^)HIQB5V*JgDBJ@$D~v->l6BCy$hM^rW#>Rl
zM?*Mt7ZAtlc9hh7^y@v9E4v~$ZI7!J>QeLZf9F(Aoo1}#iBkb9j#d8wloU&MHx~+n
zw<`0J!vN!aINv%#6X~?c>De^lx$C;dlHG3;YoKSI_;15Qg-AFo?0Xo&<Mj*?&{*q<
z`fJ;4TS=SmSVEstKY7eE;U2<tWmo2=?NPP2K-aQ`7Ez`Eo7w~1ln=-E|DdC(+Q!5n
z8q_>1N0Cqn-lMtDysYoyTVD6&{#9$PjJXeo#-YhIKfB;JbTi<L+X9zAOEy5E{MwC$
zgd5_Ne&Ukl8#VXhLeVYq!0c1@dWAs>>QHKAIB{td+~D&4RxVe62xmalbv*qA=i@M)
ztlk_2_&|>Jm+*WEh4=R!;Ufww&IA`e3$(b^CsdTu@2u3<^(8?gLN)N&>F_hbveC2S
z|H`qVE`#9fzVDn@zRw~a-B-BP0=6f9Ft*q}K)L<=x91#4i;Q*PO7LEkip;`4O-=|t
z`3X}MF|SV($*6aW5mF>=3tSQ|KqY+L86_~^AAhF@no9BP@K~!!O?OFa+#r%N1nY%^
zVgncE%fN7G>5!8{EcTZV+fWTZhbdl@(oz>#Zjg<2Q%)qp;#{EH<@OQMu`Ri$j$%yj
zNeh|)p`7>#24v%kPCUrT*-hwAKY!3iD;y8oa!8sAF<4MekuPm&(u|EjQoOpmK<JU+
zM4g{ejkQ1tN=90N?|Vm)tWHHKZVZCoeDVIKNo)S#XJZ$q@{~P>07HMF@Rh`*b+|Q(
z2{e_KFeCFdG*v$E{e2y~sSS8^{<%*Q6nr<uCxTG}nGCK+&GKA9&+fRC@;OIF&<-xE
zcJ<${2(>g9_WXOgfVcd-r<idj-%VRm3{#Q$FB3c)43IcB)kfU<9=e?71QC{|e8Pkq
z2w0HQo<zer0ICw-jG^|-X9qTfoxJR3S}45J%uEKlkQRlcK3IdlrFXi15f>9HF?N;H
z;GJ&T!u%-}-2H=bjF5)5*OS}(RY4MQ{%R}!;310N**^tkVFp1%oK}I=N8bV~%o>Vs
z9y%J|5C5?D2X@)v=*)4RAeXpmVuRE*@7KL%#oH~<97^X~gWWHn`z5w17}-_GLn=~n
zXM_Z|nUP93zRA3+y?(T5$E~pmv`Q6pD#X09oB{M_wO&xcY3YH%wuUX%?ocl74MZx^
z7XwL#Z1Ls#%B(%}d&^b6-yRc1?g(|RG(GNe^ZW`t_Vul#)S$|Uz6l|59;AxLo$wAV
z?w1xtcdlPw=E|hRyry86u0Lpy`~LkLI^rm0aOm|(`UqR33Nwv4gXkDzU+2aD(mnoM
zcDvt`{^%&aXW3Ve(P~w~NVQL8qOUE@Ke_xpO%5&*KLK8XlP_T%%G|8BW3h)mivsJf
zeu4~3(}G%;3@KyXRd@>-;^Nf}ah300vft3Og&GUY2r`}aosYM>IbQ*#?D1FG2Z=Qf
zI|txyX^cAr`%&VvG&$ndD18-+(?$ino6o60!=L<=AL1^9<56=e))s3pP*|g@%V~DK
zA>01Okn~WULcY0If)X9{4HA@8OZwpox@l?$HSRK-J7I5^HsAT^W0Hj+Hm`m`&XF`7
zA4c4N6?=<_t(@!5HodW<?|Yq|N5}{CazyPy%;5kf>p!Iu&_r*R@P|wS)R*Rr2PIHR
z&4b5FBE9S^Wf>b>g}zA0jKyh`^L{cwd=mkjPk~~e=QqP}O%{Dc7aB!fv?eo?P#bj}
zS-}AG1dfP6#$K^G7a1q$0h~3c_G6R(N41ZArv1VU`bu3y)nuR?F*cZHD?N#g!H?xC
z9`^PXT>Hy!kg{~f<Ue+)9cV2{3W1FL!*e$Q6v)>01G~`<z>QKo-l_+}TwWhHU!*)K
z2>$~_DK3Bqc-{XV5Hrl9b>jcEMqIhoYgh@qT#D*mI*qcfkPRaPj}55Uq5&@0+@!6J
z0pkC<i{1_=E+>ue+nmjExR-v%f4;@O*;*t4>6BF)N`xGn!3mgM>X>Ih0}k4CU(^97
zbx^$4V)%cV;JQ%dk?E1_0#~ULoukcl{`UYir-n~mzwGI=p(xUB^s$iqBs;C7W~SUr
zJ;7rnB4K`ufRjqCiLC;nNRNF+P|~02nrWXW{qq;nwxil}(BkJ@z{_{!zX@^G6~M#k
zp?cqe!+0T%#c_jQWt{bH`{mtB0pnJ*QP95Qd1hhh9$=C2B06={T>DPO5Zvn6-ty43
zs6&mxlI=Kq^!@7$H4Ub&ww3DFML=l}#o>(ca|kqjy`}|X4Lx5N&hvi?R+4mx8oc8P
zaRGPYt~kC4D>(h4km|X?&tuR4Q!r}72#);uxdS3Q^~PsIRw#3Bm_kUV#*x^%=OWBv
zUqgMLl5Ys}x(?|oFR?-t(WIl;$OaLw6c_(oFHy^b?{^>te0gjd<zj!$iJ`sLFpvQO
zm9Nwj{@}RYQRXATSG?MD$hdK2lq4~Z819w<o?n5C!R#-|15ENFNa2$63@&^_Q;vbN
z5ls#8*clrv52v>!W%pL|VDz}HpL}#0T1^e=$gVm>Lxr|yR7&>DFWrBtXoQWfw4Ta~
zO$up4AwTFGuD%&Jj9Z~=3e2zQ>R&@G<~bhLiAHK1Wdq)<U=VmSUOynhuK$pZjBRx@
z$%^kYy#Uo&)N;N2v>9iY^1)~}d!Wxl1mrQCJsy6od`c|j0>koiZY++voHygX%;j1l
zkh_xNe}bH&Ihng4uL1Q<=XjvSknSx@`nznv`Q#lzKTK8_x_1?vtectJ)>xUPwCCYs
zP+Q-EzAtsiZ{k)D^T+c*f7RBOw1YvW*qWlmHZ8`h07Nb4k$D&Ia;uW>b-X%|PiC8$
zF8NvAVE3{Tu@DL68q;cHQIxo2NwSZB8hOS;F=!4AQ9BuOV96eReI2?FXP?<Xf%dTb
z#N@3S59v6PpP(fC;ocnci3*pR=Xaj_j|LkLCQTl`8^`}@=;zD6V;dCi?sg>wzvgbH
zTKJcSlsWIs){My;DQ|xBFI+oAg;y#3br27Gf(m!`>VYHQ>-^yd(hdUm_Wcs8qISk%
zwvWE@VosYz%zi^vc;Gks7eg2b_TF(XbOYP*fldvM{IPFgT`-VECLC<(oBvuln!4ou
z^2xts`H^$&Z5>v7f=6(WUz+`lkyF20?|RGbB`S-aqBmuj7^{c-8%G;|XV2#k+oc9r
zu%Smx6h61=m1@5GxHWzU<qaS7AQ~3fb}4jKTgW9-cHLw9imf`LM&YXK4H3>-JegXw
z5;H`De<s4tx2~ugZ2!Qi!d(-S(^pIWt?H=VCM{j~nZ=?XQ_$HlqEgt|sKtA2_kp!`
z0(8T*%xtei3lwX_8zWcgjFDuxC`b;5cf-UDIZnCToiLjBEG5*A?))?F1x;4A8@<U^
z^I+wlkd;UGiFpU}HzFf3Aeu2f$mDUE-F@J^9xY1EO;(NGT9^p!BO0kFl2L(;uFTjd
zKqGPI0hh9bz~HCYH9BWv%q-0KWZ_kvfexq(b`WE<dOw>TlXGrKnNye;;t@`GbzUMd
zx7q%+4dj(b!f2!DmQ)~upE)$b<9o~JOxWDf(Wl2-dkiA{dv#ByDzumdTmp&VdUT{L
zl4ieSskdtKlFP((U~{%OJ|(mAvAO@|xvoB@QW`Pv7;!ZrFAZ(91`xMwGev*}+M-(8
z8=%i5w}CZ#$v-Rd^9!@I%4|_xNvW1bE%@u7yW?L<bvA5od-VmaU2J_GUWx+*E*Vnu
zQXH*s=xh@qxtju=UXR80`IVn)p{AKl{#@kt0?q?xjj}!#>RiPn8<;5W*Y|gjo5Lt#
zfN|;M7z`TuKfXZ*Vq|f#58>)hE))7kM-9NW&ceqQoM@lFf`SAEeO*Hzj)2GEgu{T_
zGL8HfPxtC7D46H2x~dX*l4EgWAuo3{XL?mUS`=Z)af{n|OQikn*TB2Qm#GO5xPlwV
z4J$9SGD0%+ZaM~K(M<&tN#{}jRIXJuw2x3FBD|(=OBmHE*Sk8cWNH0fc6<%r$<bW|
zi_-;Q((SWU-{98x^(r=00+sF`NLjQ1S1Q98ir#CjQt;p)``Fh|ok%ZlU5cYQ)X@s7
z_mUq7=s0uaPQH3Rp+j}=f05yk9qvtEl3Gch&UVo)nfz%X+b|`N90#I6Y4m&PeZ*q*
zr4eGZH#q}re!=w4Ntf=vTT({;<n*b(dTJ}khgxyUIq00t`SC2N@yzb0!mWED#{PS0
zg<G?;RA&?Sf9yZzjf%L!yl{(u=Qk<+h~&Bzg2Zm9N`K;9-Sk6tmDrUP_l*BT9PyWN
zZbqiF7ax;sKW-&W<I}gYO?e{&PZA_AX*Ao=r`G-#NCd2^3osOR`!Z$MzpJZSu<3Ew
zIz%_k%ntZy{44BGUL&=Rdi~1ipYowI-Zqe&Ed-b_j^8JRq1$s5L#t@?0#xZ&qsxP7
z#N>xyZm&MEw~AR=IlfZuyT`;X-W#`xH+b;kLScYRZ_Tq;sc)9;9HKZdtSMh!B$VNG
z&xBJ--KnlSqR~gK0Kaut8T}rDxk{N^fmP7WRq^G@2#<#Ddbghwos1U}qHt|1g8><O
zewnrd>cCGgC_Xto@jvbZ8}G$BL?+_|y!H%?8g(zse=HOgB8+Q?gLNh<n0nKGMq1ot
z2Gn~`z*k8ZXz^x4qoM*)j|~*THm%H-0}ISe65LZS;K~;ellq^jBDNx&G-Rg7^apkh
zWS_zalvWA&bFmz;HL0cW$b_tGs!H2+CQ5w&O%lWU&P7G;+V?QDOl&>;RQBd#Y1gT2
zQs*WXqsDx_Pc@b?_e;2Hj}qusyAGEx4m`1y_&sNwuxy;5r?3?}VslHJ%0hc@aDRE#
zGiPg=xuI_BPr91s{efPAZ1c{R*{H71W3H}id^OYF1D->!y{nPI>-;0|9BFu-<(%tu
zGBn*&uW9T)QuMrECZjTEZapc`B~xCxudmg$UNp=Xuva?!<k)<``kKW&=%!wP4m7+_
zD7OE!#nO${{R_Ky_uM_hOdq-1GG?1kwXl!yWv>mW?$1=3j%^u_ZS~rd4wvCmM<lJU
zNmrV4@)lCLq|LfoF1G}%-<otS+ZR1E;7Px+ozgPPGwOVMzNMed)pKs__wEO>`PtW9
z1!LoD-z_6|2SDua2<7%UhmDR!cNi8iAVF!7vFhr&#}}|$O7uA;aQ*8O+cLd_6>_S4
zv0k*zm%Tfny82ZIGqb{vX?vd9OJ7iSb4to!ctcv(;Y0s^W#1ty&F}4(J_`)cz}MZf
z(d1_B<&Zu(8<E7zU}?}8>yetn!navEd#i4pa>>-EVm}!EjJ&Tqy{m-#Ki1)i6~%h{
znVyTDn-}(%IQQ-=dfqDQg-bmm#M_#+%GOgT_xrxVp3ScPT`!`(m>QC`SLV4LyJLE~
z_4D%j$GxF0|GkjDw9>l0{j?_6-nLJ%y<v%;1$eqj_d<6xDu3=rM|<{i?pN+Bc@Adp
z%Y)u2sN7e(yg0LKrmZBl_m`#9pK`jPa+JEAra!5IOLjR1^3!2m<c2}=WH#fv-Lf|<
zu}NcZ&>=s6Z#Q#)cz<`da!D_HKXY(bAWSc2)4^hMpyO}sy(-J8C!GH4MQACCNYQ!}
zufLEy=&}mB91`w9w)$0j+aqXDpzzn+`@2^D&MfQSlHfK=%ku&P|8SYG!*zRu`M+Z5
z{>}q6hJ*#%9OP$P)PH>+H&Q)?ht<J+lCQ;kPoRxYN<bas?XY+QgMR8>ct|M74yoJp
z=}^!YeI<o5xdcnGy)_TwNp2#`T|Z(2*%j9qmG3Zg(ugm=N+0m}T`CTkZ{ZC1!(~VD
zdy+;JJvLoLHZ#*0M*L=Hf2LpMA7j^8mX-O%KfnLsk$LT-opzWn@=M9_7bo8bHd$pn
zGzf`GiiswrGP%IfBP-qiR+jyF)H{y8-?=BF?;k%L-q(MJrCd=jm+KkV2}cE!5(BPs
z^_lU-62b9nBbljrf8VG1ueT7tnyR?z9NWJ8etm!4%`<jMcscxyA2sJ34>_-ME_s#q
zXWEfR+@!pPHm29PcSieGkF5P3Nm%D!j=N41t6BUHtzJLL1j9dnKP^8p4!+#Tt2_DP
z3#IERGYf}4f6YRkW49{|XtR9V1vcfBG&4-SB$__Ny0yYrA0>?HmJec}?D>4|x(A)r
zQVw2@N%;-us41e+ZA#Bw{>~C1z5Dn%{EtN1w+qf(yh#I?eWtu#Hk%~9z?|Its3srJ
zT}O#?HIGtFWA0AOzO-|AcswQ1V|h_Cs%k>;rcCJZb03l+9_r8HUZl5CaNqIC&XV0*
zPJfU5ubu)`&6Dm^ykAX&ji0Rl4F7?BtUEcYydFUuS-|5SPmkvjW2_dI?Bn9p10O4X
zQ!-ga;bKHA!;78>vbsbl^|f(qI7MA<9JxS7*5laW8M-Ofeg2u&Q|9qow=C_H+TAn4
znCCM$GRB<K*p$8qU=s>CFUvK<My=IP#cFbjo|0XxU~7=olM*MB%v|!DGW6NE@rrKU
zev=|y(R6z@pY!d!_?E_5uhl0)3SCvwJQmI8Ym3Vj3XgXb-K8q}k?53CWKh=<QOqMG
zK^yGSr_+0)xBhdqVgm!QweVD>%A*;!tviK6l}C7U>B&<WG-ji2M7MKl^6_n!Jhe5C
z@x{CXVNq^ZH&#wK-`k(pyO}z|FsPiBcVut<%Fbf~tHOa)RnB$O0IJ6fe7abUOHfZl
zPhe<UbBFrfuwumlYZs9?KiCQLKJ#Ag$c{{rbbOU&a^j?tnAt1V)ZgYciFtldbe$mU
zb?mSeSt{P#m|U8eskN(~5_?~v+S#_!QIVef@|P$%Ueyx%89^|0MOJ-BEo@Yiyew$k
zfIQ$D_C&Y*hWU2QgAjksfG8dpJg>q#aCzsujA-+>4A(Fk{?du^rk%dlqG<DAWBrak
zgY>#4J{4VS@7!S~nc*>gN;3<d3_Hq85G<`xVr2zYmo<&MVZ#ZRIC#j}cb!89-8a`?
zC2ZK=+8(9mCm%YuBAz@;`XgyCVRtU^ggEwbph0R}b|U4b(LzJ%&$OKEDRl>xVbv%H
z8I5R~+Pd41r7shwlr%>*W?%H<HOlvo8Xi)S-{lydoQE?nRF^02cP~<$WiuLzwO*?y
ztPHQfjt}47TO5A1-gRRq`ilT{7>A~q+h@h4ic7Ed*(>RJ)|o3k1UK719XaK7aaBCo
zS;{%4Mz5%)!lH89?DZM1PFEp?_Nq3M6T(o>B{s1CIo;F8Pby+zDlA&_s3)-TI(=c|
z8G*WZWO>UK`tLKM>&4DYuRe5%8L1O34<geHh;dLQ#_l90ur;XI5+q%E_2BWh#}Dp`
zZ$7xDeu^_>=e?e9QpK2W9^37KUs|VXI28j!c4Y5{dFD;+i+VkpbpJ8ksHeuk?ON)&
z{<FayyJh*(Ddq0MEilULPtoZ@a2+;Zcn5nTEDbd^nX+B9iKlt{)zFT3|D|hJDZwzq
z*NKL;j;S=~f9$HB^wWZxhtGS7)FZq?*#wy7@+BF&h2QuADl>(7Y!WP+#Z#{xY^U{_
zNE>>2IU{3i-0_EKTw<5_J4t`=>s<-b^ojUPh_64YOC}s}_<F{4$3pn>nMe4p7WO|~
zUpw<?Ms0T`xjb$qjC{UCu58zzK50wo&whi@$Uu1NaVZr|61>&vPNi@Adb+d<f;2^M
z^eOJevo#pj?C(h#KE)p@T@fD@y&0F@)b&F}B-Abz`>565+`%TvX<@BW!1G1woz6;R
z&FZ>&S98aEniufRa|YyUVm4W`g(Kqi4?^PY9D<eQcZ(P#-BnMYIbmkVgAU;g^l;zF
zetW0{yOmBa(B-64XBEFOm*``N-I`Vx(d=#gYMpU4G>G9>8vW@#=6dV?EYd5Q#XOJB
z%0y_9&I}KK5E*|#uwn+*zWBUaYgSp#L@H!5ZLrS|+FtmMsmu{~``56m3^P@>w|#T4
zi1GcA=Qs}&9ZC4Vxa^v=)4&wtdCgRH@%(J$T(r-6b>7Vble*lR^z;FbZmPw@4aUVm
zyboNZ6MTtdF&26oZSGSJ)r+0cl6!a=U|vuCW&NX`adtdS;SXqDPY+^v%FLf)VZOz6
zqjGrb{Rnrq$0waZIXlTn5N9%D6KR(k?Av=W;>1g@^g?LaH!SCw)}C6oZu8z_(_JZi
zpdl7aJ|`|GCV*X8wQns|ALd_GNY`uju`ys!;c#hk{^Q<L%yUemkf+pBOtNN`jkee6
z^BP(oeoh5$x>da-VUM2ok8#%K(f!f4y*M3IZ#|}U>2fV3S@@Wx=Bb*X^tsH+QO+NE
zJE4!PT8i4B7Sy;R{>bCYpnp{RC#>pvIW63i7Fr9evc7F+;#j0fO3}DaZ)0x+Asu<^
zNw{WG@kMQu)B`v)LN98;#|1L*e}E4TPNh1EWF1yQUzof7E0vc_Z|p?)Q0dRQ#0r-W
z#Rlk=Y@6-iV;}ObiL_gN14T;rjZi;b9_CH=o@go)qf0^AbE38kX@5Uy(#%?k!dX#E
zCs1K%v$?i=6@nhD>J3mp=j<MGc2S;eneGd=X6`18TD%RNq`h(LtW96lqQXPh6*=a`
zsVlK6i*i~=Z7<ca#IZi3YWj@ch{&t$QDGANs@$R#pB(00;->5zn(|en_<QU!oS3(d
zcBCZk^%^_r6@5PkG1BXBRB=f%E3BQzopwq*%<bmgu=V;bi44|PhE4bK%OU3;!dAr}
zX<wxWQ@zV}NdEzSAy4^@G9t5C<(zS5s&bP?ohYK!5%u<FI4M4>1UG}Cwu9F)b)Ufj
zr7n-VMI0$^yeRVQZeqS9#l7J_D=HZ<lk96N+OGFNXgECw6#?x(1F6k=Y~&h5k)Pia
z>OYurN*TLNgN}H0r}gO^R#?5RU?YvLA_l#FAx_$yzb-|CjxYiIZp`62X(Qn&f%&79
zg~NPspHE^wP2KTccugJ3wYx<?la@2?5^Hko%=q1%nx&c1k$!p34ZJ%6;m>#z89x>9
z90PYv()X1<QfKAUbBz%BOlxG!_sF%tm>X7&!Hp^&CZk9DleZ!G>4trT@uk*pw@|S!
zrwbNG|Hi8Ls5Li@Q1N&7jH~VXh4+Z67+r-X9IdZ|o6wEYSs5@MXznmE?jCQHZ@T+V
zRKMm?q<d=9YSM38js}W9cg(;|FrVojyO6dGpF40i#~tS>#E_>Lv~eNu+U?rzFej`Q
zycuWyxhE5UNUd{L`Mz8{|LoJAh&5&PQ?{Wy??>+64Vx1q>ljJsdQUN6x|o(&EBL5Y
zU8LRMLtRth+0eJ57ONm18AD$9*0^1UWau=1uj#)iWt;O}yfgjfhP>{TBCIOwgq8Q|
z*0hQ(mJ<udnVq_&;!ef3*%t^vC;+4Nps0$;s8-hf%a8^TU|Pt4-+O6es#$Cr?@E?P
zz%SLQ-4xNq#Y3X7^N}x7WM3#A!dJ1%^lc|kUmH)&A`MTEj3m7Gn;JlfzBAgMYGgGd
zwv@hbptlUqdX3*M=HdI|!*5LuW*LNhLHX2nfu)twSd+4x8hr_vjii&480c_30P8#!
z3Okfe9Z4&1mFnBxg?xYoaLlkfzG!!d;pn>5dqx>QTvsPJgnd}F4;F~<rRpg#H#7AX
z0}v6-lE2-_Z*rm9KT^c1=Fzy<jC;ndKrqP#%SUmOGL%8-u|x!LZ;1tp5@ca;R%e0-
zQtygrMuqQG1KQI|$6J^QvofVlu`vB~f3yg1S^$tq{m%PV<{?257Qn_rEVLyTp^rtw
zCqi_(iVC)%cm0q`9705L$Dhv@mLyL)gbX4wu3HZ+$0&rk^PN=Y)^bmHNw0-JW(a_x
z3!7l%x^5LJ<=AdRDgUu<7Gx1#MoSa#<Dy>z{A=GRh6^bcj^TcDrNBGBXcFGsReIHy
z(4BXwu_7<PDgF+}!`9xx2Uw*Kq<(G|Z7neSvmw4L85%BxiI#;w`~7t}!HyX@D@%BI
zc<%T5M9Ck>`TuwdhlmgFw=AB25?S?ImfG;I;Rt6lYDHCTx`R)tJJ~z`XGIp-wRd)`
zCQ;;z>E25i#*gY@MamFzvcqfv#4Q`1^fE05m*_sV05Y9!PI!%jxLN!8o--*HCV3MI
zaR1n>FAajRl9Ux!=~m175(D6A{*#6RqVFqioVLIznomM(>838fkslsnUHjx{$kBQ6
zT0ccBroZ9K$Ct?}BAVO`eB+-8T}=QA#9scVjoC4_kswfJR+&lBu75I;+cE)wfbk!t
zM{()qX4=N@jL)@xYsR%cP!LAxmwS{=9>a>1<~1XGHu&`_TI8Pex%<nW$6`7W=C)?*
ziI@QBRIKQsx|GGH<oEI342s-EMJ78V3t$DF#ca^@`rg>AkJhc<v16Va-!V8NzTTC<
zsqSxBiXGZ$!*IS9nFn_%qXsCkZa#079No%n&wUX9z&qatH{;oq_@<G|Y8$=M@cZjx
zzdUIjCW;W25>3O^o9`5#Jk7ER{rthxv_YA}g_B#4*S7s!WQWmfSgF3$kiWvV+~mCM
zZG?XzRI@;+CcoSFgn#?^^|+VO8il;O?^3gAVncPtI&Xx-Cf$h`b3Tljyh<<==N+X%
zpZ{ZPz4C3Uo<hMUHD$Ltg5Vn5>6O|Q+Y=uiU@=_{QmM67#^Tgw0E&M}hCx0ve(ju1
zFZ>b}((l^^wx-lfXV37-CzizU?G@4q2q>I3JNeJE?011%*7BVK-aZ0D|Iq@BkKlYY
zMcL?|6>D^KV&rS#l$H+ab3UQRA0o+apS!yi2hhc2Cy{A?=%vJR+#%Prb=L88%HUo$
zdK4-|C-4_O>XNlR@K@9b3fmeL#RUtS)wI$voz}5E-t=Z-gqh-9Lzuv_PoxZM88CO9
zdLm5+0C{c*2h$`eL{cH3tL<-5gTSJSar2k<kmkA)aVlV!#X<ZSS@lzuOhVU}s2<$i
zt4}E=zLN>YPgCm*`KkE!5@ZTq7qFI88&ivlE!+GB(K2RpQ}12w(uqfOVnUXd?akK`
zOXg06MBmqhbm-JZB!IQi{x8U87&V<jQEKoD*8Zy~aV&c)fRmPw>#W&4o~)(ct&Udr
z%Nw1+o`@?I@B~1Jx_jxFm<IU8Kea`PEyRilaZ+E4fTXAJYyf!oQ1FHoHpm-F1i?Xg
zAO2ef@{f=Vn8C#dGq^Ajq!ox!oYx#kagk~_p_~)E`L6!VAuL9vzj;M`wl3BJ+#xRj
zzj5z%^T)Q4OvR7~6RImLeXw(|erAUv@mH#a=fbTWYes1XAx~l5X8#T4-nl50+jOB(
zCo{-6H^^2?N;ycs18xrI!$hOPpM6#=6kHRZrHm=$`GO0yF{F_XhmpDLvhu(`Hqq0D
zULi9C&du9tlPt{am2-RPRXzQY(zPNKd=^_g;N`W3(cgZ1WkI?t1Ph{oLJH|fSA<q?
z?^nJj?fzPk2FPc-jbCazNtntX5Y}^=2-YkS&jLG0(v2m&ZPN%;tb3wO=g9~oyPc6Y
ze<Fu$FHor44xEXcKfm6c0hUr_?$6t2hDEU_l$^xowc!QU#t{MGTR?jJ)5QAfuSy6*
zD5R;$vLENsVkM6C@J=yxmQP--AA*nZ7UEIzkD_5ZOD#Y=$WOQ0(#~<I8*cClYPRY7
zkh@*L`{g#y@+*1|0&Skx>Q;4%0Cq=pzWw6~qn}h^ihKj657)V>J8e#5z9Xah{3p|z
z3Kc{sdecbUNjurh?SES0Uz%^PfTS1FyK>e_4V}j>wGl+aVC<<V{cJK_Pyec{-O^1C
z+drpS$V*adp9Xjw209@?VGl__0pJPeQ!+d@&G_6f<j%%)sx84TcFQFx`lU6_o~xB^
zg9)WXq^n>T(<6JJPiY+A1VH3{IjTSemUOEGkY6!>+~O2v(f5A%)$ZcMEyhl+g^oSX
zh>Y}lcM{@;<>MIJ4LEWYtpHw5l&1SL^trE$!ut}94jlAF)|r=p9?m}PbDA0Xm_EBP
zrP>;!2j}_GStDVE&SqmhZ(Hyh_XimKHTif;^^80r1mLIx2h@g+RYbw5=m0OtMju_g
zF^xmRTlN4R7Sp2BXa4~yT#hNANDgaZ#r`x0w@2d@ZzN!`j{M*s9s}Ifb$TNV4l^$=
zJGTP&DKo=)gckKx05S+Z0S+p5>Va`o`0g+ScupofbQbbYXwKi;`wkAczVPtcHvn3M
zH+tBDS(dRMu=T2zmnt=aqAU?h5=HZd<!qK?wLUo@yD^>qu?lMx0h}Xu^Zpy^hf1Mv
zoU=Z~oWkI_O76Fl%DQZuy4$sY2qbvp#LVb931(-WZDQFygC9HXj+Ukt_$pblIm7_C
zv)HW_AKefZulPhE`6uX9S2VR*)K8!A(U;Rl*felxn^-;HZWT12$-eE&TJzm87Ut9`
z)M7}><7En3zbeKjuQ~O^Z^frn<_?WVQiULpVTi?*hd<+#E|lG~`9a&Xx1M)XNneBg
z=uuCht^~YoL*N^@so9))op4x>)ia4+;BibHUQcS%8Vm3(xsz$0F_&8lE_n&NdOmb?
z8tyjShaFP@vPbLQ?{WC77IqkgBm(|{tg~2J1s&68kF1YkuH#+tJ$dad%@r$M&4k;)
zYgk4)4vbH}cvct5AN^&qvw!w-aX`P8POABi@QpHei+5noY{%IEA3zGIS4_g&pL&GH
z*|TcTMbJI=az_&S%7Eht#5RF#k;%?$)?FO=0r0uL!2{zrK)lG;Gp^~EUNQf}1zvt$
z#x>M$z^}1d**elOWJ@&II4$~RHfz>0f2Vk-6CkVRg7rFDw`}3o6~<ZoXT|BYO{KO*
zp62G>rk$eXZy#({rxX)mPDl%_wYLVz#WvoCIQS0lqn^JeiT!rMD|d)D$#3VWS7{?C
z`wr&Pg(g{SoApHW1ue<Hn&zG5vaW0DPdUPSEFkJx4MOOL3hXjoFf&}s9i%Mg4G7&)
zMg6eTFs@*F)faI2!Xs%F%q=MVnd&iW&yS4~?!S(CvuhRe&W?7~1Ek8ov?uOYN68my
z!pu(W)(Kf`<kiqBq5`!8I1VW-oQ!ga40WRJI&P}=5w|7oXW1s|OUx{T)qaeG55cNV
zf_sflbq~htz5uJ^%uUK)WEbng`%c|KG#NZG;V2~p9N|bX(7;?N__1|V+W-L%;<z=6
z<3jWpcIOH%J-&TPcJo_o`IUyYF1>|aH=#pS*V%qHuT-*Z>V@tE4Q`0c?d!_}g0SV5
zATBWfx%qxGt+e;14Nchxc+*8TSMcAwcYssIC1Dyw8kG+y&zv&*dkz>RhABNgRPxl9
z1tyQ{#-Oh{g%!R&XTQ7FG-=hcv(WeH#%D*ZDc_rt8dkoyZ1uX2!1?zb+J%(Spa32Q
zfmGOPU^d(p3Ox~8xpd<^6EQpZ(Pgc=-wCcIV|%lRw{(uGjzg!44z?g_F<fzP2GEH8
zNlae}m~nUR?ao@k`h{?ZW7Ik1$UKi(=c^3^a3+$B(b8#I`ykuIrO5a7;k%JM(U&<y
z1#obqBrRZ82;_^Q+X7?=7baPlFa0?Ox%{yu$Ef}Pf69+prGAQ@6zw#8=fo^{72$pd
zNp4#c>MX13Zf6v4SWvu~?L;nFfMW&G=5=R$0af7=ZS7085Ct|dDonrTN8aZf6?>|s
zmtOJNHm#jReZK#|GaccX?J@0Zv=7021Us6)6`$&I4t0(*e~tL%-`R1=09&4G^b$ta
zLZap7`2CNw;4T-6pxs<J^!j@Rgk4vmd*N5=rB`E5Xgc%~t@{8i^OOFm7j;B5ME<#E
zfzw_2(@MQ|4$qhfhR5Q{|Hu3OJqOklV2SvuQ}l$0nbt2~sR4Qg54`vZP7U^yLXzW|
zjX=Yn@67d#Nu^q^aEx*m32i00aXCwb*rX18N$nYF;&%0Y>#@2XVBwFc+&husQwSYO
zy$Q}Bt`I(n{J}2x18hhQAX?Mqh9&;`GL_x&8#tR>Hy>=~Rp7pA5h(j=`uCaYA}|`@
zN+=z{XvB@}D0*fDVOoPeJ1AUlbhahc9Q~!=-XeqLG(f<>yvkFeNyu)CS!9t!6_D^U
zFRMFHJKjly!&|gF{Vy5V+T_?FapSa^wj+lvzDl^fsX!nP8PK4<T6K+@26GKsDk_0s
zcSSMC`f?rvbzlJ0!KXvi^MK|Gcye2z;xKOBwa2I2*_?EOKo~+}(?l!()0Az%v|k*_
zdaEa=5u;idi4sZuahxp4RYrt@HVb7A-Aw8D0o8zo{ao3!AWli=`@xt-r3}P6&AEA?
zFz$+LsI7{@9SbM;dO;m@F2;U3ow}pJ>5a&r?%}9c(~jo;ic`BEL{Gf)$wJP`YYLTG
z^e?m7m;(p+7<VjgLLQ4%sluRcUrWfs;4I}rUPfU?ORv}8pJm_MP5ys4sUOa5O1$}N
z<V42p6+$3lF-eR~T6SLToDedw!7wM3b7MI?uq1yFxfQ1vH7t=%xr``y{D1-tofhh<
z7>n{JGvb}%aG4()fXGUf(@=c+d`yFnSLoL{MS4{|urHUX3qdVF;Z?6%gV^LFh|)ja
z&V^JD>z3__&|g0-yLi5{q@*{G?OyRAa7Ooo_V0F&0I0(kB<&m?`}BOQHoYf8$4H-~
zUA@xUD~BXak3PEJEb3`(_2jlzJTtpWj!fiud>$L08@{Ccf6Zd%2%O=^k?JxMOq*ke
z;{ozaFUBG!=u+I<zry$BsmXxhJo}VL33hZmJ&VAvd0IvCW*iAUoZYf4XZj_$7xaL@
z^#JUK<;=o5cpRMG)V<I2d|kBL*0m=u-jvKRH_h8nxdKFKV+VvS3bVW*DS7y<N*8*N
zqj449X!}nB>OEUH0cqb8oU6~V>xme82%+izJqK}9dXu*IGFJeSlbd@+pM}6`UhZ`f
zp}q9xdB5gasI5F@-gt$AhgMx%*MFl2=pGPN2$2_x6Taz?5cLlIJd+AzjW$vX<%h>&
zw2ymyBx$-I#v+}c;}8DC|F=2CExJ?-Gwu-Lim`t~$J|?73TOfo=@GYvc@=6WL{Ex8
z5`iv<ZfiJ>JbNEhzB4&H?jRm;&pZ=hkP#KXN|>kRmMRat^!U0|$d{kL1Ad8ZM8dC>
z*`2mTbQ+ovf*$v8390_fxo!jGNv|4du)737vOv3Ea7(AfJKtJP@8Tn~EYX)mXYRB?
zRWItY+hS3T9s}egC$)T15lZxuz%|2s^#9jH9A=8|&ZveU*0^A-RogDQIDM_~z=3p~
zMGvtJER`MK7<*SHDqLn~<C_YWavc(0hF=BH#+t*2`(>u<_Q6?C55ZYM2oET#v%S1y
zZq1^N#!M$NPj@-LwvgBkcKY(WSL@F!Ag6LZBe>;Mcc0=GObwEyR~<wr+`?@NA~5s%
zbx_AK;X?1-Q#G1?Zp9Doy8I!)X5P!sDqG8A;Qz#~qBtnpxYFU>7haoA5CE)(Arw$m
z-qn`~;eK=T^0+yb*(dnPXFs}C>obVH-#dd^5QslqdevpV{^gex1#+p@yW5qoN5)z9
zn#;bC-p2GF1Fcq#QlmQes71X^&%IA>8@7AfE!lg2R`z$-_j>n7WA~nQ+R$yMfPd7n
zMKB^piq32+*h%WET}ZqnMF9XfGS%JO?UsKjlA`PFuNnjnqZ-C4&VdX4-#hlU3-%+e
z-WkIys6zjE7Ui)UF@Ul56n$fYBfP}qeR_co*zRd9&R@O$r_pI!dQD#dHDNMT31k8o
zl|%SH41V@Q%que)e0lpw!sD2!65IB$P%VR6sSuc4?g+HDB~6CH*sO9)>K_r&BfN#?
ze<9VQjqVqm6SN{vRhe*|OIJfSwhfNh+Z$%F7zL-M3W@RIO%1`XH`%!v-As&iyMVb}
z1#`32AX4g~-;UK}*alBV`DyYa6i;ofzved;jsZ|upmp<|Oxx#2C8%5hh0fLydh*LE
z=N57$$oR$Hd!+3TXs&A^DpjW)cu55uX+IcG<&#i}Yqwdr39nhe5k%xXVlWUS*=}lB
zPlVz=EKejv=HangRNDBm9tF%y_48OL^$WGgP~A*yj~$;JRz`r64bTpTHU4L@jmCQX
z8Lp4{^*w_yQYRh_hca|?)#P=`v6(zkyUeHae30;J5*?xPAu(+-!&mwL*n0CoDz~<O
zd^f67NGh2N8A|4vP#IE&q(Yg;%*i}EsVJc$V<@tfVcRlfCSzu`4LjRV#>^p8rr)(T
zJ@50r-{1M;Jm)#5d+qyP>l!}S=lZO*@aS|tIO`snH)cxpu0Pl{=VxL*4_A!1u;ild
zWgz1`of4(wEx~sa;Zxb>1&jd|4TJYui0IV9M7FB<lJ_5UBQ3B0uI-iSddlqCKc^gf
zxBjX$Z6i01AgUm)e$?Xd>wuZ-kgebLuJ=jQUwys*n7c$gMdU`zz|6?z8NYS794jzl
zg;8VeH_9yk>cgG(Do~(esE{Aap#Jt=`nWHKC`sDw<V`71kD>|8nf*IQS&)YNQuWEK
zZS4w6_ln1&oDaSA<vE3SV@^P)Tb_mu@R#uWJ10KI!FJ5=a4q!xDq*sdU7rK6*=y0)
z@;gIqr=n(wTHc{$#2k)#Wq=E~mKUR*0-_7cQ2_h5k{rOAr>sBzLzNK8X|yPFJ<>dT
z%x;IjK9p{-X9_9+%v~Ln4r8DP8Tm@=EOUJ__SMm_*kZLg+(!JldDI}pObOhO4u8fd
z6Y$rH&h?{y&o8NrThBLnHU~7yNx$I&X<+{U!lTRLf|!bVl(bVJujC4s+OL?xH350M
z=^H<+z1o*O83#l&ZIV7vHSQLWStOVE{}B<b>qjfrd0Yn)VQ{X^#ke!`8aHzUD{!+i
zyD^Ob$1(or;Epz`Rw$W8g!A^l<OsX}^o+fwN!ZaYt6C=COT{O8p{qwQN@3hfVJ0=6
znA$5ye6_SE)<_qeiqYaDx{7<tjEn-&tfGdf<aBsiim5x4^#_b2^Q#LA&!dj(FBt$N
zgkuD3{ERFRrLPY~3OWG0@d#EqgS;<m@&p*74j3Z#<fu$NG|61!JYK6@p}2AeM{sSw
zF~==$)59baMlSU(JRIZ*fNs)~H~uMZN>y>AHDV>Id^vT7WxaL!6D+axemJ<JA{2Dq
zftCp5G~It{7rNRS6BuK!U1&G?5hg1Nu2BN6Z%W{oDhfkQyVQaan_+b+09W);*hhW+
z)k`60ysxFp`7DGF!kHEc&k@+MEj-m7vlrk-$<;vS>+reEK0>NOsNO&QqxeYI7z38^
zt+nOhw*i*W2aOxV!>NAHPPcJXQ|W`eLc^uhtACEm!Y<llfiU`~|H~phfE=9{<bmG+
z7gz7S`vS=odmdhFkjjVxWq!IYi%eS-g>qN;Ku&XLYBE+Up<txKDJJxf1HABADXO^q
z<NtF09RHDP^~om@<|E7Z@W397KP4)(?=|hfXn0C~Mn$y4tqrJCwz6wYo|&w*eQM}x
z5_ccRieNppx$dpwJv+(hqI@$1diamd^a@A_AVh`7(~En0IJ>f6-={C5EKOVCb_dl1
z-XFIt-)zTL?Tf+tAXdlJ5A2^RUAbBGfQ?;UR1bJpZhGCi&x^)CZel;b6cmb?;w+j4
zh97TEf0qP=Nv+Go`>J;p&g7?P1Vs{RDv#`F&HRt;pB9JH_$pkt*K&fv<W-2QWLXhu
z<xw(HBeWRCA=K>E3)$+X5n?GX7i)C1i0G_5`XoEn*CL|c(KMv9>t^j=+6&VOq#aWv
zK=1wGxy+*C>Y~;y0}TC{1?q&GjtQ<^@x}nj6zSZR!gi|Jh1MV=F=c&&uE)jTKca|f
zRP)!t1)c1ad`{g6$_9K_Q0sOEh>3ZdR<@iP{lSs%9#E@x0aJU79&+2gO$xhnuV5!l
z{-94{alFbd*o&5d8a|i|ROay_z=QRFD>YIFOMOdn*&eXsrPY&Di=RmC=WlI~HX{4i
zoOJft0i@~9r@`Uk$2v4X^>c2b90prH3LFlQr`rieKW?YJu!H4c&Nq1jQgYaT&iZ6=
zHVqZ+YPBWnkY4c>aeAw}oIP~sem>YdW%$#??09fUB8EK5UKj;WhTAI^JG}0CySNoM
z*adJwadJk4d4aT-FV=JxmEh-2@O~|gw-W1H`bLUDFca;Q@IQs(0kG`|%Cs*=v!>qC
zW3;w3xrm^8?v09n0Jw?`vRb}z{g?BOF`T|<Y_M)t!VfexJ-NGT3x_rN&p_Qu)d<0f
zH!c3-+H+m43Mk#N{<k!bs0~)W=Do7%H}<-qW#W3*E4it~fR(HUKk?0t%VPgf5dj`P
zKMi_<sjY&p@*)0n)mU7U91}p`$(Km?)yOJVdKQC+vz(2DHw-k74Ac58Lg=TY!r;we
zeT`87KcpU~IH5#ndduTK0}vD^t>1mxH?v93x5e)M#U<{xc1~wO^^TUISWN%i-J&L^
zNLQHs#S5B8<glJCL*$;#1|HQhMF@GD15GEjXy)3)D7s|lawR+~oQ@k=jJ#IdM2qR*
z9LG$8U;20af1Ax=+dv1HuOeAX*a7Pr30$!bRH3%DhMX%oTpN?F@r*k$Yl7Q>6KAR+
zYbk5pvM$}92}vUF<fNG5hDF2LL^?@G!WJBPzX6oMl+c{n&G(%L`Pz%8dBT9_Q`1&^
zvsOLg89y|WX9JGl#t>y;_3y&!H}Ym6HfA(>v{;5gw9A}z?UmG}+X+MY1ud;`o`TFr
zat^ylNLno8{CT=<cmD@HX~GG}Z(g9JUcA}+bE#vrK8d@tM3i&|a=L#2D#+2AK3%aU
zls%VW@Ve*iV)-Q&O|TMkelJD%pNY~rj_%V&4<Tca9N(&a{)O7HKX;Z{tdPxQND`bU
z8sU!bCy<eWCg!a0NV=89VU8cgC~+~nGKz{jSbB~Z%@1=cB-0r0C%0Z%6LVJ2|I6uK
zS!G4b27D$^o(GVjQ$5=9z&?+(&XA?Ees6Vkz)}aiIzV(HuTQdR$vBxIv*Jm)Vmhqi
ztK)m%2U;RJ;5F=a1}?$s>^;*jKvcXTP4HMxxAWJQ20v^gpJ(T#0f8nI%1WzRNsZ#c
zbteF*$2ynEO)zc7X4yOKOc|e&(ehVIz=WC7mO-p+H?Ph@X7rl&KYsB2DsXb`yu8%D
zlHv^%uJuDnA5|GiwoP3~)R8C3{UnKgzXZ^wSq#}MA+a`$@2;d(R15U8h*HRe!|F)Q
z%M;j;x@%|FuaxO2)tu3cl0WrM$L`|EMR6W(yC|+f2!65mF#L(Tu)UCY7J?GtaNDB$
z=BuJpa7Ijs`}5Q8onp&59Zx2pM-8Ryq<ShGXohfVb1A}yCxFPE-ETM!QP-;lz{)eT
z4FDR>9RI;algUN#R`0VOL9fXk94vBwxJdHI)5G1bKkzz)mymwDdS?wtjjF`f^om&w
zQZ<I(@%vYFJI|Hs|I)U6qYWi4^r!tTbNCU*1KW!sVq`=G@UC~@|GsilyO`>|#FclF
z2Rgi?Jlpl6#46t2A~HvD(P!9J`OBfaY?^1c1s8oz$}HaPUMRbQRt+yi9_|SElLS(^
zxH~X%T2-pXIxh1;(}nZI7xVTWWZAH_P7{?yHFXn^)lk{(KJ+7Z!UdKa202C^WH$_Q
z9MBA14C@5sUE-v>94LNDa&iZxnm4+zQz?SCiO}o5V;m3YBlx;8R%{0miA-*_e+PdC
zh9(lhGb5XA0~h^Klb>7`OLGBX;5zAkz`$MW{O@t%RdXCwFYS*1x`F6~<bI&iRl-?C
zB5f=g0ET?M1Um&YUZON}8}c^OBg8kk3%;-97=&R$7`>xTDK{hdJLI{`=D#H&zb-Ag
zVja^gIF|s6SCDUP#2-aj52STPd}+O@vVBmP=kCVmDkqN=J(YTu7eFsc5hn<`fCqgP
zz(nftpMa1DYa@fK*aXodBsgD@=~2C+LyYSyi}qLfA?L0hsevy~0$!)fbAt~zFI!K_
zE$`&$*bo=9rV>k~67jj@vgX^!8+5X5cU~Z2q|D~aECFx;{zCKoRo%!0haFp;vwoB;
zj2KZhbTus2CN`#<FRi&U7&2*P@M;SE$%Ts_{y2F!#*4?y_~|P(i%zL7$`PL-aUK_+
z^-Y^?&QCY`qi{Tz$Cm*vI0+>~V_pW#_P^<!IJl*istSls&Up|Uz|F_+B!ASLy8)`<
z7jEfmt?vNvtQwFsopLk-hgEpTEB9_;8>NyhUD9q{Ea>^nGUE3e`E(-uy?Pmi!<Put
zzkx>Iy$r5}&*88v!PaD}olg%LxdkUR+ivHwcC7J;EEwO!US|i(*gYO7a$|~7>)8J#
z!bV7R%D^3SHjUY^SNFQ9RhUw9o_?F!xPboC*nkjlQT+?_sAraZ+h{A>a(sp`Itg3^
zKwCI0XjvAT2~l+|%gf{TdAo=`f3*M;#~ispNGAAaOY*ngZ>kxR0tIHgNA&xtGD~>D
z=i79#s?ec31K-cRa;2QNwgmoqkzDQe!&#Ryaale-<)XobF2B;QT&%EzI2h^@c~fsx
zCPv?;`_BEGsyQ>S(328oV8o5<1E>~~-y1jqx|NZ-CMX4<x&%~$^kNuZ#VsqEQG-G3
z7<O9J{edWG8lM8ux@gi%C2uCAG5p}od}Dboa?lSnK{8g#-LVpPZb)lIO(de&YLtcQ
zgEpk6@q-{otLL4#NV#K>13A~fha+!>#ZE|#{E}U8fpf%&EGTnU@E3)OY)RObo-kpD
zA?mBtb|bXo!v$tiaRIWW0Ax$(A?1In(Y=U(iv0d7JU9aHh%3F5L~%<57fu+jHZD&H
z<Snz@wu$Obw{TnSVn;Zdk_q^ZEnOMr^#Nd;HX(eNGu(RwDMn;>8-Sj_YO=urPuGw!
zDQkP3gz7Si+fbO5Upi_b)jBY^f-K~b92H>>)OjU;tV%vi?KDauhxuSNIR9Xh0sTaI
zA2bCj*skOYiyCug(&O3Thd7(s^G{lK9s-!hRdC7DC3?((OOhW4OcU$d;^vb0`mG-l
z|3L&|8;R76_6Cmq$hCP5`L2S6r}5q^g?IZgk%*U&f05E1Qw#aAEI*JLk~1i-Bph;H
zi!m;_pus<1gCsTaRaNjnGlM7v3EUjyvB3w!55gK<LTePJ1StrJiE_l{-K{X7f=v%K
zBYab;0fsG3<qdYb66#O}d}sD*r9hH$2k-$2qWAMCn>af}Eo{LaQ^B)O?UO^iOv3Xj
zz`xdBl<g=O{elSwuHyGS0mgrSl?{hMz+eU*;B3z8&Rk*L2Npaa|GSA_8WXd|0icgQ
zaQhvEpw9!dDLIEq<Y_5Vy`%{l^uk%bU)3S3ZV#pjK_hkDBnM1M5P|qX8K6+CJ{$8u
z#;_>2A^jtE;Ok2+oFG0E&<yQY9cNqdr4ZC(*!hGh5+!4Ka<=!cL6ybgD;UPWCH?E*
zVzA%TY$9EKf1=)RI0HYdtQ!l=U3}MOLVlfx@HFa!nj?$XGmN$PCwauEaVyxoDBTu8
zo+n3Nycm$(^qZFfkjl<l27KT>%eUi~KE&~sJ4&nGH)7UGua`3nUJw3^!0vOyQ5A#S
z<yPxs?MT5gXf7UIwRoppkF?JBepe10u9T0qQam4zZ68@Kg9?jdU#qc)#1z9gY;Of9
z1x;IiIqzXOm>=+TicG1$=<ST1{y6wC-!o6voLoSamn|Ri?S40S#vV~AsFkGV1++*s
zflAGvLV;jcJ5dI;@++v7Pc;5;m(U+cra@L9&)C2A>m|Ucj4lT#1Owj|w1llJ-0!#Z
zc)==`cMg*dhZ9mM>yDJG&xzk!>-gqq-_F!{8b@%c{*iGsL#CefA<H;_+m;~g%|0Uj
zZ);1`z9qZy2L#RvVX_#T_dnG@sjuPY23b?2^l?a_<ng$yQ5a<5fL!kO_NTFoI8#%i
z9D)P9B-i#Hf%*a&U3Z^C#O^SYbIR^xq`hQW$pbUVgWCnIq&j9flC0(ex%0^tPeEm<
zH)6#tZIJp~as@+PlRm~&DU0F<$7X~<BPWrXgOH2OmAO0RHqzEO-p1B?R&mK46PjBh
z0{NU(<$pP;l(y3}YY0Hj?dkwiK?R>hF*uXzGiXL@F=rCd0(kB7TG3b6L>r}M$_CoZ
zEBG^jIy}<k2}$2gXvs{npi=NUR9g@mxln(~7Kt?aAucSbY{c_#%sP}W2rCNlgl~fG
zzCKA97)C3lt1eJI^J<t>pPURrT}V3ULQVs5uzNuAAa!c9@J*7@mTgm_z7<gjS~-3l
z##m0BuVUAQv^Y1PKjJL9b+5e#rGpF3cy<&Uuh*?5O*Gl1IXX?B{N@LVR;*45Rv2E(
zhWuKn>zD|yg%uoBOEWDAHtwci`k@U0MOq_oGw+Mu?MGlv_5d06FEAp=d;h~^Ie1wW
zhbcLvkl^?ij8Om><%Y)*3+vdJqUAc3jqvv55g2o>@MG9IR3VF{eCLbKzsS~f!h4O&
zYZ2OVKc4{7@^NWbDQb9Jd4p1j{}eiy32y-(wdrjcJ(j(>0#cK^&(&eB>t#4daEvOU
z#jKraG8(34_i>V*6H>zVD1Ycj*bF3o_e&wf-Btx!vQd!YZUyp_l@<X47!>!MTZ7Q%
zY_i{m=e;khvxWK3*KYu<Id+#68XG5iErM%;y5X4OEN6X~iZ6HL*LTu7pqc|T`YA+L
zzyMwo0PO=WfCu;va^UZ`^Sq5Q>e{DU;kj-MK&-+Ota*Ko$r#&iIx_CpA9WII@%E7S
z4d{_xxwPms?&EMkskxV{FvE`mwKAdcMIAiN73WotG=X-ulOW|C@tu^Jsw##2N6bZL
zO=efqdmyXeS<ouWxJB<T@)WVg*)b|!n{oS=r0Ha?>#LrpFMj}%Y2gNxp-31~7-i;n
zV@kDInH`P9^H+3?X*Gl0E8l`$VXgHa#1H{8X9-ga=M`c(7*S2L#Q|16MRE^N(k7w_
z<)F7gkb_8#Fhai-JZ}uV4S%<B@IK*e$|n=AQc1Ez@ZLzSvW<uOp#O?{<_!f4YL5;k
ztmpnMSp{KX&!Mz~e}MWibvt3I&gPB@5J2ie4aMJx<u_LFeZJt2Dy5q*xs;+Sap}9%
z)GiX(0#F&S_;oAq)(ZkQ!>6K<F6Ay6eO9L2ZUw&4sL@ucX?MLXIQDExeMyK36o8Xu
zsD7TGuON5ELwy!otE`+fphku_Avd$|{*V)VDphR*pmOjfo;pE-&xqhE)b9X2vlclT
zczkyn|Mf_o)+^Q8(mEl#d#^Vc95S6i>5dDsTrX!+bv`%FFOSug9=WWZmXRR{pysdt
zi&Z=s%Gu@&<lZ1dwJ%5t^5{#WVZ$}th~xgBM(Hm*c=wO{g|p8_GKsoDcc0KV6`-go
zvMEO&VLldH-va0o6j6k=8O7)2t2KrzfjskmQT63lkF02iujL%rcu7_iS@vBgW}uXp
zUs>`;<@QO87g^dq2fCRpWP<UBchyJl>MmkEEfZErbwH$<_adaX(USUPueuLw$#Qak
zY7@_qwQcgWt0|C??M4PidO$vnc?MXxbBY>K{3GB^(}yig;t*ru`a|sfG5fkeFh@8G
z(nY8#1X$A$@zRsOYys$3XamvcKaB7o1(ZmWoW`8_DyUTWcr|x_9cNf9_o8DvQ(N~|
z1em+~N4CQyd+HqY;K6-wArgWL>7~_Rfx;nT(}vnfTid&y<I&L5FiJe4xUsT_eWXkT
zVG+FwUv~++gzP@}8F=;#GP6mjMetr=<6_9F&K_y5oH`#88*mZnQ1bKh&xgh&=fuhB
z*DHN00s;u4U<lZhe`#|3e%CMoT9QS*rqf{i4qccbKUmMMm_%x+hp=6Sw+j>#z)R5s
z!uL->--hG{lgHrO)Ewi@E5X4*>j_o6=(x<3vPR_w@TAutdK<2b==3VVRNlRWekLBQ
z&@~u-=3POHN6}O`^c&85ydXifiFXAzwh7v`7)G9k{2+3A76YDk70%n844v5rV%X=T
zeZsR%AlcYhmYq^=26hqZ`8PVijx}Fc0rKuZzir6ayYi-$?`4-ZRASan)^F->=J3y4
z*(~PR?3%YdmGP;{s>_lW0(aZBdFZqZ!`l8;Wh1V_C<?r@clMw$b`~(j3AWZWV7*fQ
zWqXf11>TrEQbr2C&R*KRSJ}uMvRxcfk+o8&ooW8{b8;lCyBqM>N{!qf(8CFD;3yy7
zhy&yIsfBV3)A)B2CMeF!fxaWF5X2#ngn%S$)jVqAGj9oOYn<oV5~?^*1lj-uZ&~wh
zbJetR4UvLYa)^l^lxb;7J0UFjr+{dB%fxQ0!1U~eWw_zEp1%H}@m-;@2ix%jt0q$8
z{9f^C7nlJ5rfa?fcz7%Jn|&`S#-ddRRT&uK5%6UrxK`o*6v(7RL+Bg`8#-zaVsx@m
z1&=kzJ*)BcbP2|`9I}mGYK!!mj+5+h5JBv7#LI0boart!jszNK5d34&>xjj;P#G7E
zg-H!Lf3EuE6o$gBGG3^jsF&#>=D)XdHRNfkHt>+}fp(%M*=(f|iARjyZi3XNlTN=r
z*;Fm&1>OZ3_!IR+sF+v@ntn0Z{1GWp38`Wldow?oSA4XKWSCfS6VV!-<HIK!y(MLk
zmQ>+TMl{%1M!~c<rApeDYiMf{jvY^dXc1U4ecX)zjzP#gT|A3dI$GLOGF7+U17&iZ
z!l;0h+TCCVqVO4U2oUc*ZgC)g`0?`;JoUJM7NLEytST&2OZ+SJg7=AkAkW2it}u#1
zee0tTFZ^9Vyi(*V3AK5reDq^GZOFF1d0!^us^%29T^Y&pla-Nt-YZ=mw*Xp%!CQg!
zRv`Q?`>HwA(x_WAYJed=BX1{eO~<rBrwHIG@`rTrq5LTLJ{;JldA68GdoA3d(CHOF
zbnyl2wLKc&)4>ddUFUq#*0CYj_jc~iuBMwN<-8zyYD!O(G2Kz&3cVJ+xW7z?127#o
zp#-+&0wdCgeVnZ4G?p-Mt$_4f-bNC~j94i%s(;Fx3XMA3U16|)gVyKocIUo?@Zrxq
z3b{HG)vLTvl%pYB&pXD?H`QH%k4+4iQy@`KLQAr|snqP6VR~qb{oXU*1c-0bK;hPV
z!FS6JZ$pBWw}gDK3jS~aBu91$m&Vs~WFBL7O+E(W6D3ApA3Q(-HEWN?2R}e|qi6jf
zCV=TtpktQrpm%3QKa3<<RVW=@5)!edTC8$zH{>KrNYkOFJssW;`Vr0D2j<7QrXIqx
zs5HiWj{~!Hg@vX&(v>4Hxq3a5*N!a1$Ue4MLEhzE_}UKd=*kCH=g4Oy=K?&5Xe2pq
zes3dp`QwwgeSHU75o&6@ZIrw{oHh)1LaR&D3AnUHP2w(Oy*8bbo-U9SA!wtBfT^H^
zy#P=4EW<5fu&MB6YPp_6F=qF#N#sa}EKIa{C9S8$7EJ6s2L9|Q2CY9o;cH}jS31~o
z%N{afBHmd|x`pPU;)i>@{meBgX!_aK%3YqLPFT)ab+O-v(mYG0>f{r|sOd>hL*4pS
zW``Gaw8YOt*C_Xe@+T!@&c#lMiEUf3y6ShPOFp#?>B(7G(uoDqpQX)Y)Ybs9_7kCH
zH|c!zWBoZO;Gzyyk^S;Xl6&0HD8~#a`9k|NA%ahwGZUf~qk@I@ZmQZq-zoDyo6Yd&
z#@);eeKc+!d1$1ihPvljP=8ez{~h_7-l*D0S7`ppN8c{MeFY-pbfN|WGp~{Pe6H8s
z)eMd2y$p+8_n>TtS-9_uxqD)JPdRK_ggDj=hZ02r@Q$5Of~gOft9Cahx}d3_m%sKg
zmpQ(-z#_XJtN^mLFy&3OfdPX@munblfV-oIyWrs>-mhY-<9HdzDSv(Kz?j(Q;dZUN
zRD7B*3xPO>=82^rdG-DCAn5p?gRCib1?EHx=$(7Lmts5jL*C?vyjf?A<zwdx1jb?~
z<K#zxw^A$l!y051<Zp@6v=`igU>hkwTZ}DG&uL9a)gM%VQ;jEI0(9e?pO+^IXgRT<
zXxoFcCK;VUojDc+X(3<lL2ry&<IO9f0$MrT-e;Psi;i|lYJ8;8Qd_panxGK0!?g$5
ze!B#tB<isqYTcNCY#d@jrYtaL&>^YP76=e0{pKG%mh!_(=3=xJYOhO}Wj>kEefGXF
z=)Lg^M~}n7x%fednnKM9^)gKy4;s-pA~u3s<D{QL<CwrWq^7!Nc%f5(=YnD1e6wgW
zq#@|hL%FjG!Kmv|{?M28L0G<3<;8wjKH!m5zEi`;bRvL7)=(IIYzNpLRb_V!3rxN+
zH~<|eNR`U@4&;JbMfjVg?t5q}bFN6%7k}Ul5xM;@1O}!}eTHs}H?<JT-zY8iqi)>o
zCIDa<n=eSJt!ukgr64I0QqxU7f?aR-+dUdtfywAcn=6hL_9;a_X1=Cp8FQivZMGWR
zJ>eWTq`xlR3K>hhD+|QEz{zg<;5S*+qv-430fu&0Z-%xnIUZ{lqP=5LuADmM%CO$S
zpB@X)GUg9~oVmR#WKLmU<ieT8Ij6&FYOUaM`~+TNk8~((4%sa#aS)MGj(xD8{x5%R
z3n%<3!4D=*HC5wKnRA6yZCfsCP2~z_Di~Vym|Y8uL2Ya|v(2*zi3xS05P~7W<#HG?
zFr^Gg2*s0M-WBHWAigztjUMa=DH_gjMtY5y@kTBBaX|KVMKXvUL>u5S8PDO>QRLKx
zsK0qmqqyeV&==7vNVj$fjLEZmh+LR}ZtT9ZR8`wm2={S#n79KXHr@mxwh!P;bHrSH
zZgXkxc`ft!#I8v^xj*D2PqHD7wx0|^d6u85uF7iu6SSq#(@yAVHhB6RJne!|swp-W
zGl>Tk-hQI7OZ0om4bonQaL=A0uo%a1rqHzb_l*?nK&_&u(H_!YPa#NpLbjLyYtye&
z4FNsV{));_gg<{~aPIE!6j<>14sR~$Uj>>F>(#$M&5jBX*aD;lzrKKe9q2iWNIo@M
zxQt93f?4=b9fw?mxyRknLHG&@X#2Fe$Ngb|tT)J1@#7~L|Edv3makO7`~ldo{r_7F
z%di6e_JpVl#ntFoXOmE|0r0eRlP^~}q84T-K(8v^l|7$JE!?~_1de=vg{l{7C1ka?
zLI1fe&Ori&iY2gzbg&0mZk%P;6TW8NDh}xA1^`&Lg;qtPR>(Dy4QQZUMv^&626eIW
zgMdOUW;XqHmm_*Z0uwj~mX(g^)3Xp9JD_-BMe*$s{j^q~A(RBYAmNJhs##L$b6$o+
z;6?Q6AAJ(@lCYaz?-pYq)9wDdP{X1h&aJ(v9R1kms@|yL$m%R9Qf^UlULf4(xGOXg
zW~8iz-j{u~->EiDC&^2ls(-P99H+ilK#@>E2MaY03&j)G9nsAY#igNLP4_>kF;>?o
z5E`H6p_{tWBv@=$F{&;2Z=?dNd=-5^Ai+p?fHrlBD>v{~P@H^xUzIid*k;dU8p;cK
zwyw<5keitYe{EMN92j6yF&t1veXoF+)B%yi5Nb9g9BpKco2r94Wg6@xOIU7$WY8Gv
zRWrNw!&<<5S<4KjC+<y0yIC<t+VK8&pTYajLuSZ2GIq3UW!{<5Q2df;rF!%Z*LHBP
z%BOIzS3bZtV6Fj%|JuxP3lw~jIp))rnB(S95|{D8x~ukEwrPoVr$Jow=VE5vzRMAN
z-Ye6Xw9B8)x#a)g@OkCW7yNY!0@#)hT@=y&=fY>5N;QGQh9~S_`m5YNq^6Q>dYxCL
zLF`lIWbAdZd#`HiBX3XS%~tkJL{X>q;Rxplgc}{HEs{4DR#j5Ug!O$|ob27=KeoK`
zlY{VD@o1me`J6uMVhqvJ#?`XHnA7-xJ0+kzJ#bb{1tz^so*KF0Au(J)7R*ZAQN`y0
z)RsIc>U-!dsy5P?E!a+HZT1;WF0}d<$<!NT%>(?4z)Zb(45?Eh67uv9U~CxyL%H_V
zwcs}2_<X}LCUaM*Ze%kXT!fVPJfV6Jc6JbgmOmXW6WQcVOyT<S{_b9U$v1qWw7YDG
zHGZ}kXSiAVi8ztCp8K=KnW3@N)frW!m`*tVpxLt=`V5BNlf0cQ4}W!NiNF6L29ZkB
zk%r%Ng^E^Na8p-Z!`|6*XQar?*Y<G-uGUBEH~QI?t{1s4?lrZcU$t47Rvo1g{0gq{
zni0-V#b-j^B=XEptENAt`4Yc>`UH>yXZQvr8fcsXX=XJ_MtB-~qR%RiK)rI?hQ*>`
z;@g)OhLKfIllzRk%iedtp1(QM;@sPz>W0G5YjnAlZBt##fCQVt&CTibR83nWxgz27
zYAlB=Vyk5^Y)uM;k-?$Rq=ToKYuTE9A2NIz<o5+at9p*{=80qR=8=>o%0pDb=5CzE
zN{d~dy)i9=Uk;p?M`PbaW1sDfdCfw7P<XgSwUSjNsUWC|+fRMsprE3Hw=i2DZf(W#
zL9Eeg)1!5!Y6<-xjkvBHSSpv+4Ops~{VwErl!AiBKQl?1wjCD4PJmjFx!04|DcMCg
zncEMWnte<ApVt@BN*g~7x_kouNU5vGi{iNW+PP$gtpOO&?y;L~@%vfSqaX8~;ll-7
zk!-qd`T6H*wheU!Z|t9_F%=oyq~A-;8}g0hk(Pqy^qy6z)?z>OH%zOph`uG`^fq1i
zBIn3y)n9iFH!4#Tl;{uBSR@HQ37!zV7q?GP&GgGdtHU(mzd5k;K4lq>a`II$*m>SQ
zMm~}*r-`72x*Po>2~823$@YN9K5^dZylqE^A<4UOx<`9Nk4Z#sQm&~+KkjbcrP!ga
zn*M-hT8mOJB<Y}_en)}NYb8a^p|(G|m#yBrSg=^6;cOZiYT#V?k_zA3S<(dEh~AhI
zUkt|jSyte+%dOqGJ(zsh;w6%Prx^3|bZ^Xe;|DQ!ZadOYWdAISxTu=$yuY}W<8*xV
z*YM*V1$M9LS7aP#q(m7PyL7v7UAcWmwrZy3nf*}Yu$1C!cVgQ44XJlv&cLn|i_$LF
z9c`jT!k_-Yh*umP&nek!oy2NJ$fas$e>$Y)NYi@8FC)kIyXdvc;X&@+U89y&zAW)Y
z4a@CTyp^iq6m<JZ({mi<;_b+;FHRRj#+U|oksoxnyuYwt_)D%w(AdvT)0c^*t3!vh
zrmNe{1b)QtUD{JpYfF@Ss;C`fUZtw7iL=_aY9kx?a&^<ZuIJOJKUQ%QgjTOLS*3#$
z5BA0wovKt7Nhv6x;u{tqIEKWPKdF%@REaprDHnwggcXuv|G)+W&<y3tr0)1J=lU$L
z6c~gk1*<JGRdzLeTJ;c+SO$(Xbue$&-GZzbUh=7)tlq6qZA&zC+3l#{K_wY{ul?1D
zy%~M+JZ=)w!OHwkZOHf}6!3}u8);fEjp)Z}?;k{`nGTO%+geW-LGQaq&3zi@Zrx`9
z`!B&|e#jrj35`N1v7uq>9BXlA{s&DDyom+8N&C2|<?M&KI)~EHvHqZ-O%Z1hqwW{h
zOdS|dT1sIuxrL3Z`Y?CA&?;gF_Qw4SnU^(84%38@aJv>i!IV8wjJEpbbalGhqmS{a
z%gcZF^&$|Cxd5K^CsU~5r{Bi7l?+MeRGVg{YWtglf-gQ+wB+@4(#|$N2^YA5y9*qH
z;8|Qbe5m%F`0+%CG%=!76jyqv-S$g@bF^h7P3^?o2^65Ec05xZ!J59t)XNnZeUFP%
zpT*y+`O$iS&IA5Ps*juH{cG`?8@Ky5DmITp=s0;WD5yY2^63X*!iV@46g`P-ikeIc
z)tZ;<`9pV9JlP%hTGt^D6c^1<<TBUPoY9ZIIrhLUF<s|rc$@;g$(-=s3^TFG(S<4J
zhx~DC1KPeeYrmC!$5=N54Od6}qOTpU_9uVxVx6%<3GEwpF-!)C3}P1yNP94N-AdIA
zh)jbz&W35y)gmF6>9B`PcCr|WO|sS`#Wj7HAc>4Hn|lV#{&u37rQVpLJi3o$Rytit
z_yc>?x9$i~wbXRA{1CYdWBX=>-%ZB8m<mILjoO%YyO+Vj<;G3wkiY3)9@28j(9=&t
z6MK?#ROkD76l{J32Q|27^ciKGp}n5j7jJdM+!CA9d~^>iPn#Wi;nP!ZjeTH!5K{n-
zmb`k6O7JY>J{=_%cJUCQilLGN?H2H&)oe|<mof9aY)Yk{mc7{@&U!|1r8+u=#QgKg
z`6<~cFw|uFp2L{a{tTbJvthSFkkygl*47*Q1a~kBQ48PbDlmW9YsS{%6_Cy6IQ6;z
zqwNuM?nn7A-{g?`6U8Cdz#DxhZ~W*3E@<**5Rcr=m6!qzD#2lORV9fXjO55Mi0k?Y
zk;5k-P0<ZY(3uuZA;-=NbPg`Y9^z$zd&&XAhu&k6jz@zX?}c+;RP{CRR{{@6=I;7v
z9zaK9{#__A<^kW2{ElMbc;)I#<V@wiipbgr0t8u<?2h$DjZ+D#C4YU$^B~&)7(861
z^B^XYIm+W`ut2zA^j*?;Z_GXUt6PsAMGZ2qE74Y)*Dt7cWZ!dn|0r5X^HDU;x<?j{
zCPOj0QZ@b6#J%V-n7L2+D3p50c>WMYYk&u0<4z|DVl;l{LCoUCze_+$F{Af*+9T3{
z3Ag8z=Ym%t=wvuG#wt|nM*NEn*&`I3BoP`EMKddrGE`E(2+dHJ2gzt5ddR_9k(7t2
z$cIyFEPQgnXBNNgs#F~n1pF`TqK$syE9V7O$Zu4*3qkvTz6P+-RdA!T5CzYW3`an%
ze$|%JdI=eX1#%)cXoR~3Gtky`q6#EiNEgEN?45!iFQ~3$H!Lm5N>)cm3#wW7h{@Yo
zRQXPym=}qpb{gR$2b&d2gVf2Eh`Q!6axK;-1YpR>a-Z;2<iG&LxjIq%jnl^lhd5!v
zdY<l<vIAoSB#>)M5tAOB<y87fhmPJoexXP>Uh(fzHKVR3;7Ni#_y4RFN{&Zpv`%sw
z-G;ehD)>Cn`vKQg2&NJr(53q~dEsEjF$`DVMs(wLEGlUpF$@Xn8(b#LwpN$B%*^{q
z_-qD@oZZx!4Q^#0h&N9l4VAGC%u=V$u!?49v93SYsE+de&b|_s{F{R%s~~GI$h~lg
z!0M@&J~`3Ls@}h8%eW}o-~S<4Eqs+>{qCQQm%c2w`nno*rY$VOSJMW2vggXm)*fmw
zH<eqY2oU(;6xAb!D-)YN*IcH?C9@y-blg+VAO~^#<#zrxi?xZ(4eiM8FO705s{?+^
zQGR|Krc?sMhX@?!9*g(6JF7q4H(D*V*wG+4yJK~HXjNgf{~;`8fNE;_;>R-njq$|d
z%|9pE2H@stuFZj^HA1qVTdzR)(%X=k3FFcCjp0#pi&K8S-zwtf9ja}Lg-e%5H=WlS
zT7B=m=XX<|tS-|_mF99aHzfI~+xi){JZ^cMIb%~MH>xmN%{SR7`9(5&!KZm?^wrN-
z#D_jp>yop|gN7meHFWc=<<ZyvOct&7?vVo5xc#Hia4RvVON0e|$=axtTkxTob?7uW
z?sgi5iiVTes-mU&DZ`ao4drUTh=l5Hx+55U0men`DVF&siK|(%n^Cf>w0`Pb^aWFp
z*TeKy7m)MF&qL(iQ+_D9-0M)7@1#rOYTxo3!;SpqYKP9;^qint`#Ic)EEU?-Km3X7
z>@yn;TykqM6w@|`vz?<-16jIGuX_I6m%_Ppl(|=%S$r+Frz=Nidao+1RaN}zpU)pR
z*284}1jwz|$^Q1*{AB6d6<EGl7_>ZlG=H@rx-e>UmY+qbTH{>q_fsy@uXG4y(=u+}
zV}$ahLBo}4YM<7Q8L!pi^4TBMGJjH9y@$$!f;2LUlMPpf0tc1-%w~tnS3mlWj{3HC
z^>5D2to&JxVqITY;@c$FX#2_fO;c|)XURF|zH&-(GGSg#yBNMYKE7JbxzzD^euj)v
zqQ~-nv<CS7o~e~vVO`_u@>4IL|2J!Mu|s*YJ8M1DZ!)!PE=O*;v2ohw;jL0GJ9|TF
zS&jI$l*EFKnavp+)<1=tW4{dxCd4-vXVz}JT1v&sO&`?uTWsBUx%|6p<CcQLT4(>}
zPYs_1zs=CZm44rWK;I4AsN6FrlblhW(duFsN5j5wS#Lv^UkUA!*`Yp?T=0Kd9#i*g
zGryvZr=1{1ISo`T4Zm9c<<s#=(s9>lHGj?KpIO7;^7)^OwB<DA3yn0h{parbNmp@8
z-MPx5NY`B>3Yn60mPVUJkwU~q)`BmrPd8my>pB1=B}Yfo2YSBkF6W(&4%eJ#;SpES
zVDZkzwDEwPWtwTeL83)mA~;CXK|r?ulCf=KW4JcXW8lkyE}7tI)zmA#H6jgNUAho=
zeK^2$+KQ66??qeA<ba7n^=Ds<@yF3vjOPywNEJj>sa|PrGq@&NE%I2X`g)ziAB=Mg
zU@^DSVuK0D(>JqR06r*JHwL-Cx+WwW;d%C3{QH5^Tf?7Jpu|)t4Nts@xc0>rbnbQt
zT+9Htkf+-x>;lmBKPWGlPc=En{pYfTe<qlEIs~lVDNaqC8$dMosFs(7K4pjYFX)y^
z6F8tq7)3>8+v^*(k9S~>0u<uSVg0xCR8#xe?W}*#pC>Syb4=yzeC3Y(N-`vCGx;V!
z5CK#be{kb%1TIOB?z=GpKSqskHn#r)N_dRyP3>iW5#Gq&@7oBEb5nlTWXd<Z-*NNL
z16I6#3C+gA^H4ag?O!UC@n9IXvHiC661@;?%YoDWpcboCo#OdV)_-ZQdO@|KERJ&3
zqggtnL#iKu@ru$v0s8kmK3Lz`&YH{!F33a+XwBO{jGi<7=BT_>_(WS;uuyQHfH>o#
zhUtQ+!;xV5@CB;rWO9nfAVM}n1&A*)Knu0$@!nb>kxa)`jI^=Xq;^+{dB9sjG{srZ
zfNZBTJ(i`@WZ*Q%03tsO@jRfNimwl1#IpVij49FqS{fYc*}c1<iacv|(dNot>ZV^}
zR6a`U)Iy$bpt=)g@X8K{=nhPgJS0JPc4KVwHrjr%OI5O3L`9==3G<x=q1c9nX~=%U
z`ZeCo6O^^1acPvUPqqLOFZ5wzheauD_ZVY6kJ5=3@k1#8Al?}DyzaAF@<D+RNT3xh
zXx4fgZTdgli&p81K6OOV@dyoMBi+j?;^{sv9xtj?8_PP$%Q%6I?CW5@%?^J%cC#I1
zE&wyl)^t6LyrOCk0ELXza#Ziemwm&Rk1wYO%`thi&{%?bWp$N^s<IFCt|%|oCrJ~m
zA_iS&$g^C``JWmrCI0~C-C+yQ=-Vf;YdRwqy+XJFC>e`xS475Au6}H#)<&g7(ViS*
zxhxM2(-o&hur<z;!J;V<IJVvQmKxC9Ekz+S!JF#AskVO*CEvPFI5U-u(M~5nLA9qE
z)SiWoRK>#{Ju(hY*)FWEJc0z?b9Tgvw_lOp?WrW)g@B___>4(OyxX#akBBk@0^ye0
z|8XYny86P$6jyURqIujbq;CDV(#mGi&iJ%d{Mzx!Gz1~)lIaX=&@%R*U5>610)%^~
zPh!V)3X6s?S^)UIh7-p&6ESx1eG@pJt_cGN0oQ~_=K2XtiYvDWWQ0oIWaH1w*5v&0
zuiv;beG%HOj5I??d%sfx1~OPx*Ixdh(j;B`d#~w^13I0sgQ47mp^>6;i!(4f3&w~a
zeh_1DL$Bv&S?=RQ1n$$l(GQ|Av0(h#Q%7hu$BwZ#?LKq5Sa{gcY0KBz&^?UA3)K6B
z^%dzGzQqU-G7o9_@_GfV%4*MAb757~NPCSG$)(h%C+54-wX^pLO9ob*?wn|GK1Rd7
zRg=97fQo%06BakWYgZK_fBqzt|4PX$`*dBe<m<z+g4$;7i>e4W7ahRl+HPZiTRa;u
z4EE_=W%}2SC{khLQzA05_45tfusPht!gfA)S>U>e$p1wPV4R7vfiX{lB|;UKQi?9B
z5_Fu685AYeTPSb(Q^ioOre^>7BmPA3wMxOxo7ui@*m?Kgl{yA!b;O`<j9u`B+Nt+r
zm@)Qp(0i$yI6lb=;1q!U=$YJ$5UZj7W+d|&smF@ZDwp!AM)YIXT<0$8B@FRhPGOT}
zem}PYe~;qgKjY`b0`A+J)4Uc-UO}<yzgSl4JHjQ#5#smUq?)dyWq=<D6rE-Zdmg7m
zZ}jyX=Jg<;cTL_4M;meb2~YuWf;UTXms|3t+)h;c5*(+`XSn$XzCXT&wXtk^i<W!s
z2rJw60&KAVvwq6OFE<~+95D7qiP4xaD5fxmAEK>Tj0PX4)H`+Ev2<f$?_dkgugz*J
zM?Kt%6uC&D&XAjKj3xV?>w`9*E#Gs(*v0_DQ_dW5bZTrc#)^j#b{aSUhqvN0ic;G-
zIy8To0FeDDNqGWVj<Zl~-mq8iPh~KPg+eyAv%m+#AjY^j&rs0tu0y4%4(^{a)i?Rx
zoTh)qp`3qpkY={!1*y=tcMGk{YeQ{Qv3K%v^!xueW`eQ0R@f3-2XP6tbIfa4!I{GZ
z#;2JS_zY!!7Q@Y@VU?nVZ>$BQ>02iMngIU)nv(>)(iTziH*{X$f>UIK7#G7#vZ?rl
zr%xy8?Q*i@eDjY^*KmCrJIl7iocYVrzBV8oxA==2%^l?V*|*k<p?BUJliv<`+LF1%
zV3${b<3#U%D|O8yfi#W`G?qN4^b5!DdCW~@>sg8*S9pDD#gjYbcgEB$j1dV9{ser2
z#Xhc5wWcOy`U)^^AxU3DRD$*!Eg@=wyQ@OR-d=Z96UPV%S|>1iJ))|kF_ep=7?_1Q
z(WN@W`ERQme&eXhnQ8<ob&FO&nIE5Ew@<kDAHiW|eQ~NR6hwUqtVUs|PO*>zR+3Y2
z<`8?6!ewChfKf3$!+T$~gD)=q%z#{2Sow07b;d#1s~Ru?d(aYr@9BBdXpH?^JC$v%
zs}SE_BWifdWbOb}2*vnG6pAM(c$0A_2zESWHyd4%UA#U8rg`;C4cLXFPxzUSXK=zm
zNBqrz5B3sG|I#p3M?IKjAbm;w`Q$TBDHLCqB;DQb>+Xm~X=8>_CQJDq#{8eyDR69`
zKUg*eM4ikJi?0-`fyZ%h?m2B++87>CKyP+y>0F;U+rUNfjgc?Gt=fw@BNhljypBVZ
z^A$T3E5J|g1-(yr&YmKpWY1vkZ*_eTT6H_-1qcN0uB6m6-ecSidA~};k01D4InhpM
z_JrHeX=PS~t<U4G4|+HJDKwS}nLh2`C{79rQ+hI^M$^wo!)j>kME#F2Iqll9Rf{~i
zEY5k76VnH@j&_wQ#T8#&7AF@VuR?eqlE$fp)Ywdpgc<aB8@hRXxV#T|7-$BfV`z%U
zU-p}6Sfykco@sJM98_bUhyfN$ijU?LwPW;W2G<HpIw%C}@Wfa08c<#rJ!*#NdjE4E
z7HB@*&4+PMeu-=hNTyI5ocT4Mw_I;7?!{a|iGOk&vL25>)<a}s758sJvq5=Q{n}-c
zc<rybA&G`1ulrEqS6rT3xO%x>6t)<_?)un;n-D48{;ZKLcY!j)`y#I85CA`Y$p4|?
zv?e=^%wb(m01&)!pAO>vIAyIRBhSIhfts!z-p8`{=yTDX#|D-yow=xrM#s0#Ej+W?
ziO~TujmShPIE6tLgZ2OMS(8<%V}QJ2T#<(FHH4#OwufoR9M!RGN1hZF1)!)xr8`*7
z8uVjI%Aifu>Vj^8lLFPPzy8AX#Ks5ifn=VVE;hD}8ET)^k87$kPOO{X0_5f%N72oO
zg9UY*+Vbi-k^}}ZP@^Zn1f>7rGi3k<X4-#J{5)zfV1B|jCyeXYrL~9r=h8O{5wkcZ
zU_dFj-nPpv#=$}@nduZ)^=|noavZNzZG7aIWdbmNW0{{A(HPET)R2|zvR??9p**^2
zmMBT)G;FzoSM_Sr<D+{x_8OVOv&KM-G=?gdJ_(u+Iu0Rwel_8s^q9r7F^Nt;If;<D
z1&+^%kHt`e-oYsSC|#DbvFGRG&q=_=Atu<=3qvdbIDIHsfN<J|<Pi~XhG?)~dsb8W
zPH5$^hcEe|r`ym$k@-;P_#}^?7^mK1{ErMvNQ!4;?m%E`J&z^NwE62XpzurCwtiC@
zco~27|5=|d@$9dlkUH*v69UY3Krm8b332IUeELv;NFBu$n7vOZbI!9+?HS_SF!|`P
z>CC?owTi**zwjs~W1<Qc*(2h|Q}eFUbd&=b(+?I6SUlq?*Va?^otlJ6m>cpSokAm3
zV97xmim5vgVzyYO74ex=&CnNMhOg5%KCfjz&Dokk%FbPk+DB>}6-u54)$ycg_osF+
znx(m#buXOwE)8@T22-M2#&VhGs9o1i*usYFygC1XKeh+rXkF3Z1^Z%DElmBPJcG&q
zY)dRJrSi3}QG2CK-y|_ZSzDX(fp)|gTO&7c0Ijaqz)J|9Mph8HWOT?$agagWa0`4+
zbuJ&m<agT=vurZPIU3{%9u5Neo!MS|8dN4UX1B}_4%#8N0LS103(--5<q=Nvr2WYE
zA3zhLkC8G56V1ajOzL+bxBqd_wXykx)<ywt{*c)doe~X$;T7@_c`!tQ)~V|2%&A&Y
zV1DA3P_rG++a;e0++iN>p(2eRf6B5JK=haXJDqQrp2u1%b7qB4ehJPAlCUX;L;y#0
zpgpdddJ6jN&eJcpN{2$pJ@TWl+-e~=<Buq=ZA1)E50ziy+0b~ynV)b1iNG*;WB7P4
zEO>~c32^V;TGkB1+>+v0%+FT{Oi@GAY&bj3FgVE1e8Wwdr*y7l5dQr-$;~TZHYe8F
zzqwFGGIVZX+vsdx8PQfy6(2Qe2n&c6^E;a5Y7*O?YlnH)Y;!@?B{NW4^N}#FE^Tq|
zVET$|m?;pEQ+fM@&WT{Sw~RIeB7u?e5#%Uo>GKNJ%|L2393te_PVJIE3l4{^O)vX!
z4D~2a7N?e-(4sfF^&kdk{f-KK3Q-vK0zQ)X{CltJ>Gj*D^_65^VR;i?tfBfa8uK&F
z!}2YY0iYwP>&oe&52A^>lzU^I{D&@mYXkFv7e^uV{heaawZdMVwv452KL07L{em~@
zezu?L$Ctuz2@m?Q6tBbKZKl-Wn;uI(6Abx48~!D264w~MCe;w;l1X@ua`q@InAoC9
z8FZO$f)t?nvK^hg+flmg_g^G+S>lBejs9_H$IlFpAS+t-n+_R)u)JCmKOk-C|5)iX
z7c-?XYhb1B?D-m?+z7=}WvdjtVBp`9>DE<%rXtyof!+6RxgNCNpARwxXrUp-hs>ri
z9uzD!ku93m)mja(S=bYUllD}iHxmjar>r|@l^!AFQCB1$z2!0VQ#<4>w|XUf<9c-S
z4zdP;f<S8YGMj_N54yfvh6bxqe%Q9vRDr=-lPiPwxKLUe@vYLpUSda^?))JFXKhB=
z2hJ90j?4l0n!*J)MasNS7BAnF3^rWc3NA#{)U-Lxhw~FI^CaZ+i7SmNKn>8$i9uBF
zXr3Si|2RX=E#_>gTkO@lNj5ZQX^(byo!qh#TevXU|I{|CUN3H)<sg>A<+${d3G>q*
z!l_r2wZ6?DERIsf2gC6LLc_C9B|i`4ks~qr(I*3JVxmG^jpEj+ntP*_MC}<dVo8Th
z(!AQoLtL`OkKd;ICb#9=7&p{*^k{au^fzvGWJ>~@jLC=gRu(R7#qnwt)*(zc9?Ci9
zf4<2@aZ$jCbEXdWRe=gptey{YkGwYSjkcD!)OTIvNvYckTc3B53z^A0wzABEpi#{k
zweFxf>{oba`*utlw7tr^-{V^rvWvw25rmU1&tu1J?3i!UnR$j-DU?WWf=C0eF$V<;
zo(<XrH?52POCtxU6{}f2zu!y~x8_2mdGwCgh(Z~kyuRGfO#}cQGMV+~zABA)fa>l3
zb>WnVDqVOhubS<$=ezw!<q_m3#A8soQ=Cpq9v;8SoF_F#SxX{{?j2{}ntD8(Vu(rc
z4iF==O2=b%Ronz@Cs}aar~QX37eFU+OD$BWdOP#sfnBMPZ4keMX1YgVr;!aTTOlpM
zQ7x`4TNWI7g550m1mU8g)Aod)fgb8&eQOF=o(mq1u0S>|cyD`}Z=-3B|L0^n|L5zE
zqS-iSf7W;~r=Tp2nWX*1X_UC;36Q5kA6)Z1?}a0Q^I<LzqH!i)5L!2|q&<)Qa3;Kq
z0sZlcU8p%De*j8ys%t|yDDUi~0#Bo616I_I&b4m1UQ<Da@;n(!_^ZR|T^6MsuJFM8
z$Vn{35cc8mXS<FPpcoF1%|B3_a!}}ov`{9AQtjE;4u~jEg9t$qS9td81HkiQ|KEZS
z%)2j;u|K8AsN-<ZVy+Yk33`5rw&c9ed8`!x{L$@cfMy2#W<UB(AM}#^(Cnh7x4QAN
z>Ilr<JM2`YeYff}D*&TEPhU^=h~g}dha@n`jI<iEpWwZ9DrKsjohP#G-IJ^tUaG5V
z?u~JN_^&ub>!(4f+kS*cr5EOVBpHHKC`>n8R}LCGeT;pWQ!_Mz*5v+b1j;kmD$$RB
zS5px^K=gvtFJT`Vaa&x(@ix^})uhR44uu_!@AyAE9}VvMQMeT&DqPWS45O^3i>i_(
z5y}l6Cj+^#FvEa|>0J9Q?yDw4Wj_H2`2Y?KMyw+~2Yo5ujf=D{pY@}$2&5+X-_T2d
zjx6C287yPIQ<7g`KXQ<Nc>+(33&2gjLrO5>qB1>#3Ae<}wo?gS`9JO3$@^UoqC?pR
zUO!SB1q3|u<1wgGZdAD%m!n!iXLn4?o|ydG|EUO5tVj#+QX;4R*UH_w`2|)351p)y
z^F2)3FO?h5wcofdC8$Vmaxa;=Gdt!4ft#hY?WEnup?MGH^Vb2|+r7ww%cG9&M@+I!
zF`&{SDAF&|tY|6+@tDv=9x}Nfc-YK@avK;!4)ezr{-t2sViCV_3r8i%Ef^wHZRUMc
zrhT~HvFD(0=9R4w>YsvaxGf0M@l?g{HY0@_)0Mzf+&_FZ5d7RcNM-wv!SBP(&Bf$D
zcHI(W1mbn|`&H!ip`01UscMT}hwIV7BUn)T?E85GS`(=!K>-Y6@j%T)2XX*q>c6{P
zaeJ&#1Y{BNJs%-{C2I_~lax7EBpX_Dsj!Mc%;zYwGvq?Hbf5V&=4{0M^u+zQmqVT%
zR*v`<m~D@VnI~fZ?C2C`Ty)wufZF>~LszRs*px1);&(u*y4RIEw{4&Ze81M+$&7LC
z1Sr@0c<g7hVRmj$uQ`J`nbz8qhCU)x^?qP`68Dpy1&0^c4nG4@cTovJ#F#s<tLLz-
zNh*{}4nLWi<!%<Ms)9g;fp0AH(GmqFOOzV*kR^9(2FhIK3yfYfrL=u=f|fKYz}ELT
z$Wn8o1VYPXu=ly4{suTT_rBU>MiTcml4wb-7XZ<U4IryJs8n6xgB_h-z4D9xR}JJt
z>?hNEJ33E(Ryae}p!B#h!{n+to!gC>ptUtge413Uk~2+t0`n83TmbyPU-Zo&)ufE0
zUZ;|#tErIEKC$-zY<$-vskg!p8HX27wpN#fD_kBs%?2Mjs+s?1w|}NMbqVzmxP^C1
z3m|x77qv%j&qe(jleawpn!-=)w!O7}9^3Q0{xclo1Apa%#9jJKigTwcCFW`>nBp#K
z$+fH6bd^m0pV@~WM8Dp@9ejQv4FQH(gmKZq%|t5AieUcBxUT~b<+Z%L7N161GF#%K
zEg#2}phLLi8zC(AJm#T@9e<`=59~F>r=5*Z+BdLvxv*>xip~+j`0oXXVNHRR0^=%>
zR96q$AA8f`+57J2^%L~y75z(*W)goA6{hxknYMh^uqKI-z};XEwrWeK^Kko@Z9#-9
zGBE{psF5(_xqI4JFhTt-?5<`*<im$Hh7WQZLO{hQC2@zc511>+sPn88g0*j%$N#P%
zFt358mkVS-dGA>j)!*2j0U*rt=g-eQ#%j+Vmx@vguPA#%yqei=m7JF@%YpTn@HW0Y
zrrTSC`DKBUXH;64RL^uZQ0#W;a-SoLh3M(X6%}52D>>v(5M5b897WXXr=gk2SP2UH
zU}pu_iuLD)uQ+}6so`CD6*YhJ{nEM7kbg6ixD)tiUv-Dt(UUxFNy|QQat>T!c2VUH
ztFE>%O?Sj56I&jwkHS9=+Y&WsX2sbD>XN<Z3+>-o%|(?<ta@!W8?Fb+G1G(r_4S4E
z>E>Mrfeqo(Ps_Z4vEKcWviaRD;#XKmKCQYV#02SlduGxZK8<S;rXTtqAHAq%_=i-!
z!bme~ui!1qRwl|)x?BZWH^=?=fDC$^DbCc%c1fl#TT-lUgvdmSOB^JU|6S-*bE~6m
z@w$U?=+wrj1p2Sjexatto02Z9Bx4x?I(dcX*UlDVi2uxoE6eVGdhK!;W8bDWdlDT@
zISq~9I;F<?ueCvk{tX2j9KjqAB%#XF`>oe><5jXpFhRV-rKH*^l+7geT2T(EVog$;
zCuNK=!AU|cRQz0Oq$y}M%zH|BBrj_WyqsAPV<D}1#BY{0E4%c%=gelyt(433Jv1#I
zl$4(JL4WtK-JD8XFJoQ)vpK(!xJ>K!+qC@5vG{1JKIem1Vrxxa^^lFP%ps43#F!}T
z*C$lx%0v@>Ds-xB&~SuE#XeAx?J`6J$Cx?L<=FdtY{hTUZ#~3srgigLmT=uM={27N
zXm-$C{n+}SB^j>mX-X(sS|>)jtJ7_swT;@0Z{3<n*F|Dd$*8mTzVQIfk)36}b))k>
z)BM;7*;Q<jTf7miSISRyyw!|`teTD(v3jJ0j|dHoW}4Ka$Z?J(r;LMeuLfS+CFuR5
zshx4To_H$;no;9iCgfxo#+$rSs#8As-vdxVef1--$yF<UtYx#ok=vb@-k8r6QbTh?
zBfRr$vUCm`%wdf|%Z<Pfcx0lU8AcxAe~3UcRFPFz3K_MSm9mfXhyzx1uyvz!zLj8Z
zP*m<X<;NUmAVV@bhn~QYr8xeXK<GN%9TPYPinM3N0&46g;3ee$j+r7uo?b|@BqXZ(
zb#1!ZS&x8Cg{asN4=5epwcw)Wkvf`LAvTuOhztPL6@8x(s80G1SBuiDKQ1;fI@JCg
zl{N9V2*?b9chm2{>tl>WK@%wR|6*s1KOdQ%{8<5>+CgJd^aRqGN(73C{#{<bO=fSu
zfQCVG8SZX{4eFO3q=zY(Jo*=D8KGu?V-FLLn+^f1thrwZcpxh^z@g;7ZgCQ;TTVY2
zSh3mo^KPy`&`oBPH)W_+q9XQxkR-%HK$5k@ttTp|AWuY<I<<~c&$zd6H^hx#dQ4$H
zzF%YE($)^*aWjrpB1g`xKfd@B0x&)TqB$%C8CNINvRy~8-J+SiR2U2-E*$DQQ({Qg
zEGAM#3li^)350jfCQpPuI|B?N18Csd(FS@id(_!U+NDJ$!rX};1EpI8Qo0F^)Bc2b
z8ue1HL-aD4H^97u!^T9;l#h@D;Pz+9;RV3}CG1^I(%7qy2+mX-frjtmJDazh_y-V!
z*#<lmWUlb2b>koizvdzH>;<rPKSSX^R+Ve@!(PVNg^jgAH-&0xHyO(#!$F+>6zR|w
zKtXwHn(WngVwPf*s*8Vk!XQMs72prkLI<aNFt9VCEu-CaN5wSs=^!zC<mxfsqr)<p
zFm&X?>W7inPWivr?oJ(@*5yRI;(f#ikc`h+WOEM`Un^RjrxBb2E|l_Rz7_z|yj@!H
zC$UyNOkATTjKrfKH+Rg2)671;-TL0wK$)DhFk+l3zj@gbN~fI^HSfd<X}=}8z4|u<
zu0Tnr`EuYBHU#OB*bH#LPR(GsvJAO(`k@(NZcGm?7U7zi+1Nt_kdwFL$CylFYrS*z
z90bbJjEgb7ZXWj-XfzzwdXwooIkt=mRQ2Gt@^x@w;4?COpi-4=bJnTCW+i=n%mX>!
zo&&CS_&vbO=1fWUDt|Dho&Lul=?)frd;C81kXCicE-jGWZ5hvPazp7F&>PB)9ma>v
zpII@O2U%SsY?}n;7MR533n)4NzxJ*?s>y5HhiXBKh_Mz_ri!hK6%?6gEKzE3B8mty
zNkC*CLITJTY*kQ@SfM}|MFo)|pv+-(f+|B$MhOrFNq|5?j4^>Qyz?d4+WOXgcdfhL
zd+V<E_CI0BcfNDZ-e(WLz0WzdkGPiUJ1;6I^Cd^Ep#oIAGMruRaCED9f|S*5V+JpQ
zN`raDWtlSqnN$%1J@o(-Cc`;J(}w+KBCq|P2!!5}2cjNWY5Ski(xyb{_@iqPCP}Cu
zS+J=Ras+;W7N)giO2NK7;E_f`m3y~$)PkC1u$)B{T?_#$P_=vXSi8lcnia=c&qed$
zs)_Pj4}4$%61v=NuhpKNcKgI^OEe9FAPi`DH2iGA;~gNB0XU?%#p)Qap29tKr)WU^
zoaoBizO2}wKu`RQQd`KA4dX%u!bvL*V}HN>HYnEf#2=IP0ZIrM0pQQpXipEwtu?m?
z2K^{P3c>RVpubJMKtMq{WcS#&UHfFx8=%5q>!cx27}&2Neg(`5IO8rqK$s>JoBGU&
zgEFyeE&fWh6gW*(6qS|&U@VID=!6nrg7vNg&kqCC<_>VcU^9{cgE;WS6OoadwDOq*
zaISv+OD0ykFcm+ab8E*-B}!NZYO{{bx?q56fY@~M_Sz~V&DB6k%D0ESE<y+I0jgFP
z;1{rfV&Lt-IY+42U|@wrX@F=AwX1^nz&-!rZB+q)E;CbCu9ScoewV9#B^IC^K+-z3
zmv!a2mL)iRsaYwz%ldLAaQ}~P9q~lWznG-m-B7QiXK-ylC=GSLJ~6p(|1vYQ8M~f`
zXO?guJo}Lhkih|tLUa3l4`6UZ+e_-N?iZzMMAPBI%uUL()(r{;cTmaLb~yt7Rr}1V
zBW^un{Lot-vplgl=qjAUp}sK>ZpGRmIr3;zdy?Kpg{J^ffyf*IVyez)5FUc6Qczw|
zyLCkB9q67JO(8zJ!dAT8VK7JD1<3C-doMXkv3%m}3F>aeR0(C#p}KeA%Ibm|4RE4b
zp!EhR2=sw<-ia{j2H`*{I5S|mt{7%+1qPEjYYDy{DGnAROTo?!N*yS42W|NNq;^<!
zB#?>)KWn#(kQ%V|m+2-3iiO1#-2uhg%VY@cYg?vqMc{QW(?5J5jfWH2tn!>4SHZo%
zC}3#+)@###oJ6Td!>f-yyQX^U95nDhg4ShcI3$9#D_7gMTm-a$SKrj+cF@V`G_apy
zfTIKw$x7J@`=Q)|n5Iah)kb<vgHj*`_K{xe0$2-D&QFyH)>Lr2g_zP4QRi{CemAEF
z$YAT^$1ne*A%YbGITT<fcU&E*-f<ON)f)&(V8LvHeK-}4QZS#bP@OFl&jAMA012ur
zJW!nd+aa@Z>V*_l1NI?a+Z4cUDJY~ZT+{0>1C}WDq<B1D?3r(rJzXr)w_rAkK|NAa
zo)T0xE+#5tg{XP)Zvl`1E>ow$ffo|TszPi-S;1(V<v*780Ji4a`0t5=;xsY&nB5+~
zY4_+NScXo(naJO9H3ckfXcH04JP{z)KtP&w|3HjjFm>VqgUWt=SD^A}Z=npwesYU>
z8A{CHExEzpz;9PFLDT2bMA_p65bcS{TznaZ_?Jw`Ay}qhXiLE|bs9k7p_t4W5s<(h
zjdTX_3tKQ)mh|$@3$NvWMmK{c0BjhQbek!X`F67?ZPf(e*6gzoF(Gfq)yJ{=*J8m_
z<<sZEQ)yrkh_{eLA2Eop#jI!p;E7R#92`HIKylQuTVAHH&T3CYJWG(#)aCFi%Bxng
zUtzy>gpTTYIOl27OAjjKUx;Wt`C~aB6mNZ`XzIVXa+cvhu~?M?l?b>|`8hYfSr#i0
zzNCF7R&C2dcRA_hcdE)&Ko()<T_SKl_^(SjjaSQ1X)Nvmr>4U;pWN`2duxXiIBuv8
zI8I=~PShwH`ijyO2VMY}DGfiLe6kSy<J>TCDykd-1I?x1@jCBJ{|L$%#{U_Heyn)_
zZ9J3mj|46B%aeWq7k)wIg^)IJagG%9id5Dc!&R_e$O6x0imc<gXMKNt09Goo-}=t%
zDDd+7{lIzd8B4oN{A=Z$Y``$)&->RV`+}eDFU90KIvL^K2ptSm8hvV$g;Vb+>r0g~
zV)CuVJf886NliZrudB2nsTnOPV-j%-9{0{iP|3Pv<u6WkXk>6F?y!AoqbnhpYnlEz
z$%Wvvj}LGkf+V5|?^kdj!F&Q`!3!~uOMD7b;Fa&VdKAp!>FHX!3LbD8f42u2nyJ#Z
z^hQ`#d6d31votfHK~k!niR@sEvIlOV#|J1cbr;Q6D(87Kwp6AtbNmJ_@k4!E`;vr<
zi|6|A$)<L*Y+px(Do%Yw-=ecn&$M5*HlX9K9nBCA3^wxK^kx@-aQ%7vx*Z=EAB$h8
zmTT6DgZu8ix;Bkh@zD_hh|Z&uaz}IOUj*jA%Rqdbs(++z|1}fzU%WxEM6IRXZvK@d
z({#5=S3-BC?#gW|S6x^w@niJ5Z&$85v+9iEBg2a^>zrZ&hE@Csms*@dcXdA~DZIM*
z`qRMHpEP)L!(Fh>PwnBSdhAnUO8-PM+CMR@X`d)W?N5yCxlfhj|LhC!vf}6(%-z6o
zWKC>rVQh6mtS6#Pb;LxACZ)6y=5gDN-icnG+naEm&i5POAqqI6JKfA#|2tSm(jVF%
zfk3E@?Np6IJaHe=z7kfImro^a9dV7$kqEf_hr*0SJ$FaU$A<+>sH?KHFqID|`w_-#
z_87xDuIG*~zXg1U5L<mM*7IzX!g*uZOkd}6Q~+~1m7By&jY(5g&5BW!hVA-eqDxol
z)O*mWH@8YeLotbnqM38-@}wYZWZ2H!d0XVOIbI`qI;hk7i-42JvujNxH(nZu;*!fe
zZx9nP`L8^H!FAb)PBY5D0P7S@5hR8kRCDJ%<Y0;eZSYw=_}zwPW@qV4m9_FP+<Ko8
zw{C@sxKx^(BLbnPZra|~vVu8$;7J#<{*oP{?!Xhw*^XXg)5)~RUJ%JwDs(B{Eg>@;
zfDII6G|-Q=bTc+C1v{Z?_bm9kbG20)Jm}#=43cTf{^D6*&PLe#{iRnDI}cv>-}|gB
zeZ{2dlX=Nv@6FuwM{&RT>Ivs9C+~Mpl>vXJbSRasAK7EVNCT#w@m?p!Fwe9lv?%P^
z^Nk*G4tug8H>ogIP_igUBl2V7H^Dyez+6UW9a0@3tRKmA6F$Nq<`apuz1-~B>MQQd
zcJSq}ojSrI;20?0d1i3L8B3`F8arSE-Z*CN3(HMt0{2EARwBPG<G_>C3!D$7)+?G8
zSElQK!`E!o6mHkDI$Yj3Ey#2v>s=raXZ!0f6f)uX>P@?Hi}K#I*q2erpqqYZ;^=!D
zeg>!of@Sx$C{FgzZALqDZ#+wGk-Jb7N3K(by*~hkf1OxDG%z@6wM0HJ<0>=4Z;Ke7
zsq0Fm#cKE*$|K~S&BlU|WFh`cLYM6jh6H%7Nbkqwo4(g<&SHGurB3jbHj!wuhE8N0
z3Z5NEZ@SbL5$FDV;X&oRBBtGx3EuvAW7pstQ9mM@?=!xqJ~{;318QMUS%ZZ@ILM0}
zh{h#O*rJR7CL1?pz^tO4A7^+omQs%)YaC}YTOAuQ7Xv?N?hd1I1V8cxY122pZ1NO@
zk4u>ULe}%@GCBP-i~K^t>hJHB`Mu3kZA{H@=sHqOk6447tw24;BId_^(%k4mawMUM
z5ccf5<TLk}{dI2#M=FRt?kw0%Jwx4xY_eXEFt4pv=vWdKu}jRcHRwZ_7|~3WkA_Fo
z#o+HL-7w9kl5_Ix7KTa!-iIAL+t9psKDg>lYKiNnsDZmy8({PBhuZ{0{(7F_{l6Vh
z`K*7}@`ngyiCnNF!LE!+5a^o;8ax<x(Bs}tL9}~IWwk}a$dCd%gt77-Ntgf}Y1PlV
zxinLUo_@P5pL^mp+m$*X5!zEqem{uu0A+(?XE+uM4OHHESXU6%`Sm&Ojq_{b0=jGv
z^Cd|)a+8+gVzV`6!`f9x=+YJrunf(I+w>E96q?cVQXi%M&sIBcw?)Jg`0tJaj*u0p
z$3291SX6R7{d?>|vOoNVV;bvL)Y4`+ZSQegdsxF0nuRRv$iA~3NHq^Tu`upw)(+7Z
zt)3KtGJNT2&_tEW4}=np(|tvhHY=}yi6}+_tW!%V{iaG}`LN<=6J(i8WOFoMV>YQ6
zDGd=q4_4k!P>9w7dk`#3$&wt+0sn+$K|K@i$qMMu0U}%SE72d$siWsG=K6P}roi?<
zSK|&1R9sqeY1HfyE$dGPnAPLbwM$DyYSS}zn-xqSls(LV^N1E)N1ar#{ww=(sV%6#
zjl`T9RWu&~wBAOy?=bZ5VHsaSEDmP~nI`zV;add_bk1ko>C6Z6T-3<N@5ptC<c03!
zu7`E}3=X}@XRfBmnWdoo_<{<S%&7lr{^yV8K_VM$q=jXykcV^Ljs5Z!^fZ7$iuk>=
zQQpt%lY%zEhqM=|mmNRvs|8X`o)fs5Y=;;`JVAR<ZKlVySAyq{01%|8ubx<2s7Fc<
zK0fD9tht9}obvi$2O_PF&8hUYB4v86m696bZZF6pmbFD(BVc}x8F)2ONKAnRyaVUf
zUTe!hJOMH{pnEGfsW!Hn>2uzxikA9WBbL*Tx~Bu)pJGTz^IzC~rJ?GCTN#(oQMWQ0
zb8IhWT(e1q+Bw4Ane3}aLq}S*_Z`0S{ycY9D_O6&P>0Ohs><^I5l_{(wEj=@Tga5b
z3AHg@Q;mK6WFoC^DnyBEu&-)(!8ZQ>@jmc^M1b!e+>xtzUX@mKhiS_s4X^Qgmr4x(
zldm{*+MntY(*`xSS9LLNY<(~r&QaI$C~S1#<F680>mn&_v@ej6?OZQkXad1ie%o^>
z=@0FfH0Yimn5Tw+KeE+zz0r+#=n}C$tJmxZoGS<y$>f5fLH~Q_h&8JsTiYg*8BQ|a
zfb~b~`St{jTQ{c&3DIBN61>bGUIQ%J=96gd-_#5G{}C*EUjK`p=>I()aQR}t_B95n
z76K2n!)LhB-G1j}NS6rvfF8Dd!h22!UXPNiG2l*9fXIc8rYE7IlxyB<YpD<%Fh5ms
zGzD8+xH@$#lbyK^`=1a_U2Y+7gF{=|U@#9*-3mU=z3{3^-qzjJ<LX1%E|>iC!z7f(
z))5bcL$GdRUrB82M2c*|nc+BT6u8I?CarW30o9(s^yNhiF^|JxA3<Tk(W%`VBz$Y*
z-19*uP>*P!5CHYce8qCF-01C<EmmrMnrzmCzD08`*>OPm5^zdk(Xp|Om%%O`Kmi{}
zI5rgGWk4s_fWo1vBoxU??UygrkZLIv%<diW?seHpjQa#;Do?Hg7=~K@V(@gKz3|=d
zSgCr_S`M+#HNK^afX?#HO^P$^PzP;vq==%1=tNtyQhe-ekgaXzG#uU)8yXkehi!H4
zksW7G5{6`%B}lcS-dQXYEoZ&%>H=r^Oh$GO1K-icU$K@=_zlH!4f9EC%jkx+SRe**
zAL3FQohZcF53kbj<fY`m;hsR8b6>^iV30#1d8s#$w5jXXFfWaPcQld5b(2|&Rw2T>
z9ly$ybdd)ra85N_&}&S&Pb##jDwMe2W_&IK|IU8?8E1O)<1Ip!(fWL@qNPFKBzv&e
zu#t3uY~s4OsCy-r-#^+9@B|l|XKgtxU}UfvHJ-(6c3ier8Q2!7tLk)%dqF5!7At6&
zdnla5OrN<y)XSvduZHQns_=y?&mh&z(8{W@sZ#6KuDx4SD9>H@=(rEQz0#EJ(NaxW
zluF?CdE2kpx|`YzKfNfakcGFc_e2c(NH=!F+6hOdeN7ka{WdWkGCFLXZK))V@7hT9
z#rJ~BYi~Ne-yEgId0o4m>789vQ3mm{=r$Tc^8y}t>A$h`=-Q>~gjUuiKAm4NyMKIK
zRW&LZ<(DvM<Mv|0eKWV?`?9&nZboCAd+11R(mT@t+r<60sd1+oPO>%468yFkV^GhT
z#~kw}_2uxjEPZ*Z{Ah$)?jf}4Vu}erdn(W&?#N*{w~=|Lw=UkDpY}A$Z0iV>tXd&W
z!QVHQl2gKvN146hJ969ha>H5#z1PaZ2c>os`+mn_W9yyb;3~9}CK=wlIh=~{Laba#
z*Da$V--xL_P<k~S<hH=a5!Cdym(y(zNSKa0N$=#i>mHZ5SRv+X`*SXTgDejF>F%9_
zZMCps>F0-#Y7|YjVfiW7$(+TGV}595q#&8t)$!q=+L#V~OXmJl%q^;{#?T1qxWM6}
zc&$lVxlu<->QW?sXh{RN`$eU`Y%ezSyyL`LtPQe;+PQkta@Q~0(#b~kq~JxcXQ*y^
z)6UuiUQ1-BL2nDzhKZv-=YO+)VAfudDVPhm$iD?RfL-0p+KVe>%fnmyc=w&4WBg`3
zm(6i>mhqF8j_<rvRurl<;|qldgo85ILIC0>IrDqy^Hau4SQ(i$6T-CXk6ep}Sn5@U
z!if8kEj8ncn5oh8!{t7XL&GxZ^OcHcOek`ACcpoIo1+Y=u196J>!yp;mVr^zV_*06
zsPyyf;}-<IlW!cDIIpxR!^XW_Y_>aug}I1srhx?%kX4!+{pQx0jo6mv3Uh=hk{c$u
zjaXf!x<mc&y6N%cuE;6Zrggn<zaEVj3<f&(y4P0P$yhApX}sx?X(*D+BcHj;@MVm<
zW_R#~S+~2khL~+`$5u3(mOM=*_@|?@z2&_t!TXwCh%vkEcQ5;rRqEJXYIhVus|&19
zk-2`IF25%nKAoa>`s>(@J71R;TC`2-n}s{n{(RU!{Gx@bX_jr{7v4JhJ&_51rM|_#
zk@SU^pC`z9ZJxmPRPZYFFN~fpyo)Io3b3t11z?glRyD?mw3xXpS!IM$ss3fvbz&k4
z8Pa8=sI~$1cx_b$eZ)JR{s{iVw)<-)6sNJ1`$95WhVj|Qjz4KJ?-{$y-b&9&jby4v
z@e3)5d89(+j7bhJkW?%w?d(<UiBd_Q+B6Sfj%etlEbwu>TV}2A^i<g`;l4%d?y(l9
zTMMNxbB^$;6UHn&(q(9th<W3iAFL@oCfXQB-rExd_Bg}-Y(ol)g<c%4oY_)tha@)F
z8Flx5zW|zZ5o_G&+}pUv_j2-7en{WW3p;5x-guRQm3LK~TN7Nam^ZQcL2I|IK5sPc
z6o%wZ_f~V4gCAuo6Wlu|a+2O<5Gf`EQ2rhLHI!KeO8i!))la^i)BQp5<{%apLds;)
z0fh|v>S3Oy!Q1(9oWyzOSBs(M^%fMaMMaP!Z|nr2qza?1MN=IqP6|@u@=IFh{PkXA
z;cyVXd7iDTJfs5Jy|%n6t@##$dc%BRtUe5dP|nB6&dN7rbAk>D75S&gvg%XeB%iP9
zBUW9F|87Q8fbA(O(Qnv7x-?9wu;<zip`JS;2Af+-=@ubSoBb`$Ao2rrQ)+0Y$wo$H
z>Rrz1mvGa0c5nJwI>~R3t&y^s9gnS5>C)9OI?d7>nptRIjCa~sljgJq9A2<`#B5D6
zz$3!Gh7XM~NR~lafK{FA#AfWR8(rJ<@&@G(f(k$LGuZ);g83SaKGQEzNV{FM-~!yG
zO@57T8(OfZm;4lZ)>-oVqcXKB!fpAA0}Mr_Zh1%BUuJKOGDq$E=bW@>YCe$PabHR5
z1M${}N;80#Ef_YW(R`)B&VQ2Xh~Hzj--E(Jq~6<7ZyMb~U20rX4R=Y0g)<&5aKu-|
zoRYK~*23`WCNG<^Cd2y44JCy+yugS^XK7(@sMnZ-@X)v5N^Y1~$P#%QTUkGVs0}@|
z_a~j|nU}A$+uM3Hwn`6;y~TaGf~@k|IT_{DJADEf7R!+gue38+yo)vJ>2qImAq&ew
zs(CNru;F@w_f!KLO4)v}NgPuBl{gmgMUqfilVMsHO-Y5x@4@RGq_e|z8_w07M26)P
zroXZ&Za8qd7E10m6?|M+Dtj>}ku_I9^uP4&5;)_`7HKD=GWhgCVaG02R#nnMXBaRa
zT2XBCcUi;|-fT8{lb>BMeu9N}Y|)7et4c{+t?y1ht>(VIHJ7aHWqwD&r}|o06|rxQ
zotiv)T9Il6#bJw%B_pHv>(0`-mknv?s062{djs}fb6*7vRo~gbwYw+%3i=AONQGxX
zr%fEC!yDzXQKs}79GuIq1coX+V(KK%iMcDm^G#q2R0YxGzdVz_5xX{{1n^ebDLpJX
zj1bEv)&$<W(-z@q7d2@ZCHw6m*H@VggJhK%{{g%lT<?DPl>*I4Nj248sVXNeZiA#&
zv)g9wo))X3rCJTpy~@s3)t|WQS~1+6n^~^dDQ1C=i4x7a<kE`axH;oK4Ycq9*zr_N
zX?vC&3E1hPZuJ862DV*Y>n?HDzs;!N&<Hvu$!-XjO<ZDq-H^ZKH@2p1MIF081caeR
zlp&rnxAUPB#pnP}(D-z2G`rb&-QKH5Oqtz&`b*8mO}z^W8ioPW*a#l>{8YESJj^bm
zFp*5T*-BOtlD!VgvK1^F<xIIw<$Dv*8QvwJQm6dXh#zlOUPl?dsLYpx#5Vc{(SiVV
pN<^<$DE*mj{x<^1KMhM3RVvV4%~yTCK|n(~xc>-(^rOqq{{b}58%Y2F

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_multi.pdf b/doc/threads/03b_stats_2d_multi.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..beb98a835bec081b17186d8b35c95a81be37d3d0
GIT binary patch
literal 12325
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
TU)}|Qz#QBtR8+6!#Zdkam?#OB

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_multi.png b/doc/threads/03b_stats_2d_multi.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac74c52620ee086eae03ac269f3ef258bf41b204
GIT binary patch
literal 150443
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
UU(X{fxwE)@-bf#N_S&6)0xlS!dH?_b

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_single.pdf b/doc/threads/03b_stats_2d_single.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3573d928ddff20a316a8b57d653c1351f96dee74
GIT binary patch
literal 12531
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%0AkWWT-)o1K8|;?%2ferPFPxp69zBM!XA50e
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
P70iu6Pyb9=3giC(^rn3g

literal 0
HcmV?d00001

diff --git a/doc/threads/03b_stats_2d_single.png b/doc/threads/03b_stats_2d_single.png
new file mode 100644
index 0000000000000000000000000000000000000000..191e5e26c858e62751950e86173e25ff822ab8ba
GIT binary patch
literal 164586
zcmeFYc{tST|35xbR1(!G6_RsAN>pUuN}FXUWnW8{!Pv&wx0XXEp)+J(5{57cV;ftk
zWE~l1FvgH&VlWu{Sbq2DbUyFT`}e)RfBydZy}G)t!OYzE>%O1&^Z8hwufOi--{ReW
zaz6wD;nlu<-4FuVCl7&e(f4wJ-zfXJ#e!d4hG}Wtd1UYK0O{&&<K_5J8fIq)f!zM<
z^=rpFv1S6z45sSjpPGlSMcmQ)``nqZIDYf9-357?Kho~paD862>->x7ayMSx;1IBU
z{kzMJ-*_UQ>^kQCRBBgijpxz3SIs=AC(>4gHEOq$0`cx!h>0Nte$9j9^z*0oAKC&R
z8rC$DTcS@K|E+yD_3X=x_>c38-kj84+#v|&Q(z4hzgD#O(BH6)@v5p?uQkah-jFxb
z_QZA_1GAB=Ha)(W?T?NorX`lcm#L;BKSKSdbvqlR)={JM4y%x(`yoP->w*Wj!?zKP
z7xxvPEcWGnbwwL^-48HMJdH}K=-ziKp>6Ruv0I<TuZP^5+kU+voO8<|xA?l7SF89{
zS8qLKX6V5ymoLigwsD;QLf4HEy}2EVcf4U!Hx>ZtLqJZm>H|hzL%e5qX|8`WF@RSW
z#|1%@XXj*hCv6Ahz2@cJ8@B6*CfC_rMsN0cKR$GkGrsYdB1B-ABj_rBA7u43m)I_j
zue+*kxz9pw*or9b&DXr(1cAOen#z?ntXj3J=qY(v`Z!n2V}89S37Wfy9`D)vq=f&(
z+pCvf9nL;Dsd<xMuryrgw8B@x{ZFoCI-T9u8s?RmcIVLj{YF=jcaALbcpt3UMR~@R
z8PTOE$GOQH{OnNTZo-2-rkuox{)^l`e+G{%dB~;ir!}t4S%cvs3_c3a9bJ`IJ-{=P
zFekK&|M!oYafhs)MR^?J6FdIbwcTHhv-u@&P5o`0EjXz)D|+qGv9+*|Z=BAG>j>EY
z<#lr{b2aaNkMaFW`TLQ(dLK{SplC&9UC+ZiT{b_3d0L^#?0Wpe$@^Fh#46hDdSzB|
zX2iGHAHK&Agg<`pp#5TJ;%Pl02U+xS#BoA+^~)2V^lT?eObZVfbG!Vx)ENGN@P1F9
z&b0RQnQ4BX!>m)cK1q(e^oXvqwLC1%XA<r5#p)C92-<_k&$Cu}XcyygOr!h9gkixs
z%Bsq$_QtNOPa1zWJruOh^O^9o{nyTqoP6+dF8sDwK7Yqw)}Ktj`#jt;|Jyv5XX@(X
z>t|rGRoVQ8TrinQ#mUQ)qLaKydc@OY)YF#9vAQww1*3&~3xSuC6Vs0yNL_PHF~yoj
z^u6jkzd!x0{>UBqJ6>nU<7DGh;><j2tHKpcRP}-i{IIJ^^LOW!_9Z{dd=_#2?e+K9
z%RWK>f}M-czlwZw^A7V}bDqh&BXZBsI-}jI<!R+y16KybgtZ*M`7bI49NKhThggYe
zzm|(%OlXfUjITW{`RMckUapwG8_zySb$EGET}Se^XZG(o%eS#QyxJYQZQ5j=TRH+d
zmD+r|p>Ypd6~BIJn@*UF^Zz{()f>Nr>OiUe9tia@j+S<mY)&{Ir*dKC_NjPM{7O7k
zDparDCPe@0-4EKLH!=-J@;?^-uJz6MlKy+W`M2L+9)`A<OB%n^n?!Z<pv7XF^lXhU
z1}6P(?{DuoeqdaAoMU{?(fAh`I_Wwotw)TWoU^#1gVn>{GRj70PZY%$5Z^A}7B22I
zj=8ImJ(R0n{GoeqS0CovyGtD?hj~+_!ehilaWleAS)(#*X8p07k(i^!NK<-|d?Ea;
zaF!J&_!c+uQtw~AN`<mj`|DbRjJosJjk0RQKs=${B4?{kY2l$V2F3Rnuj`XTO145a
z)i?26;#~W<z*_OX3zrV}52u8O3c>{Eqw=F>i^Yq5EbHJ%(iG{7@|VBA+<GaJ*rhiJ
z^+{Pw47z+p_Gn^7a%bYZq(75;6QfEeT@8FLvBH%G20MdN*8G`#$I!<nkL6z2D(%6(
ztaPnNwQe#$QjLDl@$B^rqeP>$*ImglVdvl;bEhoVBM$f6neE2C@*gX{`Mk*b{MTse
zSZ%3n$&o%RxdU;b%AzV^=1`yn>l%xLJO62h*6XHww~jVDH6Oe6ckEvThupSKCr1<7
zW@nb_o>Lj5Pe-Z~t6e=Ok!PyctBkAF5d@zjRY+XZtn@7RU^6kl7-~+Q<WTiH#jTp|
zSE_nXEp+LlpMQW+pxTQ3V&~E<Gjq*#5w`44bD>#$XZ0BnWSWYbGro&_r;cfe*oxda
zdHO&P-{4_CmD}=X<@3%T7n~LuJg!>V`GE2P87nF-x<~X6x*5HUL>)Yh6MfM1XH;C&
z13~<=w_2RnQnUn`R6kBNO?>npxia#*dP3;)?aLqK-%33c?><*5=XI|2T)v#M^1!)u
z%|*SJP(A;4S1E;xbIZt7ge811sP@*z{A$j#uxAz5Egw34uNHGQ3^H^tedy)0VEaN}
z=jw}#y}vKn=HDJZ=cM<vo0yBtAtY#g-a63n((1%$5;3VaiBYyu*7->Hk%aw<d-qVe
zBjJ9uU8h0H-ITSIK(E&b-?3=-5!ZL*{cv9DKp7Niu~pGBqfa)NK0W=MI&YDF)fzTL
zPUBF)F^?`((hR1(26_!o8=pRVoC2@LEpzwqz1KJ}ZC01-g{OUd{?XzF*NyQTk)Jod
zTWFlzGMyjo9?GlZJcB-SYx%+QnHj-;_p<Hl@2<o2CqHqla0=VEmwqg*<W@LUYvyKY
z9r)bi?C7hKkC?Xwh8QoK@rOowy&hOAq(xLvM|$#F)1ion=)O}hj8Wc&{7pZ(<sVO#
zb8DglqShDe677<j(-l?~7B@d_y?b}J;(gvcVLp5G<B=hWfRy&+<mB-bUGw4im+?ul
zq7sZP*KLGJft!n!U>4@bZ;G!yr#{PMHoQ#rQKKNjgV9Tc>;1_-=7A5md)~j(>N!D>
zoZdfmQkCXaluItfZJN~C#AKML+XP=-xYlyx<L8Y?-2^Y`4lDg?)xb0Bt=I8i(wj{<
zi-#CXQ^Hjf0W)8a&2$r%VsL_+DMc}q@O`4%V%j3D66)@|n6g;8?XY0M3Y*ky7A{k<
z^6g;w@D-h?ReU7tJ)XW<M_=(@apx-*J|#3S=zsC#<#R#&^S0{`J~okJE{j}H9a0ZJ
zbw23#t?Z3=8-#T#HpKl%@_w0@<d_u=rvI|v6OH+Wm~xF{63mR)j06Ko=oP3SG$X?^
zwVL&i64{a<DI?&(vlX{mHt~9*pe(e1t5;_KZ_xT<wbtvn)u{HAQTHh7a=U-0T5!Uu
z+k^VKx^~tPkv@@ib*`XP^RMQgq>Y2R*LybmmzaHq-@Cgtu1USBkLx(V13(nlL)}}~
zA=~VKZ|ZUZo`UT2xNU}jK&1a*|L5?_(eMGk6!E@c>V41M!Q1zNmp$ax9lg`HoZJ!K
z2s<yBhxchE=_|6*vhJyc5)jB~i1ziX_x)0*DRu6T$jKrTRAt#e`uGbu7^aUe8h^CA
z{c6{qiG362#0fgj)JyC*U30lyUxn_1okcdjIC^E|8BF$+m1d=s;``H_5iPd1ja4TD
z4jlht>rgH<U5Aq|php%C7=8ZEghV+A2$<Bdp1RIjH3XQv!?F?K&NcjMqlB^R*G~|K
zeexW?e&D`UvhUYxMa3u3U#}ZK9CH2l69=PhkNo<BhsW-eU$4WS{?WJl*AGHMAH;vX
z9v<HN{}1v1^+GXOEa@<cWKODt5<_j#)FoK8Tqz>iH_zP0tciiz_$Hn4YZLtvLhiY2
zF4af&<r=zBe0j?UhC8%TWy=i0P_6`)NLT1&Nw##f2c^-(M#U<zL|Sm?+K_W_q+zSg
znKczH4ZeT&d2V*oAG6fZ=X;1H*5`d%N3!7HCp*m2cV4D-&c3BZX!o-qeTP#xQ;9*@
zPpJ$Hv2top%2tEeHu)8P&om{YJan6(y_FGs>?3Z)0JZS|rD3q(7+CZtW3x#tbTDKi
zCHUAv^k$vdcKPON7Nf~-t6}tbG-8FhDigbbQzMnOW~S>hU?RIxlzK9>YBea;V*x)d
z3O6zQSVXIPA&b<Q=uOKhcWU5f!@Sz2bZA~fL{&4lNYkZ_cA7^J?$lw|!>-DE5l^5o
zu#XB>37IC`DFga9Yy$WwXi`$%4FA#@LKr@qxK1dd1-WD0-U_&`&uIh=_br7K*-QuY
z>qhHJj=Lo1+;^uA)crjYXXu8qJfn@lPFJV;zS~Tjc6lgrin%S^?2#I%5kp->$66`(
zASTsjv}|P~))CKFa($(%Pbq6Q&#4U6FBM5@EHZ92he$6~$}kqUzpO0cHZr$PeLp1<
zbf9@oHlyhqOJk<Vktd|jmm`R&)N%u5(`&BFiX7PtM=YxxwIZ1pvxNT|5XlyR#oOtE
zt-R(;Ley89|2pT#6Kx5P^RUq_m>9D8eoUNK609;e*PK4{gqD`Q&j_hL<JGxheE!$@
z#fkQL*LDVq;CYw4oiQs(J{OeX2_EEL_9jBt(m5dz^?aL-4PFRj?rzn=U117`OBJu>
z#KqQ5tCn}7d^VTV@IIGlcbEr_=<yrP95j%L6d#3NVk$r&jkiXW_d<qlmrN=yJynXm
zl293FKDVURsnk=e)yrnJ?5i<)W2>IWmVeW>Q#mue-;;(=*Z7pG)uD19192(9#s`xc
zJ@c^E(>ShU1z2l|>LFiYh8bq*(q9=#O0(N4(Ibitxf#vPLDC!yfWKTL5tAi5aWRox
z>N!p8zT}!g7Y$nyYQhH{?9Q0Mg#{DdPb#L>j<|>iCL;3uBl3^_oChRK_>ik|i2MHO
zI75A3)tx)~cab;`yS|kbgbds)aeV&spb4yv8tMeMWw<>tY=udVd-cbb+qoGZEt^Pe
zGkRR?)83u4p(9CidHEh*(NWPaPp$}h3Aea}7Oo^N7gxgzz7&?hY2Ysy*)J9S6<5C0
zw!w853XJTA=oP|D&oX!gyg$(=70!OKbevrAg#8M<`*>L|+`_J1bcm-6UeMepPj(<1
z$GitGU6JGg4Z-nUw?jgydpwRiWAHhyzSVfq2_fg9OlRRfZDZ~deN-yu5=q%kzbqiB
z0lDh|{h!HIAScW|R|v0w$&hNu4V@Km7Z#lC494rP=w;7nGuP#%e=)h@#m`x=f9v}1
z-`TI=Sgl$CFqJYmy`yaBU2q(Ex%`W%@mcKt0O5T3OMbmu%=g5A`S4;K25VishTM!D
z0Wq1qQjNibd_xKUnQyd162=<*+k~*hX3ViY5J(AUPF%5eC-Vi}0s;xM>%yHfXCco+
zh8hf8YcdP`>nlRH(ZqH7h1ZMHlYQ4wXf=y%DtYhHfqw#0NCV`Z*I|c2?0(pAlnn*J
z9Q0e!Q;7N-b2<X0FurSO<i)+G>}{u)Uk&W2%KW)p!37Q4%-|Ihl>l`xs@8mQ?8a5r
zPCR#8@tL9aLaepfA&uk3m~X!)@GZB~jphCcS@PVr_!>xXHk|6*Ahtie!)~pxionsd
z6|v;wXe4iz1ngzp(U=LYpCBzhRbzI4*J}T-<FHp=IMbXi)`D1J7`EnKsV@|PtQXmR
z<3}94!nlL|Rj5l;o<N)F^(*t;MK^Nd2x5*r^*%p-hUTwC(8uusJ=)7hvy3;?kAGP=
z6>5b+elv9a?*R{j0pFR^?NH<)EnnuB*M`!umdmGV(iGhCl&BV%e@+Kv`sO?AERG8W
zlHY`CQ2gX&XM?1M>jQpwBQh&=zmfD3%u>>_G(u59Mc8PQp6Vs`XH(ARY)H3=oLPfn
zmPlIa0&||&%nrhGMhv_!*7r@ES9-#>f>OxO5k&MPb9k6RtFDhh`udR;SB!i=y$7!}
zl76Ge1>=G|fAV2x=7exQvGQEb2333OV#q3l^IT3)hnx_?!liD=QLQ<f_f%T;TIjeK
z0b+*I8>%VRmCQg5wzre~^)Krqq%x?NH6TLZxSAzzGr)Jo29rQMl$@t5-N7t9q+%g+
z>U-s(o9tv{I>Ylu14~h<k>;0}$(7JPRhCUB6iu*8gC>f9IBnqcvs&k&0y&w5Wl;E1
z^#?Rev^#Yr1wKL{wRU*eRtz)r1c<qB-XtwZ<N3+H-71eHm2CyQT~B^VwI$dk&)p5}
zZ!oDF&7bL6%vtGz2c#tp9K37O%`;9k4-J6N{9KV*5oIu+9W*!e7hYQ$wUJLWAK)kK
z)PXBM>p;@LxP#2)8COqZourxBe*oI87DMk6k?ri6yvukb#z@65jPst0usfpOC#k21
zOt^<x^7+8j*OAPSota*g{7c&M=XeZLmif2bV3OyL-6^&jTNerTZynO4{Df@J>qzEm
z>yzCy12Y_{`1iLqx49?6la;YVmSHO*dHWB2u+Yw!6rV_Q=M+|b%J~k%0DQq0hD)c<
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
ZkBOT}!G9|Ak*8{|KjTJpZ9Ex~`zxcCGh6@w

literal 0
HcmV?d00001

diff --git a/doc/threads/Makefile b/doc/threads/Makefile
index fafb8d47..8d27f90e 100644
--- a/doc/threads/Makefile
+++ b/doc/threads/Makefile
@@ -1,5 +1,5 @@
 SUFFICES := .pdf -wordpress.html
-CHAPTERS := 00_the_name_of_the_game 01_the_route_and_its_attributes 02_asynchronous_export 03_coroutines
+CHAPTERS := 00_the_name_of_the_game 01_the_route_and_its_attributes 02_asynchronous_export 03_coroutines 03b_performance
 
 all: $(foreach ch,$(CHAPTERS),$(addprefix $(ch),$(SUFFICES)))
 
diff --git a/doc/threads/stats-filter-2d.pl b/doc/threads/stats-filter-2d.pl
index 59eda26b..01db9e0e 100644
--- a/doc/threads/stats-filter-2d.pl
+++ b/doc/threads/stats-filter-2d.pl
@@ -21,7 +21,7 @@ while ($line = <F>)
   chomp $line;
   $line =~ s/;;(.*);;/;;\1;/;
   $line =~ s/v2\.0\.8-1[89][^;]+/bgp/;
-  $line =~ s/v2\.0\.8-[^;]+/sark/;
+  $line =~ s/v2\.0\.8-[^;]+/sark/ and next;
   $line =~ s/master;/v2.0.8;/;
   my %row;
   @row{@header} = split /;/, $line;
@@ -33,15 +33,41 @@ sub avg {
   return List::Util::sum(@_) / @_;
 }
 
-sub stdev {
+sub getinbetween {
+  my $index = shift;
+  my @list = @_;
+
+  return $list[int $index] if $index == int $index;
+
+  my $lower = $list[int $index];
+  my $upper = $list[1 + int $index];
+
+  my $frac = $index - int $index;
+
+  return ($lower * (1 - $frac) + $upper * $frac);
+}
+
+sub stats {
   my $avg = shift;
-  return 0 if @_ <= 1;
-  return sqrt(List::Util::sum(map { ($avg - $_)**2 } @_) / (@_-1));
+  return [0, 0, 0, 0, 0] if @_ <= 1;
+
+  #  my $stdev = sqrt(List::Util::sum(map { ($avg - $_)**2 } @_) / (@_-1));
+
+  my @sorted = sort { $a <=> $b } @_;
+  my $count = scalar @sorted;
+
+  return [
+    getinbetween(($count-1) * 0.25, @sorted),
+    $sorted[0],
+    $sorted[$count-1],
+    getinbetween(($count-1) * 0.75, @sorted),
+  ];
 }
 
 my %output;
 my %vers;
 my %peers;
+my %stplot;
 
 STATS:
 foreach my $k (keys %data)
@@ -49,30 +75,16 @@ foreach my $k (keys %data)
   my %cols = map { my $vk = $_; $vk => [ map { $_->{$vk} } @{$data{$k}} ]; } @VALUES;
 
   my %avg = map { $_ => avg(@{$cols{$_}})} @VALUES;
-  my %stdev = map { $_ => stdev($avg{$_}, @{$cols{$_}})} @VALUES;
-
-  foreach my $v (@VALUES) {
-    next if $stdev{$v} / $avg{$v} < 0.035;
-
-    for (my $i=0; $i<@{$cols{$v}}; $i++)
-    {
-      my $dif = $cols{$v}[$i] - $avg{$v};
-      next if $dif < $stdev{$v} * 2 and $dif > $stdev{$v} * (-2);
-=cut
-      printf "Removing an outlier for %s/%s: avg=%f, stdev=%f, variance=%.1f%%, val=%f, valratio=%.1f%%\n",
-	$k, $v, $avg{$v}, $stdev{$v}, (100 * $stdev{$v} / $avg{$v}), $cols{$v}[$i], (100 * $dif / $stdev{$v});
-=cut
-      splice @{$data{$k}}, $i, 1, ();
-      redo STATS;
-    }
-  }
+  my %stloc = map { $_ => stats($avg{$_}, @{$cols{$_}})} @VALUES;
 
   $vers{$data{$k}[0]{VERSION}}++;
   $peers{$data{$k}[0]{PEERS}}++;
   $output{$data{$k}[0]{VERSION}}{$data{$k}[0]{PEERS}}{$data{$k}[0]{TOTAL_ROUTES}} = { %avg };
+  $stplot{$data{$k}[0]{VERSION}}{$data{$k}[0]{PEERS}}{$data{$k}[0]{TOTAL_ROUTES}} = { %stloc };
 }
 
-(3 == scalar %vers) and $vers{sark} and $vers{bgp} and $vers{"v2.0.8"} or die "vers size is " . (scalar %vers) . ", items ", join ", ", keys %vers;
+#(3 == scalar %vers) and $vers{sark} and $vers{bgp} and $vers{"v2.0.8"} or die "vers size is " . (scalar %vers) . ", items ", join ", ", keys %vers;
+(2 == scalar %vers) and $vers{bgp} and $vers{"v2.0.8"} or die "vers size is " . (scalar %vers) . ", items ", join ", ", keys %vers;
 
 ### Export the data ###
 
@@ -84,9 +96,9 @@ set logscale
 set term pdfcairo size 20cm,15cm
 
 set xlabel "Total number of routes" offset 0,-1.5
-set xrange [10000:1500000]
+set xrange [10000:3000000]
 set xtics offset 0,-0.5
-set xtics (10000,15000,30000,50000,100000,150000,300000,500000,1000000)
+#set xtics (10000,15000,30000,50000,100000,150000,300000,500000,1000000)
 
 set ylabel "Time to converge (s)"
 set yrange [0.5:10800]
@@ -99,10 +111,10 @@ set output "$OUTPUT"
 EOF
 
 my @colors = (
-  [ 1, 0.3, 0.3 ],
-  [ 1, 0.7, 0 ],
-  [ 0.3, 1, 0 ],
-  [ 0, 1, 0.3 ],
+  [ 1, 0.9, 0.3 ],
+  [ 0.7, 0, 0 ],
+  #  [ 0.6, 1, 0.3 ],
+  #  [ 0, 0.7, 0 ],
   [ 0, 0.7, 1 ],
   [ 0.3, 0.3, 1 ],
 );
@@ -123,8 +135,15 @@ foreach my $v (sort keys %vers) {
     }
     say PLOT "EOD";
 
+    say PLOT "\$data_${vnodot}_${p}_stats << EOD";
+    foreach my $tr (sort { int $a <=> int $b } keys %{$output{$v}{$p}}) {
+      say PLOT join " ", ( $tr, @{$stplot{$v}{$p}{$tr}{TIMEDIF}} );
+    }
+    say PLOT "EOD";
+
     my $colorstr = sprintf "linecolor rgbcolor \"#%02x%02x%02x\"", map +( int($color->[$_] * 255 + 0.5)), (0, 1, 2);
     push @plot_data, "\$data_${vnodot}_${p} using 1:2 with lines $colorstr linewidth 2 title \"$v, $p peers\"";
+    push @plot_data, "\$data_${vnodot}_${p}_stats with candlesticks $colorstr linewidth 2 notitle \"\"";
     $color = [ map +( $color->[$_] + $stepcolor->[$_] ), (0, 1, 2) ];
   }
 }
diff --git a/doc/threads/stats.csv b/doc/threads/stats.csv
new file mode 100644
index 00000000..08a30ff3
--- /dev/null
+++ b/doc/threads/stats.csv
@@ -0,0 +1,2086 @@
+VERSION;TYPE;PEERS;ROUTES;;TOTAL_ROUTES;TOTAL_PREFICES;RSS;SZ;VSZ;i;TIMEDIF;DATETIME
+v2.0.8;multi;10;10000;;12925;6245;25192;7862;31448;5;1.096254577;2022-02-02@15:17:22
+v2.0.8;multi;10;10000;;12925;6245;25328;7855;31420;4;.874940633;2022-02-02@15:17:28
+v2.0.8;multi;10;10000;;12925;6245;25312;7858;31432;3;.652671281;2022-02-02@15:17:33
+v2.0.8;multi;10;10000;;12925;6245;25100;7881;31524;4;.875534663;2022-02-02@15:17:39
+v2.0.8;multi;10;10000;;12925;6245;25336;7865;31460;3;.650571200;2022-02-02@15:17:44
+v2.0.8;multi;10;10000;;12925;6245;25332;7875;31500;4;.874139409;2022-02-02@15:17:50
+v2.0.8;multi;10;10000;;12925;6245;25352;7857;31428;3;.647811603;2022-02-02@15:17:55
+v2.0.8;multi;10;10000;;12925;6245;25432;7892;31568;4;.875001038;2022-02-02@15:18:01
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21232;187160;748640;5;1.089692765;2022-02-02@15:18:09
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21176;187217;748868;3;.651933721;2022-02-02@15:18:14
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21192;187197;748788;3;.653084865;2022-02-02@15:18:20
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21744;187207;748828;3;.652415229;2022-02-02@15:18:25
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21388;187184;748736;3;.648270200;2022-02-02@15:18:31
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21560;187191;748764;3;.648193217;2022-02-02@15:18:36
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21168;187275;749100;3;.647980957;2022-02-02@15:18:42
+v2.0.8-169-ga840170e;multi;10;10000;;12925;6245;21140;187204;748816;3;.647965071;2022-02-02@15:18:47
+v2.0.8-191-g68d8716f;multi;10;10000;;12925;6245;20820;367168;1468672;5;1.100622692;2022-02-02@15:18:55
+v2.0.8-191-g68d8716f;multi;10;10000;;12925;6245;21628;367185;1468740;3;.651433753;2022-02-02@15:19:00
+v2.0.8-191-g68d8716f;multi;10;10000;;12925;6245;20616;367175;1468700;3;.652091098;2022-02-02@15:19:06
+v2.0.8-191-g68d8716f;multi;10;10000;;12925;6245;21092;367163;1468652;3;.651469363;2022-02-02@15:19:11
+v2.0.8-191-g68d8716f;multi;10;10000;;12925;6245;20964;367203;1468812;3;.652121146;2022-02-02@15:19:17
+v2.0.8;imex;10;10000;;12925;6245;21296;6904;27616;4;.877780033;2022-02-02@15:21:17
+v2.0.8;imex;10;10000;;12925;6245;21448;6918;27672;3;.650221711;2022-02-02@15:21:22
+v2.0.8;imex;10;10000;;12925;6245;21328;6903;27612;3;.647419908;2022-02-02@15:21:28
+v2.0.8;imex;10;10000;;12925;6245;21344;6926;27704;4;.871457090;2022-02-02@15:21:33
+v2.0.8;imex;10;10000;;12925;6245;21476;6913;27652;3;.651801557;2022-02-02@15:21:39
+v2.0.8;imex;10;10000;;12925;6245;21612;6935;27740;4;.875996732;2022-02-02@15:21:44
+v2.0.8;imex;10;10000;;12925;6245;21620;6893;27572;3;.648566097;2022-02-02@15:21:50
+v2.0.8;imex;10;10000;;12925;6245;21412;6903;27612;4;.873475734;2022-02-02@15:21:56
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19476;6754;27016;5;1.089638185;2022-02-02@15:22:04
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19484;6803;27212;4;.875170379;2022-02-02@15:22:09
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19380;6764;27056;4;.873880808;2022-02-02@15:22:15
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19168;6734;26936;4;.875658090;2022-02-02@15:22:21
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19576;6775;27100;4;.875797357;2022-02-02@15:22:26
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19504;6760;27040;4;.876190127;2022-02-02@15:22:32
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19336;6734;26936;4;.876356543;2022-02-02@15:22:38
+v2.0.8-169-ga840170e;imex;10;10000;;12925;6245;19440;6748;26992;4;.873076286;2022-02-02@15:22:43
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;19888;186270;745080;5;1.093324053;2022-02-02@15:22:51
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;20184;186317;745268;3;.648926212;2022-02-02@15:22:57
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;20400;186286;745144;3;.652659838;2022-02-02@15:23:02
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;19764;186270;745080;3;.650098923;2022-02-02@15:23:08
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;19652;186346;745384;3;.650386749;2022-02-02@15:23:13
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;20240;186288;745152;3;.647853086;2022-02-02@15:23:18
+v2.0.8-191-g68d8716f;imex;10;10000;;12925;6245;20784;186390;745560;5;1.092959610;2022-02-02@15:25:55
+v2.0.8;single;10;10000;;12925;6245;7912;3548;14192;5;1.094383039;2022-02-02@15:26:07
+v2.0.8;single;10;10000;;12925;6245;7996;3585;14340;3;.650089289;2022-02-02@15:26:13
+v2.0.8;single;10;10000;;12925;6245;8012;3559;14236;3;.648235964;2022-02-02@15:26:18
+v2.0.8;single;10;10000;;12925;6245;7952;3560;14240;3;.650843503;2022-02-02@15:26:23
+v2.0.8;single;10;10000;;12925;6245;7856;3558;14232;3;.651045036;2022-02-02@15:26:29
+v2.0.8;single;10;10000;;12925;6245;7928;3561;14244;3;.651095458;2022-02-02@15:26:34
+v2.0.8;single;10;10000;;12925;6245;7976;3557;14228;3;.681797956;2022-02-02@15:26:40
+v2.0.8;single;10;10000;;12925;6245;8132;3562;14248;3;.652359216;2022-02-02@15:26:45
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7264;3365;13460;5;1.088970668;2022-02-02@15:26:53
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7192;3361;13444;3;.650648189;2022-02-02@15:26:59
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7308;3378;13512;4;.871713554;2022-02-02@15:27:04
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7268;3366;13464;4;.878582212;2022-02-02@15:27:10
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7244;3370;13480;4;.875305600;2022-02-02@15:27:16
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7320;3362;13448;3;.651824711;2022-02-02@15:27:21
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;7180;3359;13436;3;.652604286;2022-02-02@15:27:26
+v2.0.8-169-ga840170e;single;10;10000;;12925;6245;6928;3337;13348;3;.647718070;2022-02-02@15:27:32
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;6968;183309;733236;5;1.092421653;2022-02-02@15:27:40
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7096;183308;733232;3;.651097706;2022-02-02@15:27:45
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7312;183308;733232;3;.655538305;2022-02-02@15:27:51
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7016;183305;733220;3;.654065594;2022-02-02@15:27:56
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7540;183304;733216;3;.666565863;2022-02-02@15:28:02
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7108;183301;733204;3;.653260264;2022-02-02@15:28:07
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7028;183306;733224;3;.647986838;2022-02-02@15:28:12
+v2.0.8-191-g68d8716f;single;10;10000;;12925;6245;7468;183303;733212;3;.652839552;2022-02-02@15:28:18
+v2.0.8;mulimex;10;10000;;12925;6245;35124;10257;41028;18;3.983991812;2022-02-02@15:28:32
+v2.0.8;mulimex;10;10000;;12925;6245;34596;10252;41008;4;.870756321;2022-02-02@15:28:38
+v2.0.8;mulimex;10;10000;;12925;6245;34692;10254;41016;4;.873432127;2022-02-02@15:28:44
+v2.0.8;mulimex;10;10000;;12925;6245;34892;10248;40992;4;.873415983;2022-02-02@15:28:49
+v2.0.8;mulimex;10;10000;;12925;6245;34892;10251;41004;4;.873559471;2022-02-02@15:28:55
+v2.0.8;mulimex;10;10000;;12925;6245;35068;10259;41036;4;.876322998;2022-02-02@15:29:01
+v2.0.8;mulimex;10;10000;;12925;6245;34816;10252;41008;4;.873908995;2022-02-02@15:29:06
+v2.0.8;mulimex;10;10000;;12925;6245;35000;10239;40956;4;.874443910;2022-02-02@15:29:12
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30036;189852;759408;5;1.093355424;2022-02-02@15:29:20
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30756;189811;759244;3;.648560139;2022-02-02@15:29:25
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30328;189809;759236;3;.653396946;2022-02-02@15:29:31
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30196;189822;759288;3;.652052544;2022-02-02@15:29:36
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30912;189830;759320;3;.666112449;2022-02-02@15:29:42
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30728;189846;759384;3;.654761674;2022-02-02@15:29:47
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30388;189810;759240;3;.653036823;2022-02-02@15:29:53
+v2.0.8-169-ga840170e;mulimex;10;10000;;12925;6245;30512;189817;759268;3;.656138441;2022-02-02@15:29:58
+v2.0.8;multi;32;10000;;16892;6334;65476;17922;71688;9;1.978757602;2022-02-02@15:42:29
+v2.0.8;multi;32;10000;;16892;6334;65556;17917;71668;10;2.204558310;2022-02-02@15:42:35
+v2.0.8;multi;32;10000;;16892;6334;65664;17952;71808;10;2.207757568;2022-02-02@15:42:42
+v2.0.8;multi;32;10000;;16892;6334;65332;17917;71668;10;2.210122725;2022-02-02@15:42:49
+v2.0.8;multi;32;10000;;16892;6334;65744;17951;71804;10;2.209464583;2022-02-02@15:42:56
+v2.0.8;multi;32;10000;;16892;6334;65660;17947;71788;10;2.204717296;2022-02-02@15:43:03
+v2.0.8;multi;32;10000;;16892;6334;65652;17961;71844;10;2.208649226;2022-02-02@15:43:10
+v2.0.8;multi;32;10000;;16892;6334;65552;17930;71720;10;2.207374856;2022-02-02@15:43:17
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;53780;556850;2227400;6;1.320844277;2022-02-02@15:43:26
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;54060;556763;2227052;4;.875968132;2022-02-02@15:43:31
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;53828;556749;2226996;6;1.321768776;2022-02-02@15:43:37
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;53424;556728;2226912;5;1.100994342;2022-02-02@15:43:43
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;54768;556941;2227764;6;1.325130679;2022-02-02@15:43:49
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;53320;556749;2226996;5;1.101143621;2022-02-02@15:43:55
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;54244;556865;2227460;4;.881834961;2022-02-02@15:44:01
+v2.0.8-169-ga840170e;multi;32;10000;;16892;6334;53712;556731;2226924;5;1.100983242;2022-02-02@15:44:07
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;52280;1097517;4390068;5;1.103570818;2022-02-02@15:44:15
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;52320;1097543;4390172;3;.654667895;2022-02-02@15:44:20
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;51504;1097540;4390160;3;.649057466;2022-02-02@15:44:26
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;53344;1097711;4390844;3;.649039820;2022-02-02@15:44:31
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;51732;1097486;4389944;3;.649671799;2022-02-02@15:44:37
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;52344;1097536;4390144;3;.656412012;2022-02-02@15:44:42
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;53124;1097522;4390088;5;1.096198849;2022-02-02@15:44:48
+v2.0.8-191-g68d8716f;multi;32;10000;;16892;6334;51168;1097478;4389912;3;.659546489;2022-02-02@15:44:53
+v2.0.8;imex;32;10000;;16892;6334;42712;12223;48892;6;1.327920465;2022-02-02@15:45:10
+v2.0.8;imex;32;10000;;16892;6334;42568;12212;48848;7;1.535425273;2022-02-02@15:45:17
+v2.0.8;imex;32;10000;;16892;6334;42824;12206;48824;7;1.538440531;2022-02-02@15:45:23
+v2.0.8;imex;32;10000;;16892;6334;42808;12238;48952;7;1.534904026;2022-02-02@15:45:29
+v2.0.8;imex;32;10000;;16892;6334;42748;12213;48852;7;1.541219094;2022-02-02@15:45:35
+v2.0.8;imex;32;10000;;16892;6334;42560;12205;48820;7;1.535834051;2022-02-02@15:45:42
+v2.0.8;imex;32;10000;;16892;6334;42524;12220;48880;7;1.540260690;2022-02-02@15:45:48
+v2.0.8;imex;32;10000;;16892;6334;42812;12186;48744;6;1.322518613;2022-02-02@15:45:54
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;39864;12556;50224;9;1.984306262;2022-02-02@15:46:03
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;40256;12587;50348;8;1.770465450;2022-02-02@15:46:10
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;39928;12560;50240;8;1.766832304;2022-02-02@15:46:16
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;40004;12595;50380;8;1.767638024;2022-02-02@15:46:23
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;39984;12581;50324;8;1.763657056;2022-02-02@15:46:29
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;40148;12576;50304;7;1.543609827;2022-02-02@15:46:36
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;40148;12625;50500;8;1.760773146;2022-02-02@15:46:42
+v2.0.8-169-ga840170e;imex;32;10000;;16892;6334;40080;12576;50304;8;1.768230892;2022-02-02@15:46:49
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;45136;553302;2213208;5;1.094519040;2022-02-02@15:46:57
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;43368;553125;2212500;3;.650387638;2022-02-02@15:47:02
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;43672;552980;2211920;3;.654067418;2022-02-02@15:47:08
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;44656;553284;2213136;3;.651614609;2022-02-02@15:47:13
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;45448;553189;2212756;3;.666249996;2022-02-02@15:47:19
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;44492;553117;2212468;5;1.112866299;2022-02-02@15:47:25
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;43112;553067;2212268;3;.652770168;2022-02-02@15:47:30
+v2.0.8-191-g68d8716f;imex;32;10000;;16892;6334;44068;553158;2212632;3;.648439768;2022-02-02@15:47:35
+v2.0.8;single;32;10000;;16892;6334;10400;4155;16620;6;1.314662804;2022-02-02@15:47:52
+v2.0.8;single;32;10000;;16892;6334;10588;4186;16744;6;1.326380068;2022-02-02@15:47:58
+v2.0.8;single;32;10000;;16892;6334;10476;4173;16692;6;1.324679389;2022-02-02@15:48:04
+v2.0.8;single;32;10000;;16892;6334;10448;4155;16620;6;1.323704494;2022-02-02@15:48:10
+v2.0.8;single;32;10000;;16892;6334;10340;4180;16720;6;1.327077199;2022-02-02@15:48:17
+v2.0.8;single;32;10000;;16892;6334;10672;4168;16672;7;1.536551975;2022-02-02@15:48:23
+v2.0.8;single;32;10000;;16892;6334;10560;4163;16652;6;1.320830805;2022-02-02@15:48:29
+v2.0.8;single;32;10000;;16892;6334;10432;4190;16760;6;1.321610181;2022-02-02@15:48:35
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;9008;3838;15352;7;1.545963718;2022-02-02@15:48:44
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;8916;3857;15428;6;1.319859810;2022-02-02@15:48:50
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;9128;3830;15320;7;1.535050332;2022-02-02@15:48:56
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;8936;3830;15320;6;1.323007004;2022-02-02@15:49:02
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;9096;3850;15400;6;1.321120073;2022-02-02@15:49:08
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;8968;3816;15264;6;1.312407112;2022-02-02@15:49:14
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;8896;3825;15300;6;1.318392153;2022-02-02@15:49:20
+v2.0.8-169-ga840170e;single;32;10000;;16892;6334;8852;3845;15380;7;1.541096359;2022-02-02@15:49:27
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;5924;544495;2177980;5;1.097982950;2022-02-02@15:49:35
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;6928;544523;2178092;3;.653526758;2022-02-02@15:49:40
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;6300;544504;2178016;3;.680781738;2022-02-02@15:49:46
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;7324;544507;2178028;3;.654547177;2022-02-02@15:49:51
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;7264;544504;2178016;5;1.105357001;2022-02-02@15:49:57
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;7728;544509;2178036;5;1.101831844;2022-02-02@15:50:03
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;7476;544514;2178056;5;1.103368505;2022-02-02@15:50:09
+v2.0.8-191-g68d8716f;single;32;10000;;16892;6334;7176;544490;2177960;3;.651212314;2022-02-02@15:50:14
+v2.0.8;mulimex;32;10000;;16892;6334;92844;24706;98824;10;2.218621332;2022-02-02@15:50:32
+v2.0.8;mulimex;32;10000;;16892;6334;92720;24715;98860;10;2.206368864;2022-02-02@15:50:39
+v2.0.8;mulimex;32;10000;;16892;6334;92552;24670;98680;10;2.204216319;2022-02-02@15:50:46
+v2.0.8;mulimex;32;10000;;16892;6334;92800;24686;98744;10;2.204847245;2022-02-02@15:50:53
+v2.0.8;mulimex;32;10000;;16892;6334;92596;24670;98680;10;2.209583472;2022-02-02@15:51:00
+v2.0.8;mulimex;32;10000;;16892;6334;92584;24642;98568;10;2.209544478;2022-02-02@15:51:07
+v2.0.8;mulimex;32;10000;;16892;6334;92588;24682;98728;10;2.212179581;2022-02-02@15:51:14
+v2.0.8;mulimex;32;10000;;16892;6334;92532;24679;98716;11;2.428413526;2022-02-02@15:51:21
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;81140;564596;2258384;7;1.537899787;2022-02-02@15:51:30
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80752;564666;2258664;5;1.097044431;2022-02-02@15:51:35
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80300;564614;2258456;5;1.104611467;2022-02-02@15:51:41
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80072;564516;2258064;5;1.105940444;2022-02-02@15:51:47
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80852;564626;2258504;5;1.096172779;2022-02-02@15:51:53
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80568;564599;2258396;5;1.099257363;2022-02-02@15:51:59
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80308;564507;2258028;5;1.098518301;2022-02-02@15:52:05
+v2.0.8-169-ga840170e;mulimex;32;10000;;16892;6334;80828;564569;2258276;6;1.325210984;2022-02-02@15:52:11
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;80388;1105305;4421220;5;1.098699044;2022-02-02@15:52:19
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;83416;1105283;4421132;4;.877097870;2022-02-02@15:53:50
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;85228;1105668;4422672;3;.653528445;2022-02-02@15:53:55
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;82668;1105385;4421540;3;.653928563;2022-02-02@15:54:00
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;80040;1105310;4421240;3;.653293911;2022-02-02@15:54:06
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;84700;1105612;4422448;4;.878791305;2022-02-02@15:54:12
+v2.0.8-191-g68d8716f;mulimex;32;10000;;16892;6334;83092;1105470;4421880;3;.654332748;2022-02-02@15:54:17
+v2.0.8;multi;100;10000;;18563;6381;184748;47739;190956;31;6.905085711;2022-02-02@15:54:42
+v2.0.8;multi;100;10000;;18563;6381;184864;47766;191064;31;6.888150188;2022-02-02@15:54:54
+v2.0.8;multi;100;10000;;18563;6381;185056;47761;191044;31;6.896919915;2022-02-02@15:55:06
+v2.0.8;multi;100;10000;;18563;6381;185056;47770;191080;31;6.912848533;2022-02-02@15:55:18
+v2.0.8;multi;100;10000;;18563;6381;184924;47753;191012;31;6.897361378;2022-02-02@15:55:30
+v2.0.8;multi;100;10000;;18563;6381;184860;47788;191152;31;6.909714459;2022-02-02@15:55:42
+v2.0.8;multi;100;10000;;18563;6381;184932;47737;190948;31;6.916711619;2022-02-02@15:55:54
+v2.0.8;multi;100;10000;;18563;6381;184764;47741;190964;31;6.896984802;2022-02-02@15:56:06
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;149380;1698765;6795060;12;2.659859656;2022-02-02@15:56:16
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;153584;1698847;6795388;12;2.675793520;2022-02-02@15:56:23
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;157128;1699660;6798640;12;2.659518527;2022-02-02@15:56:31
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;150636;1698648;6794592;12;2.665613631;2022-02-02@15:56:38
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;152348;1698940;6795760;12;2.657749990;2022-02-02@15:56:46
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;154508;1698575;6794300;12;2.668599217;2022-02-02@15:56:53
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;149708;1698685;6794740;12;2.662533000;2022-02-02@15:57:01
+v2.0.8-169-ga840170e;multi;100;10000;;18563;6381;151076;1698687;6794748;12;2.664170364;2022-02-02@15:57:08
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;157996;2126435;8505740;7;1.554906474;2022-02-02@15:58:42
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;153116;2126166;8504664;7;1.558577793;2022-02-02@15:58:49
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;160540;2126202;8504808;7;1.538475929;2022-02-02@15:58:55
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;151372;2126009;8504036;7;1.548179949;2022-02-02@15:59:01
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;155160;2126318;8505272;6;1.323799368;2022-02-02@15:59:08
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;153372;2126077;8504308;7;1.550670506;2022-02-02@15:59:14
+v2.0.8-191-g68d8716f;multi;100;10000;;18563;6381;148772;2125919;8503676;7;1.576611397;2022-02-02@15:59:20
+v2.0.8;imex;100;10000;;18563;6381;98280;26166;104664;18;3.986302444;2022-02-02@15:59:59
+v2.0.8;imex;100;10000;;18563;6381;98420;26156;104624;19;4.218468406;2022-02-02@16:00:08
+v2.0.8;imex;100;10000;;18563;6381;98344;26109;104436;18;3.996161204;2022-02-02@16:00:17
+v2.0.8;imex;100;10000;;18563;6381;98312;26151;104604;18;3.993555325;2022-02-02@16:00:26
+v2.0.8;imex;100;10000;;18563;6381;98432;26169;104676;19;4.222533428;2022-02-02@16:00:35
+v2.0.8;imex;100;10000;;18563;6381;98316;26123;104492;19;4.230594593;2022-02-02@16:00:44
+v2.0.8;imex;100;10000;;18563;6381;98276;26136;104544;18;3.984420623;2022-02-02@16:00:52
+v2.0.8;imex;100;10000;;18563;6381;98656;26210;104840;18;3.986272423;2022-02-02@16:01:01
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97308;28903;115612;20;4.434241286;2022-02-02@16:01:13
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;98000;29078;116312;20;4.434311497;2022-02-02@16:01:22
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97912;29015;116060;20;4.449306013;2022-02-02@16:01:31
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97624;28978;115912;21;4.654573677;2022-02-02@16:01:41
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97092;28883;115532;20;4.434558251;2022-02-02@16:01:50
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97680;29055;116220;20;4.439353471;2022-02-02@16:01:59
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97660;28971;115884;20;4.443074268;2022-02-02@16:02:08
+v2.0.8-169-ga840170e;imex;100;10000;;18563;6381;97120;28863;115452;20;4.458258199;2022-02-02@16:02:18
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;116700;1686712;6746848;6;1.322512547;2022-02-02@16:02:26
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;116004;1686494;6745976;6;1.325503902;2022-02-02@16:02:32
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;118872;1686734;6746936;6;1.326405932;2022-02-02@16:02:38
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;119152;1687160;6748640;6;1.321581759;2022-02-02@16:02:44
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;114348;1685958;6743832;6;1.315188429;2022-02-02@16:02:50
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;115972;1686456;6745824;6;1.321753490;2022-02-02@16:02:56
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;119824;1686919;6747676;6;1.315624838;2022-02-02@16:03:03
+v2.0.8-191-g68d8716f;imex;100;10000;;18563;6381;118356;1686683;6746732;6;1.330877474;2022-02-02@16:03:09
+v2.0.8;single;100;10000;;18563;6381;13468;4979;19916;17;3.799087779;2022-02-02@16:03:47
+v2.0.8;single;100;10000;;18563;6381;13892;5038;20152;17;3.800934060;2022-02-02@16:03:55
+v2.0.8;single;100;10000;;18563;6381;13684;4932;19728;18;3.994367792;2022-02-02@16:04:04
+v2.0.8;single;100;10000;;18563;6381;13680;5012;20048;18;4.009388266;2022-02-02@16:04:13
+v2.0.8;single;100;10000;;18563;6381;13752;4947;19788;17;3.770747621;2022-02-02@16:04:21
+v2.0.8;single;100;10000;;18563;6381;13728;5015;20060;18;3.988319406;2022-02-02@16:04:30
+v2.0.8;single;100;10000;;18563;6381;13672;4937;19748;17;3.771330679;2022-02-02@16:04:39
+v2.0.8;single;100;10000;;18563;6381;13848;4972;19888;17;3.765548617;2022-02-02@16:04:47
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;12068;4577;18308;17;3.775450581;2022-02-02@16:04:58
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11904;4551;18204;17;3.788765324;2022-02-02@16:05:07
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11768;4538;18152;17;3.778796746;2022-02-02@16:05:15
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;12020;4560;18240;16;3.553800836;2022-02-02@16:05:24
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11856;4535;18140;17;3.775249036;2022-02-02@16:05:32
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11956;4555;18220;17;3.787193966;2022-02-02@16:05:41
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11644;4553;18212;17;3.777879221;2022-02-02@16:05:49
+v2.0.8-169-ga840170e;single;100;10000;;18563;6381;11928;4558;18232;17;3.787686447;2022-02-02@16:05:58
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8604;1660755;6643020;6;1.326084068;2022-02-02@16:06:06
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8448;1660651;6642604;6;1.317446011;2022-02-02@16:06:12
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8692;1660633;6642532;6;1.324981939;2022-02-02@16:06:18
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8772;1660640;6642560;6;1.327670396;2022-02-02@16:06:24
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8656;1660740;6642960;6;1.326580292;2022-02-02@16:06:30
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8428;1660814;6643256;6;1.328290321;2022-02-02@16:06:37
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8640;1660730;6642920;6;1.371798523;2022-02-02@16:06:43
+v2.0.8-191-g68d8716f;single;100;10000;;18563;6381;8268;1660651;6642604;6;1.346723512;2022-02-02@16:06:49
+v2.0.8;mulimex;100;10000;;18563;6381;263604;67453;269812;33;7.360971443;2022-02-02@16:07:30
+v2.0.8;mulimex;100;10000;;18563;6381;263644;67477;269908;32;7.126471040;2022-02-02@16:07:43
+v2.0.8;mulimex;100;10000;;18563;6381;263672;67445;269780;32;7.133226814;2022-02-02@16:07:55
+v2.0.8;mulimex;100;10000;;18563;6381;263864;67487;269948;32;7.129820274;2022-02-02@16:08:07
+v2.0.8;mulimex;100;10000;;18563;6381;263784;67469;269876;32;7.137229997;2022-02-02@16:08:20
+v2.0.8;mulimex;100;10000;;18563;6381;263800;67466;269864;32;7.131475864;2022-02-02@16:08:32
+v2.0.8;mulimex;100;10000;;18563;6381;263676;67459;269836;32;7.140033002;2022-02-02@16:08:44
+v2.0.8;mulimex;100;10000;;18563;6381;263876;67494;269976;32;7.130427897;2022-02-02@16:08:57
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;233552;1722181;6888724;14;3.105856824;2022-02-02@16:09:07
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;233348;1722054;6888216;14;3.116089618;2022-02-02@16:09:15
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;235832;1721816;6887264;15;3.342201413;2022-02-02@16:09:23
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;240788;1723125;6892500;15;3.342350219;2022-02-02@16:09:31
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;233900;1722376;6889504;15;3.326025335;2022-02-02@16:09:39
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;236284;1721842;6887368;15;3.333339990;2022-02-02@16:09:47
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;236012;1722360;6889440;15;3.331908827;2022-02-02@16:09:56
+v2.0.8-169-ga840170e;mulimex;100;10000;;18563;6381;240876;1723169;6892676;15;3.344265549;2022-02-02@16:10:04
+v2.0.8-191-g68d8716f;mulimex;100;10000;;18563;6381;246520;2150931;8603724;7;1.537485181;2022-02-02@16:10:12
+v2.0.8-191-g68d8716f;mulimex;100;10000;;18563;6381;245612;2150396;8601584;7;1.546537888;2022-02-02@16:13:01
+v2.0.8-191-g68d8716f;mulimex;100;10000;;18563;6381;252292;2151115;8604460;7;1.549455390;2022-02-02@16:13:08
+v2.0.8-191-g68d8716f;mulimex;100;10000;;18563;6381;253068;2150720;8602880;7;1.553020422;2022-02-02@16:13:14
+v2.0.8;multi;316;10000;;19553;6638;574756;145186;580744;111;24.875043586;2022-02-02@16:17:22
+v2.0.8;multi;316;10000;;19553;6638;574568;145188;580752;112;25.087693186;2022-02-02@16:17:53
+v2.0.8;multi;316;10000;;19553;6638;574244;145131;580524;112;25.105188009;2022-02-02@16:18:25
+v2.0.8;multi;316;10000;;19553;6638;575156;145262;581048;114;25.544961576;2022-02-02@16:18:56
+v2.0.8;multi;316;10000;;19553;6638;574580;145190;580760;110;24.675578843;2022-02-02@16:19:27
+v2.0.8;multi;316;10000;;19553;6638;574568;145197;580788;112;25.101365269;2022-02-02@16:19:58
+v2.0.8;multi;316;10000;;19553;6638;574640;145197;580788;113;25.350631563;2022-02-02@16:20:30
+v2.0.8;multi;316;10000;;19553;6638;574380;145147;580588;112;25.080088411;2022-02-02@16:21:01
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;478256;2216462;8865848;40;8.950696582;2022-02-02@16:21:18
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;490244;2216051;8864204;39;8.711322077;2022-02-02@16:21:32
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;452280;2215663;8862652;39;8.748604814;2022-02-02@16:21:45
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;457900;2217142;8868568;42;9.379200652;2022-02-02@16:21:59
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;464208;2215304;8861216;39;8.724995102;2022-02-02@16:22:13
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;461028;2217779;8871116;39;8.706358909;2022-02-02@16:22:26
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;455448;2215474;8861896;39;8.707086972;2022-02-02@16:22:40
+v2.0.8-169-ga840170e;multi;316;10000;;19553;6638;482764;2216948;8867792;40;8.939725863;2022-02-02@16:22:54
+v2.0.8-191-g68d8716f;multi;316;10000;;19553;6638;514984;2222523;8890092;20;4.469350134;2022-02-02@16:23:05
+v2.0.8-191-g68d8716f;multi;316;10000;;19553;6638;543880;2222489;8889956;19;4.287261037;2022-02-02@16:24:23
+v2.0.8-191-g68d8716f;multi;316;10000;;19553;6638;512692;2223364;8893456;18;4.015889015;2022-02-02@16:28:21
+v2.0.8;imex;316;10000;;19553;6638;281800;72001;288004;79;17.701601688;2022-02-02@16:31:56
+v2.0.8;imex;316;10000;;19553;6638;281788;71952;287808;69;15.433384042;2022-02-02@16:32:17
+v2.0.8;imex;316;10000;;19553;6638;281896;71997;287988;69;15.476263288;2022-02-02@16:32:37
+v2.0.8;imex;316;10000;;19553;6638;281968;72057;288228;70;15.681520777;2022-02-02@16:32:58
+v2.0.8;imex;316;10000;;19553;6638;281860;72033;288132;71;15.911707488;2022-02-02@16:33:19
+v2.0.8;imex;316;10000;;19553;6638;281828;71989;287956;69;15.465026850;2022-02-02@16:33:40
+v2.0.8;imex;316;10000;;19553;6638;282480;72195;288780;69;15.437115282;2022-02-02@16:34:00
+v2.0.8;imex;316;10000;;19553;6638;281888;72015;288060;69;15.454763570;2022-02-02@16:34:21
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;285680;82499;329996;68;15.187697989;2022-02-02@16:34:43
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;285520;82385;329540;70;15.722410031;2022-02-02@16:35:04
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;286412;82717;330868;69;15.405166652;2022-02-02@16:35:24
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;287280;82930;331720;74;16.510624914;2022-02-02@16:35:45
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;286188;82611;330444;69;15.399281903;2022-02-02@16:36:06
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;289440;83413;333652;70;15.608280011;2022-02-02@16:36:26
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;285280;82429;329716;69;15.395506632;2022-02-02@16:36:46
+v2.0.8-169-ga840170e;imex;316;10000;;19553;6638;286064;82601;330404;68;15.184299510;2022-02-02@16:37:06
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;336312;2171313;8685252;12;2.718531734;2022-02-02@16:37:16
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;331172;2170896;8683584;12;2.707448746;2022-02-02@16:37:23
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;342396;2171497;8685988;12;2.748744844;2022-02-02@16:37:31
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;342312;2171607;8686428;12;2.666350429;2022-02-02@16:37:39
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;332528;2172268;8689072;11;2.457329679;2022-02-02@16:37:46
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;341744;2171307;8685228;12;2.671678567;2022-02-02@16:37:53
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;348944;2171900;8687600;14;3.124912393;2022-02-02@16:38:01
+v2.0.8-191-g68d8716f;imex;316;10000;;19553;6638;339176;2171854;8687416;11;2.451779359;2022-02-02@16:38:09
+v2.0.8;single;316;10000;;19553;6638;25136;7806;31224;65;14.606654244;2022-02-02@16:40:39
+v2.0.8;single;316;10000;;19553;6638;26732;8174;32696;67;14.995790956;2022-02-02@16:40:58
+v2.0.8;single;316;10000;;19553;6638;26364;8059;32236;66;14.771025973;2022-02-02@16:41:18
+v2.0.8;single;316;10000;;19553;6638;26656;8121;32484;67;14.990756334;2022-02-02@16:41:38
+v2.0.8;single;316;10000;;19553;6638;25968;7997;31988;68;15.266536629;2022-02-02@16:41:58
+v2.0.8;single;316;10000;;19553;6638;25872;7979;31916;67;14.997916364;2022-02-02@16:42:18
+v2.0.8;single;316;10000;;19553;6638;26240;8076;32304;68;15.201040536;2022-02-02@16:42:38
+v2.0.8;single;316;10000;;19553;6638;25408;7829;31316;66;14.787224899;2022-02-02@16:42:57
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19628;6470;25880;57;12.741635618;2022-02-02@16:43:17
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19580;6474;25896;57;12.739297639;2022-02-02@16:43:34
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19876;6513;26052;57;12.770329737;2022-02-02@16:43:52
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19520;6480;25920;57;12.749687555;2022-02-02@16:44:09
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19656;6495;25980;56;12.524833233;2022-02-02@16:44:27
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19512;6475;25900;58;12.972431299;2022-02-02@16:44:44
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19564;6474;25896;57;12.743207087;2022-02-02@16:45:02
+v2.0.8-169-ga840170e;single;316;10000;;19553;6638;19688;6475;25900;57;12.734766557;2022-02-02@16:45:19
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;18492;2093026;8372104;10;2.250806889;2022-02-02@16:45:29
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;26544;2093211;8372844;10;2.269035127;2022-02-02@16:45:36
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;46212;2093637;8374548;9;2.052613340;2022-02-02@16:45:43
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;31520;2093503;8374012;10;2.254200895;2022-02-02@16:45:50
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;19516;2093013;8372052;10;2.227538345;2022-02-02@16:45:57
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;28372;2093701;8374804;10;2.242273743;2022-02-02@16:46:04
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;33464;2093280;8373120;10;2.266793992;2022-02-02@16:46:11
+v2.0.8-191-g68d8716f;single;316;10000;;19553;6638;29836;2093217;8372868;10;2.241835648;2022-02-02@16:46:18
+v2.0.8;mulimex;316;10000;;19553;6638;827512;208387;833548;113;25.357901229;2022-02-02@16:49:01
+v2.0.8;mulimex;316;10000;;19553;6638;827992;208492;833968;113;25.329241361;2022-02-02@16:49:33
+v2.0.8;mulimex;316;10000;;19553;6638;827984;208471;833884;113;25.324911752;2022-02-02@16:50:05
+v2.0.8;mulimex;316;10000;;19553;6638;827124;208325;833300;113;25.310128090;2022-02-02@16:50:38
+v2.0.8;mulimex;316;10000;;19553;6638;827512;208424;833696;113;25.313349047;2022-02-02@16:51:10
+v2.0.8;mulimex;316;10000;;19553;6638;827428;208358;833432;114;25.537513534;2022-02-02@16:51:42
+v2.0.8;mulimex;316;10000;;19553;6638;827928;208435;833740;114;25.546806422;2022-02-02@16:52:15
+v2.0.8;mulimex;316;10000;;19553;6638;827208;208359;833436;112;25.093348964;2022-02-02@16:52:46
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;750988;2292156;9168624;49;10.919057214;2022-02-02@16:53:06
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;755928;2292301;9169204;49;10.955130151;2022-02-02@16:53:22
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;753316;2290486;9161944;49;10.939504130;2022-02-02@16:53:37
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;748152;2294324;9177296;49;10.951741412;2022-02-02@16:53:53
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;761156;2294287;9177148;48;10.681507651;2022-02-02@16:54:09
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;714848;2290882;9163528;51;11.406591954;2022-02-02@16:54:25
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;757724;2292931;9171724;50;11.148194111;2022-02-02@16:54:41
+v2.0.8-169-ga840170e;mulimex;316;10000;;19553;6638;747348;2291959;9167836;48;10.735578908;2022-02-02@16:54:56
+v2.0.8;multi;1000;10000;;20198;7289;1918952;481269;1925076;409;92.556105059;2022-02-02@17:13:54
+v2.0.8;multi;1000;10000;;20198;7289;1843856;462455;1849820;382;86.286460690;2022-02-02@17:15:31
+v2.0.8;multi;1000;10000;;20198;7289;1844268;462545;1850180;378;85.399383493;2022-02-02@17:17:07
+v2.0.8;multi;1000;10000;;20198;7289;1844004;462473;1849892;379;85.629571786;2022-02-02@17:18:43
+v2.0.8;multi;1000;10000;;20198;7289;1844360;462601;1850404;379;85.592494014;2022-02-02@17:20:19
+v2.0.8;multi;1000;10000;;20198;7289;1848996;463776;1855104;382;86.257385232;2022-02-02@17:21:56
+v2.0.8;multi;1000;10000;;20198;7289;1844468;462654;1850616;379;85.630820626;2022-02-02@17:23:32
+v2.0.8;multi;1000;10000;;20198;7289;1843652;462489;1849956;383;86.434786348;2022-02-02@17:25:09
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1600112;2518060;10072240;145;32.605450234;2022-02-02@17:25:54
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1592188;2516087;10064348;145;32.613735528;2022-02-02@17:26:32
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1618340;2519680;10078720;148;33.278723247;2022-02-02@17:27:10
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1565452;2522912;10091648;145;32.623061345;2022-02-02@17:27:48
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1602660;2517774;10071096;144;32.345346294;2022-02-02@17:28:26
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1610260;2521498;10085992;146;32.818846131;2022-02-02@17:29:04
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1597260;2516030;10064120;140;31.481242443;2022-02-02@17:29:40
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1585880;2521021;10084084;146;32.821031493;2022-02-02@17:30:18
+v2.0.8-191-g68d8716f;multi;1000;10000;;20198;7289;1692088;2543310;10173240;71;16.123901890;2022-02-02@17:30:42
+v2.0.8;multi;1000;10000;;20198;7289;1843460;462416;1849664;380;85.784607865;2022-02-02@17:45:42
+v2.0.8;multi;1000;10000;;20198;7289;1850944;464319;1857276;379;85.579503223;2022-02-02@17:47:17
+v2.0.8;multi;1000;10000;;20198;7289;1843876;462490;1849960;379;85.580077687;2022-02-02@17:48:53
+v2.0.8;multi;1000;10000;;20198;7289;1843360;462430;1849720;379;85.565668997;2022-02-02@17:50:29
+v2.0.8;multi;1000;10000;;20198;7289;1844668;462667;1850668;377;85.138994632;2022-02-02@17:52:05
+v2.0.8;multi;1000;10000;;20198;7289;1844332;462582;1850328;381;85.964141560;2022-02-02@17:53:41
+v2.0.8;multi;1000;10000;;20198;7289;1843340;462336;1849344;377;85.104851264;2022-02-02@17:55:16
+v2.0.8;multi;1000;10000;;20198;7289;1843688;462493;1849972;382;86.245226556;2022-02-02@17:56:53
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1627992;2523647;10094588;145;32.630990467;2022-02-02@17:57:38
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1518900;2523423;10093692;142;31.916369543;2022-02-02@17:58:15
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1589680;2516197;10064788;143;32.115406140;2022-02-02@17:58:53
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1603032;2523248;10092992;149;33.463930835;2022-02-02@17:59:31
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1482196;2516903;10067612;149;33.562284734;2022-02-02@18:00:10
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1575540;2516748;10066992;144;32.406810002;2022-02-02@18:00:48
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1625412;2523674;10094696;152;34.173149497;2022-02-02@18:01:27
+v2.0.8-169-ga840170e;multi;1000;10000;;20198;7289;1630680;2523724;10094896;148;33.246558336;2022-02-02@18:02:06
+v2.0.8-191-g68d8716f;multi;1000;10000;;20198;7289;1612280;2543692;10174768;68;15.516767793;2022-02-02@18:06:24
+v2.0.8-191-g68d8716f;multi;1000;10000;;20198;7289;1653388;2538169;10152676;97;22.204992100;2022-02-02@18:08:59
+v2.0.8-191-g68d8716f;multi;1000;10000;;20198;7289;1553264;2541272;10165088;66;14.963504759;2022-02-02@18:09:19
+v2.0.8;imex;1000;10000;;20198;7289;918600;231241;924964;259;58.526293659;2022-02-02@18:22:52
+v2.0.8;imex;1000;10000;;20198;7289;918876;231213;924852;343;77.752204003;2022-02-02@18:24:16
+v2.0.8;imex;1000;10000;;20198;7289;918492;231189;924756;266;60.169002238;2022-02-02@18:25:22
+v2.0.8;imex;1000;10000;;20198;7289;918888;231250;925000;345;78.174168712;2022-02-02@18:26:47
+v2.0.8;imex;1000;10000;;20198;7289;918900;231305;925220;257;58.137123733;2022-02-02@18:27:51
+v2.0.8;imex;1000;10000;;20198;7289;918292;231088;924352;347;78.644603392;2022-02-02@18:29:16
+v2.0.8;imex;1000;10000;;20198;7289;918828;231280;925120;259;58.518265503;2022-02-02@18:30:21
+v2.0.8;imex;1000;10000;;20198;7289;918644;231157;924628;342;77.476259405;2022-02-02@18:31:45
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;942008;267107;1068428;277;62.290351918;2022-02-02@18:32:55
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;938428;266238;1064952;261;58.601389193;2022-02-02@18:33:59
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;942736;267297;1069188;256;57.517160365;2022-02-02@18:35:01
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;967124;273421;1093684;247;55.539658141;2022-02-02@18:36:02
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;959296;271471;1085884;244;54.744832081;2022-02-02@18:37:04
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;950444;269168;1076672;245;54.997048778;2022-02-02@18:38:04
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;952416;269719;1078876;238;53.396354656;2022-02-02@18:39:10
+v2.0.8-169-ga840170e;imex;1000;10000;;20198;7289;950684;269213;1076852;249;55.886498041;2022-02-02@18:40:20
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1229516;2380248;9520992;39;8.849477868;2022-02-02@18:40:36
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1166328;2378259;9513036;36;8.160477720;2022-02-02@18:40:49
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1137688;2378939;9515756;36;8.173673686;2022-02-02@18:41:03
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1286048;2413111;9652444;41;9.418611016;2022-02-02@18:41:17
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1188564;2380741;9522964;49;11.154219052;2022-02-02@18:41:33
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1181600;2379385;9517540;43;9.831544546;2022-02-02@18:41:48
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1165704;2379113;9516452;46;10.359286424;2022-02-02@18:42:04
+v2.0.8-191-g68d8716f;imex;1000;10000;;20198;7289;1144084;2378342;9513368;48;10.856140332;2022-02-02@18:42:20
+v2.0.8;single;1000;10000;;20198;7289;43776;12410;49640;247;55.994247859;2022-02-02@18:55:46
+v2.0.8;single;1000;10000;;20198;7289;43648;12416;49664;245;55.550156851;2022-02-02@18:56:47
+v2.0.8;single;1000;10000;;20198;7289;43720;12388;49552;254;57.434214477;2022-02-02@18:57:49
+v2.0.8;single;1000;10000;;20198;7289;43128;12288;49152;250;56.710667003;2022-02-02@18:58:51
+v2.0.8;single;1000;10000;;20198;7289;43544;12453;49812;244;55.216580102;2022-02-02@18:59:51
+v2.0.8;single;1000;10000;;20198;7289;44020;12536;50144;251;56.787332144;2022-02-02@19:00:52
+v2.0.8;single;1000;10000;;20198;7289;44140;12544;50176;255;57.725415078;2022-02-02@19:01:55
+v2.0.8;single;1000;10000;;20198;7289;43264;12299;49196;248;56.105100371;2022-02-02@19:03:00
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;46044;13089;52356;204;45.978549547;2022-02-02@19:03:53
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;46028;13085;52340;201;45.277937293;2022-02-02@19:04:43
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;42820;12241;48964;200;45.077595035;2022-02-02@19:05:33
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;42648;12241;48964;203;45.743033047;2022-02-02@19:06:23
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;42760;12246;48984;200;45.083305510;2022-02-02@19:07:13
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;42716;12267;49068;200;45.136407887;2022-02-02@19:08:03
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;42700;12238;48952;201;45.299410040;2022-02-02@19:08:53
+v2.0.8-169-ga840170e;single;1000;10000;;20198;7289;44044;12598;50392;206;46.473973896;2022-02-02@19:09:45
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;459124;2119075;8476300;50;11.724118662;2022-02-02@19:10:03
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;180564;2118151;8472604;34;7.909926062;2022-02-02@19:10:20
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;417388;2120731;8482924;38;8.733552667;2022-02-02@19:10:34
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;363320;2119850;8479400;57;12.946924478;2022-02-02@19:10:52
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;278540;2118588;8474352;113;26.059769770;2022-02-02@19:11:23
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;246504;2118661;8474644;102;23.561329241;2022-02-02@19:11:52
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;263576;2118704;8474816;54;12.555825441;2022-02-02@19:12:09
+v2.0.8-191-g68d8716f;single;1000;10000;;20198;7289;220484;2116832;8467328;71;16.439284499;2022-02-02@19:12:34
+v2.0.8;mulimex;1000;10000;;20198;7289;2711616;679490;2717960;389;87.851509232;2022-02-02@19:26:10
+v2.0.8;mulimex;1000;10000;;20198;7289;2710504;679224;2716896;396;89.521607717;2022-02-02@19:27:52
+v2.0.8;mulimex;1000;10000;;20198;7289;2715028;680241;2720964;386;87.244744526;2022-02-02@19:29:31
+v2.0.8;mulimex;1000;10000;;20198;7289;2711880;679523;2718092;387;87.539170004;2022-02-02@19:31:11
+v2.0.8;mulimex;1000;10000;;20198;7289;2712768;679742;2718968;400;90.444261172;2022-02-02@19:32:54
+v2.0.8;mulimex;1000;10000;;20198;7289;2710560;679180;2716720;398;89.803752427;2022-02-02@19:34:36
+v2.0.8;mulimex;1000;10000;;20198;7289;2711672;679460;2717840;386;87.187275054;2022-02-02@19:36:15
+v2.0.8;mulimex;1000;10000;;20198;7289;2711592;679398;2717592;394;89.032442627;2022-02-02@19:37:57
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2479780;2772503;11090012;175;39.339667844;2022-02-02@19:38:51
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2471832;2781643;11126572;189;42.543192806;2022-02-02@19:39:38
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2512788;2781386;11125544;187;41.961281081;2022-02-02@19:40:26
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2438388;2783094;11132376;194;43.588668140;2022-02-02@19:41:15
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2499408;2775849;11103396;175;39.285009320;2022-02-02@19:42:00
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2419224;2781780;11127120;181;40.621440667;2022-02-02@19:42:46
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2508500;2782415;11129660;194;43.484794727;2022-02-02@19:43:34
+v2.0.8-169-ga840170e;mulimex;1000;10000;;20198;7289;2535668;2779466;11117864;188;42.257747500;2022-02-02@19:44:22
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2466780;2806621;11226484;84;18.901887754;2022-02-02@19:44:48
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2547520;2811975;11247900;113;25.470624914;2022-02-02@19:45:19
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2499896;2798680;11194720;81;18.122502604;2022-02-02@19:45:43
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2501992;2805419;11221676;96;21.458408316;2022-02-02@19:46:10
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2523880;2809246;11236984;92;20.631695788;2022-02-02@19:46:36
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2552108;2810792;11243168;83;18.690704479;2022-02-02@19:47:00
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2571904;2814192;11256768;99;22.208167519;2022-02-02@19:47:28
+v2.0.8-191-g68d8716f;mulimex;1000;10000;;20198;7289;2598396;2814103;11256412;77;17.280540594;2022-02-02@19:47:50
+v2.0.8;multi;10;31623;;54425;24231;92896;24760;99040;9;2.061135608;2022-02-02@19:52:54
+v2.0.8;multi;10;31623;;54425;24231;92992;24783;99132;10;2.281368313;2022-02-02@19:53:01
+v2.0.8;multi;10;31623;;54425;24231;92876;24785;99140;10;2.276555975;2022-02-02@19:53:08
+v2.0.8;multi;10;31623;;54425;24231;92708;24762;99048;10;2.279739676;2022-02-02@19:53:15
+v2.0.8;multi;10;31623;;54425;24231;93092;24803;99212;10;2.271190989;2022-02-02@19:53:22
+v2.0.8;multi;10;31623;;54425;24231;92952;24770;99080;10;2.305766289;2022-02-02@19:53:29
+v2.0.8;multi;10;31623;;54425;24231;92944;24778;99112;10;2.272949683;2022-02-02@19:53:36
+v2.0.8;multi;10;31623;;54425;24231;92948;24756;99024;10;2.279365827;2022-02-02@19:53:43
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;76612;199494;797976;7;1.574790788;2022-02-02@19:53:52
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;77336;199547;798188;6;1.363207013;2022-02-02@19:53:58
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;76680;199454;797816;6;1.358123909;2022-02-02@19:54:04
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;77012;199881;799524;5;1.117990270;2022-02-02@19:54:10
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;76856;199437;797748;6;1.377519059;2022-02-02@19:54:16
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;77728;199527;798108;5;1.124094229;2022-02-02@19:54:22
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;76908;199490;797960;6;1.361653864;2022-02-02@19:54:28
+v2.0.8-169-ga840170e;multi;10;31623;;54425;24231;76908;199876;799504;6;1.360381447;2022-02-02@19:54:34
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;77500;378271;1513084;6;1.321139684;2022-02-02@19:54:43
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;76984;378180;1512720;5;1.139635741;2022-02-02@19:54:48
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;77468;378183;1512732;4;.890615812;2022-02-02@19:54:54
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;76752;378184;1512736;4;.887449038;2022-02-02@19:55:00
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;77188;378215;1512860;4;.888284681;2022-02-02@19:55:06
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;77364;378183;1512732;5;1.119217055;2022-02-02@19:55:11
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;77224;378204;1512816;4;.894053334;2022-02-02@19:55:17
+v2.0.8-191-g68d8716f;multi;10;31623;;54425;24231;75980;378189;1512756;4;.892353838;2022-02-02@19:55:23
+v2.0.8;imex;10;31623;;54425;24231;74984;20328;81312;8;1.793568500;2022-02-02@19:55:36
+v2.0.8;imex;10;31623;;54425;24231;75104;20301;81204;8;1.809987614;2022-02-02@19:55:43
+v2.0.8;imex;10;31623;;54425;24231;75208;20306;81224;8;1.820619754;2022-02-02@19:55:50
+v2.0.8;imex;10;31623;;54425;24231;75300;20331;81324;8;1.812107186;2022-02-02@19:55:56
+v2.0.8;imex;10;31623;;54425;24231;74984;20312;81248;8;1.811914240;2022-02-02@19:56:03
+v2.0.8;imex;10;31623;;54425;24231;75012;20344;81376;8;1.813298263;2022-02-02@19:56:10
+v2.0.8;imex;10;31623;;54425;24231;74916;20328;81312;8;1.828973653;2022-02-02@19:56:16
+v2.0.8;imex;10;31623;;54425;24231;75144;20327;81308;8;1.815619495;2022-02-02@19:56:23
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64104;17996;71984;13;2.958697569;2022-02-02@19:56:33
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64312;17990;71960;12;2.744167826;2022-02-02@19:56:40
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64248;18008;72032;12;2.744094633;2022-02-02@19:56:48
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64444;17983;71932;13;2.971843289;2022-02-02@19:56:56
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64104;17983;71932;13;2.978377168;2022-02-02@19:57:03
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64408;17971;71884;12;2.740160298;2022-02-02@19:57:11
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64236;17991;71964;12;2.740415015;2022-02-02@19:57:19
+v2.0.8-169-ga840170e;imex;10;31623;;54425;24231;64120;17984;71936;12;2.737853597;2022-02-02@19:57:26
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65740;194933;779732;6;1.366722076;2022-02-02@19:57:34
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65772;194691;778764;5;1.126984850;2022-02-02@19:57:40
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65872;194676;778704;5;1.114196721;2022-02-02@19:57:46
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65700;194855;779420;4;.896245824;2022-02-02@19:57:52
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65820;194667;778668;4;.884916833;2022-02-02@19:57:58
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;66128;194675;778700;5;1.114432961;2022-02-02@19:58:04
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65264;194728;778912;4;.881375103;2022-02-02@19:58:09
+v2.0.8-191-g68d8716f;imex;10;31623;;54425;24231;65136;194913;779652;5;1.100753297;2022-02-02@19:58:15
+v2.0.8;single;10;31623;;54425;24231;22700;7279;29116;6;1.371140093;2022-02-02@19:58:29
+v2.0.8;single;10;31623;;54425;24231;22892;7286;29144;7;1.596586117;2022-02-02@19:58:35
+v2.0.8;single;10;31623;;54425;24231;23072;7263;29052;7;1.597030488;2022-02-02@19:58:41
+v2.0.8;single;10;31623;;54425;24231;22784;7261;29044;8;1.811937844;2022-02-02@19:58:48
+v2.0.8;single;10;31623;;54425;24231;22960;7266;29064;7;1.578547748;2022-02-02@19:58:54
+v2.0.8;single;10;31623;;54425;24231;22856;7264;29056;7;1.583096662;2022-02-02@19:59:01
+v2.0.8;single;10;31623;;54425;24231;22720;7254;29016;7;1.584863592;2022-02-02@19:59:07
+v2.0.8;single;10;31623;;54425;24231;22964;7277;29108;7;1.583565953;2022-02-02@19:59:13
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18252;6139;24556;8;1.794470355;2022-02-02@19:59:22
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18416;6178;24712;7;1.589732994;2022-02-02@19:59:28
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18388;6162;24648;7;1.582190172;2022-02-02@19:59:35
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18436;6151;24604;7;1.587018099;2022-02-02@19:59:41
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18376;6148;24592;7;1.575646700;2022-02-02@19:59:48
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18520;6193;24772;7;1.588156849;2022-02-02@19:59:54
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18492;6151;24604;7;1.583657796;2022-02-02@20:00:00
+v2.0.8-169-ga840170e;single;10;31623;;54425;24231;18380;6148;24592;7;1.580550469;2022-02-02@20:00:07
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18744;184863;739452;6;1.324379764;2022-02-02@20:00:15
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18788;184860;739440;4;.887870711;2022-02-02@20:00:21
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18800;184863;739452;4;.882343486;2022-02-02@20:00:26
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18476;184860;739440;4;.891660205;2022-02-02@20:00:32
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;17968;184856;739424;5;1.111036262;2022-02-02@20:00:38
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18812;184871;739484;4;.902703536;2022-02-02@20:00:44
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18572;184870;739480;4;.892983304;2022-02-02@20:00:49
+v2.0.8-191-g68d8716f;single;10;31623;;54425;24231;18408;184862;739448;5;1.125872220;2022-02-02@20:00:55
+v2.0.8;mulimex;10;31623;;54425;24231;130480;34116;136464;10;2.263970858;2022-02-02@20:01:10
+v2.0.8;mulimex;10;31623;;54425;24231;130328;34141;136564;10;2.283210969;2022-02-02@20:01:17
+v2.0.8;mulimex;10;31623;;54425;24231;130516;34146;136584;11;2.514148666;2022-02-02@20:01:24
+v2.0.8;mulimex;10;31623;;54425;24231;130132;34136;136544;11;2.510524701;2022-02-02@20:01:31
+v2.0.8;mulimex;10;31623;;54425;24231;130376;34114;136456;10;2.284054662;2022-02-02@20:01:38
+v2.0.8;mulimex;10;31623;;54425;24231;130316;34112;136448;11;2.515189072;2022-02-02@20:01:46
+v2.0.8;mulimex;10;31623;;54425;24231;130468;34126;136504;11;2.512798855;2022-02-02@20:01:53
+v2.0.8;mulimex;10;31623;;54425;24231;130360;34115;136460;11;2.516084012;2022-02-02@20:02:01
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111272;208471;833884;15;3.442871186;2022-02-02@20:02:11
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111388;208588;834352;11;2.518306337;2022-02-02@20:02:18
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111288;208451;833804;11;2.524106172;2022-02-02@20:02:26
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111792;208586;834344;13;2.994332616;2022-02-02@20:02:33
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111780;208452;833808;10;2.286579462;2022-02-02@20:02:40
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111400;208481;833924;12;2.771033373;2022-02-02@20:02:48
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111280;208429;833716;12;2.770682628;2022-02-02@20:02:56
+v2.0.8-169-ga840170e;mulimex;10;31623;;54425;24231;111484;208494;833976;11;2.524751951;2022-02-02@20:03:03
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;112900;387062;1548248;6;1.335525077;2022-02-02@20:03:11
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113664;387062;1548248;4;.884061714;2022-02-02@20:03:17
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113448;387056;1548224;4;.906460210;2022-02-02@20:03:23
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113636;387088;1548352;5;1.129243221;2022-02-02@20:03:29
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113384;387053;1548212;4;.904309508;2022-02-02@20:03:34
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;112376;387035;1548140;4;.901388346;2022-02-02@20:03:40
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113152;387057;1548228;4;.912528125;2022-02-02@20:03:46
+v2.0.8-191-g68d8716f;mulimex;10;31623;;54425;24231;113948;387114;1548456;4;.900704740;2022-02-02@20:03:52
+v2.0.8;multi;32;31623;;58800;24186;219368;56367;225468;30;6.885636761;2022-02-02@20:04:11
+v2.0.8;multi;32;31623;;58800;24186;219340;56375;225500;30;6.898206547;2022-02-02@20:04:23
+v2.0.8;multi;32;31623;;58800;24186;219380;56369;225476;30;6.920744328;2022-02-02@20:04:35
+v2.0.8;multi;32;31623;;58800;24186;219364;56356;225424;30;6.889681220;2022-02-02@20:04:47
+v2.0.8;multi;32;31623;;58800;24186;219380;56375;225500;30;6.901653424;2022-02-02@20:04:59
+v2.0.8;multi;32;31623;;58800;24186;219244;56366;225464;30;6.919975031;2022-02-02@20:05:11
+v2.0.8;multi;32;31623;;58800;24186;219212;56371;225484;30;6.903714320;2022-02-02@20:05:23
+v2.0.8;multi;32;31623;;58800;24186;219436;56362;225448;29;6.747508391;2022-02-02@20:05:35
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;183604;586911;2347644;11;2.506963770;2022-02-02@20:05:44
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;183920;586939;2347756;12;2.746657682;2022-02-02@20:05:52
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;182864;588039;2352156;12;2.772625775;2022-02-02@20:05:59
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;183024;586886;2347544;11;2.515912071;2022-02-02@20:06:07
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;182828;587967;2351868;12;2.751033845;2022-02-02@20:06:14
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;183592;588038;2352152;12;2.758063968;2022-02-02@20:06:22
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;182556;588038;2352152;11;2.515176260;2022-02-02@20:06:29
+v2.0.8-169-ga840170e;multi;32;31623;;58800;24186;183428;588013;2352052;12;2.754864475;2022-02-02@20:06:37
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;187828;1126365;4505460;7;1.593869377;2022-02-02@20:06:45
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;184660;1126363;4505452;6;1.390524580;2022-02-02@20:06:52
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;187104;1126291;4505164;5;1.163656111;2022-02-02@20:06:58
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;184896;1126312;4505248;5;1.147200457;2022-02-02@20:07:04
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;184920;1126369;4505476;5;1.139531284;2022-02-02@20:07:10
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;186736;1126386;4505544;5;1.139013805;2022-02-02@20:07:16
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;189736;1126336;4505344;5;1.132032293;2022-02-02@20:07:21
+v2.0.8-191-g68d8716f;multi;32;31623;;58800;24186;199924;1126330;4505320;5;1.131235674;2022-02-02@20:07:27
+v2.0.8;imex;32;31623;;58800;24186;143556;37456;149824;20;4.597211749;2022-02-02@20:07:48
+v2.0.8;imex;32;31623;;58800;24186;143720;37450;149800;21;4.800847622;2022-02-02@20:07:57
+v2.0.8;imex;32;31623;;58800;24186;143644;37492;149968;20;4.591868286;2022-02-02@20:08:07
+v2.0.8;imex;32;31623;;58800;24186;143900;37475;149900;20;4.590178281;2022-02-02@20:08:16
+v2.0.8;imex;32;31623;;58800;24186;143568;37475;149900;21;4.804081227;2022-02-02@20:08:26
+v2.0.8;imex;32;31623;;58800;24186;143600;37444;149776;20;4.590194334;2022-02-02@20:08:36
+v2.0.8;imex;32;31623;;58800;24186;143856;37485;149940;21;4.807461635;2022-02-02@20:08:45
+v2.0.8;imex;32;31623;;58800;24186;143520;37449;149796;21;4.798587201;2022-02-02@20:08:55
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128820;34804;139216;25;5.709069932;2022-02-02@20:09:08
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128940;34762;139048;25;5.726877490;2022-02-02@20:09:18
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128600;34732;138928;25;5.735514486;2022-02-02@20:09:29
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128488;34749;138996;25;5.731999686;2022-02-02@20:09:39
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128644;34771;139084;25;5.734470483;2022-02-02@20:09:50
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128772;34763;139052;25;5.727734651;2022-02-02@20:10:00
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;129204;34824;139296;25;5.736937580;2022-02-02@20:10:11
+v2.0.8-169-ga840170e;imex;32;31623;;58800;24186;128524;34749;138996;24;5.499779076;2022-02-02@20:10:21
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;134728;571828;2287312;7;1.587289961;2022-02-02@20:10:30
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;134592;571693;2286772;5;1.130302449;2022-02-02@20:10:36
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;136892;571807;2287228;6;1.377142597;2022-02-02@20:10:42
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;134504;572051;2288204;7;1.581604491;2022-02-02@20:10:48
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;134768;571807;2287228;6;1.350384544;2022-02-02@20:10:54
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;135124;572203;2288812;7;1.582746205;2022-02-02@20:11:01
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;133876;571620;2286480;6;1.354121385;2022-02-02@20:11:07
+v2.0.8-191-g68d8716f;imex;32;31623;;58800;24186;134652;571640;2286560;5;1.124964768;2022-02-02@20:11:13
+v2.0.8;single;32;31623;;58800;24186;26340;8108;32432;19;4.347082601;2022-02-02@20:11:33
+v2.0.8;single;32;31623;;58800;24186;26112;8102;32408;19;4.390840325;2022-02-02@20:11:42
+v2.0.8;single;32;31623;;58800;24186;26024;8105;32420;19;4.353837574;2022-02-02@20:11:51
+v2.0.8;single;32;31623;;58800;24186;26456;8106;32424;19;4.371704027;2022-02-02@20:12:00
+v2.0.8;single;32;31623;;58800;24186;26304;8097;32388;20;4.585657323;2022-02-02@20:12:10
+v2.0.8;single;32;31623;;58800;24186;26364;8098;32392;19;4.364567904;2022-02-02@20:12:19
+v2.0.8;single;32;31623;;58800;24186;26196;8116;32464;19;4.351285742;2022-02-02@20:12:28
+v2.0.8;single;32;31623;;58800;24186;26028;8113;32452;19;4.335927422;2022-02-02@20:12:37
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21180;6809;27236;18;4.138554191;2022-02-02@20:12:48
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21116;6826;27304;19;4.350710800;2022-02-02@20:12:57
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21164;6833;27332;19;4.363152968;2022-02-02@20:13:07
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21116;6807;27228;18;4.106176339;2022-02-02@20:13:16
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21036;6821;27284;18;4.108272955;2022-02-02@20:13:24
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21128;6814;27256;19;4.349887495;2022-02-02@20:13:34
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21116;6826;27304;19;4.375268837;2022-02-02@20:13:43
+v2.0.8-169-ga840170e;single;32;31623;;58800;24186;21072;6825;27300;18;4.113858814;2022-02-02@20:13:52
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;22488;546116;2184464;7;1.570694207;2022-02-02@20:14:00
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;22156;546149;2184596;6;1.417918051;2022-02-02@20:14:06
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;22388;546135;2184540;5;1.143425094;2022-02-02@20:14:12
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;20652;546130;2184520;6;1.379597491;2022-02-02@20:14:18
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;21644;546141;2184564;6;1.364964908;2022-02-02@20:14:25
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;21892;546128;2184512;7;1.566992279;2022-02-02@20:14:31
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;22284;546148;2184592;7;1.565422272;2022-02-02@20:14:37
+v2.0.8-191-g68d8716f;single;32;31623;;58800;24186;21956;546119;2184476;6;1.324000717;2022-02-02@20:14:43
+v2.0.8;mulimex;32;31623;;58800;24186;319956;81515;326060;31;7.128546212;2022-02-02@20:15:06
+v2.0.8;mulimex;32;31623;;58800;24186;319656;81465;325860;31;7.123276328;2022-02-02@20:15:18
+v2.0.8;mulimex;32;31623;;58800;24186;319880;81501;326004;31;7.161056442;2022-02-02@20:15:31
+v2.0.8;mulimex;32;31623;;58800;24186;319736;81520;326080;31;7.139200376;2022-02-02@20:15:43
+v2.0.8;mulimex;32;31623;;58800;24186;320080;81509;326036;32;7.356374620;2022-02-02@20:15:56
+v2.0.8;mulimex;32;31623;;58800;24186;319984;81508;326032;31;7.104872234;2022-02-02@20:16:08
+v2.0.8;mulimex;32;31623;;58800;24186;319904;81497;325988;31;7.121769180;2022-02-02@20:16:21
+v2.0.8;mulimex;32;31623;;58800;24186;319948;81515;326060;32;7.353782542;2022-02-02@20:16:33
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;278004;611570;2446280;17;3.895777487;2022-02-02@20:16:45
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;277972;611765;2447060;17;3.908159126;2022-02-02@20:16:53
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;277940;611822;2447288;17;3.908633757;2022-02-02@20:17:02
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;277916;612767;2451068;17;3.920093526;2022-02-02@20:17:11
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;278960;611703;2446812;18;4.136890610;2022-02-02@20:17:20
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;279468;611945;2447780;17;3.907086532;2022-02-02@20:17:28
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;278380;612745;2450980;17;3.896484215;2022-02-02@20:17:37
+v2.0.8-169-ga840170e;mulimex;32;31623;;58800;24186;279516;611801;2447204;17;3.919517999;2022-02-02@20:17:46
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;282868;1150832;4603328;8;1.819519212;2022-02-02@20:17:55
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;283316;1150773;4603092;6;1.376890918;2022-02-02@20:18:01
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;284940;1150908;4603632;6;1.374635250;2022-02-02@20:18:07
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;287560;1150845;4603380;6;1.378710769;2022-02-02@20:18:13
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;283720;1150599;4602396;6;1.390721252;2022-02-02@20:18:20
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;283852;1150756;4603024;6;1.366153197;2022-02-02@20:18:26
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;285980;1150687;4602748;6;1.369095500;2022-02-02@20:18:32
+v2.0.8-191-g68d8716f;mulimex;32;31623;;58800;24186;284872;1150641;4602564;6;1.375042829;2022-02-02@20:18:38
+v2.0.8;multi;100;31623;;60390;24233;609772;154042;616168;106;24.403749624;2022-02-02@20:19:21
+v2.0.8;multi;100;31623;;60390;24233;599576;151502;606008;103;23.602692608;2022-02-02@20:19:51
+v2.0.8;multi;100;31623;;60390;24233;599396;151404;605616;100;23.043384193;2022-02-02@20:20:20
+v2.0.8;multi;100;31623;;60390;24233;617564;155960;623840;111;25.479996554;2022-02-02@20:20:51
+v2.0.8;multi;100;31623;;60390;24233;606516;153108;612432;107;24.662684893;2022-02-02@20:21:21
+v2.0.8;multi;100;31623;;60390;24233;599540;151445;605780;103;23.767208910;2022-02-02@20:21:51
+v2.0.8;multi;100;31623;;60390;24233;599652;151423;605692;100;22.985136797;2022-02-02@20:22:20
+v2.0.8;multi;100;31623;;60390;24233;609384;153858;615432;106;24.245110006;2022-02-02@20:22:50
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510416;1783869;7135476;37;8.521332192;2022-02-02@20:23:06
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510268;1783458;7133832;36;8.287241595;2022-02-02@20:23:19
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;511452;1786942;7147768;37;8.538776257;2022-02-02@20:23:33
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510116;1786810;7147240;35;8.103943459;2022-02-02@20:23:46
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510468;1783372;7133488;36;8.311868790;2022-02-02@20:23:59
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;511060;1783471;7133884;36;8.345806458;2022-02-02@20:24:12
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510760;1783361;7133444;36;8.281915512;2022-02-02@20:24:25
+v2.0.8-169-ga840170e;multi;100;31623;;60390;24233;510956;1783407;7133628;36;8.288528196;2022-02-02@20:24:38
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;554216;2209520;8838080;15;3.451486188;2022-02-02@20:24:48
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;558836;2209439;8837756;14;3.213895138;2022-02-02@20:24:56
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;580304;2209498;8837992;14;3.222141351;2022-02-02@20:25:05
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;578248;2209491;8837964;14;3.219908986;2022-02-02@20:25:13
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;573236;2209739;8838956;14;3.245140384;2022-02-02@20:25:21
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;570364;2209481;8837924;14;3.218710894;2022-02-02@20:25:29
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;572240;2210064;8840256;14;3.232105362;2022-02-02@20:25:37
+v2.0.8-191-g68d8716f;multi;100;31623;;60390;24233;560344;2209488;8837952;14;3.192630364;2022-02-02@20:25:45
+v2.0.8;imex;100;31623;;60390;24233;343240;87364;349456;62;14.373490899;2022-02-02@20:26:34
+v2.0.8;imex;100;31623;;60390;24233;343500;87414;349656;63;14.466659803;2022-02-02@20:26:53
+v2.0.8;imex;100;31623;;60390;24233;343628;87402;349608;62;14.215860802;2022-02-02@20:27:13
+v2.0.8;imex;100;31623;;60390;24233;343532;87387;349548;63;14.437585063;2022-02-02@20:27:32
+v2.0.8;imex;100;31623;;60390;24233;343392;87389;349556;63;14.450131995;2022-02-02@20:27:52
+v2.0.8;imex;100;31623;;60390;24233;343604;87408;349632;63;14.442537601;2022-02-02@20:28:12
+v2.0.8;imex;100;31623;;60390;24233;343452;87408;349632;63;14.497646853;2022-02-02@20:28:31
+v2.0.8;imex;100;31623;;60390;24233;343444;87412;349648;62;14.340834752;2022-02-02@20:28:51
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319284;84479;337916;66;15.158155017;2022-02-02@20:29:13
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319104;84394;337576;66;15.146457949;2022-02-02@20:29:33
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319712;84609;338436;67;15.421973968;2022-02-02@20:29:53
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319144;84411;337644;66;15.171973366;2022-02-02@20:30:13
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319252;84425;337700;67;15.392000200;2022-02-02@20:30:34
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319472;84490;337960;66;15.142010833;2022-02-02@20:30:53
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319528;84517;338068;65;14.957823368;2022-02-02@20:31:13
+v2.0.8-169-ga840170e;imex;100;31623;;60390;24233;319248;84434;337736;68;15.610104439;2022-02-02@20:31:34
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;342480;1735591;6942364;12;2.753912946;2022-02-02@20:31:43
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;345536;1736833;6947332;10;2.304458569;2022-02-02@20:31:51
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;340200;1737696;6950784;10;2.261198996;2022-02-02@20:31:58
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;342544;1737195;6948780;10;2.285360797;2022-02-02@20:32:05
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;341972;1735643;6942572;10;2.327064056;2022-02-02@20:32:12
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;344468;1737520;6950080;11;2.554786328;2022-02-02@20:32:19
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;342096;1735691;6942764;10;2.340935971;2022-02-02@20:32:27
+v2.0.8-191-g68d8716f;imex;100;31623;;60390;24233;345176;1737651;6950604;10;2.272069748;2022-02-02@20:32:34
+v2.0.8;single;100;31623;;60390;24233;31076;9315;37260;57;13.196041577;2022-02-02@20:33:21
+v2.0.8;single;100;31623;;60390;24233;31204;9310;37240;57;13.073802136;2022-02-02@20:33:39
+v2.0.8;single;100;31623;;60390;24233;31100;9265;37060;58;13.304486526;2022-02-02@20:33:57
+v2.0.8;single;100;31623;;60390;24233;31332;9336;37344;58;13.381902493;2022-02-02@20:34:15
+v2.0.8;single;100;31623;;60390;24233;31116;9317;37268;58;13.327016466;2022-02-02@20:34:34
+v2.0.8;single;100;31623;;60390;24233;31044;9289;37156;57;13.072699575;2022-02-02@20:34:51
+v2.0.8;single;100;31623;;60390;24233;30884;9304;37216;57;13.084164379;2022-02-02@20:35:09
+v2.0.8;single;100;31623;;60390;24233;31016;9290;37160;59;13.528666585;2022-02-02@20:35:28
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;25004;7778;31112;53;12.275608428;2022-02-02@20:35:47
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24872;7786;31144;55;12.667801365;2022-02-02@20:36:04
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24876;7808;31232;54;12.437475344;2022-02-02@20:36:22
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24928;7818;31272;55;12.719042482;2022-02-02@20:36:39
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24768;7785;31140;54;12.437589859;2022-02-02@20:36:56
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24784;7789;31156;53;12.206095233;2022-02-02@20:37:13
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24900;7781;31124;55;12.670752311;2022-02-02@20:37:31
+v2.0.8-169-ga840170e;single;100;31623;;60390;24233;24928;7802;31208;56;12.870220856;2022-02-02@20:37:48
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;57032;1662861;6651444;11;2.492611619;2022-02-02@20:37:58
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;47504;1662801;6651204;10;2.269025127;2022-02-02@20:38:05
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;60072;1662896;6651584;9;2.054864106;2022-02-02@20:38:12
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;53748;1662827;6651308;10;2.264594583;2022-02-02@20:38:19
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;42696;1662738;6650952;10;2.264983192;2022-02-02@20:38:26
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;49188;1662803;6651212;9;2.041539185;2022-02-02@20:38:33
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;53220;1662839;6651356;10;2.282280543;2022-02-02@20:38:40
+v2.0.8-191-g68d8716f;single;100;31623;;60390;24233;73856;1662921;6651684;10;2.275693343;2022-02-02@20:38:47
+v2.0.8;mulimex;100;31623;;60390;24233;893868;225017;900068;106;24.351250034;2022-02-02@20:39:46
+v2.0.8;mulimex;100;31623;;60390;24233;893972;225027;900108;107;24.579589101;2022-02-02@20:40:17
+v2.0.8;mulimex;100;31623;;60390;24233;905980;228026;912104;106;24.331246341;2022-02-02@20:40:48
+v2.0.8;mulimex;100;31623;;60390;24233;912620;229739;918956;108;24.825167645;2022-02-02@20:41:19
+v2.0.8;mulimex;100;31623;;60390;24233;894172;225065;900260;105;24.131678640;2022-02-02@20:41:50
+v2.0.8;mulimex;100;31623;;60390;24233;896372;225648;902592;105;24.187256143;2022-02-02@20:42:21
+v2.0.8;mulimex;100;31623;;60390;24233;913184;229877;919508;106;24.413003245;2022-02-02@20:42:52
+v2.0.8;mulimex;100;31623;;60390;24233;893864;225026;900104;104;24.052328066;2022-02-02@20:43:22
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;790552;1856693;7426772;47;10.867123643;2022-02-02@20:43:42
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;794128;1856617;7426468;47;10.828357246;2022-02-02@20:43:58
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;791332;1856626;7426504;49;11.323127520;2022-02-02@20:44:14
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;790848;1856584;7426336;47;10.830449566;2022-02-02@20:44:29
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;794084;1857098;7428392;48;11.055144634;2022-02-02@20:44:45
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;791496;1856599;7426396;48;11.115870635;2022-02-02@20:45:01
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;790940;1860063;7440252;48;11.096586121;2022-02-02@20:45:17
+v2.0.8-169-ga840170e;mulimex;100;31623;;60390;24233;789836;1856695;7426780;49;11.271300841;2022-02-02@20:45:33
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;836220;2281855;9127420;18;4.152594171;2022-02-02@20:45:44
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;833424;2282037;9128148;19;4.358091221;2022-02-02@20:45:54
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;825436;2281321;9125284;16;3.686258530;2022-02-02@20:46:02
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;828220;2281841;9127364;16;3.661010565;2022-02-02@20:46:11
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;818992;2281632;9126528;17;3.947767346;2022-02-02@20:46:19
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;830152;2281628;9126512;16;3.705973347;2022-02-02@20:46:28
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;823836;2281340;9125360;16;3.734540217;2022-02-02@20:46:37
+v2.0.8-191-g68d8716f;mulimex;100;31623;;60390;24233;830364;2282082;9128328;16;3.732490512;2022-02-02@20:46:45
+v2.0.8;multi;316;31623;;61364;24592;1816280;455598;1822392;332;77.436715317;2022-02-02@20:49:19
+v2.0.8;multi;316;31623;;61364;24592;1815216;455312;1821248;322;75.081119072;2022-02-02@20:50:43
+v2.0.8;multi;316;31623;;61364;24592;1815684;455524;1822096;326;76.158121754;2022-02-02@20:52:09
+v2.0.8;multi;316;31623;;61364;24592;1816004;455531;1822124;332;77.355584290;2022-02-02@20:53:36
+v2.0.8;multi;316;31623;;61364;24592;1815608;455388;1821552;330;76.769393421;2022-02-02@20:55:03
+v2.0.8;multi;316;31623;;61364;24592;1816080;455532;1822128;338;78.723329865;2022-02-02@20:56:31
+v2.0.8;multi;316;31623;;61364;24592;1815184;455300;1821200;338;78.735088217;2022-02-02@20:57:59
+v2.0.8;multi;316;31623;;61364;24592;1815396;455369;1821476;331;77.115575895;2022-02-02@20:59:26
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1556580;2473658;9894632;109;25.511644772;2022-02-02@21:00:04
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1555712;2473990;9895960;112;26.091256282;2022-02-02@21:00:35
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1548924;2481942;9927768;115;26.733370377;2022-02-02@21:01:07
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1556436;2484036;9936144;107;24.894919247;2022-02-02@21:01:37
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1556400;2473750;9895000;111;25.797810912;2022-02-02@21:02:08
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1555548;2473474;9893896;116;26.935629707;2022-02-02@21:02:40
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1554536;2473497;9893988;109;25.380262714;2022-02-02@21:03:11
+v2.0.8-169-ga840170e;multi;316;31623;;61364;24592;1557064;2473370;9893480;108;25.157586964;2022-02-02@21:03:41
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1608404;2479793;9919172;44;10.215476372;2022-02-02@21:03:58
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1608452;2481788;9927152;43;10.012273462;2022-02-02@21:04:14
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1605776;2481569;9926276;44;10.311323765;2022-02-02@21:04:29
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1621848;2482295;9929180;43;9.948007871;2022-02-02@21:04:44
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1616236;2481117;9924468;44;10.251145553;2022-02-02@21:04:59
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1615248;2481870;9927480;44;10.264449314;2022-02-02@21:05:15
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1622368;2482145;9928580;45;10.479320573;2022-02-02@21:05:30
+v2.0.8-191-g68d8716f;multi;316;31623;;61364;24592;1633092;2486876;9947504;46;10.816874025;2022-02-02@21:05:46
+v2.0.8;imex;316;31623;;61364;24592;982468;247158;988632;225;52.145060203;2022-02-02@21:08:53
+v2.0.8;imex;316;31623;;61364;24592;981304;246922;987688;222;51.557928112;2022-02-02@21:09:51
+v2.0.8;imex;316;31623;;61364;24592;981524;246909;987636;222;51.408518461;2022-02-02@21:10:49
+v2.0.8;imex;316;31623;;61364;24592;981212;246872;987488;222;51.519757421;2022-02-02@21:11:47
+v2.0.8;imex;316;31623;;61364;24592;981932;247054;988216;222;51.470307221;2022-02-02@21:12:45
+v2.0.8;imex;316;31623;;61364;24592;981500;246919;987676;223;51.764474434;2022-02-02@21:13:43
+v2.0.8;imex;316;31623;;61364;24592;982372;247126;988504;221;51.190135520;2022-02-02@21:14:41
+v2.0.8;imex;316;31623;;61364;24592;982144;247088;988352;223;51.626732127;2022-02-02@21:15:39
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;928124;243144;972576;205;47.345308268;2022-02-02@21:16:35
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;931488;243934;975736;201;46.577522276;2022-02-02@21:17:26
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;930128;243660;974640;206;47.574034068;2022-02-02@21:18:19
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;933008;244392;977568;202;46.673453141;2022-02-02@21:19:10
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;936116;245149;980596;211;48.719153880;2022-02-02@21:20:04
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;931544;243990;975960;206;47.572895613;2022-02-02@21:20:56
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;931520;243896;975584;206;47.447554575;2022-02-02@21:21:48
+v2.0.8-169-ga840170e;imex;316;31623;;61364;24592;929352;243445;973780;204;47.139843739;2022-02-02@21:22:40
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1026812;2322916;9291664;29;6.652073460;2022-02-02@21:22:54
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1027720;2325004;9300016;32;7.358777220;2022-02-02@21:23:06
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1015224;2321519;9286076;29;6.600663091;2022-02-02@21:23:18
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1032756;2324245;9296980;32;7.360553459;2022-02-02@21:23:30
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1012624;2322745;9290980;31;7.059120867;2022-02-02@21:23:42
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1007304;2322964;9291856;36;8.190926862;2022-02-02@21:23:55
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1029756;2323708;9294832;30;6.857123354;2022-02-02@21:24:07
+v2.0.8-191-g68d8716f;imex;316;31623;;61364;24592;1016208;2324010;9296040;33;7.551347495;2022-02-02@21:24:20
+v2.0.8;single;316;31623;;61364;24592;41092;11800;47200;223;51.599431493;2022-02-02@21:27:25
+v2.0.8;single;316;31623;;61364;24592;41544;11883;47532;215;49.846132343;2022-02-02@21:28:19
+v2.0.8;single;316;31623;;61364;24592;40984;11772;47088;219;50.752624784;2022-02-02@21:29:15
+v2.0.8;single;316;31623;;61364;24592;41416;11869;47476;216;50.180805105;2022-02-02@21:30:10
+v2.0.8;single;316;31623;;61364;24592;40636;11616;46464;221;51.179113519;2022-02-02@21:31:06
+v2.0.8;single;316;31623;;61364;24592;40700;11638;46552;217;50.238548418;2022-02-02@21:32:01
+v2.0.8;single;316;31623;;61364;24592;41016;11776;47104;219;50.730275804;2022-02-02@21:32:56
+v2.0.8;single;316;31623;;61364;24592;41180;11841;47364;220;50.999142102;2022-02-02@21:33:52
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;35132;10354;41416;170;39.342137595;2022-02-02@21:34:39
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;34908;10340;41360;166;38.376001452;2022-02-02@21:35:22
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;35080;10400;41600;166;38.405387324;2022-02-02@21:36:05
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;35016;10347;41388;167;38.616029254;2022-02-02@21:36:48
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;34936;10366;41464;164;37.971476233;2022-02-02@21:37:31
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;35120;10335;41340;167;38.636480683;2022-02-02@21:38:15
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;34892;10350;41400;170;39.358453466;2022-02-02@21:38:59
+v2.0.8-169-ga840170e;single;316;31623;;61364;24592;35100;10364;41456;167;38.626356006;2022-02-02@21:39:42
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;141180;2096605;8386420;26;6.033158602;2022-02-02@21:39:55
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;113516;2096209;8384836;25;5.795120363;2022-02-02@21:40:06
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;88732;2096324;8385296;25;5.812146181;2022-02-02@21:40:16
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;117016;2096393;8385572;25;5.811050373;2022-02-02@21:40:27
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;120032;2096217;8384868;26;6.007754867;2022-02-02@21:40:38
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;116392;2096663;8386652;25;5.767125065;2022-02-02@21:40:48
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;103524;2095889;8383556;25;5.736038618;2022-02-02@21:40:59
+v2.0.8-191-g68d8716f;single;316;31623;;61364;24592;93180;2095903;8383612;25;5.856605202;2022-02-02@21:41:10
+v2.0.8;mulimex;316;31623;;61364;24592;2738664;686187;2744748;337;78.612317925;2022-02-02@21:44:44
+v2.0.8;mulimex;316;31623;;61364;24592;2736352;685615;2742460;337;78.656320392;2022-02-02@21:46:14
+v2.0.8;mulimex;316;31623;;61364;24592;2736444;685612;2742448;336;78.391438180;2022-02-02@21:47:44
+v2.0.8;mulimex;316;31623;;61364;24592;2736596;685676;2742704;336;78.396778332;2022-02-02@21:49:14
+v2.0.8;mulimex;316;31623;;61364;24592;2738388;686139;2744556;339;79.084028707;2022-02-02@21:50:45
+v2.0.8;mulimex;316;31623;;61364;24592;2736616;685650;2742600;337;78.655240623;2022-02-02@21:52:15
+v2.0.8;mulimex;316;31623;;61364;24592;2736612;685731;2742924;335;78.163305575;2022-02-02@21:53:45
+v2.0.8;mulimex;316;31623;;61364;24592;2738764;686174;2744696;336;78.301823192;2022-02-02@21:55:15
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2439648;2704985;10819940;147;34.064618894;2022-02-02@21:56:03
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2437424;2704517;10818068;154;35.523102787;2022-02-02@21:56:44
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2436340;2703887;10815548;143;33.098801820;2022-02-02@21:57:22
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2440416;2703938;10815752;152;35.205021098;2022-02-02@21:58:03
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2430028;2702637;10810548;146;33.710258797;2022-02-02@21:58:42
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2424608;2702694;10810776;144;33.375235537;2022-02-02@21:59:20
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2439264;2704049;10816196;144;33.395947254;2022-02-02@21:59:59
+v2.0.8-169-ga840170e;mulimex;316;31623;;61364;24592;2436920;2703216;10812864;145;33.643642065;2022-02-02@22:00:37
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2481012;2706644;10826576;65;15.003861162;2022-02-02@22:01:00
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2506084;2708273;10833092;52;12.075097259;2022-02-02@22:01:17
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2505360;2708466;10833864;54;12.790615287;2022-02-02@22:01:35
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2508920;2722988;10891952;54;12.631624324;2022-02-02@22:01:53
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2512252;2707401;10829604;52;12.122919018;2022-02-02@22:02:11
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2490256;2708236;10832944;54;12.591466900;2022-02-02@22:02:29
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2490656;2705477;10821908;54;12.585721138;2022-02-02@22:02:47
+v2.0.8-191-g68d8716f;mulimex;316;31623;;61364;24592;2510588;2707623;10830492;58;13.436823882;2022-02-02@22:03:05
+v2.0.8;multi;1000;31623;;62712;25321;5774112;1445077;5780308;1240;293.086164054;2022-02-02@22:14:41
+v2.0.8;multi;1000;31623;;62712;25321;5778476;1446151;5784604;1246;294.419143257;2022-02-02@22:19:58
+v2.0.8;multi;1000;31623;;62712;25321;5772628;1444693;5778772;1240;293.087164578;2022-02-02@22:25:14
+v2.0.8;multi;1000;31623;;62712;25321;5770852;1444208;5776832;1247;294.509920641;2022-02-02@22:30:31
+v2.0.8;multi;1000;31623;;62712;25321;5779704;1446459;5785836;1248;294.841307128;2022-02-02@22:35:48
+v2.0.8;multi;1000;31623;;62712;25321;5789472;1448918;5795672;1265;299.209784387;2022-02-02@22:41:10
+v2.0.8;multi;1000;31623;;62712;25321;5771092;1444244;5776976;1227;289.644361027;2022-02-02@22:46:22
+v2.0.8;multi;1000;31623;;62712;25321;5770504;1444186;5776744;1203;284.051015429;2022-02-02@22:51:28
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4920516;3331145;13324580;455;106.094097364;2022-02-02@22:53:37
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4908820;3351542;13406168;440;102.561138900;2022-02-02@22:55:26
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4913020;3331474;13325896;457;106.547017307;2022-02-02@22:57:19
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4911024;3330460;13321840;423;98.890622411;2022-02-02@22:59:03
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4909816;3329960;13319840;434;101.429949080;2022-02-02@23:00:51
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4952884;3339613;13358452;434;101.429036554;2022-02-02@23:02:39
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4913980;3329618;13318472;439;102.199929320;2022-02-02@23:04:27
+v2.0.8-169-ga840170e;multi;1000;31623;;62712;25321;4916828;3331270;13325080;437;102.068495453;2022-02-02@23:06:15
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5275964;3365587;13462348;157;36.827212979;2022-02-02@23:07:00
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5205452;3384278;13537112;158;37.361298295;2022-02-02@23:07:43
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5303300;3369252;13477008;153;35.939883492;2022-02-02@23:08:25
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5115856;3365454;13461816;161;37.686384242;2022-02-02@23:09:15
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5220888;3368799;13475196;147;34.322271864;2022-02-02@23:09:55
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5207600;3365039;13460156;154;36.484503342;2022-02-02@23:10:46
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5052176;3363675;13454700;155;36.473683328;2022-02-02@23:11:29
+v2.0.8-191-g68d8716f;multi;1000;31623;;62712;25321;5234004;3364984;13459936;159;37.426300286;2022-02-02@23:12:12
+v2.0.8;imex;1000;31623;;62712;25321;3077080;770775;3083100;932;220.401626049;2022-02-02@23:27:32
+v2.0.8;imex;1000;31623;;62712;25321;3079572;771507;3086028;943;222.831105234;2022-02-02@23:31:27
+v2.0.8;imex;1000;31623;;62712;25321;3081604;771948;3087792;939;222.029646285;2022-02-02@23:35:21
+v2.0.8;imex;1000;31623;;62712;25321;3078008;771043;3084172;909;214.865276918;2022-02-02@23:39:08
+v2.0.8;imex;1000;31623;;62712;25321;2994980;750261;3001044;806;191.020287817;2022-02-02@23:42:31
+v2.0.8;imex;1000;31623;;62712;25321;3086908;773274;3093096;918;217.221657397;2022-02-02@23:46:20
+v2.0.8;imex;1000;31623;;62712;25321;3074460;770136;3080544;921;217.699858960;2022-02-02@23:50:10
+v2.0.8;imex;1000;31623;;62712;25321;3074448;770188;3080752;901;212.932271620;2022-02-02@23:53:55
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2915956;760653;3042612;753;175.410624708;2022-02-02@23:57:04
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2948928;768816;3075264;755;175.596397003;2022-02-03@00:00:05
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2927068;763424;3053696;750;174.520716135;2022-02-03@00:03:05
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2931580;764516;3058064;754;175.449852605;2022-02-03@00:06:07
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2925676;763024;3052096;738;171.822788955;2022-02-03@00:09:04
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2934416;765213;3060852;742;172.524932454;2022-02-03@00:12:02
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2920640;761788;3047152;754;175.487462819;2022-02-03@00:15:03
+v2.0.8-169-ga840170e;imex;1000;31623;;62712;25321;2941792;767049;3068196;763;177.717125678;2022-02-03@00:18:06
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3487596;2865840;11463360;98;22.600772399;2022-02-03@00:18:36
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3402028;2854222;11416888;95;21.942213046;2022-02-03@00:19:06
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3508612;2851432;11405728;101;23.382506890;2022-02-03@00:19:35
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3429564;2852559;11410236;99;22.759707309;2022-02-03@00:20:13
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3461048;2851218;11404872;95;22.287236497;2022-02-03@00:20:41
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3526920;2853406;11413624;94;21.921398783;2022-02-03@00:21:14
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3458984;2916328;11665312;97;22.686502384;2022-02-03@00:21:50
+v2.0.8-191-g68d8716f;imex;1000;31623;;62712;25321;3647060;2850070;11400280;98;22.670127679;2022-02-03@00:22:28
+v2.0.8;single;1000;31623;;62712;25321;123880;32500;130000;938;223.207803674;2022-02-03@00:38:28
+v2.0.8;single;1000;31623;;62712;25321;82632;22155;88620;946;225.574573402;2022-02-03@00:42:20
+v2.0.8;single;1000;31623;;62712;25321;81708;21943;87772;940;223.896770918;2022-02-03@00:46:09
+v2.0.8;single;1000;31623;;62712;25321;87888;23451;93804;939;223.872257110;2022-02-03@00:49:59
+v2.0.8;single;1000;31623;;62712;25321;82476;22084;88336;934;222.361461941;2022-02-03@00:53:47
+v2.0.8;single;1000;31623;;62712;25321;94544;25136;100544;955;227.913353563;2022-02-03@00:57:40
+v2.0.8;single;1000;31623;;62712;25321;82864;22248;88992;956;227.760285555;2022-02-03@01:01:33
+v2.0.8;single;1000;31623;;62712;25321;81296;21834;87336;937;223.145407676;2022-02-03@01:05:22
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63384;17396;69584;619;144.871449929;2022-02-03@01:07:54
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;64072;17587;70348;625;146.293002409;2022-02-03@01:10:25
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63808;17536;70144;621;145.315860569;2022-02-03@01:12:55
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63892;17589;70356;620;145.181706825;2022-02-03@01:15:25
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63508;17450;69800;621;145.353670600;2022-02-03@01:17:55
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63540;17454;69816;616;144.258300160;2022-02-03@01:20:25
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63660;17533;70132;628;147.055067150;2022-02-03@01:22:56
+v2.0.8-169-ga840170e;single;1000;31623;;62712;25321;63580;17475;69900;613;143.478846839;2022-02-03@01:25:25
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;2151096;2126622;8506488;294;70.921632233;2022-02-03@01:26:43
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1917008;2130397;8521588;149;35.171599188;2022-02-03@01:27:26
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1421528;2125927;8503708;136;32.897053758;2022-02-03@01:28:14
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1996496;2130830;8523320;142;33.853604252;2022-02-03@01:29:02
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1292692;2126261;8505044;136;32.673237428;2022-02-03@01:29:49
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1996200;2136188;8544752;102;24.542073096;2022-02-03@01:30:19
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1392504;2126797;8507188;127;30.453187877;2022-02-03@01:31:04
+v2.0.8-191-g68d8716f;single;1000;31623;;62712;25321;1791820;2127190;8508760;116;27.350334960;2022-02-03@01:31:37
+v2.0.8;mulimex;1000;31623;;62712;25321;8750396;2189114;8756456;1196;282.407629781;2022-02-03@01:49:04
+v2.0.8;mulimex;1000;31623;;62712;25321;8751288;2189324;8757296;1175;277.642086168;2022-02-03@01:54:13
+v2.0.8;mulimex;1000;31623;;62712;25321;8763704;2192498;8769992;1166;275.682522414;2022-02-03@01:59:17
+v2.0.8;mulimex;1000;31623;;62712;25321;8812544;2204635;8818540;1199;281.864097633;2022-02-03@02:04:28
+v2.0.8;mulimex;1000;31623;;62712;25321;8749816;2188997;8755988;1197;282.906372293;2022-02-03@02:09:41
+v2.0.8;mulimex;1000;31623;;62712;25321;8752016;2189579;8758316;1198;282.545104136;2022-02-03@02:14:54
+v2.0.8;mulimex;1000;31623;;62712;25321;8911316;2229383;8917532;1275;285.535875802;2022-02-03@02:20:09
+v2.0.8;mulimex;1000;31623;;62712;25321;8923108;2232376;8929504;1229;290.099242501;2022-02-03@02:25:30
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7805036;4081565;16326260;548;126.300709104;2022-02-03@02:28:10
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7787812;4077735;16310940;535;124.444522629;2022-02-03@02:30:21
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7813100;4085368;16341472;544;126.802852753;2022-02-03@02:32:34
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7815256;4083757;16335028;569;132.578946304;2022-02-03@02:34:53
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7788196;4079905;16319620;557;130.013811201;2022-02-03@02:37:10
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7787124;4077949;16311796;532;124.077469090;2022-02-03@02:39:21
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7789584;4081063;16324252;558;130.124821167;2022-02-03@02:41:38
+v2.0.8-169-ga840170e;mulimex;1000;31623;;62712;25321;7788372;4095808;16383232;574;134.160317672;2022-02-03@02:43:58
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7907692;4089987;16359948;213;49.353041968;2022-02-03@02:44:57
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7955612;4094713;16378852;199;46.856902543;2022-02-03@02:45:50
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7935572;4095091;16380364;206;48.329116453;2022-02-03@02:46:46
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7914464;4093911;16375644;237;55.356136965;2022-02-03@02:47:48
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;8006428;4136348;16545392;199;46.405608786;2022-02-03@02:48:50
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7948884;4100531;16402124;197;46.239262945;2022-02-03@02:49:49
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7967444;4098904;16395616;206;48.621152065;2022-02-03@02:50:44
+v2.0.8-191-g68d8716f;mulimex;1000;31623;;62712;25321;7951844;4112822;16451288;323;76.509026163;2022-02-03@02:52:08
+v2.0.8;multi;10;100000;;126751;52385;207124;53281;213124;19;4.614935797;2022-02-03@03:05:46
+v2.0.8;multi;10;100000;;126751;52385;207032;53292;213168;20;4.852857172;2022-02-03@03:05:56
+v2.0.8;multi;10;100000;;126751;52385;207124;53296;213184;20;4.851456992;2022-02-03@03:06:05
+v2.0.8;multi;10;100000;;126751;52385;206928;53304;213216;20;4.848927657;2022-02-03@03:06:15
+v2.0.8;multi;10;100000;;126751;52385;207132;53297;213188;20;4.859316113;2022-02-03@03:06:25
+v2.0.8;multi;10;100000;;126751;52385;207160;53296;213184;20;4.856985963;2022-02-03@03:06:34
+v2.0.8;multi;10;100000;;126751;52385;206988;53281;213124;20;4.864978026;2022-02-03@03:06:44
+v2.0.8;multi;10;100000;;126751;52385;207072;53284;213136;20;4.868856010;2022-02-03@03:06:54
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;169948;220902;883608;11;2.661599160;2022-02-03@03:07:03
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170740;220948;883792;9;2.197051220;2022-02-03@03:07:10
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170512;220963;883852;10;2.450602942;2022-02-03@03:07:18
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170588;220923;883692;9;2.166589290;2022-02-03@03:07:25
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170080;220934;883736;9;2.211241091;2022-02-03@03:07:32
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170196;220925;883700;9;2.195719282;2022-02-03@03:07:39
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170156;220938;883752;9;2.167987968;2022-02-03@03:07:46
+v2.0.8-169-ga840170e;multi;10;100000;;126751;52385;170484;220947;883788;9;2.183906608;2022-02-03@03:07:53
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;169988;397588;1590352;9;2.127436973;2022-02-03@03:08:02
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170472;397549;1590196;6;1.427612542;2022-02-03@03:08:08
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170908;397595;1590380;6;1.429181845;2022-02-03@03:08:14
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;169924;397592;1590368;6;1.460594293;2022-02-03@03:08:21
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170796;397646;1590584;6;1.414426568;2022-02-03@03:08:27
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170780;397574;1590296;6;1.427815630;2022-02-03@03:08:33
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170216;397573;1590292;6;1.440043205;2022-02-03@03:08:39
+v2.0.8-191-g68d8716f;multi;10;100000;;126751;52385;170392;397534;1590136;6;1.461589641;2022-02-03@03:08:46
+v2.0.8;imex;10;100000;;126751;52385;162848;42276;169104;14;3.355771821;2022-02-03@03:09:04
+v2.0.8;imex;10;100000;;126751;52385;163024;42281;169124;14;3.385658766;2022-02-03@03:09:12
+v2.0.8;imex;10;100000;;126751;52385;162856;42261;169044;14;3.393856135;2022-02-03@03:09:20
+v2.0.8;imex;10;100000;;126751;52385;163016;42303;169212;14;3.361237304;2022-02-03@03:09:28
+v2.0.8;imex;10;100000;;126751;52385;162644;42225;168900;14;3.386373061;2022-02-03@03:09:37
+v2.0.8;imex;10;100000;;126751;52385;162840;42258;169032;14;3.374360367;2022-02-03@03:09:45
+v2.0.8;imex;10;100000;;126751;52385;162816;42247;168988;15;3.617011790;2022-02-03@03:09:54
+v2.0.8;imex;10;100000;;126751;52385;162884;42280;169120;15;3.629950751;2022-02-03@03:10:02
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138200;36449;145796;36;8.845786207;2022-02-03@03:10:18
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138260;36506;146024;32;7.908583186;2022-02-03@03:10:31
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138964;36633;146532;34;8.387238847;2022-02-03@03:10:44
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138120;36494;145976;32;7.888674242;2022-02-03@03:10:57
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138012;36376;145504;32;7.858948064;2022-02-03@03:11:09
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138336;36525;146100;32;7.886642353;2022-02-03@03:11:22
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;137980;36375;145500;36;8.864683568;2022-02-03@03:11:36
+v2.0.8-169-ga840170e;imex;10;100000;;126751;52385;138004;36396;145584;33;8.122152503;2022-02-03@03:11:49
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139112;208799;835196;8;1.955140607;2022-02-03@03:11:58
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;138792;208444;833776;7;1.631631517;2022-02-03@03:12:04
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139884;209155;836620;7;1.660641739;2022-02-03@03:12:11
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139696;208998;835992;7;1.673483591;2022-02-03@03:12:17
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139992;209002;836008;7;1.649942621;2022-02-03@03:12:24
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139612;208961;835844;7;1.636169001;2022-02-03@03:12:30
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139312;209061;836244;7;1.636019396;2022-02-03@03:12:37
+v2.0.8-191-g68d8716f;imex;10;100000;;126751;52385;139708;208727;834908;6;1.396705344;2022-02-03@03:12:43
+v2.0.8;single;10;100000;;126751;52385;47492;13389;53556;12;2.934239824;2022-02-03@03:13:00
+v2.0.8;single;10;100000;;126751;52385;47800;13489;53956;13;3.148140098;2022-02-03@03:13:08
+v2.0.8;single;10;100000;;126751;52385;47568;13461;53844;13;3.159360711;2022-02-03@03:13:16
+v2.0.8;single;10;100000;;126751;52385;47460;13421;53684;13;3.138111085;2022-02-03@03:13:24
+v2.0.8;single;10;100000;;126751;52385;47732;13462;53848;13;3.155554093;2022-02-03@03:13:32
+v2.0.8;single;10;100000;;126751;52385;47440;13396;53584;13;3.116741909;2022-02-03@03:13:40
+v2.0.8;single;10;100000;;126751;52385;47764;13436;53744;13;3.150074962;2022-02-03@03:13:48
+v2.0.8;single;10;100000;;126751;52385;47532;13415;53660;13;3.132360552;2022-02-03@03:13:56
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37052;10874;43496;14;3.298269653;2022-02-03@03:14:06
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37256;10919;43676;13;3.155410124;2022-02-03@03:14:14
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37588;10944;43776;13;3.145028761;2022-02-03@03:14:22
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37132;10868;43472;13;3.160614535;2022-02-03@03:14:30
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37552;10952;43808;13;3.140422866;2022-02-03@03:14:38
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37424;10932;43728;13;3.112125603;2022-02-03@03:14:46
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37116;10879;43516;12;2.855090373;2022-02-03@03:14:54
+v2.0.8-169-ga840170e;single;10;100000;;126751;52385;37288;10883;43532;13;3.106732592;2022-02-03@03:15:02
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37620;187425;749700;7;1.622574067;2022-02-03@03:15:10
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37396;187411;749644;6;1.416909625;2022-02-03@03:15:17
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37184;187414;749656;5;1.207164605;2022-02-03@03:15:23
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;36724;187406;749624;7;1.646643947;2022-02-03@03:15:29
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;38312;187448;749792;6;1.433157205;2022-02-03@03:15:35
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37392;187413;749652;6;1.390700796;2022-02-03@03:15:42
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37236;187435;749740;7;1.623199711;2022-02-03@03:15:48
+v2.0.8-191-g68d8716f;single;10;100000;;126751;52385;37224;187419;749676;6;1.439987083;2022-02-03@03:15:54
+v2.0.8;mulimex;10;100000;;126751;52385;289576;73874;295496;20;4.863245572;2022-02-03@03:16:14
+v2.0.8;mulimex;10;100000;;126751;52385;289560;73889;295556;21;5.086059576;2022-02-03@03:16:24
+v2.0.8;mulimex;10;100000;;126751;52385;289148;73884;295536;21;5.099663968;2022-02-03@03:16:34
+v2.0.8;mulimex;10;100000;;126751;52385;289232;73840;295360;21;5.124542769;2022-02-03@03:16:44
+v2.0.8;mulimex;10;100000;;126751;52385;289048;73810;295240;21;5.072715666;2022-02-03@03:16:54
+v2.0.8;mulimex;10;100000;;126751;52385;289060;73828;295312;21;5.097667219;2022-02-03@03:17:04
+v2.0.8;mulimex;10;100000;;126751;52385;289680;73888;295552;21;5.090356462;2022-02-03@03:17:14
+v2.0.8;mulimex;10;100000;;126751;52385;289340;73842;295368;21;5.097429754;2022-02-03@03:17:24
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;246548;240357;961428;34;8.401297531;2022-02-03@03:17:39
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;245884;240307;961228;31;7.691744238;2022-02-03@03:17:52
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;246844;240291;961164;30;7.451237762;2022-02-03@03:18:04
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;245924;240277;961108;32;7.929553124;2022-02-03@03:18:17
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;247060;240374;961496;30;7.465879614;2022-02-03@03:18:29
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;246260;240338;961352;31;7.703218633;2022-02-03@03:18:41
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;245796;240278;961112;30;7.471953366;2022-02-03@03:18:54
+v2.0.8-169-ga840170e;mulimex;10;100000;;126751;52385;246248;240374;961496;31;7.727363332;2022-02-03@03:19:06
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;247924;417013;1668052;9;2.155338531;2022-02-03@03:19:15
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;248488;417169;1668676;6;1.438671152;2022-02-03@03:19:22
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;247888;416907;1667628;7;1.719655371;2022-02-03@03:19:28
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;248232;417082;1668328;7;1.690601283;2022-02-03@03:19:35
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;248304;417123;1668492;6;1.444054793;2022-02-03@03:19:41
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;247964;416967;1667868;6;1.440690962;2022-02-03@03:19:48
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;249244;417090;1668360;6;1.449661217;2022-02-03@03:19:54
+v2.0.8-191-g68d8716f;mulimex;10;100000;;126751;52385;248372;417079;1668316;7;1.684171755;2022-02-03@03:20:01
+v2.0.8;multi;32;100000;;166748;52697;585236;147874;591496;75;18.486222358;2022-02-03@03:20:35
+v2.0.8;multi;32;100000;;166748;52697;585232;147885;591540;87;21.354458903;2022-02-03@03:21:02
+v2.0.8;multi;32;100000;;166748;52697;585340;147862;591448;75;18.445704587;2022-02-03@03:21:26
+v2.0.8;multi;32;100000;;166748;52697;585264;147865;591460;76;18.711116125;2022-02-03@03:21:51
+v2.0.8;multi;32;100000;;166748;52697;585456;147915;591660;75;18.495866471;2022-02-03@03:22:15
+v2.0.8;multi;32;100000;;166748;52697;585460;147851;591404;75;18.436913713;2022-02-03@03:22:39
+v2.0.8;multi;32;100000;;166748;52697;585180;147856;591424;74;18.217346286;2022-02-03@03:23:03
+v2.0.8;multi;32;100000;;166748;52697;585332;147902;591608;75;18.411901971;2022-02-03@03:23:28
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484616;657584;2630336;26;6.369710220;2022-02-03@03:23:42
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484540;657594;2630376;24;5.833181408;2022-02-03@03:23:53
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484256;657735;2630940;24;5.893088236;2022-02-03@03:24:03
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484588;657711;2630844;24;5.919665564;2022-02-03@03:24:14
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;483660;657838;2631352;24;5.880021438;2022-02-03@03:24:25
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484848;657689;2630756;24;5.868562502;2022-02-03@03:24:35
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484880;657840;2631360;24;5.900194436;2022-02-03@03:24:46
+v2.0.8-169-ga840170e;multi;32;100000;;166748;52697;484788;657590;2630360;24;5.864673127;2022-02-03@03:24:57
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;489016;1193650;4774600;13;3.250847185;2022-02-03@03:25:07
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;484404;1193712;4774848;12;3.063875289;2022-02-03@03:25:15
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;485812;1193762;4775048;12;3.053638778;2022-02-03@03:25:23
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;485004;1196009;4784036;12;3.026271713;2022-02-03@03:25:31
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;484872;1193718;4774872;12;3.007040826;2022-02-03@03:25:39
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;486108;1193686;4774744;12;3.042356648;2022-02-03@03:25:47
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;486652;1193641;4774564;12;3.028977922;2022-02-03@03:25:55
+v2.0.8-191-g68d8716f;multi;32;100000;;166748;52697;485700;1193650;4774600;12;3.085739075;2022-02-03@03:26:03
+v2.0.8;imex;32;100000;;166748;52697;335228;85366;341464;42;10.205459728;2022-02-03@03:26:30
+v2.0.8;imex;32;100000;;166748;52697;335080;85339;341356;42;10.228001944;2022-02-03@03:26:45
+v2.0.8;imex;32;100000;;166748;52697;335248;85366;341464;43;10.483181287;2022-02-03@03:27:00
+v2.0.8;imex;32;100000;;166748;52697;335056;85357;341428;43;10.502112894;2022-02-03@03:27:16
+v2.0.8;imex;32;100000;;166748;52697;335284;85347;341388;41;10.035896550;2022-02-03@03:27:31
+v2.0.8;imex;32;100000;;166748;52697;335160;85359;341436;42;10.246666443;2022-02-03@03:27:47
+v2.0.8;imex;32;100000;;166748;52697;335180;85334;341336;42;10.265953877;2022-02-03@03:28:02
+v2.0.8;imex;32;100000;;166748;52697;335356;85369;341476;42;10.285572607;2022-02-03@03:28:17
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;294052;76075;304300;56;13.778641742;2022-02-03@03:28:39
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;294116;76112;304448;65;16.014618401;2022-02-03@03:28:59
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;294312;76158;304632;65;16.100152767;2022-02-03@03:29:20
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;294020;76121;304484;66;16.269488070;2022-02-03@03:29:41
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;293816;76066;304264;58;14.269149416;2022-02-03@03:30:01
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;293976;76065;304260;58;14.299197839;2022-02-03@03:30:20
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;293984;76134;304536;63;15.556897908;2022-02-03@03:30:40
+v2.0.8-169-ga840170e;imex;32;100000;;166748;52697;293996;76104;304416;64;15.681865360;2022-02-03@03:31:00
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;297660;604576;2418304;12;2.898652814;2022-02-03@03:31:10
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;298544;604433;2417732;11;2.636944301;2022-02-03@03:31:18
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;298052;604538;2418152;11;2.640495457;2022-02-03@03:31:25
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;298172;604591;2418364;10;2.462956288;2022-02-03@03:31:33
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;298704;604516;2418064;11;2.670014809;2022-02-03@03:31:40
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;297268;604430;2417720;11;2.626243019;2022-02-03@03:31:48
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;297772;604504;2418016;11;2.795152004;2022-02-03@03:31:55
+v2.0.8-191-g68d8716f;imex;32;100000;;166748;52697;297988;604472;2417888;11;2.632789987;2022-02-03@03:32:03
+v2.0.8;single;32;100000;;166748;52697;63996;17566;70264;38;9.218257705;2022-02-03@03:32:28
+v2.0.8;single;32;100000;;166748;52697;64316;17570;70280;38;9.262111096;2022-02-03@03:32:43
+v2.0.8;single;32;100000;;166748;52697;63944;17565;70260;38;9.251625557;2022-02-03@03:32:57
+v2.0.8;single;32;100000;;166748;52697;64060;17582;70328;38;9.281909278;2022-02-03@03:33:11
+v2.0.8;single;32;100000;;166748;52697;64092;17558;70232;38;9.250030044;2022-02-03@03:33:25
+v2.0.8;single;32;100000;;166748;52697;64116;17574;70296;38;9.293164969;2022-02-03@03:33:39
+v2.0.8;single;32;100000;;166748;52697;63844;17557;70228;38;9.300185852;2022-02-03@03:33:53
+v2.0.8;single;32;100000;;166748;52697;64016;17558;70232;38;9.326301222;2022-02-03@03:34:07
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50292;14138;56552;41;9.974790615;2022-02-03@03:34:24
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50344;14177;56708;39;9.481383993;2022-02-03@03:34:39
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50396;14168;56672;37;8.974590069;2022-02-03@03:34:52
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50416;14150;56600;37;8.999044951;2022-02-03@03:35:06
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50500;14153;56612;39;9.501545895;2022-02-03@03:35:20
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50300;14171;56684;38;9.266433712;2022-02-03@03:35:35
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50448;14177;56708;37;9.002393156;2022-02-03@03:35:48
+v2.0.8-169-ga840170e;single;32;100000;;166748;52697;50360;14146;56584;37;8.999302476;2022-02-03@03:36:02
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;50116;549758;2199032;10;2.417509163;2022-02-03@03:36:12
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;51656;549895;2199580;8;2.037054128;2022-02-03@03:36:19
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;50724;549806;2199224;9;2.180783198;2022-02-03@03:36:26
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;50932;549784;2199136;9;2.177541835;2022-02-03@03:36:33
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;50488;549756;2199024;10;2.418719794;2022-02-03@03:36:40
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;49888;549799;2199196;9;2.172596130;2022-02-03@03:36:47
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;50720;549780;2199120;10;2.465486684;2022-02-03@03:36:54
+v2.0.8-191-g68d8716f;single;32;100000;;166748;52697;49776;549787;2199148;8;2.084299164;2022-02-03@03:37:01
+v2.0.8;mulimex;32;100000;;166748;52697;811120;204292;817168;78;19.446498700;2022-02-03@03:37:37
+v2.0.8;mulimex;32;100000;;166748;52697;810944;204239;816956;79;19.458937156;2022-02-03@03:38:02
+v2.0.8;mulimex;32;100000;;166748;52697;810864;204292;817168;80;19.656616262;2022-02-03@03:38:28
+v2.0.8;mulimex;32;100000;;166748;52697;810732;204251;817004;79;19.433095414;2022-02-03@03:38:54
+v2.0.8;mulimex;32;100000;;166748;52697;811056;204270;817080;78;19.216247533;2022-02-03@03:39:19
+v2.0.8;mulimex;32;100000;;166748;52697;811068;204285;817140;79;19.417941708;2022-02-03@03:39:45
+v2.0.8;mulimex;32;100000;;166748;52697;811076;204285;817140;78;19.185879127;2022-02-03@03:40:10
+v2.0.8;mulimex;32;100000;;166748;52697;810936;204298;817192;78;19.183132590;2022-02-03@03:40:35
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;694024;711217;2844868;44;10.890215748;2022-02-03@03:40:55
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;694264;711273;2845092;44;10.885117803;2022-02-03@03:41:10
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;695264;711095;2844380;44;10.906228136;2022-02-03@03:41:26
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;694148;711047;2844188;44;10.861365333;2022-02-03@03:41:42
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;695224;711212;2844848;44;10.949888719;2022-02-03@03:41:57
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;694724;711583;2846332;43;10.625223748;2022-02-03@03:42:13
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;695188;711052;2844208;43;10.669767968;2022-02-03@03:42:28
+v2.0.8-169-ga840170e;mulimex;32;100000;;166748;52697;693784;711064;2844256;44;10.937289159;2022-02-03@03:42:44
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;702632;1245382;4981528;14;3.413564323;2022-02-03@03:42:55
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;700180;1245477;4981908;14;3.469947154;2022-02-03@03:43:03
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;699664;1245456;4981824;13;3.299001177;2022-02-03@03:43:11
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;697732;1245341;4981364;14;3.485798201;2022-02-03@03:43:20
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;701120;1245404;4981616;14;3.489658214;2022-02-03@03:43:28
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;699048;1245320;4981280;14;3.547827353;2022-02-03@03:43:37
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;699684;1245477;4981908;13;3.290228948;2022-02-03@03:43:45
+v2.0.8-191-g68d8716f;mulimex;32;100000;;166748;52697;698284;1245349;4981396;14;3.547135679;2022-02-03@03:43:53
+v2.0.8;multi;100;100000;;184114;52738;1713052;429823;1719292;273;67.385808014;2022-02-03@03:45:21
+v2.0.8;multi;100;100000;;184114;52738;1712852;429793;1719172;275;67.757938249;2022-02-03@03:46:38
+v2.0.8;multi;100;100000;;184114;52738;1713168;429842;1719368;274;67.509844463;2022-02-03@03:47:54
+v2.0.8;multi;100;100000;;184114;52738;1713132;429783;1719132;277;68.044733435;2022-02-03@03:49:11
+v2.0.8;multi;100;100000;;184114;52738;1713124;429801;1719204;271;66.940725001;2022-02-03@03:50:28
+v2.0.8;multi;100;100000;;184114;52738;1713312;429840;1719360;274;67.369835399;2022-02-03@03:51:44
+v2.0.8;multi;100;100000;;184114;52738;1712952;429800;1719200;275;67.498930363;2022-02-03@03:53:01
+v2.0.8;multi;100;100000;;184114;52738;1713104;429787;1719148;275;67.725068578;2022-02-03@03:54:18
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1425992;2005657;8022628;83;20.557725451;2022-02-03@03:54:49
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1429844;2005698;8022792;82;20.209845376;2022-02-03@03:55:15
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1429500;2005671;8022684;85;21.015281049;2022-02-03@03:55:41
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1429628;2005825;8023300;83;20.415961317;2022-02-03@03:56:06
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1422632;2005632;8022528;83;20.496795671;2022-02-03@03:56:32
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1430108;2005650;8022600;84;20.734262658;2022-02-03@03:56:57
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1430404;2012302;8049208;87;21.457426752;2022-02-03@03:57:24
+v2.0.8-169-ga840170e;multi;100;100000;;184114;52738;1425324;2005867;8023468;84;20.691418186;2022-02-03@03:57:50
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1481388;2427324;9709296;35;8.778679458;2022-02-03@03:58:05
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1442612;2427252;9709008;37;9.336091223;2022-02-03@03:58:20
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1456140;2427248;9708992;35;8.843064050;2022-02-03@03:58:34
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1469568;2428023;9712092;34;8.621438359;2022-02-03@03:58:48
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1466508;2427266;9709064;35;8.815145970;2022-02-03@03:59:01
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1478856;2427419;9709676;34;8.620417968;2022-02-03@03:59:15
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1495244;2427218;9708872;35;8.737462480;2022-02-03@03:59:29
+v2.0.8-191-g68d8716f;multi;100;100000;;184114;52738;1492124;2427344;9709376;35;8.768686315;2022-02-03@03:59:43
+v2.0.8;imex;100;100000;;184114;52738;777560;195972;783888;137;33.677154762;2022-02-03@04:00:51
+v2.0.8;imex;100;100000;;184114;52738;777648;195972;783888;138;33.894622326;2022-02-03@04:01:31
+v2.0.8;imex;100;100000;;184114;52738;777880;196007;784028;137;33.626373147;2022-02-03@04:02:11
+v2.0.8;imex;100;100000;;184114;52738;777416;195943;783772;136;33.434963973;2022-02-03@04:02:50
+v2.0.8;imex;100;100000;;184114;52738;777728;196008;784032;138;33.973120680;2022-02-03@04:03:30
+v2.0.8;imex;100;100000;;184114;52738;777736;195952;783808;137;33.790319607;2022-02-03@04:04:09
+v2.0.8;imex;100;100000;;184114;52738;777592;195960;783840;137;33.706548283;2022-02-03@04:04:49
+v2.0.8;imex;100;100000;;184114;52738;777640;195941;783764;136;33.378781803;2022-02-03@04:05:28
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;708088;181622;726488;151;37.013249999;2022-02-03@04:06:13
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707980;181589;726356;154;37.662782667;2022-02-03@04:06:56
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707820;181568;726272;153;37.459746076;2022-02-03@04:07:38
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707856;181564;726256;153;37.469682383;2022-02-03@04:08:20
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707912;181609;726436;152;37.283080970;2022-02-03@04:09:02
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;708376;181674;726696;155;37.965614917;2022-02-03@04:09:45
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707884;181558;726232;148;36.272936479;2022-02-03@04:10:26
+v2.0.8-169-ga840170e;imex;100;100000;;184114;52738;707956;181631;726524;153;37.403954079;2022-02-03@04:11:09
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;728300;1820218;7280872;23;5.687433724;2022-02-03@04:11:21
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;729376;1820265;7281060;22;5.508918611;2022-02-03@04:11:32
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;721520;1819819;7279276;23;5.761245300;2022-02-03@04:11:43
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;724460;1820191;7280764;23;5.704400797;2022-02-03@04:11:53
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;721860;1819740;7278960;21;5.452494059;2022-02-03@04:12:04
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;723112;1819876;7279504;22;5.496902181;2022-02-03@04:12:14
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;726544;1820444;7281776;23;5.789891400;2022-02-03@04:12:25
+v2.0.8-191-g68d8716f;imex;100;100000;;184114;52738;727744;1820258;7281032;22;5.541548042;2022-02-03@04:12:35
+v2.0.8;single;100;100000;;184114;52738;76400;20696;82784;131;32.358187307;2022-02-03@04:13:43
+v2.0.8;single;100;100000;;184114;52738;76900;20742;82968;123;30.351653399;2022-02-03@04:14:18
+v2.0.8;single;100;100000;;184114;52738;76740;20738;82952;124;30.534422905;2022-02-03@04:14:54
+v2.0.8;single;100;100000;;184114;52738;76812;20722;82888;123;30.281710157;2022-02-03@04:15:29
+v2.0.8;single;100;100000;;184114;52738;76944;20761;83044;124;30.520022777;2022-02-03@04:16:04
+v2.0.8;single;100;100000;;184114;52738;76784;20757;83028;122;29.946760894;2022-02-03@04:16:39
+v2.0.8;single;100;100000;;184114;52738;76388;20702;82808;121;29.785200129;2022-02-03@04:17:13
+v2.0.8;single;100;100000;;184114;52738;76924;20768;83072;122;30.107677983;2022-02-03@04:17:48
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62340;17218;68872;116;28.453683467;2022-02-03@04:18:24
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62568;17236;68944;116;28.442184734;2022-02-03@04:18:57
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62440;17242;68968;116;28.526600914;2022-02-03@04:19:30
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62460;17224;68896;117;28.702293593;2022-02-03@04:20:04
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62384;17205;68820;118;28.902405376;2022-02-03@04:20:38
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62548;17231;68924;126;30.908334968;2022-02-03@04:21:13
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62716;17210;68840;116;28.500362944;2022-02-03@04:21:47
+v2.0.8-169-ga840170e;single;100;100000;;184114;52738;62632;17207;68828;116;28.475685239;2022-02-03@04:22:20
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;91248;1666616;6666464;17;4.271670995;2022-02-03@04:22:31
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;76420;1666473;6665892;17;4.335608306;2022-02-03@04:22:41
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;69236;1666528;6666112;17;4.229734845;2022-02-03@04:22:50
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;72072;1666426;6665704;18;4.412883654;2022-02-03@04:22:59
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;73128;1666487;6665948;17;4.212628622;2022-02-03@04:23:08
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;77072;1666460;6665840;18;4.385832007;2022-02-03@04:23:17
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;78064;1666492;6665968;18;4.568953528;2022-02-03@04:23:27
+v2.0.8-191-g68d8716f;single;100;100000;;184114;52738;77756;1666414;6665656;18;4.469834074;2022-02-03@04:23:36
+v2.0.8;mulimex;100;100000;;184114;52738;2359508;591472;2365888;287;70.676991979;2022-02-03@04:25:21
+v2.0.8;mulimex;100;100000;;184114;52738;2359816;591543;2366172;288;70.927290312;2022-02-03@04:26:43
+v2.0.8;mulimex;100;100000;;184114;52738;2359824;591512;2366048;286;70.510577014;2022-02-03@04:28:04
+v2.0.8;mulimex;100;100000;;184114;52738;2359636;591461;2365844;288;71.006861767;2022-02-03@04:29:25
+v2.0.8;mulimex;100;100000;;184114;52738;2359928;591515;2366060;285;70.281233979;2022-02-03@04:30:46
+v2.0.8;mulimex;100;100000;;184114;52738;2359656;591457;2365828;286;70.601197140;2022-02-03@04:32:07
+v2.0.8;mulimex;100;100000;;184114;52738;2359812;591476;2365904;286;70.666377892;2022-02-03@04:33:29
+v2.0.8;mulimex;100;100000;;184114;52738;2359708;591514;2366056;287;70.556825506;2022-02-03@04:34:50
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2038120;2161261;8645044;118;29.101637190;2022-02-03@04:35:32
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2033316;2160761;8643044;118;29.140601512;2022-02-03@04:36:06
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2035604;2160436;8641744;116;28.714020616;2022-02-03@04:36:40
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2032084;2160283;8641132;118;29.206112580;2022-02-03@04:37:14
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2034324;2161417;8645668;116;28.719086136;2022-02-03@04:37:48
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2038272;2160535;8642140;119;29.421605527;2022-02-03@04:38:23
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2035796;2160192;8640768;120;29.634764100;2022-02-03@04:38:58
+v2.0.8-169-ga840170e;mulimex;100;100000;;184114;52738;2034508;2160224;8640896;119;29.377756160;2022-02-03@04:39:32
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2066540;2577570;10310280;41;10.276458137;2022-02-03@04:39:50
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2062300;2577893;10311572;42;10.449553877;2022-02-03@04:40:05
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2059708;2577368;10309472;42;10.452116857;2022-02-03@04:40:21
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2056856;2578069;10312276;42;10.423925637;2022-02-03@04:40:37
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2053748;2577565;10310260;45;11.163303590;2022-02-03@04:40:53
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2061360;2590324;10361296;43;10.730801046;2022-02-03@04:41:09
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2060692;2577812;10311248;43;10.710891642;2022-02-03@04:41:25
+v2.0.8-191-g68d8716f;mulimex;100;100000;;184114;52738;2063280;2578033;10312132;43;10.684359182;2022-02-03@04:41:41
+v2.0.8;multi;316;100000;;190189;52927;5281860;1321995;5287980;994;245.879640405;2022-02-03@04:46:59
+v2.0.8;multi;316;100000;;190189;52927;5382740;1347278;5389112;1050;257.578737989;2022-02-03@04:51:39
+v2.0.8;multi;316;100000;;190189;52927;5403916;1352524;5410096;1035;253.467316643;2022-02-03@04:56:15
+v2.0.8;multi;316;100000;;190189;52927;5496968;1375750;5503000;1041;257.867202868;2022-02-03@05:00:54
+v2.0.8;multi;316;100000;;190189;52927;5258544;1316143;5264572;960;237.893632545;2022-02-03@05:05:15
+v2.0.8;multi;316;100000;;190189;52927;5348760;1338752;5355008;998;250.531522184;2022-02-03@05:09:47
+v2.0.8;multi;316;100000;;190189;52927;5296112;1325603;5302412;1016;252.767831222;2022-02-03@05:14:23
+v2.0.8;multi;316;100000;;190189;52927;5372000;1344560;5378240;1034;253.495169761;2022-02-03@05:18:59
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4404020;3174481;12697924;276;69.023646352;2022-02-03@05:20:33
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4400612;3173771;12695084;280;70.015554835;2022-02-03@05:21:48
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4429320;3173950;12695800;286;70.681332973;2022-02-03@05:23:05
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4425700;3173919;12695676;286;70.795075847;2022-02-03@05:24:21
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4430492;3173609;12694436;278;69.789081001;2022-02-03@05:25:37
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4429668;3175102;12700408;284;70.196907446;2022-02-03@05:26:53
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4397176;3173123;12692492;283;70.311592696;2022-02-03@05:28:09
+v2.0.8-169-ga840170e;multi;316;100000;;190189;52927;4427280;3174034;12696136;296;74.267391825;2022-02-03@05:29:29
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4485068;3174288;12697152;114;28.949716281;2022-02-03@05:30:05
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4469544;3173345;12693380;117;29.661510944;2022-02-03@05:30:41
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4463320;3174285;12697140;114;29.222807153;2022-02-03@05:31:16
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4486372;3175018;12700072;116;29.549598654;2022-02-03@05:31:51
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4438104;3172962;12691848;114;28.843304067;2022-02-03@05:32:26
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4488232;3173855;12695420;117;29.646877166;2022-02-03@05:33:01
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4461456;3174340;12697360;115;28.942223081;2022-02-03@05:33:36
+v2.0.8-191-g68d8716f;multi;316;100000;;190189;52927;4454720;3175039;12700156;113;28.743747784;2022-02-03@05:34:11
+v2.0.8;imex;316;100000;;190189;52927;2137860;535979;2143916;495;122.590894535;2022-02-03@05:38:31
+v2.0.8;imex;316;100000;;190189;52927;2137280;535863;2143452;491;121.383961452;2022-02-03@05:40:42
+v2.0.8;imex;316;100000;;190189;52927;2137372;535935;2143740;451;111.418025115;2022-02-03@05:42:43
+v2.0.8;imex;316;100000;;190189;52927;2137700;535986;2143944;459;113.312442412;2022-02-03@05:44:46
+v2.0.8;imex;316;100000;;190189;52927;2138192;536084;2144336;451;111.311870414;2022-02-03@05:46:46
+v2.0.8;imex;316;100000;;190189;52927;2137708;535916;2143664;463;114.303927138;2022-02-03@05:48:50
+v2.0.8;imex;316;100000;;190189;52927;2160324;541594;2166376;568;139.847036587;2022-02-03@05:51:19
+v2.0.8;imex;316;100000;;190189;52927;2137424;535952;2143808;457;113.878936852;2022-02-03@05:53:22
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1996660;510235;2040940;471;116.319749596;2022-02-03@05:55:30
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1995524;510024;2040096;483;118.976521811;2022-02-03@05:57:34
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1998328;510663;2042652;479;118.293786569;2022-02-03@05:59:38
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1999360;510972;2043888;489;120.978658268;2022-02-03@06:01:44
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;2000976;511402;2045608;468;115.401895324;2022-02-03@06:03:45
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1996924;510305;2041220;501;123.097728865;2022-02-03@06:05:53
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1997264;510350;2041400;491;120.791956279;2022-02-03@06:07:59
+v2.0.8-169-ga840170e;imex;316;100000;;190189;52927;1997220;510388;2041552;482;118.743311862;2022-02-03@06:10:03
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2068252;2566018;10264072;59;14.391527906;2022-02-03@06:10:25
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2088456;2568363;10273452;67;16.644190435;2022-02-03@06:10:47
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2072596;2566724;10266896;64;16.024444245;2022-02-03@06:11:08
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2070076;2567913;10271652;66;16.351289470;2022-02-03@06:11:30
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2078984;2567831;10271324;62;15.238132685;2022-02-03@06:11:50
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2067560;2565743;10262972;67;16.814082533;2022-02-03@06:12:13
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2070048;2566418;10265672;61;15.002802592;2022-02-03@06:12:33
+v2.0.8-191-g68d8716f;imex;316;100000;;190189;52927;2071136;2567149;10268596;67;16.353451606;2022-02-03@06:12:55
+v2.0.8;single;316;100000;;190189;52927;172536;44619;178476;458;113.098238068;2022-02-03@06:17:04
+v2.0.8;single;316;100000;;190189;52927;326152;83047;332188;496;122.566699993;2022-02-03@06:19:12
+v2.0.8;single;316;100000;;190189;52927;96068;25471;101884;428;106.050803206;2022-02-03@06:21:03
+v2.0.8;single;316;100000;;190189;52927;261112;66790;267160;486;119.511468952;2022-02-03@06:23:07
+v2.0.8;single;316;100000;;190189;52927;181584;46926;187704;466;115.345875130;2022-02-03@06:25:08
+v2.0.8;single;316;100000;;190189;52927;95156;25249;100996;422;104.911367718;2022-02-03@06:26:58
+v2.0.8;single;316;100000;;190189;52927;204440;52676;210704;464;114.297340504;2022-02-03@06:28:58
+v2.0.8;single;316;100000;;190189;52927;172040;44494;177976;445;109.724622301;2022-02-03@06:30:52
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86300;23128;92512;364;90.136167912;2022-02-03@06:32:30
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86320;23150;92600;373;92.585121893;2022-02-03@06:34:07
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;85852;23041;92164;378;93.174950447;2022-02-03@06:35:45
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86040;23124;92496;367;90.846414752;2022-02-03@06:37:21
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86264;23109;92436;379;93.737167514;2022-02-03@06:39:00
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86132;23147;92588;364;90.296516902;2022-02-03@06:40:35
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;85856;23098;92392;370;91.471385760;2022-02-03@06:42:11
+v2.0.8-169-ga840170e;single;316;100000;;190189;52927;86148;23103;92412;395;97.162799138;2022-02-03@06:43:53
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;200012;2101578;8406312;45;11.198236719;2022-02-03@06:44:11
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;194384;2100834;8403336;50;12.182006692;2022-02-03@06:44:28
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;247016;2101457;8405828;50;12.354683197;2022-02-03@06:44:46
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;228096;2102139;8408556;49;12.045194388;2022-02-03@06:45:02
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;175404;2100478;8401912;52;12.614416323;2022-02-03@06:45:20
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;170236;2100946;8403784;51;12.495446867;2022-02-03@06:45:37
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;131204;2099846;8399384;48;12.197375024;2022-02-03@06:45:54
+v2.0.8-191-g68d8716f;single;316;100000;;190189;52927;197968;2101074;8404296;50;12.404942083;2022-02-03@06:46:12
+v2.0.8;mulimex;316;100000;;190189;52927;7332100;1834561;7338244;945;237.399219849;2022-02-03@06:52:27
+v2.0.8;mulimex;316;100000;;190189;52927;7250904;1814304;7257216;943;236.718527622;2022-02-03@06:56:51
+v2.0.8;mulimex;316;100000;;190189;52927;7410312;1854089;7416356;992;248.435463468;2022-02-03@07:01:27
+v2.0.8;mulimex;316;100000;;190189;52927;7612072;1904561;7618244;1011;245.053884674;2022-02-03@07:06:00
+v2.0.8;mulimex;316;100000;;190189;52927;7352760;1839735;7358940;961;242.556831077;2022-02-03@07:10:31
+v2.0.8;mulimex;316;100000;;190189;52927;7317324;1830835;7323340;961;241.287011587;2022-02-03@07:15:00
+v2.0.8;mulimex;316;100000;;190189;52927;7398876;1851282;7405128;971;244.612596444;2022-02-03@07:19:32
+v2.0.8;mulimex;316;100000;;190189;52927;7505984;1878044;7512176;985;245.404879949;2022-02-03@07:24:06
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6264840;3650096;14600384;386;96.147257862;2022-02-03@07:26:12
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6266104;3649825;14599300;365;91.024647117;2022-02-03@07:27:49
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6280208;3653255;14613020;375;93.470309311;2022-02-03@07:29:28
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6261960;3648623;14594492;372;92.894013777;2022-02-03@07:31:07
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6264724;3651159;14604636;382;95.096312419;2022-02-03@07:32:48
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6267244;3649361;14597444;371;92.597706568;2022-02-03@07:34:27
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6298528;3651834;14607336;391;96.981682334;2022-02-03@07:36:10
+v2.0.8-169-ga840170e;mulimex;316;100000;;190189;52927;6310992;3653325;14613300;392;97.033327502;2022-02-03@07:37:53
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6363852;3639934;14559736;139;35.152829098;2022-02-03@07:38:37
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6351992;3636596;14546384;136;34.333764587;2022-02-03@07:39:17
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6355956;3636635;14546540;143;36.006970585;2022-02-03@07:40:00
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6363100;3634921;14539684;136;34.464716039;2022-02-03@07:40:40
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6337424;3635356;14541424;140;35.503620575;2022-02-03@07:41:22
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6353340;3636116;14544464;140;35.285220848;2022-02-03@07:42:04
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6347020;3637883;14551532;140;35.529595963;2022-02-03@07:42:45
+v2.0.8-191-g68d8716f;mulimex;316;100000;;190189;52927;6352476;3635825;14543300;136;34.355653514;2022-02-03@07:43:26
+v2.0.8;multi;1000;100000;;193018;53631;17468552;4368669;17474676;3380;863.306128297;2022-02-03@08:07:14
+v2.0.8;multi;1000;100000;;193018;53631;17325700;4332943;17331772;3367;863.931550969;2022-02-03@08:22:50
+v2.0.8;multi;1000;100000;;193018;53631;16552052;4139590;16558360;3186;818.790084808;2022-02-03@08:37:42
+v2.0.8;multi;1000;100000;;193018;53631;16551264;4139311;16557244;3201;822.717123217;2022-02-03@08:52:34
+v2.0.8;multi;1000;100000;;193018;53631;16551788;4139461;16557844;3212;826.138209394;2022-02-03@09:07:27
+v2.0.8;multi;1000;100000;;193018;53631;16600900;4151723;16606892;3241;833.309896852;2022-02-03@09:22:30
+v2.0.8;multi;1000;100000;;193018;53631;16735736;4185443;16741772;3259;824.363579620;2022-02-03@09:37:24
+v2.0.8;multi;1000;100000;;193018;53631;16855612;4215378;16861512;3198;819.069948500;2022-02-03@09:52:10
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13875876;5534093;22136372;1034;260.436925816;2022-02-03@09:57:43
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13935584;5545120;22180480;996;251.851710383;2022-02-03@10:02:03
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13915340;5542966;22171864;991;251.192607776;2022-02-03@10:06:23
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13900320;5540726;22162904;1036;262.117055373;2022-02-03@10:10:54
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13902760;5599028;22396112;1036;262.242990863;2022-02-03@10:15:25
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13895216;5539317;22157268;1010;255.966011201;2022-02-03@10:19:49
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13900932;5539274;22157096;1031;260.420562920;2022-02-03@10:24:18
+v2.0.8-169-ga840170e;multi;1000;100000;;193018;53631;13902396;5541916;22167664;1025;259.354372779;2022-02-03@10:28:46
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14093440;5563748;22254992;371;96.642722708;2022-02-03@10:30:34
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14188432;5563990;22255960;374;96.097045592;2022-02-03@10:32:18
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14313320;5589110;22356440;375;97.914719400;2022-02-03@10:34:05
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14086388;5564886;22259544;377;97.265356716;2022-02-03@10:35:51
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14301752;5566175;22264700;373;95.975012014;2022-02-03@10:37:36
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14379084;5565276;22261104;379;97.048136130;2022-02-03@10:39:21
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14102848;5561945;22247780;364;94.738872113;2022-02-03@10:41:05
+v2.0.8-191-g68d8716f;multi;1000;100000;;193018;53631;14237076;5554384;22217536;372;96.647769907;2022-02-03@10:42:50
+v2.0.8;imex;1000;100000;;193018;53631;6484424;1622679;6490716;1875;482.540425051;2022-02-03@11:02:59
+v2.0.8;imex;1000;100000;;193018;53631;6483852;1622554;6490216;1842;474.208983966;2022-02-03@11:14:45
+v2.0.8;imex;1000;100000;;193018;53631;6483120;1622300;6489200;1826;474.457891592;2022-02-03@11:23:03
+v2.0.8;imex;1000;100000;;193018;53631;6486588;1623136;6492544;1775;461.414092140;2022-02-03@11:31:06
+v2.0.8;imex;1000;100000;;193018;53631;6396260;1600616;6402464;1615;411.187226540;2022-02-03@11:41:36
+v2.0.8;imex;1000;100000;;193018;53631;6484300;1622652;6490608;1873;480.474788391;2022-02-03@11:50:00
+v2.0.8;imex;1000;100000;;193018;53631;6482328;1622165;6488660;1800;466.211549611;2022-02-03@11:58:09
+v2.0.8;imex;1000;100000;;193018;53631;6483020;1622355;6489420;1751;454.190549723;2022-02-03@12:06:05
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6106832;1558338;6233352;1710;428.516817317;2022-02-03@12:13:38
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6122324;1562264;6249056;1640;411.982097185;2022-02-03@12:20:36
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6105360;1557955;6231820;1696;426.530304815;2022-02-03@12:27:49
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6110212;1559166;6236664;1673;419.725820068;2022-02-03@12:34:55
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6109680;1559014;6236056;1704;427.558229590;2022-02-03@12:42:09
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6110564;1559249;6236996;1629;408.460628991;2022-02-03@12:49:04
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6102580;1557245;6228980;1682;422.337072472;2022-02-03@12:56:13
+v2.0.8-169-ga840170e;imex;1000;100000;;193018;53631;6110072;1559156;6236624;1692;424.285084153;2022-02-03@13:03:23
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;7321864;3616864;14467456;186;45.712994101;2022-02-03@13:04:18
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;7282472;3619060;14476240;183;45.781475732;2022-02-03@13:05:20
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6666280;3599380;14397520;190;46.622790738;2022-02-03@13:06:22
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6522996;3593081;14372324;189;46.317347513;2022-02-03@13:07:24
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6758316;3595662;14382648;184;44.881492367;2022-02-03@13:08:25
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6430780;3591595;14366380;187;45.282494522;2022-02-03@13:09:26
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6612508;3592906;14371624;185;45.514072936;2022-02-03@13:10:27
+v2.0.8-191-g68d8716f;imex;1000;100000;;193018;53631;6454132;3589513;14358052;192;47.232171566;2022-02-03@13:11:30
+v2.0.8;single;1000;100000;;193018;53631;1408264;353580;1414320;1966;515.280917903;2022-02-03@13:32:37
+v2.0.8;single;1000;100000;;193018;53631;6477000;1620691;6482764;2079;542.068793106;2022-02-03@13:41:46
+v2.0.8;single;1000;100000;;193018;53631;142392;37140;148560;1513;391.485474774;2022-02-03@13:48:24
+v2.0.8;single;1000;100000;;193018;53631;626456;158172;632688;1948;511.336938028;2022-02-03@13:57:01
+v2.0.8;single;1000;100000;;193018;53631;143044;37276;149104;1913;501.711617731;2022-02-03@14:05:29
+v2.0.8;single;1000;100000;;193018;53631;152672;39761;159044;1548;401.680514237;2022-02-03@14:12:18
+v2.0.8;single;1000;100000;;193018;53631;141528;36906;147624;1938;508.531319109;2022-02-03@14:20:53
+v2.0.8;single;1000;100000;;193018;53631;2734640;685185;2740740;1665;429.584126719;2022-02-03@14:28:09
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;146368;38200;152800;1345;338.466514238;2022-02-03@14:33:56
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;147640;38545;154180;1317;332.678695484;2022-02-03@14:39:33
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;141888;37061;148244;1320;333.745310462;2022-02-03@14:45:12
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;143348;37433;149732;1639;414.009485232;2022-02-03@14:52:11
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;143884;37555;150220;1348;340.067197467;2022-02-03@14:57:56
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;144476;37754;151016;1341;338.978348933;2022-02-03@15:03:40
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;144184;37625;150500;1356;342.926343492;2022-02-03@15:09:27
+v2.0.8-169-ga840170e;single;1000;100000;;193018;53631;143544;37491;149964;1314;331.320578720;2022-02-03@15:15:04
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3740168;2190531;8762124;151;38.152168921;2022-02-03@15:15:50
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3313112;2190909;8763636;164;41.809710293;2022-02-03@15:16:46
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3455476;2136840;8547360;434;118.858650308;2022-02-03@15:19:00
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3868996;2186787;8747148;257;59.759624992;2022-02-03@15:20:14
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;2764464;2142534;8570136;273;74.020984400;2022-02-03@15:21:43
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;2937188;2157951;8631804;202;50.051248078;2022-02-03@15:22:48
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3582192;2159308;8637232;251;66.608551466;2022-02-03@15:24:09
+v2.0.8-191-g68d8716f;single;1000;100000;;193018;53631;3226296;2153810;8615240;244;61.470352963;2022-02-03@15:25:25
+v2.0.8;mulimex;1000;100000;;193018;53631;22835728;5710437;22841748;3080;788.018471684;2022-02-03@15:50:54
+v2.0.8;mulimex;1000;100000;;193018;53631;24592688;6149716;24598864;3229;812.944255473;2022-02-03@16:05:55
+v2.0.8;mulimex;1000;100000;;193018;53631;24113228;6029834;24119336;3173;807.567866212;2022-02-03@16:20:54
+v2.0.8;mulimex;1000;100000;;193018;53631;22878472;5721116;22884464;3201;777.645260928;2022-02-03@16:40:50
+v2.0.8;mulimex;1000;100000;;193018;53631;24293768;6074952;24299808;3144;800.867283481;2022-02-03@16:55:36
+v2.0.8;mulimex;1000;100000;;193018;53631;22834128;5710089;22840356;3051;779.932494695;2022-02-03@17:10:07
+v2.0.8;mulimex;1000;100000;;193018;53631;22835368;5710350;22841400;3209;777.752787584;2022-02-03@17:24:32
+v2.0.8;mulimex;1000;100000;;193018;53631;23548064;5888588;23554352;4022;1000.652184486;2022-02-03@17:42:40
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19842736;7054553;28218212;1311;330.180895796;2022-02-03@17:49:42
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19854320;7052744;28210976;1419;353.094363352;2022-02-03@17:55:45
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19808364;7046524;28186096;1370;345.226145164;2022-02-03@18:01:40
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19868820;7055835;28223340;1355;342.605010825;2022-02-03@18:07:37
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19854968;7049060;28196240;1431;355.692300099;2022-02-03@18:13:43
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19859836;7053934;28215736;1343;332.053004678;2022-02-03@18:19:25
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19841016;7055541;28222164;1355;342.505930980;2022-02-03@18:25:17
+v2.0.8-169-ga840170e;mulimex;1000;100000;;193018;53631;19810872;7043420;28173680;1405;350.090272023;2022-02-03@18:31:21
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;19990956;7034428;28137712;470;119.521376634;2022-02-03@18:33:33
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;19967340;7020888;28083552;475;121.982156758;2022-02-03@18:35:51
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;20049492;7057685;28230740;475;119.742134782;2022-02-03@18:38:08
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;20060292;7026102;28104408;474;120.572194285;2022-02-03@18:40:19
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;20033684;7071709;28286836;468;121.085714415;2022-02-03@18:42:37
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;20017876;7073195;28292780;461;117.444891608;2022-02-03@18:44:45
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;19998276;7030067;28120268;474;119.275644121;2022-02-03@18:46:55
+v2.0.8-191-g68d8716f;mulimex;1000;100000;;193018;53631;20038156;7025849;28103396;511;123.896344996;2022-02-03@18:49:11
+v2.0.8;multi;10;316228;;479961;199356;760232;191600;766400;57;18.100669973;2022-02-03@19:03:18
+v2.0.8;multi;10;316228;;479961;199356;760320;191653;766612;56;17.802495851;2022-02-03@19:03:42
+v2.0.8;multi;10;316228;;479961;199356;760964;191723;766892;57;18.088836720;2022-02-03@19:04:06
+v2.0.8;multi;10;316228;;479961;199356;760220;191639;766556;57;18.121039282;2022-02-03@19:04:30
+v2.0.8;multi;10;316228;;479961;199356;760748;191695;766780;57;18.088406992;2022-02-03@19:04:54
+v2.0.8;multi;10;316228;;479961;199356;760460;191648;766592;57;18.073004957;2022-02-03@19:05:18
+v2.0.8;multi;10;316228;;479961;199356;760496;191676;766704;56;17.803915352;2022-02-03@19:05:41
+v2.0.8;multi;10;316228;;479961;199356;760264;191601;766404;57;18.157421154;2022-02-03@19:06:06
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;627360;324715;1298860;23;7.601787467;2022-02-03@19:06:21
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;627244;324717;1298868;21;7.196022880;2022-02-03@19:06:34
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;627076;324665;1298660;21;7.224608226;2022-02-03@19:06:48
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;626588;324690;1298760;22;7.380568848;2022-02-03@19:07:00
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;627316;324680;1298720;22;7.338933096;2022-02-03@19:07:13
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;626984;324704;1298816;21;7.213435195;2022-02-03@19:07:27
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;627436;324680;1298720;21;7.112946586;2022-02-03@19:07:40
+v2.0.8-169-ga840170e;multi;10;316228;;479961;199356;626788;324708;1298832;20;6.844253739;2022-02-03@19:07:53
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;632464;491546;1966184;15;4.720728580;2022-02-03@19:08:05
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;631728;491508;1966032;14;4.658141395;2022-02-03@19:08:15
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;630956;491547;1966188;13;4.222976203;2022-02-03@19:08:24
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;630632;491568;1966272;14;4.617645888;2022-02-03@19:08:34
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;628776;491536;1966144;13;4.204276172;2022-02-03@19:08:43
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;630768;491554;1966216;13;4.239881422;2022-02-03@19:08:52
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;630500;491567;1966268;14;4.557912490;2022-02-03@19:09:02
+v2.0.8-191-g68d8716f;multi;10;316228;;479961;199356;629412;491521;1966084;14;4.474037616;2022-02-03@19:09:12
+v2.0.8;imex;10;316228;;479961;199356;594388;150119;600476;39;12.217288652;2022-02-03@19:09:51
+v2.0.8;imex;10;316228;;479961;199356;595116;150346;601384;39;12.375427929;2022-02-03@19:10:09
+v2.0.8;imex;10;316228;;479961;199356;594196;150063;600252;39;12.288175323;2022-02-03@19:10:26
+v2.0.8;imex;10;316228;;479961;199356;594468;150130;600520;40;12.666691255;2022-02-03@19:10:44
+v2.0.8;imex;10;316228;;479961;199356;594160;150126;600504;39;12.327911197;2022-02-03@19:11:02
+v2.0.8;imex;10;316228;;479961;199356;594148;150047;600188;39;12.237630508;2022-02-03@19:11:20
+v2.0.8;imex;10;316228;;479961;199356;594984;150276;601104;40;12.538058437;2022-02-03@19:11:38
+v2.0.8;imex;10;316228;;479961;199356;594356;150148;600592;40;12.633004967;2022-02-03@19:11:56
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504156;127907;511628;231;77.120470289;2022-02-03@19:13:21
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504128;127982;511928;234;77.711870262;2022-02-03@19:14:43
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504364;127949;511796;232;77.211753566;2022-02-03@19:16:06
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;503664;127785;511140;229;76.477384898;2022-02-03@19:17:27
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504656;128033;512132;233;77.697383350;2022-02-03@19:18:50
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504064;127910;511640;232;77.401652193;2022-02-03@19:20:12
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;503636;127849;511396;232;77.277274203;2022-02-03@19:21:34
+v2.0.8-169-ga840170e;imex;10;316228;;479961;199356;504144;127942;511768;223;73.894835263;2022-02-03@19:22:53
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;503324;278904;1115616;17;5.396802326;2022-02-03@19:23:06
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;504764;278138;1112552;16;5.273096949;2022-02-03@19:23:16
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;504056;276822;1107288;18;5.795243228;2022-02-03@19:23:27
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;503960;278096;1112384;18;5.749869022;2022-02-03@19:23:38
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;504748;278945;1115780;17;5.408554363;2022-02-03@19:23:48
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;503364;276964;1107856;17;5.487876922;2022-02-03@19:23:59
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;504048;277593;1110372;18;5.835502915;2022-02-03@19:24:10
+v2.0.8-191-g68d8716f;imex;10;316228;;479961;199356;504648;278244;1112976;16;5.120643232;2022-02-03@19:24:21
+v2.0.8;single;10;316228;;479961;199356;163828;42541;170164;34;10.670019270;2022-02-03@19:24:59
+v2.0.8;single;10;316228;;479961;199356;164168;42633;170532;34;10.714429291;2022-02-03@19:25:14
+v2.0.8;single;10;316228;;479961;199356;165020;42817;171268;34;10.749774579;2022-02-03@19:25:30
+v2.0.8;single;10;316228;;479961;199356;164696;42766;171064;34;10.689285899;2022-02-03@19:25:46
+v2.0.8;single;10;316228;;479961;199356;163836;42527;170108;35;10.977159838;2022-02-03@19:26:02
+v2.0.8;single;10;316228;;479961;199356;164676;42739;170956;34;10.755818128;2022-02-03@19:26:17
+v2.0.8;single;10;316228;;479961;199356;163928;42575;170300;34;10.667790867;2022-02-03@19:26:33
+v2.0.8;single;10;316228;;479961;199356;164776;42754;171016;36;11.222724330;2022-02-03@19:26:49
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127428;33388;133552;35;10.650012677;2022-02-03@19:27:07
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127432;33451;133804;34;10.558070103;2022-02-03@19:27:22
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127452;33465;133860;34;10.789338092;2022-02-03@19:27:38
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127556;33445;133780;34;10.739616650;2022-02-03@19:27:54
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127648;33460;133840;35;10.918017304;2022-02-03@19:28:09
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127560;33448;133792;34;10.723903688;2022-02-03@19:28:25
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127424;33441;133764;33;10.366541502;2022-02-03@19:28:40
+v2.0.8-169-ga840170e;single;10;316228;;479961;199356;127464;33454;133816;34;10.605268363;2022-02-03@19:28:56
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;131036;199851;799404;11;3.385104392;2022-02-03@19:29:06
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;134128;199904;799616;11;3.145593650;2022-02-03@19:29:16
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;133756;200059;800236;11;3.268330570;2022-02-03@19:29:25
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;144396;200070;800280;11;3.584803871;2022-02-03@19:29:35
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;133700;199984;799936;12;3.608714588;2022-02-03@19:29:43
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;135676;199814;799256;11;3.650940127;2022-02-03@19:29:53
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;135544;199998;799992;12;3.714757259;2022-02-03@19:30:01
+v2.0.8-191-g68d8716f;single;10;316228;;479961;199356;141052;200065;800260;12;3.811908998;2022-02-03@19:30:11
+v2.0.8;mulimex;10;316228;;479961;199356;1073332;269861;1079444;59;18.991715917;2022-02-03@19:30:58
+v2.0.8;mulimex;10;316228;;479961;199356;1073628;269954;1079816;60;19.115197364;2022-02-03@19:31:24
+v2.0.8;mulimex;10;316228;;479961;199356;1073544;269880;1079520;59;18.783549169;2022-02-03@19:31:49
+v2.0.8;mulimex;10;316228;;479961;199356;1073596;269915;1079660;60;19.196274571;2022-02-03@19:32:15
+v2.0.8;mulimex;10;316228;;479961;199356;1073556;269885;1079540;60;19.041683246;2022-02-03@19:32:41
+v2.0.8;mulimex;10;316228;;479961;199356;1073564;269875;1079500;59;18.771604479;2022-02-03@19:33:07
+v2.0.8;mulimex;10;316228;;479961;199356;1073996;270069;1080276;60;19.010996066;2022-02-03@19:33:32
+v2.0.8;mulimex;10;316228;;479961;199356;1073284;269872;1079488;60;19.011560682;2022-02-03@19:33:58
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;915388;397043;1588172;240;81.240801889;2022-02-03@19:35:28
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;914856;397063;1588252;235;79.212343524;2022-02-03@19:36:53
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;914956;397059;1588236;256;86.601180413;2022-02-03@19:38:26
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;915440;396938;1587752;238;80.329047239;2022-02-03@19:39:52
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;914944;397002;1588008;232;78.658030220;2022-02-03@19:41:17
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;915192;397051;1588204;244;82.485581233;2022-02-03@19:42:45
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;915172;397014;1588056;252;85.264522152;2022-02-03@19:44:16
+v2.0.8-169-ga840170e;mulimex;10;316228;;479961;199356;914836;396923;1587692;242;81.636058334;2022-02-03@19:45:44
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;917424;560939;2243756;17;5.627595395;2022-02-03@19:45:58
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;917012;562210;2248840;17;5.511046024;2022-02-03@19:46:09
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;916888;561727;2246908;18;5.933457024;2022-02-03@19:46:20
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;917204;562535;2250140;17;5.606410980;2022-02-03@19:46:31
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;916628;560690;2242760;16;5.224918383;2022-02-03@19:46:41
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;918328;560995;2243980;17;5.620913867;2022-02-03@19:46:52
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;917760;562706;2250824;17;5.684540260;2022-02-03@19:47:03
+v2.0.8-191-g68d8716f;mulimex;10;316228;;479961;199356;917800;560715;2242860;17;5.651983375;2022-02-03@19:47:13
+v2.0.8;multi;32;316228;;564441;201030;1997396;500875;2003500;196;63.436395638;2022-02-03@19:48:47
+v2.0.8;multi;32;316228;;564441;201030;1995676;500365;2001460;199;63.703843192;2022-02-03@19:50:00
+v2.0.8;multi;32;316228;;564441;201030;1995332;500336;2001344;197;63.016381461;2022-02-03@19:51:11
+v2.0.8;multi;32;316228;;564441;201030;1995688;500483;2001932;198;63.435352883;2022-02-03@19:52:24
+v2.0.8;multi;32;316228;;564441;201030;1995236;500330;2001320;197;63.372110530;2022-02-03@19:53:36
+v2.0.8;multi;32;316228;;564441;201030;1997124;500769;2003076;197;63.481817604;2022-02-03@19:54:49
+v2.0.8;multi;32;316228;;564441;201030;1997332;500872;2003488;197;63.291646500;2022-02-03@19:56:01
+v2.0.8;multi;32;316228;;564441;201030;1995656;500422;2001688;198;63.579733397;2022-02-03@19:57:13
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1672288;944392;3777568;56;18.354787385;2022-02-03@19:57:43
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1672536;944381;3777524;57;18.421398113;2022-02-03@19:58:07
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1674068;944582;3778328;55;18.140361630;2022-02-03@19:58:30
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1673616;944507;3778028;56;18.587431872;2022-02-03@19:58:54
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1670112;943920;3775680;55;18.436486504;2022-02-03@19:59:18
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1670628;944066;3776264;56;18.324174921;2022-02-03@19:59:41
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1670780;943927;3775708;57;18.645134883;2022-02-03@20:00:05
+v2.0.8-169-ga840170e;multi;32;316228;;564441;201030;1673580;944627;3778508;56;18.524527870;2022-02-03@20:00:29
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1677620;1468271;5873084;28;9.677386591;2022-02-03@20:00:46
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1689044;1468309;5873236;27;9.412043603;2022-02-03@20:01:01
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1684744;1468094;5872376;28;9.679222041;2022-02-03@20:01:16
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1677052;1468293;5873172;28;9.585466010;2022-02-03@20:01:31
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1679316;1468485;5873940;28;9.841863348;2022-02-03@20:01:46
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1693272;1468259;5873036;27;9.443133693;2022-02-03@20:02:01
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1680508;1468316;5873264;28;9.717036506;2022-02-03@20:02:16
+v2.0.8-191-g68d8716f;multi;32;316228;;564441;201030;1676248;1467854;5871416;28;9.557940355;2022-02-03@20:02:31
+v2.0.8;imex;32;316228;;564441;201030;1198808;301225;1204900;120;37.800512864;2022-02-03@20:03:39
+v2.0.8;imex;32;316228;;564441;201030;1199248;301360;1205440;118;36.955478693;2022-02-03@20:04:23
+v2.0.8;imex;32;316228;;564441;201030;1197900;301059;1204236;116;36.297098568;2022-02-03@20:05:07
+v2.0.8;imex;32;316228;;564441;201030;1196664;300707;1202828;118;37.106370172;2022-02-03@20:05:51
+v2.0.8;imex;32;316228;;564441;201030;1197160;300862;1203448;119;37.460994264;2022-02-03@20:06:35
+v2.0.8;imex;32;316228;;564441;201030;1196988;300846;1203384;116;36.406368297;2022-02-03@20:07:19
+v2.0.8;imex;32;316228;;564441;201030;1197832;300955;1203820;117;36.635464337;2022-02-03@20:08:02
+v2.0.8;imex;32;316228;;564441;201030;1197092;300886;1203544;116;36.827039557;2022-02-03@20:08:46
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1054744;266200;1064800;309;102.506706700;2022-02-03@20:10:38
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1057188;266875;1067500;315;104.945146914;2022-02-03@20:12:29
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1056300;266576;1066304;297;98.656621485;2022-02-03@20:14:13
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1055792;266540;1066160;294;97.682145307;2022-02-03@20:15:57
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1057436;266939;1067756;316;105.331285315;2022-02-03@20:17:49
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1058612;267151;1068604;319;105.880776701;2022-02-03@20:19:41
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1057116;266886;1067544;310;103.304779955;2022-02-03@20:21:30
+v2.0.8-169-ga840170e;imex;32;316228;;564441;201030;1057992;267067;1068268;322;107.374461715;2022-02-03@20:23:23
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1060576;770614;3082456;29;9.601403230;2022-02-03@20:23:41
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1061860;770794;3083176;29;9.778064195;2022-02-03@20:23:56
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1060608;770404;3081616;28;9.534692749;2022-02-03@20:24:11
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1060400;770741;3082964;28;9.292749167;2022-02-03@20:24:25
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1061592;770686;3082744;28;9.438102784;2022-02-03@20:24:40
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1063232;770969;3083876;28;9.443758386;2022-02-03@20:24:55
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1061964;770566;3082264;27;9.250639284;2022-02-03@20:25:09
+v2.0.8-191-g68d8716f;imex;32;316228;;564441;201030;1062796;770885;3083540;28;9.226445198;2022-02-03@20:25:25
+v2.0.8;single;32;316228;;564441;201030;204940;52784;211136;105;33.015951290;2022-02-03@20:26:28
+v2.0.8;single;32;316228;;564441;201030;205248;52923;211692;104;32.618852204;2022-02-03@20:27:07
+v2.0.8;single;32;316228;;564441;201030;204344;52610;210440;102;32.064591280;2022-02-03@20:27:44
+v2.0.8;single;32;316228;;564441;201030;203836;52517;210068;101;31.922112197;2022-02-03@20:28:22
+v2.0.8;single;32;316228;;564441;201030;204808;52729;210916;102;32.143658751;2022-02-03@20:29:00
+v2.0.8;single;32;316228;;564441;201030;204376;52654;210616;103;32.409855416;2022-02-03@20:29:38
+v2.0.8;single;32;316228;;564441;201030;203968;52542;210168;102;32.237741123;2022-02-03@20:30:17
+v2.0.8;single;32;316228;;564441;201030;204588;52669;210676;101;31.887046376;2022-02-03@20:30:54
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158804;41287;165148;101;31.611179206;2022-02-03@20:31:33
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;159052;41354;165416;101;31.480480280;2022-02-03@20:32:10
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158920;41344;165376;101;31.303404256;2022-02-03@20:32:48
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158636;41260;165040;100;31.163432847;2022-02-03@20:33:25
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158888;41307;165228;102;31.848213884;2022-02-03@20:34:03
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158940;41291;165164;102;31.673911144;2022-02-03@20:34:41
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158768;41270;165080;100;31.212337613;2022-02-03@20:35:18
+v2.0.8-169-ga840170e;single;32;316228;;564441;201030;158684;41301;165204;100;31.105116696;2022-02-03@20:35:55
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;183752;564245;2256980;18;6.329625566;2022-02-03@20:36:10
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;178496;564177;2256708;17;5.903963683;2022-02-03@20:36:22
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;166360;564180;2256720;18;5.939968628;2022-02-03@20:36:34
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;182332;564248;2256992;18;6.271316493;2022-02-03@20:36:46
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;163680;564188;2256752;18;5.959872843;2022-02-03@20:36:59
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;175380;564188;2256752;18;6.105659248;2022-02-03@20:37:11
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;158744;563903;2255612;18;5.789413145;2022-02-03@20:37:23
+v2.0.8-191-g68d8716f;single;32;316228;;564441;201030;178404;564257;2257028;17;6.217304008;2022-02-03@20:37:35
+v2.0.8;mulimex;32;316228;;564441;201030;2843832;712480;2849920;218;69.009013307;2022-02-03@20:39:16
+v2.0.8;mulimex;32;316228;;564441;201030;2843436;712368;2849472;214;67.545477823;2022-02-03@20:40:35
+v2.0.8;mulimex;32;316228;;564441;201030;2845360;712878;2851512;215;67.915526880;2022-02-03@20:41:54
+v2.0.8;mulimex;32;316228;;564441;201030;2843612;712463;2849852;218;68.953625815;2022-02-03@20:43:15
+v2.0.8;mulimex;32;316228;;564441;201030;2843792;712435;2849740;215;68.021109810;2022-02-03@20:44:34
+v2.0.8;mulimex;32;316228;;564441;201030;2843512;712401;2849604;214;67.425542564;2022-02-03@20:45:53
+v2.0.8;mulimex;32;316228;;564441;201030;2843592;712424;2849696;215;67.893724804;2022-02-03@20:47:12
+v2.0.8;mulimex;32;316228;;564441;201030;2843776;712520;2850080;216;68.207891812;2022-02-03@20:48:32
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2463024;1134768;4539072;209;70.721863363;2022-02-03@20:49:56
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2462100;1134870;4539480;218;74.159586631;2022-02-03@20:51:16
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2459872;1133519;4534076;222;75.475383659;2022-02-03@20:52:37
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2460992;1134091;4536364;222;75.298175308;2022-02-03@20:53:57
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2458812;1133416;4533664;217;73.250632776;2022-02-03@20:55:16
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2459068;1133469;4533876;217;74.311785905;2022-02-03@20:56:35
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2459212;1142113;4568452;221;74.829166716;2022-02-03@20:57:55
+v2.0.8-169-ga840170e;mulimex;32;316228;;564441;201030;2459060;1141989;4567956;222;75.985762215;2022-02-03@20:59:17
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2470184;1665411;6661644;37;12.685265036;2022-02-03@20:59:37
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2468568;1665423;6661692;39;13.388871975;2022-02-03@20:59:56
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2469704;1665339;6661356;37;12.756166268;2022-02-03@21:00:14
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2469360;1665592;6662368;38;13.017830546;2022-02-03@21:00:33
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2469536;1665623;6662492;38;13.199590092;2022-02-03@21:00:51
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2469820;1665593;6662372;39;13.421426497;2022-02-03@21:01:10
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2469316;1665388;6661552;38;12.991844484;2022-02-03@21:01:29
+v2.0.8-191-g68d8716f;mulimex;32;316228;;564441;201030;2468440;1665167;6660668;38;13.038986850;2022-02-03@21:01:47
+v2.0.8;multi;100;316228;;594700;201496;5655716;1415485;5661940;701;219.556105830;2022-02-03@21:06:01
+v2.0.8;multi;100;316228;;594700;201496;5655584;1415439;5661756;693;217.811588652;2022-02-03@21:09:59
+v2.0.8;multi;100;316228;;594700;201496;5655520;1415411;5661644;682;215.243894128;2022-02-03@21:13:55
+v2.0.8;multi;100;316228;;594700;201496;5655676;1415440;5661760;686;215.832614301;2022-02-03@21:17:51
+v2.0.8;multi;100;316228;;594700;201496;5655800;1415478;5661912;687;215.907078157;2022-02-03@21:21:47
+v2.0.8;multi;100;316228;;594700;201496;5655752;1415474;5661896;681;214.325194434;2022-02-03@21:25:41
+v2.0.8;multi;100;316228;;594700;201496;5655740;1415431;5661724;680;214.475993046;2022-02-03@21:29:36
+v2.0.8;multi;100;316228;;594700;201496;5655788;1415440;5661760;692;217.781143001;2022-02-03@21:33:34
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4802040;2837518;11350072;203;64.043727066;2022-02-03@21:35:00
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4810660;2810954;11243816;202;64.190775229;2022-02-03@21:36:11
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4799472;2811050;11244200;204;64.909993937;2022-02-03@21:37:21
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4802516;2837441;11349764;204;64.791092462;2022-02-03@21:38:32
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4801976;2811105;11244420;203;64.474865085;2022-02-03@21:39:43
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4810804;2811124;11244496;205;64.752235416;2022-02-03@21:40:53
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4809620;2811609;11246436;203;64.776016272;2022-02-03@21:42:04
+v2.0.8-169-ga840170e;multi;100;316228;;594700;201496;4811300;2837490;11349960;200;64.131733712;2022-02-03@21:43:14
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4810868;3218565;12874260;83;28.217756981;2022-02-03@21:43:50
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4810892;3218677;12874708;81;27.082966319;2022-02-03@21:44:24
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4812432;3218565;12874260;84;27.458714401;2022-02-03@21:44:57
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4823940;3219747;12878988;84;27.734992960;2022-02-03@21:45:31
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4800040;3219346;12877384;82;27.510986056;2022-02-03@21:46:04
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4804652;3218791;12875164;84;28.089037904;2022-02-03@21:46:38
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4816344;3218763;12875052;82;27.470560658;2022-02-03@21:47:12
+v2.0.8-191-g68d8716f;multi;100;316228;;594700;201496;4817688;3218740;12874960;82;27.684297873;2022-02-03@21:47:46
+v2.0.8;imex;100;316228;;594700;201496;2846280;713088;2852352;359;109.324085092;2022-02-03@21:50:13
+v2.0.8;imex;100;316228;;594700;201496;2846072;713099;2852396;357;109.583646410;2022-02-03@21:52:14
+v2.0.8;imex;100;316228;;594700;201496;2846232;713128;2852512;358;109.796284523;2022-02-03@21:54:16
+v2.0.8;imex;100;316228;;594700;201496;2846100;713075;2852300;358;109.680396857;2022-02-03@21:56:17
+v2.0.8;imex;100;316228;;594700;201496;2846572;713149;2852596;371;113.979027421;2022-02-03@21:58:22
+v2.0.8;imex;100;316228;;594700;201496;2845788;713027;2852108;366;111.930538820;2022-02-03@22:00:26
+v2.0.8;imex;100;316228;;594700;201496;2846224;713073;2852292;353;108.346703218;2022-02-03@22:02:26
+v2.0.8;imex;100;316228;;594700;201496;2846080;713053;2852212;353;108.921417143;2022-02-03@22:04:26
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590248;652189;2608756;437;134.270602484;2022-02-03@22:06:54
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2589720;652041;2608164;426;131.452951788;2022-02-03@22:09:12
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590144;652179;2608716;424;130.091674709;2022-02-03@22:11:27
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590752;652284;2609136;428;132.716559979;2022-02-03@22:13:45
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590392;652263;2609052;438;134.817149170;2022-02-03@22:16:06
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590656;652302;2609208;444;137.595680607;2022-02-03@22:18:29
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2590680;652275;2609100;432;133.020608126;2022-02-03@22:20:47
+v2.0.8-169-ga840170e;imex;100;316228;;594700;201496;2591476;652504;2610016;427;131.395060773;2022-02-03@22:23:04
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2617456;2239425;8957700;63;20.810603066;2022-02-03@22:23:33
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2612872;2238941;8955764;64;20.886209203;2022-02-03@22:23:59
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2612564;2239061;8956244;62;21.050117907;2022-02-03@22:24:25
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2615516;2239169;8956676;66;21.690930407;2022-02-03@22:24:52
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2614636;2239109;8956436;62;21.159461065;2022-02-03@22:25:19
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2610700;2238792;8955168;63;20.997612770;2022-02-03@22:25:46
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2613788;2239036;8956144;61;20.485384055;2022-02-03@22:26:12
+v2.0.8-191-g68d8716f;imex;100;316228;;594700;201496;2611312;2238890;8955560;61;20.899023946;2022-02-03@22:26:39
+v2.0.8;single;100;316228;;594700;201496;229896;58998;235992;321;98.252233154;2022-02-03@22:28:55
+v2.0.8;single;100;316228;;594700;201496;230224;59119;236476;331;101.128840133;2022-02-03@22:30:41
+v2.0.8;single;100;316228;;594700;201496;230008;59031;236124;321;98.033606210;2022-02-03@22:32:25
+v2.0.8;single;100;316228;;594700;201496;229872;59030;236120;312;95.545400348;2022-02-03@22:34:05
+v2.0.8;single;100;316228;;594700;201496;229900;59031;236124;308;94.663559456;2022-02-03@22:35:45
+v2.0.8;single;100;316228;;594700;201496;230120;59030;236120;316;96.820833087;2022-02-03@22:37:28
+v2.0.8;single;100;316228;;594700;201496;230036;59066;236264;313;95.584435122;2022-02-03@22:39:08
+v2.0.8;single;100;316228;;594700;201496;230216;59020;236080;313;95.716079587;2022-02-03@22:40:49
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189564;48968;195872;301;92.699525571;2022-02-03@22:42:30
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189852;49040;196160;304;93.288557938;2022-02-03@22:44:09
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189556;49008;196032;301;92.447279218;2022-02-03@22:45:48
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189700;49009;196036;303;93.232235527;2022-02-03@22:47:27
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189512;49021;196084;306;93.833998975;2022-02-03@22:49:07
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189820;49025;196100;304;93.885631448;2022-02-03@22:50:47
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189936;49024;196096;307;93.718667948;2022-02-03@22:52:27
+v2.0.8-169-ga840170e;single;100;316228;;594700;201496;189684;49048;196192;311;95.479295293;2022-02-03@22:54:09
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;278044;1681838;6727352;39;12.991570954;2022-02-03@22:54:30
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;284024;1681676;6726704;43;13.628427391;2022-02-03@22:54:50
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;274952;1681556;6726224;43;13.712076806;2022-02-03@22:55:10
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;273044;1681485;6725940;42;13.567492096;2022-02-03@22:55:30
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;270316;1681490;6725960;44;14.081979842;2022-02-03@22:55:50
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;285300;1681663;6726652;42;13.549905521;2022-02-03@22:56:10
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;286388;1681718;6726872;41;13.619843838;2022-02-03@22:56:30
+v2.0.8-191-g68d8716f;single;100;316228;;594700;201496;294848;1681529;6726116;41;13.088778724;2022-02-03@22:56:49
+v2.0.8;mulimex;100;316228;;594700;201496;8107348;2028392;8113568;744;232.149537321;2022-02-03@23:01:19
+v2.0.8;mulimex;100;316228;;594700;201496;8107244;2028310;8113240;736;229.958512113;2022-02-03@23:05:37
+v2.0.8;mulimex;100;316228;;594700;201496;8106976;2028275;8113100;743;231.654842647;2022-02-03@23:09:56
+v2.0.8;mulimex;100;316228;;594700;201496;8106992;2028273;8113092;746;232.129673523;2022-02-03@23:14:17
+v2.0.8;mulimex;100;316228;;594700;201496;8106600;2028210;8112840;737;229.554222979;2022-02-03@23:18:34
+v2.0.8;mulimex;100;316228;;594700;201496;8107712;2028471;8113884;751;234.494652088;2022-02-03@23:22:57
+v2.0.8;mulimex;100;316228;;594700;201496;8107796;2028488;8113952;752;234.014058385;2022-02-03@23:27:19
+v2.0.8;mulimex;100;316228;;594700;201496;8106820;2028306;8113224;742;232.352721373;2022-02-03@23:31:39
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7087564;3385224;13540896;341;109.590811701;2022-02-03@23:33:59
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7099004;3410833;13643332;340;109.371342924;2022-02-03@23:35:55
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7093720;3410517;13642068;341;109.316081405;2022-02-03@23:37:51
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7097424;3410895;13643580;347;111.311301898;2022-02-03@23:39:48
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7095676;3410748;13642992;337;107.727156113;2022-02-03@23:41:43
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7095960;3410745;13642980;341;109.315866822;2022-02-03@23:43:38
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7095160;3410836;13643344;343;109.834171047;2022-02-03@23:45:35
+v2.0.8-169-ga840170e;mulimex;100;316228;;594700;201496;7086284;3410741;13642964;336;108.454875353;2022-02-03@23:47:29
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7127860;3766550;15066200;110;36.141478852;2022-02-03@23:48:14
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7088924;3766959;15067836;113;37.105573021;2022-02-03@23:48:58
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7113216;3767180;15068720;108;35.893775294;2022-02-03@23:49:41
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7117152;3766154;15064616;108;36.226685625;2022-02-03@23:50:24
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7128784;3767280;15069120;112;37.084410516;2022-02-03@23:51:07
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7119932;3766496;15065984;107;35.669195527;2022-02-03@23:51:50
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7122968;3766800;15067200;111;36.608013515;2022-02-03@23:52:33
+v2.0.8-191-g68d8716f;mulimex;100;316228;;594700;201496;7116372;3766900;15067600;107;35.877353209;2022-02-03@23:53:16
+v2.0.8;multi;316;316228;;605518;201425;17307992;4328576;17314304;2809;870.551840019;2022-02-04@00:09:04
+v2.0.8;multi;316;316228;;605518;201425;17207996;4303513;17214052;2698;829.071886658;2022-02-04@00:23:56
+v2.0.8;multi;316;316228;;605518;201425;17208308;4303605;17214420;2674;819.361342283;2022-02-04@00:38:35
+v2.0.8;multi;316;316228;;605518;201425;17208004;4303551;17214204;2670;823.315155878;2022-02-04@00:53:21
+v2.0.8;multi;316;316228;;605518;201425;17208836;4303729;17214916;2492;772.014621618;2022-02-04@01:07:14
+v2.0.8;multi;316;316228;;605518;201425;17243636;4312452;17249808;2792;875.779224129;2022-02-04@01:22:50
+v2.0.8;multi;316;316228;;605518;201425;17245172;4312881;17251524;2831;873.660704816;2022-02-04@01:38:26
+v2.0.8;multi;316;316228;;605518;201425;17300016;4326527;17306108;2769;867.511493212;2022-02-04@01:53:56
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14792416;5658059;22632236;756;235.643579755;2022-02-04@01:58:55
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14821224;5659807;22639228;752;238.248681634;2022-02-04@02:03:02
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14798724;5658831;22635324;746;233.427721359;2022-02-04@02:07:04
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14841148;5659475;22637900;745;232.379694235;2022-02-04@02:11:04
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14805648;5658484;22633936;729;229.517788038;2022-02-04@02:15:02
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14804976;5658262;22633048;716;226.744668934;2022-02-04@02:18:58
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14788832;5663254;22653016;756;235.082023175;2022-02-04@02:23:01
+v2.0.8-169-ga840170e;multi;316;316228;;605518;201425;14804096;5659887;22639548;735;230.637917609;2022-02-04@02:27:01
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14763464;5634658;22538632;279;92.779800466;2022-02-04@08:26:22
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14735604;5631130;22524520;292;96.090570635;2022-02-04@08:28:07
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14787760;5632334;22529336;290;95.511633749;2022-02-04@08:29:51
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14778740;5633729;22534916;288;95.175872462;2022-02-04@08:31:35
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14756132;5633118;22532472;281;93.642143708;2022-02-04@08:33:18
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14758256;5631060;22524240;281;93.073872008;2022-02-04@08:35:01
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14775988;5631445;22525780;279;92.396968930;2022-02-04@08:36:42
+v2.0.8-191-g68d8716f;multi;316;316228;;605518;201425;14762508;5633703;22534812;285;93.461486369;2022-02-04@08:38:25
+v2.0.8;imex;316;316228;;605518;201425;7980864;1996762;7987048;1506;457.425045540;2022-02-04@08:48:22
+v2.0.8;imex;316;316228;;605518;201425;7980804;1996782;7987128;1305;403.727207492;2022-02-04@08:55:34
+v2.0.8;imex;316;316228;;605518;201425;7980404;1996584;7986336;1550;476.769339022;2022-02-04@09:03:59
+v2.0.8;imex;316;316228;;605518;201425;7981236;1996916;7987664;1270;389.463041735;2022-02-04@09:10:57
+v2.0.8;imex;316;316228;;605518;201425;7981284;1996872;7987488;1286;397.470156101;2022-02-04@09:18:01
+v2.0.8;imex;316;316228;;605518;201425;7980524;1996715;7986860;1399;426.729209665;2022-02-04@09:25:36
+v2.0.8;imex;316;316228;;605518;201425;7981252;1996885;7987540;1326;410.426199039;2022-02-04@09:32:55
+v2.0.8;imex;316;316228;;605518;201425;7980892;1996811;7987244;1357;415.256561958;2022-02-04@09:40:18
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7405736;1862510;7450040;1450;444.886006164;2022-02-04@09:48:13
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7402644;1861797;7447188;1476;452.510565340;2022-02-04@09:55:52
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7404632;1862271;7449084;1452;447.399196936;2022-02-04@10:03:26
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7405164;1862336;7449344;1482;454.833471197;2022-02-04@10:11:08
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7409544;1863466;7453864;1459;448.235195972;2022-02-04@10:18:43
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7405004;1862319;7449276;1445;446.163542914;2022-02-04@10:26:16
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7406596;1862759;7451036;1438;440.176631357;2022-02-04@10:33:43
+v2.0.8-169-ga840170e;imex;316;316228;;605518;201425;7408616;1863264;7453056;1458;447.140033673;2022-02-04@10:41:17
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7557196;3812196;15248784;180;58.596244368;2022-02-04@10:42:24
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7554484;3811724;15246896;172;54.001143070;2022-02-04@10:43:26
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7579636;3829985;15319940;171;54.666351487;2022-02-04@10:44:27
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7589172;3829683;15318732;172;54.598314694;2022-02-04@10:45:29
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7576196;3814594;15258376;166;53.493274344;2022-02-04@10:46:30
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7586412;3814603;15258412;179;56.936863522;2022-02-04@10:47:34
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7566520;3828995;15315980;164;52.511771033;2022-02-04@10:48:34
+v2.0.8-191-g68d8716f;imex;316;316228;;605518;201425;7567552;3812995;15251980;175;55.069025368;2022-02-04@10:49:36
+v2.0.8;single;316;316228;;605518;201425;509324;128865;515460;1380;415.648631744;2022-02-04@10:58:50
+v2.0.8;single;316;316228;;605518;201425;966508;243161;972644;1516;468.456778094;2022-02-04@11:06:45
+v2.0.8;single;316;316228;;605518;201425;276532;70609;282436;1219;378.805497653;2022-02-04@11:13:11
+v2.0.8;single;316;316228;;605518;201425;278040;71016;284064;1149;358.263179534;2022-02-04@11:19:16
+v2.0.8;single;316;316228;;605518;201425;392924;99730;398920;1327;404.128967370;2022-02-04@11:26:06
+v2.0.8;single;316;316228;;605518;201425;673448;169888;679552;1351;416.628110316;2022-02-04@11:33:10
+v2.0.8;single;316;316228;;605518;201425;278084;71045;284180;1208;370.203251669;2022-02-04@11:39:26
+v2.0.8;single;316;316228;;605518;201425;548584;138660;554640;1279;395.891527753;2022-02-04@11:46:09
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;260072;66622;266488;1096;340.041956132;2022-02-04@11:51:58
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;259648;66508;266032;1078;335.014727662;2022-02-04@11:57:39
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;259848;66565;266260;1073;331.370046549;2022-02-04@12:03:17
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;259428;66423;265692;1068;332.814228795;2022-02-04@12:08:56
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;260168;66647;266588;1118;348.011919095;2022-02-04@12:14:50
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;259892;66578;266312;1131;348.822271704;2022-02-04@12:20:45
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;259480;66508;266032;1061;331.195207230;2022-02-04@12:26:23
+v2.0.8-169-ga840170e;single;316;316228;;605518;201425;260200;66607;266428;1087;338.285705124;2022-02-04@12:32:07
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;911804;2118525;8474100;125;39.518096999;2022-02-04@12:32:55
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;815276;2118169;8472676;120;36.844198798;2022-02-04@12:33:39
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;681948;2118037;8472148;124;36.959847432;2022-02-04@12:34:22
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;816200;2118201;8472804;130;39.074425331;2022-02-04@12:35:07
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;1063488;2135067;8540268;133;38.955417885;2022-02-04@12:35:53
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;1005012;2117852;8471408;127;37.833442816;2022-02-04@12:36:37
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;950012;2134617;8538468;130;38.286585221;2022-02-04@12:37:21
+v2.0.8-191-g68d8716f;single;316;316228;;605518;201425;894232;2118110;8472440;130;38.689491626;2022-02-04@12:38:06
+v2.0.8;mulimex;316;316228;;605518;201425;24734548;6185147;24740588;2536;789.955851713;2022-02-04@12:53:37
+v2.0.8;mulimex;316;316228;;605518;201425;24815564;6205449;24821796;2600;807.273637047;2022-02-04@13:08:32
+v2.0.8;mulimex;316;316228;;605518;201425;24797948;6200990;24803960;2651;820.672513394;2022-02-04@13:23:40
+v2.0.8;mulimex;316;316228;;605518;201425;24775484;6195433;24781732;2628;805.891996416;2022-02-04@13:38:36
+v2.0.8;mulimex;316;316228;;605518;201425;24876948;6220750;24883000;2605;808.632610690;2022-02-04@13:53:33
+v2.0.8;mulimex;316;316228;;605518;201425;24899644;6226481;24905924;2712;816.544034297;2022-02-04@14:08:39
+v2.0.8;mulimex;316;316228;;605518;201425;24955640;6240487;24961948;2705;820.108112366;2022-02-04@14:23:47
+v2.0.8;mulimex;316;316228;;605518;201425;24840172;6211627;24846508;2578;803.511887403;2022-02-04@14:38:39
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21820368;7422244;29688976;1073;333.583600379;2022-02-04@14:45:43
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21839208;7423739;29694956;1079;334.957842467;2022-02-04@14:51:28
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21827228;7424919;29699676;1058;328.452798694;2022-02-04@14:57:07
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21833420;7424204;29696816;1065;331.454453671;2022-02-04@15:02:49
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21818232;7424229;29696916;1049;326.951643633;2022-02-04@15:08:26
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21828132;7423116;29692464;1047;325.806422532;2022-02-04@15:14:02
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21855080;7426232;29704928;1084;334.913148342;2022-02-04@15:19:47
+v2.0.8-169-ga840170e;mulimex;316;316228;;605518;201425;21835420;7424973;29699892;1048;323.582718950;2022-02-04@15:25:21
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21869936;7319450;29277800;359;116.841816757;2022-02-04@15:27:30
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21804616;7317773;29271092;358;116.057090932;2022-02-04@15:29:38
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21861600;7319248;29276992;361;115.904053186;2022-02-04@15:31:44
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21866584;7318595;29274380;368;120.459762331;2022-02-04@15:33:56
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21880744;7318389;29273556;352;113.731656309;2022-02-04@15:36:01
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21883128;7321479;29285916;348;113.307114826;2022-02-04@15:38:05
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21891432;7322635;29290540;360;116.228471720;2022-02-04@15:40:13
+v2.0.8-191-g68d8716f;mulimex;316;316228;;605518;201425;21870960;7317581;29270324;354;115.435152216;2022-02-04@15:42:20
+v2.0.8;imex;1000;316228;;609729;202295;24622920;6157260;24629040;5938;2002.821686171;2022-02-04@17:39:58
+v2.0.8;imex;1000;316228;;609729;202295;24273696;6069967;24279868;5595;1930.856731525;2022-02-04@18:13:42
+v2.0.8;imex;1000;316228;;609729;202295;24271368;6069397;24277588;5962;1920.432548555;2022-02-04@18:47:53
+v2.0.8;imex;1000;316228;;609729;202295;24274296;6070117;24280468;5588;1931.745936351;2022-02-04@19:21:24
+v2.0.8;imex;1000;316228;;609729;202295;23692748;5924760;23699040;4347;1453.827263562;2022-02-04@19:46:58
+v2.0.8;imex;1000;316228;;609729;202295;24275116;6070322;24281288;5529;1930.265015200;2022-02-04@20:20:53
+v2.0.8;imex;1000;316228;;609729;202295;24274860;6070289;24281156;5623;1947.827149176;2022-02-04@20:55:29
+v2.0.8;imex;1000;316228;;609729;202295;24275892;6070487;24281948;5490;1911.765756494;2022-02-04@21:28:47
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22684812;5735494;22941976;4841;1530.477395432;2022-02-04@21:56:00
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22673652;5700034;22800136;4974;1552.738683247;2022-02-04@22:22:04
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22665560;5698052;22792208;4956;1546.399044334;2022-02-04@22:48:02
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22677224;5700869;22803476;4812;1544.484917526;2022-02-04@23:13:58
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22687808;5703564;22814256;4993;1557.960861845;2022-02-04@23:40:07
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22677220;5700937;22803748;5010;1555.873035787;2022-02-05@00:06:15
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22681472;5702011;22808044;5015;1564.670112520;2022-02-05@00:32:32
+v2.0.8-169-ga840170e;imex;1000;316228;;609729;202295;22683124;5702408;22809632;4981;1560.490669282;2022-02-05@00:58:44
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;25052564;7506753;30027012;546;166.701338606;2022-02-05@01:01:44
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;26078556;7564950;30259800;576;171.186004132;2022-02-05@01:04:52
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;26137948;7583714;30334856;565;170.165447838;2022-02-05@01:08:02
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;25577612;7546220;30184880;563;172.713776047;2022-02-05@01:11:12
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;25481304;7559229;30236916;554;169.639453386;2022-02-05@01:14:21
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;25983844;7549779;30199116;540;170.372893769;2022-02-05@01:17:27
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;26315352;7656935;30627740;623;183.826687009;2022-02-05@01:20:48
+v2.0.8-191-g68d8716f;imex;1000;316228;;609729;202295;27625032;7749186;30996744;721;229.231241024;2022-02-05@01:30:17
+v2.0.8;single;1000;316228;;609729;202295;10792640;2699685;10798740;5912;2036.834114064;2022-02-05@02:16:59
+v2.0.8;single;1000;316228;;609729;202295;6098948;1526244;6104976;5806;2044.103052699;2022-02-05@02:55:06
+v2.0.8;single;1000;316228;;609729;202295;10465428;2617842;10471368;5694;2007.650305528;2022-02-05@03:28:44
+v2.0.8;single;1000;316228;;609729;202295;1073948;270018;1080072;5636;1983.623219556;2022-02-05@04:06:04
+v2.0.8;single;1000;316228;;609729;202295;12223736;3057419;12229676;6758;2204.906028987;2022-02-05@04:50:23
+v2.0.8;single;1000;316228;;609729;202295;403600;102476;409904;5513;1929.831781026;2022-02-05@05:22:42
+v2.0.8;single;1000;316228;;609729;202295;8320348;2081604;8326416;5719;2036.542076734;2022-02-05@05:56:48
+v2.0.8;single;1000;316228;;609729;202295;11171468;2794388;11177552;6136;2138.570605368;2022-02-05@06:32:37
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;431804;109511;438044;3766;1174.736554296;2022-02-05@06:52:24
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;424320;107641;430564;3721;1177.436043110;2022-02-05@07:12:08
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;432144;109601;438404;3773;1187.099384005;2022-02-05@07:32:02
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;430932;109314;437256;3859;1212.350914498;2022-02-05@07:52:20
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;428912;108789;435156;3736;1173.267382896;2022-02-05@08:12:00
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;432600;109734;438936;3838;1192.131359003;2022-02-05@08:31:59
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;435392;110442;441768;3857;1203.855684546;2022-02-05@08:52:09
+v2.0.8-169-ga840170e;single;1000;316228;;609729;202295;432156;109626;438504;3690;1148.847959233;2022-02-05@09:11:24
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;12629088;4108840;16435360;711;244.839083367;2022-02-05@09:15:38
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;11800340;3941170;15764680;731;254.074450970;2022-02-05@09:20:07
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;14532820;4757847;19031388;881;308.014000549;2022-02-05@09:33:14
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;13171428;4439572;17758288;796;244.992738331;2022-02-05@09:37:26
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;13561724;4545775;18183100;715;248.739982640;2022-02-05@09:45:16
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;12543864;4265013;17060052;698;242.845807132;2022-02-05@09:49:34
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;12744408;4202327;16809308;800;286.580612795;2022-02-05@09:58:04
+v2.0.8-191-g68d8716f;single;1000;316228;;609729;202295;12966908;4350806;17403224;928;337.771646463;2022-02-05@10:03:56
+v2.0.8;multi;10;1000000;;1316089;765345;2173232;544852;2179408;104;54.325874816;2022-02-05@10:10:05
+v2.0.8;multi;10;1000000;;1316089;765345;2173628;544984;2179936;105;54.988035724;2022-02-05@10:11:09
+v2.0.8;multi;10;1000000;;1316089;765345;2173456;544869;2179476;103;54.051979815;2022-02-05@10:12:12
+v2.0.8;multi;10;1000000;;1316089;765345;2173000;544834;2179336;105;54.244819351;2022-02-05@10:13:14
+v2.0.8;multi;10;1000000;;1316089;765345;2173844;544972;2179888;107;55.518375233;2022-02-05@10:14:19
+v2.0.8;multi;10;1000000;;1316089;765345;2172860;544799;2179196;104;54.477336274;2022-02-05@10:15:22
+v2.0.8;multi;10;1000000;;1316089;765345;2173272;544877;2179508;104;54.368082128;2022-02-05@10:16:25
+v2.0.8;multi;10;1000000;;1316089;765345;2173008;544756;2179024;105;54.847246134;2022-02-05@10:17:28
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835436;603275;2413100;35;21.093173544;2022-02-05@10:18:00
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835108;603242;2412968;36;21.250465165;2022-02-05@10:18:29
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835120;603283;2413132;36;21.454543594;2022-02-05@10:18:57
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835240;603293;2413172;35;21.205366308;2022-02-05@10:19:26
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1834924;603259;2413036;37;21.584010857;2022-02-05@10:19:54
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835096;603278;2413112;37;21.747764589;2022-02-05@10:20:23
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835464;603311;2413244;37;21.554958843;2022-02-05@10:20:52
+v2.0.8-169-ga840170e;multi;10;1000000;;1316089;765345;1835020;603257;2413028;36;20.796240505;2022-02-05@10:21:20
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1851596;748048;2992192;21;11.470545795;2022-02-05@10:21:41
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1874960;748320;2993280;21;12.510108288;2022-02-05@10:22:00
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1853388;747957;2991828;21;11.339037879;2022-02-05@10:22:19
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1860752;747947;2991788;20;11.458786975;2022-02-05@10:22:38
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1849636;747809;2991236;21;11.184670493;2022-02-05@10:22:56
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1869088;748443;2993772;20;11.344524211;2022-02-05@10:23:15
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1860416;748197;2992788;20;11.148555078;2022-02-05@10:23:33
+v2.0.8-191-g68d8716f;multi;10;1000000;;1316089;765345;1877784;748194;2992776;21;11.657953273;2022-02-05@10:23:52
+v2.0.8;imex;10;1000000;;1316089;765345;1849452;463888;1855552;84;44.039838432;2022-02-05@10:25:38
+v2.0.8;imex;10;1000000;;1316089;765345;1849296;463912;1855648;87;45.434500563;2022-02-05@10:26:31
+v2.0.8;imex;10;1000000;;1316089;765345;1849876;463979;1855916;88;44.898942311;2022-02-05@10:27:24
+v2.0.8;imex;10;1000000;;1316089;765345;1849696;463966;1855864;86;44.551704143;2022-02-05@10:28:16
+v2.0.8;imex;10;1000000;;1316089;765345;1849596;463982;1855928;86;44.011534730;2022-02-05@10:29:08
+v2.0.8;imex;10;1000000;;1316089;765345;1850236;464093;1856372;86;44.756151119;2022-02-05@10:30:01
+v2.0.8;imex;10;1000000;;1316089;765345;1849324;463866;1855464;86;44.534863766;2022-02-05@10:30:53
+v2.0.8;imex;10;1000000;;1316089;765345;1849504;463889;1855556;86;45.118214507;2022-02-05@10:31:46
+v2.0.8;imex;10;1000000;;1316089;765345;1849640;463989;1855956;87;45.411629456;2022-02-05@10:58:28
+v2.0.8;imex;10;1000000;;1316089;765345;1849124;463858;1855432;83;44.270380028;2022-02-05@10:59:20
+v2.0.8;imex;10;1000000;;1316089;765345;1849604;463949;1855796;84;44.338739798;2022-02-05@11:00:12
+v2.0.8;imex;10;1000000;;1316089;765345;1849468;463900;1855600;85;45.175721747;2022-02-05@11:01:05
+v2.0.8;imex;10;1000000;;1316089;765345;1849732;463968;1855872;87;44.639490530;2022-02-05@11:01:58
+v2.0.8;imex;10;1000000;;1316089;765345;1849844;463994;1855976;88;45.333969551;2022-02-05@11:02:51
+v2.0.8;imex;10;1000000;;1316089;765345;1849036;463848;1855392;85;44.340897712;2022-02-05@11:03:43
+v2.0.8;imex;10;1000000;;1316089;765345;1849352;463855;1855420;89;45.636895457;2022-02-05@11:04:37
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1591172;517388;2069552;52;32.538620092;2022-02-05@11:05:19
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1592704;512529;2050116;56;34.382643326;2022-02-05@11:06:01
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1592636;509587;2038348;52;32.563343526;2022-02-05@11:06:40
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1591848;515413;2061652;53;33.543034954;2022-02-05@11:07:21
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1591700;517549;2070196;55;35.501331671;2022-02-05@11:08:04
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1592640;514462;2057848;56;35.311793038;2022-02-05@11:08:46
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1590428;513287;2053148;53;32.513421822;2022-02-05@11:09:26
+v2.0.8-191-g68d8716f;imex;10;1000000;;1316089;765345;1590960;513253;2053012;50;32.078524668;2022-02-05@11:10:05
+v2.0.8;single;10;1000000;;1316089;765345;439732;111491;445964;72;36.311908285;2022-02-05@11:11:42
+v2.0.8;single;10;1000000;;1316089;765345;440264;111625;446500;73;37.613376453;2022-02-05@11:12:27
+v2.0.8;single;10;1000000;;1316089;765345;439540;111446;445784;70;36.683987170;2022-02-05@11:13:10
+v2.0.8;single;10;1000000;;1316089;765345;438744;111278;445112;71;36.868889074;2022-02-05@11:13:53
+v2.0.8;single;10;1000000;;1316089;765345;439964;111538;446152;74;38.256904022;2022-02-05@11:14:38
+v2.0.8;single;10;1000000;;1316089;765345;439368;111411;445644;76;38.532687586;2022-02-05@11:15:24
+v2.0.8;single;10;1000000;;1316089;765345;438584;111225;444900;74;37.600545026;2022-02-05@11:16:08
+v2.0.8;single;10;1000000;;1316089;765345;440156;111554;446216;70;36.656141061;2022-02-05@11:16:52
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;380392;231103;924412;17;9.703857291;2022-02-05@11:17:11
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;422384;247511;990044;18;10.692671055;2022-02-05@11:17:29
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;380240;231058;924232;17;8.949187928;2022-02-05@11:17:45
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;393276;231150;924600;18;9.433902188;2022-02-05@11:18:02
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;390440;231129;924516;19;10.199531182;2022-02-05@11:18:20
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;415924;247448;989792;19;11.302476591;2022-02-05@11:18:38
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;422040;247504;990016;17;10.620269079;2022-02-05@11:18:56
+v2.0.8-191-g68d8716f;single;10;1000000;;1316089;765345;386500;231073;924292;18;9.503013716;2022-02-05@11:19:13
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275008;820299;3281196;113;58.588564011;2022-02-05@11:21:13
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275776;820478;3281912;114;59.085267626;2022-02-05@11:22:23
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275652;820459;3281836;113;58.765284124;2022-02-05@11:23:33
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275836;820493;3281972;115;59.770207368;2022-02-05@11:24:44
+v2.0.8;mulimex;10;1000000;;1316089;765345;3276304;820586;3282344;114;58.986978166;2022-02-05@11:25:54
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275260;820374;3281496;114;59.079053422;2022-02-05@11:27:04
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275640;820472;3281888;113;58.736825804;2022-02-05@11:28:14
+v2.0.8;mulimex;10;1000000;;1316089;765345;3275372;820384;3281536;113;58.829616165;2022-02-05@11:29:24
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859128;993453;3973812;46;28.670792321;2022-02-05@11:30:06
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859276;993396;3973584;43;26.726314187;2022-02-05@11:30:40
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859228;995567;3982268;45;28.225805211;2022-02-05@11:31:14
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859584;994596;3978384;46;29.223023400;2022-02-05@11:31:49
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859780;995682;3982728;44;27.779189264;2022-02-05@11:32:24
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2858928;995613;3982452;45;27.548950169;2022-02-05@11:32:57
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2858364;993644;3974576;43;27.176190346;2022-02-05@11:33:31
+v2.0.8-191-g68d8716f;mulimex;10;1000000;;1316089;765345;2859172;995506;3982024;45;28.009507315;2022-02-05@11:34:06
+v2.0.8;multi;32;1000000;;1699523;774910;6199248;1551351;6205404;386;207.328060631;2022-02-05@11:38:47
+v2.0.8;multi;32;1000000;;1699523;774910;6199004;1551266;6205064;384;207.438266755;2022-02-05@11:42:33
+v2.0.8;multi;32;1000000;;1699523;774910;6199416;1551404;6205616;386;208.684548210;2022-02-05@11:46:21
+v2.0.8;multi;32;1000000;;1699523;774910;6199124;1551308;6205232;391;208.834112866;2022-02-05@11:50:08
+v2.0.8;multi;32;1000000;;1699523;774910;6199664;1551439;6205756;385;207.896302830;2022-02-05@11:53:55
+v2.0.8;multi;32;1000000;;1699523;774910;6199792;1551470;6205880;386;207.940466723;2022-02-05@11:57:41
+v2.0.8;multi;32;1000000;;1699523;774910;6202604;1552126;6208504;385;207.592725766;2022-02-05@12:01:28
+v2.0.8;multi;32;1000000;;1699523;774910;6199716;1551502;6206008;385;206.669155734;2022-02-05@12:05:13
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5295736;2302668;9210672;43;28.939887118;2022-02-05@12:06:02
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5297564;2302827;9211308;43;28.965262088;2022-02-05@12:06:38
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5288448;2302738;9210952;45;28.851224962;2022-02-05@12:07:14
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5283444;2302568;9210272;44;29.476861072;2022-02-05@12:07:50
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5299844;2302667;9210668;43;29.546638147;2022-02-05@12:08:26
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5293508;2302839;9211356;45;28.784280992;2022-02-05@12:09:02
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5282368;2302344;9209376;48;32.269508612;2022-02-05@12:09:41
+v2.0.8-191-g68d8716f;multi;32;1000000;;1699523;774910;5285388;2302969;9211876;43;28.206513692;2022-02-05@12:10:21
+v2.0.8;imex;32;1000000;;1699523;774910;4174980;1045341;4181364;275;143.531939230;2022-02-05@12:13:59
+v2.0.8;imex;32;1000000;;1699523;774910;4174476;1045178;4180712;275;145.072610373;2022-02-05@12:16:38
+v2.0.8;imex;32;1000000;;1699523;774910;4175652;1045487;4181948;263;139.194764481;2022-02-05@12:19:11
+v2.0.8;imex;32;1000000;;1699523;774910;4174324;1045133;4180532;262;139.065497607;2022-02-05@12:21:43
+v2.0.8;imex;32;1000000;;1699523;774910;4176580;1045726;4182904;269;143.323853780;2022-02-05@12:24:21
+v2.0.8;imex;32;1000000;;1699523;774910;4174076;1045054;4180216;268;143.944790262;2022-02-05@12:26:58
+v2.0.8;imex;32;1000000;;1699523;774910;4175076;1045344;4181376;265;141.771928835;2022-02-05@12:29:34
+v2.0.8;imex;32;1000000;;1699523;774910;4174860;1045238;4180952;270;143.180922398;2022-02-05@12:32:11
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3704768;1379658;5518632;75;50.430233611;2022-02-05@12:33:17
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3706024;1379966;5519864;78;52.239238793;2022-02-05@12:34:17
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3706524;1379806;5519224;79;52.422872807;2022-02-05@12:35:17
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3705172;1379800;5519200;80;52.544108937;2022-02-05@12:36:17
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3705520;1380045;5520180;76;51.262736863;2022-02-05@12:37:15
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3704716;1379694;5518776;79;53.586894813;2022-02-05@12:38:16
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3704884;1379897;5519588;76;51.340094014;2022-02-05@12:39:15
+v2.0.8-191-g68d8716f;imex;32;1000000;;1699523;774910;3703700;1379644;5518576;78;52.650961543;2022-02-05@12:40:15
+v2.0.8;single;32;1000000;;1699523;774910;584644;147700;590800;221;115.561012475;2022-02-05@12:43:25
+v2.0.8;single;32;1000000;;1699523;774910;585052;147812;591248;218;116.154549958;2022-02-05@12:45:29
+v2.0.8;single;32;1000000;;1699523;774910;585692;147991;591964;227;119.816137749;2022-02-05@12:47:36
+v2.0.8;single;32;1000000;;1699523;774910;585920;147978;591912;218;115.920501519;2022-02-05@12:49:39
+v2.0.8;single;32;1000000;;1699523;774910;584736;147730;590920;222;116.844915404;2022-02-05@12:51:44
+v2.0.8;single;32;1000000;;1699523;774910;585232;147805;591220;220;116.102990014;2022-02-05@12:53:47
+v2.0.8;single;32;1000000;;1699523;774910;585228;147820;591280;225;118.512725032;2022-02-05@12:55:53
+v2.0.8;single;32;1000000;;1699523;774910;583712;147436;589744;219;114.983142926;2022-02-05@12:57:56
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;601776;620654;2482616;33;21.499598073;2022-02-05@12:58:27
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;563960;620669;2482676;37;22.997979497;2022-02-05@12:58:58
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;599224;620658;2482632;35;20.756789147;2022-02-05@12:59:27
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;574468;604265;2417060;34;20.968939650;2022-02-05@12:59:55
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;585688;620643;2482572;34;20.971547157;2022-02-05@13:00:24
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;574828;620645;2482580;37;22.899177590;2022-02-05@13:00:55
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;582804;620643;2482572;37;23.201426719;2022-02-05@13:01:26
+v2.0.8-191-g68d8716f;single;32;1000000;;1699523;774910;580488;620703;2482812;33;21.535547640;2022-02-05@13:01:55
+v2.0.8;mulimex;32;1000000;;1699523;774910;9376028;2345542;9382168;426;225.043996185;2022-02-05@13:06:57
+v2.0.8;mulimex;32;1000000;;1699523;774910;9375216;2345323;9381292;424;224.030730591;2022-02-05@13:11:09
+v2.0.8;mulimex;32;1000000;;1699523;774910;9375456;2345336;9381344;423;224.891252999;2022-02-05@13:15:23
+v2.0.8;mulimex;32;1000000;;1699523;774910;9375216;2345384;9381536;421;224.156344279;2022-02-05@13:19:35
+v2.0.8;mulimex;32;1000000;;1699523;774910;9374592;2345196;9380784;427;227.180265334;2022-02-05@13:23:51
+v2.0.8;mulimex;32;1000000;;1699523;774910;9374496;2345190;9380760;428;226.327899792;2022-02-05@13:28:06
+v2.0.8;mulimex;32;1000000;;1699523;774910;9374784;2345239;9380956;428;227.141943116;2022-02-05@13:32:22
+v2.0.8;mulimex;32;1000000;;1699523;774910;9375216;2345348;9381392;427;225.976576860;2022-02-05@13:36:36
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8226656;3036427;12145708;95;61.612434783;2022-02-05@13:38:08
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8227896;3036353;12145412;94;62.019259615;2022-02-05@13:39:18
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8226268;3036186;12144744;96;62.048104203;2022-02-05@13:40:28
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8226444;3036468;12145872;94;60.630507651;2022-02-05@13:41:36
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8225848;3036274;12145096;93;61.394216566;2022-02-05@13:42:45
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8225644;3036198;12144792;96;62.742032127;2022-02-05@13:43:56
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8225940;3036350;12145400;94;61.260405248;2022-02-05@13:45:05
+v2.0.8-191-g68d8716f;mulimex;32;1000000;;1699523;774910;8225844;3036232;12144928;96;61.768891642;2022-02-05@13:46:15
+v2.0.8;multi;100;1000000;;1850595;774906;18181288;4546881;18187524;1362;723.826224972;2022-02-05@13:59:43
+v2.0.8;multi;100;1000000;;1850595;774906;18179196;4546362;18185448;1353;723.766027174;2022-02-05@14:12:43
+v2.0.8;multi;100;1000000;;1850595;774906;18181804;4546978;18187912;1323;709.892586705;2022-02-05@14:25:30
+v2.0.8;multi;100;1000000;;1850595;774906;18180964;4546737;18186948;1356;723.369298512;2022-02-05@14:38:28
+v2.0.8;multi;100;1000000;;1850595;774906;18181028;4546797;18187188;1373;725.807064145;2022-02-05@14:51:30
+v2.0.8;multi;100;1000000;;1850595;774906;18181512;4546947;18187788;1371;724.396930561;2022-02-05@15:04:31
+v2.0.8;multi;100;1000000;;1850595;774906;18181812;4546973;18187892;1329;707.344611202;2022-02-05@15:17:14
+v2.0.8;multi;100;1000000;;1850595;774906;18180828;4546740;18186960;1346;718.505171052;2022-02-05@15:30:08
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15578332;5860000;23440000;149;86.934491755;2022-02-05@15:32:33
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15574768;5859238;23436952;149;88.587973265;2022-02-05@15:34:11
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15575476;5859288;23437152;149;89.273338309;2022-02-05@15:35:51
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15576692;5858918;23435672;153;88.019030286;2022-02-05@15:37:29
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15579784;5859598;23438392;150;89.904531723;2022-02-05@15:39:09
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15577956;5859738;23438952;150;88.175351234;2022-02-05@15:40:47
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15580964;5859216;23436864;151;89.891753211;2022-02-05@15:42:27
+v2.0.8-191-g68d8716f;multi;100;1000000;;1850595;774906;15577132;5859328;23437312;152;89.232704147;2022-02-05@15:44:06
+v2.0.8;imex;100;1000000;;1850595;774906;10532972;2634781;10539124;862;433.301725886;2022-02-05@15:52:49
+v2.0.8;imex;100;1000000;;1850595;774906;10530516;2634104;10536416;867;437.732405753;2022-02-05@16:00:40
+v2.0.8;imex;100;1000000;;1850595;774906;10530844;2634274;10537096;845;432.392108833;2022-02-05@16:08:24
+v2.0.8;imex;100;1000000;;1850595;774906;10539636;2636538;10546152;856;435.052248234;2022-02-05@16:16:11
+v2.0.8;imex;100;1000000;;1850595;774906;10530684;2634253;10537012;864;439.776782900;2022-02-05@16:24:04
+v2.0.8;imex;100;1000000;;1850595;774906;10529488;2633951;10535804;865;438.289669443;2022-02-05@16:31:55
+v2.0.8;imex;100;1000000;;1850595;774906;10538308;2636130;10544520;869;440.148196898;2022-02-05@16:39:48
+v2.0.8;imex;100;1000000;;1850595;774906;10529548;2633975;10535900;871;436.884153410;2022-02-05@16:47:37
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9623644;3964392;15857568;177;108.112807424;2022-02-05@16:50:01
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9628400;3964670;15858680;171;107.956290725;2022-02-05@16:51:57
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9629944;3964390;15857560;173;109.504775126;2022-02-05@16:53:55
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9618932;3963398;15853592;170;105.854461943;2022-02-05@16:55:49
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9633072;3963771;15855084;166;104.777816772;2022-02-05@16:57:42
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9622912;3963295;15853180;175;111.980341915;2022-02-05@16:59:43
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9623776;3963462;15853848;169;104.894534387;2022-02-05@17:01:36
+v2.0.8-191-g68d8716f;imex;100;1000000;;1850595;774906;9622028;3963678;15854712;170;107.391482679;2022-02-05@17:03:32
+v2.0.8;single;100;1000000;;1850595;774906;679140;171404;685616;697;358.381163366;2022-02-05@17:10:58
+v2.0.8;single;100;1000000;;1850595;774906;686080;173036;692144;699;358.341566070;2022-02-05@17:17:03
+v2.0.8;single;100;1000000;;1850595;774906;681764;172002;688008;697;360.435852469;2022-02-05@17:23:10
+v2.0.8;single;100;1000000;;1850595;774906;687088;173364;693456;701;359.305831640;2022-02-05@17:29:16
+v2.0.8;single;100;1000000;;1850595;774906;685352;172894;691576;715;367.350519611;2022-02-05@17:35:31
+v2.0.8;single;100;1000000;;1850595;774906;682160;172095;688380;717;370.549735284;2022-02-05@17:41:48
+v2.0.8;single;100;1000000;;1850595;774906;687208;173336;693344;713;366.740814475;2022-02-05@17:48:01
+v2.0.8;single;100;1000000;;1850595;774906;684264;172584;690336;717;370.407455817;2022-02-05@17:54:19
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;1909064;1744323;6977292;88;50.457323999;2022-02-05@17:55:18
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;1911704;1744279;6977116;81;48.009843424;2022-02-05@17:56:15
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;1927700;1727894;6911576;80;46.040963014;2022-02-05@17:57:09
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;2102624;1727928;6911712;73;45.154658709;2022-02-05@17:58:03
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;1999780;1744290;6977160;75;45.320106646;2022-02-05@17:58:57
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;1849620;1727877;6911508;81;45.344112731;2022-02-05@17:59:50
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;2195280;1744262;6977048;83;49.307507134;2022-02-05@18:00:48
+v2.0.8-191-g68d8716f;single;100;1000000;;1850595;774906;2122772;1744314;6977256;83;48.885739566;2022-02-05@18:01:45
+v2.0.8;mulimex;100;1000000;;1850595;774906;27538684;6886450;27545800;1501;771.549366259;2022-02-05@18:16:04
+v2.0.8;mulimex;100;1000000;;1850595;774906;27543460;6887382;27549528;1500;763.970036677;2022-02-05@18:30:16
+v2.0.8;mulimex;100;1000000;;1850595;774906;27543024;6887585;27550340;1529;785.017708441;2022-02-05@18:44:48
+v2.0.8;mulimex;100;1000000;;1850595;774906;27542992;6887238;27548952;1537;788.560879095;2022-02-05@18:59:24
+v2.0.8;mulimex;100;1000000;;1850595;774906;27540988;6886722;27546888;1526;780.469105467;2022-02-05@19:13:53
+v2.0.8;mulimex;100;1000000;;1850595;774906;27540736;6886707;27546828;1494;761.272494529;2022-02-05@19:28:01
+v2.0.8;mulimex;100;1000000;;1850595;774906;27539324;6886404;27545616;1503;773.100628946;2022-02-05@19:42:21
+v2.0.8;mulimex;100;1000000;;1850595;774906;27544724;6887658;27550632;1531;784.312494214;2022-02-05@19:56:53
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24303324;8034422;32137688;255;151.266685842;2022-02-05@20:00:55
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24299220;8034486;32137944;255;151.735213648;2022-02-05@20:03:39
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24300540;8035684;32142736;259;152.859662854;2022-02-05@20:06:25
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24299092;8034016;32136064;253;152.038598172;2022-02-05@20:09:09
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24290004;8033225;32132900;257;154.580068271;2022-02-05@20:11:57
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24295968;8034657;32138628;255;152.730881611;2022-02-05@20:14:43
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24296716;8033090;32132360;251;150.853322625;2022-02-05@20:17:27
+v2.0.8-191-g68d8716f;mulimex;100;1000000;;1850595;774906;24307072;8034328;32137312;251;151.143574226;2022-02-05@20:20:10
+v2.0.8;single;316;1000000;;1904334;774924;775872;195473;781892;2348;1174.577249348;2022-02-05@22:17:37
+v2.0.8;single;316;1000000;;1904334;774924;776112;195574;782296;2466;1206.370934164;2022-02-05@22:37:55
+v2.0.8;single;316;1000000;;1904334;774924;883280;222354;889416;3720;2037.159169159;2022-02-05@23:12:03
+v2.0.8;single;316;1000000;;1904334;774924;1103508;277363;1109452;3956;2202.485440220;2022-02-05@23:48:57
+v2.0.8;single;316;1000000;;1904334;774924;778572;196189;784756;2353;1168.519093026;2022-02-06@00:08:37
+v2.0.8;single;316;1000000;;1904334;774924;895896;225477;901908;3898;2212.139663429;2022-02-06@00:45:41
+v2.0.8;single;316;1000000;;1904334;774924;933612;234961;939844;3550;1911.990475277;2022-02-06@01:17:43
+v2.0.8;single;316;1000000;;1904334;774924;776832;195814;783256;2885;1384.335300260;2022-02-06@01:40:58
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2099000;2200608;8802432;297;146.881032759;2022-02-06@01:43:39
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2021504;2184216;8736864;271;142.265301817;2022-02-06@01:46:10
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2019184;2183596;8734384;280;145.881691306;2022-02-06@01:48:44
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2114844;2184232;8736928;283;144.454957472;2022-02-06@01:51:18
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;3202660;2202504;8810016;251;139.810589922;2022-02-06@01:53:46
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2358196;2168710;8674840;244;137.155072737;2022-02-06@01:56:12
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2351692;2184810;8739240;262;142.477408473;2022-02-06@01:58:43
+v2.0.8-191-g68d8716f;single;316;1000000;;1904334;774924;2203488;2184041;8736164;274;140.694525782;2022-02-06@02:01:13
+v2.0.8;single;1000;1000000;;1921645;775122;10172940;2544765;10179060;12699;7751.345015169;2022-02-06@04:19:19
+v2.0.8;single;1000;1000000;;1921645;775122;10765548;2692881;10771524;12721;7847.362800203;2022-02-06@06:30:31
+v2.0.8;single;1000;1000000;;1921645;775122;6931664;1734436;6937744;11924;7679.360650451;2022-02-06@08:38:52
+v2.0.8;single;1000;1000000;;1921645;775122;2880676;721670;2886680;11966;7472.979289279;2022-02-06@10:43:48
+v2.0.8;single;1000;1000000;;1921645;775122;1791404;449352;1797408;8893;4837.344280205;2022-02-06@12:04:47
+v2.0.8;single;1000;1000000;;1921645;775122;1102328;277096;1108384;11546;7431.205042891;2022-02-06@14:13:21
+v2.0.8;single;1000;1000000;;1921645;775122;3931932;984508;3938032;11545;7470.880615272;2022-02-06@16:18:11
+v2.0.8;single;1000;1000000;;1921645;775122;8973476;2244831;8979324;12756;7968.283077393;2022-02-06@18:31:21

From 935c066402d56d9b01ae41527c2e760d189b01f9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 7 Feb 2022 22:35:05 +0100
Subject: [PATCH 103/431] NEWS and version update

---
 NEWS            | 15 +++++++++++++++
 misc/bird.spec  |  2 +-
 sysdep/config.h |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4a85c365..6ce93de8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Version 3.0-alpha0 (2022-02-07)
+  o Removal of fixed protocol-specific route attributes
+  o Asynchronous route export
+  o Explicit table import / export hooks
+  o Partially lockless route attribute cache
+  o Thread-safe resource management
+  o Thread-safe interface notifications
+  o Thread-safe protocol API
+  o Adoption of BFD IO loop for general use
+  o Parallel Pipe protocol
+  o Parallel RPKI protocol
+  o Parallel BGP protocol
+  o Lots of refactoring
+  o Bugfixes and improvements as they came along
+
 Version 2.0.8 (2021-03-18)
   o Automatic channel reloads based on RPKI changes
   o Multiple static routes with the same network
diff --git a/misc/bird.spec b/misc/bird.spec
index 26b43011..d08c130a 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 2.0.8
+Version: 3.0-alpha0
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/sysdep/config.h b/sysdep/config.h
index 55be90f0..2425b666 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -13,7 +13,7 @@
 #ifdef GIT_LABEL
 #define BIRD_VERSION XSTR1(GIT_LABEL)
 #else
-#define BIRD_VERSION "2.0.8"
+#define BIRD_VERSION "3.0-alpha0"
 #endif
 
 /* Include parameters determined by configure script */

From 7404a215806972fb5e7205aaa99a3ff7b00ede16 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Wed, 2 Mar 2022 10:38:15 +0100
Subject: [PATCH 104/431] Minor doc and gendist changes

---
 doc/bird.sgml      | 11 +++++------
 doc/prog-head.sgml |  2 +-
 tools/gendist      |  3 +--
 tools/linuxdoc     |  9 +++++++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index c44b49db..5cf09bfe 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1,7 +1,7 @@
 <!doctype birddoc system>
 
 <!--
-	BIRD 2.0 documentation
+	BIRD 3.0 documentation
 
 This documentation can have 4 forms: sgml (this is master copy), html, ASCII
 text and dvi/postscript (generated from sgml using sgmltools). You should always
@@ -20,10 +20,9 @@ configuration - something in config which is not keyword.
 
 <book>
 
-<title>BIRD 2.0 User's Guide
+<title>BIRD 3.0 User's Guide
 <author>
 Ondrej Filip <it/&lt;feela@network.cz&gt;/,
-Pavel Machek <it/&lt;pavel@ucw.cz&gt;/,
 Martin Mares <it/&lt;mj@ucw.cz&gt;/,
 Maria Matejka <it/&lt;mq@jmq.cz&gt;/,
 Ondrej Zajicek <it/&lt;santiago@crfreenet.org&gt;/
@@ -5377,15 +5376,15 @@ name="atrey.karlin.mff.cuni.cz:/pub/rfc">).
 </book>
 
 <!--
-LocalWords:  GPL IPv GateD BGPv RIPv OSPFv Linux sgml html dvi sgmltools Pavel
+LocalWords:  GPL IPv GateD BGPv RIPv OSPFv Linux sgml html dvi sgmltools
 LocalWords:  linuxdoc dtd descrip config conf syslog stderr auth ospf bgp Mbps
 LocalWords:  router's eval expr num birdc ctl UNIX if's enums bool int ip GCC
 LocalWords:  len ipaddress pxlen netmask enum bgppath bgpmask clist gw md eth
-LocalWords:  RTS printn quitbird iBGP AS'es eBGP RFC multiprotocol IGP Machek
+LocalWords:  RTS printn quitbird iBGP AS'es eBGP RFC multiprotocol IGP
 LocalWords:  EGP misconfigurations keepalive pref aggr aggregator BIRD's RTC
 LocalWords:  OS'es AS's multicast nolisten misconfigured UID blackhole MRTD MTU
 LocalWords:  uninstalls ethernets IP binutils ANYCAST anycast dest RTD ICMP rfc
 LocalWords:  compat multicasts nonbroadcast pointopoint loopback sym stats
 LocalWords:  Perl SIGHUP dd mm yy HH MM SS EXT IA UNICAST multihop Discriminator txt
-LocalWords:  proto wildcard Ondrej Filip
+LocalWords:  proto wildcard
 -->
diff --git a/doc/prog-head.sgml b/doc/prog-head.sgml
index 0eec367e..43ee4ef6 100644
--- a/doc/prog-head.sgml
+++ b/doc/prog-head.sgml
@@ -12,7 +12,7 @@
 <title>BIRD Programmer's Documentation
 <author>
 Ondrej Filip <it/&lt;feela@network.cz&gt;/,
-Pavel Machek <it/&lt;pavel@ucw.cz&gt;/,
+Maria Matejka <it/&lt;mq@jmq.cz&gt;/,
 Martin Mares <it/&lt;mj@ucw.cz&gt;/,
 Ondrej Zajicek <it/&lt;santiago@crfreenet.org&gt;/
 </author>
diff --git a/tools/gendist b/tools/gendist
index 2ac59030..2dc42ba9 100755
--- a/tools/gendist
+++ b/tools/gendist
@@ -2,6 +2,7 @@
 #
 #  Generate BIRD Distribution Archive
 #  (c) 2000--2004 Martin Mares <mj@ucw.cz>
+#  (c) 2005--2022 Ondrej Filip <feela@network.cz>
 #
 
 VERSION=`grep 'BIRD_VERSION \"' sysdep/config.h | sed '/BIRD_VERSION/!d;s/^.*"\(.*\)"$/\1/'`
@@ -33,8 +34,6 @@ rm -rf `find $T/$REL -name CVS -o -name tmp` $T/$REL/{misc,rfc,doc/slides,doc/sl
 rm -rf $T/$REL $T/$DREL
 echo -n "OK? "
 read OK
-echo Uploading to Atrey...
-scp $T/$REL.tar.gz $T/$DREL.tar.gz atrey.karlin.mff.cuni.cz:~ftp/pub/bird/
 echo Uploading to Trubka...
 scp $T/$REL.tar.gz $T/$DREL.tar.gz bird.network.cz:~ftp/pub/bird/
 echo Done.
diff --git a/tools/linuxdoc b/tools/linuxdoc
index 51110e79..58f5cbc4 100755
--- a/tools/linuxdoc
+++ b/tools/linuxdoc
@@ -25,8 +25,13 @@ use FindBin;
 $prefix             = "/usr";
 $isoentities_prefix = "/usr";
 $DataDir            = "$FindBin::Bin/../doc/sbase";
-$AuxBinDir          = "/usr/lib/linuxdoc-tools";
-
+if (-d "/usr/lib/linuxdoc-tools")
+{
+  $AuxBinDir          = "/usr/lib/linuxdoc-tools";
+} else
+{
+  $AuxBinDir          = "/usr/bin";
+}
 use lib "$FindBin::Bin/linuxdoc-tools";
 
 # ---------------------------------------------------------------------

From 1b9189d5fdab672f91600b7e72a1deeab277eafc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 9 Mar 2022 12:30:05 +0100
Subject: [PATCH 105/431] Route validity check converted to generic macro
 dispatch

---
 nest/route.h      |  5 ++++-
 nest/rt-table.c   | 27 ++++++++++++---------------
 proto/bgp/attrs.c |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index ade14857..4944a854 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -259,7 +259,10 @@ struct rte_storage {
 #define REF_MODIFY	16		/* Route is scheduled for modify */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
-static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
+static inline int rte_is_valid_rte(rte *r) { return r && !(r->flags & REF_FILTERED); }
+static inline int rte_is_valid_storage(struct rte_storage *r) { return r && rte_is_valid_rte(&r->rte); }
+
+#define rte_is_valid(r)		_Generic((*r), rte: rte_is_valid_rte, struct rte_storage: rte_is_valid_storage)(r)
 
 /* Route just has REF_FILTERED flag */
 static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ee69d7c4..c49400b7 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -170,7 +170,7 @@ net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
       net_addr_roa4 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa4(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
+      if (net_equal_prefix_roa4(roa, &n) && rte_is_valid(r->routes))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -202,7 +202,7 @@ net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
       net_addr_roa6 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa6(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
+      if (net_equal_prefix_roa6(roa, &n) && rte_is_valid(r->routes))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -543,7 +543,7 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
     old_best = old_changed;
   else
   {
-    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
+    for (struct rte_storage *r = net->routes; rte_is_valid(r); r = r->next)
     {
       if (bmap_test(&c->export_map, r->rte.id))
       {
@@ -561,7 +561,7 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
   if ((new_changed == old_changed) || (old_best == old_changed))
   {
     /* Feed or old_best changed -> find first accepted by filters */
-    for (struct rte_storage *r = net->routes; r && rte_is_valid(&r->rte); r = r->next)
+    for (struct rte_storage *r = net->routes; rte_is_valid(r); r = r->next)
       if (new_best = export_filter(c, ((nb0 = r->rte), &nb0), 0))
 	break;
   }
@@ -596,7 +596,7 @@ rt_export_merged(struct channel *c, net *net, linpool *pool, int silent)
   struct rte_storage *best0 = net->routes;
   rte *best;
 
-  if (!best0 || !rte_is_valid(&best0->rte))
+  if (!rte_is_valid(best0))
     return NULL;
 
   best = export_filter_(c, ((rme = best0->rte), &rme), pool, silent);
@@ -714,16 +714,16 @@ static void
 rte_announce(rtable *tab, uint type, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
-  if (!new || !rte_is_valid(&new->rte))
+  if (!rte_is_valid(new))
     new = NULL;
 
-  if (!old || !rte_is_valid(&old->rte))
+  if (!rte_is_valid(old))
     old = NULL;
 
-  if (!new_best || !rte_is_valid(&new_best->rte))
+  if (!rte_is_valid(new_best))
     new_best = NULL;
 
-  if (!old_best || !rte_is_valid(&old_best->rte))
+  if (!rte_is_valid(old_best))
     old_best = NULL;
 
   if (!new && !old && !new_best && !old_best)
@@ -1246,14 +1246,11 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
 {
   net *n = net_find(t, a);
 
-  if (!n || !n->routes)
+  if (!n || !rte_is_valid(n->routes))
     return 0;
 
   rte rt = n->routes->rte;
 
-  if (!rte_is_valid(&rt))
-    return 0;
-
   rte_update_lock();
 
   /* Rest is stripped down export_filter() */
@@ -2151,7 +2148,7 @@ rt_feed_channel(struct channel *c)
       if ((c->ra_mode == RA_OPTIMAL) ||
 	  (c->ra_mode == RA_ACCEPTED) ||
 	  (c->ra_mode == RA_MERGED))
-	if (e && rte_is_valid(&e->rte))
+	if (rte_is_valid(e))
 	  {
 	    /* In the meantime, the protocol may fell down */
 	    if (c->export_state != ES_FEEDING)
@@ -2168,7 +2165,7 @@ rt_feed_channel(struct channel *c)
 	    if (c->export_state != ES_FEEDING)
 	      goto done;
 
-	    if (!rte_is_valid(&e->rte))
+	    if (!rte_is_valid(e))
 	      continue;
 
 	    do_feed_channel(c, n, &e->rte);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 90490b4f..1d9b3630 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2212,7 +2212,7 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 
   /* The default case - find a new best-in-group route */
   rte *r = new; /* new may not be in the list */
-  for (struct rte_storage *s = net->routes; rte_is_valid(&s->rte); s = s->next)
+  for (struct rte_storage *s = net->routes; rte_is_valid(s); s = s->next)
     if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
     {
       s->rte.pflags |= BGP_REF_SUPPRESSED;
@@ -2229,7 +2229,7 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     new->pflags &= ~BGP_REF_SUPPRESSED;
 
   /* Found all existing routes mergable with best-in-group */
-  for (struct rte_storage *s = net->routes; rte_is_valid(&s->rte); s = s->next)
+  for (struct rte_storage *s = net->routes; rte_is_valid(s); s = s->next)
     if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
       if ((&s->rte != r) && bgp_rte_mergable(r, &s->rte))
 	s->rte.pflags &= ~BGP_REF_SUPPRESSED;

From 36f5fea31a61d9067d81ffb1620fdf174f47d5e4 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 9 Mar 2022 13:27:49 +0100
Subject: [PATCH 106/431] Fixed a static assert in page allocator

---
 sysdep/unix/alloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 755b5fa5..edad6209 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -26,7 +26,7 @@ long page_size = 0;
 #define KEEP_PAGES_MAIN_MIN	8
 #define CLEANUP_PAGES_BULK	256
 
-_Static_assert(KEEP_PAGES_MAIN_MIN * 4 < KEEP_PAGES_MAIN_MAX);
+STATIC_ASSERT(KEEP_PAGES_MAIN_MIN * 4 < KEEP_PAGES_MAIN_MAX);
 
 static _Bool use_fake = 0;
 

From d4bcef0e0bfee911d403c0cf830de3e3007eeb38 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 25 Mar 2022 19:15:11 +0100
Subject: [PATCH 107/431] Filter operations: bitwise AND and OR

---
 conf/cf-lex.l    |  2 +-
 conf/confbase.Y  |  1 +
 filter/config.Y  |  2 ++
 filter/f-inst.c  | 10 ++++++++++
 filter/test.conf |  8 ++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index c9d2f5a5..b9457a83 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -347,7 +347,7 @@ else: {
   return DDOT;
 }
 
-[={}:;,.()+*/%<>~\[\]?!\|-] {
+[={}:;,.()+*/%<>~\[\]?!\|&-] {
   return yytext[0];
 }
 
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 6985783b..753df325 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -120,6 +120,7 @@ CF_DECLS
 %nonassoc PREFIX_DUMMY
 %left AND OR
 %nonassoc '=' '<' '>' '~' GEQ LEQ NEQ NMA PO PC
+%left '|' '&'
 %left '+' '-'
 %left '*' '/' '%'
 %left '!'
diff --git a/filter/config.Y b/filter/config.Y
index 46ba7769..dabe4781 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -780,6 +780,8 @@ term:
  | term '-' term	{ $$ = f_new_inst(FI_SUBTRACT, $1, $3); }
  | term '*' term	{ $$ = f_new_inst(FI_MULTIPLY, $1, $3); }
  | term '/' term	{ $$ = f_new_inst(FI_DIVIDE, $1, $3); }
+ | term '&' term	{ $$ = f_new_inst(FI_BITAND, $1, $3); }
+ | term '|' term	{ $$ = f_new_inst(FI_BITOR, $1, $3); }
  | term AND term	{ $$ = f_new_inst(FI_AND, $1, $3); }
  | term OR  term	{ $$ = f_new_inst(FI_OR, $1, $3); }
  | term '=' term	{ $$ = f_new_inst(FI_EQ, $1, $3); }
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 8e20dc74..0050c237 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -240,6 +240,16 @@
     if (v2.val.i == 0) runtime( "Mother told me not to divide by 0" );
     RESULT(T_INT, i, v1.val.i / v2.val.i);
   }
+  INST(FI_BITOR, 2, 1) {
+    ARG(1,T_INT);
+    ARG(2,T_INT);
+    RESULT(T_INT, i, v1.val.i | v2.val.i);
+  }
+  INST(FI_BITAND, 2, 1) {
+    ARG(1,T_INT);
+    ARG(2,T_INT);
+    RESULT(T_INT, i, v1.val.i & v2.val.i);
+  }
   INST(FI_AND, 1, 1) {
     ARG(1,T_BOOL);
     ARG_TYPE_STATIC(2,T_BOOL);
diff --git a/filter/test.conf b/filter/test.conf
index 2a5a2d98..1058d34e 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -111,6 +111,14 @@ int i;
 	bt_assert(!(i = 4));
 	bt_assert(1 <= 1);
 	bt_assert(!(1234 < 1234));
+
+	bt_assert(10 - 5 = 5);
+	bt_assert(4294967295 + 1 = 0);
+	bt_assert(6*9=54);
+	bt_assert(984/41 = 24);
+	bt_assert(123/45 = 2);
+	bt_assert(0xfee1a | 0xbeef = 0xffeff);
+	bt_assert(0xfee1a & 0xbeef = 0xae0a);
 }
 
 bt_test_suite(t_int, "Testing integers");

From bc17fee1bfdbd330f5a4377bf40f6de0681afa5c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 25 Mar 2022 19:51:35 +0100
Subject: [PATCH 108/431] Filter: Bitfield eattrs reading / writing moved to
 filter code

Before this change, fetch-update-write and bitmasking was hardcoded in
attribute access code cased by the attribute type. Several filter
instructions are used to do it instead.

As this is certainly going to be a little bit slower than before, the
switch block in attribute access code should be completely removed in
near future, helping with both performance and code cleanliness.

The user interface should have stayed intact.
---
 filter/config.Y        | 14 +++++++++++++-
 filter/f-inst.c        | 16 ----------------
 filter/f-inst.h        |  4 ++--
 filter/test.conf       |  4 ++++
 nest/route.h           |  1 -
 nest/rt-attr.c         |  3 ---
 sysdep/linux/netlink.Y | 24 ++++++++++++------------
 sysdep/linux/netlink.c |  2 +-
 8 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index dabe4781..67bd04b4 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -308,7 +308,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 
 %type <xp> cmds_int cmd_prep
 %type <x> term block cmd cmds constant constructor print_list var_list function_call symbol_value bgp_path_expr bgp_path bgp_path_tail
-%type <fda> dynamic_attr
+%type <fda> dynamic_attr attr_bit
 %type <fsa> static_attr
 %type <f> filter where_filter
 %type <fl> filter_body function_body
@@ -802,6 +802,10 @@ term:
  | static_attr { $$ = f_new_inst(FI_RTA_GET, $1); }
 
  | dynamic_attr { $$ = f_new_inst(FI_EA_GET, $1); }
+ | attr_bit {
+    struct f_inst *c = f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)});
+    $$ = f_new_inst(FI_EQ, c, f_new_inst(FI_BITAND, f_new_inst(FI_EA_GET, $1), c));
+  }
 
  | term '.' IS_V4 { $$ = f_new_inst(FI_IS_V4, $1); }
  | term '.' TYPE { $$ = f_new_inst(FI_TYPE, $1); }
@@ -899,6 +903,14 @@ cmd:
  | UNSET '(' dynamic_attr ')' ';' {
      $$ = f_new_inst(FI_EA_UNSET, $3);
    }
+ | attr_bit '=' term ';' {
+     $$ = f_new_inst(FI_CONDITION, $3,
+	f_generate_complex(FI_BITOR, $1,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)})),
+	f_generate_complex(FI_BITAND, $1,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}))
+     );
+   }
  | break_command print_list ';' {
     struct f_inst *breaker = f_new_inst(FI_DIE, $1);
     if ($2) {
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 0050c237..8bfec479 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -712,9 +712,6 @@
       case EAF_TYPE_AS_PATH:
 	RESULT_(T_PATH, ad, e->u.ptr);
 	break;
-      case EAF_TYPE_BITFIELD:
-	RESULT_(T_BOOL, i, !!(e->u.data & (1u << da.bit)));
-	break;
       case EAF_TYPE_INT_SET:
 	RESULT_(T_CLIST, ad, e->u.ptr);
 	break;
@@ -774,19 +771,6 @@
 	l->attrs[0].u.ptr = v1.val.ad;
 	break;
 
-      case EAF_TYPE_BITFIELD:
-	{
-	  /* First, we have to find the old value */
-	  eattr *e = ea_find(*fs->eattrs, da.ea_code);
-	  u32 data = e ? e->u.data : 0;
-
-	  if (v1.val.i)
-	    l->attrs[0].u.data = data | (1u << da.bit);
-	  else
-	    l->attrs[0].u.data = data & ~(1u << da.bit);
-	}
-	break;
-
       default:
 	bug("Unknown dynamic attribute type");
       }
diff --git a/filter/f-inst.h b/filter/f-inst.h
index df45f88e..9265ecec 100644
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -89,8 +89,8 @@ void f_add_lines(const struct f_line_item *what, struct filter_iterator *fit);
 struct filter *f_new_where(struct f_inst *);
 static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, enum f_type f_type, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
 { return (struct f_dynamic_attr) { .type = type, .f_type = f_type, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
-static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, enum f_type f_type, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
-{ return (struct f_dynamic_attr) { .type = EAF_TYPE_BITFIELD, .bit = bit, .f_type = f_type, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
+static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
+{ return (struct f_dynamic_attr) { .type = EAF_TYPE_INT, .bit = bit, .f_type = T_INT, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
 static inline struct f_static_attr f_new_static_attr(int f_type, int code, int readonly)
 { return (struct f_static_attr) { .f_type = f_type, .sa_code = code, .readonly = readonly }; }
 struct f_inst *f_generate_complex(enum f_instruction_code fi_code, struct f_dynamic_attr da, struct f_inst *argument);
diff --git a/filter/test.conf b/filter/test.conf
index 1058d34e..ee2f5be4 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -1342,6 +1342,10 @@ int j;
 	rip_metric = 14;
 	unset(rip_metric);
 
+#	krt_lock_mtu = false;
+#	krt_lock_window = true;
+#	krt_lock_rtt = krt_lock_rttvar && krt_lock_sstresh || krt_lock_cwnd;
+
 	accept "ok I take that";
 }
 
diff --git a/nest/route.h b/nest/route.h
index 80c53ba6..a4af0edc 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -536,7 +536,6 @@ const char *ea_custom_name(uint ea);
 #define EAF_TYPE_IP_ADDRESS 0x04	/* IP address */
 #define EAF_TYPE_ROUTER_ID 0x05		/* Router ID (IPv4 address) */
 #define EAF_TYPE_AS_PATH 0x06		/* BGP AS path (encoding per RFC 1771:4.3) */
-#define EAF_TYPE_BITFIELD 0x09		/* 32-bit embedded bitfield */
 #define EAF_TYPE_INT_SET 0x0a		/* Set of u32's (e.g., a community list) */
 #define EAF_TYPE_EC_SET 0x0e		/* Set of pairs of u32's - ext. community list */
 #define EAF_TYPE_LC_SET 0x12		/* Set of triplets of u32's - large community list */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 22b45db9..abda5d82 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -965,9 +965,6 @@ ea_show(struct cli *c, const eattr *e)
 	case EAF_TYPE_AS_PATH:
 	  as_path_format(ad, pos, end - pos);
 	  break;
-	case EAF_TYPE_BITFIELD:
-	  bsprintf(pos, "%08x", e->u.data);
-	  break;
 	case EAF_TYPE_INT_SET:
 	  ea_show_int_set(c, ad, 1, pos, buf, end);
 	  return;
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 487ad1d8..7390be73 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -48,19 +48,19 @@ dynamic_attr: KRT_QUICKACK	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT
 
 /* Bits of EA_KRT_LOCK, based on RTAX_* constants */
 
-dynamic_attr: KRT_LOCK_MTU	{ $$ = f_new_dynamic_attr_bit(2, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_WINDOW	{ $$ = f_new_dynamic_attr_bit(3, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_RTT	{ $$ = f_new_dynamic_attr_bit(4, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_RTTVAR	{ $$ = f_new_dynamic_attr_bit(5, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_SSTRESH	{ $$ = f_new_dynamic_attr_bit(6, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_CWND	{ $$ = f_new_dynamic_attr_bit(7, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_ADVMSS	{ $$ = f_new_dynamic_attr_bit(8, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_REORDERING { $$ = f_new_dynamic_attr_bit(9, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_HOPLIMIT { $$ = f_new_dynamic_attr_bit(10, T_BOOL, EA_KRT_LOCK); } ;
-dynamic_attr: KRT_LOCK_RTO_MIN { $$ = f_new_dynamic_attr_bit(13, T_BOOL, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_MTU	{ $$ = f_new_dynamic_attr_bit(2, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_WINDOW	{ $$ = f_new_dynamic_attr_bit(3, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_RTT	{ $$ = f_new_dynamic_attr_bit(4, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_RTTVAR	{ $$ = f_new_dynamic_attr_bit(5, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_SSTRESH	{ $$ = f_new_dynamic_attr_bit(6, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_CWND	{ $$ = f_new_dynamic_attr_bit(7, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_ADVMSS	{ $$ = f_new_dynamic_attr_bit(8, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_REORDERING { $$ = f_new_dynamic_attr_bit(9, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_HOPLIMIT { $$ = f_new_dynamic_attr_bit(10, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_RTO_MIN { $$ = f_new_dynamic_attr_bit(13, EA_KRT_LOCK); } ;
 
-dynamic_attr: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, T_BOOL, EA_KRT_FEATURES); } ;
-dynamic_attr: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr(3, T_BOOL, EA_KRT_FEATURES); } ;
+attr_bit: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, EA_KRT_FEATURES); } ;
+attr_bit: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr_bit(3, EA_KRT_FEATURES); } ;
 
 
 CF_CODE
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index e103c8ef..6c8228fd 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1928,7 +1928,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	  {
 	    ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
 	    ea->attrs[n].flags = 0;
-	    ea->attrs[n].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */
+	    ea->attrs[n].type = EAF_TYPE_INT;
 	    ea->attrs[n].u.data = metrics[t];
 	    n++;
 	  }

From e261b325113a63410bc30287c135bf162480c3b2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Apr 2022 12:06:17 +0200
Subject: [PATCH 109/431] Dropping EAF_VAR_LENGTH as the attribute data is
 either embedded or adata

---
 nest/route.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index a4af0edc..7557bf93 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -538,10 +538,10 @@ const char *ea_custom_name(uint ea);
 #define EAF_TYPE_AS_PATH 0x06		/* BGP AS path (encoding per RFC 1771:4.3) */
 #define EAF_TYPE_INT_SET 0x0a		/* Set of u32's (e.g., a community list) */
 #define EAF_TYPE_EC_SET 0x0e		/* Set of pairs of u32's - ext. community list */
-#define EAF_TYPE_LC_SET 0x12		/* Set of triplets of u32's - large community list */
-#define EAF_TYPE_IFACE 0x16		/* Interface pointer stored in adata */
+#define EAF_TYPE_LC_SET 0x08		/* Set of triplets of u32's - large community list */
+#define EAF_TYPE_IFACE 0x0c		/* Interface pointer stored in adata */
 #define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
-#define EAF_VAR_LENGTH 0x02		/* Attribute length is variable (part of type spec) */
+					/* Otherwise, attribute data is adata */
 
 typedef struct adata {
   uint length;				/* Length of data */

From 22f95d9889f07d868ffaec40ab43fd8dd9b0bb31 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 26 Mar 2022 12:37:41 +0100
Subject: [PATCH 110/431] Special attribute types for enums

---
 filter/config.Y     | 2 +-
 filter/f-inst.c     | 2 +-
 nest/route.h        | 3 +++
 nest/rt-attr.c      | 7 +++++--
 proto/bgp/attrs.c   | 2 +-
 proto/bgp/config.Y  | 2 +-
 proto/radv/config.Y | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index 67bd04b4..fb331c16 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -165,7 +165,7 @@ f_generate_empty(struct f_dynamic_attr dyn)
 {
   struct f_val empty;
 
-  switch (dyn.type & EAF_TYPE_MASK) {
+  switch (dyn.type) {
     case EAF_TYPE_AS_PATH:
       empty = f_const_empty_path;
       break;
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 8bfec479..11ca1e28 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -696,7 +696,7 @@
 	break;
       }
 
-      switch (e->type & EAF_TYPE_MASK) {
+      switch (e->type) {
       case EAF_TYPE_INT:
 	RESULT_(da.f_type, i, e->u.data);
 	break;
diff --git a/nest/route.h b/nest/route.h
index 7557bf93..d2f60f41 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -540,6 +540,9 @@ const char *ea_custom_name(uint ea);
 #define EAF_TYPE_EC_SET 0x0e		/* Set of pairs of u32's - ext. community list */
 #define EAF_TYPE_LC_SET 0x08		/* Set of triplets of u32's - large community list */
 #define EAF_TYPE_IFACE 0x0c		/* Interface pointer stored in adata */
+#define EAF_TYPE_BGP_ORIGIN 0x11	/* BGP Origin enum */
+#define EAF_TYPE_RA_PREFERENCE 0x13	/* RA Preference enum */
+
 #define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
 					/* Otherwise, attribute data is adata */
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index abda5d82..25548dca 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -948,7 +948,7 @@ ea_show(struct cli *c, const eattr *e)
       if (e->undef)
 	bsprintf(pos, "undefined");
       else
-      switch (e->type & EAF_TYPE_MASK)
+      switch (e->type)
 	{
 	case EAF_TYPE_INT:
 	  bsprintf(pos, "%u", e->u.data);
@@ -1008,7 +1008,10 @@ ea_dump(ea_list *e)
 	{
 	  eattr *a = &e->attrs[i];
 	  debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags);
-	  debug("=%c", "?iO?I?P???S?????" [a->type & EAF_TYPE_MASK]);
+	  debug("=%c",
+	      "?iO?IRP???S??pE?"
+	      "??L???N?????????"
+	      "?o???r??????????" [a->type]);
 	  if (a->originated)
 	    debug("o");
 	  if (a->type & EAF_EMBEDDED)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index a7c49be5..b514f1b9 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -987,7 +987,7 @@ bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data,
 static const struct bgp_attr_desc bgp_attr_table[] = {
   [BA_ORIGIN] = {
     .name = "origin",
-    .type = EAF_TYPE_INT,
+    .type = EAF_TYPE_BGP_ORIGIN,
     .flags = BAF_TRANSITIVE,
     .export = bgp_export_origin,
     .encode = bgp_encode_u8,
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 241aa7c2..04920941 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -318,7 +318,7 @@ bgp_proto_channel: bgp_channel_start bgp_channel_opt_list bgp_channel_end;
 
 
 dynamic_attr: BGP_ORIGIN
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
+	{ $$ = f_new_dynamic_attr(EAF_TYPE_BGP_ORIGIN, T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
 dynamic_attr: BGP_PATH
 	{ $$ = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
 dynamic_attr: BGP_NEXT_HOP
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index 8d4a3ab9..f16b897d 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -336,7 +336,7 @@ radv_sensitive:
  | SENSITIVE bool { $$ = $2; }
  ;
 
-dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
+dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(EAF_TYPE_RA_PREFERENCE, T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
 dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RA_LIFETIME); } ;
 
 CF_CODE

From 58f59d5d9dc11dcc5513ed1fdfcb12c1730b4a19 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 26 Mar 2022 15:05:03 +0100
Subject: [PATCH 111/431] Filters: removing adata_empty() duplicating
 lp_alloc_adata()

---
 filter/data.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/filter/data.c b/filter/data.c
index c3f8bf57..feb8c8bb 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -93,14 +93,6 @@ const struct f_val f_const_empty_path = {
   .val.ad = &null_adata,
 };
 
-static struct adata *
-adata_empty(struct linpool *pool, int l)
-{
-  struct adata *res = lp_alloc(pool, sizeof(struct adata) + l);
-  res->length = l;
-  return res;
-}
-
 static void
 pm_format(const struct f_path_mask *p, buffer *buf)
 {
@@ -423,7 +415,7 @@ clist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }
@@ -457,7 +449,7 @@ eclist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }
@@ -489,7 +481,7 @@ lclist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }

From 0b871c170472202770691af8995766ee57920fdc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 31 Mar 2022 19:29:17 +0200
Subject: [PATCH 112/431] Moved filter value union to lib

---
 filter/data.h | 15 +--------------
 lib/attrs.h   | 20 +++++++++++++++++++-
 lib/route.h   | 21 ++-------------------
 lib/type.h    | 19 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/filter/data.h b/filter/data.h
index 0b1e8e57..9ffa1b61 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -16,20 +16,7 @@
 /* Filter value; size of this affects filter memory consumption */
 struct f_val {
   btype type;	/* T_*  */
-  union {
-    union bval bval;
-    BVAL_ITEMS;
-
-    u64 ec;
-    lcomm lc;
-    ip_addr ip;
-    const net_addr *net;
-    const char *s;
-    const struct f_tree *t;
-    const struct f_trie *ti;
-    const struct f_path_mask *path_mask;
-    struct f_path_mask_item pmi;
-  } val;
+  union bval_long val;
 };
 
 #define fputip(a)   ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
diff --git a/lib/attrs.h b/lib/attrs.h
index e0595846..97a9630f 100644
--- a/lib/attrs.h
+++ b/lib/attrs.h
@@ -11,7 +11,25 @@
 
 #include <stdint.h>
 #include "lib/unaligned.h"
-#include "lib/route.h"
+
+typedef struct adata {
+  uint length;				/* Length of data */
+  byte data[0];
+} adata;
+
+extern const adata null_adata;		/* adata of length 0 */
+
+static inline struct adata *
+lp_alloc_adata(struct linpool *pool, uint len)
+{
+  struct adata *ad = lp_alloc(pool, sizeof(struct adata) + len);
+  ad->length = len;
+  return ad;
+}
+
+static inline int adata_same(const struct adata *a, const struct adata *b)
+{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
+
 
 
 /* a-path.c */
diff --git a/lib/route.h b/lib/route.h
index 47355abc..8e60f749 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -10,6 +10,8 @@
 #ifndef _BIRD_LIB_ROUTE_H_
 #define _BIRD_LIB_ROUTE_H_
 
+#include "lib/type.h"
+
 struct network;
 struct proto;
 struct cli;
@@ -163,25 +165,6 @@ const char *ea_custom_name(uint ea);
 #define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
 #define EA_BIT_GET(ea) ((ea) >> 24)
 
-typedef struct adata {
-  uint length;				/* Length of data */
-  byte data[0];
-} adata;
-
-extern const adata null_adata;		/* adata of length 0 */
-
-static inline struct adata *
-lp_alloc_adata(struct linpool *pool, uint len)
-{
-  struct adata *ad = lp_alloc(pool, sizeof(struct adata) + len);
-  ad->length = len;
-  return ad;
-}
-
-static inline int adata_same(const struct adata *a, const struct adata *b)
-{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
-
-
 typedef struct ea_list {
   struct ea_list *next;			/* In case we have an override list */
   byte flags;				/* Flags: EALF_... */
diff --git a/lib/type.h b/lib/type.h
index d0a887d8..6d19a250 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -10,6 +10,7 @@
 #define _BIRD_TYPE_H_
 
 #include "lib/birdlib.h"
+#include "lib/attrs.h"
 
 union bval {
 #define BVAL_ITEMS	\
@@ -18,9 +19,25 @@ union bval {
   const struct adata *ptr;	/* Generic attribute data inherited from eattrs */	\
   const struct adata *ad;     	/* Generic attribute data inherited from filters */	\
 
-  BVAL_ITEMS
+  BVAL_ITEMS;
 };
 
+union bval_long {
+  union bval bval;		/* For direct assignments */
+  BVAL_ITEMS;			/* For item-wise access */
+
+  u64 ec;
+  lcomm lc;
+  ip_addr ip;
+  const net_addr *net;
+  const char *s;
+  const struct f_tree *t;
+  const struct f_trie *ti;
+  const struct f_path_mask *path_mask;
+  struct f_path_mask_item pmi;
+};
+
+
 /* Internal types */
 enum btype {
 /* Nothing. Simply nothing. */

From c1194ab7edbb17cb7371ac38e6eab5ae3ae72163 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 10 Apr 2022 19:31:50 +0200
Subject: [PATCH 113/431] Protocols use EA_LITERAL_* to set attributes

---
 lib/route.h         | 11 ++++++++---
 proto/babel/babel.c | 36 +++++++++++++-----------------------
 proto/bgp/attrs.c   |  7 +++----
 proto/ospf/rt.c     | 40 +++++++++++++++++-----------------------
 proto/rip/rip.c     | 24 ++++++------------------
 5 files changed, 47 insertions(+), 71 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 49810887..431da4d8 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -225,9 +225,14 @@ struct ea_one_attr_list {
     EA_LITERAL_GENERIC(_id, _type, _flags, .u.i = _val); \
     })
 
-#define EA_LITERAL_ADATA(_id, _type, _flags, _buf, _len) ({ \
+#define EA_LITERAL_STORE_ADATA(_id, _type, _flags, _buf, _len) ({ \
     ASSERT_DIE(!(_type & EAF_EMBEDDED)); \
-    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = tmp_store_adata(_buf, _len)); \
+    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = tmp_store_adata((_buf), (_len))); \
+    })
+
+#define EA_LITERAL_DIRECT_ADATA(_id, _type, _flags, _adata) ({ \
+    ASSERT_DIE(!(_type & EAF_EMBEDDED)); \
+    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = _adata); \
     })
 
 #define EA_LITERAL_GENERIC(_id, _type, _flags, ...) \
@@ -261,7 +266,7 @@ ea_set_attr_u32(ea_list **to, uint id, uint flags, uint type, u32 data)
 
 static inline void
 ea_set_attr_data(ea_list **to, uint id, uint flags, uint type, void *data, uint len)
-{ ea_set_attr(to, EA_LITERAL_ADATA(id, type, flags, data, len)); }
+{ ea_set_attr(to, EA_LITERAL_STORE_ADATA(id, type, flags, data, len)); }
 
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index a6cc7aa3..db710a0d 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -640,6 +640,18 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
 
   if (r)
   {
+    struct {
+      ea_list l;
+      eattr a[3];
+    } eattrs = {
+      .l.count = 3,
+      .a = {
+	EA_LITERAL_EMBEDDED(EA_BABEL_METRIC, T_INT, 0, r->metric),
+	EA_LITERAL_STORE_ADATA(EA_BABEL_ROUTER_ID, T_OPAQUE, 0, &r->router_id, sizeof(r->router_id)),
+	EA_LITERAL_EMBEDDED(EA_BABEL_SEQNO, T_INT, 0, r->seqno),
+      }
+    };
+
     rta a0 = {
       .source = RTS_BABEL,
       .scope = SCOPE_UNIVERSE,
@@ -648,29 +660,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       .from = r->neigh->addr,
       .nh.gw = r->next_hop,
       .nh.iface = r->neigh->ifa->iface,
-      .eattrs = alloca(sizeof(ea_list) + 3*sizeof(eattr)),
-    };
-
-    *a0.eattrs = (ea_list) { .count = 3 };
-    a0.eattrs->attrs[0] = (eattr) {
-      .id = EA_BABEL_METRIC,
-      .type = T_INT,
-      .u.data = r->metric,
-    };
-
-    struct adata *ad = alloca(sizeof(struct adata) + sizeof(u64));
-    ad->length = sizeof(u64);
-    memcpy(ad->data, &(r->router_id), sizeof(u64));
-    a0.eattrs->attrs[1] = (eattr) {
-      .id = EA_BABEL_ROUTER_ID,
-      .type = T_OPAQUE,
-      .u.ptr = ad,
-    };
-
-    a0.eattrs->attrs[2] = (eattr) {
-      .id = EA_BABEL_SEQNO,
-      .type = T_INT,
-      .u.data = r->seqno,
+      .eattrs = &eattrs.l,
     };
 
     /*
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index a7b6d0cd..4c67b161 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -94,13 +94,12 @@ void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
 void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad)
 {
   ASSERT(bgp_attr_known(code));
-  ASSERT_DIE(!(bgp_attr_table[code].type & EAF_EMBEDDED));
 
-  ea_set_attr(to, EA_LITERAL_GENERIC(
+  ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
 	EA_CODE(PROTOCOL_BGP, code),
 	bgp_attr_table[code].type,
 	flags & ~BAF_EXT_LEN,
-	.u.ad = ad
+	ad
 	));
 }
 
@@ -109,7 +108,7 @@ bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len)
 {
   ASSERT(bgp_attr_known(code));
 
-  ea_set_attr(to, EA_LITERAL_ADATA(
+  ea_set_attr(to, EA_LITERAL_STORE_ADATA(
 	EA_CODE(PROTOCOL_BGP, code),
 	bgp_attr_table[code].type,
 	flags & ~BAF_EXT_LEN,
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 8643f456..5969b7c7 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2062,39 +2062,33 @@ again1:
 
       if (reload || ort_changed(nf, &a0))
       {
-	a0.eattrs = alloca(sizeof(ea_list) + 4 * sizeof(eattr));
-	memset(a0.eattrs, 0, sizeof(ea_list));
-
 	nf->old_metric1 = nf->n.metric1;
 	nf->old_metric2 = nf->n.metric2;
 	nf->old_tag = nf->n.tag;
 	nf->old_rid = nf->n.rid;
 
-	a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
-	  .id = EA_OSPF_METRIC1,
-	  .type = T_INT,
-	  .u.data = nf->n.metric1,
-	};
+	struct {
+	  ea_list l;
+	  eattr a[4];
+	} eattrs;
+
+	eattrs.l = (ea_list) {};
+
+	eattrs.a[eattrs.l.count++] =
+	  EA_LITERAL_EMBEDDED(EA_OSPF_METRIC1, T_INT, 0, nf->n.metric1);
 
 	if (nf->n.type == RTS_OSPF_EXT2)
-	  a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
-	    .id = EA_OSPF_METRIC2,
-	    .type = T_INT,
-	    .u.data = nf->n.metric2,
-	  };
+	  eattrs.a[eattrs.l.count++] =
+	    EA_LITERAL_EMBEDDED(EA_OSPF_METRIC2, T_INT, 0, nf->n.metric2);
 
 	if ((nf->n.type == RTS_OSPF_EXT1) || (nf->n.type == RTS_OSPF_EXT2))
-	  a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
-	    .id = EA_OSPF_TAG,
-	    .type = T_INT,
-	    .u.data = nf->n.tag,
-	  };
+	  eattrs.a[eattrs.l.count++] =
+	    EA_LITERAL_EMBEDDED(EA_OSPF_TAG, T_INT, 0, nf->n.tag);
 
-	a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
-	  .id = EA_OSPF_ROUTER_ID,
-	  .type = T_QUAD,
-	  .u.data = nf->n.rid,
-	};
+	eattrs.a[eattrs.l.count++] =
+	  EA_LITERAL_EMBEDDED(EA_OSPF_ROUTER_ID, T_QUAD, 0, nf->n.rid);
+
+	a0.eattrs = &eattrs.l;
 
 	rta *a = rta_lookup(&a0);
 	rte *e = rte_get_temp(a, p->p.main_source);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index fa5b1289..2b5babcb 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -195,26 +195,14 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 
     struct {
       ea_list l;
-      eattr e[3];
+      eattr a[3];
       struct rip_iface_adata riad;
     } ea_block = {
-      .l = { .count = 3, },
-      .e = {
-	{
-	  .id = EA_RIP_METRIC,
-	  .type = T_INT,
-	  .u.data = rt_metric,
-	},
-	{
-	  .id = EA_RIP_TAG,
-	  .type = T_INT,
-	  .u.data = rt_tag,
-	},
-	{
-	  .id = EA_RIP_FROM,
-	  .type = T_IFACE,
-	  .u.ptr = &ea_block.riad.ad,
-	}
+      .l.count = 3,
+      .a = {
+	EA_LITERAL_EMBEDDED(EA_RIP_METRIC, T_INT, 0, rt_metric),
+	EA_LITERAL_EMBEDDED(EA_RIP_TAG, T_INT, 0, rt_tag),
+	EA_LITERAL_DIRECT_ADATA(EA_RIP_FROM, T_IFACE, 0, &ea_block.riad.ad),
       },
       .riad = {
 	.ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },

From cd9550b24487ac7327b0234fd825f4214fdf7b16 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 19 Mar 2022 16:38:32 +0100
Subject: [PATCH 114/431] Implicit ROA check converted to explicit filter
 instruction sequence

---
 filter/config.Y | 19 +++++++++++++++++--
 filter/f-inst.c | 32 +-------------------------------
 nest/proto.c    | 10 ++--------
 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index 15b77761..46ba7769 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -185,6 +185,21 @@ f_generate_empty(struct f_dynamic_attr dyn)
   return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, empty), dyn);
 }
 
+#define BA_AS_PATH 0x02
+
+static inline struct f_inst *
+f_implicit_roa_check(struct rtable_config *tab)
+{
+  struct f_dynamic_attr fda = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+
+  struct f_static_attr fsa = f_new_static_attr(T_NET, SA_NET, 1);
+
+  return f_new_inst(FI_ROA_CHECK,
+	    f_new_inst(FI_RTA_GET, fsa),
+	    f_new_inst(FI_AS_PATH_LAST, f_new_inst(FI_EA_GET, fda)),
+	    tab);
+}
+
 /*
  * Remove all new lines and doubled whitespaces
  * and convert all tabulators to spaces
@@ -822,8 +837,8 @@ term:
  | DELETE '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_DEL, $3, $5); }
  | FILTER '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_FILTER, $3, $5); }
 
- | ROA_CHECK '(' rtable ')' { $$ = f_new_inst(FI_ROA_CHECK_IMPLICIT, $3); }
- | ROA_CHECK '(' rtable ',' term ',' term ')' { $$ = f_new_inst(FI_ROA_CHECK_EXPLICIT, $5, $7, $3); }
+ | ROA_CHECK '(' rtable ')' { $$ = f_implicit_roa_check($3); }
+ | ROA_CHECK '(' rtable ',' term ',' term ')' { $$ = f_new_inst(FI_ROA_CHECK, $5, $7, $3); }
 
  | FORMAT '(' term ')' {  $$ = f_new_inst(FI_FORMAT, $3); }
 
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 2c4c97b1..8e20dc74 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -1295,37 +1295,7 @@
       runtime("Can't filter non-[e|l]clist");
   }
 
-  INST(FI_ROA_CHECK_IMPLICIT, 0, 1) {	/* ROA Check */
-    NEVER_CONSTANT;
-    RTC(1);
-    struct rtable *table = rtc->table;
-    ACCESS_RTE;
-    ACCESS_EATTRS;
-    const net_addr *net = (*fs->rte)->net->n.addr;
-
-    /* We ignore temporary attributes, probably not a problem here */
-    /* 0x02 is a value of BA_AS_PATH, we don't want to include BGP headers */
-    eattr *e = ea_find(*fs->eattrs, EA_CODE(PROTOCOL_BGP, 0x02));
-
-    if (!e || ((e->type & EAF_TYPE_MASK) != EAF_TYPE_AS_PATH))
-      runtime("Missing AS_PATH attribute");
-
-    u32 as = 0;
-    as_path_get_last(e->u.ptr, &as);
-
-    if (!table)
-      runtime("Missing ROA table");
-
-    if (table->addr_type != NET_ROA4 && table->addr_type != NET_ROA6)
-      runtime("Table type must be either ROA4 or ROA6");
-
-    if (table->addr_type != (net->type == NET_IP4 ? NET_ROA4 : NET_ROA6))
-      RESULT(T_ENUM_ROA, i, ROA_UNKNOWN); /* Prefix and table type mismatch */
-    else
-      RESULT(T_ENUM_ROA, i, [[ net_roa_check(table, net, as) ]]);
-  }
-
-  INST(FI_ROA_CHECK_EXPLICIT, 2, 1) {	/* ROA Check */
+  INST(FI_ROA_CHECK, 2, 1) {	/* ROA Check */
     NEVER_CONSTANT;
     ARG(1, T_NET);
     ARG(2, T_INT);
diff --git a/nest/proto.c b/nest/proto.c
index 7074f73a..c6bda73b 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -409,14 +409,8 @@ channel_roa_subscribe_filter(struct channel *c, int dir)
   {
     switch (fi->fi_code)
     {
-    case FI_ROA_CHECK_IMPLICIT:
-      tab = fi->i_FI_ROA_CHECK_IMPLICIT.rtc->table;
-      if (valid) channel_roa_subscribe(c, tab, dir);
-      found = 1;
-      break;
-
-    case FI_ROA_CHECK_EXPLICIT:
-      tab = fi->i_FI_ROA_CHECK_EXPLICIT.rtc->table;
+    case FI_ROA_CHECK:
+      tab = fi->i_FI_ROA_CHECK.rtc->table;
       if (valid) channel_roa_subscribe(c, tab, dir);
       found = 1;
       break;

From 80272d4b64a38ee6f04a1c4e8566cac3a2293176 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 26 Mar 2022 12:40:46 +0100
Subject: [PATCH 115/431] Opaque types are named opaque also in filters

---
 filter/data.h      | 4 +++-
 filter/f-inst.c    | 2 +-
 proto/bgp/config.Y | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/filter/data.h b/filter/data.h
index 6d588204..924bbf3e 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -20,6 +20,9 @@ enum f_type {
 /* Nothing. Simply nothing. */
   T_VOID = 0,
 
+/* Something but inaccessible. */
+  T_OPAQUE = 0xee,
+
 /* User visible types, which fit in int */
   T_INT = 0x10,
   T_BOOL = 0x11,
@@ -41,7 +44,6 @@ enum f_type {
   T_ENUM_AF = 0x38,
 
 /* new enums go here */
-  T_ENUM_EMPTY = 0x3f,	/* Special hack for atomic_aggr */
 
 #define T_ENUM T_ENUM_LO ... T_ENUM_HI
 
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 11ca1e28..75a53499 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -704,7 +704,7 @@
 	RESULT_(T_QUAD, i, e->u.data);
 	break;
       case EAF_TYPE_OPAQUE:
-	RESULT_(T_ENUM_EMPTY, i, 0);
+	RESULT_(T_OPAQUE, ad, e->u.ptr);
 	break;
       case EAF_TYPE_IP_ADDRESS:
 	RESULT_(T_IP, ip, *((ip_addr *) e->u.ptr->data));
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 04920941..86124bfb 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -328,9 +328,9 @@ dynamic_attr: BGP_MED
 dynamic_attr: BGP_LOCAL_PREF
 	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
 dynamic_attr: BGP_ATOMIC_AGGR
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_ENUM_EMPTY, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
+	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
 dynamic_attr: BGP_AGGREGATOR
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_ENUM_EMPTY, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
+	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
 dynamic_attr: BGP_COMMUNITY
 	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
 dynamic_attr: BGP_ORIGINATOR_ID
@@ -340,7 +340,7 @@ dynamic_attr: BGP_CLUSTER_LIST
 dynamic_attr: BGP_EXT_COMMUNITY
 	{ $$ = f_new_dynamic_attr(EAF_TYPE_EC_SET, T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
 dynamic_attr: BGP_AIGP
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_ENUM_EMPTY, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
+	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
 dynamic_attr: BGP_LARGE_COMMUNITY
 	{ $$ = f_new_dynamic_attr(EAF_TYPE_LC_SET, T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
 

From 0d0f6554a5c233bf2bf830ae319191c4b1808d49 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 26 Mar 2022 11:56:02 +0100
Subject: [PATCH 116/431] Unified attribute and filter types

This commit removes the EAF_TYPE_* namespace completely and also for
route attributes, filter-based types T_* are used. This simplifies
fetching and setting route attributes from filters.

Also, there is now union bval which serves as an universal value holder
instead of private unions held separately by eattr and filter code.
---
 filter/config.Y             |   25 +-
 filter/data.c               |   20 +-
 filter/data.h               |   84 +-
 filter/decl.m4              |    4 +-
 filter/f-inst.c             |  128 +-
 filter/f-inst.h             |   12 +-
 filter/f-util.c             |   27 +-
 filter/filter.h             |    2 +-
 filter/test.conf            |    6 +-
 lib/type.h                  |   87 ++
 nest/config.Y               |    2 +-
 nest/route.h                |   47 +-
 nest/rt-attr.c              |   23 +-
 proto/babel/babel.c         |    6 +-
 proto/babel/config.Y        |    2 +-
 proto/bgp/attrs.c           |   40 +-
 proto/bgp/bgp.h             |   16 +-
 proto/bgp/config.Y          |   26 +-
 proto/ospf/config.Y         |    8 +-
 proto/ospf/rt.c             |    8 +-
 proto/radv/config.Y         |    4 +-
 proto/rip/config.Y          |    4 +-
 proto/rip/rip.c             |    6 +-
 sysdep/bsd/krt-sock.c       |    2 +-
 sysdep/linux/netlink.Y      |   32 +-
 sysdep/linux/netlink.c      |   12 +-
 sysdep/linux/netlink.c.orig | 2179 -----------------------------------
 sysdep/unix/krt.Y           |    4 +-
 28 files changed, 299 insertions(+), 2517 deletions(-)
 create mode 100644 lib/type.h
 delete mode 100644 sysdep/linux/netlink.c.orig

diff --git a/filter/config.Y b/filter/config.Y
index fb331c16..22981945 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -163,26 +163,11 @@ f_new_lc_item(u32 f1, u32 t1, u32 f2, u32 t2, u32 f3, u32 t3)
 static inline struct f_inst *
 f_generate_empty(struct f_dynamic_attr dyn)
 {
-  struct f_val empty;
+  const struct f_val *empty = f_get_empty(dyn.type);
+  if (!empty)
+    cf_error("Can't empty that attribute");
 
-  switch (dyn.type) {
-    case EAF_TYPE_AS_PATH:
-      empty = f_const_empty_path;
-      break;
-    case EAF_TYPE_INT_SET:
-      empty = f_const_empty_clist;
-      break;
-    case EAF_TYPE_EC_SET:
-      empty = f_const_empty_eclist;
-      break;
-    case EAF_TYPE_LC_SET:
-      empty = f_const_empty_lclist;
-      break;
-    default:
-      cf_error("Can't empty that attribute");
-  }
-
-  return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, empty), dyn);
+  return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, *empty), dyn);
 }
 
 #define BA_AS_PATH 0x02
@@ -190,7 +175,7 @@ f_generate_empty(struct f_dynamic_attr dyn)
 static inline struct f_inst *
 f_implicit_roa_check(struct rtable_config *tab)
 {
-  struct f_dynamic_attr fda = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+  struct f_dynamic_attr fda = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
 
   struct f_static_attr fsa = f_new_static_attr(T_NET, SA_NET, 1);
 
diff --git a/filter/data.c b/filter/data.c
index 56c1fb17..c3f8bf57 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -27,6 +27,8 @@
 
 static const char * const f_type_str[] = {
   [T_VOID]	= "void",
+  [T_OPAQUE]	= "opaque byte string",
+  [T_IFACE]	= "interface",
 
   [T_INT]	= "int",
   [T_BOOL]	= "bool",
@@ -47,6 +49,7 @@ static const char * const f_type_str[] = {
   [T_NET]	= "prefix",
   [T_STRING]	= "string",
   [T_PATH_MASK]	= "bgpmask",
+  [T_PATH_MASK_ITEM] = "bgpmask item",
   [T_PATH]	= "bgppath",
   [T_CLIST]	= "clist",
   [T_EC]	= "ec",
@@ -54,22 +57,19 @@ static const char * const f_type_str[] = {
   [T_LC]	= "lc",
   [T_LCLIST]	= "lclist",
   [T_RD]	= "rd",
+
+  [T_SET]	= "set",
+  [T_PREFIX_SET] = "prefix set",
 };
 
 const char *
-f_type_name(enum f_type t)
+f_type_name(btype t)
 {
-  if (t < ARRAY_SIZE(f_type_str))
-    return f_type_str[t] ?: "?";
-
-  if ((t == T_SET) || (t == T_PREFIX_SET))
-    return "set";
-
-  return "?";
+  return (t < ARRAY_SIZE(f_type_str)) ? (f_type_str[t] ?: "?") : "?";
 }
 
-enum f_type
-f_type_element_type(enum f_type t)
+btype
+f_type_element_type(btype t)
 {
   switch(t) {
     case T_CLIST:  return T_PAIR;
diff --git a/filter/data.h b/filter/data.h
index 924bbf3e..0b1e8e57 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -11,65 +11,15 @@
 #define _BIRD_FILTER_DATA_H_
 
 #include "nest/bird.h"
-
-/* Type numbers must be in 0..0xff range */
-#define T_MASK 0xff
-
-/* Internal types */
-enum f_type {
-/* Nothing. Simply nothing. */
-  T_VOID = 0,
-
-/* Something but inaccessible. */
-  T_OPAQUE = 0xee,
-
-/* User visible types, which fit in int */
-  T_INT = 0x10,
-  T_BOOL = 0x11,
-  T_PAIR = 0x12,  /*	Notice that pair is stored as integer: first << 16 | second */
-  T_QUAD = 0x13,
-
-/* Put enumerational types in 0x30..0x3f range */
-  T_ENUM_LO = 0x30,
-  T_ENUM_HI = 0x3f,
-
-  T_ENUM_RTS = 0x30,
-  T_ENUM_BGP_ORIGIN = 0x31,
-  T_ENUM_SCOPE = 0x32,
-  T_ENUM_RTC = 0x33,
-  T_ENUM_RTD = 0x34,
-  T_ENUM_ROA = 0x35,
-  T_ENUM_NETTYPE = 0x36,
-  T_ENUM_RA_PREFERENCE = 0x37,
-  T_ENUM_AF = 0x38,
-
-/* new enums go here */
-
-#define T_ENUM T_ENUM_LO ... T_ENUM_HI
-
-/* Bigger ones */
-  T_IP = 0x20,
-  T_NET = 0x21,
-  T_STRING = 0x22,
-  T_PATH_MASK = 0x23,	/* mask for BGP path */
-  T_PATH = 0x24,		/* BGP path */
-  T_CLIST = 0x25,		/* Community list */
-  T_EC = 0x26,		/* Extended community value, u64 */
-  T_ECLIST = 0x27,		/* Extended community list */
-  T_LC = 0x28,		/* Large community value, lcomm */
-  T_LCLIST = 0x29,		/* Large community list */
-  T_RD = 0x2a,		/* Route distinguisher for VPN addresses */
-  T_PATH_MASK_ITEM = 0x2b,	/* Path mask item for path mask constructors */
-
-  T_SET = 0x80,
-  T_PREFIX_SET = 0x81,
-} PACKED;
+#include "lib/type.h"
 
 /* Filter value; size of this affects filter memory consumption */
 struct f_val {
-  enum f_type type;	/* T_*  */
+  btype type;	/* T_*  */
   union {
-    uint i;
+    union bval bval;
+    BVAL_ITEMS;
+
     u64 ec;
     lcomm lc;
     ip_addr ip;
@@ -77,17 +27,17 @@ struct f_val {
     const char *s;
     const struct f_tree *t;
     const struct f_trie *ti;
-    const struct adata *ad;
     const struct f_path_mask *path_mask;
     struct f_path_mask_item pmi;
   } val;
 };
 
+#define fputip(a)   ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
+
 /* Dynamic attribute definition (eattrs) */
 struct f_dynamic_attr {
-  u8 type;		/* EA type (EAF_*) */
+  btype type;		/* EA type (EAF_*) */
   u8 bit;		/* For bitfield accessors */
-  enum f_type f_type;	/* Filter type */
   uint ea_code;		/* EA code */
 };
 
@@ -108,9 +58,9 @@ enum f_sa_code {
 
 /* Static attribute definition (members of struct rta) */
 struct f_static_attr {
-  enum f_type f_type;		/* Filter type */
+  btype type;			/* Data type */
   enum f_sa_code sa_code;	/* Static attribute id */
-  int readonly:1;			/* Don't allow writing */
+  int readonly:1;		/* Don't allow writing */
 };
 
 /* Filter l-value type */
@@ -266,9 +216,9 @@ trie_match_next_longest_ip6(net_addr_ip6 *n, ip6_addr *found)
 
 #define F_CMP_ERROR 999
 
-const char *f_type_name(enum f_type t);
+const char *f_type_name(btype t);
 
-enum f_type f_type_element_type(enum f_type t);
+enum btype f_type_element_type(btype t);
 
 int val_same(const struct f_val *v1, const struct f_val *v2);
 int val_compare(const struct f_val *v1, const struct f_val *v2);
@@ -301,6 +251,16 @@ undef_value(struct f_val v)
 }
 
 extern const struct f_val f_const_empty_path, f_const_empty_clist, f_const_empty_eclist, f_const_empty_lclist;
+static inline const struct f_val *f_get_empty(btype t)
+{
+  switch (t) {
+    case T_PATH:	return &f_const_empty_path;
+    case T_CLIST:	return &f_const_empty_clist;
+    case T_ECLIST:	return &f_const_empty_eclist;
+    case T_LCLIST:	return &f_const_empty_lclist;
+    default:		return NULL;
+  }
+}
 
 enum filter_return f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres);
 
diff --git a/filter/decl.m4 b/filter/decl.m4
index 44537aaa..2e4fb235 100644
--- a/filter/decl.m4
+++ b/filter/decl.m4
@@ -490,7 +490,7 @@ fi_constant(struct f_inst *what, struct f_val val)
 }
 
 static int
-f_const_promotion(struct f_inst *arg, enum f_type want)
+f_const_promotion(struct f_inst *arg, btype want)
 {
   if (arg->fi_code != FI_CONSTANT)
     return 0;
@@ -640,7 +640,7 @@ FID_WR_PUT(4)m4_dnl
 struct f_inst {
   struct f_inst *next;			/* Next instruction */
   enum f_instruction_code fi_code;	/* Instruction code */
-  enum f_type type;			/* Type of returned value, if known */
+  btype type;				/* Type of returned value, if known */
   int size;				/* How many instructions are underneath */
   int lineno;				/* Line number */
   union {
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 75a53499..e0bad833 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -533,21 +533,21 @@
 
       switch (sa.sa_code)
       {
-      case SA_FROM:	RESULT(sa.f_type, ip, rta->from); break;
-      case SA_GW:	RESULT(sa.f_type, ip, rta->nh.gw); break;
-      case SA_NET:	RESULT(sa.f_type, net, (*fs->rte)->net->n.addr); break;
-      case SA_PROTO:	RESULT(sa.f_type, s, (*fs->rte)->src->proto->name); break;
-      case SA_SOURCE:	RESULT(sa.f_type, i, rta->source); break;
-      case SA_SCOPE:	RESULT(sa.f_type, i, rta->scope); break;
-      case SA_DEST:	RESULT(sa.f_type, i, rta->dest); break;
-      case SA_IFNAME:	RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
-      case SA_IFINDEX:	RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
-      case SA_WEIGHT:	RESULT(sa.f_type, i, rta->nh.weight + 1); break;
-      case SA_PREF:	RESULT(sa.f_type, i, rta->pref); break;
-      case SA_GW_MPLS:	RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
+      case SA_FROM:	RESULT(sa.type, ip, rta->from); break;
+      case SA_GW:	RESULT(sa.type, ip, rta->nh.gw); break;
+      case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
+      case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
+      case SA_SOURCE:	RESULT(sa.type, i, rta->source); break;
+      case SA_SCOPE:	RESULT(sa.type, i, rta->scope); break;
+      case SA_DEST:	RESULT(sa.type, i, rta->dest); break;
+      case SA_IFNAME:	RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
+      case SA_IFINDEX:	RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
+      case SA_WEIGHT:	RESULT(sa.type, i, rta->nh.weight + 1); break;
+      case SA_PREF:	RESULT(sa.type, i, rta->pref); break;
+      case SA_GW_MPLS:	RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
 
       default:
-	bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
       }
     }
   }
@@ -556,7 +556,7 @@
     ACCESS_RTE;
     ARG_ANY(1);
     STATIC_ATTR;
-    ARG_TYPE(1, sa.f_type);
+    ARG_TYPE(1, sa.type);
 
     f_rta_cow(fs);
     {
@@ -653,7 +653,7 @@
 	break;
 
       default:
-	bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
       }
     }
   }
@@ -662,68 +662,30 @@
     DYNAMIC_ATTR;
     ACCESS_RTE;
     ACCESS_EATTRS;
-    RESULT_TYPE(da.f_type);
+    RESULT_TYPE(da.type);
     {
+      const struct f_val *empty;
       eattr *e = ea_find(*fs->eattrs, da.ea_code);
 
-      if (!e) {
-	/* A special case: undefined as_path looks like empty as_path */
-	if (da.type == EAF_TYPE_AS_PATH) {
-	  RESULT_(T_PATH, ad, &null_adata);
-	  break;
-	}
+      if (e)
+      {
+	ASSERT_DIE(e->type == da.type);
 
-	/* The same special case for int_set */
-	if (da.type == EAF_TYPE_INT_SET) {
-	  RESULT_(T_CLIST, ad, &null_adata);
-	  break;
+	switch (e->type) {
+	  case T_IP:
+	    RESULT_(T_IP, ip, *((const ip_addr *) e->u.ptr->data));
+	    break;
+	  default:
+	    RESULT_VAL([[(struct f_val) {
+		.type = e->type,
+		.val.bval = e->u,
+		}]]);
 	}
-
-	/* The same special case for ec_set */
-	if (da.type == EAF_TYPE_EC_SET) {
-	  RESULT_(T_ECLIST, ad, &null_adata);
-	  break;
-	}
-
-	/* The same special case for lc_set */
-	if (da.type == EAF_TYPE_LC_SET) {
-	  RESULT_(T_LCLIST, ad, &null_adata);
-	  break;
-	}
-
-	/* Undefined value */
+      }
+      else if (empty = f_get_empty(da.type))
+	RESULT_VAL(*empty);
+      else
 	RESULT_VOID;
-	break;
-      }
-
-      switch (e->type) {
-      case EAF_TYPE_INT:
-	RESULT_(da.f_type, i, e->u.data);
-	break;
-      case EAF_TYPE_ROUTER_ID:
-	RESULT_(T_QUAD, i, e->u.data);
-	break;
-      case EAF_TYPE_OPAQUE:
-	RESULT_(T_OPAQUE, ad, e->u.ptr);
-	break;
-      case EAF_TYPE_IP_ADDRESS:
-	RESULT_(T_IP, ip, *((ip_addr *) e->u.ptr->data));
-	break;
-      case EAF_TYPE_AS_PATH:
-	RESULT_(T_PATH, ad, e->u.ptr);
-	break;
-      case EAF_TYPE_INT_SET:
-	RESULT_(T_CLIST, ad, e->u.ptr);
-	break;
-      case EAF_TYPE_EC_SET:
-	RESULT_(T_ECLIST, ad, e->u.ptr);
-	break;
-      case EAF_TYPE_LC_SET:
-	RESULT_(T_LCLIST, ad, e->u.ptr);
-	break;
-      default:
-	bug("Unknown dynamic attribute type");
-      }
     }
   }
 
@@ -732,7 +694,7 @@
     ACCESS_EATTRS;
     ARG_ANY(1);
     DYNAMIC_ATTR;
-    ARG_TYPE(1, da.f_type);
+    ARG_TYPE(1, da.type);
     {
       struct ea_list *l = lp_alloc(fs->pool, sizeof(struct ea_list) + sizeof(eattr));
 
@@ -746,17 +708,16 @@
       l->attrs[0].fresh = 1;
       l->attrs[0].undef = 0;
 
-      switch (da.type) {
-      case EAF_TYPE_INT:
-      case EAF_TYPE_ROUTER_ID:
-	l->attrs[0].u.data = v1.val.i;
-	break;
+      if (da.type >= EAF_TYPE__MAX)
+	bug("Unsupported attribute type");
 
-      case EAF_TYPE_OPAQUE:
+      switch (da.type) {
+      case T_OPAQUE:
+      case T_IFACE:
 	runtime( "Setting opaque attribute is not allowed" );
 	break;
 
-      case EAF_TYPE_IP_ADDRESS:;
+      case T_IP:;
 	int len = sizeof(ip_addr);
 	struct adata *ad = lp_alloc(fs->pool, sizeof(struct adata) + len);
 	ad->length = len;
@@ -764,15 +725,10 @@
 	l->attrs[0].u.ptr = ad;
 	break;
 
-      case EAF_TYPE_AS_PATH:
-      case EAF_TYPE_INT_SET:
-      case EAF_TYPE_EC_SET:
-      case EAF_TYPE_LC_SET:
-	l->attrs[0].u.ptr = v1.val.ad;
+      default:
+	l->attrs[0].u = v1.val.bval;
 	break;
 
-      default:
-	bug("Unknown dynamic attribute type");
       }
 
       f_rta_cow(fs);
diff --git a/filter/f-inst.h b/filter/f-inst.h
index 9265ecec..32da4653 100644
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -87,12 +87,12 @@ void f_add_lines(const struct f_line_item *what, struct filter_iterator *fit);
 
 
 struct filter *f_new_where(struct f_inst *);
-static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, enum f_type f_type, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
-{ return (struct f_dynamic_attr) { .type = type, .f_type = f_type, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
-static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
-{ return (struct f_dynamic_attr) { .type = EAF_TYPE_INT, .bit = bit, .f_type = T_INT, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
-static inline struct f_static_attr f_new_static_attr(int f_type, int code, int readonly)
-{ return (struct f_static_attr) { .f_type = f_type, .sa_code = code, .readonly = readonly }; }
+static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, uint code)
+{ return (struct f_dynamic_attr) { .type = type, .ea_code = code }; }
+static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code)
+{ return (struct f_dynamic_attr) { .type = T_INT, .bit = bit, .ea_code = code }; }
+static inline struct f_static_attr f_new_static_attr(btype type, int code, int readonly)
+{ return (struct f_static_attr) { .type = type, .sa_code = code, .readonly = readonly }; }
 struct f_inst *f_generate_complex(enum f_instruction_code fi_code, struct f_dynamic_attr da, struct f_inst *argument);
 struct f_inst *f_generate_roa_check(struct rtable_config *table, struct f_inst *prefix, struct f_inst *asn);
 
diff --git a/filter/f-util.c b/filter/f-util.c
index 410999a6..79cf3452 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -82,8 +82,8 @@ static void
 ca_dump(resource *r)
 {
   struct custom_attribute *ca = (void *) r;
-  debug("name \"%s\" id 0x%04x ea_type 0x%02x f_type 0x%02x\n",
-      ca->name, ca->fda->ea_code, ca->fda->type, ca->fda->f_type);
+  debug("name \"%s\" id 0x%04x ea_type 0x%02x\n",
+      ca->name, ca->fda->ea_code, ca->fda->type);
 }
 
 static struct resclass ca_class = {
@@ -96,31 +96,16 @@ static struct resclass ca_class = {
 };
 
 struct custom_attribute *
-ca_lookup(pool *p, const char *name, int f_type)
+ca_lookup(pool *p, const char *name, btype type)
 {
-  int ea_type;
-
-  switch (f_type) {
+  switch (type) {
     case T_INT:
-      ea_type = EAF_TYPE_INT;
-      break;
     case T_IP:
-      ea_type = EAF_TYPE_IP_ADDRESS;
-      break;
     case T_QUAD:
-      ea_type = EAF_TYPE_ROUTER_ID;
-      break;
     case T_PATH:
-      ea_type = EAF_TYPE_AS_PATH;
-      break;
     case T_CLIST:
-      ea_type = EAF_TYPE_INT_SET;
-      break;
     case T_ECLIST:
-      ea_type = EAF_TYPE_EC_SET;
-      break;
     case T_LCLIST:
-      ea_type = EAF_TYPE_LC_SET;
       break;
     default:
       cf_error("Custom route attribute of unsupported type");
@@ -137,7 +122,7 @@ ca_lookup(pool *p, const char *name, int f_type)
     inited++;
   }
 
-  struct ca_storage *cas = HASH_FIND(ca_hash, CA, name, ea_type);
+  struct ca_storage *cas = HASH_FIND(ca_hash, CA, name, type);
   if (cas) {
     cas->uc++;
   } else {
@@ -153,7 +138,7 @@ ca_lookup(pool *p, const char *name, int f_type)
     }
 
     cas = mb_allocz(&root_pool, sizeof(struct ca_storage) + strlen(name) + 1);
-    cas->fda = f_new_dynamic_attr(ea_type, f_type, EA_CUSTOM(id));
+    cas->fda = f_new_dynamic_attr(type, EA_CUSTOM(id));
     cas->uc = 1;
 
     strcpy(cas->name, name);
diff --git a/filter/filter.h b/filter/filter.h
index 26c1037b..e9c9d917 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -77,6 +77,6 @@ struct custom_attribute {
   const char *name;
 };
 
-struct custom_attribute *ca_lookup(pool *p, const char *name, int ea_type);
+struct custom_attribute *ca_lookup(pool *p, const char *name, btype type);
 
 #endif
diff --git a/filter/test.conf b/filter/test.conf
index ee2f5be4..062756b1 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -406,9 +406,9 @@ bt_test_suite(t_ip_set, "Testing sets of ip address");
 
 function t_enum()
 {
-	bt_assert(format(RTS_STATIC) = "(enum 30)1");
-	bt_assert(format(NET_IP4) = "(enum 36)1");
-	bt_assert(format(NET_VPN6) = "(enum 36)4");
+	bt_assert(format(RTS_STATIC) = "(enum 31)1");
+	bt_assert(format(NET_IP4) = "(enum 3b)1");
+	bt_assert(format(NET_VPN6) = "(enum 3b)4");
 
 	bt_assert(RTS_STATIC ~ [RTS_STATIC, RTS_DEVICE]);
 	bt_assert(RTS_BGP !~ [RTS_STATIC, RTS_DEVICE]);
diff --git a/lib/type.h b/lib/type.h
new file mode 100644
index 00000000..d0a887d8
--- /dev/null
+++ b/lib/type.h
@@ -0,0 +1,87 @@
+/*
+ *     BIRD Internet Routing Daemon -- Internal Data Types
+ *
+ *     (c) 2022 Maria Matejka <mq@jmq.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_TYPE_H_
+#define _BIRD_TYPE_H_
+
+#include "lib/birdlib.h"
+
+union bval {
+#define BVAL_ITEMS	\
+  u32 data;			/* Integer type inherited from eattrs */		\
+  u32 i;			/* Integer type inherited from filters */		\
+  const struct adata *ptr;	/* Generic attribute data inherited from eattrs */	\
+  const struct adata *ad;     	/* Generic attribute data inherited from filters */	\
+
+  BVAL_ITEMS
+};
+
+/* Internal types */
+enum btype {
+/* Nothing. Simply nothing. */
+  T_VOID = 0,
+
+/* Something but inaccessible. */
+  T_OPAQUE = 0x02,		/* Opaque byte string (not filterable) */
+  T_IFACE = 0x0c,		/* Pointer to an interface (inside adata) */
+
+/* Types shared with eattrs */
+  T_INT = 0x01,			/* 32-bit unsigned integer number */
+  T_IP = 0x04,			/* IP address */
+  T_QUAD = 0x05,		/* Router ID (IPv4 address) */
+  T_PATH = 0x06,		/* BGP AS path (encoding per RFC 1771:4.3) */
+  T_CLIST = 0x0a,		/* Set of u32's (e.g., a community list) */
+  T_ECLIST = 0x0e,		/* Set of pairs of u32's - ext. community list */
+  T_LCLIST = 0x08,		/* Set of triplets of u32's - large community list */
+
+  T_ENUM_BGP_ORIGIN = 0x11,	/* BGP Origin enum */
+  T_ENUM_RA_PREFERENCE = 0x13,	/* RA Preference enum */
+
+#define EAF_TYPE__MAX 0x1f
+#define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
+					/* Otherwise, attribute data is adata */
+
+/* Other user visible types which fit in int */
+  T_BOOL = 0xa0,
+  T_PAIR = 0xa4,  /*	Notice that pair is stored as integer: first << 16 | second */
+
+/* Put enumerational types in 0x20..0x3f range */
+  T_ENUM_LO = 0x10,
+  T_ENUM_HI = 0x3f,
+
+  T_ENUM_RTS = 0x31,
+  T_ENUM_SCOPE = 0x33,
+  T_ENUM_RTC = 0x35,
+  T_ENUM_RTD = 0x37,
+  T_ENUM_ROA = 0x39,
+  T_ENUM_NETTYPE = 0x3b,
+  T_ENUM_AF = 0x3d,
+
+/* new enums go here */
+
+#define T_ENUM T_ENUM_LO ... T_ENUM_HI
+
+/* Bigger ones */
+  T_NET = 0xb0,
+  T_STRING = 0xb4,
+  T_PATH_MASK = 0xb8,	/* mask for BGP path */
+  T_EC = 0xbc,		/* Extended community value, u64 */
+  T_LC = 0xc0,		/* Large community value, lcomm */
+  T_RD = 0xc4,		/* Route distinguisher for VPN addresses */
+  T_PATH_MASK_ITEM = 0xc8,	/* Path mask item for path mask constructors */
+
+  T_SET = 0x80,
+  T_PREFIX_SET = 0x84,
+} PACKED;
+
+typedef enum btype btype;
+
+STATIC_ASSERT(sizeof(btype) == sizeof(byte));
+
+
+#endif
diff --git a/nest/config.Y b/nest/config.Y
index 92a80589..b597b332 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -921,7 +921,7 @@ proto_patt2:
  | TEXT { $$.ptr = $1; $$.patt = 1; }
  ;
 
-dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_GEN_IGP_METRIC); } ;
+dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_GEN_IGP_METRIC); } ;
 
 
 CF_CODE
diff --git a/nest/route.h b/nest/route.h
index d2f60f41..da8c723f 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -13,6 +13,7 @@
 #include "lib/bitmap.h"
 #include "lib/resource.h"
 #include "lib/net.h"
+#include "lib/type.h"
 
 struct ea_list;
 struct protocol;
@@ -506,10 +507,8 @@ typedef struct eattr {
   byte originated:1;			/* The attribute has originated locally */
   byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
   byte undef:1;				/* Explicitly undefined */
-  union {
-    uintptr_t data;
-    const struct adata *ptr;		/* Attribute data elsewhere */
-  } u;
+
+  union bval u;
 } eattr;
 
 
@@ -530,22 +529,6 @@ const char *ea_custom_name(uint ea);
 #define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
 #define EA_BIT_GET(ea) ((ea) >> 24)
 
-#define EAF_TYPE_MASK 0x1f		/* Mask with this to get type */
-#define EAF_TYPE_INT 0x01		/* 32-bit unsigned integer number */
-#define EAF_TYPE_OPAQUE 0x02		/* Opaque byte string (not filterable) */
-#define EAF_TYPE_IP_ADDRESS 0x04	/* IP address */
-#define EAF_TYPE_ROUTER_ID 0x05		/* Router ID (IPv4 address) */
-#define EAF_TYPE_AS_PATH 0x06		/* BGP AS path (encoding per RFC 1771:4.3) */
-#define EAF_TYPE_INT_SET 0x0a		/* Set of u32's (e.g., a community list) */
-#define EAF_TYPE_EC_SET 0x0e		/* Set of pairs of u32's - ext. community list */
-#define EAF_TYPE_LC_SET 0x08		/* Set of triplets of u32's - large community list */
-#define EAF_TYPE_IFACE 0x0c		/* Interface pointer stored in adata */
-#define EAF_TYPE_BGP_ORIGIN 0x11	/* BGP Origin enum */
-#define EAF_TYPE_RA_PREFERENCE 0x13	/* RA Preference enum */
-
-#define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
-					/* Otherwise, attribute data is adata */
-
 typedef struct adata {
   uint length;				/* Length of data */
   byte data[0];
@@ -591,7 +574,7 @@ struct ea_walk_state {
 
 eattr *ea_find(ea_list *, unsigned ea);
 eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
-uintptr_t ea_get_int(ea_list *, unsigned ea, uintptr_t def);
+u32 ea_get_int(ea_list *, unsigned ea, u32 def);
 void ea_dump(ea_list *);
 void ea_sort(ea_list *);		/* Sort entries in all sub-lists */
 unsigned ea_scan(ea_list *);		/* How many bytes do we need for merged ea_list */
@@ -618,7 +601,7 @@ struct ea_one_attr_list {
 };
 
 static inline eattr *
-ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, uintptr_t val)
+ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, union bval val)
 {
   struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
   *ea = (struct ea_one_attr_list) {
@@ -631,11 +614,7 @@ ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type,
     .a.flags = flags,
   };
 
-  if (type & EAF_EMBEDDED)
-    ea->a.u.data = val;
-  else
-    ea->a.u.ptr = (struct adata *) val;
-
+  ea->a.u = val;
   *to = &ea->l;
 
   return &ea->a;
@@ -659,19 +638,19 @@ ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
 }
 
 static inline void
-ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 val)
-{ ea_set_attr(to, pool, id, flags, type, (uintptr_t) val); }
-
-static inline void
-ea_set_attr_ptr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, struct adata *val)
-{ ea_set_attr(to, pool, id, flags, type, (uintptr_t) val); }
+ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 data)
+{
+  union bval bv = { .data = data };
+  ea_set_attr(to, pool, id, flags, type, bv);
+}
 
 static inline void
 ea_set_attr_data(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, void *data, uint len)
 {
   struct adata *a = lp_alloc_adata(pool, len);
   memcpy(a->data, data, len);
-  ea_set_attr(to, pool, id, flags, type, (uintptr_t) a);
+  union bval bv = { .ptr = a, };
+  ea_set_attr(to, pool, id, flags, type, bv);
 }
 
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 25548dca..de45dfa1 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -539,8 +539,8 @@ ea_walk(struct ea_walk_state *s, uint id, uint max)
  * by calling ea_find() to find the attribute, extracting its value or returning
  * a provided default if no such attribute is present.
  */
-uintptr_t
-ea_get_int(ea_list *e, unsigned id, uintptr_t def)
+u32
+ea_get_int(ea_list *e, unsigned id, u32 def)
 {
   eattr *a = ea_find(e, id);
   if (!a)
@@ -950,30 +950,33 @@ ea_show(struct cli *c, const eattr *e)
       else
       switch (e->type)
 	{
-	case EAF_TYPE_INT:
+	case T_INT:
 	  bsprintf(pos, "%u", e->u.data);
 	  break;
-	case EAF_TYPE_OPAQUE:
+	case T_OPAQUE:
 	  opaque_format(ad, pos, end - pos);
 	  break;
-	case EAF_TYPE_IP_ADDRESS:
+	case T_IP:
 	  bsprintf(pos, "%I", *(ip_addr *) ad->data);
 	  break;
-	case EAF_TYPE_ROUTER_ID:
+	case T_QUAD:
 	  bsprintf(pos, "%R", e->u.data);
 	  break;
-	case EAF_TYPE_AS_PATH:
+	case T_PATH:
 	  as_path_format(ad, pos, end - pos);
 	  break;
-	case EAF_TYPE_INT_SET:
+	case T_CLIST:
 	  ea_show_int_set(c, ad, 1, pos, buf, end);
 	  return;
-	case EAF_TYPE_EC_SET:
+	case T_ECLIST:
 	  ea_show_ec_set(c, ad, pos, buf, end);
 	  return;
-	case EAF_TYPE_LC_SET:
+	case T_LCLIST:
 	  ea_show_lc_set(c, ad, pos, buf, end);
 	  return;
+	case T_IFACE:
+	  bsprintf(pos, "%s", ((struct iface *) e->u.ptr)->name);
+	  return;
 	default:
 	  bsprintf(pos, "<type %02x>", e->type);
 	}
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 8040345f..a6cc7aa3 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -654,7 +654,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     *a0.eattrs = (ea_list) { .count = 3 };
     a0.eattrs->attrs[0] = (eattr) {
       .id = EA_BABEL_METRIC,
-      .type = EAF_TYPE_INT,
+      .type = T_INT,
       .u.data = r->metric,
     };
 
@@ -663,13 +663,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     memcpy(ad->data, &(r->router_id), sizeof(u64));
     a0.eattrs->attrs[1] = (eattr) {
       .id = EA_BABEL_ROUTER_ID,
-      .type = EAF_TYPE_OPAQUE,
+      .type = T_OPAQUE,
       .u.ptr = ad,
     };
 
     a0.eattrs->attrs[2] = (eattr) {
       .id = EA_BABEL_SEQNO,
-      .type = EAF_TYPE_INT,
+      .type = T_INT,
       .u.data = r->seqno,
     };
 
diff --git a/proto/babel/config.Y b/proto/babel/config.Y
index 05210fa4..fa745993 100644
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@ -163,7 +163,7 @@ babel_iface_opt_list:
 babel_iface:
   babel_iface_start iface_patt_list_nopx babel_iface_opt_list babel_iface_finish;
 
-dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_BABEL_METRIC); } ;
+dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_BABEL_METRIC); } ;
 
 CF_CLI_HELP(SHOW BABEL, ..., [[Show information about Babel protocol]]);
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index b514f1b9..1bae942d 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -80,7 +80,7 @@ static const struct bgp_attr_desc bgp_attr_table[];
 static inline int bgp_attr_known(uint code);
 
 eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, uintptr_t val)
+bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val)
 {
   ASSERT(bgp_attr_known(code));
 
@@ -976,7 +976,7 @@ static inline void
 bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to)
 {
   /* Cannot use bgp_set_attr_data() as it works on known attributes only */
-  ea_set_attr_data(to, s->pool, EA_CODE(PROTOCOL_BGP, code), flags, EAF_TYPE_OPAQUE, data, len);
+  ea_set_attr_data(to, s->pool, EA_CODE(PROTOCOL_BGP, code), flags, T_OPAQUE, data, len);
 }
 
 
@@ -987,7 +987,7 @@ bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data,
 static const struct bgp_attr_desc bgp_attr_table[] = {
   [BA_ORIGIN] = {
     .name = "origin",
-    .type = EAF_TYPE_BGP_ORIGIN,
+    .type = T_ENUM_BGP_ORIGIN,
     .flags = BAF_TRANSITIVE,
     .export = bgp_export_origin,
     .encode = bgp_encode_u8,
@@ -996,14 +996,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_AS_PATH] = {
     .name = "as_path",
-    .type = EAF_TYPE_AS_PATH,
+    .type = T_PATH,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_as_path,
     .decode = bgp_decode_as_path,
   },
   [BA_NEXT_HOP] = {
     .name = "next_hop",
-    .type = EAF_TYPE_IP_ADDRESS,
+    .type = T_IP,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_next_hop,
     .decode = bgp_decode_next_hop,
@@ -1011,14 +1011,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_MULTI_EXIT_DISC] = {
     .name = "med",
-    .type = EAF_TYPE_INT,
+    .type = T_INT,
     .flags = BAF_OPTIONAL,
     .encode = bgp_encode_u32,
     .decode = bgp_decode_med,
   },
   [BA_LOCAL_PREF] = {
     .name = "local_pref",
-    .type = EAF_TYPE_INT,
+    .type = T_INT,
     .flags = BAF_TRANSITIVE,
     .export = bgp_export_local_pref,
     .encode = bgp_encode_u32,
@@ -1026,14 +1026,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_ATOMIC_AGGR] = {
     .name = "atomic_aggr",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_atomic_aggr,
   },
   [BA_AGGREGATOR] = {
     .name = "aggregator",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_aggregator,
     .decode = bgp_decode_aggregator,
@@ -1041,7 +1041,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_COMMUNITY] = {
     .name = "community",
-    .type = EAF_TYPE_INT_SET,
+    .type = T_CLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_community,
     .encode = bgp_encode_u32s,
@@ -1049,7 +1049,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_ORIGINATOR_ID] = {
     .name = "originator_id",
-    .type = EAF_TYPE_ROUTER_ID,
+    .type = T_QUAD,
     .flags = BAF_OPTIONAL,
     .export = bgp_export_originator_id,
     .encode = bgp_encode_u32,
@@ -1057,7 +1057,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_CLUSTER_LIST] = {
     .name = "cluster_list",
-    .type = EAF_TYPE_INT_SET,
+    .type = T_CLIST,
     .flags = BAF_OPTIONAL,
     .export = bgp_export_cluster_list,
     .encode = bgp_encode_u32s,
@@ -1066,19 +1066,19 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_MP_REACH_NLRI] = {
     .name = "mp_reach_nlri",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_reach_nlri,
   },
   [BA_MP_UNREACH_NLRI] = {
     .name = "mp_unreach_nlri",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_unreach_nlri,
   },
   [BA_EXT_COMMUNITY] = {
     .name = "ext_community",
-    .type = EAF_TYPE_EC_SET,
+    .type = T_ECLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_ext_community,
     .encode = bgp_encode_u32s,
@@ -1086,14 +1086,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_AS4_PATH] = {
     .name = "as4_path",
-    .type = EAF_TYPE_AS_PATH,
+    .type = T_PATH,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_as4_path,
   },
   [BA_AS4_AGGREGATOR] = {
     .name = "as4_aggregator",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_as4_aggregator,
@@ -1101,7 +1101,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_AIGP] = {
     .name = "aigp",
-    .type = EAF_TYPE_OPAQUE,
+    .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_DECODE_FLAGS,
     .export = bgp_export_aigp,
     .encode = bgp_encode_raw,
@@ -1110,7 +1110,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_LARGE_COMMUNITY] = {
     .name = "large_community",
-    .type = EAF_TYPE_LC_SET,
+    .type = T_LCLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_large_community,
     .encode = bgp_encode_u32s,
@@ -1118,7 +1118,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_MPLS_LABEL_STACK] = {
     .name = "mpls_label_stack",
-    .type = EAF_TYPE_INT_SET,
+    .type = T_CLIST,
     .export = bgp_export_mpls_label_stack,
     .encode = bgp_encode_mpls_label_stack,
     .decode = bgp_decode_mpls_label_stack,
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 8a44514c..6f209595 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -545,22 +545,28 @@ bgp_find_attr(ea_list *attrs, uint code)
 }
 
 eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, uintptr_t val);
+bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val);
 
 static inline void
 bgp_set_attr_u32(ea_list **to, struct linpool *pool, uint code, uint flags, u32 val)
-{ bgp_set_attr(to, pool, code, flags, (uintptr_t) val); }
+{
+  union bval bv = { .data = val };
+  bgp_set_attr(to, pool, code, flags, bv);
+}
 
 static inline void
-bgp_set_attr_ptr(ea_list **to, struct linpool *pool, uint code, uint flags, const struct adata *val)
-{ bgp_set_attr(to, pool, code, flags, (uintptr_t) val); }
+bgp_set_attr_ptr(ea_list **to, struct linpool *pool, uint code, uint flags, const struct adata *ad)
+{
+  union bval bv = { .ptr = ad };
+  bgp_set_attr(to, pool, code, flags, bv);
+}
 
 static inline void
 bgp_set_attr_data(ea_list **to, struct linpool *pool, uint code, uint flags, void *data, uint len)
 {
   struct adata *a = lp_alloc_adata(pool, len);
   bmemcpy(a->data, data, len);
-  bgp_set_attr(to, pool, code, flags, (uintptr_t) a);
+  bgp_set_attr_ptr(to, pool, code, flags, a);
 }
 
 #define bgp_unset_attr(to, pool, code) ea_unset_attr(to, pool, 0, code)
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 86124bfb..6a78f79b 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -318,31 +318,31 @@ bgp_proto_channel: bgp_channel_start bgp_channel_opt_list bgp_channel_end;
 
 
 dynamic_attr: BGP_ORIGIN
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_BGP_ORIGIN, T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
+	{ $$ = f_new_dynamic_attr(T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
 dynamic_attr: BGP_PATH
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
+	{ $$ = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
 dynamic_attr: BGP_NEXT_HOP
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_IP_ADDRESS, T_IP, EA_CODE(PROTOCOL_BGP, BA_NEXT_HOP)); } ;
+	{ $$ = f_new_dynamic_attr(T_IP, EA_CODE(PROTOCOL_BGP, BA_NEXT_HOP)); } ;
 dynamic_attr: BGP_MED
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC)); } ;
+	{ $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC)); } ;
 dynamic_attr: BGP_LOCAL_PREF
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
+	{ $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
 dynamic_attr: BGP_ATOMIC_AGGR
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
+	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
 dynamic_attr: BGP_AGGREGATOR
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
+	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
 dynamic_attr: BGP_COMMUNITY
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
+	{ $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
 dynamic_attr: BGP_ORIGINATOR_ID
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_ROUTER_ID, T_QUAD, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID)); } ;
+	{ $$ = f_new_dynamic_attr(T_QUAD, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID)); } ;
 dynamic_attr: BGP_CLUSTER_LIST
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST)); } ;
+	{ $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST)); } ;
 dynamic_attr: BGP_EXT_COMMUNITY
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_EC_SET, T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
+	{ $$ = f_new_dynamic_attr(T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
 dynamic_attr: BGP_AIGP
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
+	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
 dynamic_attr: BGP_LARGE_COMMUNITY
-	{ $$ = f_new_dynamic_attr(EAF_TYPE_LC_SET, T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
+	{ $$ = f_new_dynamic_attr(T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
 
 
 
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 4b7d5a36..a8972d2c 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -505,10 +505,10 @@ ospf_iface:
   ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); }
  ;
 
-dynamic_attr: OSPF_METRIC1 { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_METRIC1); } ;
-dynamic_attr: OSPF_METRIC2 { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_METRIC2); } ;
-dynamic_attr: OSPF_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_TAG); } ;
-dynamic_attr: OSPF_ROUTER_ID { $$ = f_new_dynamic_attr(EAF_TYPE_ROUTER_ID, T_QUAD, EA_OSPF_ROUTER_ID); } ;
+dynamic_attr: OSPF_METRIC1 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC1); } ;
+dynamic_attr: OSPF_METRIC2 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC2); } ;
+dynamic_attr: OSPF_TAG { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_TAG); } ;
+dynamic_attr: OSPF_ROUTER_ID { $$ = f_new_dynamic_attr(T_QUAD, EA_OSPF_ROUTER_ID); } ;
 
 CF_CLI_HELP(SHOW OSPF, ..., [[Show information about OSPF protocol]]);
 CF_CLI(SHOW OSPF, optproto, [<name>], [[Show information about OSPF protocol]])
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 471bb586..8643f456 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2072,27 +2072,27 @@ again1:
 
 	a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
 	  .id = EA_OSPF_METRIC1,
-	  .type = EAF_TYPE_INT,
+	  .type = T_INT,
 	  .u.data = nf->n.metric1,
 	};
 
 	if (nf->n.type == RTS_OSPF_EXT2)
 	  a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
 	    .id = EA_OSPF_METRIC2,
-	    .type = EAF_TYPE_INT,
+	    .type = T_INT,
 	    .u.data = nf->n.metric2,
 	  };
 
 	if ((nf->n.type == RTS_OSPF_EXT1) || (nf->n.type == RTS_OSPF_EXT2))
 	  a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
 	    .id = EA_OSPF_TAG,
-	    .type = EAF_TYPE_INT,
+	    .type = T_INT,
 	    .u.data = nf->n.tag,
 	  };
 
 	a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
 	  .id = EA_OSPF_ROUTER_ID,
-	  .type = EAF_TYPE_ROUTER_ID,
+	  .type = T_QUAD,
 	  .u.data = nf->n.rid,
 	};
 
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index f16b897d..0a339cb4 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -336,8 +336,8 @@ radv_sensitive:
  | SENSITIVE bool { $$ = $2; }
  ;
 
-dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(EAF_TYPE_RA_PREFERENCE, T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
-dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RA_LIFETIME); } ;
+dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
+dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(T_INT, EA_RA_LIFETIME); } ;
 
 CF_CODE
 
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 28ee9609..3934d337 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -190,8 +190,8 @@ rip_iface:
   rip_iface_start iface_patt_list_nopx rip_iface_opt_list rip_iface_finish;
 
 
-dynamic_attr: RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RIP_METRIC); } ;
-dynamic_attr: RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RIP_TAG); } ;
+dynamic_attr: RIP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_RIP_METRIC); } ;
+dynamic_attr: RIP_TAG { $$ = f_new_dynamic_attr(T_INT, EA_RIP_TAG); } ;
 
 CF_CLI_HELP(SHOW RIP, ..., [[Show information about RIP protocol]]);
 
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 6ca7a6b5..fa5b1289 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -202,17 +202,17 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
       .e = {
 	{
 	  .id = EA_RIP_METRIC,
-	  .type = EAF_TYPE_INT,
+	  .type = T_INT,
 	  .u.data = rt_metric,
 	},
 	{
 	  .id = EA_RIP_TAG,
-	  .type = EAF_TYPE_INT,
+	  .type = T_INT,
 	  .u.data = rt_tag,
 	},
 	{
 	  .id = EA_RIP_FROM,
-	  .type = EAF_TYPE_IFACE,
+	  .type = T_IFACE,
 	  .u.ptr = &ea_block.riad.ad,
 	}
       },
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index efdb18a3..3b1d2299 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -589,7 +589,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
 
   ea->attrs[0] = (eattr) {
     .id = EA_KRT_SOURCE,
-    .type = EAF_TYPE_INT,
+    .type = T_INT,
     .u.data = src2,
   };
 
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 7390be73..f31b88c7 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -28,23 +28,23 @@ kern_sys_item:
  | NETLINK RX BUFFER expr { THIS_KRT->sys.netlink_rx_buffer = $4; }
  ;
 
-dynamic_attr: KRT_PREFSRC	{ $$ = f_new_dynamic_attr(EAF_TYPE_IP_ADDRESS, T_IP, EA_KRT_PREFSRC); } ;
-dynamic_attr: KRT_REALM	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_REALM); } ;
-dynamic_attr: KRT_SCOPE	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SCOPE); } ;
+dynamic_attr: KRT_PREFSRC	{ $$ = f_new_dynamic_attr(T_IP, EA_KRT_PREFSRC); } ;
+dynamic_attr: KRT_REALM	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_REALM); } ;
+dynamic_attr: KRT_SCOPE	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_SCOPE); } ;
 
-dynamic_attr: KRT_MTU		{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_MTU); } ;
-dynamic_attr: KRT_WINDOW	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_WINDOW); } ;
-dynamic_attr: KRT_RTT		{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTT); } ;
-dynamic_attr: KRT_RTTVAR	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTTVAR); } ;
-dynamic_attr: KRT_SSTRESH	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SSTRESH); } ;
-dynamic_attr: KRT_CWND		{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_CWND); } ;
-dynamic_attr: KRT_ADVMSS	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_ADVMSS); } ;
-dynamic_attr: KRT_REORDERING	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_REORDERING); } ;
-dynamic_attr: KRT_HOPLIMIT	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_HOPLIMIT); } ;
-dynamic_attr: KRT_INITCWND	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_INITCWND); } ;
-dynamic_attr: KRT_RTO_MIN	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTO_MIN); } ;
-dynamic_attr: KRT_INITRWND	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_INITRWND); } ;
-dynamic_attr: KRT_QUICKACK	{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_QUICKACK); } ;
+dynamic_attr: KRT_MTU		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_MTU); } ;
+dynamic_attr: KRT_WINDOW	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_WINDOW); } ;
+dynamic_attr: KRT_RTT		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTT); } ;
+dynamic_attr: KRT_RTTVAR	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTTVAR); } ;
+dynamic_attr: KRT_SSTRESH	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_SSTRESH); } ;
+dynamic_attr: KRT_CWND		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_CWND); } ;
+dynamic_attr: KRT_ADVMSS	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_ADVMSS); } ;
+dynamic_attr: KRT_REORDERING	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_REORDERING); } ;
+dynamic_attr: KRT_HOPLIMIT	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_HOPLIMIT); } ;
+dynamic_attr: KRT_INITCWND	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITCWND); } ;
+dynamic_attr: KRT_RTO_MIN	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTO_MIN); } ;
+dynamic_attr: KRT_INITRWND	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITRWND); } ;
+dynamic_attr: KRT_QUICKACK	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_QUICKACK); } ;
 
 /* Bits of EA_KRT_LOCK, based on RTAX_* constants */
 
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 6c8228fd..eb4be711 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1587,12 +1587,12 @@ nl_announce_route(struct nl_parse_state *s)
 
   ea->attrs[0] = (eattr) {
     .id = EA_KRT_SOURCE,
-    .type = EAF_TYPE_INT,
+    .type = T_INT,
     .u.data = s->krt_proto,
   };
   ea->attrs[1] = (eattr) {
     .id = EA_KRT_METRIC,
-    .type = EAF_TYPE_INT,
+    .type = T_INT,
     .u.data = s->krt_metric,
   };
 
@@ -1873,7 +1873,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       ea->count = 1;
       ea->attrs[0].id = EA_KRT_SCOPE;
       ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_INT;
+      ea->attrs[0].type = T_INT;
       ea->attrs[0].u.data = i->rtm_scope;
     }
 
@@ -1888,7 +1888,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       ea->count = 1;
       ea->attrs[0].id = EA_KRT_PREFSRC;
       ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_IP_ADDRESS;
+      ea->attrs[0].type = T_IP;
 
       struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
       ad->length = sizeof(ps);
@@ -1907,7 +1907,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       ea->count = 1;
       ea->attrs[0].id = EA_KRT_REALM;
       ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_INT;
+      ea->attrs[0].type = T_INT;
       ea->attrs[0].u.data = s->rta_flow;
     }
 
@@ -1928,7 +1928,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	  {
 	    ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
 	    ea->attrs[n].flags = 0;
-	    ea->attrs[n].type = EAF_TYPE_INT;
+	    ea->attrs[n].type = T_INT;
 	    ea->attrs[n].u.data = metrics[t];
 	    n++;
 	  }
diff --git a/sysdep/linux/netlink.c.orig b/sysdep/linux/netlink.c.orig
deleted file mode 100644
index 7cea5322..00000000
--- a/sysdep/linux/netlink.c.orig
+++ /dev/null
@@ -1,2179 +0,0 @@
-/*
- *	BIRD -- Linux Netlink Interface
- *
- *	(c) 1999--2000 Martin Mares <mj@ucw.cz>
- *
- *	Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#include <alloca.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <errno.h>
-
-#undef LOCAL_DEBUG
-
-#include "nest/bird.h"
-#include "nest/route.h"
-#include "nest/protocol.h"
-#include "nest/iface.h"
-#include "lib/alloca.h"
-#include "sysdep/unix/unix.h"
-#include "sysdep/unix/krt.h"
-#include "lib/socket.h"
-#include "lib/string.h"
-#include "lib/hash.h"
-#include "conf/conf.h"
-
-#include <asm/types.h>
-#include <linux/if.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-#ifdef HAVE_MPLS_KERNEL
-#include <linux/lwtunnel.h>
-#endif
-
-#ifndef MSG_TRUNC			/* Hack: Several versions of glibc miss this one :( */
-#define MSG_TRUNC 0x20
-#endif
-
-#ifndef IFA_FLAGS
-#define IFA_FLAGS 8
-#endif
-
-#ifndef IFF_LOWER_UP
-#define IFF_LOWER_UP 0x10000
-#endif
-
-#ifndef RTA_TABLE
-#define RTA_TABLE  15
-#endif
-
-#ifndef RTA_VIA
-#define RTA_VIA	 18
-#endif
-
-#ifndef RTA_NEWDST
-#define RTA_NEWDST  19
-#endif
-
-#ifndef RTA_ENCAP_TYPE
-#define RTA_ENCAP_TYPE	21
-#endif
-
-#ifndef RTA_ENCAP
-#define RTA_ENCAP  22
-#endif
-
-#define krt_ipv4(p) ((p)->af == AF_INET)
-#define krt_ecmp6(p) ((p)->af == AF_INET6)
-
-const int rt_default_ecmp = 16;
-
-/*
- * Structure nl_parse_state keeps state of received route processing. Ideally,
- * we could just independently parse received Netlink messages and immediately
- * propagate received routes to the rest of BIRD, but older Linux kernel (before
- * version 4.11) represents and announces IPv6 ECMP routes not as one route with
- * multiple next hops (like RTA_MULTIPATH in IPv4 ECMP), but as a sequence of
- * routes with the same prefix. More recent kernels work as with IPv4.
- *
- * Therefore, BIRD keeps currently processed route in nl_parse_state structure
- * and postpones its propagation until we expect it to be final; i.e., when
- * non-matching route is received or when the scan ends. When another matching
- * route is received, it is merged with the already processed route to form an
- * ECMP route. Note that merging is done only for IPv6 (merge == 1), but the
- * postponing is done in both cases (for simplicity). All IPv4 routes or IPv6
- * routes with RTA_MULTIPATH set are just considered non-matching.
- *
- * This is ignored for asynchronous notifications (every notification is handled
- * as a separate route). It is not an issue for our routes, as we ignore such
- * notifications anyways. But importing alien IPv6 ECMP routes does not work
- * properly with older kernels.
- *
- * Whatever the kernel version is, IPv6 ECMP routes are sent as multiple routes
- * for the same prefix.
- */
-
-struct nl_parse_state
-{
-  struct linpool *pool;
-  int scan;
-  int merge;
-
-  net *net;
-  rta *attrs;
-  struct krt_proto *proto;
-  s8 new;
-  s8 krt_src;
-  u8 krt_type;
-  u8 krt_proto;
-  u32 krt_metric;
-
-  u32 rta_flow;		/* Used during parsing */
-};
-
-/*
- *	Synchronous Netlink interface
- */
-
-struct nl_sock
-{
-  int fd;
-  u32 seq;
-  byte *rx_buffer;			/* Receive buffer */
-  struct nlmsghdr *last_hdr;		/* Recently received packet */
-  uint last_size;
-};
-
-#define NL_RX_SIZE 8192
-
-#define NL_OP_DELETE	0
-#define NL_OP_ADD	(NLM_F_CREATE|NLM_F_EXCL)
-#define NL_OP_REPLACE	(NLM_F_CREATE|NLM_F_REPLACE)
-#define NL_OP_APPEND	(NLM_F_CREATE|NLM_F_APPEND)
-
-static linpool *nl_linpool;
-
-static struct nl_sock nl_scan = {.fd = -1};	/* Netlink socket for synchronous scan */
-static struct nl_sock nl_req  = {.fd = -1};	/* Netlink socket for requests */
-
-static void
-nl_open_sock(struct nl_sock *nl)
-{
-  if (nl->fd < 0)
-    {
-      nl->fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-      if (nl->fd < 0)
-	die("Unable to open rtnetlink socket: %m");
-      nl->seq = (u32) (current_time() TO_S); /* Or perhaps random_u32() ? */
-      nl->rx_buffer = xmalloc(NL_RX_SIZE);
-      nl->last_hdr = NULL;
-      nl->last_size = 0;
-    }
-}
-
-static void
-nl_open(void)
-{
-  nl_open_sock(&nl_scan);
-  nl_open_sock(&nl_req);
-}
-
-static void
-nl_send(struct nl_sock *nl, struct nlmsghdr *nh)
-{
-  struct sockaddr_nl sa;
-
-  memset(&sa, 0, sizeof(sa));
-  sa.nl_family = AF_NETLINK;
-  nh->nlmsg_pid = 0;
-  nh->nlmsg_seq = ++(nl->seq);
-  nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len);
-  if (sendto(nl->fd, nh, nh->nlmsg_len, 0, (struct sockaddr *)&sa, sizeof(sa)) < 0)
-    die("rtnetlink sendto: %m");
-  nl->last_hdr = NULL;
-}
-
-static void
-nl_request_dump(int af, int cmd)
-{
-  struct {
-    struct nlmsghdr nh;
-    struct rtgenmsg g;
-  } req = {
-    .nh.nlmsg_type = cmd,
-    .nh.nlmsg_len = sizeof(req),
-    .nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP,
-    .g.rtgen_family = af
-  };
-  nl_send(&nl_scan, &req.nh);
-}
-
-static struct nlmsghdr *
-nl_get_reply(struct nl_sock *nl)
-{
-  for(;;)
-    {
-      if (!nl->last_hdr)
-	{
-	  struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
-	  struct sockaddr_nl sa;
-	  struct msghdr m = {
-	    .msg_name = &sa,
-	    .msg_namelen = sizeof(sa),
-	    .msg_iov = &iov,
-	    .msg_iovlen = 1,
-	  };
-	  int x = recvmsg(nl->fd, &m, 0);
-	  if (x < 0)
-	    die("nl_get_reply: %m");
-	  if (sa.nl_pid)		/* It isn't from the kernel */
-	    {
-	      DBG("Non-kernel packet\n");
-	      continue;
-	    }
-	  nl->last_size = x;
-	  nl->last_hdr = (void *) nl->rx_buffer;
-	  if (m.msg_flags & MSG_TRUNC)
-	    bug("nl_get_reply: got truncated reply which should be impossible");
-	}
-      if (NLMSG_OK(nl->last_hdr, nl->last_size))
-	{
-	  struct nlmsghdr *h = nl->last_hdr;
-	  nl->last_hdr = NLMSG_NEXT(h, nl->last_size);
-	  if (h->nlmsg_seq != nl->seq)
-	    {
-	      log(L_WARN "nl_get_reply: Ignoring out of sequence netlink packet (%x != %x)",
-		  h->nlmsg_seq, nl->seq);
-	      continue;
-	    }
-	  return h;
-	}
-      if (nl->last_size)
-	log(L_WARN "nl_get_reply: Found packet remnant of size %d", nl->last_size);
-      nl->last_hdr = NULL;
-    }
-}
-
-static struct tbf rl_netlink_err = TBF_DEFAULT_LOG_LIMITS;
-
-static int
-nl_error(struct nlmsghdr *h, int ignore_esrch)
-{
-  struct nlmsgerr *e;
-  int ec;
-
-  if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
-    {
-      log(L_WARN "Netlink: Truncated error message received");
-      return ENOBUFS;
-    }
-  e = (struct nlmsgerr *) NLMSG_DATA(h);
-  ec = -e->error;
-  if (ec && !(ignore_esrch && (ec == ESRCH)))
-    log_rl(&rl_netlink_err, L_WARN "Netlink: %s", strerror(ec));
-  return ec;
-}
-
-static struct nlmsghdr *
-nl_get_scan(void)
-{
-  struct nlmsghdr *h = nl_get_reply(&nl_scan);
-
-  if (h->nlmsg_type == NLMSG_DONE)
-    return NULL;
-  if (h->nlmsg_type == NLMSG_ERROR)
-    {
-      nl_error(h, 0);
-      return NULL;
-    }
-  return h;
-}
-
-static int
-nl_exchange(struct nlmsghdr *pkt, int ignore_esrch)
-{
-  struct nlmsghdr *h;
-
-  nl_send(&nl_req, pkt);
-  for(;;)
-    {
-      h = nl_get_reply(&nl_req);
-      if (h->nlmsg_type == NLMSG_ERROR)
-	break;
-      log(L_WARN "nl_exchange: Unexpected reply received");
-    }
-  return nl_error(h, ignore_esrch) ? -1 : 0;
-}
-
-/*
- *	Netlink attributes
- */
-
-static int nl_attr_len;
-
-static void *
-nl_checkin(struct nlmsghdr *h, int lsize)
-{
-  nl_attr_len = h->nlmsg_len - NLMSG_LENGTH(lsize);
-  if (nl_attr_len < 0)
-    {
-      log(L_ERR "nl_checkin: underrun by %d bytes", -nl_attr_len);
-      return NULL;
-    }
-  return NLMSG_DATA(h);
-}
-
-struct nl_want_attrs {
-  u8 defined:1;
-  u8 checksize:1;
-  u8 size;
-};
-
-
-#define BIRD_IFLA_MAX (IFLA_WIRELESS+1)
-
-static struct nl_want_attrs ifla_attr_want[BIRD_IFLA_MAX] = {
-  [IFLA_IFNAME]	  = { 1, 0, 0 },
-  [IFLA_MTU]	  = { 1, 1, sizeof(u32) },
-  [IFLA_MASTER]	  = { 1, 1, sizeof(u32) },
-  [IFLA_WIRELESS] = { 1, 0, 0 },
-};
-
-
-#define BIRD_IFA_MAX  (IFA_FLAGS+1)
-
-static struct nl_want_attrs ifa_attr_want4[BIRD_IFA_MAX] = {
-  [IFA_ADDRESS]	  = { 1, 1, sizeof(ip4_addr) },
-  [IFA_LOCAL]	  = { 1, 1, sizeof(ip4_addr) },
-  [IFA_BROADCAST] = { 1, 1, sizeof(ip4_addr) },
-  [IFA_FLAGS]     = { 1, 1, sizeof(u32) },
-};
-
-static struct nl_want_attrs ifa_attr_want6[BIRD_IFA_MAX] = {
-  [IFA_ADDRESS]	  = { 1, 1, sizeof(ip6_addr) },
-  [IFA_LOCAL]	  = { 1, 1, sizeof(ip6_addr) },
-  [IFA_FLAGS]	  = { 1, 1, sizeof(u32) },
-};
-
-
-#define BIRD_RTA_MAX  (RTA_ENCAP+1)
-
-static struct nl_want_attrs nexthop_attr_want4[BIRD_RTA_MAX] = {
-  [RTA_GATEWAY]	  = { 1, 1, sizeof(ip4_addr) },
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_FLOW]	  = { 1, 1, sizeof(u32) },
-  [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
-  [RTA_ENCAP]	  = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs nexthop_attr_want6[BIRD_RTA_MAX] = {
-  [RTA_GATEWAY]	  = { 1, 1, sizeof(ip6_addr) },
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_FLOW]	  = { 1, 1, sizeof(u32) },
-  [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
-  [RTA_ENCAP]	  = { 1, 0, 0 },
-};
-
-#ifdef HAVE_MPLS_KERNEL
-static struct nl_want_attrs nexthop_attr_want_mpls[BIRD_RTA_MAX] = {
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_NEWDST]	  = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs encap_mpls_want[BIRD_RTA_MAX] = {
-  [RTA_DST]       = { 1, 0, 0 },
-};
-#endif
-
-static struct nl_want_attrs rtm_attr_want4[BIRD_RTA_MAX] = {
-  [RTA_DST]	  = { 1, 1, sizeof(ip4_addr) },
-  [RTA_OIF]	  = { 1, 1, sizeof(u32) },
-  [RTA_GATEWAY]	  = { 1, 1, sizeof(ip4_addr) },
-  [RTA_PRIORITY]  = { 1, 1, sizeof(u32) },
-  [RTA_PREFSRC]	  = { 1, 1, sizeof(ip4_addr) },
-  [RTA_METRICS]	  = { 1, 0, 0 },
-  [RTA_MULTIPATH] = { 1, 0, 0 },
-  [RTA_FLOW]	  = { 1, 1, sizeof(u32) },
-  [RTA_TABLE]	  = { 1, 1, sizeof(u32) },
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
-  [RTA_ENCAP]	  = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs rtm_attr_want6[BIRD_RTA_MAX] = {
-  [RTA_DST]	  = { 1, 1, sizeof(ip6_addr) },
-  [RTA_SRC]	  = { 1, 1, sizeof(ip6_addr) },
-  [RTA_IIF]	  = { 1, 1, sizeof(u32) },
-  [RTA_OIF]	  = { 1, 1, sizeof(u32) },
-  [RTA_GATEWAY]	  = { 1, 1, sizeof(ip6_addr) },
-  [RTA_PRIORITY]  = { 1, 1, sizeof(u32) },
-  [RTA_PREFSRC]	  = { 1, 1, sizeof(ip6_addr) },
-  [RTA_METRICS]	  = { 1, 0, 0 },
-  [RTA_MULTIPATH] = { 1, 0, 0 },
-  [RTA_FLOW]	  = { 1, 1, sizeof(u32) },
-  [RTA_TABLE]	  = { 1, 1, sizeof(u32) },
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
-  [RTA_ENCAP]	  = { 1, 0, 0 },
-};
-
-#ifdef HAVE_MPLS_KERNEL
-static struct nl_want_attrs rtm_attr_want_mpls[BIRD_RTA_MAX] = {
-  [RTA_DST]	  = { 1, 1, sizeof(u32) },
-  [RTA_IIF]	  = { 1, 1, sizeof(u32) },
-  [RTA_OIF]	  = { 1, 1, sizeof(u32) },
-  [RTA_PRIORITY]  = { 1, 1, sizeof(u32) },
-  [RTA_METRICS]	  = { 1, 0, 0 },
-  [RTA_MULTIPATH] = { 1, 0, 0 },
-  [RTA_FLOW]	  = { 1, 1, sizeof(u32) },
-  [RTA_TABLE]	  = { 1, 1, sizeof(u32) },
-  [RTA_VIA]	  = { 1, 0, 0 },
-  [RTA_NEWDST]	  = { 1, 0, 0 },
-};
-#endif
-
-
-static int
-nl_parse_attrs(struct rtattr *a, struct nl_want_attrs *want, struct rtattr **k, int ksize)
-{
-  int max = ksize / sizeof(struct rtattr *);
-  bzero(k, ksize);
-
-  for ( ; RTA_OK(a, nl_attr_len); a = RTA_NEXT(a, nl_attr_len))
-    {
-      if ((a->rta_type >= max) || !want[a->rta_type].defined)
-	continue;
-
-      if (want[a->rta_type].checksize && (RTA_PAYLOAD(a) != want[a->rta_type].size))
-	{
-	  log(L_ERR "nl_parse_attrs: Malformed attribute received");
-	  return 0;
-	}
-
-      k[a->rta_type] = a;
-    }
-
-  if (nl_attr_len)
-    {
-      log(L_ERR "nl_parse_attrs: remnant of size %d", nl_attr_len);
-      return 0;
-    }
-
-  return 1;
-}
-
-static inline u16 rta_get_u16(struct rtattr *a)
-{ return *(u16 *) RTA_DATA(a); }
-
-static inline u32 rta_get_u32(struct rtattr *a)
-{ return *(u32 *) RTA_DATA(a); }
-
-static inline ip4_addr rta_get_ip4(struct rtattr *a)
-{ return ip4_ntoh(*(ip4_addr *) RTA_DATA(a)); }
-
-static inline ip6_addr rta_get_ip6(struct rtattr *a)
-{ return ip6_ntoh(*(ip6_addr *) RTA_DATA(a)); }
-
-static inline ip_addr rta_get_ipa(struct rtattr *a)
-{
-  if (RTA_PAYLOAD(a) == sizeof(ip4_addr))
-    return ipa_from_ip4(rta_get_ip4(a));
-  else
-    return ipa_from_ip6(rta_get_ip6(a));
-}
-
-#ifdef HAVE_MPLS_KERNEL
-static inline ip_addr rta_get_via(struct rtattr *a)
-{
-  struct rtvia *v = RTA_DATA(a);
-  switch(v->rtvia_family) {
-    case AF_INET:  return ipa_from_ip4(ip4_ntoh(*(ip4_addr *) v->rtvia_addr));
-    case AF_INET6: return ipa_from_ip6(ip6_ntoh(*(ip6_addr *) v->rtvia_addr));
-  }
-  return IPA_NONE;
-}
-
-static u32 rta_mpls_stack[MPLS_MAX_LABEL_STACK];
-static inline int rta_get_mpls(struct rtattr *a, u32 *stack)
-{
-  if (!a)
-    return 0;
-
-  if (RTA_PAYLOAD(a) % 4)
-    log(L_WARN "KRT: Strange length of received MPLS stack: %u", RTA_PAYLOAD(a));
-
-  int labels = mpls_get(RTA_DATA(a), RTA_PAYLOAD(a) & ~0x3, stack);
-
-  if (labels < 0)
-  {
-    log(L_WARN "KRT: Too long MPLS stack received, ignoring");
-    labels = 0;
-  }
-
-  return labels;
-}
-#endif
-
-struct rtattr *
-nl_add_attr(struct nlmsghdr *h, uint bufsize, uint code, const void *data, uint dlen)
-{
-  uint pos = NLMSG_ALIGN(h->nlmsg_len);
-  uint len = RTA_LENGTH(dlen);
-
-  if (pos + len > bufsize)
-    bug("nl_add_attr: packet buffer overflow");
-
-  struct rtattr *a = (struct rtattr *)((char *)h + pos);
-  a->rta_type = code;
-  a->rta_len = len;
-  h->nlmsg_len = pos + len;
-
-  if (dlen > 0)
-    memcpy(RTA_DATA(a), data, dlen);
-
-  return a;
-}
-
-static inline struct rtattr *
-nl_open_attr(struct nlmsghdr *h, uint bufsize, uint code)
-{
-  return nl_add_attr(h, bufsize, code, NULL, 0);
-}
-
-static inline void
-nl_close_attr(struct nlmsghdr *h, struct rtattr *a)
-{
-  a->rta_len = (void *)h + NLMSG_ALIGN(h->nlmsg_len) - (void *)a;
-}
-
-static inline void
-nl_add_attr_u16(struct nlmsghdr *h, uint bufsize, int code, u16 data)
-{
-  nl_add_attr(h, bufsize, code, &data, 2);
-}
-
-static inline void
-nl_add_attr_u32(struct nlmsghdr *h, uint bufsize, int code, u32 data)
-{
-  nl_add_attr(h, bufsize, code, &data, 4);
-}
-
-static inline void
-nl_add_attr_ip4(struct nlmsghdr *h, uint bufsize, int code, ip4_addr ip4)
-{
-  ip4 = ip4_hton(ip4);
-  nl_add_attr(h, bufsize, code, &ip4, sizeof(ip4));
-}
-
-static inline void
-nl_add_attr_ip6(struct nlmsghdr *h, uint bufsize, int code, ip6_addr ip6)
-{
-  ip6 = ip6_hton(ip6);
-  nl_add_attr(h, bufsize, code, &ip6, sizeof(ip6));
-}
-
-static inline void
-nl_add_attr_ipa(struct nlmsghdr *h, uint bufsize, int code, ip_addr ipa)
-{
-  if (ipa_is_ip4(ipa))
-    nl_add_attr_ip4(h, bufsize, code, ipa_to_ip4(ipa));
-  else
-    nl_add_attr_ip6(h, bufsize, code, ipa_to_ip6(ipa));
-}
-
-#ifdef HAVE_MPLS_KERNEL
-static inline void
-nl_add_attr_mpls(struct nlmsghdr *h, uint bufsize, int code, int len, u32 *stack)
-{
-  char buf[len*4];
-  mpls_put(buf, len, stack);
-  nl_add_attr(h, bufsize, code, buf, len*4);
-}
-
-static inline void
-nl_add_attr_mpls_encap(struct nlmsghdr *h, uint bufsize, int len, u32 *stack)
-{
-  nl_add_attr_u16(h, bufsize, RTA_ENCAP_TYPE, LWTUNNEL_ENCAP_MPLS);
-
-  struct rtattr *nest = nl_open_attr(h, bufsize, RTA_ENCAP);
-  nl_add_attr_mpls(h, bufsize, RTA_DST, len, stack);
-  nl_close_attr(h, nest);
-}
-
-static inline void
-nl_add_attr_via(struct nlmsghdr *h, uint bufsize, ip_addr ipa)
-{
-  struct rtvia *via = alloca(sizeof(struct rtvia) + 16);
-
-  if (ipa_is_ip4(ipa))
-  {
-    via->rtvia_family = AF_INET;
-    put_ip4(via->rtvia_addr, ipa_to_ip4(ipa));
-    nl_add_attr(h, bufsize, RTA_VIA, via, sizeof(struct rtvia) + 4);
-  }
-  else
-  {
-    via->rtvia_family = AF_INET6;
-    put_ip6(via->rtvia_addr, ipa_to_ip6(ipa));
-    nl_add_attr(h, bufsize, RTA_VIA, via, sizeof(struct rtvia) + 16);
-  }
-}
-#endif
-
-static inline struct rtnexthop *
-nl_open_nexthop(struct nlmsghdr *h, uint bufsize)
-{
-  uint pos = NLMSG_ALIGN(h->nlmsg_len);
-  uint len = RTNH_LENGTH(0);
-
-  if (pos + len > bufsize)
-    bug("nl_open_nexthop: packet buffer overflow");
-
-  h->nlmsg_len = pos + len;
-
-  return (void *)h + pos;
-}
-
-static inline void
-nl_close_nexthop(struct nlmsghdr *h, struct rtnexthop *nh)
-{
-  nh->rtnh_len = (void *)h + NLMSG_ALIGN(h->nlmsg_len) - (void *)nh;
-}
-
-static inline void
-nl_add_nexthop(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af UNUSED)
-{
-#ifdef HAVE_MPLS_KERNEL
-  if (nh->labels > 0)
-    if (af == AF_MPLS)
-      nl_add_attr_mpls(h, bufsize, RTA_NEWDST, nh->labels, nh->label);
-    else
-      nl_add_attr_mpls_encap(h, bufsize, nh->labels, nh->label);
-
-  if (ipa_nonzero(nh->gw))
-  {
-    if (af == (ipa_is_ip4(nh->gw) ? AF_INET : AF_INET6))
-      nl_add_attr_ipa(h, bufsize, RTA_GATEWAY, nh->gw);
-    else
-      nl_add_attr_via(h, bufsize, nh->gw);
-  }
-#else
-
-  if (ipa_nonzero(nh->gw))
-    nl_add_attr_ipa(h, bufsize, RTA_GATEWAY, nh->gw);
-#endif
-}
-
-static void
-nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, ea_list *eattrs)
-{
-  struct rtattr *a = nl_open_attr(h, bufsize, RTA_MULTIPATH);
-  eattr *flow = ea_find(eattrs, EA_KRT_REALM);
-
-  for (; nh; nh = nh->next)
-  {
-    struct rtnexthop *rtnh = nl_open_nexthop(h, bufsize);
-
-    rtnh->rtnh_flags = 0;
-    rtnh->rtnh_hops = nh->weight;
-    rtnh->rtnh_ifindex = nh->iface->index;
-
-    nl_add_nexthop(h, bufsize, nh, af);
-
-    if (nh->flags & RNF_ONLINK)
-      rtnh->rtnh_flags |= RTNH_F_ONLINK;
-
-    /* Our KRT_REALM is per-route, but kernel RTA_FLOW is per-nexthop.
-       Therefore, we need to attach the same attribute to each nexthop. */
-    if (flow)
-      nl_add_attr_u32(h, bufsize, RTA_FLOW, flow->u.data);
-
-    nl_close_nexthop(h, rtnh);
-  }
-
-  nl_close_attr(h, a);
-}
-
-static struct nexthop *
-nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr *n, struct rtattr *ra, int af, int krt_src)
-{
-  struct rtattr *a[BIRD_RTA_MAX];
-  struct rtnexthop *nh = RTA_DATA(ra);
-  struct nexthop *rv, *first, **last;
-  unsigned len = RTA_PAYLOAD(ra);
-
-  first = NULL;
-  last = &first;
-
-  while (len)
-    {
-      /* Use RTNH_OK(nh,len) ?? */
-      if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
-	goto err;
-
-      if ((nh->rtnh_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
-	goto next;
-
-      *last = rv = lp_allocz(s->pool, NEXTHOP_MAX_SIZE);
-      last = &(rv->next);
-
-      rv->weight = nh->rtnh_hops;
-      rv->iface = if_find_by_index(nh->rtnh_ifindex);
-      if (!rv->iface)
-	{
-	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", n, nh->rtnh_ifindex);
-	  return NULL;
-	}
-
-      /* Nonexistent RTNH_PAYLOAD ?? */
-      nl_attr_len = nh->rtnh_len - RTNH_LENGTH(0);
-      switch (af)
-        {
-	case AF_INET:
-	  if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want4, a, sizeof(a)))
-	    goto err;
-	  break;
-
-	case AF_INET6:
-	  if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want6, a, sizeof(a)))
-	    goto err;
-	  break;
-
-#ifdef HAVE_MPLS_KERNEL
-	case AF_MPLS:
-	  if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want_mpls, a, sizeof(a)))
-	    goto err;
-
-	  if (a[RTA_NEWDST])
-	    rv->labels = rta_get_mpls(a[RTA_NEWDST], rv->label);
-
-	  break;
-#endif
-
-	default:
-	  goto err;
-	}
-
-      if (a[RTA_GATEWAY])
-	rv->gw = rta_get_ipa(a[RTA_GATEWAY]);
-
-      if (a[RTA_FLOW])
-	s->rta_flow = rta_get_u32(a[RTA_FLOW]);
-
-#ifdef HAVE_MPLS_KERNEL
-      if (a[RTA_VIA])
-	rv->gw = rta_get_via(a[RTA_VIA]);
-#endif
-
-      if (ipa_nonzero(rv->gw))
-	{
-	  if (nh->rtnh_flags & RTNH_F_ONLINK)
-	    rv->flags |= RNF_ONLINK;
-
-	  neighbor *nbr;
-	  nbr = neigh_find(&p->p, rv->gw, rv->iface,
-			   (rv->flags & RNF_ONLINK) ? NEF_ONLINK : 0);
-	  if (!nbr || (nbr->scope == SCOPE_HOST))
-	    {
-	        log(L_ERR "KRT: Received route %N with strange next-hop %I", n, rv->gw);
-	        return NULL;
-	    }
-	}
-
-#ifdef HAVE_MPLS_KERNEL
-      if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE])
-      {
-	if (rta_get_u16(a[RTA_ENCAP_TYPE]) != LWTUNNEL_ENCAP_MPLS)
-	{
-	  log(L_WARN "KRT: Received route %N with unknown encapsulation method %d",
-	      n, rta_get_u16(a[RTA_ENCAP_TYPE]));
-	  return NULL;
-	}
-
-	struct rtattr *enca[BIRD_RTA_MAX];
-	nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
-	nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
-	rv->labels = rta_get_mpls(enca[RTA_DST], rv->label);
-      }
-#endif
-
-    next:
-      len -= NLMSG_ALIGN(nh->rtnh_len);
-      nh = RTNH_NEXT(nh);
-    }
-
-  /* Ensure nexthops are sorted to satisfy nest invariant */
-  if (!nexthop_is_sorted(first))
-    first = nexthop_sort(first);
-
-  return first;
-
-err:
-  log(L_ERR "KRT: Received strange multipath route %N", n);
-  return NULL;
-}
-
-static void
-nl_add_metrics(struct nlmsghdr *h, uint bufsize, u32 *metrics, int max)
-{
-  struct rtattr *a = nl_open_attr(h, bufsize, RTA_METRICS);
-  int t;
-
-  for (t = 1; t < max; t++)
-    if (metrics[0] & (1 << t))
-      nl_add_attr_u32(h, bufsize, t, metrics[t]);
-
-  nl_close_attr(h, a);
-}
-
-static int
-nl_parse_metrics(struct rtattr *hdr, u32 *metrics, int max)
-{
-  struct rtattr *a = RTA_DATA(hdr);
-  int len = RTA_PAYLOAD(hdr);
-
-  metrics[0] = 0;
-  for (; RTA_OK(a, len); a = RTA_NEXT(a, len))
-  {
-    if (a->rta_type == RTA_UNSPEC)
-      continue;
-
-    if (a->rta_type >= max)
-      continue;
-
-    if (RTA_PAYLOAD(a) != 4)
-      return -1;
-
-    metrics[0] |= 1 << a->rta_type;
-    metrics[a->rta_type] = rta_get_u32(a);
-  }
-
-  if (len > 0)
-    return -1;
-
-  return 0;
-}
-
-
-/*
- *	Scanning of interfaces
- */
-
-static void
-nl_parse_link(struct nlmsghdr *h, int scan)
-{
-  struct ifinfomsg *i;
-  struct rtattr *a[BIRD_IFLA_MAX];
-  int new = h->nlmsg_type == RTM_NEWLINK;
-  struct iface f = {};
-  struct iface *ifi;
-  char *name;
-  u32 mtu, master = 0;
-  uint fl;
-
-  if (!(i = nl_checkin(h, sizeof(*i))) || !nl_parse_attrs(IFLA_RTA(i), ifla_attr_want, a, sizeof(a)))
-    return;
-  if (!a[IFLA_IFNAME] || (RTA_PAYLOAD(a[IFLA_IFNAME]) < 2) || !a[IFLA_MTU])
-    {
-      /*
-       * IFLA_IFNAME and IFLA_MTU are required, in fact, but there may also come
-       * a message with IFLA_WIRELESS set, where (e.g.) no IFLA_IFNAME exists.
-       * We simply ignore all such messages with IFLA_WIRELESS without notice.
-       */
-
-      if (a[IFLA_WIRELESS])
-	return;
-
-      log(L_ERR "KIF: Malformed message received");
-      return;
-    }
-
-  name = RTA_DATA(a[IFLA_IFNAME]);
-  mtu = rta_get_u32(a[IFLA_MTU]);
-
-  if (a[IFLA_MASTER])
-    master = rta_get_u32(a[IFLA_MASTER]);
-
-  ifi = if_find_by_index(i->ifi_index);
-  if (!new)
-    {
-      DBG("KIF: IF%d(%s) goes down\n", i->ifi_index, name);
-      if (!ifi)
-	return;
-
-      if_delete(ifi);
-    }
-  else
-    {
-      DBG("KIF: IF%d(%s) goes up (mtu=%d,flg=%x)\n", i->ifi_index, name, mtu, i->ifi_flags);
-      if (ifi && strncmp(ifi->name, name, sizeof(ifi->name)-1))
-	if_delete(ifi);
-
-      strncpy(f.name, name, sizeof(f.name)-1);
-      f.index = i->ifi_index;
-      f.mtu = mtu;
-
-      f.master_index = master;
-      f.master = if_find_by_index(master);
-
-      fl = i->ifi_flags;
-      if (fl & IFF_UP)
-	f.flags |= IF_ADMIN_UP;
-      if (fl & IFF_LOWER_UP)
-	f.flags |= IF_LINK_UP;
-      if (fl & IFF_LOOPBACK)		/* Loopback */
-	f.flags |= IF_MULTIACCESS | IF_LOOPBACK | IF_IGNORE;
-      else if (fl & IFF_POINTOPOINT)	/* PtP */
-	f.flags |= IF_MULTICAST;
-      else if (fl & IFF_BROADCAST)	/* Broadcast */
-	f.flags |= IF_MULTIACCESS | IF_BROADCAST | IF_MULTICAST;
-      else
-	f.flags |= IF_MULTIACCESS;	/* NBMA */
-
-      if (fl & IFF_MULTICAST)
-	f.flags |= IF_MULTICAST;
-
-      ifi = if_update(&f);
-
-      if (!scan)
-	if_end_partial_update(ifi);
-    }
-}
-
-static void
-nl_parse_addr4(struct ifaddrmsg *i, int scan, int new)
-{
-  struct rtattr *a[BIRD_IFA_MAX];
-  struct iface *ifi;
-  u32 ifa_flags;
-  int scope;
-
-  if (!nl_parse_attrs(IFA_RTA(i), ifa_attr_want4, a, sizeof(a)))
-    return;
-
-  if (!a[IFA_LOCAL])
-    {
-      log(L_ERR "KIF: Malformed message received (missing IFA_LOCAL)");
-      return;
-    }
-  if (!a[IFA_ADDRESS])
-    {
-      log(L_ERR "KIF: Malformed message received (missing IFA_ADDRESS)");
-      return;
-    }
-
-  ifi = if_find_by_index(i->ifa_index);
-  if (!ifi)
-    {
-      log(L_ERR "KIF: Received address message for unknown interface %d", i->ifa_index);
-      return;
-    }
-
-  if (a[IFA_FLAGS])
-    ifa_flags = rta_get_u32(a[IFA_FLAGS]);
-  else
-    ifa_flags = i->ifa_flags;
-
-  struct ifa ifa;
-  bzero(&ifa, sizeof(ifa));
-  ifa.iface = ifi;
-  if (ifa_flags & IFA_F_SECONDARY)
-    ifa.flags |= IA_SECONDARY;
-
-  ifa.ip = rta_get_ipa(a[IFA_LOCAL]);
-
-  if (i->ifa_prefixlen > IP4_MAX_PREFIX_LENGTH)
-    {
-      log(L_ERR "KIF: Invalid prefix length for interface %s: %d", ifi->name, i->ifa_prefixlen);
-      new = 0;
-    }
-  if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH)
-    {
-      ifa.brd = rta_get_ipa(a[IFA_ADDRESS]);
-      net_fill_ip4(&ifa.prefix, rta_get_ip4(a[IFA_ADDRESS]), i->ifa_prefixlen);
-
-      /* It is either a host address or a peer address */
-      if (ipa_equal(ifa.ip, ifa.brd))
-	ifa.flags |= IA_HOST;
-      else
-	{
-	  ifa.flags |= IA_PEER;
-	  ifa.opposite = ifa.brd;
-	}
-    }
-  else
-    {
-      net_fill_ip4(&ifa.prefix, ipa_to_ip4(ifa.ip), i->ifa_prefixlen);
-      net_normalize(&ifa.prefix);
-
-      if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 1)
-	ifa.opposite = ipa_opposite_m1(ifa.ip);
-
-      if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 2)
-	ifa.opposite = ipa_opposite_m2(ifa.ip);
-
-      if (ifi->flags & IF_BROADCAST)
-        {
-	  /* If kernel offers us a broadcast address, we trust it */
-	  if (a[IFA_BROADCAST])
-	    ifa.brd = ipa_from_ip4(rta_get_ip4(a[IFA_BROADCAST]));
-	  /* Otherwise we create one (except for /31) */
-	  else if (i->ifa_prefixlen < (IP4_MAX_PREFIX_LENGTH - 1))
-	    ifa.brd = ipa_from_ip4(ip4_or(ipa_to_ip4(ifa.ip),
-					  ip4_not(ip4_mkmask(i->ifa_prefixlen))));
-	}
-    }
-
-  scope = ipa_classify(ifa.ip);
-  if (scope < 0)
-    {
-      log(L_ERR "KIF: Invalid interface address %I for %s", ifa.ip, ifi->name);
-      return;
-    }
-  ifa.scope = scope & IADDR_SCOPE_MASK;
-
-  DBG("KIF: IF%d(%s): %s IPA %I, flg %x, net %N, brd %I, opp %I\n",
-      ifi->index, ifi->name,
-      new ? "added" : "removed",
-      ifa.ip, ifa.flags, &ifa.prefix, ifa.brd, ifa.opposite);
-
-  if (new)
-    ifa_update(&ifa);
-  else
-    ifa_delete(&ifa);
-
-  if (!scan)
-    if_end_partial_update(ifi);
-}
-
-static void
-nl_parse_addr6(struct ifaddrmsg *i, int scan, int new)
-{
-  struct rtattr *a[BIRD_IFA_MAX];
-  struct iface *ifi;
-  u32 ifa_flags;
-  int scope;
-
-  if (!nl_parse_attrs(IFA_RTA(i), ifa_attr_want6, a, sizeof(a)))
-    return;
-
-  if (!a[IFA_ADDRESS])
-    {
-      log(L_ERR "KIF: Malformed message received (missing IFA_ADDRESS)");
-      return;
-    }
-
-  ifi = if_find_by_index(i->ifa_index);
-  if (!ifi)
-    {
-      log(L_ERR "KIF: Received address message for unknown interface %d", i->ifa_index);
-      return;
-    }
-
-  if (a[IFA_FLAGS])
-    ifa_flags = rta_get_u32(a[IFA_FLAGS]);
-  else
-    ifa_flags = i->ifa_flags;
-
-  struct ifa ifa;
-  bzero(&ifa, sizeof(ifa));
-  ifa.iface = ifi;
-  if (ifa_flags & IFA_F_SECONDARY)
-    ifa.flags |= IA_SECONDARY;
-
-  /* Ignore tentative addresses silently */
-  if (ifa_flags & IFA_F_TENTATIVE)
-    return;
-
-  /* IFA_LOCAL can be unset for IPv6 interfaces */
-  ifa.ip = rta_get_ipa(a[IFA_LOCAL] ? : a[IFA_ADDRESS]);
-
-  if (i->ifa_prefixlen > IP6_MAX_PREFIX_LENGTH)
-    {
-      log(L_ERR "KIF: Invalid prefix length for interface %s: %d", ifi->name, i->ifa_prefixlen);
-      new = 0;
-    }
-  if (i->ifa_prefixlen == IP6_MAX_PREFIX_LENGTH)
-    {
-      ifa.brd = rta_get_ipa(a[IFA_ADDRESS]);
-      net_fill_ip6(&ifa.prefix, rta_get_ip6(a[IFA_ADDRESS]), i->ifa_prefixlen);
-
-      /* It is either a host address or a peer address */
-      if (ipa_equal(ifa.ip, ifa.brd))
-	ifa.flags |= IA_HOST;
-      else
-	{
-	  ifa.flags |= IA_PEER;
-	  ifa.opposite = ifa.brd;
-	}
-    }
-  else
-    {
-      net_fill_ip6(&ifa.prefix, ipa_to_ip6(ifa.ip), i->ifa_prefixlen);
-      net_normalize(&ifa.prefix);
-
-      if (i->ifa_prefixlen == IP6_MAX_PREFIX_LENGTH - 1)
-	ifa.opposite = ipa_opposite_m1(ifa.ip);
-    }
-
-  scope = ipa_classify(ifa.ip);
-  if (scope < 0)
-    {
-      log(L_ERR "KIF: Invalid interface address %I for %s", ifa.ip, ifi->name);
-      return;
-    }
-  ifa.scope = scope & IADDR_SCOPE_MASK;
-
-  DBG("KIF: IF%d(%s): %s IPA %I, flg %x, net %N, brd %I, opp %I\n",
-      ifi->index, ifi->name,
-      new ? "added" : "removed",
-      ifa.ip, ifa.flags, &ifa.prefix, ifa.brd, ifa.opposite);
-
-  if (new)
-    ifa_update(&ifa);
-  else
-    ifa_delete(&ifa);
-
-  if (!scan)
-    if_end_partial_update(ifi);
-}
-
-static void
-nl_parse_addr(struct nlmsghdr *h, int scan)
-{
-  struct ifaddrmsg *i;
-
-  if (!(i = nl_checkin(h, sizeof(*i))))
-    return;
-
-  int new = (h->nlmsg_type == RTM_NEWADDR);
-
-  switch (i->ifa_family)
-    {
-      case AF_INET:
-	return nl_parse_addr4(i, scan, new);
-
-      case AF_INET6:
-	return nl_parse_addr6(i, scan, new);
-    }
-}
-
-void
-kif_do_scan(struct kif_proto *p UNUSED)
-{
-  struct nlmsghdr *h;
-
-  if_start_update();
-
-  nl_request_dump(AF_UNSPEC, RTM_GETLINK);
-  while (h = nl_get_scan())
-    if (h->nlmsg_type == RTM_NEWLINK || h->nlmsg_type == RTM_DELLINK)
-      nl_parse_link(h, 1);
-    else
-      log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
-  /* Re-resolve master interface for slaves */
-  struct iface *i;
-  WALK_LIST(i, iface_list)
-    if (i->master_index)
-    {
-      struct iface f = {
-	.flags = i->flags,
-	.mtu = i->mtu,
-	.index = i->index,
-	.master_index = i->master_index,
-	.master = if_find_by_index(i->master_index)
-      };
-
-      if (f.master != i->master)
-      {
-	memcpy(f.name, i->name, sizeof(f.name));
-	if_update(&f);
-      }
-    }
-
-  nl_request_dump(AF_INET, RTM_GETADDR);
-  while (h = nl_get_scan())
-    if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR)
-      nl_parse_addr(h, 1);
-    else
-      log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
-  nl_request_dump(AF_INET6, RTM_GETADDR);
-  while (h = nl_get_scan())
-    if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR)
-      nl_parse_addr(h, 1);
-    else
-      log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
-  if_end_update();
-}
-
-/*
- *	Routes
- */
-
-static inline u32
-krt_table_id(struct krt_proto *p)
-{
-  return KRT_CF->sys.table_id;
-}
-
-static HASH(struct krt_proto) nl_table_map;
-
-#define RTH_KEY(p)		p->af, krt_table_id(p)
-#define RTH_NEXT(p)		p->sys.hash_next
-#define RTH_EQ(a1,i1,a2,i2)	a1 == a2 && i1 == i2
-#define RTH_FN(a,i)		a ^ u32_hash(i)
-
-#define RTH_REHASH		rth_rehash
-#define RTH_PARAMS		/8, *2, 2, 2, 6, 20
-
-HASH_DEFINE_REHASH_FN(RTH, struct krt_proto)
-
-int
-krt_capable(rte *e)
-{
-  rta *a = e->attrs;
-
-  switch (a->dest)
-  {
-    case RTD_UNICAST:
-    case RTD_BLACKHOLE:
-    case RTD_UNREACHABLE:
-    case RTD_PROHIBIT:
-      return 1;
-
-    default:
-      return 0;
-  }
-}
-
-static inline int
-nh_bufsize(struct nexthop *nh)
-{
-  int rv = 0;
-  for (; nh != NULL; nh = nh->next)
-    rv += RTNH_LENGTH(RTA_LENGTH(sizeof(ip_addr)));
-  return rv;
-}
-
-static int
-nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
-{
-  eattr *ea;
-  net *net = e->net;
-  rta *a = e->attrs;
-  ea_list *eattrs = a->eattrs;
-  int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh));
-  u32 priority = 0;
-
-  struct {
-    struct nlmsghdr h;
-    struct rtmsg r;
-    char buf[0];
-  } *r;
-
-  int rsize = sizeof(*r) + bufsize;
-  r = alloca(rsize);
-
-  DBG("nl_send_route(%N,op=%x)\n", net->n.addr, op);
-
-  bzero(&r->h, sizeof(r->h));
-  bzero(&r->r, sizeof(r->r));
-  r->h.nlmsg_type = op ? RTM_NEWROUTE : RTM_DELROUTE;
-  r->h.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-  r->h.nlmsg_flags = op | NLM_F_REQUEST | NLM_F_ACK;
-
-  r->r.rtm_family = p->af;
-  r->r.rtm_dst_len = net_pxlen(net->n.addr);
-  r->r.rtm_protocol = RTPROT_BIRD;
-  r->r.rtm_scope = RT_SCOPE_NOWHERE;
-#ifdef HAVE_MPLS_KERNEL
-  if (p->af == AF_MPLS)
-  {
-    /*
-     * Kernel MPLS code is a bit picky. We must:
-     * 1) Always set RT_SCOPE_UNIVERSE and RTN_UNICAST (even for RTM_DELROUTE)
-     * 2) Never use RTA_PRIORITY
-     */
-
-    u32 label = net_mpls(net->n.addr);
-    nl_add_attr_mpls(&r->h, rsize, RTA_DST, 1, &label);
-    r->r.rtm_scope = RT_SCOPE_UNIVERSE;
-    r->r.rtm_type = RTN_UNICAST;
-  }
-  else
-#endif
-  {
-    nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(net->n.addr));
-
-    /* Add source address for IPv6 SADR routes */
-    if (net->n.addr->type == NET_IP6_SADR)
-    {
-      net_addr_ip6_sadr *a = (void *) &net->n.addr;
-      nl_add_attr_ip6(&r->h, rsize, RTA_SRC, a->src_prefix);
-      r->r.rtm_src_len = a->src_pxlen;
-    }
-  }
-
-  /*
-   * Strange behavior for RTM_DELROUTE:
-   * 1) rtm_family is ignored in IPv6, works for IPv4
-   * 2) not setting RTA_PRIORITY is different from setting default value (on IPv6)
-   * 3) not setting RTA_PRIORITY is equivalent to setting 0, which is wildcard
-   */
-
-  if (krt_table_id(p) < 256)
-    r->r.rtm_table = krt_table_id(p);
-  else
-    nl_add_attr_u32(&r->h, rsize, RTA_TABLE, krt_table_id(p));
-
-  if (p->af == AF_MPLS)
-    priority = 0;
-  else if (a->source == RTS_DUMMY)
-    priority = e->u.krt.metric;
-  else if (KRT_CF->sys.metric)
-    priority = KRT_CF->sys.metric;
-  else if ((op != NL_OP_DELETE) && (ea = ea_find(eattrs, EA_KRT_METRIC)))
-    priority = ea->u.data;
-
-  if (priority)
-    nl_add_attr_u32(&r->h, rsize, RTA_PRIORITY, priority);
-
-  /* For route delete, we do not specify remaining route attributes */
-  if (op == NL_OP_DELETE)
-    goto dest;
-
-  /* Default scope is LINK for device routes, UNIVERSE otherwise */
-  if (p->af == AF_MPLS)
-    r->r.rtm_scope = RT_SCOPE_UNIVERSE;
-  else if (ea = ea_find(eattrs, EA_KRT_SCOPE))
-    r->r.rtm_scope = ea->u.data;
-  else
-    r->r.rtm_scope = (dest == RTD_UNICAST && ipa_zero(nh->gw)) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
-
-  if (ea = ea_find(eattrs, EA_KRT_PREFSRC))
-    nl_add_attr_ipa(&r->h, rsize, RTA_PREFSRC, *(ip_addr *)ea->u.ptr->data);
-
-  if (ea = ea_find(eattrs, EA_KRT_REALM))
-    nl_add_attr_u32(&r->h, rsize, RTA_FLOW, ea->u.data);
-
-
-  u32 metrics[KRT_METRICS_MAX];
-  metrics[0] = 0;
-
-  struct ea_walk_state ews = { .eattrs = eattrs };
-  while (ea = ea_walk(&ews, EA_KRT_METRICS, KRT_METRICS_MAX))
-  {
-    int id = ea->id - EA_KRT_METRICS;
-    metrics[0] |= 1 << id;
-    metrics[id] = ea->u.data;
-  }
-
-  if (metrics[0])
-    nl_add_metrics(&r->h, rsize, metrics, KRT_METRICS_MAX);
-
-
-dest:
-  switch (dest)
-    {
-    case RTD_UNICAST:
-      r->r.rtm_type = RTN_UNICAST;
-      if (nh->next && !krt_ecmp6(p))
-	nl_add_multipath(&r->h, rsize, nh, p->af, eattrs);
-      else
-      {
-	nl_add_attr_u32(&r->h, rsize, RTA_OIF, nh->iface->index);
-	nl_add_nexthop(&r->h, rsize, nh, p->af);
-
-	if (nh->flags & RNF_ONLINK)
-	  r->r.rtm_flags |= RTNH_F_ONLINK;
-      }
-      break;
-    case RTD_BLACKHOLE:
-      r->r.rtm_type = RTN_BLACKHOLE;
-      break;
-    case RTD_UNREACHABLE:
-      r->r.rtm_type = RTN_UNREACHABLE;
-      break;
-    case RTD_PROHIBIT:
-      r->r.rtm_type = RTN_PROHIBIT;
-      break;
-    case RTD_NONE:
-      break;
-    default:
-      bug("krt_capable inconsistent with nl_send_route");
-    }
-
-  /* Ignore missing for DELETE */
-  return nl_exchange(&r->h, (op == NL_OP_DELETE));
-}
-
-static inline int
-nl_add_rte(struct krt_proto *p, rte *e)
-{
-  rta *a = e->attrs;
-  int err = 0;
-
-  if (krt_ecmp6(p) && a->nh.next)
-  {
-    struct nexthop *nh = &(a->nh);
-
-    err = nl_send_route(p, e, NL_OP_ADD, RTD_UNICAST, nh);
-    if (err < 0)
-      return err;
-
-    for (nh = nh->next; nh; nh = nh->next)
-      err += nl_send_route(p, e, NL_OP_APPEND, RTD_UNICAST, nh);
-
-    return err;
-  }
-
-  return nl_send_route(p, e, NL_OP_ADD, a->dest, &(a->nh));
-}
-
-static inline int
-nl_delete_rte(struct krt_proto *p, rte *e)
-{
-  int err = 0;
-
-  /* For IPv6, we just repeatedly request DELETE until we get error */
-  do
-    err = nl_send_route(p, e, NL_OP_DELETE, RTD_NONE, NULL);
-  while (krt_ecmp6(p) && !err);
-
-  return err;
-}
-
-static inline int
-nl_replace_rte(struct krt_proto *p, rte *e)
-{
-  rta *a = e->attrs;
-  return nl_send_route(p, e, NL_OP_REPLACE, a->dest, &(a->nh));
-}
-
-
-void
-krt_replace_rte(struct krt_proto *p, net *n UNUSED, rte *new, rte *old)
-{
-  int err = 0;
-
-  /*
-   * We use NL_OP_REPLACE for IPv4, it has an issue with not checking for
-   * matching rtm_protocol, but that is OK when dedicated priority is used.
-   *
-   * We do not use NL_OP_REPLACE for IPv6, as it has broken semantics for ECMP
-   * and with some kernel versions ECMP replace crashes kernel. Would need more
-   * testing and checks for kernel versions.
-   *
-   * For IPv6, we use NL_OP_DELETE and then NL_OP_ADD. We also do not trust the
-   * old route value, so we do not try to optimize IPv6 ECMP reconfigurations.
-   */
-
-  if (krt_ipv4(p) && old && new)
-  {
-    err = nl_replace_rte(p, new);
-  }
-  else
-  {
-    if (old)
-      nl_delete_rte(p, old);
-
-    if (new)
-      err = nl_add_rte(p, new);
-  }
-
-  if (new)
-  {
-    if (err < 0)
-      bmap_clear(&p->sync_map, new->id);
-    else
-      bmap_set(&p->sync_map, new->id);
-  }
-}
-
-static int
-nl_mergable_route(struct nl_parse_state *s, net *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family)
-{
-  /* Route merging is used for IPv6 scans */
-  if (!s->scan || (rtm_family != AF_INET6))
-    return 0;
-
-  /* Saved and new route must have same network, proto/table, and priority */
-  if ((s->net != net) || (s->proto != p) || (s->krt_metric != priority))
-    return 0;
-
-  /* Both must be regular unicast routes */
-  if ((s->krt_type != RTN_UNICAST) || (krt_type != RTN_UNICAST))
-    return 0;
-
-  return 1;
-}
-
-static void
-nl_announce_route(struct nl_parse_state *s)
-{
-  rte *e = rte_get_temp(s->attrs);
-  e->net = s->net;
-  e->u.krt.src = s->krt_src;
-  e->u.krt.proto = s->krt_proto;
-  e->u.krt.seen = 0;
-  e->u.krt.best = 0;
-  e->u.krt.metric = s->krt_metric;
-
-  if (s->scan)
-    krt_got_route(s->proto, e);
-  else
-    krt_got_route_async(s->proto, e, s->new);
-
-  s->net = NULL;
-  s->attrs = NULL;
-  s->proto = NULL;
-  lp_flush(s->pool);
-}
-
-static inline void
-nl_parse_begin(struct nl_parse_state *s, int scan)
-{
-  memset(s, 0, sizeof (struct nl_parse_state));
-  s->pool = nl_linpool;
-  s->scan = scan;
-}
-
-static inline void
-nl_parse_end(struct nl_parse_state *s)
-{
-  if (s->net)
-    nl_announce_route(s);
-}
-
-
-#define SKIP0(ARG, ...) do { DBG("KRT: Ignoring route - " ARG, ##__VA_ARGS__); return; } while(0)
-#define SKIP(ARG, ...)  do { DBG("KRT: Ignoring route %N - " ARG, &dst, ##__VA_ARGS__); return; } while(0)
-
-static void
-nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
-{
-  struct krt_proto *p;
-  struct rtmsg *i;
-  struct rtattr *a[BIRD_RTA_MAX];
-  int new = h->nlmsg_type == RTM_NEWROUTE;
-
-  net_addr dst, src = {};
-  u32 oif = ~0;
-  u32 table_id;
-  u32 priority = 0;
-  u32 def_scope = RT_SCOPE_UNIVERSE;
-  int krt_src;
-
-  if (!(i = nl_checkin(h, sizeof(*i))))
-    return;
-
-  switch (i->rtm_family)
-    {
-    case AF_INET:
-      if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want4, a, sizeof(a)))
-	return;
-
-      if (a[RTA_DST])
-	net_fill_ip4(&dst, rta_get_ip4(a[RTA_DST]), i->rtm_dst_len);
-      else
-	net_fill_ip4(&dst, IP4_NONE, 0);
-      break;
-
-    case AF_INET6:
-      if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want6, a, sizeof(a)))
-	return;
-
-      if (a[RTA_DST])
-	net_fill_ip6(&dst, rta_get_ip6(a[RTA_DST]), i->rtm_dst_len);
-      else
-	net_fill_ip6(&dst, IP6_NONE, 0);
-
-      if (a[RTA_SRC])
-	net_fill_ip6(&src, rta_get_ip6(a[RTA_SRC]), i->rtm_src_len);
-      else
-	net_fill_ip6(&src, IP6_NONE, 0);
-      break;
-
-#ifdef HAVE_MPLS_KERNEL
-    case AF_MPLS:
-      if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want_mpls, a, sizeof(a)))
-	return;
-
-      if (!a[RTA_DST])
-	SKIP0("MPLS route without RTA_DST\n");
-
-      if (rta_get_mpls(a[RTA_DST], rta_mpls_stack) != 1)
-	SKIP0("MPLS route with multi-label RTA_DST\n");
-
-      net_fill_mpls(&dst, rta_mpls_stack[0]);
-      break;
-#endif
-
-    default:
-      return;
-    }
-
-  if (a[RTA_OIF])
-    oif = rta_get_u32(a[RTA_OIF]);
-
-  if (a[RTA_TABLE])
-    table_id = rta_get_u32(a[RTA_TABLE]);
-  else
-    table_id = i->rtm_table;
-
-  if (i->rtm_flags & RTM_F_CLONED)
-    SKIP("cloned\n");
-
-  /* Do we know this table? */
-  p = HASH_FIND(nl_table_map, RTH, i->rtm_family, table_id);
-  if (!p)
-    SKIP("unknown table %u\n", table_id);
-
-  if (a[RTA_SRC] && (p->p.net_type != NET_IP6_SADR))
-    SKIP("src prefix for non-SADR channel\n");
-
-  if (a[RTA_IIF])
-    SKIP("IIF set\n");
-
-  if (i->rtm_tos != 0)			/* We don't support TOS */
-    SKIP("TOS %02x\n", i->rtm_tos);
-
-  if (s->scan && !new)
-    SKIP("RTM_DELROUTE in scan\n");
-
-  if (a[RTA_PRIORITY])
-    priority = rta_get_u32(a[RTA_PRIORITY]);
-
-  int c = net_classify(&dst);
-  if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
-    SKIP("strange class/scope\n");
-
-  switch (i->rtm_protocol)
-    {
-    case RTPROT_UNSPEC:
-      SKIP("proto unspec\n");
-
-    case RTPROT_REDIRECT:
-      krt_src = KRT_SRC_REDIRECT;
-      break;
-
-    case RTPROT_KERNEL:
-      krt_src = KRT_SRC_KERNEL;
-      return;
-
-    case RTPROT_BIRD:
-      if (!s->scan)
-	SKIP("echo\n");
-      krt_src = KRT_SRC_BIRD;
-      break;
-
-    case RTPROT_BOOT:
-    default:
-      krt_src = KRT_SRC_ALIEN;
-    }
-
-  net_addr *n = &dst;
-  if (p->p.net_type == NET_IP6_SADR)
-  {
-    n = alloca(sizeof(net_addr_ip6_sadr));
-    net_fill_ip6_sadr(n, net6_prefix(&dst), net6_pxlen(&dst),
-		      net6_prefix(&src), net6_pxlen(&src));
-  }
-
-  net *net = net_get(p->p.main_channel->table, n);
-
-  if (s->net && !nl_mergable_route(s, net, p, priority, i->rtm_type, i->rtm_family))
-    nl_announce_route(s);
-
-  rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
-  ra->src = p->p.main_source;
-  ra->source = RTS_INHERIT;
-  ra->scope = SCOPE_UNIVERSE;
-
-  if (a[RTA_FLOW])
-    s->rta_flow = rta_get_u32(a[RTA_FLOW]);
-  else
-    s->rta_flow = 0;
-
-  switch (i->rtm_type)
-    {
-    case RTN_UNICAST:
-      ra->dest = RTD_UNICAST;
-
-      if (a[RTA_MULTIPATH])
-        {
-	  struct nexthop *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
-	  if (!nh)
-	    SKIP("strange RTA_MULTIPATH\n");
-
-	  nexthop_link(ra, nh);
-	  break;
-	}
-
-      if ((i->rtm_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
-	SKIP("ignore RTNH_F_DEAD\n");
-
-      ra->nh.iface = if_find_by_index(oif);
-      if (!ra->nh.iface)
-	{
-	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", net->n.addr, oif);
-	  return;
-	}
-
-      if (a[RTA_GATEWAY])
-	ra->nh.gw = rta_get_ipa(a[RTA_GATEWAY]);
-
-#ifdef HAVE_MPLS_KERNEL
-      if (a[RTA_VIA])
-	ra->nh.gw = rta_get_via(a[RTA_VIA]);
-#endif
-
-      if (ipa_nonzero(ra->nh.gw))
-	{
-	  /* Silently skip strange 6to4 routes */
-	  const net_addr_ip6 sit = NET_ADDR_IP6(IP6_NONE, 96);
-	  if ((i->rtm_family == AF_INET6) && ipa_in_netX(ra->nh.gw, (net_addr *) &sit))
-	    return;
-
-	  if (i->rtm_flags & RTNH_F_ONLINK)
-	    ra->nh.flags |= RNF_ONLINK;
-
-	  neighbor *nbr;
-	  nbr = neigh_find(&p->p, ra->nh.gw, ra->nh.iface,
-			   (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
-	  if (!nbr || (nbr->scope == SCOPE_HOST))
-	    {
-	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr,
-                  ra->nh.gw);
-	      return;
-	    }
-	}
-
-      break;
-    case RTN_BLACKHOLE:
-      ra->dest = RTD_BLACKHOLE;
-      break;
-    case RTN_UNREACHABLE:
-      ra->dest = RTD_UNREACHABLE;
-      break;
-    case RTN_PROHIBIT:
-      ra->dest = RTD_PROHIBIT;
-      break;
-    /* FIXME: What about RTN_THROW? */
-    default:
-      SKIP("type %d\n", i->rtm_type);
-      return;
-    }
-
-#ifdef HAVE_MPLS_KERNEL
-  if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !ra->nh.next)
-    ra->nh.labels = rta_get_mpls(a[RTA_NEWDST], ra->nh.label);
-
-  if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !ra->nh.next)
-    {
-      switch (rta_get_u16(a[RTA_ENCAP_TYPE]))
-	{
-	  case LWTUNNEL_ENCAP_MPLS:
-	    {
-	      struct rtattr *enca[BIRD_RTA_MAX];
-	      nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
-	      nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
-	      ra->nh.labels = rta_get_mpls(enca[RTA_DST], ra->nh.label);
-	      break;
-	    }
-	  default:
-	    SKIP("unknown encapsulation method %d\n", rta_get_u16(a[RTA_ENCAP_TYPE]));
-	    break;
-	}
-    }
-#endif
-
-  if (i->rtm_scope != def_scope)
-    {
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_SCOPE;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_INT;
-      ea->attrs[0].u.data = i->rtm_scope;
-    }
-
-  if (a[RTA_PREFSRC])
-    {
-      ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
-
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_PREFSRC;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_IP_ADDRESS;
-
-      struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
-      ad->length = sizeof(ps);
-      memcpy(ad->data, &ps, sizeof(ps));
-
-      ea->attrs[0].u.ptr = ad;
-    }
-
-  /* Can be set per-route or per-nexthop */
-  if (s->rta_flow)
-    {
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_REALM;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = EAF_TYPE_INT;
-      ea->attrs[0].u.data = s->rta_flow;
-    }
-
-  if (a[RTA_METRICS])
-    {
-      u32 metrics[KRT_METRICS_MAX];
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + KRT_METRICS_MAX * sizeof(eattr));
-      int t, n = 0;
-
-      if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0)
-        {
-	  log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net->n.addr);
-	  return;
-	}
-
-      for (t = 1; t < KRT_METRICS_MAX; t++)
-	if (metrics[0] & (1 << t))
-	  {
-	    ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
-	    ea->attrs[n].flags = 0;
-	    ea->attrs[n].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */
-	    ea->attrs[n].u.data = metrics[t];
-	    n++;
-	  }
-
-      if (n > 0)
-        {
-	  ea->next = ra->eattrs;
-	  ea->flags = EALF_SORTED;
-	  ea->count = n;
-	  ra->eattrs = ea;
-	}
-    }
-
-  /*
-   * Ideally, now we would send the received route to the rest of kernel code.
-   * But IPv6 ECMP routes before 4.11 are sent as a sequence of routes, so we
-   * postpone it and merge next hops until the end of the sequence. Note that
-   * when doing merging of next hops, we expect the new route to be unipath.
-   * Otherwise, we ignore additional next hops in nexthop_insert().
-   */
-
-  if (!s->net)
-  {
-    /* Store the new route */
-    s->net = net;
-    s->attrs = ra;
-    s->proto = p;
-    s->new = new;
-    s->krt_src = krt_src;
-    s->krt_type = i->rtm_type;
-    s->krt_proto = i->rtm_protocol;
-    s->krt_metric = priority;
-  }
-  else
-  {
-    /* Merge next hops with the stored route */
-    rta *oa = s->attrs;
-
-    struct nexthop *nhs = &oa->nh;
-    nexthop_insert(&nhs, &ra->nh);
-
-    /* Perhaps new nexthop is inserted at the first position */
-    if (nhs == &ra->nh)
-    {
-      /* Swap rtas */
-      s->attrs = ra;
-
-      /* Keep old eattrs */
-      ra->eattrs = oa->eattrs;
-    }
-  }
-}
-
-void
-krt_do_scan(struct krt_proto *p UNUSED)	/* CONFIG_ALL_TABLES_AT_ONCE => p is NULL */
-{
-  struct nlmsghdr *h;
-  struct nl_parse_state s;
-
-  nl_parse_begin(&s, 1);
-  nl_request_dump(AF_UNSPEC, RTM_GETROUTE);
-  while (h = nl_get_scan())
-    if (h->nlmsg_type == RTM_NEWROUTE || h->nlmsg_type == RTM_DELROUTE)
-      nl_parse_route(&s, h);
-    else
-      log(L_DEBUG "nl_scan_fire: Unknown packet received (type=%d)", h->nlmsg_type);
-  nl_parse_end(&s);
-}
-
-/*
- *	Asynchronous Netlink interface
- */
-
-static sock *nl_async_sk;		/* BIRD socket for asynchronous notifications */
-static byte *nl_async_rx_buffer;	/* Receive buffer */
-
-static void
-nl_async_msg(struct nlmsghdr *h)
-{
-  struct nl_parse_state s;
-
-  switch (h->nlmsg_type)
-    {
-    case RTM_NEWROUTE:
-    case RTM_DELROUTE:
-      DBG("KRT: Received async route notification (%d)\n", h->nlmsg_type);
-      nl_parse_begin(&s, 0);
-      nl_parse_route(&s, h);
-      nl_parse_end(&s);
-      break;
-    case RTM_NEWLINK:
-    case RTM_DELLINK:
-      DBG("KRT: Received async link notification (%d)\n", h->nlmsg_type);
-      if (kif_proto)
-	nl_parse_link(h, 0);
-      break;
-    case RTM_NEWADDR:
-    case RTM_DELADDR:
-      DBG("KRT: Received async address notification (%d)\n", h->nlmsg_type);
-      if (kif_proto)
-	nl_parse_addr(h, 0);
-      break;
-    default:
-      DBG("KRT: Received unknown async notification (%d)\n", h->nlmsg_type);
-    }
-}
-
-static int
-nl_async_hook(sock *sk, uint size UNUSED)
-{
-  struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
-  struct sockaddr_nl sa;
-  struct msghdr m = {
-    .msg_name = &sa,
-    .msg_namelen = sizeof(sa),
-    .msg_iov = &iov,
-    .msg_iovlen = 1,
-  };
-  struct nlmsghdr *h;
-  int x;
-  uint len;
-
-  x = recvmsg(sk->fd, &m, 0);
-  if (x < 0)
-    {
-      if (errno == ENOBUFS)
-	{
-	  /*
-	   *  Netlink reports some packets have been thrown away.
-	   *  One day we might react to it by asking for route table
-	   *  scan in near future.
-	   */
-	  log(L_WARN "Kernel dropped some netlink messages, will resync on next scan.");
-	  return 1;	/* More data are likely to be ready */
-	}
-      else if (errno != EWOULDBLOCK)
-	log(L_ERR "Netlink recvmsg: %m");
-      return 0;
-    }
-  if (sa.nl_pid)		/* It isn't from the kernel */
-    {
-      DBG("Non-kernel packet\n");
-      return 1;
-    }
-  h = (void *) nl_async_rx_buffer;
-  len = x;
-  if (m.msg_flags & MSG_TRUNC)
-    {
-      log(L_WARN "Netlink got truncated asynchronous message");
-      return 1;
-    }
-  while (NLMSG_OK(h, len))
-    {
-      nl_async_msg(h);
-      h = NLMSG_NEXT(h, len);
-    }
-  if (len)
-    log(L_WARN "nl_async_hook: Found packet remnant of size %d", len);
-  return 1;
-}
-
-static void
-nl_async_err_hook(sock *sk, int e UNUSED)
-{
-  nl_async_hook(sk, 0);
-}
-
-static void
-nl_open_async(void)
-{
-  sock *sk;
-  struct sockaddr_nl sa;
-  int fd;
-
-  if (nl_async_sk)
-    return;
-
-  DBG("KRT: Opening async netlink socket\n");
-
-  fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-  if (fd < 0)
-    {
-      log(L_ERR "Unable to open asynchronous rtnetlink socket: %m");
-      return;
-    }
-
-  bzero(&sa, sizeof(sa));
-  sa.nl_family = AF_NETLINK;
-  sa.nl_groups = RTMGRP_LINK |
-    RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE |
-    RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_ROUTE;
-
-  if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0)
-    {
-      log(L_ERR "Unable to bind asynchronous rtnetlink socket: %m");
-      close(fd);
-      return;
-    }
-
-  nl_async_rx_buffer = xmalloc(NL_RX_SIZE);
-
-  sk = nl_async_sk = sk_new(krt_pool);
-  sk->type = SK_MAGIC;
-  sk->rx_hook = nl_async_hook;
-  sk->err_hook = nl_async_err_hook;
-  sk->fd = fd;
-  if (sk_open(sk) < 0)
-    bug("Netlink: sk_open failed");
-}
-
-
-/*
- *	Interface to the UNIX krt module
- */
-
-void
-krt_sys_io_init(void)
-{
-  nl_linpool = lp_new_default(krt_pool);
-  HASH_INIT(nl_table_map, krt_pool, 6);
-}
-
-int
-krt_sys_start(struct krt_proto *p)
-{
-  struct krt_proto *old = HASH_FIND(nl_table_map, RTH, p->af, krt_table_id(p));
-
-  if (old)
-    {
-      log(L_ERR "%s: Kernel table %u already registered by %s",
-	  p->p.name, krt_table_id(p), old->p.name);
-      return 0;
-    }
-
-  HASH_INSERT2(nl_table_map, RTH, krt_pool, p);
-
-  nl_open();
-  nl_open_async();
-
-  return 1;
-}
-
-void
-krt_sys_shutdown(struct krt_proto *p)
-{
-  HASH_REMOVE2(nl_table_map, RTH, krt_pool, p);
-}
-
-int
-krt_sys_reconfigure(struct krt_proto *p UNUSED, struct krt_config *n, struct krt_config *o)
-{
-  return (n->sys.table_id == o->sys.table_id) && (n->sys.metric == o->sys.metric);
-}
-
-void
-krt_sys_init_config(struct krt_config *cf)
-{
-  cf->sys.table_id = RT_TABLE_MAIN;
-  cf->sys.metric = 32;
-}
-
-void
-krt_sys_copy_config(struct krt_config *d, struct krt_config *s)
-{
-  d->sys.table_id = s->sys.table_id;
-  d->sys.metric = s->sys.metric;
-}
-
-static const char *krt_metrics_names[KRT_METRICS_MAX] = {
-  NULL, "lock", "mtu", "window", "rtt", "rttvar", "sstresh", "cwnd", "advmss",
-  "reordering", "hoplimit", "initcwnd", "features", "rto_min", "initrwnd", "quickack"
-};
-
-static const char *krt_features_names[KRT_FEATURES_MAX] = {
-  "ecn", NULL, NULL, "allfrag"
-};
-
-int
-krt_sys_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
-{
-  switch (a->id)
-  {
-  case EA_KRT_PREFSRC:
-    bsprintf(buf, "prefsrc");
-    return GA_NAME;
-
-  case EA_KRT_REALM:
-    bsprintf(buf, "realm");
-    return GA_NAME;
-
-  case EA_KRT_SCOPE:
-    bsprintf(buf, "scope");
-    return GA_NAME;
-
-  case EA_KRT_LOCK:
-    buf += bsprintf(buf, "lock:");
-    ea_format_bitfield(a, buf, buflen, krt_metrics_names, 2, KRT_METRICS_MAX);
-    return GA_FULL;
-
-  case EA_KRT_FEATURES:
-    buf += bsprintf(buf, "features:");
-    ea_format_bitfield(a, buf, buflen, krt_features_names, 0, KRT_FEATURES_MAX);
-    return GA_FULL;
-
-  default:;
-    int id = (int)EA_ID(a->id) - KRT_METRICS_OFFSET;
-    if (id > 0 && id < KRT_METRICS_MAX)
-    {
-      bsprintf(buf, "%s", krt_metrics_names[id]);
-      return GA_NAME;
-    }
-
-    return GA_UNKNOWN;
-  }
-}
-
-
-
-void
-kif_sys_start(struct kif_proto *p UNUSED)
-{
-  nl_open();
-  nl_open_async();
-}
-
-void
-kif_sys_shutdown(struct kif_proto *p UNUSED)
-{
-}
-
-int
-kif_update_sysdep_addr(struct iface *i UNUSED)
-{
-  return 0;
-}
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 95b54d65..2a3f41de 100644
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -122,8 +122,8 @@ kif_iface:
   kif_iface_start iface_patt_list_nopx kif_iface_opt_list;
 
 
-dynamic_attr: KRT_SOURCE { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SOURCE); } ;
-dynamic_attr: KRT_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_METRIC); } ;
+dynamic_attr: KRT_SOURCE { $$ = f_new_dynamic_attr(T_INT, EA_KRT_SOURCE); } ;
+dynamic_attr: KRT_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_KRT_METRIC); } ;
 
 CF_CODE
 

From 0e1e632f70b74cf111f08175ab3634db2f962579 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 31 Mar 2022 19:00:00 +0200
Subject: [PATCH 117/431] FIB is a data structure generic enough to be in lib

---
 lib/fib.h    | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++
 nest/route.h | 107 +--------------------------------------------
 2 files changed, 120 insertions(+), 106 deletions(-)
 create mode 100644 lib/fib.h

diff --git a/lib/fib.h b/lib/fib.h
new file mode 100644
index 00000000..bec2a8d4
--- /dev/null
+++ b/lib/fib.h
@@ -0,0 +1,119 @@
+/*
+ *	BIRD Internet Routing Daemon -- Network prefix storage
+ *
+ *	(c) 1998--2000 Martin Mares <mj@ucw.cz>
+ *	(c) 2022 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LIB_FIB_H_
+#define _BIRD_LIB_FIB_H_
+
+/*
+ *	BIRD FIBs are generic data structure for storing network prefixes.
+ *	Also used for the master routing table. Currently implemented as
+ *	a hash table.
+ *
+ *	Available operations:
+ *		- insertion of new entry
+ *		- deletion of entry
+ *		- searching for entry by network prefix
+ *		- asynchronous retrieval of fib contents
+ */
+
+struct fib;
+
+struct fib_node {
+  struct fib_node *next;		/* Next in hash chain */
+  struct fib_iterator *readers;		/* List of readers of this node */
+  net_addr addr[0];
+};
+
+struct fib_iterator {			/* See lib/slists.h for an explanation */
+  struct fib_iterator *prev, *next;	/* Must be synced with struct fib_node! */
+  byte efef;				/* 0xff to distinguish between iterator and node */
+  byte pad[3];
+  struct fib_node *node;		/* Or NULL if freshly merged */
+  uint hash;
+};
+
+typedef void (*fib_init_fn)(struct fib *, void *);
+
+struct fib {
+  pool *fib_pool;			/* Pool holding all our data */
+  slab *fib_slab;			/* Slab holding all fib nodes */
+  struct fib_node **hash_table;		/* Node hash table */
+  uint hash_size;			/* Number of hash table entries (a power of two) */
+  uint hash_order;			/* Binary logarithm of hash_size */
+  uint hash_shift;			/* 32 - hash_order */
+  uint addr_type;			/* Type of address data stored in fib (NET_*) */
+  uint node_size;			/* FIB node size, 0 for nonuniform */
+  uint node_offset;			/* Offset of fib_node struct inside of user data */
+  uint entries;				/* Number of entries */
+  uint entries_min, entries_max;	/* Entry count limits (else start rehashing) */
+  fib_init_fn init;			/* Constructor */
+};
+
+static inline void * fib_node_to_user(struct fib *f, struct fib_node *e)
+{ return e ? (void *) ((char *) e - f->node_offset) : NULL; }
+
+static inline struct fib_node * fib_user_to_node(struct fib *f, void *e)
+{ return e ? (void *) ((char *) e + f->node_offset) : NULL; }
+
+void fib_init(struct fib *f, pool *p, uint addr_type, uint node_size, uint node_offset, uint hash_order, fib_init_fn init);
+void *fib_find(struct fib *, const net_addr *);	/* Find or return NULL if doesn't exist */
+void *fib_get_chain(struct fib *f, const net_addr *a); /* Find first node in linked list from hash table */
+void *fib_get(struct fib *, const net_addr *);	/* Find or create new if nonexistent */
+void *fib_route(struct fib *, const net_addr *); /* Longest-match routing lookup */
+void fib_delete(struct fib *, void *);	/* Remove fib entry */
+void fib_free(struct fib *);		/* Destroy the fib */
+void fib_check(struct fib *);		/* Consistency check for debugging */
+
+void fit_init(struct fib_iterator *, struct fib *); /* Internal functions, don't call */
+struct fib_node *fit_get(struct fib *, struct fib_iterator *);
+void fit_put(struct fib_iterator *, struct fib_node *);
+void fit_put_next(struct fib *f, struct fib_iterator *i, struct fib_node *n, uint hpos);
+void fit_put_end(struct fib_iterator *i);
+void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src);
+
+
+#define FIB_WALK(fib, type, z) do {				\
+	struct fib_node *fn_, **ff_ = (fib)->hash_table;	\
+	uint count_ = (fib)->hash_size;				\
+	type *z;						\
+	while (count_--)					\
+	  for (fn_ = *ff_++; z = fib_node_to_user(fib, fn_); fn_=fn_->next)
+
+#define FIB_WALK_END } while (0)
+
+#define FIB_ITERATE_INIT(it, fib) fit_init(it, fib)
+
+#define FIB_ITERATE_START(fib, it, type, z) do {		\
+	struct fib_node *fn_ = fit_get(fib, it);		\
+	uint count_ = (fib)->hash_size;				\
+	uint hpos_ = (it)->hash;				\
+	type *z;						\
+	for(;;) {						\
+	  if (!fn_)						\
+	    {							\
+	       if (++hpos_ >= count_)				\
+		 break;						\
+	       fn_ = (fib)->hash_table[hpos_];			\
+	       continue;					\
+	    }							\
+	  z = fib_node_to_user(fib, fn_);
+
+#define FIB_ITERATE_END fn_ = fn_->next; } } while(0)
+
+#define FIB_ITERATE_PUT(it) fit_put(it, fn_)
+
+#define FIB_ITERATE_PUT_NEXT(it, fib) fit_put_next(fib, it, fn_, hpos_)
+
+#define FIB_ITERATE_PUT_END(it) fit_put_end(it)
+
+#define FIB_ITERATE_UNLINK(it, fib) fit_get(fib, it)
+
+#define FIB_ITERATE_COPY(dst, src, fib) fit_copy(fib, dst, src)
+
+#endif
diff --git a/nest/route.h b/nest/route.h
index da8c723f..c6d30148 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -14,6 +14,7 @@
 #include "lib/resource.h"
 #include "lib/net.h"
 #include "lib/type.h"
+#include "lib/fib.h"
 
 struct ea_list;
 struct protocol;
@@ -21,117 +22,11 @@ struct proto;
 struct rte_src;
 struct symbol;
 struct timer;
-struct fib;
 struct filter;
 struct f_trie;
 struct f_trie_walk_state;
 struct cli;
 
-/*
- *	Generic data structure for storing network prefixes. Also used
- *	for the master routing table. Currently implemented as a hash
- *	table.
- *
- *	Available operations:
- *		- insertion of new entry
- *		- deletion of entry
- *		- searching for entry by network prefix
- *		- asynchronous retrieval of fib contents
- */
-
-struct fib_node {
-  struct fib_node *next;		/* Next in hash chain */
-  struct fib_iterator *readers;		/* List of readers of this node */
-  net_addr addr[0];
-};
-
-struct fib_iterator {			/* See lib/slists.h for an explanation */
-  struct fib_iterator *prev, *next;	/* Must be synced with struct fib_node! */
-  byte efef;				/* 0xff to distinguish between iterator and node */
-  byte pad[3];
-  struct fib_node *node;		/* Or NULL if freshly merged */
-  uint hash;
-};
-
-typedef void (*fib_init_fn)(struct fib *, void *);
-
-struct fib {
-  pool *fib_pool;			/* Pool holding all our data */
-  slab *fib_slab;			/* Slab holding all fib nodes */
-  struct fib_node **hash_table;		/* Node hash table */
-  uint hash_size;			/* Number of hash table entries (a power of two) */
-  uint hash_order;			/* Binary logarithm of hash_size */
-  uint hash_shift;			/* 32 - hash_order */
-  uint addr_type;			/* Type of address data stored in fib (NET_*) */
-  uint node_size;			/* FIB node size, 0 for nonuniform */
-  uint node_offset;			/* Offset of fib_node struct inside of user data */
-  uint entries;				/* Number of entries */
-  uint entries_min, entries_max;	/* Entry count limits (else start rehashing) */
-  fib_init_fn init;			/* Constructor */
-};
-
-static inline void * fib_node_to_user(struct fib *f, struct fib_node *e)
-{ return e ? (void *) ((char *) e - f->node_offset) : NULL; }
-
-static inline struct fib_node * fib_user_to_node(struct fib *f, void *e)
-{ return e ? (void *) ((char *) e + f->node_offset) : NULL; }
-
-void fib_init(struct fib *f, pool *p, uint addr_type, uint node_size, uint node_offset, uint hash_order, fib_init_fn init);
-void *fib_find(struct fib *, const net_addr *);	/* Find or return NULL if doesn't exist */
-void *fib_get_chain(struct fib *f, const net_addr *a); /* Find first node in linked list from hash table */
-void *fib_get(struct fib *, const net_addr *);	/* Find or create new if nonexistent */
-void *fib_route(struct fib *, const net_addr *); /* Longest-match routing lookup */
-void fib_delete(struct fib *, void *);	/* Remove fib entry */
-void fib_free(struct fib *);		/* Destroy the fib */
-void fib_check(struct fib *);		/* Consistency check for debugging */
-
-void fit_init(struct fib_iterator *, struct fib *); /* Internal functions, don't call */
-struct fib_node *fit_get(struct fib *, struct fib_iterator *);
-void fit_put(struct fib_iterator *, struct fib_node *);
-void fit_put_next(struct fib *f, struct fib_iterator *i, struct fib_node *n, uint hpos);
-void fit_put_end(struct fib_iterator *i);
-void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src);
-
-
-#define FIB_WALK(fib, type, z) do {				\
-	struct fib_node *fn_, **ff_ = (fib)->hash_table;	\
-	uint count_ = (fib)->hash_size;				\
-	type *z;						\
-	while (count_--)					\
-	  for (fn_ = *ff_++; z = fib_node_to_user(fib, fn_); fn_=fn_->next)
-
-#define FIB_WALK_END } while (0)
-
-#define FIB_ITERATE_INIT(it, fib) fit_init(it, fib)
-
-#define FIB_ITERATE_START(fib, it, type, z) do {		\
-	struct fib_node *fn_ = fit_get(fib, it);		\
-	uint count_ = (fib)->hash_size;				\
-	uint hpos_ = (it)->hash;				\
-	type *z;						\
-	for(;;) {						\
-	  if (!fn_)						\
-	    {							\
-	       if (++hpos_ >= count_)				\
-		 break;						\
-	       fn_ = (fib)->hash_table[hpos_];			\
-	       continue;					\
-	    }							\
-	  z = fib_node_to_user(fib, fn_);
-
-#define FIB_ITERATE_END fn_ = fn_->next; } } while(0)
-
-#define FIB_ITERATE_PUT(it) fit_put(it, fn_)
-
-#define FIB_ITERATE_PUT_NEXT(it, fib) fit_put_next(fib, it, fn_, hpos_)
-
-#define FIB_ITERATE_PUT_END(it) fit_put_end(it)
-
-#define FIB_ITERATE_UNLINK(it, fib) fit_get(fib, it)
-
-#define FIB_ITERATE_COPY(dst, src, fib) fit_copy(fib, dst, src)
-
-
 /*
  *	Master Routing Tables. Generally speaking, each of them contains a FIB
  *	with each entry pointing to a list of route entries representing routes

From ef6a903e6f44b467f9606018446095521ad01ef1 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 31 Mar 2022 19:09:38 +0200
Subject: [PATCH 118/431] Splitting route data structures out to lib

---
 conf/cf-lex.l          |   2 +-
 conf/conf.c            |   2 +-
 conf/confbase.Y        |   2 +-
 filter/data.c          |   2 +-
 filter/f-util.c        |   2 +-
 filter/filter.c        |   2 +-
 filter/filter.h        |   2 +-
 lib/event_test.c       |   2 +-
 lib/route.h            | 332 +++++++++++++++++++++++++++++++++++++++++
 nest/a-path.c          |   2 +-
 nest/a-path_test.c     |   2 +-
 nest/a-set.c           |   2 +-
 nest/a-set_test.c      |   2 +-
 nest/attrs.h           |   2 +-
 nest/cmds.c            |   2 +-
 nest/proto.c           |   2 +-
 nest/protocol.h        |   2 +-
 nest/rt-attr.c         |  21 +--
 nest/rt-dev.c          |   2 +-
 nest/rt-fib.c          |   2 +-
 nest/rt-show.c         |   2 +-
 nest/rt-table.c        |   2 +-
 nest/{route.h => rt.h} | 306 +------------------------------------
 proto/babel/babel.h    |   2 +-
 proto/bfd/bfd.h        |   2 +-
 proto/bgp/attrs.c      |   2 +-
 proto/bgp/bgp.c        |   2 +-
 proto/bgp/bgp.h        |   2 +-
 proto/bgp/packets.c    |   2 +-
 proto/mrt/mrt.h        |   2 +-
 proto/ospf/ospf.h      |   2 +-
 proto/perf/perf.c      |   2 +-
 proto/pipe/pipe.c      |   2 +-
 proto/radv/radv.h      |   2 +-
 proto/rip/rip.h        |   2 +-
 proto/rpki/rpki.h      |   2 +-
 proto/static/static.c  |   2 +-
 proto/static/static.h  |   2 +-
 sysdep/bsd/krt-sock.c  |   2 +-
 sysdep/linux/netlink.c |   2 +-
 sysdep/unix/krt.c      |   2 +-
 sysdep/unix/main.c     |   2 +-
 test/bt-utils.c        |   2 +-
 43 files changed, 378 insertions(+), 361 deletions(-)
 create mode 100644 lib/route.h
 rename nest/{route.h => rt.h} (57%)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index b9457a83..75e1ceeb 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -42,7 +42,7 @@
 #define PARSER 1
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"
diff --git a/conf/conf.c b/conf/conf.c
index a2b01667..0230053b 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -46,7 +46,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 753df325..3fdacb12 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -18,7 +18,7 @@ CF_HDR
 #include "lib/string.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/bfd.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/filter/data.c b/filter/data.c
index feb8c8bb..87ef4ff1 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -16,7 +16,7 @@
 #include "lib/unaligned.h"
 #include "lib/net.h"
 #include "lib/ip.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/attrs.h"
diff --git a/filter/f-util.c b/filter/f-util.c
index 79cf3452..83ae01f6 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -13,7 +13,7 @@
 #include "filter/f-inst.h"
 #include "lib/idm.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 
 #define P(a,b) ((a<<8) | b)
 
diff --git a/filter/filter.c b/filter/filter.c
index 7004b96d..31ae79fe 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -35,7 +35,7 @@
 #include "lib/ip.h"
 #include "lib/net.h"
 #include "lib/flowspec.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/attrs.h"
diff --git a/filter/filter.h b/filter/filter.h
index e9c9d917..8ce6c1e0 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -13,7 +13,7 @@
 #include "lib/resource.h"
 #include "lib/ip.h"
 #include "lib/macro.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 
 /* Possible return values of filter execution */
diff --git a/lib/event_test.c b/lib/event_test.c
index e1fbea8f..e14d0b95 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -15,7 +15,7 @@
 #include "nest/locks.h"
 #include "sysdep/unix/unix.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 
 #define MAX_NUM 4
 
diff --git a/lib/route.h b/lib/route.h
new file mode 100644
index 00000000..47355abc
--- /dev/null
+++ b/lib/route.h
@@ -0,0 +1,332 @@
+/*
+ *	BIRD Internet Routing Daemon -- Routing data structures
+ *
+ *	(c) 1998--2000 Martin Mares <mj@ucw.cz>
+ *	(c) 2022 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LIB_ROUTE_H_
+#define _BIRD_LIB_ROUTE_H_
+
+struct network;
+struct proto;
+struct cli;
+
+typedef struct rte {
+  struct rte *next;
+  struct network *net;			/* Network this RTE belongs to */
+  struct rte_src *src;			/* Route source that created the route */
+  struct channel *sender;		/* Channel used to send the route to the routing table */
+  struct rta *attrs;			/* Attributes of this route */
+  u32 id;				/* Table specific route id */
+  byte flags;				/* Flags (REF_...) */
+  byte pflags;				/* Protocol-specific flags */
+  btime lastmod;			/* Last modified */
+} rte;
+
+#define REF_COW		1		/* Copy this rte on write */
+#define REF_FILTERED	2		/* Route is rejected by import filter */
+#define REF_STALE	4		/* Route is stale in a refresh cycle */
+#define REF_DISCARD	8		/* Route is scheduled for discard */
+#define REF_MODIFY	16		/* Route is scheduled for modify */
+
+/* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
+static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
+
+/* Route just has REF_FILTERED flag */
+static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
+
+struct rte_src {
+  struct rte_src *next;			/* Hash chain */
+  struct proto *proto;			/* Protocol the source is based on */
+  u32 private_id;			/* Private ID, assigned by the protocol */
+  u32 global_id;			/* Globally unique ID of the source */
+  unsigned uc;				/* Use count */
+};
+
+
+struct rte_src *rt_find_source(struct proto *p, u32 id);
+struct rte_src *rt_get_source(struct proto *p, u32 id);
+static inline void rt_lock_source(struct rte_src *src) { src->uc++; }
+static inline void rt_unlock_source(struct rte_src *src) { src->uc--; }
+void rt_prune_sources(void);
+
+/*
+ *	Route Attributes
+ *
+ *	Beware: All standard BGP attributes must be represented here instead
+ *	of making them local to the route. This is needed to ensure proper
+ *	construction of BGP route attribute lists.
+ */
+
+/* Nexthop structure */
+struct nexthop {
+  ip_addr gw;				/* Next hop */
+  struct iface *iface;			/* Outgoing interface */
+  struct nexthop *next;
+  byte flags;
+  byte weight;
+  byte labels_orig;			/* Number of labels before hostentry was applied */
+  byte labels;				/* Number of all labels */
+  u32 label[0];
+};
+
+#define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
+
+
+typedef struct rta {
+  struct rta *next, **pprev;		/* Hash chain */
+  u32 uc;				/* Use count */
+  u32 hash_key;				/* Hash over important fields */
+  struct ea_list *eattrs;		/* Extended Attribute chain */
+  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
+  ip_addr from;				/* Advertising router */
+  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */
+  u16 cached:1;				/* Are attributes cached? */
+  u16 source:7;				/* Route source (RTS_...) */
+  u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
+  u16 dest:4;				/* Route destination type (RTD_...) */
+  word pref;
+  struct nexthop nh;			/* Next hop */
+} rta;
+
+#define RTS_STATIC 1			/* Normal static route */
+#define RTS_INHERIT 2			/* Route inherited from kernel */
+#define RTS_DEVICE 3			/* Device route */
+#define RTS_STATIC_DEVICE 4		/* Static device route */
+#define RTS_REDIRECT 5			/* Learned via redirect */
+#define RTS_RIP 6			/* RIP route */
+#define RTS_OSPF 7			/* OSPF route */
+#define RTS_OSPF_IA 8			/* OSPF inter-area route */
+#define RTS_OSPF_EXT1 9			/* OSPF external route type 1 */
+#define RTS_OSPF_EXT2 10		/* OSPF external route type 2 */
+#define RTS_BGP 11			/* BGP route */
+#define RTS_PIPE 12			/* Inter-table wormhole */
+#define RTS_BABEL 13			/* Babel route */
+#define RTS_RPKI 14			/* Route Origin Authorization */
+#define RTS_PERF 15			/* Perf checker */
+#define RTS_MAX 16
+
+#define RTD_NONE 0			/* Undefined next hop */
+#define RTD_UNICAST 1			/* Next hop is neighbor router */
+#define RTD_BLACKHOLE 2			/* Silently drop packets */
+#define RTD_UNREACHABLE 3		/* Reject as unreachable */
+#define RTD_PROHIBIT 4			/* Administratively prohibited */
+#define RTD_MAX 5
+
+#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
+					   protocol-specific metric is availabe */
+
+
+extern const char * rta_dest_names[RTD_MAX];
+
+static inline const char *rta_dest_name(uint n)
+{ return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
+
+/* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
+static inline int rte_is_reachable(rte *r)
+{ return r->attrs->dest == RTD_UNICAST; }
+
+
+/*
+ *	Extended Route Attributes
+ */
+
+typedef struct eattr {
+  word id;				/* EA_CODE(PROTOCOL_..., protocol-dependent ID) */
+  byte flags;				/* Protocol-dependent flags */
+  byte type:5;				/* Attribute type */
+  byte originated:1;			/* The attribute has originated locally */
+  byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
+  byte undef:1;				/* Explicitly undefined */
+
+  union bval u;
+} eattr;
+
+
+#define EA_CODE(proto,id) (((proto) << 8) | (id))
+#define EA_ID(ea) ((ea) & 0xff)
+#define EA_PROTO(ea) ((ea) >> 8)
+#define EA_CUSTOM(id) ((id) | EA_CUSTOM_BIT)
+#define EA_IS_CUSTOM(ea) ((ea) & EA_CUSTOM_BIT)
+#define EA_CUSTOM_ID(ea) ((ea) & ~EA_CUSTOM_BIT)
+
+const char *ea_custom_name(uint ea);
+
+#define EA_GEN_IGP_METRIC EA_CODE(PROTOCOL_NONE, 0)
+
+#define EA_CODE_MASK 0xffff
+#define EA_CUSTOM_BIT 0x8000
+#define EA_ALLOW_UNDEF 0x10000		/* ea_find: allow EAF_TYPE_UNDEF */
+#define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
+#define EA_BIT_GET(ea) ((ea) >> 24)
+
+typedef struct adata {
+  uint length;				/* Length of data */
+  byte data[0];
+} adata;
+
+extern const adata null_adata;		/* adata of length 0 */
+
+static inline struct adata *
+lp_alloc_adata(struct linpool *pool, uint len)
+{
+  struct adata *ad = lp_alloc(pool, sizeof(struct adata) + len);
+  ad->length = len;
+  return ad;
+}
+
+static inline int adata_same(const struct adata *a, const struct adata *b)
+{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
+
+
+typedef struct ea_list {
+  struct ea_list *next;			/* In case we have an override list */
+  byte flags;				/* Flags: EALF_... */
+  byte rfu;
+  word count;				/* Number of attributes */
+  eattr attrs[0];			/* Attribute definitions themselves */
+} ea_list;
+
+#define EALF_SORTED 1			/* Attributes are sorted by code */
+#define EALF_BISECT 2			/* Use interval bisection for searching */
+#define EALF_CACHED 4			/* Attributes belonging to cached rta */
+
+struct ea_walk_state {
+  ea_list *eattrs;			/* Ccurrent ea_list, initially set by caller */
+  eattr *ea;				/* Current eattr, initially NULL */
+  u32 visited[4];			/* Bitfield, limiting max to 128 */
+};
+
+eattr *ea_find(ea_list *, unsigned ea);
+eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
+
+/**
+ * ea_get_int - fetch an integer attribute
+ * @e: attribute list
+ * @id: attribute ID
+ * @def: default value
+ *
+ * This function is a shortcut for retrieving a value of an integer attribute
+ * by calling ea_find() to find the attribute, extracting its value or returning
+ * a provided default if no such attribute is present.
+ */
+static inline u32
+ea_get_int(ea_list *e, unsigned id, u32 def)
+{
+  eattr *a = ea_find(e, id);
+  return a ? a->u.data : def;
+}
+
+void ea_dump(ea_list *);
+void ea_sort(ea_list *);		/* Sort entries in all sub-lists */
+unsigned ea_scan(ea_list *);		/* How many bytes do we need for merged ea_list */
+void ea_merge(ea_list *from, ea_list *to); /* Merge sub-lists to allocated buffer */
+int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
+uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */
+ea_list *ea_append(ea_list *to, ea_list *what);
+void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
+
+#define ea_normalize(ea) do { \
+  if (ea->next) { \
+    ea_list *t = alloca(ea_scan(ea)); \
+    ea_merge(ea, t); \
+    ea = t; \
+  } \
+  ea_sort(ea); \
+  if (ea->count == 0) \
+    ea = NULL; \
+} while(0) \
+
+struct ea_one_attr_list {
+  ea_list l;
+  eattr a;
+};
+
+static inline eattr *
+ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, union bval val)
+{
+  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
+  *ea = (struct ea_one_attr_list) {
+    .l.flags = EALF_SORTED,
+    .l.count = 1,
+    .l.next = *to,
+
+    .a.id = id,
+    .a.type = type,
+    .a.flags = flags,
+  };
+
+  ea->a.u = val;
+  *to = &ea->l;
+
+  return &ea->a;
+}
+
+static inline void
+ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
+{
+  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
+  *ea = (struct ea_one_attr_list) {
+    .l.flags = EALF_SORTED,
+    .l.count = 1,
+    .l.next = *to,
+    .a.id = code,
+    .a.fresh = local,
+    .a.originated = local,
+    .a.undef = 1,
+  };
+
+  *to = &ea->l;
+}
+
+static inline void
+ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 data)
+{
+  union bval bv = { .data = data };
+  ea_set_attr(to, pool, id, flags, type, bv);
+}
+
+static inline void
+ea_set_attr_data(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, void *data, uint len)
+{
+  struct adata *a = lp_alloc_adata(pool, len);
+  memcpy(a->data, data, len);
+  union bval bv = { .ptr = a, };
+  ea_set_attr(to, pool, id, flags, type, bv);
+}
+
+
+#define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
+
+static inline size_t nexthop_size(const struct nexthop *nh)
+{ return sizeof(struct nexthop) + sizeof(u32)*nh->labels; }
+int nexthop__same(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops */
+static inline int nexthop_same(struct nexthop *x, struct nexthop *y)
+{ return (x == y) || nexthop__same(x, y); }
+struct nexthop *nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp);
+struct nexthop *nexthop_sort(struct nexthop *x);
+static inline void nexthop_link(struct rta *a, struct nexthop *from)
+{ memcpy(&a->nh, from, nexthop_size(from)); }
+void nexthop_insert(struct nexthop **n, struct nexthop *y);
+int nexthop_is_sorted(struct nexthop *x);
+
+void rta_init(void);
+static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }
+#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
+rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
+static inline int rta_is_cached(rta *r) { return r->cached; }
+static inline rta *rta_clone(rta *r) { r->uc++; return r; }
+void rta__free(rta *r);
+static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
+rta *rta_do_cow(rta *o, linpool *lp);
+static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
+void rta_dump(rta *);
+void rta_dump_all(void);
+void rta_show(struct cli *, rta *);
+
+u32 rt_get_igp_metric(rte *rt);
+
+#endif
diff --git a/nest/a-path.c b/nest/a-path.c
index badbc911..64504c93 100644
--- a/nest/a-path.c
+++ b/nest/a-path.c
@@ -8,7 +8,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
diff --git a/nest/a-path_test.c b/nest/a-path_test.c
index e007a450..a6b4d3d8 100644
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 
diff --git a/nest/a-set.c b/nest/a-set.c
index 71fbac94..93f6431e 100644
--- a/nest/a-set.c
+++ b/nest/a-set.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
diff --git a/nest/a-set_test.c b/nest/a-set_test.c
index 904e6764..daa6ab74 100644
--- a/nest/a-set_test.c
+++ b/nest/a-set_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "lib/net.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 
diff --git a/nest/attrs.h b/nest/attrs.h
index ef2b95e6..e0595846 100644
--- a/nest/attrs.h
+++ b/nest/attrs.h
@@ -11,7 +11,7 @@
 
 #include <stdint.h>
 #include "lib/unaligned.h"
-#include "nest/route.h"
+#include "lib/route.h"
 
 
 /* a-path.c */
diff --git a/nest/cmds.c b/nest/cmds.c
index 8481bf96..3e59cb6f 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -8,7 +8,7 @@
 
 #include "nest/bird.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "nest/cmds.h"
diff --git a/nest/proto.c b/nest/proto.c
index c6bda73b..95c319db 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -16,7 +16,7 @@
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "conf/conf.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/nest/protocol.h b/nest/protocol.h
index d0810a8f..7fb08992 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -12,7 +12,7 @@
 #include "lib/lists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "conf/conf.h"
 
 struct iface;
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index de45dfa1..8f4319c5 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -45,7 +45,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
@@ -529,25 +529,6 @@ ea_walk(struct ea_walk_state *s, uint id, uint max)
   return NULL;
 }
 
-/**
- * ea_get_int - fetch an integer attribute
- * @e: attribute list
- * @id: attribute ID
- * @def: default value
- *
- * This function is a shortcut for retrieving a value of an integer attribute
- * by calling ea_find() to find the attribute, extracting its value or returning
- * a provided default if no such attribute is present.
- */
-u32
-ea_get_int(ea_list *e, unsigned id, u32 def)
-{
-  eattr *a = ea_find(e, id);
-  if (!a)
-    return def;
-  return a->u.data;
-}
-
 static inline void
 ea_do_sort(ea_list *e)
 {
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 05e64fc3..82533321 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/rt-dev.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 43e3039d..801561da 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -55,7 +55,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "lib/string.h"
 
 /*
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 19877966..464e5f1b 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -10,7 +10,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
diff --git a/nest/rt-table.c b/nest/rt-table.c
index fbfdb1e6..031e462b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -91,7 +91,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/nest/route.h b/nest/rt.h
similarity index 57%
rename from nest/route.h
rename to nest/rt.h
index c6d30148..7451a261 100644
--- a/nest/route.h
+++ b/nest/rt.h
@@ -6,8 +6,8 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#ifndef _BIRD_ROUTE_H_
-#define _BIRD_ROUTE_H_
+#ifndef _BIRD_NEST_RT_H_
+#define _BIRD_NEST_RT_H_
 
 #include "lib/lists.h"
 #include "lib/bitmap.h"
@@ -15,6 +15,7 @@
 #include "lib/net.h"
 #include "lib/type.h"
 #include "lib/fib.h"
+#include "lib/route.h"
 
 struct ea_list;
 struct protocol;
@@ -148,31 +149,6 @@ struct hostentry {
   u32 igp_metric;			/* Chosen route IGP metric */
 };
 
-typedef struct rte {
-  struct rte *next;
-  net *net;				/* Network this RTE belongs to */
-  struct rte_src *src;			/* Route source that created the route */
-  struct channel *sender;		/* Channel used to send the route to the routing table */
-  struct rta *attrs;			/* Attributes of this route */
-  u32 id;				/* Table specific route id */
-  byte flags;				/* Flags (REF_...) */
-  byte pflags;				/* Protocol-specific flags */
-  btime lastmod;			/* Last modified */
-} rte;
-
-#define REF_COW		1		/* Copy this rte on write */
-#define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_STALE	4		/* Route is stale in a refresh cycle */
-#define REF_DISCARD	8		/* Route is scheduled for discard */
-#define REF_MODIFY	16		/* Route is scheduled for modify */
-
-/* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
-static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
-
-/* Route just has REF_FILTERED flag */
-static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
-
-
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
 #define RA_OPTIMAL	1		/* Announcement of optimal route change */
@@ -209,7 +185,6 @@ static inline net *net_find_valid(rtable *tab, const net_addr *addr)
 static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 net *net_get(rtable *tab, const net_addr *addr);
 net *net_route(rtable *tab, const net_addr *n);
-int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 rte *rte_find(net *net, struct rte_src *src);
 rte *rte_get_temp(struct rta *, struct rte_src *src);
 void rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
@@ -305,279 +280,6 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t
 #define RSEM_NOEXPORT	3		/* Routes rejected by export filter */
 #define RSEM_EXPORTED	4		/* Routes marked in export map */
 
-/*
- *	Route Attributes
- *
- *	Beware: All standard BGP attributes must be represented here instead
- *	of making them local to the route. This is needed to ensure proper
- *	construction of BGP route attribute lists.
- */
-
-/* Nexthop structure */
-struct nexthop {
-  ip_addr gw;				/* Next hop */
-  struct iface *iface;			/* Outgoing interface */
-  struct nexthop *next;
-  byte flags;
-  byte weight;
-  byte labels_orig;			/* Number of labels before hostentry was applied */
-  byte labels;				/* Number of all labels */
-  u32 label[0];
-};
-
-#define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
-
-
-struct rte_src {
-  struct rte_src *next;			/* Hash chain */
-  struct proto *proto;			/* Protocol the source is based on */
-  u32 private_id;			/* Private ID, assigned by the protocol */
-  u32 global_id;			/* Globally unique ID of the source */
-  unsigned uc;				/* Use count */
-};
-
-
-typedef struct rta {
-  struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
-  u32 hash_key;				/* Hash over important fields */
-  struct ea_list *eattrs;		/* Extended Attribute chain */
-  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
-  ip_addr from;				/* Advertising router */
-  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */
-  u16 cached:1;				/* Are attributes cached? */
-  u16 source:7;				/* Route source (RTS_...) */
-  u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
-  u16 dest:4;				/* Route destination type (RTD_...) */
-  word pref;
-  struct nexthop nh;			/* Next hop */
-} rta;
-
-#define RTS_STATIC 1			/* Normal static route */
-#define RTS_INHERIT 2			/* Route inherited from kernel */
-#define RTS_DEVICE 3			/* Device route */
-#define RTS_STATIC_DEVICE 4		/* Static device route */
-#define RTS_REDIRECT 5			/* Learned via redirect */
-#define RTS_RIP 6			/* RIP route */
-#define RTS_OSPF 7			/* OSPF route */
-#define RTS_OSPF_IA 8			/* OSPF inter-area route */
-#define RTS_OSPF_EXT1 9			/* OSPF external route type 1 */
-#define RTS_OSPF_EXT2 10		/* OSPF external route type 2 */
-#define RTS_BGP 11			/* BGP route */
-#define RTS_PIPE 12			/* Inter-table wormhole */
-#define RTS_BABEL 13			/* Babel route */
-#define RTS_RPKI 14			/* Route Origin Authorization */
-#define RTS_PERF 15			/* Perf checker */
-#define RTS_MAX 16
-
-#define RTD_NONE 0			/* Undefined next hop */
-#define RTD_UNICAST 1			/* Next hop is neighbor router */
-#define RTD_BLACKHOLE 2			/* Silently drop packets */
-#define RTD_UNREACHABLE 3		/* Reject as unreachable */
-#define RTD_PROHIBIT 4			/* Administratively prohibited */
-#define RTD_MAX 5
-
-#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
-					   protocol-specific metric is availabe */
-
-
-extern const char * rta_dest_names[RTD_MAX];
-
-static inline const char *rta_dest_name(uint n)
-{ return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
-
-/* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
-static inline int rte_is_reachable(rte *r)
-{ return r->attrs->dest == RTD_UNICAST; }
-
-
-/*
- *	Extended Route Attributes
- */
-
-typedef struct eattr {
-  word id;				/* EA_CODE(PROTOCOL_..., protocol-dependent ID) */
-  byte flags;				/* Protocol-dependent flags */
-  byte type:5;				/* Attribute type */
-  byte originated:1;			/* The attribute has originated locally */
-  byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
-  byte undef:1;				/* Explicitly undefined */
-
-  union bval u;
-} eattr;
-
-
-#define EA_CODE(proto,id) (((proto) << 8) | (id))
-#define EA_ID(ea) ((ea) & 0xff)
-#define EA_PROTO(ea) ((ea) >> 8)
-#define EA_CUSTOM(id) ((id) | EA_CUSTOM_BIT)
-#define EA_IS_CUSTOM(ea) ((ea) & EA_CUSTOM_BIT)
-#define EA_CUSTOM_ID(ea) ((ea) & ~EA_CUSTOM_BIT)
-
-const char *ea_custom_name(uint ea);
-
-#define EA_GEN_IGP_METRIC EA_CODE(PROTOCOL_NONE, 0)
-
-#define EA_CODE_MASK 0xffff
-#define EA_CUSTOM_BIT 0x8000
-#define EA_ALLOW_UNDEF 0x10000		/* ea_find: allow EAF_TYPE_UNDEF */
-#define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
-#define EA_BIT_GET(ea) ((ea) >> 24)
-
-typedef struct adata {
-  uint length;				/* Length of data */
-  byte data[0];
-} adata;
-
-extern const adata null_adata;		/* adata of length 0 */
-
-static inline struct adata *
-lp_alloc_adata(struct linpool *pool, uint len)
-{
-  struct adata *ad = lp_alloc(pool, sizeof(struct adata) + len);
-  ad->length = len;
-  return ad;
-}
-
-static inline int adata_same(const struct adata *a, const struct adata *b)
-{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
-
-
-typedef struct ea_list {
-  struct ea_list *next;			/* In case we have an override list */
-  byte flags;				/* Flags: EALF_... */
-  byte rfu;
-  word count;				/* Number of attributes */
-  eattr attrs[0];			/* Attribute definitions themselves */
-} ea_list;
-
-#define EALF_SORTED 1			/* Attributes are sorted by code */
-#define EALF_BISECT 2			/* Use interval bisection for searching */
-#define EALF_CACHED 4			/* Attributes belonging to cached rta */
-
-struct rte_src *rt_find_source(struct proto *p, u32 id);
-struct rte_src *rt_get_source(struct proto *p, u32 id);
-static inline void rt_lock_source(struct rte_src *src) { src->uc++; }
-static inline void rt_unlock_source(struct rte_src *src) { src->uc--; }
-void rt_prune_sources(void);
-
-struct ea_walk_state {
-  ea_list *eattrs;			/* Ccurrent ea_list, initially set by caller */
-  eattr *ea;				/* Current eattr, initially NULL */
-  u32 visited[4];			/* Bitfield, limiting max to 128 */
-};
-
-eattr *ea_find(ea_list *, unsigned ea);
-eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
-u32 ea_get_int(ea_list *, unsigned ea, u32 def);
-void ea_dump(ea_list *);
-void ea_sort(ea_list *);		/* Sort entries in all sub-lists */
-unsigned ea_scan(ea_list *);		/* How many bytes do we need for merged ea_list */
-void ea_merge(ea_list *from, ea_list *to); /* Merge sub-lists to allocated buffer */
-int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
-uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */
-ea_list *ea_append(ea_list *to, ea_list *what);
-void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
-
-#define ea_normalize(ea) do { \
-  if (ea->next) { \
-    ea_list *t = alloca(ea_scan(ea)); \
-    ea_merge(ea, t); \
-    ea = t; \
-  } \
-  ea_sort(ea); \
-  if (ea->count == 0) \
-    ea = NULL; \
-} while(0) \
-
-struct ea_one_attr_list {
-  ea_list l;
-  eattr a;
-};
-
-static inline eattr *
-ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, union bval val)
-{
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
-    .l.flags = EALF_SORTED,
-    .l.count = 1,
-    .l.next = *to,
-
-    .a.id = id,
-    .a.type = type,
-    .a.flags = flags,
-  };
-
-  ea->a.u = val;
-  *to = &ea->l;
-
-  return &ea->a;
-}
-
-static inline void
-ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
-{
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
-    .l.flags = EALF_SORTED,
-    .l.count = 1,
-    .l.next = *to,
-    .a.id = code,
-    .a.fresh = local,
-    .a.originated = local,
-    .a.undef = 1,
-  };
-
-  *to = &ea->l;
-}
-
-static inline void
-ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 data)
-{
-  union bval bv = { .data = data };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
-
-static inline void
-ea_set_attr_data(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, void *data, uint len)
-{
-  struct adata *a = lp_alloc_adata(pool, len);
-  memcpy(a->data, data, len);
-  union bval bv = { .ptr = a, };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
-
-
-#define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
-
-static inline size_t nexthop_size(const struct nexthop *nh)
-{ return sizeof(struct nexthop) + sizeof(u32)*nh->labels; }
-int nexthop__same(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops */
-static inline int nexthop_same(struct nexthop *x, struct nexthop *y)
-{ return (x == y) || nexthop__same(x, y); }
-struct nexthop *nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp);
-struct nexthop *nexthop_sort(struct nexthop *x);
-static inline void nexthop_link(struct rta *a, struct nexthop *from)
-{ memcpy(&a->nh, from, nexthop_size(from)); }
-void nexthop_insert(struct nexthop **n, struct nexthop *y);
-int nexthop_is_sorted(struct nexthop *x);
-
-void rta_init(void);
-static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }
-#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
-rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
-static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) { r->uc++; return r; }
-void rta__free(rta *r);
-static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
-rta *rta_do_cow(rta *o, linpool *lp);
-static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
-void rta_dump(rta *);
-void rta_dump_all(void);
-void rta_show(struct cli *, rta *);
-
-u32 rt_get_igp_metric(rte *rt);
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);
 
@@ -636,4 +338,6 @@ int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *
 #define ROA_VALID	1
 #define ROA_INVALID	2
 
+int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
+
 #endif
diff --git a/proto/babel/babel.h b/proto/babel/babel.h
index 8b6da3c8..00814641 100644
--- a/proto/babel/babel.h
+++ b/proto/babel/babel.h
@@ -16,7 +16,7 @@
 #include "nest/bird.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/locks.h"
 #include "nest/password.h"
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 91fdaa60..bbccd0b8 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -13,7 +13,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/password.h"
 #include "conf/conf.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1bae942d..3265cb5e 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 8c97f7b3..aec78a45 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -114,7 +114,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 6f209595..d09a5c8f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <setjmp.h>
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/bfd.h"
 //#include "lib/lists.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index a805cdf0..5def0f27 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "proto/mrt/mrt.h"
 #include "conf/conf.h"
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index 4ff94c12..3b83aa39 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -13,7 +13,7 @@
 #include "nest/bird.h"
 #include "nest/protocol.h"
 #include "lib/lists.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "lib/event.h"
 #include "lib/hash.h"
 
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3e704ae8..3d0d57d9 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -22,7 +22,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 5d228045..dde7e473 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index c3457135..483ece67 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -35,7 +35,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/radv/radv.h b/proto/radv/radv.h
index 14d40f8a..5cca3aca 100644
--- a/proto/radv/radv.h
+++ b/proto/radv/radv.h
@@ -19,7 +19,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index f8713c4a..a6fa3326 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -16,7 +16,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/password.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/rpki/rpki.h b/proto/rpki/rpki.h
index 8a5c38fd..26fbb46e 100644
--- a/proto/rpki/rpki.h
+++ b/proto/rpki/rpki.h
@@ -13,7 +13,7 @@
 #define _BIRD_RPKI_H_
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "lib/socket.h"
 #include "lib/ip.h"
diff --git a/proto/static/static.c b/proto/static/static.c
index cd31afd3..3a0d9257 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -38,7 +38,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/static/static.h b/proto/static/static.h
index fc91f71c..d99f7ebd 100644
--- a/proto/static/static.h
+++ b/proto/static/static.h
@@ -9,7 +9,7 @@
 #ifndef _BIRD_STATIC_H_
 #define _BIRD_STATIC_H_
 
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/bfd.h"
 #include "lib/buffer.h"
 
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 3b1d2299..cd449d11 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -25,7 +25,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "sysdep/unix/unix.h"
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index eb4be711..a37692d6 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -17,7 +17,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/alloca.h"
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index bfd69b73..671e91fe 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -53,7 +53,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "conf/conf.h"
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 71749324..9bb37e5d 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -30,7 +30,7 @@
 #include "lib/event.h"
 #include "lib/timer.h"
 #include "lib/string.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
diff --git a/test/bt-utils.c b/test/bt-utils.c
index 8496e185..ce9a49d7 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -14,7 +14,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 
 #include "sysdep/unix/unix.h"

From 3fb70b26faca6788aa0bdf1d558414f9f777c6cd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 31 Mar 2022 19:22:07 +0200
Subject: [PATCH 119/431] Complex route attributes are data structures, shall
 be in lib also

---
 filter/data.c               | 2 +-
 filter/filter.c             | 2 +-
 filter/filter.h             | 2 +-
 lib/Makefile                | 4 ++--
 {nest => lib}/a-path.c      | 2 +-
 {nest => lib}/a-path_test.c | 2 +-
 {nest => lib}/a-set.c       | 2 +-
 {nest => lib}/a-set_test.c  | 2 +-
 {nest => lib}/attrs.h       | 0
 nest/Makefile               | 4 ++--
 nest/rt-attr.c              | 2 +-
 proto/bgp/attrs.c           | 2 +-
 proto/bgp/packets.c         | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
 rename {nest => lib}/a-path.c (99%)
 rename {nest => lib}/a-path_test.c (99%)
 rename {nest => lib}/a-set.c (99%)
 rename {nest => lib}/a-set_test.c (99%)
 rename {nest => lib}/attrs.h (100%)

diff --git a/filter/data.c b/filter/data.c
index 87ef4ff1..381448fa 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -19,7 +19,7 @@
 #include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"
diff --git a/filter/filter.c b/filter/filter.c
index 31ae79fe..8f946f5b 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -38,7 +38,7 @@
 #include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"
diff --git a/filter/filter.h b/filter/filter.h
index 8ce6c1e0..385f1179 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -14,7 +14,7 @@
 #include "lib/ip.h"
 #include "lib/macro.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 
 /* Possible return values of filter execution */
 enum filter_return {
diff --git a/lib/Makefile b/lib/Makefile
index 812f721c..853e0a22 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
-src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
+src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
+tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/nest/a-path.c b/lib/a-path.c
similarity index 99%
rename from nest/a-path.c
rename to lib/a-path.c
index 64504c93..0eca8475 100644
--- a/nest/a-path.c
+++ b/lib/a-path.c
@@ -9,7 +9,7 @@
 
 #include "nest/bird.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
 #include "lib/string.h"
diff --git a/nest/a-path_test.c b/lib/a-path_test.c
similarity index 99%
rename from nest/a-path_test.c
rename to lib/a-path_test.c
index a6b4d3d8..38f77642 100644
--- a/nest/a-path_test.c
+++ b/lib/a-path_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 
 #define TESTS_NUM 30
diff --git a/nest/a-set.c b/lib/a-set.c
similarity index 99%
rename from nest/a-set.c
rename to lib/a-set.c
index 93f6431e..8ede9b83 100644
--- a/nest/a-set.c
+++ b/lib/a-set.c
@@ -11,7 +11,7 @@
 
 #include "nest/bird.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
 
diff --git a/nest/a-set_test.c b/lib/a-set_test.c
similarity index 99%
rename from nest/a-set_test.c
rename to lib/a-set_test.c
index daa6ab74..3280031f 100644
--- a/nest/a-set_test.c
+++ b/lib/a-set_test.c
@@ -11,7 +11,7 @@
 
 #include "lib/net.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/resource.h"
 
 #define SET_SIZE 10
diff --git a/nest/attrs.h b/lib/attrs.h
similarity index 100%
rename from nest/attrs.h
rename to lib/attrs.h
diff --git a/nest/Makefile b/nest/Makefile
index 7d451ba4..c0765530 100644
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -1,4 +1,4 @@
-src := a-path.c a-set.c cli.c cmds.c iface.c locks.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-fib.c rt-show.c rt-table.c
+src := cli.c cmds.c iface.c locks.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-fib.c rt-show.c rt-table.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
@@ -8,6 +8,6 @@ $(proto-build-c): $(lastword $(MAKEFILE_LIST))
 	$(E)echo GEN $@
 	$(Q)echo "$(patsubst %,void %(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %(); ,$(PROTO_BUILD))}" > $@
 
-tests_src := a-set_test.c a-path_test.c
+tests_src :=
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 8f4319c5..2fa9b673 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -49,7 +49,7 @@
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "lib/alloca.h"
 #include "lib/hash.h"
 #include "lib/idm.h"
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 3265cb5e..2c0d011f 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -16,7 +16,7 @@
 #include "nest/iface.h"
 #include "nest/protocol.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
 #include "lib/string.h"
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 5def0f27..8eeae490 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -16,7 +16,7 @@
 #include "nest/iface.h"
 #include "nest/protocol.h"
 #include "nest/rt.h"
-#include "nest/attrs.h"
+#include "lib/attrs.h"
 #include "proto/mrt/mrt.h"
 #include "conf/conf.h"
 #include "lib/unaligned.h"

From de86040b2cf4ec9bfbb64f0e208a19d4d7e51adc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 10 Apr 2022 14:11:46 +0200
Subject: [PATCH 120/431] Attribute list normalization cleanup

---
 filter/f-inst.c   |  8 ++----
 lib/attrs.h       | 10 ++++++++
 lib/birdlib.h     |  1 +
 lib/route.h       | 18 ++++---------
 nest/rt-attr.c    | 64 +++++++++++++++++++++++++++++++----------------
 nest/rt-show.c    |  2 +-
 proto/bgp/attrs.c | 47 ++++++++--------------------------
 proto/mrt/mrt.c   |  2 +-
 8 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index e0bad833..7b3db1c7 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -717,12 +717,8 @@
 	runtime( "Setting opaque attribute is not allowed" );
 	break;
 
-      case T_IP:;
-	int len = sizeof(ip_addr);
-	struct adata *ad = lp_alloc(fs->pool, sizeof(struct adata) + len);
-	ad->length = len;
-	(* (ip_addr *) ad->data) = v1.val.ip;
-	l->attrs[0].u.ptr = ad;
+      case T_IP:
+	l->attrs[0].u.ptr = lp_store_adata(fs->pool, &v1.val.ip, sizeof(ip_addr));
 	break;
 
       default:
diff --git a/lib/attrs.h b/lib/attrs.h
index 97a9630f..fcb70230 100644
--- a/lib/attrs.h
+++ b/lib/attrs.h
@@ -17,6 +17,8 @@ typedef struct adata {
   byte data[0];
 } adata;
 
+#define ADATA_SIZE(s)	BIRD_CPU_ALIGN(sizeof(struct adata) + s)
+
 extern const adata null_adata;		/* adata of length 0 */
 
 static inline struct adata *
@@ -27,6 +29,14 @@ lp_alloc_adata(struct linpool *pool, uint len)
   return ad;
 }
 
+static inline struct adata *
+lp_store_adata(struct linpool *pool, const void *buf, uint len)
+{
+  struct adata *ad = lp_alloc_adata(pool, len);
+  memcpy(ad->data, buf, len);
+  return ad;
+}
+
 static inline int adata_same(const struct adata *a, const struct adata *b)
 { return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
 
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 81d4908a..6f0bab96 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -19,6 +19,7 @@ struct align_probe { char x; long int y; };
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define CPU_STRUCT_ALIGN (sizeof(struct align_probe))
+#define BIRD_CPU_ALIGN(s) BIRD_ALIGN((s), CPU_STRUCT_ALIGN)
 
 /* Utility macros */
 
diff --git a/lib/route.h b/lib/route.h
index 8e60f749..eda5b9ad 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -204,24 +204,16 @@ ea_get_int(ea_list *e, unsigned id, u32 def)
 }
 
 void ea_dump(ea_list *);
-void ea_sort(ea_list *);		/* Sort entries in all sub-lists */
-unsigned ea_scan(ea_list *);		/* How many bytes do we need for merged ea_list */
-void ea_merge(ea_list *from, ea_list *to); /* Merge sub-lists to allocated buffer */
 int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
 uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */
 ea_list *ea_append(ea_list *to, ea_list *what);
 void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
 
-#define ea_normalize(ea) do { \
-  if (ea->next) { \
-    ea_list *t = alloca(ea_scan(ea)); \
-    ea_merge(ea, t); \
-    ea = t; \
-  } \
-  ea_sort(ea); \
-  if (ea->count == 0) \
-    ea = NULL; \
-} while(0) \
+/* Normalize ea_list; allocates the result from tmp_linpool */
+ea_list *ea_normalize(const ea_list *e);
+
+uint ea_list_size(ea_list *);
+void ea_list_copy(ea_list *dest, ea_list *src, uint size);
 
 struct ea_one_attr_list {
   ea_list l;
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 2fa9b673..afa95eec 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -626,7 +626,7 @@ ea_do_prune(ea_list *e)
  * If an attribute occurs multiple times in a single &ea_list,
  * ea_sort() leaves only the first (the only significant) occurrence.
  */
-void
+static void
 ea_sort(ea_list *e)
 {
   while (e)
@@ -650,8 +650,8 @@ ea_sort(ea_list *e)
  * This function calculates an upper bound of the size of
  * a given &ea_list after merging with ea_merge().
  */
-unsigned
-ea_scan(ea_list *e)
+static unsigned
+ea_scan(const ea_list *e)
 {
   unsigned cnt = 0;
 
@@ -677,8 +677,8 @@ ea_scan(ea_list *e)
  * segments with ea_merge() and finally sort and prune the result
  * by calling ea_sort().
  */
-void
-ea_merge(ea_list *e, ea_list *t)
+static void
+ea_merge(const ea_list *e, ea_list *t)
 {
   eattr *d = t->attrs;
 
@@ -694,6 +694,16 @@ ea_merge(ea_list *e, ea_list *t)
     }
 }
 
+ea_list *
+ea_normalize(const ea_list *e)
+{
+  ea_list *t = tmp_alloc(ea_scan(e));
+  ea_merge(e, t);
+  ea_sort(t);
+
+  return t->count ? t : NULL;
+}
+
 /**
  * ea_same - compare two &ea_list's
  * @x: attribute list
@@ -729,33 +739,38 @@ ea_same(ea_list *x, ea_list *y)
   return 1;
 }
 
-static inline ea_list *
-ea_list_copy(ea_list *o)
+uint
+ea_list_size(ea_list *o)
 {
-  ea_list *n;
-  unsigned i, adpos, elen;
+  unsigned i, elen;
 
-  if (!o)
-    return NULL;
-  ASSERT(!o->next);
-  elen = adpos = sizeof(ea_list) + sizeof(eattr) * o->count;
+  ASSERT_DIE(o);
+  ASSERT_DIE(!o->next);
+  elen = BIRD_CPU_ALIGN(sizeof(ea_list) + sizeof(eattr) * o->count);
 
   for(i=0; i<o->count; i++)
     {
       eattr *a = &o->attrs[i];
       if (!(a->type & EAF_EMBEDDED))
-	elen += sizeof(struct adata) + a->u.ptr->length;
+	elen += ADATA_SIZE(a->u.ptr->length);
     }
 
-  n = mb_alloc(rta_pool, elen);
+  return elen;
+}
+
+void
+ea_list_copy(ea_list *n, ea_list *o, uint elen)
+{
+  uint adpos = sizeof(ea_list) + sizeof(eattr) * o->count;
   memcpy(n, o, adpos);
-  n->flags |= EALF_CACHED;
-  for(i=0; i<o->count; i++)
+  adpos = BIRD_CPU_ALIGN(adpos);
+
+  for(uint i=0; i<o->count; i++)
     {
       eattr *a = &n->attrs[i];
       if (!(a->type & EAF_EMBEDDED))
 	{
-	  unsigned size = sizeof(struct adata) + a->u.ptr->length;
+	  unsigned size = ADATA_SIZE(a->u.ptr->length);
 	  ASSERT_DIE(adpos + size <= elen);
 
 	  struct adata *d = ((void *) n) + adpos;
@@ -765,8 +780,8 @@ ea_list_copy(ea_list *o)
 	  adpos += size;
 	}
     }
+
   ASSERT_DIE(adpos == elen);
-  return n;
 }
 
 static inline void
@@ -1029,6 +1044,7 @@ ea_hash(ea_list *e)
 
   if (e)			/* Assuming chain of length 1 */
     {
+      ASSERT_DIE(!e->next);
       for(i=0; i<e->count; i++)
 	{
 	  struct eattr *a = &e->attrs[i];
@@ -1135,7 +1151,13 @@ rta_copy(rta *o)
   memcpy(r, o, rta_size(o));
   r->uc = 1;
   r->nh.next = nexthop_copy(o->nh.next);
-  r->eattrs = ea_list_copy(o->eattrs);
+  if (!r->eattrs)
+    return r;
+
+  uint elen = ea_list_size(o->eattrs);
+  r->eattrs = mb_alloc(rta_pool, elen);
+  ea_list_copy(r->eattrs, o->eattrs, elen);
+  r->eattrs->flags |= EALF_CACHED;
   return r;
 }
 
@@ -1191,7 +1213,7 @@ rta_lookup(rta *o)
 
   ASSERT(!o->cached);
   if (o->eattrs)
-    ea_normalize(o->eattrs);
+    o->eattrs = ea_normalize(o->eattrs);
 
   h = rta_hash(o);
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 464e5f1b..4e0c5602 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -55,7 +55,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 
   /* Need to normalize the extended attributes */
   if (d->verbose && !rta_is_cached(a) && a->eattrs)
-    ea_normalize(a->eattrs);
+    a->eattrs = ea_normalize(a->eattrs);
 
   get_route_info = e->src->proto->proto->get_route_info;
   if (get_route_info)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 2c0d011f..1c49e76a 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1191,12 +1191,11 @@ bgp_export_attr(struct bgp_export_state *s, eattr *a, ea_list *to)
  * Result: one sorted attribute list segment, or NULL if attributes are unsuitable.
  */
 static inline ea_list *
-bgp_export_attrs(struct bgp_export_state *s, ea_list *attrs)
+bgp_export_attrs(struct bgp_export_state *s, const ea_list *a)
 {
   /* Merge the attribute list */
-  ea_list *new = lp_alloc(s->pool, ea_scan(attrs));
-  ea_merge(attrs, new);
-  ea_sort(new);
+  ea_list *new = ea_normalize(a);
+  ASSERT_DIE(new);
 
   uint i, count;
   count = new->count;
@@ -1498,6 +1497,7 @@ bgp_free_bucket_table(struct bgp_channel *c)
 static struct bgp_bucket *
 bgp_get_bucket(struct bgp_channel *c, ea_list *new)
 {
+
   /* Hash and lookup */
   u32 hash = ea_hash(new);
   struct bgp_bucket *b = HASH_FIND(c->bucket_hash, RBH, new, hash);
@@ -1505,45 +1505,18 @@ bgp_get_bucket(struct bgp_channel *c, ea_list *new)
   if (b)
     return b;
 
-  uint ea_size = sizeof(ea_list) + new->count * sizeof(eattr);
-  uint ea_size_aligned = BIRD_ALIGN(ea_size, CPU_STRUCT_ALIGN);
-  uint size = sizeof(struct bgp_bucket) + ea_size_aligned;
-  uint i;
-  byte *dest;
+  /* Scan the list for total size */
+  uint ea_size = BIRD_CPU_ALIGN(ea_list_size(new));
+  uint size = sizeof(struct bgp_bucket) + ea_size;
 
-  /* Gather total size of non-inline attributes */
-  for (i = 0; i < new->count; i++)
-  {
-    eattr *a = &new->attrs[i];
-
-    if (!(a->type & EAF_EMBEDDED))
-      size += BIRD_ALIGN(sizeof(struct adata) + a->u.ptr->length, CPU_STRUCT_ALIGN);
-  }
-
-  /* Create the bucket */
+  /* Allocate the bucket */
   b = mb_alloc(c->pool, size);
   *b = (struct bgp_bucket) { };
   init_list(&b->prefixes);
   b->hash = hash;
 
-  /* Copy list of extended attributes */
-  memcpy(b->eattrs, new, ea_size);
-  dest = ((byte *) b->eattrs) + ea_size_aligned;
-
-  /* Copy values of non-inline attributes */
-  for (i = 0; i < new->count; i++)
-  {
-    eattr *a = &b->eattrs->attrs[i];
-
-    if (!(a->type & EAF_EMBEDDED))
-    {
-      const struct adata *oa = a->u.ptr;
-      struct adata *na = (struct adata *) dest;
-      memcpy(na, oa, sizeof(struct adata) + oa->length);
-      a->u.ptr = na;
-      dest += BIRD_ALIGN(sizeof(struct adata) + na->length, CPU_STRUCT_ALIGN);
-    }
-  }
+  /* Copy the ea_list */
+  ea_list_copy(b->eattrs, new, ea_size);
 
   /* Insert the bucket to send queue and bucket hash */
   add_tail(&c->bucket_queue, &b->send_node);
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 321c6395..760cfa73 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -431,7 +431,7 @@ mrt_rib_table_entry_bgp_attrs(struct mrt_table_dump_state *s, rte *r)
 
   /* Attribute list must be normalized for bgp_encode_attrs() */
   if (!rta_is_cached(r->attrs))
-    ea_normalize(eattrs);
+    eattrs = ea_normalize(eattrs);
 
   mrt_buffer_need(b, MRT_ATTR_BUFFER_SIZE);
   byte *pos = b->pos;

From f2f3163f6c3fba7f9ef03640d7b2f6323873d2cc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 10 Apr 2022 18:55:15 +0200
Subject: [PATCH 121/431] Filters always allocate from tmp_linpool

---
 conf/confbase.Y       |  6 ++--
 filter/config.Y       |  2 +-
 filter/data.c         | 72 +++++++++++++++++++++++++++++++++++++++++++
 filter/data.h         |  4 ++-
 filter/f-inst.c       |  6 ++--
 filter/filter.c       | 29 ++++++-----------
 filter/filter.h       |  6 ++--
 filter/filter_test.c  |  2 +-
 lib/attrs.h           |  2 ++
 nest/cmds.c           |  2 +-
 nest/rt-show.c        |  4 +--
 nest/rt-table.c       | 18 ++++-------
 proto/mrt/mrt.c       |  2 +-
 proto/static/static.c | 11 +------
 sysdep/unix/krt.c     |  2 +-
 15 files changed, 110 insertions(+), 58 deletions(-)

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 3fdacb12..a81560dc 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -152,9 +152,9 @@ conf: definition ;
 
 definition:
    DEFINE symbol '=' term ';' {
-     struct f_val *val = cfg_allocz(sizeof(struct f_val));
-     if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error");
-     cf_define_symbol($2, SYM_CONSTANT | val->type, val, val);
+     struct f_val val;
+     if (f_eval(f_linearize($4), &val) > F_RETURN) cf_error("Runtime error");
+     cf_define_symbol($2, SYM_CONSTANT | val.type, val, lp_val_copy(cfg_mem, &val));
    }
  ;
 
diff --git a/filter/config.Y b/filter/config.Y
index 22981945..92656f7c 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -529,7 +529,7 @@ set_atom:
  | VPN_RD { $$.type = T_RD; $$.val.ec = $1; }
  | ENUM   { $$.type = pair_a($1); $$.val.i = pair_b($1); }
  | '(' term ')' {
-     if (f_eval(f_linearize($2), cfg_mem, &($$)) > F_RETURN) cf_error("Runtime error");
+     if (f_eval(f_linearize($2), &($$)) > F_RETURN) cf_error("Runtime error");
      if (!f_valid_set_type($$.type)) cf_error("Set-incompatible type");
    }
  | CF_SYM_KNOWN {
diff --git a/filter/data.c b/filter/data.c
index 381448fa..425dfdd3 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -602,3 +602,75 @@ val_dump(const struct f_val *v) {
   return val_dump_buffer;
 }
 
+
+struct f_val *
+lp_val_copy(struct linpool *lp, const struct f_val *v)
+{
+  switch (v->type)
+  {
+    case T_VOID:
+    case T_BOOL:
+    case T_INT:
+    case T_IP:
+    case T_PAIR:
+    case T_QUAD:
+    case T_EC:
+    case T_LC:
+    case T_RD:
+    case T_ENUM:
+    case T_PATH_MASK_ITEM:
+      /* These aren't embedded but there is no need to copy them */
+    case T_SET:
+    case T_PREFIX_SET:
+    case T_PATH_MASK:
+    case T_IFACE:
+      {
+	struct f_val *out = lp_alloc(lp, sizeof(*out));
+	*out = *v;
+	return out;
+      }
+
+    case T_NET:
+      {
+	struct {
+	  struct f_val val;
+	  net_addr net[0];
+	} *out = lp_alloc(lp, sizeof(*out) + v->val.net->length);
+	out->val = *v;
+	out->val.val.net = out->net;
+	net_copy(out->net, v->val.net);
+	return &out->val;
+      }
+
+    case T_STRING:
+      {
+	uint len = strlen(v->val.s);
+	struct {
+	  struct f_val val;
+	  char buf[0];
+	} *out = lp_alloc(lp, sizeof(*out) + len + 1);
+	out->val = *v;
+	out->val.val.s = out->buf;
+	memcpy(out->buf, v->val.s, len+1);
+	return &out->val;
+      }
+
+    case T_PATH:
+    case T_CLIST:
+    case T_ECLIST:
+    case T_LCLIST:
+      {
+	struct {
+	  struct f_val val;
+	  struct adata ad;
+	} *out = lp_alloc(lp, sizeof(*out) + v->val.ad->length);
+	out->val = *v;
+	out->val.val.ad = &out->ad;
+	memcpy(&out->ad, v->val.ad, v->val.ad->length);
+	return &out->val;
+      }
+
+    default:
+      bug("Unknown type in value copy: %d", v->type);
+  }
+}
diff --git a/filter/data.h b/filter/data.h
index 9ffa1b61..cba47d6a 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -213,6 +213,8 @@ void val_format(const struct f_val *v, buffer *buf);
 char *val_format_str(struct linpool *lp, const struct f_val *v);
 const char *val_dump(const struct f_val *v);
 
+struct f_val *lp_val_copy(struct linpool *lp, const struct f_val *v);
+
 static inline int val_is_ip4(const struct f_val *v)
 { return (v->type == T_IP) && ipa_is_ip4(v->val.ip); }
 int val_in_range(const struct f_val *v1, const struct f_val *v2);
@@ -249,6 +251,6 @@ static inline const struct f_val *f_get_empty(btype t)
   }
 }
 
-enum filter_return f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres);
+enum filter_return f_eval(const struct f_line *expr, struct f_val *pres);
 
 #endif
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 7b3db1c7..3a2554fd 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -696,7 +696,7 @@
     DYNAMIC_ATTR;
     ARG_TYPE(1, da.type);
     {
-      struct ea_list *l = lp_alloc(fs->pool, sizeof(struct ea_list) + sizeof(eattr));
+      struct ea_list *l = tmp_alloc(sizeof(struct ea_list) + sizeof(eattr));
 
       l->next = NULL;
       l->flags = EALF_SORTED;
@@ -718,7 +718,7 @@
 	break;
 
       case T_IP:
-	l->attrs[0].u.ptr = lp_store_adata(fs->pool, &v1.val.ip, sizeof(ip_addr));
+	l->attrs[0].u.ptr = tmp_store_adata(&v1.val.ip, sizeof(ip_addr));
 	break;
 
       default:
@@ -739,7 +739,7 @@
     ACCESS_EATTRS;
 
     f_rta_cow(fs);
-    ea_unset_attr(fs->eattrs, fs->pool, 1, da.ea_code);
+    ea_unset_attr(fs->eattrs, tmp_linpool, 1, da.ea_code);
   }
 
   INST(FI_LENGTH, 1, 1) {	/* Get length of */
diff --git a/filter/filter.c b/filter/filter.c
index 8f946f5b..9bedb938 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -82,9 +82,6 @@ struct filter_state {
   /* Cached pointer to ea_list */
   struct ea_list **eattrs;
 
-  /* Linpool for adata allocation */
-  struct linpool *pool;
-
   /* Buffer for log output */
   struct buffer buf;
 
@@ -134,7 +131,7 @@ f_rta_cow(struct filter_state *fs)
    * at the end of f_run()), also the lock of hostentry is inherited (we
    * suppose hostentry is not changed by filters).
    */
-  (*fs->rte)->attrs = rta_do_cow((*fs->rte)->attrs, fs->pool);
+  (*fs->rte)->attrs = rta_do_cow((*fs->rte)->attrs, tmp_linpool);
 
   /* Re-cache the ea_list */
   f_cache_eattrs(fs);
@@ -202,8 +199,8 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
   return F_ERROR; \
 } while(0)
 
-#define falloc(size)  lp_alloc(fs->pool, size)
-#define fpool fs->pool
+#define falloc(size)	tmp_alloc(size)
+#define fpool		tmp_linpool
 
 #define ACCESS_EATTRS do { if (!fs->eattrs) f_cache_eattrs(fs); } while (0)
 
@@ -268,7 +265,7 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
  * modified in place, old cached rta is possibly freed.
  */
 enum filter_return
-f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags)
+f_run(const struct filter *filter, struct rte **rte, int flags)
 {
   if (filter == FILTER_ACCEPT)
     return F_ACCEPT;
@@ -282,7 +279,6 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
   /* Initialize the filter state */
   filter_state = (struct filter_state) {
     .rte = rte,
-    .pool = tmp_pool,
     .flags = flags,
   };
 
@@ -343,11 +339,10 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
  */
 
 enum filter_return
-f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool)
+f_eval_rte(const struct f_line *expr, struct rte **rte)
 {
   filter_state = (struct filter_state) {
     .rte = rte,
-    .pool = tmp_pool,
   };
 
   f_stack_init(filter_state);
@@ -367,11 +362,9 @@ f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool
  * @pres: here the output will be stored
  */
 enum filter_return
-f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres)
+f_eval(const struct f_line *expr, struct f_val *pres)
 {
-  filter_state = (struct filter_state) {
-    .pool = tmp_pool,
-  };
+  filter_state = (struct filter_state) {};
 
   f_stack_init(filter_state);
 
@@ -390,9 +383,7 @@ uint
 f_eval_int(const struct f_line *expr)
 {
   /* Called independently in parse-time to eval expressions */
-  filter_state = (struct filter_state) {
-    .pool = cfg_mem,
-  };
+  filter_state = (struct filter_state) {};
 
   f_stack_init(filter_state);
 
@@ -413,10 +404,10 @@ f_eval_int(const struct f_line *expr)
  * f_eval_buf - get a value of a term and print it to the supplied buffer
  */
 enum filter_return
-f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf)
+f_eval_buf(const struct f_line *expr, buffer *buf)
 {
   struct f_val val;
-  enum filter_return fret = f_eval(expr, tmp_pool, &val);
+  enum filter_return fret = f_eval(expr, &val);
   if (fret <= F_RETURN)
     val_format(&val, buf);
   return fret;
diff --git a/filter/filter.h b/filter/filter.h
index 385f1179..43c04443 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -51,10 +51,10 @@ struct filter {
 
 struct rte;
 
-enum filter_return f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags);
-enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool);
+enum filter_return f_run(const struct filter *filter, struct rte **rte, int flags);
+enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte);
 uint f_eval_int(const struct f_line *expr);
-enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf);
+enum filter_return f_eval_buf(const struct f_line *expr, buffer *buf);
 
 const char *filter_name(const struct filter *filter);
 int filter_same(const struct filter *new, const struct filter *old);
diff --git a/filter/filter_test.c b/filter/filter_test.c
index e8e8b747..63764964 100644
--- a/filter/filter_test.c
+++ b/filter/filter_test.c
@@ -46,7 +46,7 @@ run_function(const void *arg)
   if (t->cmp)
     return t->result == f_same(t->fn, t->cmp);
 
-  enum filter_return fret = f_eval(t->fn, tmp_linpool, NULL);
+  enum filter_return fret = f_eval(t->fn, NULL);
 
   return (fret < F_REJECT);
 }
diff --git a/lib/attrs.h b/lib/attrs.h
index fcb70230..d2638f3f 100644
--- a/lib/attrs.h
+++ b/lib/attrs.h
@@ -37,6 +37,8 @@ lp_store_adata(struct linpool *pool, const void *buf, uint len)
   return ad;
 }
 
+#define tmp_store_adata(buf, len) lp_store_adata(tmp_linpool, buf, len)
+
 static inline int adata_same(const struct adata *a, const struct adata *b)
 { return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
 
diff --git a/nest/cmds.c b/nest/cmds.c
index 3e59cb6f..99a7bbfe 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -133,7 +133,7 @@ cmd_eval(const struct f_line *expr)
   buffer buf;
   LOG_BUFFER_INIT(buf);
 
-  if (f_eval_buf(expr, this_cli->parser_pool, &buf) > F_RETURN)
+  if (f_eval_buf(expr, &buf) > F_RETURN)
     {
       cli_msg(8008, "runtime error");
       return;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 4e0c5602..7d02f52e 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -169,7 +169,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	       * command may change the export filter and do not update routes.
 	       */
 	      int do_export = (ic > 0) ||
-		(f_run(ec->out_filter, &e, c->show_pool, FF_SILENT) <= F_ACCEPT);
+		(f_run(ec->out_filter, &e, FF_SILENT) <= F_ACCEPT);
 
 	      if (do_export != (d->export_mode == RSEM_EXPORT))
 		goto skip;
@@ -182,7 +182,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       if (d->show_protocol && (d->show_protocol != e->src->proto))
 	goto skip;
 
-      if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT)
+      if (f_run(d->filter, &e, 0) > F_ACCEPT)
 	goto skip;
 
       if (d->stats < 2)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 031e462b..049b7a7f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -713,7 +713,7 @@ rte_trace_out(uint flag, struct channel *c, rte *e, char *msg)
 }
 
 static rte *
-export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int silent)
+export_filter(struct channel *c, rte *rt0, rte **rt_free, int silent)
 {
   struct proto *p = c->proto;
   const struct filter *filter = c->out_filter;
@@ -743,7 +743,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
     }
 
   v = filter && ((filter == FILTER_REJECT) ||
-		 (f_run(filter, &rt, pool,
+		 (f_run(filter, &rt,
 			(silent ? FF_SILENT : 0)) > F_ACCEPT));
   if (v)
     {
@@ -767,12 +767,6 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
   return NULL;
 }
 
-static inline rte *
-export_filter(struct channel *c, rte *rt0, rte **rt_free, int silent)
-{
-  return export_filter_(c, rt0, rt_free, rte_update_pool, silent);
-}
-
 static void
 do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
 {
@@ -963,7 +957,7 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
   if (!rte_is_valid(best0))
     return NULL;
 
-  best = export_filter_(c, best0, rt_free, pool, silent);
+  best = export_filter(c, best0, rt_free, silent);
 
   if (!best || !rte_is_reachable(best))
     return best;
@@ -973,7 +967,7 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
     if (!rte_mergable(best0, rt0))
       continue;
 
-    rt = export_filter_(c, rt0, &tmp, pool, 1);
+    rt = export_filter(c, rt0, &tmp, 1);
 
     if (!rt)
       continue;
@@ -1592,7 +1586,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	}
       else if (filter)
 	{
-	  int fr = f_run(filter, &new, rte_update_pool, 0);
+	  int fr = f_run(filter, &new, 0);
 	  if (fr > F_ACCEPT)
 	  {
 	    stats->imp_updates_filtered++;
@@ -1696,7 +1690,7 @@ rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
   /* Rest is stripped down export_filter() */
   int v = p->preexport ? p->preexport(p, rt) : 0;
   if (v == RIC_PROCESS)
-    v = (f_run(filter, &rt, rte_update_pool, FF_SILENT) <= F_ACCEPT);
+    v = (f_run(filter, &rt, FF_SILENT) <= F_ACCEPT);
 
   /* Discard temporary rte */
   if (rt != n->routes)
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 760cfa73..c595f298 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -525,7 +525,7 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
       continue;
     }
 
-    if (f_run(s->filter, &rt, s->linpool, 0) <= F_ACCEPT)
+    if (f_run(s->filter, &rt, 0) <= F_ACCEPT)
       mrt_rib_table_entry(s, rt);
 
     if (rt != rt0)
diff --git a/proto/static/static.c b/proto/static/static.c
index 3a0d9257..42febcd4 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -47,8 +47,6 @@
 
 #include "static.h"
 
-static linpool *static_lp;
-
 static inline struct rte_src * static_get_source(struct static_proto *p, uint i)
 { return i ? rt_get_source(&p->p, i) : p->p.main_source; }
 
@@ -114,7 +112,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     net_copy(e->net->n.addr, r->net);
 
     /* Evaluate the filter */
-    f_eval_rte(r->cmds, &e, static_lp);
+    f_eval_rte(r->cmds, &e);
 
     /* Remove the temporary node */
     e->net = NULL;
@@ -122,10 +120,6 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 
   rte_update2(p->p.main_channel, r->net, e, src);
   r->state = SRS_CLEAN;
-
-  if (r->cmds)
-    lp_flush(static_lp);
-
   return;
 
 withdraw:
@@ -485,9 +479,6 @@ static_start(struct proto *P)
   struct static_config *cf = (void *) P->cf;
   struct static_route *r;
 
-  if (!static_lp)
-    static_lp = lp_new(&root_pool);
-
   if (p->igp_table_ip4)
     rt_lock_table(p->igp_table_ip4);
 
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 671e91fe..0ebc4fb3 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -589,7 +589,7 @@ krt_export_net(struct krt_proto *p, net *net, rte **rt_free)
   if (filter == FILTER_ACCEPT)
     goto accept;
 
-  if (f_run(filter, &rt, krt_filter_lp, FF_SILENT) > F_ACCEPT)
+  if (f_run(filter, &rt, FF_SILENT) > F_ACCEPT)
     goto reject;
 
 

From ef4313e1667a8745c8d8813ac78342ec7c035895 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 10 Apr 2022 19:15:18 +0200
Subject: [PATCH 122/431] Local route attributes are always allocated from
 tmp_linpool

---
 filter/f-inst.c     |   2 +-
 lib/route.h         |  56 +++++++++-------------
 proto/bgp/attrs.c   | 110 ++++++++++++++++++++++++++------------------
 proto/bgp/bgp.h     |  29 ++----------
 proto/bgp/packets.c |  18 ++++----
 5 files changed, 103 insertions(+), 112 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 3a2554fd..0d042e37 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -739,7 +739,7 @@
     ACCESS_EATTRS;
 
     f_rta_cow(fs);
-    ea_unset_attr(fs->eattrs, tmp_linpool, 1, da.ea_code);
+    ea_unset_attr(fs->eattrs, 1, da.ea_code);
   }
 
   INST(FI_LENGTH, 1, 1) {	/* Get length of */
diff --git a/lib/route.h b/lib/route.h
index eda5b9ad..49810887 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -220,58 +220,48 @@ struct ea_one_attr_list {
   eattr a;
 };
 
+#define EA_LITERAL_EMBEDDED(_id, _type, _flags, _val) ({ \
+    ASSERT_DIE(_type & EAF_EMBEDDED); \
+    EA_LITERAL_GENERIC(_id, _type, _flags, .u.i = _val); \
+    })
+
+#define EA_LITERAL_ADATA(_id, _type, _flags, _buf, _len) ({ \
+    ASSERT_DIE(!(_type & EAF_EMBEDDED)); \
+    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = tmp_store_adata(_buf, _len)); \
+    })
+
+#define EA_LITERAL_GENERIC(_id, _type, _flags, ...) \
+  ((eattr) { .id = _id, .type = _type, .flags = _flags, __VA_ARGS__ })
+
 static inline eattr *
-ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, union bval val)
+ea_set_attr(ea_list **to, eattr a)
 {
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
+  struct ea_one_attr_list *ea = tmp_alloc(sizeof(*ea));
   *ea = (struct ea_one_attr_list) {
     .l.flags = EALF_SORTED,
     .l.count = 1,
     .l.next = *to,
-
-    .a.id = id,
-    .a.type = type,
-    .a.flags = flags,
+    .a = a,
   };
 
-  ea->a.u = val;
   *to = &ea->l;
-
   return &ea->a;
 }
 
 static inline void
-ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
+ea_unset_attr(ea_list **to, _Bool local, uint code)
 {
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
-    .l.flags = EALF_SORTED,
-    .l.count = 1,
-    .l.next = *to,
-    .a.id = code,
-    .a.fresh = local,
-    .a.originated = local,
-    .a.undef = 1,
-  };
-
-  *to = &ea->l;
+  ea_set_attr(to, EA_LITERAL_GENERIC(code, 0, 0,
+	.fresh = local, .originated = local, .undef = 1));
 }
 
 static inline void
-ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 data)
-{
-  union bval bv = { .data = data };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
+ea_set_attr_u32(ea_list **to, uint id, uint flags, uint type, u32 data)
+{ ea_set_attr(to, EA_LITERAL_EMBEDDED(id, type, flags, data)); }
 
 static inline void
-ea_set_attr_data(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, void *data, uint len)
-{
-  struct adata *a = lp_alloc_adata(pool, len);
-  memcpy(a->data, data, len);
-  union bval bv = { .ptr = a, };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
+ea_set_attr_data(ea_list **to, uint id, uint flags, uint type, void *data, uint len)
+{ ea_set_attr(to, EA_LITERAL_ADATA(id, type, flags, data, len)); }
 
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1c49e76a..a7b6d0cd 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -79,22 +79,44 @@ static const struct bgp_attr_desc bgp_attr_table[];
 
 static inline int bgp_attr_known(uint code);
 
-eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val)
+void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
 {
   ASSERT(bgp_attr_known(code));
 
-  return ea_set_attr(
-      attrs,
-      pool,
-      EA_CODE(PROTOCOL_BGP, code),
-      flags & ~BAF_EXT_LEN,
-      bgp_attr_table[code].type,
-      val
-  );
+  ea_set_attr(to, EA_LITERAL_EMBEDDED(
+	EA_CODE(PROTOCOL_BGP, code),
+	bgp_attr_table[code].type,
+	flags & ~BAF_EXT_LEN,
+	val
+	));
 }
 
+void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad)
+{
+  ASSERT(bgp_attr_known(code));
+  ASSERT_DIE(!(bgp_attr_table[code].type & EAF_EMBEDDED));
 
+  ea_set_attr(to, EA_LITERAL_GENERIC(
+	EA_CODE(PROTOCOL_BGP, code),
+	bgp_attr_table[code].type,
+	flags & ~BAF_EXT_LEN,
+	.u.ad = ad
+	));
+}
+
+void
+bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len)
+{
+  ASSERT(bgp_attr_known(code));
+
+  ea_set_attr(to, EA_LITERAL_ADATA(
+	EA_CODE(PROTOCOL_BGP, code),
+	bgp_attr_table[code].type,
+	flags & ~BAF_EXT_LEN,
+	data,
+	len
+	));
+}
 
 #define REPORT(msg, args...) \
   ({ log(L_REMOTE "%s: " msg, s->proto->p.name, ## args); })
@@ -402,7 +424,7 @@ bgp_decode_origin(struct bgp_parse_state *s, uint code UNUSED, uint flags, byte
   if (data[0] > 2)
     WITHDRAW(BAD_VALUE, "ORIGIN", data[0]);
 
-  bgp_set_attr_u32(to, s->pool, BA_ORIGIN, flags, data[0]);
+  bgp_set_attr_u32(to, BA_ORIGIN, flags, data[0]);
 }
 
 static void
@@ -470,7 +492,7 @@ bgp_decode_as_path(struct bgp_parse_state *s, uint code UNUSED, uint flags, byte
       !bgp_as_path_first_as_equal(data, len, p->remote_as))
     WITHDRAW("Malformed AS_PATH attribute - %s", "First AS differs from neigbor AS");
 
-  bgp_set_attr_data(to, s->pool, BA_AS_PATH, flags, data, len);
+  bgp_set_attr_data(to, BA_AS_PATH, flags, data, len);
 }
 
 
@@ -542,7 +564,7 @@ bgp_decode_med(struct bgp_parse_state *s, uint code UNUSED, uint flags, byte *da
     WITHDRAW(BAD_LENGTH, "MULTI_EXIT_DISC", len);
 
   u32 val = get_u32(data);
-  bgp_set_attr_u32(to, s->pool, BA_MULTI_EXIT_DISC, flags, val);
+  bgp_set_attr_u32(to, BA_MULTI_EXIT_DISC, flags, val);
 }
 
 
@@ -563,7 +585,7 @@ bgp_decode_local_pref(struct bgp_parse_state *s, uint code UNUSED, uint flags, b
     WITHDRAW(BAD_LENGTH, "LOCAL_PREF", len);
 
   u32 val = get_u32(data);
-  bgp_set_attr_u32(to, s->pool, BA_LOCAL_PREF, flags, val);
+  bgp_set_attr_u32(to, BA_LOCAL_PREF, flags, val);
 }
 
 
@@ -573,7 +595,7 @@ bgp_decode_atomic_aggr(struct bgp_parse_state *s, uint code UNUSED, uint flags,
   if (len != 0)
     DISCARD(BAD_LENGTH, "ATOMIC_AGGR", len);
 
-  bgp_set_attr_data(to, s->pool, BA_ATOMIC_AGGR, flags, NULL, 0);
+  bgp_set_attr_data(to, BA_ATOMIC_AGGR, flags, NULL, 0);
 }
 
 static int
@@ -607,7 +629,7 @@ bgp_decode_aggregator(struct bgp_parse_state *s, uint code UNUSED, uint flags, b
     len = aggregator_16to32(data, src);
   }
 
-  bgp_set_attr_data(to, s->pool, BA_AGGREGATOR, flags, data, len);
+  bgp_set_attr_data(to, BA_AGGREGATOR, flags, data, len);
 }
 
 static void
@@ -636,7 +658,7 @@ bgp_decode_community(struct bgp_parse_state *s, uint code UNUSED, uint flags, by
 
   struct adata *ad = lp_alloc_adata(s->pool, len);
   get_u32s(data, (u32 *) ad->data, len / 4);
-  bgp_set_attr_ptr(to, s->pool, BA_COMMUNITY, flags, ad);
+  bgp_set_attr_ptr(to, BA_COMMUNITY, flags, ad);
 }
 
 
@@ -657,7 +679,7 @@ bgp_decode_originator_id(struct bgp_parse_state *s, uint code UNUSED, uint flags
     WITHDRAW(BAD_LENGTH, "ORIGINATOR_ID", len);
 
   u32 val = get_u32(data);
-  bgp_set_attr_u32(to, s->pool, BA_ORIGINATOR_ID, flags, val);
+  bgp_set_attr_u32(to, BA_ORIGINATOR_ID, flags, val);
 }
 
 
@@ -682,7 +704,7 @@ bgp_decode_cluster_list(struct bgp_parse_state *s, uint code UNUSED, uint flags,
 
   struct adata *ad = lp_alloc_adata(s->pool, len);
   get_u32s(data, (u32 *) ad->data, len / 4);
-  bgp_set_attr_ptr(to, s->pool, BA_CLUSTER_LIST, flags, ad);
+  bgp_set_attr_ptr(to, BA_CLUSTER_LIST, flags, ad);
 }
 
 static void
@@ -801,7 +823,7 @@ bgp_decode_ext_community(struct bgp_parse_state *s, uint code UNUSED, uint flags
 
   struct adata *ad = lp_alloc_adata(s->pool, len);
   get_u32s(data, (u32 *) ad->data, len / 4);
-  bgp_set_attr_ptr(to, s->pool, BA_EXT_COMMUNITY, flags, ad);
+  bgp_set_attr_ptr(to, BA_EXT_COMMUNITY, flags, ad);
 }
 
 
@@ -814,7 +836,7 @@ bgp_decode_as4_aggregator(struct bgp_parse_state *s, uint code UNUSED, uint flag
   if (len != 8)
     DISCARD(BAD_LENGTH, "AS4_AGGREGATOR", len);
 
-  bgp_set_attr_data(to, s->pool, BA_AS4_AGGREGATOR, flags, data, len);
+  bgp_set_attr_data(to, BA_AS4_AGGREGATOR, flags, data, len);
 }
 
 static void
@@ -844,7 +866,7 @@ bgp_decode_as4_path(struct bgp_parse_state *s, uint code UNUSED, uint flags, byt
     a = as_path_strip_confed(s->pool, a);
   }
 
-  bgp_set_attr_ptr(to, s->pool, BA_AS4_PATH, flags, a);
+  bgp_set_attr_ptr(to, BA_AS4_PATH, flags, a);
 }
 
 
@@ -868,7 +890,7 @@ bgp_decode_aigp(struct bgp_parse_state *s, uint code UNUSED, uint flags, byte *d
   if (!bgp_aigp_valid(data, len, err, sizeof(err)))
     DISCARD("Malformed AIGP attribute - %s", err);
 
-  bgp_set_attr_data(to, s->pool, BA_AIGP, flags, data, len);
+  bgp_set_attr_data(to, BA_AIGP, flags, data, len);
 }
 
 static void
@@ -900,7 +922,7 @@ bgp_decode_large_community(struct bgp_parse_state *s, uint code UNUSED, uint fla
 
   struct adata *ad = lp_alloc_adata(s->pool, len);
   get_u32s(data, (u32 *) ad->data, len / 4);
-  bgp_set_attr_ptr(to, s->pool, BA_LARGE_COMMUNITY, flags, ad);
+  bgp_set_attr_ptr(to, BA_LARGE_COMMUNITY, flags, ad);
 }
 
 static void
@@ -973,10 +995,10 @@ bgp_format_mpls_label_stack(const eattr *a, byte *buf, uint size)
 }
 
 static inline void
-bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to)
+bgp_decode_unknown(struct bgp_parse_state *s UNUSED, uint code, uint flags, byte *data, uint len, ea_list **to)
 {
   /* Cannot use bgp_set_attr_data() as it works on known attributes only */
-  ea_set_attr_data(to, s->pool, EA_CODE(PROTOCOL_BGP, code), flags, T_OPAQUE, data, len);
+  ea_set_attr_data(to, EA_CODE(PROTOCOL_BGP, code), flags, T_OPAQUE, data, len);
 }
 
 
@@ -1419,7 +1441,7 @@ bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len)
 
   /* If there is no local preference, define one */
   if (!BIT32_TEST(s->attrs_seen, BA_LOCAL_PREF))
-    bgp_set_attr_u32(&attrs, s->pool, BA_LOCAL_PREF, 0, p->cf->default_local_pref);
+    bgp_set_attr_u32(&attrs, BA_LOCAL_PREF, 0, p->cf->default_local_pref);
 
   return attrs;
 
@@ -1449,7 +1471,7 @@ bgp_finish_attrs(struct bgp_parse_state *s, rta *a)
   if (BIT32_TEST(s->attrs_seen, BA_AIGP) && !s->channel->cf->aigp)
   {
     REPORT("Discarding AIGP attribute received on non-AIGP session");
-    bgp_unset_attr(&a->eattrs, s->pool, BA_AIGP);
+    bgp_unset_attr(&a->eattrs, BA_AIGP);
   }
 }
 
@@ -1718,7 +1740,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
 
   /* ORIGIN attribute - mandatory, attach if missing */
   if (! bgp_find_attr(attrs0, BA_ORIGIN))
-    bgp_set_attr_u32(&attrs, pool, BA_ORIGIN, 0, src ? ORIGIN_INCOMPLETE : ORIGIN_IGP);
+    bgp_set_attr_u32(&attrs, BA_ORIGIN, 0, src ? ORIGIN_INCOMPLETE : ORIGIN_IGP);
 
   /* AS_PATH attribute - mandatory */
   a = bgp_find_attr(attrs0, BA_AS_PATH);
@@ -1733,24 +1755,24 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
   {
     /* IBGP or route server -> just ensure there is one */
     if (!a)
-      bgp_set_attr_ptr(&attrs, pool, BA_AS_PATH, 0, &null_adata);
+      bgp_set_attr_ptr(&attrs, BA_AS_PATH, 0, &null_adata);
   }
   else if (p->is_interior)
   {
     /* Confederation -> prepend ASN as AS_CONFED_SEQUENCE */
     ad = as_path_prepend2(pool, ad, AS_PATH_CONFED_SEQUENCE, p->public_as);
-    bgp_set_attr_ptr(&attrs, pool, BA_AS_PATH, 0, ad);
+    bgp_set_attr_ptr(&attrs, BA_AS_PATH, 0, ad);
   }
   else /* Regular EBGP (no RS, no confederation) */
   {
     /* Regular EBGP -> prepend ASN as regular sequence */
     ad = as_path_prepend2(pool, ad, AS_PATH_SEQUENCE, p->public_as);
-    bgp_set_attr_ptr(&attrs, pool, BA_AS_PATH, 0, ad);
+    bgp_set_attr_ptr(&attrs, BA_AS_PATH, 0, ad);
 
     /* MULTI_EXIT_DESC attribute - accept only if set in export filter */
     a = bgp_find_attr(attrs0, BA_MULTI_EXIT_DISC);
     if (a && !(a->fresh))
-      bgp_unset_attr(&attrs, pool, BA_MULTI_EXIT_DISC);
+      bgp_unset_attr(&attrs, BA_MULTI_EXIT_DISC);
   }
 
   /* NEXT_HOP attribute - delegated to AF-specific hook */
@@ -1759,7 +1781,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
 
   /* LOCAL_PREF attribute - required for IBGP, attach if missing */
   if (p->is_interior && ! bgp_find_attr(attrs0, BA_LOCAL_PREF))
-    bgp_set_attr_u32(&attrs, pool, BA_LOCAL_PREF, 0, p->cf->default_local_pref);
+    bgp_set_attr_u32(&attrs, BA_LOCAL_PREF, 0, p->cf->default_local_pref);
 
   /* AIGP attribute - accumulate local metric or originate new one */
   u64 metric;
@@ -1768,7 +1790,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
        (c->cf->aigp_originate && bgp_init_aigp_metric(e, &metric, &ad))))
   {
     ad = bgp_aigp_set_metric(pool, ad, metric);
-    bgp_set_attr_ptr(&attrs, pool, BA_AIGP, 0, ad);
+    bgp_set_attr_ptr(&attrs, BA_AIGP, 0, ad);
   }
 
   /* IBGP route reflection, RFC 4456 */
@@ -1776,7 +1798,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
   {
     /* ORIGINATOR_ID attribute - attach if not already set */
     if (! bgp_find_attr(attrs0, BA_ORIGINATOR_ID))
-      bgp_set_attr_u32(&attrs, pool, BA_ORIGINATOR_ID, 0, src->remote_id);
+      bgp_set_attr_u32(&attrs, BA_ORIGINATOR_ID, 0, src->remote_id);
 
     /* CLUSTER_LIST attribute - prepend cluster ID */
     a = bgp_find_attr(attrs0, BA_CLUSTER_LIST);
@@ -1791,7 +1813,7 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
       ad = int_set_prepend(pool, ad, p->rr_cluster_id);
 
     /* Should be at least one prepended cluster ID */
-    bgp_set_attr_ptr(&attrs, pool, BA_CLUSTER_LIST, 0, ad);
+    bgp_set_attr_ptr(&attrs, BA_CLUSTER_LIST, 0, ad);
   }
 
   /* AS4_* transition attributes, RFC 6793 4.2.2 */
@@ -1800,15 +1822,15 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
     a = bgp_find_attr(attrs, BA_AS_PATH);
     if (a && as_path_contains_as4(a->u.ptr))
     {
-      bgp_set_attr_ptr(&attrs, pool, BA_AS_PATH, 0, as_path_to_old(pool, a->u.ptr));
-      bgp_set_attr_ptr(&attrs, pool, BA_AS4_PATH, 0, as_path_strip_confed(pool, a->u.ptr));
+      bgp_set_attr_ptr(&attrs, BA_AS_PATH, 0, as_path_to_old(pool, a->u.ptr));
+      bgp_set_attr_ptr(&attrs, BA_AS4_PATH, 0, as_path_strip_confed(pool, a->u.ptr));
     }
 
     a = bgp_find_attr(attrs, BA_AGGREGATOR);
     if (a && aggregator_contains_as4(a->u.ptr))
     {
-      bgp_set_attr_ptr(&attrs, pool, BA_AGGREGATOR, 0, aggregator_to_old(pool, a->u.ptr));
-      bgp_set_attr_ptr(&attrs, pool, BA_AS4_AGGREGATOR, 0, a->u.ptr);
+      bgp_set_attr_ptr(&attrs, BA_AGGREGATOR, 0, aggregator_to_old(pool, a->u.ptr));
+      bgp_set_attr_ptr(&attrs, BA_AS4_AGGREGATOR, 0, a->u.ptr);
     }
   }
 
@@ -2271,7 +2293,7 @@ bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
     return r;
 
   r = rte_cow_rta(r, pool);
-  bgp_set_attr_ptr(&(r->attrs->eattrs), pool, BA_COMMUNITY, flags,
+  bgp_set_attr_ptr(&(r->attrs->eattrs), BA_COMMUNITY, flags,
 		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
   r->pflags |= BGP_REF_STALE;
 
@@ -2291,8 +2313,8 @@ bgp_process_as4_attrs(ea_list **attrs, struct linpool *pool)
   eattr *a4 = bgp_find_attr(*attrs, BA_AS4_AGGREGATOR);
 
   /* First, unset AS4_* attributes */
-  if (p4) bgp_unset_attr(attrs, pool, BA_AS4_PATH);
-  if (a4) bgp_unset_attr(attrs, pool, BA_AS4_AGGREGATOR);
+  if (p4) bgp_unset_attr(attrs, BA_AS4_PATH);
+  if (a4) bgp_unset_attr(attrs, BA_AS4_AGGREGATOR);
 
   /* Handle AGGREGATOR attribute */
   if (a2 && a4)
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index d09a5c8f..de5bd836 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -544,32 +544,11 @@ bgp_find_attr(ea_list *attrs, uint code)
   return ea_find(attrs, EA_CODE(PROTOCOL_BGP, code));
 }
 
-eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val);
+void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val);
+void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad);
+void bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len);
 
-static inline void
-bgp_set_attr_u32(ea_list **to, struct linpool *pool, uint code, uint flags, u32 val)
-{
-  union bval bv = { .data = val };
-  bgp_set_attr(to, pool, code, flags, bv);
-}
-
-static inline void
-bgp_set_attr_ptr(ea_list **to, struct linpool *pool, uint code, uint flags, const struct adata *ad)
-{
-  union bval bv = { .ptr = ad };
-  bgp_set_attr(to, pool, code, flags, bv);
-}
-
-static inline void
-bgp_set_attr_data(ea_list **to, struct linpool *pool, uint code, uint flags, void *data, uint len)
-{
-  struct adata *a = lp_alloc_adata(pool, len);
-  bmemcpy(a->data, data, len);
-  bgp_set_attr_ptr(to, pool, code, flags, a);
-}
-
-#define bgp_unset_attr(to, pool, code) ea_unset_attr(to, pool, 0, code)
+#define bgp_unset_attr(to, code) ea_unset_attr(to, 0, code)
 
 int bgp_encode_mp_reach_mrt(struct bgp_write_state *s, eattr *a, byte *buf, uint size);
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 8eeae490..a18ff373 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1115,27 +1115,27 @@ bgp_update_next_hop_ip(struct bgp_export_state *s, eattr *a, ea_list **to)
     {
       rta *ra = s->route->attrs;
       ip_addr nh[1] = { ra->nh.gw };
-      bgp_set_attr_data(to, s->pool, BA_NEXT_HOP, 0, nh, 16);
+      bgp_set_attr_data(to, BA_NEXT_HOP, 0, nh, 16);
 
       if (s->mpls)
       {
 	u32 implicit_null = BGP_MPLS_NULL;
 	u32 *labels = ra->nh.labels ? ra->nh.label : &implicit_null;
 	uint lnum = ra->nh.labels ? ra->nh.labels : 1;
-	bgp_set_attr_data(to, s->pool, BA_MPLS_LABEL_STACK, 0, labels, lnum * 4);
+	bgp_set_attr_data(to, BA_MPLS_LABEL_STACK, 0, labels, lnum * 4);
       }
     }
     else
     {
       ip_addr nh[2] = { s->channel->next_hop_addr, s->channel->link_addr };
-      bgp_set_attr_data(to, s->pool, BA_NEXT_HOP, 0, nh, ipa_nonzero(nh[1]) ? 32 : 16);
+      bgp_set_attr_data(to, BA_NEXT_HOP, 0, nh, ipa_nonzero(nh[1]) ? 32 : 16);
       s->local_next_hop = 1;
 
       /* TODO: Use local MPLS assigned label */
       if (s->mpls)
       {
 	u32 implicit_null = BGP_MPLS_NULL;
-	bgp_set_attr_data(to, s->pool, BA_MPLS_LABEL_STACK, 0, &implicit_null, 4);
+	bgp_set_attr_data(to, BA_MPLS_LABEL_STACK, 0, &implicit_null, 4);
       }
     }
   }
@@ -1239,7 +1239,7 @@ bgp_decode_next_hop_ip(struct bgp_parse_state *s, byte *data, uint len, rta *a)
 
   // XXXX validate next hop
 
-  bgp_set_attr_ptr(&(a->eattrs), s->pool, BA_NEXT_HOP, 0, ad);
+  bgp_set_attr_ptr(&(a->eattrs), BA_NEXT_HOP, 0, ad);
   bgp_apply_next_hop(s, a, nh[0], nh[1]);
 }
 
@@ -1320,7 +1320,7 @@ bgp_decode_next_hop_vpn(struct bgp_parse_state *s, byte *data, uint len, rta *a)
 
   // XXXX validate next hop
 
-  bgp_set_attr_ptr(&(a->eattrs), s->pool, BA_NEXT_HOP, 0, ad);
+  bgp_set_attr_ptr(&(a->eattrs), BA_NEXT_HOP, 0, ad);
   bgp_apply_next_hop(s, a, nh[0], nh[1]);
 }
 
@@ -1345,11 +1345,11 @@ bgp_decode_next_hop_none(struct bgp_parse_state *s UNUSED, byte *data UNUSED, ui
 }
 
 static void
-bgp_update_next_hop_none(struct bgp_export_state *s, eattr *a, ea_list **to)
+bgp_update_next_hop_none(struct bgp_export_state *s UNUSED, eattr *a, ea_list **to)
 {
   /* NEXT_HOP shall not pass */
   if (a)
-    bgp_unset_attr(to, s->pool, BA_NEXT_HOP);
+    bgp_unset_attr(to, BA_NEXT_HOP);
 }
 
 
@@ -1444,7 +1444,7 @@ bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *p
   if (!s->mpls_labels)
   {
     s->mpls_labels = lp_alloc_adata(s->pool, 4*BGP_MPLS_MAX);
-    bgp_set_attr_ptr(&(a->eattrs), s->pool, BA_MPLS_LABEL_STACK, 0, s->mpls_labels);
+    bgp_set_attr_ptr(&(a->eattrs), BA_MPLS_LABEL_STACK, 0, s->mpls_labels);
   }
 
   /* Overwrite data in the attribute */

From 1d309c4ce6e95b68c64a8f007f6dd2f1830a5707 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Apr 2022 16:51:18 +0200
Subject: [PATCH 123/431] Enforcing certain data structure explicit paddings.

Implicit paddings have undefined values in C. We want the eattr blocks
to be comparable by memcmp and eattrs settable directly by structrure
literals. This check ensures that all paddings in eattr and bval are
explicit and therefore zeroed in all literals.
---
 aclocal.m4      | 26 +++++++++++++++++
 configure.ac    |  7 +++++
 lib/Makefile    |  2 +-
 lib/birdlib.h   | 18 ++++++++++--
 lib/route.h     |  2 ++
 lib/type.h      | 12 ++++++--
 lib/type_test.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 nest/Makefile   |  2 +-
 nest/bird.h     |  1 -
 9 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 lib/type_test.c

diff --git a/aclocal.m4 b/aclocal.m4
index 1613d680..58c48791 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,32 @@
 dnl ** Additional Autoconf tests for BIRD configure script
 dnl ** (c) 1999 Martin Mares <mj@ucw.cz>
 
+AC_DEFUN([BIRD_CHECK_POINTER_ALIGNMENT],
+[
+  AC_CACHE_CHECK(
+    [how pointers are aligned],
+    [bird_cv_pointer_alignment],
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+	[
+	  _Static_assert(_Alignof(void *) == 8, "bad");
+	], []
+      )
+    ],
+    [bird_cv_pointer_alignment=8],
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+	[
+	  _Static_assert(_Alignof(void *) == 4, "bad");
+	], []
+      )
+    ],
+    [bird_cv_pointer_alignment=4],
+    [bird_cv_pointer_alignment=unknown]
+    ))
+  )
+])
+
 AC_DEFUN([BIRD_CHECK_THREAD_LOCAL],
 [
   AC_CACHE_CHECK(
diff --git a/configure.ac b/configure.ac
index 64181d29..321bed95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,13 @@ AC_C_BIGENDIAN(
   [AC_MSG_ERROR([Cannot determine CPU endianity.])]
 )
 
+BIRD_CHECK_POINTER_ALIGNMENT
+if test "$bird_cv_pointer_alignment" = "unknown" ; then
+  AC_MSG_ERROR([Couldn't determine pointer alignment])
+else
+  AC_DEFINE_UNQUOTED([CPU_POINTER_ALIGNMENT], [$bird_cv_pointer_alignment], [Pointer alignment for macro usage])
+fi
+
 BIRD_CHECK_ANDROID_GLOB
 if test "$bird_cv_lib_glob" = no ; then
   AC_MSG_ERROR([glob.h not found.])
diff --git a/lib/Makefile b/lib/Makefile
index 853e0a22..15f757d9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,6 @@ src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
+tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c type_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 6f0bab96..9b6e4a16 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -9,18 +9,30 @@
 #ifndef _BIRD_BIRDLIB_H_
 #define _BIRD_BIRDLIB_H_
 
+#include "sysdep/config.h"
 #include "lib/alloca.h"
 
 /* Ugly structure offset handling macros */
 
-struct align_probe { char x; long int y; };
-
 #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
-#define CPU_STRUCT_ALIGN (sizeof(struct align_probe))
+#define CPU_STRUCT_ALIGN  (MAX_(_Alignof(void*), _Alignof(u64)))
 #define BIRD_CPU_ALIGN(s) BIRD_ALIGN((s), CPU_STRUCT_ALIGN)
 
+/* Structure item alignment macros */
+
+#define PADDING_NAME(id)	_padding_##id
+#define PADDING_(id, sz)	u8 PADDING_NAME(id)[sz]
+
+#if CPU_POINTER_ALIGNMENT == 4
+#define PADDING(id, n32, n64)	PADDING_(id, n32)
+#elif CPU_POINTER_ALIGNMENT == 8
+#define PADDING(id, n32, n64)	PADDING_(id, n64)
+#else
+#error "Strange CPU pointer alignment: " CPU_POINTER_ALIGNMENT
+#endif
+
 /* Utility macros */
 
 #define MIN_(a,b) (((a)<(b))?(a):(b))
diff --git a/lib/route.h b/lib/route.h
index 431da4d8..ba7bab61 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -144,6 +144,8 @@ typedef struct eattr {
   byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
   byte undef:1;				/* Explicitly undefined */
 
+  PADDING(unused, 0, 4);
+
   union bval u;
 } eattr;
 
diff --git a/lib/type.h b/lib/type.h
index 6d19a250..e43389f3 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -13,9 +13,15 @@
 #include "lib/attrs.h"
 
 union bval {
-#define BVAL_ITEMS	\
-  u32 data;			/* Integer type inherited from eattrs */		\
-  u32 i;			/* Integer type inherited from filters */		\
+#define BVAL_ITEMS									\
+  struct {										\
+    u32 data;			/* Integer type inherited from eattrs */		\
+    PADDING(data, 0, 4);	/* Must be padded on 64-bits */				\
+  };											\
+  struct {										\
+    u32 i;			/* Integer type inherited from filters */		\
+    PADDING(i, 0, 4);		/* Must be padded on 64-bits */				\
+  };											\
   const struct adata *ptr;	/* Generic attribute data inherited from eattrs */	\
   const struct adata *ad;     	/* Generic attribute data inherited from filters */	\
 
diff --git a/lib/type_test.c b/lib/type_test.c
new file mode 100644
index 00000000..20e7630b
--- /dev/null
+++ b/lib/type_test.c
@@ -0,0 +1,78 @@
+/*
+ *	BIRD Library -- Data Type Alignment Tests
+ *
+ *	(c) 2022 Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "test/birdtest.h"
+#include "lib/type.h"
+#include "lib/route.h"
+
+#define CHECK_ONE(val)	\
+  for (uint i=0; i<sizeof(val); i++) \
+    bt_assert(((const u8 *) &val)[i] == (u8) ~0);
+
+#define SET_PADDING(val, name)	\
+  for (uint i=0; i<sizeof(val.PADDING_NAME(name)); i++) \
+    val.PADDING_NAME(name)[i] = ~0;
+
+
+static int
+t_bval(void)
+{
+  union bval v;
+
+  memset(&v, 0, sizeof(v));
+  v.data = ~0;
+  SET_PADDING(v, data);
+  CHECK_ONE(v);
+
+  memset(&v, 0, sizeof(v));
+  v.i = ~0;
+  SET_PADDING(v, i);
+  CHECK_ONE(v);
+
+  memset(&v, 0, sizeof(v));
+  v.ptr = (void *) ~0;
+  CHECK_ONE(v);
+
+  memset(&v, 0, sizeof(v));
+  v.ad = (void *) ~0;
+  CHECK_ONE(v);
+
+  return 1;
+}
+
+static int
+t_eattr(void)
+{
+  struct eattr e;
+  memset(&e, 0, sizeof(e));
+
+  e.id = ~0;
+  e.flags = ~0;
+  e.type = ~0;
+  e.originated = ~0;
+  e.fresh = ~0;
+  e.undef = ~0;
+  memset(&e.u, ~0, sizeof(e.u));  /* Assumes t_bval passed */
+
+  SET_PADDING(e, unused);
+
+  CHECK_ONE(e);
+
+  return 1;
+}
+
+
+int main(int argc, char *argv[])
+{
+  bt_init(argc, argv);
+
+  bt_test_suite(t_bval,	  "Structure alignment test: bval");
+  bt_test_suite(t_eattr,  "Structure alignment test: eattr");
+
+  return bt_exit_value();
+}
diff --git a/nest/Makefile b/nest/Makefile
index c0765530..0350c3b6 100644
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -6,7 +6,7 @@ $(call proto-build,dev_build)
 
 $(proto-build-c): $(lastword $(MAKEFILE_LIST))
 	$(E)echo GEN $@
-	$(Q)echo "$(patsubst %,void %(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %(); ,$(PROTO_BUILD))}" > $@
+	$(Q)echo "#include \"lib/birdlib.h\"\n$(patsubst %,void %(void);\n,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %();\n,$(PROTO_BUILD))}" > $@
 
 tests_src :=
 tests_targets := $(tests_targets) $(tests-target-files)
diff --git a/nest/bird.h b/nest/bird.h
index 55712abe..931974a0 100644
--- a/nest/bird.h
+++ b/nest/bird.h
@@ -9,7 +9,6 @@
 #ifndef _BIRD_BIRD_H_
 #define _BIRD_BIRD_H_
 
-#include "sysdep/config.h"
 #include "lib/birdlib.h"
 #include "lib/ip.h"
 #include "lib/net.h"

From cf07d8ad79273a3bbf0617c17e438602e4b64ece Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Apr 2022 18:32:19 +0200
Subject: [PATCH 124/431] Replaced boilerplate eattr allocation by
 ea_set_attr()

---
 filter/f-inst.c        | 26 +++++-------
 lib/route.h            | 13 +++---
 sysdep/bsd/krt-sock.c  | 11 +----
 sysdep/linux/netlink.c | 92 +++++++++++-------------------------------
 4 files changed, 40 insertions(+), 102 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 0d042e37..7b34ef91 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -696,21 +696,13 @@
     DYNAMIC_ATTR;
     ARG_TYPE(1, da.type);
     {
-      struct ea_list *l = tmp_alloc(sizeof(struct ea_list) + sizeof(eattr));
-
-      l->next = NULL;
-      l->flags = EALF_SORTED;
-      l->count = 1;
-      l->attrs[0].id = da.ea_code;
-      l->attrs[0].flags = 0;
-      l->attrs[0].type = da.type;
-      l->attrs[0].originated = 1;
-      l->attrs[0].fresh = 1;
-      l->attrs[0].undef = 0;
+      struct eattr *a;
 
       if (da.type >= EAF_TYPE__MAX)
 	bug("Unsupported attribute type");
 
+      f_rta_cow(fs);
+
       switch (da.type) {
       case T_OPAQUE:
       case T_IFACE:
@@ -718,18 +710,18 @@
 	break;
 
       case T_IP:
-	l->attrs[0].u.ptr = tmp_store_adata(&v1.val.ip, sizeof(ip_addr));
+	a = ea_set_attr(fs->eattrs,
+	    EA_LITERAL_STORE_ADATA(da.ea_code, da.type, 0, &v1.val.ip, sizeof(ip_addr)));
 	break;
 
       default:
-	l->attrs[0].u = v1.val.bval;
+	a = ea_set_attr(fs->eattrs,
+	    EA_LITERAL_GENERIC(da.ea_code, da.type, 0, .u = v1.val.bval));
 	break;
-
       }
 
-      f_rta_cow(fs);
-      l->next = *fs->eattrs;
-      *fs->eattrs = l;
+      a->originated = 1;
+      a->fresh = 1;
     }
   }
 
diff --git a/lib/route.h b/lib/route.h
index ba7bab61..ad3f3fb7 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -217,10 +217,7 @@ ea_list *ea_normalize(const ea_list *e);
 uint ea_list_size(ea_list *);
 void ea_list_copy(ea_list *dest, ea_list *src, uint size);
 
-struct ea_one_attr_list {
-  ea_list l;
-  eattr a;
-};
+#define EA_LOCAL_LIST(N)  struct { ea_list l; eattr a[N]; }
 
 #define EA_LITERAL_EMBEDDED(_id, _type, _flags, _val) ({ \
     ASSERT_DIE(_type & EAF_EMBEDDED); \
@@ -243,16 +240,16 @@ struct ea_one_attr_list {
 static inline eattr *
 ea_set_attr(ea_list **to, eattr a)
 {
-  struct ea_one_attr_list *ea = tmp_alloc(sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
+  EA_LOCAL_LIST(1) *ea = tmp_alloc(sizeof(*ea));
+  *ea = (typeof(*ea)) {
     .l.flags = EALF_SORTED,
     .l.count = 1,
     .l.next = *to,
-    .a = a,
+    .a[0] = a,
   };
 
   *to = &ea->l;
-  return &ea->a;
+  return &ea->a[0];
 }
 
 static inline void
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index cd449d11..844b9f83 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -583,15 +583,8 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   e = rte_get_temp(&a);
   e->net = net;
 
-  ea_list *ea = alloca(sizeof(ea_list) + 1 * sizeof(eattr));
-  *ea = (ea_list) { .count = 1, .next = e->attrs->eattrs };
-  e->attrs->eattrs = ea;
-
-  ea->attrs[0] = (eattr) {
-    .id = EA_KRT_SOURCE,
-    .type = T_INT,
-    .u.data = src2,
-  };
+  ea_set_attr(e->attrs->eattrs,
+      EA_LITERAL_EMBEDDED(EA_KRT_SOURCE, T_INT, 0, src2));
 
   if (scan)
     krt_got_route(p, e, src);
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index a37692d6..81e02b4c 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1581,20 +1581,21 @@ nl_announce_route(struct nl_parse_state *s)
   rte *e = rte_get_temp(s->attrs, s->proto->p.main_source);
   e->net = s->net;
 
-  ea_list *ea = alloca(sizeof(ea_list) + 2 * sizeof(eattr));
-  *ea = (ea_list) { .count = 2, .next = e->attrs->eattrs };
-  e->attrs->eattrs = ea;
+  EA_LOCAL_LIST(2) ea0 = {
+    .l = { .count = 2, .next = e->attrs->eattrs },
+    .a[0] = (eattr) {
+      .id = EA_KRT_SOURCE,
+      .type = T_INT,
+      .u.data = s->krt_proto,
+    },
+    .a[1] = (eattr) {
+      .id = EA_KRT_METRIC,
+      .type = T_INT,
+      .u.data = s->krt_metric,
+    },
+  };
 
-  ea->attrs[0] = (eattr) {
-    .id = EA_KRT_SOURCE,
-    .type = T_INT,
-    .u.data = s->krt_proto,
-  };
-  ea->attrs[1] = (eattr) {
-    .id = EA_KRT_METRIC,
-    .type = T_INT,
-    .u.data = s->krt_metric,
-  };
+  e->attrs->eattrs = &ea0.l;
 
   if (s->scan)
     krt_got_route(s->proto, e, s->krt_src);
@@ -1865,81 +1866,36 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 #endif
 
   if (i->rtm_scope != def_scope)
-    {
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_SCOPE;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = T_INT;
-      ea->attrs[0].u.data = i->rtm_scope;
-    }
+    ea_set_attr(&ra->eattrs,
+	EA_LITERAL_EMBEDDED(EA_KRT_SCOPE, T_INT, 0, i->rtm_scope));
 
   if (a[RTA_PREFSRC])
     {
       ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
 
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_PREFSRC;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = T_IP;
-
-      struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
-      ad->length = sizeof(ps);
-      memcpy(ad->data, &ps, sizeof(ps));
-
-      ea->attrs[0].u.ptr = ad;
+      ea_set_attr(&ra->eattrs,
+	  EA_LITERAL_STORE_ADATA(EA_KRT_PREFSRC, T_IP, 0, &ps, sizeof(ps)));
     }
 
   /* Can be set per-route or per-nexthop */
   if (s->rta_flow)
-    {
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-      ea->next = ra->eattrs;
-      ra->eattrs = ea;
-      ea->flags = EALF_SORTED;
-      ea->count = 1;
-      ea->attrs[0].id = EA_KRT_REALM;
-      ea->attrs[0].flags = 0;
-      ea->attrs[0].type = T_INT;
-      ea->attrs[0].u.data = s->rta_flow;
-    }
+    ea_set_attr(&ra->eattrs,
+	EA_LITERAL_EMBEDDED(EA_KRT_REALM, T_INT, 0, s->rta_flow));
 
   if (a[RTA_METRICS])
     {
       u32 metrics[KRT_METRICS_MAX];
-      ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + KRT_METRICS_MAX * sizeof(eattr));
-      int t, n = 0;
-
       if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0)
         {
 	  log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net->n.addr);
 	  return;
 	}
 
-      for (t = 1; t < KRT_METRICS_MAX; t++)
+      for (int t = 1; t < KRT_METRICS_MAX; t++)
 	if (metrics[0] & (1 << t))
-	  {
-	    ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
-	    ea->attrs[n].flags = 0;
-	    ea->attrs[n].type = T_INT;
-	    ea->attrs[n].u.data = metrics[t];
-	    n++;
-	  }
-
-      if (n > 0)
-        {
-	  ea->next = ra->eattrs;
-	  ea->flags = EALF_SORTED;
-	  ea->count = n;
-	  ra->eattrs = ea;
-	}
+	  ea_set_attr(&ra->eattrs,
+	      EA_LITERAL_EMBEDDED(EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t),
+		T_INT, 0, metrics[t]));
     }
 
   /*

From 165156beeb2926472bbceca3c103aacc3f81a8cc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 2 May 2022 20:29:03 +0200
Subject: [PATCH 125/431] Conf: Symbols are properly scoped

Now there is a persistent root symbol scope and all scopes have their
symbol hashes to store local symbols and not leak any symbol out.
---
 conf/cf-lex.l | 49 +++++++++++++++++++++++++++----------------------
 conf/conf.c   |  3 ---
 conf/conf.h   | 18 ++++++++++++++----
 nest/cmds.c   | 19 ++++++++++---------
 nest/config.Y |  2 +-
 5 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 75e1ceeb..bd424c69 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -77,18 +77,18 @@ static uint cf_hash(const byte *c);
 #define SYM_NEXT(n)		n->next
 #define SYM_EQ(a,s1,b,s2)	!strcmp(a,b) && s1 == s2
 #define SYM_FN(k,s)		cf_hash(k)
-#define SYM_ORDER		6 /* Initial */
+#define SYM_ORDER		4 /* Initial */
 
 #define SYM_REHASH		sym_rehash
-#define SYM_PARAMS		/8, *1, 2, 2, 6, 20
+#define SYM_PARAMS		/8, *1, 2, 2, 4, 20
 
 
 HASH_DEFINE_REHASH_FN(SYM, struct symbol)
 
 HASH(struct keyword) kw_hash;
 
-
 struct sym_scope *conf_this_scope;
+struct sym_scope *global_root_scope;
 
 linpool *cfg_mem;
 
@@ -587,41 +587,39 @@ cf_new_symbol(const byte *c)
   *s = (struct symbol) { .scope = conf_this_scope, .class = SYM_VOID, };
   strcpy(s->name, c);
 
-  if (!new_config->sym_hash.data)
-    HASH_INIT(new_config->sym_hash, new_config->pool, SYM_ORDER);
+  if (!conf_this_scope->hash.data)
+    HASH_INIT(conf_this_scope->hash, new_config->pool, SYM_ORDER);
 
-  HASH_INSERT2(new_config->sym_hash, SYM, new_config->pool, s);
+  HASH_INSERT2(conf_this_scope->hash, SYM, new_config->pool, s);
 
-  add_tail(&(new_config->symbols), &(s->n));
+  if (conf_this_scope == new_config->root_scope)
+    add_tail(&(new_config->symbols), &(s->n));
 
   return s;
 }
 
 /**
- * cf_find_symbol - find a symbol by name
- * @cfg: specificed config
+ * cf_find_symbol_scope - find a symbol by name
+ * @scope: config scope
  * @c: symbol name
  *
- * This functions searches the symbol table in the config @cfg for a symbol of
- * given name. First it examines the current scope, then the second recent one
+ * This functions searches the symbol table in the scope @scope for a symbol of
+ * given name. First it examines the current scope, then the underlying one
  * and so on until it either finds the symbol and returns a pointer to its
  * &symbol structure or reaches the end of the scope chain and returns %NULL to
  * signify no match.
  */
 struct symbol *
-cf_find_symbol(const struct config *cfg, const byte *c)
+cf_find_symbol_scope(const struct sym_scope *scope, const byte *c)
 {
   struct symbol *s;
 
-  if (cfg->sym_hash.data &&
-      (s = HASH_FIND(cfg->sym_hash, SYM, c, 1)))
-    return s;
-
-  /* In CLI command parsing, fallback points to the current config, otherwise it is NULL. */
-  if (cfg->fallback &&
-      cfg->fallback->sym_hash.data &&
-      (s = HASH_FIND(cfg->fallback->sym_hash, SYM, c, 1)))
-    return s;
+  /* Find the symbol here or anywhere below */
+  while (scope)
+    if (scope->hash.data && (s = HASH_FIND(scope->hash, SYM, c, 1)))
+      return s;
+    else
+      scope = scope->next;
 
   return NULL;
 }
@@ -638,7 +636,7 @@ cf_find_symbol(const struct config *cfg, const byte *c)
 struct symbol *
 cf_get_symbol(const byte *c)
 {
-  return cf_find_symbol(new_config, c) ?: cf_new_symbol(c);
+  return cf_find_symbol_scope(conf_this_scope, c) ?: cf_new_symbol(c);
 }
 
 /**
@@ -718,6 +716,8 @@ cf_lex_init_kh(void)
   struct keyword *k;
   for (k=keyword_list; k->name; k++)
     HASH_INSERT(kw_hash, KW, k);
+
+  global_root_scope = mb_allocz(&root_pool, sizeof(*global_root_scope));
 }
 
 /**
@@ -753,6 +753,11 @@ cf_lex_init(int is_cli, struct config *c)
   c->root_scope = cfg_allocz(sizeof(struct sym_scope));
   conf_this_scope = c->root_scope;
   conf_this_scope->active = 1;
+
+  if (is_cli)
+    conf_this_scope->next = config->root_scope;
+  else
+    conf_this_scope->next = global_root_scope;
 }
 
 /**
diff --git a/conf/conf.c b/conf/conf.c
index 0230053b..580a6472 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -168,7 +168,6 @@ int
 cli_parse(struct config *c)
 {
   int done = 0;
-  c->fallback = config;
   new_config = c;
   cfg_mem = c->mem;
   if (setjmp(conf_jmpbuf))
@@ -179,7 +178,6 @@ cli_parse(struct config *c)
   done = 1;
 
 cleanup:
-  c->fallback = NULL;
   new_config = NULL;
   cfg_mem = NULL;
   return done;
@@ -522,7 +520,6 @@ order_shutdown(int gr)
   init_list(&c->tables);
   init_list(&c->symbols);
   memset(c->def_tables, 0, sizeof(c->def_tables));
-  HASH_INIT(c->sym_hash, c->pool, 4);
   c->shutdown = 1;
   c->gr_down = gr;
 
diff --git a/conf/conf.h b/conf/conf.h
index 55cb9c58..2700295b 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -16,7 +16,6 @@
 #include "lib/timer.h"
 
 /* Configuration structure */
-
 struct config {
   pool *pool;				/* Pool the configuration is stored in */
   linpool *mem;				/* Linear pool containing configuration data */
@@ -54,8 +53,7 @@ struct config {
   char *err_file_name;			/* File name containing error */
   char *file_name;			/* Name of main configuration file */
   int file_fd;				/* File descriptor of main configuration file */
-  HASH(struct symbol) sym_hash;		/* Lexer: symbol hash table */
-  struct config *fallback;		/* Link to regular config for CLI parsing */
+
   struct sym_scope *root_scope;		/* Scope for root symbols */
   int obstacle_count;			/* Number of items blocking freeing of this config */
   int shutdown;				/* This is a pseudo-config for daemon shutdown */
@@ -133,10 +131,15 @@ struct symbol {
 struct sym_scope {
   struct sym_scope *next;		/* Next on scope stack */
   struct symbol *name;			/* Name of this scope */
+
+  HASH(struct symbol) hash;		/* Local symbol hash */
+
   uint slots;				/* Variable slots */
   int active;				/* Currently entered */
 };
 
+extern struct sym_scope *global_root_scope;
+
 struct bytestring {
   size_t length;
   byte data[];
@@ -185,7 +188,14 @@ int cf_lex(void);
 void cf_lex_init(int is_cli, struct config *c);
 void cf_lex_unwind(void);
 
-struct symbol *cf_find_symbol(const struct config *cfg, const byte *c);
+struct symbol *cf_find_symbol_scope(const struct sym_scope *scope, const byte *c);
+static inline struct symbol *cf_find_symbol_cfg(const struct config *cfg, const byte *c)
+{ return cf_find_symbol_scope(cfg->root_scope, c); }
+
+#define cf_find_symbol(where, what) _Generic(*(where), \
+    struct config: cf_find_symbol_cfg, \
+    struct sym_scope: cf_find_symbol_scope \
+    )((where), (what))
 
 struct symbol *cf_get_symbol(const byte *c);
 struct symbol *cf_default_name(char *template, int *counter);
diff --git a/nest/cmds.c b/nest/cmds.c
index 99a7bbfe..092be48a 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -51,17 +51,18 @@ cmd_show_symbols(struct sym_show_data *sd)
     cli_msg(1010, "%-8s\t%s", sd->sym->name, cf_symbol_class_name(sd->sym));
   else
   {
-    HASH_WALK(config->sym_hash, next, sym)
-    {
-      if (!sym->scope->active)
-	continue;
+    for (const struct sym_scope *scope = config->root_scope; scope; scope = scope->next)
+      HASH_WALK(scope->hash, next, sym)
+      {
+	if (!sym->scope->active)
+	  continue;
 
-      if (sd->type && (sym->class != sd->type))
-	continue;
+	if (sd->type && (sym->class != sd->type))
+	  continue;
 
-      cli_msg(-1010, "%-8s\t%s", sym->name, cf_symbol_class_name(sym));
-    }
-    HASH_WALK_END;
+	cli_msg(-1010, "%-8s\t%s", sym->name, cf_symbol_class_name(sym));
+      }
+      HASH_WALK_END;
 
     cli_msg(0, "");
   }
diff --git a/nest/config.Y b/nest/config.Y
index b597b332..12fd01a2 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -638,7 +638,7 @@ r_args:
      $$ = cfg_allocz(sizeof(struct rt_show_data));
      init_list(&($$->tables));
      $$->filter = FILTER_ACCEPT;
-     $$->running_on_config = new_config->fallback;
+     $$->running_on_config = config;
    }
  | r_args net_any {
      $$ = $1;

From 17f91f9e6e70f7e3f29502e854823c0d48571eaa Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 19 Mar 2022 16:23:42 +0100
Subject: [PATCH 126/431] Explicit definition structures of route attributes

Changes in internal API:

* Every route attribute must be defined as struct ea_class somewhere.
* Registration of route attributes known at startup must be done by
  ea_register_init() from protocol build functions.
* Every attribute has now its symbol registered in a global symbol table
  defined as SYM_ATTRIBUTE
* All attribute ID's are dynamically allocated.
* Attribute value custom formatting hook is defined in the ea_class.
* Attribute names are the same for display and filters, always prefixed
  by protocol name.

Also added some unit testing code for filters with route attributes.
---
 conf/cf-lex.l          |  54 ++++++-
 conf/conf.h            |   2 +-
 conf/confbase.Y        |   3 +-
 filter/config.Y        |  88 +++++++-----
 filter/data.h          |  10 +-
 filter/decl.m4         |   4 +-
 filter/f-inst.c        |  20 +--
 filter/f-inst.h        |  12 +-
 filter/f-util.c        | 128 +----------------
 filter/filter.h        |   9 --
 filter/test.conf       | 149 ++++++++++++++++++++
 lib/event_test.c       |   2 +-
 lib/mempool.c          |   2 -
 lib/resource.c         |  19 +++
 lib/resource.h         |  13 +-
 lib/route.h            | 108 ++++++++------
 nest/config.Y          |   5 +-
 nest/proto.c           |   4 -
 nest/protocol.h        |  26 +---
 nest/rt-attr.c         | 225 ++++++++++++++++++++++--------
 nest/rt-dev.c          |   1 -
 nest/rt-table.c        |  10 +-
 proto/babel/babel.c    |  80 ++++++-----
 proto/babel/babel.h    |   4 -
 proto/babel/config.Y   |   2 -
 proto/bfd/bfd.c        |   1 -
 proto/bgp/attrs.c      | 310 +++++++++++++++++++++--------------------
 proto/bgp/bgp.c        |   3 +-
 proto/bgp/bgp.h        |  54 +++----
 proto/bgp/config.Y     |  30 ----
 proto/mrt/mrt.c        |   1 -
 proto/ospf/config.Y    |   5 -
 proto/ospf/ospf.c      |  71 ++++++----
 proto/ospf/ospf.h      |   7 +-
 proto/ospf/rt.c        |   8 +-
 proto/ospf/topology.c  |   6 +-
 proto/perf/perf.c      |   1 -
 proto/pipe/pipe.c      |   1 -
 proto/radv/config.Y    |   3 -
 proto/radv/radv.c      |  42 +++---
 proto/radv/radv.h      |   4 -
 proto/rip/config.Y     |   3 -
 proto/rip/rip.c        |  67 +++++----
 proto/rip/rip.h        |   4 -
 proto/rpki/rpki.c      |   1 -
 proto/static/static.c  |  11 +-
 sysdep/linux/krt-sys.h |  32 -----
 sysdep/linux/netlink.Y |  43 ++----
 sysdep/linux/netlink.c | 197 +++++++++++++++-----------
 sysdep/unix/krt.Y      |   3 -
 sysdep/unix/krt.c      |  35 ++---
 sysdep/unix/krt.h      |   4 +
 sysdep/unix/main.c     |   2 +-
 test/bt-utils.c        |   5 +-
 54 files changed, 1056 insertions(+), 878 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index bd424c69..e84e1d9d 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -86,9 +86,12 @@ static uint cf_hash(const byte *c);
 HASH_DEFINE_REHASH_FN(SYM, struct symbol)
 
 HASH(struct keyword) kw_hash;
+HASH(struct ea_class) ea_name_hash;
 
 struct sym_scope *conf_this_scope;
-struct sym_scope *global_root_scope;
+
+static struct sym_scope global_root_scope__init = { .active = 1, };
+struct sym_scope *global_root_scope = &global_root_scope__init;
 
 linpool *cfg_mem;
 
@@ -598,6 +601,25 @@ cf_new_symbol(const byte *c)
   return s;
 }
 
+static struct symbol *
+cf_root_symbol(const byte *c)
+{
+  uint l = strlen(c);
+  if (l > SYM_MAX_LEN)
+    bug("Root symbol %s too long", c);
+
+  struct symbol *s = mb_alloc(&root_pool, sizeof(struct symbol) + l + 1);
+  *s = (struct symbol) { .scope = global_root_scope, .class = SYM_VOID, };
+  memcpy(s->name, c, l+1);
+
+  if (!global_root_scope->hash.data)
+    HASH_INIT(global_root_scope->hash, &root_pool, SYM_ORDER);
+
+  HASH_INSERT2(global_root_scope->hash, SYM, &root_pool, s);
+  return s;
+}
+
+
 /**
  * cf_find_symbol_scope - find a symbol by name
  * @scope: config scope
@@ -652,7 +674,7 @@ cf_localize_symbol(struct symbol *sym)
   /* If the symbol type is void, it has been recently allocated just in this scope. */
   if (!sym->class)
     return sym;
-  
+
   /* If the scope is the current, it is already defined in this scope. */
   if (sym->scope == conf_this_scope)
     cf_error("Symbol already defined");
@@ -716,8 +738,34 @@ cf_lex_init_kh(void)
   struct keyword *k;
   for (k=keyword_list; k->name; k++)
     HASH_INSERT(kw_hash, KW, k);
+}
 
-  global_root_scope = mb_allocz(&root_pool, sizeof(*global_root_scope));
+void
+ea_lex_register(struct ea_class *def)
+{
+  struct symbol *sym = cf_root_symbol(def->name);
+  sym->class = SYM_ATTRIBUTE;
+  sym->attribute = def;
+  def->sym = sym;
+}
+
+void
+ea_lex_unregister(struct ea_class *def)
+{
+  struct symbol *sym = def->sym;
+  HASH_REMOVE2(global_root_scope->hash, SYM, &root_pool, sym);
+  mb_free(sym);
+  def->sym = NULL;
+}
+
+struct ea_class *
+ea_class_find_by_name(const char *name)
+{
+  struct symbol *sym = cf_find_symbol(global_root_scope, name);
+  if (!sym || (sym->class != SYM_ATTRIBUTE))
+    return NULL;
+  else
+    return sym->attribute;
 }
 
 /**
diff --git a/conf/conf.h b/conf/conf.h
index 2700295b..18de8def 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -120,7 +120,7 @@ struct symbol {
     const struct f_line *function;	/* For SYM_FUNCTION */
     const struct filter *filter;	/* For SYM_FILTER */
     struct rtable_config *table;	/* For SYM_TABLE */
-    struct f_dynamic_attr *attribute;	/* For SYM_ATTRIBUTE */
+    struct ea_class *attribute;		/* For SYM_ATTRIBUTE */
     struct f_val *val;			/* For SYM_CONSTANT */
     uint offset;			/* For SYM_VARIABLE */
   };
diff --git a/conf/confbase.Y b/conf/confbase.Y
index a81560dc..2286b257 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -71,8 +71,9 @@ CF_DECLS
   } xp;
   enum filter_return fret;
   enum ec_subtype ecs;
-  struct f_dynamic_attr fda;
+  struct ea_class *ea_class;
   struct f_static_attr fsa;
+  struct f_attr_bit fab;
   struct f_lval flv;
   struct f_line *fl;
   const struct filter *f;
diff --git a/filter/config.Y b/filter/config.Y
index 92656f7c..f21f1c8e 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -22,6 +22,13 @@ static inline u32 pair_b(u32 p) { return p & 0xFFFF; }
 #define f_generate_complex(fi_code, da, arg) \
   f_new_inst(FI_EA_SET, f_new_inst(fi_code, f_new_inst(FI_EA_GET, da), arg), da)
 
+#define f_generate_complex_sym(fi_code, sym, arg) ({ \
+  if (sym->class != SYM_ATTRIBUTE) \
+    cf_error("Can't empty %s: not an attribute", sym->name); \
+  f_generate_complex(fi_code, sym->attribute, arg); \
+})
+  
+
 /*
  * Sets and their items are during parsing handled as lists, linked
  * through left ptr. The first item in a list also contains a pointer
@@ -161,27 +168,31 @@ f_new_lc_item(u32 f1, u32 t1, u32 f2, u32 t2, u32 f3, u32 t3)
 }
 
 static inline struct f_inst *
-f_generate_empty(struct f_dynamic_attr dyn)
+f_generate_empty(const struct symbol *sym)
 {
-  const struct f_val *empty = f_get_empty(dyn.type);
+  if (sym->class != SYM_ATTRIBUTE)
+    cf_error("Can't empty %s: not an attribute", sym->name);
+
+  const struct ea_class *def = sym->attribute;
+  const struct f_val *empty = f_get_empty(def->type);
   if (!empty)
-    cf_error("Can't empty that attribute");
+    cf_error("Can't empty attribute %s", def->name);
 
-  return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, *empty), dyn);
+  return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, *empty), def);
 }
 
-#define BA_AS_PATH 0x02
-
 static inline struct f_inst *
 f_implicit_roa_check(struct rtable_config *tab)
 {
-  struct f_dynamic_attr fda = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+  const struct ea_class *def = ea_class_find("bgp_path");
+  if (!def)
+    cf_error("Fatal: Couldn't find BGP path attribute definition.");
 
   struct f_static_attr fsa = f_new_static_attr(T_NET, SA_NET, 1);
 
   return f_new_inst(FI_ROA_CHECK,
 	    f_new_inst(FI_RTA_GET, fsa),
-	    f_new_inst(FI_AS_PATH_LAST, f_new_inst(FI_EA_GET, fda)),
+	    f_new_inst(FI_AS_PATH_LAST, f_new_inst(FI_EA_GET, def)),
 	    tab);
 }
 
@@ -293,8 +304,8 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 
 %type <xp> cmds_int cmd_prep
 %type <x> term block cmd cmds constant constructor print_list var_list function_call symbol_value bgp_path_expr bgp_path bgp_path_tail
-%type <fda> dynamic_attr attr_bit
 %type <fsa> static_attr
+%type <fab> attr_bit
 %type <f> filter where_filter
 %type <fl> filter_body function_body
 %type <flv> lvalue
@@ -335,7 +346,14 @@ filter_eval:
 
 conf: custom_attr ;
 custom_attr: ATTRIBUTE type symbol ';' {
-  cf_define_symbol($3, SYM_ATTRIBUTE, attribute, ca_lookup(new_config->pool, $3->name, $2)->fda);
+  if (($3->class == SYM_ATTRIBUTE) && ($3->scope == new_config->root_scope))
+    cf_error("Duplicate attribute %s definition", $3->name);
+
+  cf_define_symbol($3, SYM_ATTRIBUTE, attribute,
+      ea_register_alloc(new_config->pool, (struct ea_class) {
+	.name = $3->name,
+	.type = $2,
+	})->class);
 };
 
 conf: bt_test_suite ;
@@ -736,7 +754,7 @@ symbol_value: CF_SYM_KNOWN
 	$$ = f_new_inst(FI_VAR_GET, $1);
 	break;
       case SYM_ATTRIBUTE:
-	$$ = f_new_inst(FI_EA_GET, *$1->attribute);
+	$$ = f_new_inst(FI_EA_GET, $1->attribute);
 	break;
       default:
 	cf_error("Can't get value of symbol %s", $1->name);
@@ -785,11 +803,9 @@ term:
  | constructor { $$ = $1; }
 
  | static_attr { $$ = f_new_inst(FI_RTA_GET, $1); }
-
- | dynamic_attr { $$ = f_new_inst(FI_EA_GET, $1); }
  | attr_bit {
     struct f_inst *c = f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)});
-    $$ = f_new_inst(FI_EQ, c, f_new_inst(FI_BITAND, f_new_inst(FI_EA_GET, $1), c));
+    $$ = f_new_inst(FI_EQ, c, f_new_inst(FI_BITAND, f_new_inst(FI_EA_GET, $1.class), c));
   }
 
  | term '.' IS_V4 { $$ = f_new_inst(FI_IS_V4, $1); }
@@ -833,8 +849,6 @@ term:
 
  | FORMAT '(' term ')' {  $$ = f_new_inst(FI_FORMAT, $3); }
 
-/* | term '.' LEN { $$->code = P('P','l'); } */
-
  | function_call
  ;
 
@@ -867,7 +881,9 @@ cmd:
 	 $$ = f_new_inst(FI_VAR_SET, $3, $1);
 	 break;
        case SYM_ATTRIBUTE:
-	 $$ = f_new_inst(FI_EA_SET, $3, *$1->attribute);
+	 if ($1->attribute->readonly)
+	   cf_error("Attribute %s is read-only", $1->attribute->name);
+	 $$ = f_new_inst(FI_EA_SET, $3, $1->attribute);
 	 break;
        default:
 	 cf_error("Can't assign to symbol %s", $1->name);
@@ -877,22 +893,23 @@ cmd:
      DBG( "Ook, we'll return the value\n" );
      $$ = f_new_inst(FI_RETURN, $2);
    }
- | dynamic_attr '=' term ';' {
-     $$ = f_new_inst(FI_EA_SET, $3, $1);
-   }
  | static_attr '=' term ';' {
      if ($1.readonly)
        cf_error( "This static attribute is read-only.");
      $$ = f_new_inst(FI_RTA_SET, $3, $1);
    }
- | UNSET '(' dynamic_attr ')' ';' {
-     $$ = f_new_inst(FI_EA_UNSET, $3);
+ | UNSET '(' CF_SYM_KNOWN ')' ';' {
+     if ($3->class != SYM_ATTRIBUTE)
+       cf_error("Can't unset %s", $3->name);
+     if ($3->attribute->readonly)
+       cf_error("Attribute %s is read-only", $3->attribute->name);
+     $$ = f_new_inst(FI_EA_UNSET, $3->attribute);
    }
  | attr_bit '=' term ';' {
      $$ = f_new_inst(FI_CONDITION, $3,
-	f_generate_complex(FI_BITOR, $1,
+	f_generate_complex(FI_BITOR, $1.class,
 	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)})),
-	f_generate_complex(FI_BITAND, $1,
+	f_generate_complex(FI_BITAND, $1.class,
 	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}))
      );
    }
@@ -919,11 +936,11 @@ cmd:
       $$ = f_new_inst(FI_SWITCH, $2, build_tree($4));
    }
 
- | dynamic_attr '.' EMPTY ';' { $$ = f_generate_empty($1); }
- | dynamic_attr '.' PREPEND '(' term ')' ';'   { $$ = f_generate_complex( FI_PATH_PREPEND, $1, $5 ); }
- | dynamic_attr '.' ADD '(' term ')' ';'       { $$ = f_generate_complex( FI_CLIST_ADD, $1, $5 ); }
- | dynamic_attr '.' DELETE '(' term ')' ';'    { $$ = f_generate_complex( FI_CLIST_DEL, $1, $5 ); }
- | dynamic_attr '.' FILTER '(' term ')' ';'    { $$ = f_generate_complex( FI_CLIST_FILTER, $1, $5 ); }
+ | CF_SYM_KNOWN '.' EMPTY ';' { $$ = f_generate_empty($1); }
+ | CF_SYM_KNOWN '.' PREPEND '(' term ')' ';'   { $$ = f_generate_complex_sym( FI_PATH_PREPEND, $1, $5 ); }
+ | CF_SYM_KNOWN '.' ADD '(' term ')' ';'       { $$ = f_generate_complex_sym( FI_CLIST_ADD, $1, $5 ); }
+ | CF_SYM_KNOWN '.' DELETE '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_DEL, $1, $5 ); }
+ | CF_SYM_KNOWN '.' FILTER '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_FILTER, $1, $5 ); }
  | BT_ASSERT '(' get_cf_position term get_cf_position ')' ';' { $$ = assert_done($4, $3 + 1, $5 - 1); }
  | BT_CHECK_ASSIGN '(' get_cf_position lvalue get_cf_position ',' term ')' ';' { $$ = assert_assign(&$4, $7, $3 + 1, $5 - 1); }
  ;
@@ -934,8 +951,17 @@ get_cf_position:
 };
 
 lvalue:
-   CF_SYM_KNOWN { cf_assert_symbol($1, SYM_VARIABLE); $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1 }; }
+   CF_SYM_KNOWN {
+      switch ($1->class) {
+	case SYM_VARIABLE_RANGE:
+	  $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1 };
+	  break;
+	case SYM_ATTRIBUTE:
+	  $$ = (struct f_lval) { .type = F_LVAL_EA, .da = $1->attribute };
+	  break;
+      }
+  }
  | static_attr { $$ = (struct f_lval) { .type = F_LVAL_SA, .sa = $1 }; }
- | dynamic_attr { $$ = (struct f_lval) { .type = F_LVAL_EA, .da = $1 }; };
+ ;
 
 CF_END
diff --git a/filter/data.h b/filter/data.h
index cba47d6a..4d2622ab 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -21,13 +21,6 @@ struct f_val {
 
 #define fputip(a)   ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
 
-/* Dynamic attribute definition (eattrs) */
-struct f_dynamic_attr {
-  btype type;		/* EA type (EAF_*) */
-  u8 bit;		/* For bitfield accessors */
-  uint ea_code;		/* EA code */
-};
-
 enum f_sa_code {
   SA_FROM = 1,
   SA_GW,
@@ -53,7 +46,6 @@ struct f_static_attr {
 /* Filter l-value type */
 enum f_lval_type {
   F_LVAL_VARIABLE,
-  F_LVAL_PREFERENCE,
   F_LVAL_SA,
   F_LVAL_EA,
 };
@@ -63,7 +55,7 @@ struct f_lval {
   enum f_lval_type type;
   union {
     struct symbol *sym;
-    struct f_dynamic_attr da;
+    const struct ea_class *da;
     struct f_static_attr sa;
   };
 };
diff --git a/filter/decl.m4 b/filter/decl.m4
index 2e4fb235..c59cd7f3 100644
--- a/filter/decl.m4
+++ b/filter/decl.m4
@@ -94,7 +94,7 @@ FID_DUMP_BODY()m4_dnl
 debug("%s" $4 "\n", INDENT, $5);
 ]])
 FID_INTERPRET_EXEC()m4_dnl
-const $1 $2 = whati->$2
+$1 $2 = whati->$2
 FID_INTERPRET_BODY')
 
 #	Instruction arguments are needed only until linearization is done.
@@ -256,7 +256,7 @@ FID_INTERPRET_BODY()')
 m4_define(SYMBOL, `FID_MEMBER(struct symbol *, sym, [[strcmp(f1->sym->name, f2->sym->name) || (f1->sym->class != f2->sym->class)]], "symbol %s", item->sym->name)')
 m4_define(RTC, `FID_MEMBER(struct rtable_config *, rtc, [[strcmp(f1->rtc->name, f2->rtc->name)]], "route table %s", item->rtc->name)')
 m4_define(STATIC_ATTR, `FID_MEMBER(struct f_static_attr, sa, f1->sa.sa_code != f2->sa.sa_code,,)')
-m4_define(DYNAMIC_ATTR, `FID_MEMBER(struct f_dynamic_attr, da, f1->da.ea_code != f2->da.ea_code,,)')
+m4_define(DYNAMIC_ATTR, `FID_MEMBER(const struct ea_class *, da, f1->da != f2->da,,)')
 m4_define(ACCESS_RTE, `FID_HIC(,[[do { if (!fs->rte) runtime("No route to access"); } while (0)]],NEVER_CONSTANT())')
 
 #	2) Code wrapping
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 7b34ef91..c5947955 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -662,14 +662,14 @@
     DYNAMIC_ATTR;
     ACCESS_RTE;
     ACCESS_EATTRS;
-    RESULT_TYPE(da.type);
+    RESULT_TYPE(da->type);
     {
       const struct f_val *empty;
-      eattr *e = ea_find(*fs->eattrs, da.ea_code);
+      const eattr *e = ea_find(*fs->eattrs, da->id);
 
       if (e)
       {
-	ASSERT_DIE(e->type == da.type);
+	ASSERT_DIE(e->type == da->type);
 
 	switch (e->type) {
 	  case T_IP:
@@ -682,7 +682,7 @@
 		}]]);
 	}
       }
-      else if (empty = f_get_empty(da.type))
+      else if (empty = f_get_empty(da->type))
 	RESULT_VAL(*empty);
       else
 	RESULT_VOID;
@@ -694,16 +694,16 @@
     ACCESS_EATTRS;
     ARG_ANY(1);
     DYNAMIC_ATTR;
-    ARG_TYPE(1, da.type);
+    ARG_TYPE(1, da->type);
     {
       struct eattr *a;
 
-      if (da.type >= EAF_TYPE__MAX)
+      if (da->type >= EAF_TYPE__MAX)
 	bug("Unsupported attribute type");
 
       f_rta_cow(fs);
 
-      switch (da.type) {
+      switch (da->type) {
       case T_OPAQUE:
       case T_IFACE:
 	runtime( "Setting opaque attribute is not allowed" );
@@ -711,12 +711,12 @@
 
       case T_IP:
 	a = ea_set_attr(fs->eattrs,
-	    EA_LITERAL_STORE_ADATA(da.ea_code, da.type, 0, &v1.val.ip, sizeof(ip_addr)));
+	    EA_LITERAL_STORE_ADATA(da, 0, &v1.val.ip, sizeof(ip_addr)));
 	break;
 
       default:
 	a = ea_set_attr(fs->eattrs,
-	    EA_LITERAL_GENERIC(da.ea_code, da.type, 0, .u = v1.val.bval));
+	    EA_LITERAL_GENERIC(da->id, da->type, 0, .u = v1.val.bval));
 	break;
       }
 
@@ -731,7 +731,7 @@
     ACCESS_EATTRS;
 
     f_rta_cow(fs);
-    ea_unset_attr(fs->eattrs, 1, da.ea_code);
+    ea_unset_attr(fs->eattrs, 1, da);
   }
 
   INST(FI_LENGTH, 1, 1) {	/* Get length of */
diff --git a/filter/f-inst.h b/filter/f-inst.h
index 32da4653..047a66c9 100644
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -87,15 +87,17 @@ void f_add_lines(const struct f_line_item *what, struct filter_iterator *fit);
 
 
 struct filter *f_new_where(struct f_inst *);
-static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, uint code)
-{ return (struct f_dynamic_attr) { .type = type, .ea_code = code }; }
-static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code)
-{ return (struct f_dynamic_attr) { .type = T_INT, .bit = bit, .ea_code = code }; }
 static inline struct f_static_attr f_new_static_attr(btype type, int code, int readonly)
 { return (struct f_static_attr) { .type = type, .sa_code = code, .readonly = readonly }; }
-struct f_inst *f_generate_complex(enum f_instruction_code fi_code, struct f_dynamic_attr da, struct f_inst *argument);
 struct f_inst *f_generate_roa_check(struct rtable_config *table, struct f_inst *prefix, struct f_inst *asn);
 
+struct f_attr_bit {
+  const struct ea_class *class;
+  uint bit;
+};
+
+#define f_new_dynamic_attr_bit(_bit, _name)  ((struct f_attr_bit) { .bit = _bit, .class = ea_class_find(_name) })
+
 /* Hook for call bt_assert() function in configuration */
 extern void (*bt_assert_hook)(int result, const struct f_line_item *assert);
 
diff --git a/filter/f-util.c b/filter/f-util.c
index 83ae01f6..fb93ee80 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -2,7 +2,7 @@
  *	Filters: utility functions
  *
  *	Copyright 1998 Pavel Machek <pavel@ucw.cz>
- *		  2017 Jan Maria Matejka <mq@ucw.cz>
+ *		  2017 Maria Matejka <mq@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -40,129 +40,3 @@ struct filter *f_new_where(struct f_inst *where)
   f->root = f_linearize(cond);
   return f;
 }
-
-#define CA_KEY(n)	n->name, n->fda.type
-#define CA_NEXT(n)	n->next
-#define CA_EQ(na,ta,nb,tb)	(!strcmp(na,nb) && (ta == tb))
-#define CA_FN(n,t)	(mem_hash(n, strlen(n)) ^ (t*0xaae99453U))
-#define CA_ORDER	8 /* Fixed */
-
-struct ca_storage {
-  struct ca_storage *next;
-  struct f_dynamic_attr fda;
-  u32 uc;
-  char name[0];
-};
-
-HASH(struct ca_storage) ca_hash;
-
-static struct idm ca_idm;
-static struct ca_storage **ca_storage;
-static uint ca_storage_max;
-
-static void
-ca_free(resource *r)
-{
-  struct custom_attribute *ca = (void *) r;
-  struct ca_storage *cas = HASH_FIND(ca_hash, CA, ca->name, ca->fda->type);
-  ASSERT(cas);
-
-  ca->name = NULL;
-  ca->fda = NULL;
-  if (!--cas->uc) {
-    uint id = EA_CUSTOM_ID(cas->fda.ea_code);
-    idm_free(&ca_idm, id);
-    HASH_REMOVE(ca_hash, CA, cas);
-    ca_storage[id] = NULL;
-    mb_free(cas);
-  }
-}
-
-static void
-ca_dump(resource *r)
-{
-  struct custom_attribute *ca = (void *) r;
-  debug("name \"%s\" id 0x%04x ea_type 0x%02x\n",
-      ca->name, ca->fda->ea_code, ca->fda->type);
-}
-
-static struct resclass ca_class = {
-  .name = "Custom attribute",
-  .size = sizeof(struct custom_attribute),
-  .free = ca_free,
-  .dump = ca_dump,
-  .lookup = NULL,
-  .memsize = NULL,
-};
-
-struct custom_attribute *
-ca_lookup(pool *p, const char *name, btype type)
-{
-  switch (type) {
-    case T_INT:
-    case T_IP:
-    case T_QUAD:
-    case T_PATH:
-    case T_CLIST:
-    case T_ECLIST:
-    case T_LCLIST:
-      break;
-    default:
-      cf_error("Custom route attribute of unsupported type");
-  }
-
-  static int inited = 0;
-  if (!inited) {
-    idm_init(&ca_idm, &root_pool, 8);
-    HASH_INIT(ca_hash, &root_pool, CA_ORDER);
-
-    ca_storage_max = 256;
-    ca_storage = mb_allocz(&root_pool, sizeof(struct ca_storage *) * ca_storage_max);
-
-    inited++;
-  }
-
-  struct ca_storage *cas = HASH_FIND(ca_hash, CA, name, type);
-  if (cas) {
-    cas->uc++;
-  } else {
-
-    uint id = idm_alloc(&ca_idm);
-
-    if (id >= EA_CUSTOM_BIT)
-      cf_error("Too many custom attributes.");
-
-    if (id >= ca_storage_max) {
-      ca_storage_max *= 2;
-      ca_storage = mb_realloc(ca_storage, sizeof(struct ca_storage *) * ca_storage_max * 2);
-    }
-
-    cas = mb_allocz(&root_pool, sizeof(struct ca_storage) + strlen(name) + 1);
-    cas->fda = f_new_dynamic_attr(type, EA_CUSTOM(id));
-    cas->uc = 1;
-
-    strcpy(cas->name, name);
-    ca_storage[id] = cas;
-
-    HASH_INSERT(ca_hash, CA, cas);
-  }
-
-  struct custom_attribute *ca = ralloc(p, &ca_class);
-  ca->fda = &(cas->fda);
-  ca->name = cas->name;
-  return ca;
-}
-
-const char *
-ea_custom_name(uint ea)
-{
-  uint id = EA_CUSTOM_ID(ea);
-  if (id >= ca_storage_max)
-    return NULL;
-
-  if (!ca_storage[id])
-    return NULL;
-
-  return ca_storage[id]->name;
-}
-
diff --git a/filter/filter.h b/filter/filter.h
index 43c04443..0273ef15 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -70,13 +70,4 @@ void filters_dump_all(void);
 
 #define FF_SILENT 2			/* Silent filter execution */
 
-/* Custom route attributes */
-struct custom_attribute {
-  resource r;
-  struct f_dynamic_attr *fda;
-  const char *name;
-};
-
-struct custom_attribute *ca_lookup(pool *p, const char *name, btype type);
-
 #endif
diff --git a/filter/test.conf b/filter/test.conf
index 062756b1..21e7330f 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -9,7 +9,109 @@ router id 62.168.0.1;
 /* We have to setup any protocol */
 protocol device { }
 
+/* Setting some custom attributes, enough to force BIRD to reallocate the attribute idmap */
+attribute int test_ca_int1;
+attribute int test_ca_int2;
+attribute int test_ca_int3;
+attribute int test_ca_int4;
+attribute int test_ca_int5;
+attribute int test_ca_int6;
+attribute int test_ca_int7;
+attribute int test_ca_int8;
+attribute int test_ca_int9;
+attribute int test_ca_int10;
 
+attribute ip test_ca_ip1;
+attribute ip test_ca_ip2;
+attribute ip test_ca_ip3;
+attribute ip test_ca_ip4;
+attribute ip test_ca_ip5;
+attribute ip test_ca_ip6;
+attribute ip test_ca_ip7;
+attribute ip test_ca_ip8;
+attribute ip test_ca_ip9;
+attribute ip test_ca_ip10;
+
+attribute quad test_ca_quad1;
+attribute quad test_ca_quad2;
+attribute quad test_ca_quad3;
+attribute quad test_ca_quad4;
+attribute quad test_ca_quad5;
+attribute quad test_ca_quad6;
+attribute quad test_ca_quad7;
+attribute quad test_ca_quad8;
+attribute quad test_ca_quad9;
+attribute quad test_ca_quad10;
+
+attribute bgppath test_ca_bgppath1;
+attribute bgppath test_ca_bgppath2;
+attribute bgppath test_ca_bgppath3;
+attribute bgppath test_ca_bgppath4;
+attribute bgppath test_ca_bgppath5;
+attribute bgppath test_ca_bgppath6;
+attribute bgppath test_ca_bgppath7;
+attribute bgppath test_ca_bgppath8;
+attribute bgppath test_ca_bgppath9;
+attribute bgppath test_ca_bgppath10;
+
+attribute clist test_ca_clist1;
+attribute clist test_ca_clist2;
+attribute clist test_ca_clist3;
+attribute clist test_ca_clist4;
+attribute clist test_ca_clist5;
+attribute clist test_ca_clist6;
+attribute clist test_ca_clist7;
+attribute clist test_ca_clist8;
+attribute clist test_ca_clist9;
+attribute clist test_ca_clist10;
+
+attribute eclist test_ca_eclist1;
+attribute eclist test_ca_eclist2;
+attribute eclist test_ca_eclist3;
+attribute eclist test_ca_eclist4;
+attribute eclist test_ca_eclist5;
+attribute eclist test_ca_eclist6;
+attribute eclist test_ca_eclist7;
+attribute eclist test_ca_eclist8;
+attribute eclist test_ca_eclist9;
+attribute eclist test_ca_eclist10;
+
+attribute lclist test_ca_lclist1;
+attribute lclist test_ca_lclist2;
+attribute lclist test_ca_lclist3;
+attribute lclist test_ca_lclist4;
+attribute lclist test_ca_lclist5;
+attribute lclist test_ca_lclist6;
+attribute lclist test_ca_lclist7;
+attribute lclist test_ca_lclist8;
+attribute lclist test_ca_lclist9;
+attribute lclist test_ca_lclist10;
+
+attribute lclist test_ca_lclist_max1;
+attribute lclist test_ca_lclist_max2;
+attribute lclist test_ca_lclist_max3;
+attribute lclist test_ca_lclist_max4;
+attribute lclist test_ca_lclist_max5;
+attribute lclist test_ca_lclist_max6;
+attribute lclist test_ca_lclist_max7;
+attribute lclist test_ca_lclist_max8;
+attribute lclist test_ca_lclist_max9;
+attribute lclist test_ca_lclist_max10;
+attribute lclist test_ca_lclist_max11;
+attribute lclist test_ca_lclist_max12;
+attribute lclist test_ca_lclist_max13;
+attribute lclist test_ca_lclist_max14;
+attribute lclist test_ca_lclist_max15;
+attribute lclist test_ca_lclist_max16;
+attribute lclist test_ca_lclist_max17;
+attribute lclist test_ca_lclist_max18;
+attribute lclist test_ca_lclist_max19;
+attribute lclist test_ca_lclist_max20;
+attribute lclist test_ca_lclist_max21;
+
+
+/* Uncomment this to get an error */
+#attribute int bgp_path;
 
 /*
  * 	Common definitions and functions
@@ -1331,6 +1433,7 @@ function __test2()
 
 filter testf
 int j;
+bool t;
 {
 	print "Heya, filtering route to ", net.ip, " prefixlen ", net.len, " source ", source;
 	print "This route was from ", from;
@@ -1342,6 +1445,52 @@ int j;
 	rip_metric = 14;
 	unset(rip_metric);
 
+	test_ca_int1 = 42;
+	test_ca_ip2 = 1.3.5.7;
+	test_ca_quad3 = 2.4.6.8;
+	test_ca_bgppath4 = +empty+;
+	test_ca_clist5 = -empty-;
+	test_ca_eclist6 = --empty--;
+	test_ca_lclist7 = ---empty---;
+
+	igp_metric = 53;
+	babel_metric = 64;
+	t = defined(babel_router_id);
+	j = babel_seqno;
+
+	bgp_origin = ORIGIN_IGP;
+	bgp_path = +empty+;
+	bgp_next_hop = 3456:789a:bcde:f012::3456:789a;
+	bgp_med = 71;
+	bgp_local_pref = 942;
+	t = defined(bgp_atomic_aggr);
+	t = defined(bgp_aggregator);
+	bgp_community = -empty-;
+	bgp_originator_id = 9.7.5.3;
+	bgp_cluster_list = -empty-;
+	t = defined(bgp_mp_reach_nlri);
+	t = defined(bgp_mp_unreach_nlri);
+	bgp_ext_community = --empty--;
+	bgp_as4_path = +empty+;
+	t = defined(bgp_as4_aggregator);
+	t = defined(bgp_aigp);
+	bgp_large_community = ---empty---;
+	t = defined(bgp_mpls_label_stack);
+
+	ospf_metric1 = 64;
+	ospf_metric2 = 111;
+	ospf_tag = 654432;
+
+	radv_preference = RA_PREF_LOW;
+	radv_lifetime = 28;
+
+	rip_metric = 2;
+	rip_tag = 4;
+	t = defined(rip_from);
+
+	krt_source = 17;
+	krt_metric = 19;
+
 #	krt_lock_mtu = false;
 #	krt_lock_window = true;
 #	krt_lock_rtt = krt_lock_rttvar && krt_lock_sstresh || krt_lock_cwnd;
diff --git a/lib/event_test.c b/lib/event_test.c
index e14d0b95..3070327d 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -55,8 +55,8 @@ t_ev_run_list(void)
 
   olock_init();
   timer_init();
-  io_init();
   rt_init();
+  io_init();
   if_init();
 //  roa_init();
   config_init();
diff --git a/lib/mempool.c b/lib/mempool.c
index 325b1ecf..33eaec86 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -41,8 +41,6 @@ struct linpool {
   uint total, total_large;
 };
 
-_Thread_local linpool *tmp_linpool;
-
 static void lp_free(resource *);
 static void lp_dump(resource *);
 static resource *lp_lookup(resource *, unsigned long);
diff --git a/lib/resource.c b/lib/resource.c
index 89e559b4..c31d9889 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -292,6 +292,25 @@ resource_init(void)
   tmp_init(&root_pool);
 }
 
+_Thread_local struct tmp_resources tmp_res;
+
+void
+tmp_init(pool *p)
+{
+  tmp_res.lp = lp_new_default(p);
+  tmp_res.parent = p;
+  tmp_res.pool = rp_new(p, "TMP");
+}
+
+void
+tmp_flush(void)
+{
+  lp_flush(tmp_linpool);
+  rfree(tmp_res.pool);
+  tmp_res.pool = rp_new(tmp_res.parent, "TMP");
+}
+
+
 /**
  * DOC: Memory blocks
  *
diff --git a/lib/resource.h b/lib/resource.h
index a4e110a5..4cedbf00 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -80,14 +80,21 @@ void lp_flush(linpool *);			/* Free everything, but leave linpool */
 void lp_save(linpool *m, lp_state *p);		/* Save state */
 void lp_restore(linpool *m, lp_state *p);	/* Restore state */
 
-extern _Thread_local linpool *tmp_linpool;	/* Temporary linpool autoflushed regularily */
+struct tmp_resources {
+  pool *pool, *parent;
+  linpool *lp;
+};
 
+extern _Thread_local struct tmp_resources tmp_res;
+
+#define tmp_linpool	tmp_res.lp
 #define tmp_alloc(sz)	lp_alloc(tmp_linpool, sz)
 #define tmp_allocu(sz)	lp_allocu(tmp_linpool, sz)
 #define tmp_allocz(sz)	lp_allocz(tmp_linpool, sz)
 
-#define tmp_init(p)	tmp_linpool = lp_new_default(p)
-#define tmp_flush()	lp_flush(tmp_linpool)
+void tmp_init(pool *p);
+void tmp_flush(void);
+
 
 #define lp_new_default	lp_new
 
diff --git a/lib/route.h b/lib/route.h
index ad3f3fb7..f24fd555 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -150,19 +150,7 @@ typedef struct eattr {
 } eattr;
 
 
-#define EA_CODE(proto,id) (((proto) << 8) | (id))
-#define EA_ID(ea) ((ea) & 0xff)
-#define EA_PROTO(ea) ((ea) >> 8)
-#define EA_CUSTOM(id) ((id) | EA_CUSTOM_BIT)
-#define EA_IS_CUSTOM(ea) ((ea) & EA_CUSTOM_BIT)
-#define EA_CUSTOM_ID(ea) ((ea) & ~EA_CUSTOM_BIT)
-
-const char *ea_custom_name(uint ea);
-
-#define EA_GEN_IGP_METRIC EA_CODE(PROTOCOL_NONE, 0)
-
 #define EA_CODE_MASK 0xffff
-#define EA_CUSTOM_BIT 0x8000
 #define EA_ALLOW_UNDEF 0x10000		/* ea_find: allow EAF_TYPE_UNDEF */
 #define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
 #define EA_BIT_GET(ea) ((ea) >> 24)
@@ -179,32 +167,67 @@ typedef struct ea_list {
 #define EALF_BISECT 2			/* Use interval bisection for searching */
 #define EALF_CACHED 4			/* Attributes belonging to cached rta */
 
+struct ea_class {
+#define EA_CLASS_INSIDE \
+  const char *name;			/* Name (both print and filter) */ \
+  struct symbol *sym;			/* Symbol to export to configs */ \
+  uint id;				/* Autoassigned attribute ID */ \
+  uint uc;				/* Reference count */ \
+  btype type;				/* Data type ID */ \
+  uint readonly:1;			/* This attribute can't be changed by filters */ \
+  uint conf:1;				/* Requested by config */ \
+  void (*format)(const eattr *ea, byte *buf, uint size); \
+
+  EA_CLASS_INSIDE;
+};
+
+struct ea_class_ref {
+  resource r;
+  struct ea_class *class;
+};
+
+extern struct ea_class ea_gen_igp_metric;
+
+void ea_register_init(struct ea_class *);
+struct ea_class_ref *ea_register_alloc(pool *, struct ea_class);
+
+#define EA_REGISTER_ALL_HELPER(x)	ea_register_init(x);
+#define EA_REGISTER_ALL(...)		MACRO_FOREACH(EA_REGISTER_ALL_HELPER, __VA_ARGS__)
+
+struct ea_class *ea_class_find_by_id(uint id);
+struct ea_class *ea_class_find_by_name(const char *name);
+static inline struct ea_class *ea_class_self(struct ea_class *self) { return self; }
+#define ea_class_find(_arg)	_Generic((_arg), \
+  uint: ea_class_find_by_id, \
+  word: ea_class_find_by_id, \
+  char *: ea_class_find_by_name, \
+  const char *: ea_class_find_by_name, \
+  struct ea_class *: ea_class_self)(_arg)
+
 struct ea_walk_state {
   ea_list *eattrs;			/* Ccurrent ea_list, initially set by caller */
   eattr *ea;				/* Current eattr, initially NULL */
   u32 visited[4];			/* Bitfield, limiting max to 128 */
 };
 
-eattr *ea_find(ea_list *, unsigned ea);
-eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
-
-/**
- * ea_get_int - fetch an integer attribute
- * @e: attribute list
- * @id: attribute ID
- * @def: default value
- *
- * This function is a shortcut for retrieving a value of an integer attribute
- * by calling ea_find() to find the attribute, extracting its value or returning
- * a provided default if no such attribute is present.
- */
-static inline u32
-ea_get_int(ea_list *e, unsigned id, u32 def)
+#define ea_find(_l, _arg)	_Generic((_arg), uint: ea_find_by_id, struct ea_class *: ea_find_by_class, char *: ea_find_by_name)(_l, _arg)
+eattr *ea_find_by_id(ea_list *, unsigned ea);
+static inline eattr *ea_find_by_class(ea_list *l, const struct ea_class *def)
+{ return ea_find_by_id(l, def->id); }
+static inline eattr *ea_find_by_name(ea_list *l, const char *name)
 {
-  eattr *a = ea_find(e, id);
-  return a ? a->u.data : def;
+  const struct ea_class *def = ea_class_find_by_name(name);
+  return def ? ea_find_by_class(l, def) : NULL;
 }
 
+#define ea_get_int(_l, _ident, _def)  ({ \
+    struct ea_class *cls = ea_class_find((_ident)); \
+    ASSERT_DIE(cls->type & EAF_EMBEDDED); \
+    const eattr *ea = ea_find((_l), cls->id); \
+    (ea ? ea->u.data : (_def)); \
+    })
+
+eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
 void ea_dump(ea_list *);
 int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
 uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */
@@ -219,19 +242,22 @@ void ea_list_copy(ea_list *dest, ea_list *src, uint size);
 
 #define EA_LOCAL_LIST(N)  struct { ea_list l; eattr a[N]; }
 
-#define EA_LITERAL_EMBEDDED(_id, _type, _flags, _val) ({ \
+#define EA_LITERAL_EMBEDDED(_class, _flags, _val) ({ \
+    btype _type = (_class)->type; \
     ASSERT_DIE(_type & EAF_EMBEDDED); \
-    EA_LITERAL_GENERIC(_id, _type, _flags, .u.i = _val); \
+    EA_LITERAL_GENERIC((_class)->id, _type, _flags, .u.i = _val); \
     })
 
-#define EA_LITERAL_STORE_ADATA(_id, _type, _flags, _buf, _len) ({ \
+#define EA_LITERAL_STORE_ADATA(_class, _flags, _buf, _len) ({ \
+    btype _type = (_class)->type; \
     ASSERT_DIE(!(_type & EAF_EMBEDDED)); \
-    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = tmp_store_adata((_buf), (_len))); \
+    EA_LITERAL_GENERIC((_class)->id, _type, _flags, .u.ad = tmp_store_adata((_buf), (_len))); \
     })
 
-#define EA_LITERAL_DIRECT_ADATA(_id, _type, _flags, _adata) ({ \
+#define EA_LITERAL_DIRECT_ADATA(_class, _flags, _adata) ({ \
+    btype _type = (_class)->type; \
     ASSERT_DIE(!(_type & EAF_EMBEDDED)); \
-    EA_LITERAL_GENERIC(_id, _type, _flags, .u.ad = _adata); \
+    EA_LITERAL_GENERIC((_class)->id, _type, _flags, .u.ad = _adata); \
     })
 
 #define EA_LITERAL_GENERIC(_id, _type, _flags, ...) \
@@ -253,19 +279,19 @@ ea_set_attr(ea_list **to, eattr a)
 }
 
 static inline void
-ea_unset_attr(ea_list **to, _Bool local, uint code)
+ea_unset_attr(ea_list **to, _Bool local, const struct ea_class *def)
 {
-  ea_set_attr(to, EA_LITERAL_GENERIC(code, 0, 0,
+  ea_set_attr(to, EA_LITERAL_GENERIC(def->id, 0, 0,
 	.fresh = local, .originated = local, .undef = 1));
 }
 
 static inline void
-ea_set_attr_u32(ea_list **to, uint id, uint flags, uint type, u32 data)
-{ ea_set_attr(to, EA_LITERAL_EMBEDDED(id, type, flags, data)); }
+ea_set_attr_u32(ea_list **to, const struct ea_class *def, uint flags, u64 data)
+{ ea_set_attr(to, EA_LITERAL_EMBEDDED(def, flags, data)); }
 
 static inline void
-ea_set_attr_data(ea_list **to, uint id, uint flags, uint type, void *data, uint len)
-{ ea_set_attr(to, EA_LITERAL_STORE_ADATA(id, type, flags, data, len)); }
+ea_set_attr_data(ea_list **to, const struct ea_class *def, uint flags, void *data, uint len)
+{ ea_set_attr(to, EA_LITERAL_STORE_ADATA(def, flags, data, len)); }
 
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
diff --git a/nest/config.Y b/nest/config.Y
index 12fd01a2..c2913506 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -120,7 +120,7 @@ CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CH
 CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512)
 CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
 CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION)
-CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
+CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP)
 CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
 CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
@@ -921,9 +921,6 @@ proto_patt2:
  | TEXT { $$.ptr = $1; $$.patt = 1; }
  ;
 
-dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_GEN_IGP_METRIC); } ;
-
-
 CF_CODE
 
 CF_END
diff --git a/nest/proto.c b/nest/proto.c
index 95c319db..72613f8d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -26,7 +26,6 @@ pool *proto_pool;
 list STATIC_LIST_INIT(proto_list);
 
 static list STATIC_LIST_INIT(protocol_list);
-struct protocol *class_to_protocol[PROTOCOL__MAX];
 
 #define CD(c, msg, args...) ({ if (c->debug & D_STATES) log(L_TRACE "%s.%s: " msg, c->proto->name, c->name ?: "?", ## args); })
 #define PD(p, msg, args...) ({ if (p->debug & D_STATES) log(L_TRACE "%s: " msg, p->name, ## args); })
@@ -1637,9 +1636,6 @@ void
 proto_build(struct protocol *p)
 {
   add_tail(&protocol_list, &p->n);
-  ASSERT(p->class);
-  ASSERT(!class_to_protocol[p->class]);
-  class_to_protocol[p->class] = p;
 }
 
 /* FIXME: convert this call to some protocol hook */
diff --git a/nest/protocol.h b/nest/protocol.h
index 7fb08992..8f0cc4b4 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -37,38 +37,20 @@ struct symbol;
  *	Routing Protocol
  */
 
-enum protocol_class {
-  PROTOCOL_NONE,
-  PROTOCOL_BABEL,
-  PROTOCOL_BFD,
-  PROTOCOL_BGP,
-  PROTOCOL_DEVICE,
-  PROTOCOL_DIRECT,
-  PROTOCOL_KERNEL,
-  PROTOCOL_OSPF,
-  PROTOCOL_MRT,
-  PROTOCOL_PERF,
-  PROTOCOL_PIPE,
-  PROTOCOL_RADV,
-  PROTOCOL_RIP,
-  PROTOCOL_RPKI,
-  PROTOCOL_STATIC,
-  PROTOCOL__MAX
-};
-
-extern struct protocol *class_to_protocol[PROTOCOL__MAX];
 
 struct protocol {
   node n;
   char *name;
   char *template;			/* Template for automatic generation of names */
   int name_counter;			/* Counter for automatic name generation */
-  enum protocol_class class;		/* Machine readable protocol class */
   uint preference;			/* Default protocol preference */
   uint channel_mask;			/* Mask of accepted channel types (NB_*) */
   uint proto_size;			/* Size of protocol data structure */
   uint config_size;			/* Size of protocol config data structure */
 
+  uint eattr_begin;			/* First ID of registered eattrs */
+  uint eattr_end;			/* End of eattr id zone */
+
   void (*preconfig)(struct protocol *, struct config *);	/* Just before configuring */
   void (*postconfig)(struct proto_config *);			/* After configuring each instance */
   struct proto * (*init)(struct proto_config *);		/* Create new instance */
@@ -79,7 +61,7 @@ struct protocol {
   void (*cleanup)(struct proto *);		/* Called after shutdown when protocol became hungry/down */
   void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */
   void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */
-  int (*get_attr)(const struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */
+//  int (*get_attr)(const struct eattr *, byte *buf, int buflen);	/* ASCIIfy dynamic attribute (returns GA_*) */
   void (*show_proto_info)(struct proto *);	/* Show protocol info (for `show protocols all' command) */
   void (*copy_config)(struct proto_config *, struct proto_config *);	/* Copy config from given protocol instance */
 };
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index afa95eec..a763db4d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -60,6 +60,11 @@
 
 const adata null_adata;		/* adata of length 0 */
 
+struct ea_class ea_gen_igp_metric = {
+  .name = "igp_metric",
+  .type = T_INT,
+};
+
 const char * const rta_src_names[RTS_MAX] = {
   [RTS_STATIC]		= "static",
   [RTS_INHERIT]		= "inherit",
@@ -401,6 +406,117 @@ nexthop_free(struct nexthop *o)
  *	Extended Attributes
  */
 
+#define EA_CLASS_INITIAL_MAX	128
+static struct ea_class **ea_class_global = NULL;
+static uint ea_class_max;
+static struct idm ea_class_idm;
+
+/* Config parser lex register function */
+void ea_lex_register(struct ea_class *def);
+void ea_lex_unregister(struct ea_class *def);
+
+static void
+ea_class_free(struct ea_class *cl)
+{
+  /* No more ea class references. Unregister the attribute. */
+  idm_free(&ea_class_idm, cl->id);
+  ea_class_global[cl->id] = NULL;
+  ea_lex_unregister(cl);
+}
+
+static void
+ea_class_ref_free(resource *r)
+{
+  struct ea_class_ref *ref = SKIP_BACK(struct ea_class_ref, r, r);
+  if (!--ref->class->uc)
+    ea_class_free(ref->class);
+}
+
+static void
+ea_class_ref_dump(resource *r)
+{
+  struct ea_class_ref *ref = SKIP_BACK(struct ea_class_ref, r, r);
+  debug("name \"%s\", type=%d\n", ref->class->name, ref->class->type);
+}
+
+static struct resclass ea_class_ref_class = {
+  .name = "Attribute class reference",
+  .size = sizeof(struct ea_class_ref),
+  .free = ea_class_ref_free,
+  .dump = ea_class_ref_dump,
+  .lookup = NULL,
+  .memsize = NULL,
+};
+
+static void
+ea_class_init(void)
+{
+  idm_init(&ea_class_idm, rta_pool, EA_CLASS_INITIAL_MAX);
+  ea_class_global = mb_allocz(rta_pool,
+      sizeof(*ea_class_global) * (ea_class_max = EA_CLASS_INITIAL_MAX));
+}
+
+static struct ea_class_ref *
+ea_ref_class(pool *p, struct ea_class *def)
+{
+  def->uc++;
+  struct ea_class_ref *ref = ralloc(p, &ea_class_ref_class);
+  ref->class = def;
+  return ref;
+}
+
+static struct ea_class_ref *
+ea_register(pool *p, struct ea_class *def)
+{
+  def->id = idm_alloc(&ea_class_idm);
+
+  ASSERT_DIE(ea_class_global);
+  while (def->id >= ea_class_max)
+    ea_class_global = mb_realloc(ea_class_global, sizeof(*ea_class_global) * (ea_class_max *= 2));
+
+  ASSERT_DIE(def->id < ea_class_max);
+  ea_class_global[def->id] = def;
+
+  ea_lex_register(def);
+
+  return ea_ref_class(p, def);
+}
+
+struct ea_class_ref *
+ea_register_alloc(pool *p, struct ea_class cl)
+{
+  struct ea_class *clp = ea_class_find_by_name(cl.name);
+  if (clp && clp->type == cl.type)
+    return ea_ref_class(p, clp);
+
+  uint namelen = strlen(cl.name) + 1;
+
+  struct {
+    struct ea_class cl;
+    char name[0];
+  } *cla = mb_alloc(rta_pool, sizeof(struct ea_class) + namelen);
+  cla->cl = cl;
+  memcpy(cla->name, cl.name, namelen);
+  cla->cl.name = cla->name;
+
+  return ea_register(p, &cla->cl);
+}
+
+void
+ea_register_init(struct ea_class *clp)
+{
+  ASSERT_DIE(!ea_class_find_by_name(clp->name));
+  ea_register(&root_pool, clp);
+}
+
+struct ea_class *
+ea_class_find_by_id(uint id)
+{
+  ASSERT_DIE(id < ea_class_max);
+  ASSERT_DIE(ea_class_global[id]);
+  return ea_class_global[id];
+}
+
 static inline eattr *
 ea__find(ea_list *e, unsigned id)
 {
@@ -444,7 +560,7 @@ ea__find(ea_list *e, unsigned id)
  * to its &eattr structure or %NULL if no such attribute exists.
  */
 eattr *
-ea_find(ea_list *e, unsigned id)
+ea_find_by_id(ea_list *e, unsigned id)
 {
   eattr *a = ea__find(e, id & EA_CODE_MASK);
 
@@ -784,28 +900,46 @@ ea_list_copy(ea_list *n, ea_list *o, uint elen)
   ASSERT_DIE(adpos == elen);
 }
 
+static void
+ea_list_ref(ea_list *l)
+{
+  for(uint i=0; i<l->count; i++)
+    {
+      eattr *a = &l->attrs[i];
+      ASSERT_DIE(a->id < ea_class_max);
+
+      struct ea_class *cl = ea_class_global[a->id];
+      ASSERT_DIE(cl && cl->uc);
+      cl->uc++;
+    }
+}
+
+static void
+ea_list_unref(ea_list *l)
+{
+  for(uint i=0; i<l->count; i++)
+    {
+      eattr *a = &l->attrs[i];
+      ASSERT_DIE(a->id < ea_class_max);
+
+      struct ea_class *cl = ea_class_global[a->id];
+      ASSERT_DIE(cl && cl->uc);
+      if (!--cl->uc)
+	ea_class_free(cl);
+    }
+}
+
 static inline void
 ea_free(ea_list *o)
 {
   if (o)
     {
+      ea_list_unref(o);
       ASSERT(!o->next);
       mb_free(o);
     }
 }
 
-static int
-get_generic_attr(const eattr *a, byte **buf, int buflen UNUSED)
-{
-  if (a->id == EA_GEN_IGP_METRIC)
-    {
-      *buf += bsprintf(*buf, "igp_metric");
-      return GA_NAME;
-    }
-
-  return GA_UNKNOWN;
-}
-
 void
 ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max)
 {
@@ -905,47 +1039,27 @@ ea_show_lc_set(struct cli *c, const struct adata *ad, byte *pos, byte *buf, byte
 void
 ea_show(struct cli *c, const eattr *e)
 {
-  struct protocol *p;
-  int status = GA_UNKNOWN;
   const struct adata *ad = (e->type & EAF_EMBEDDED) ? NULL : e->u.ptr;
   byte buf[CLI_MSG_SIZE];
   byte *pos = buf, *end = buf + sizeof(buf);
 
-  if (EA_IS_CUSTOM(e->id))
-    {
-      const char *name = ea_custom_name(e->id);
-      if (name)
-        {
-	  pos += bsprintf(pos, "%s", name);
-	  status = GA_NAME;
-	}
-      else
-	pos += bsprintf(pos, "%02x.", EA_PROTO(e->id));
-    }
-  else if (p = class_to_protocol[EA_PROTO(e->id)])
-    {
-      pos += bsprintf(pos, "%s.", p->name);
-      if (p->get_attr)
-	status = p->get_attr(e, pos, end - pos);
-      pos += strlen(pos);
-    }
-  else if (EA_PROTO(e->id))
-    pos += bsprintf(pos, "%02x.", EA_PROTO(e->id));
+  ASSERT_DIE(e->id < ea_class_max);
+
+  struct ea_class *cls = ea_class_global[e->id];
+  ASSERT_DIE(cls);
+
+  pos += bsprintf(pos, "%s", cls->name);
+
+  *pos++ = ':';
+  *pos++ = ' ';
+
+  if (e->undef)
+    bsprintf(pos, "undefined (should not happen)");
+  else if (cls->format)
+    cls->format(e, buf, end - buf);
   else
-    status = get_generic_attr(e, &pos, end - pos);
-
-  if (status < GA_NAME)
-    pos += bsprintf(pos, "%02x", EA_ID(e->id));
-  if (status < GA_FULL)
-    {
-      *pos++ = ':';
-      *pos++ = ' ';
-
-      if (e->undef)
-	bsprintf(pos, "undefined");
-      else
-      switch (e->type)
-	{
+    switch (e->type)
+      {
 	case T_INT:
 	  bsprintf(pos, "%u", e->u.data);
 	  break;
@@ -970,13 +1084,10 @@ ea_show(struct cli *c, const eattr *e)
 	case T_LCLIST:
 	  ea_show_lc_set(c, ad, pos, buf, end);
 	  return;
-	case T_IFACE:
-	  bsprintf(pos, "%s", ((struct iface *) e->u.ptr)->name);
-	  return;
 	default:
 	  bsprintf(pos, "<type %02x>", e->type);
-	}
-    }
+      }
+
   cli_printf(c, -1012, "\t%s", buf);
 }
 
@@ -1006,7 +1117,7 @@ ea_dump(ea_list *e)
       for(i=0; i<e->count; i++)
 	{
 	  eattr *a = &e->attrs[i];
-	  debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags);
+	  debug(" %04x.%02x", a->id, a->flags);
 	  debug("=%c",
 	      "?iO?IRP???S??pE?"
 	      "??L???N?????????"
@@ -1157,6 +1268,7 @@ rta_copy(rta *o)
   uint elen = ea_list_size(o->eattrs);
   r->eattrs = mb_alloc(rta_pool, elen);
   ea_list_copy(r->eattrs, o->eattrs, elen);
+  ea_list_ref(r->eattrs);
   r->eattrs->flags |= EALF_CACHED;
   return r;
 }
@@ -1357,6 +1469,9 @@ rta_init(void)
 
   rta_alloc_hash();
   rte_src_init();
+  ea_class_init();
+
+  ea_register_init(&ea_gen_igp_metric);
 }
 
 /*
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 82533321..bdf8584d 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -185,7 +185,6 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src)
 struct protocol proto_device = {
   .name =		"Direct",
   .template =		"direct%d",
-  .class =		PROTOCOL_DIRECT,
   .preference =		DEF_PREF_DIRECT,
   .channel_mask =	NB_IP | NB_IP6_SADR,
   .proto_size =		sizeof(struct rt_dev_proto),
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 049b7a7f..af59d63b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2536,14 +2536,14 @@ net_flow_has_dst_prefix(const net_addr *n)
 static inline int
 rta_as_path_is_empty(rta *a)
 {
-  eattr *e = ea_find(a->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+  eattr *e = ea_find(a->eattrs, "bgp_path");
   return !e || (as_path_getlen(e->u.ptr) == 0);
 }
 
 static inline u32
 rta_get_first_asn(rta *a)
 {
-  eattr *e = ea_find(a->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+  eattr *e = ea_find(a->eattrs, "bgp_path");
   u32 asn;
 
   return (e && as_path_get_first_regular(e->u.ptr, &asn)) ? asn : 0;
@@ -2587,8 +2587,8 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, i
     return 0;
 
   /* Find ORIGINATOR_ID values */
-  u32 orig_a = ea_get_int(a->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID), 0);
-  u32 orig_b = ea_get_int(rb->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID), 0);
+  u32 orig_a = ea_get_int(a->eattrs, "bgp_originator_id", 0);
+  u32 orig_b = ea_get_int(rb->attrs->eattrs, "bgp_originator_id", 0);
 
   /* Originator is either ORIGINATOR_ID (if present), or BGP neighbor address (if not) */
   if ((orig_a != orig_b) || (!orig_a && !orig_b && !ipa_equal(a->from, rb->attrs->from)))
@@ -3458,7 +3458,7 @@ if_local_addr(ip_addr a, struct iface *i)
 u32
 rt_get_igp_metric(rte *rt)
 {
-  eattr *ea = ea_find(rt->attrs->eattrs, EA_GEN_IGP_METRIC);
+  eattr *ea = ea_find(rt->attrs->eattrs, "igp_metric");
 
   if (ea)
     return ea->u.data;
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index db710a0d..97dca4ac 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -37,6 +37,7 @@
 
 #include <stdlib.h>
 #include "babel.h"
+#include "lib/macro.h"
 
 #define LOG_PKT_AUTH(msg, args...) \
   log_rl(&p->log_pkt_tbf, L_AUTH "%s: " msg, p->p.name, args)
@@ -58,6 +59,8 @@ static void babel_update_cost(struct babel_neighbor *n);
 static inline void babel_kick_timer(struct babel_proto *p);
 static inline void babel_iface_kick_timer(struct babel_iface *ifa);
 
+static struct ea_class ea_babel_metric, ea_babel_router_id, ea_babel_seqno;
+
 /*
  *	Functions to maintain data structures
  */
@@ -646,9 +649,9 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     } eattrs = {
       .l.count = 3,
       .a = {
-	EA_LITERAL_EMBEDDED(EA_BABEL_METRIC, T_INT, 0, r->metric),
-	EA_LITERAL_STORE_ADATA(EA_BABEL_ROUTER_ID, T_OPAQUE, 0, &r->router_id, sizeof(r->router_id)),
-	EA_LITERAL_EMBEDDED(EA_BABEL_SEQNO, T_INT, 0, r->seqno),
+	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
+	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
+	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
       }
     };
 
@@ -2018,39 +2021,41 @@ static void
 babel_get_route_info(rte *rte, byte *buf)
 {
   u64 rid = 0;
-  eattr *e = ea_find(rte->attrs->eattrs, EA_BABEL_ROUTER_ID);
+  eattr *e = ea_find(rte->attrs->eattrs, &ea_babel_router_id);
   if (e)
     memcpy(&rid, e->u.ptr->data, sizeof(u64));
 
   buf += bsprintf(buf, " (%d/%d) [%lR]", rte->attrs->pref,
-      ea_get_int(rte->attrs->eattrs, EA_BABEL_METRIC, BABEL_INFINITY), rid);
+      ea_get_int(rte->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY), rid);
 }
 
-static int
-babel_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
+static void
+babel_router_id_format(const eattr *a, byte *buf, uint len)
 {
-  switch (a->id)
-  {
-  case EA_BABEL_SEQNO:
-    return GA_FULL;
-
-  case EA_BABEL_METRIC:
-    bsprintf(buf, "metric: %d", a->u.data);
-    return GA_FULL;
-
-  case EA_BABEL_ROUTER_ID:
-  {
-    u64 rid = 0;
-    memcpy(&rid, a->u.ptr->data, sizeof(u64));
-    bsprintf(buf, "router_id: %lR", rid);
-    return GA_FULL;
-  }
-
-  default:
-    return GA_UNKNOWN;
-  }
+  u64 rid = 0;
+  memcpy(&rid, a->u.ptr->data, sizeof(u64));
+  bsnprintf(buf, len, "%lR", rid);
 }
 
+static struct ea_class ea_babel_metric = {
+  .name = "babel_metric",
+  .type = T_INT,
+};
+
+static struct ea_class ea_babel_router_id = {
+  .name = "babel_router_id",
+  .type = T_OPAQUE,
+  .readonly = 1,
+  .format = babel_router_id_format,
+};
+
+static struct ea_class ea_babel_seqno = {
+  .name = "babel_seqno",
+  .type = T_INT,
+  .readonly = 1,
+};
+
+
 void
 babel_show_interfaces(struct proto *P, const char *iff)
 {
@@ -2272,13 +2277,13 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
   {
     /* Update */
     uint rt_seqno;
-    uint rt_metric = ea_get_int(new->attrs->eattrs, EA_BABEL_METRIC, 0);
+    uint rt_metric = ea_get_int(new->attrs->eattrs, &ea_babel_metric, 0);
     u64 rt_router_id = 0;
 
     if (new->src->proto == P)
     {
-      rt_seqno = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data;
-      eattr *e = ea_find(new->attrs->eattrs, EA_BABEL_ROUTER_ID);
+      rt_seqno = ea_get_int(new->attrs->eattrs, &ea_babel_seqno, 0);
+      eattr *e = ea_find(new->attrs->eattrs, &ea_babel_router_id);
       if (e)
 	memcpy(&rt_router_id, e->u.ptr->data, sizeof(u64));
     }
@@ -2329,8 +2334,8 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
 static int
 babel_rte_better(struct rte *new, struct rte *old)
 {
-  uint new_metric = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data;
-  uint old_metric = ea_find(old->attrs->eattrs, EA_BABEL_SEQNO)->u.data;
+  uint new_metric = ea_get_int(new->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
+  uint old_metric = ea_get_int(old->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
 
   return new_metric < old_metric;
 }
@@ -2338,7 +2343,7 @@ babel_rte_better(struct rte *new, struct rte *old)
 static u32
 babel_rte_igp_metric(struct rte *rt)
 {
-  return ea_get_int(rt->attrs->eattrs, EA_BABEL_METRIC, BABEL_INFINITY);
+  return ea_get_int(rt->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
 }
 
 
@@ -2466,11 +2471,9 @@ babel_reconfigure(struct proto *P, struct proto_config *CF)
   return 1;
 }
 
-
 struct protocol proto_babel = {
   .name =		"Babel",
   .template =		"babel%d",
-  .class =		PROTOCOL_BABEL,
   .preference =		DEF_PREF_BABEL,
   .channel_mask =	NB_IP | NB_IP6_SADR,
   .proto_size =		sizeof(struct babel_proto),
@@ -2482,11 +2485,16 @@ struct protocol proto_babel = {
   .shutdown =		babel_shutdown,
   .reconfigure =	babel_reconfigure,
   .get_route_info =	babel_get_route_info,
-  .get_attr =		babel_get_attr
 };
 
 void
 babel_build(void)
 {
   proto_build(&proto_babel);
+
+  EA_REGISTER_ALL(
+      &ea_babel_metric,
+      &ea_babel_router_id,
+      &ea_babel_seqno
+      );
 }
diff --git a/proto/babel/babel.h b/proto/babel/babel.h
index 00814641..a980d1da 100644
--- a/proto/babel/babel.h
+++ b/proto/babel/babel.h
@@ -26,10 +26,6 @@
 #include "lib/string.h"
 #include "lib/timer.h"
 
-#define EA_BABEL_METRIC		EA_CODE(PROTOCOL_BABEL, 0)
-#define EA_BABEL_ROUTER_ID	EA_CODE(PROTOCOL_BABEL, 1)
-#define EA_BABEL_SEQNO		EA_CODE(PROTOCOL_BABEL, 2)
-
 #define BABEL_MAGIC		42
 #define BABEL_VERSION		2
 #define BABEL_PORT		6696
diff --git a/proto/babel/config.Y b/proto/babel/config.Y
index fa745993..82419b20 100644
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@ -163,8 +163,6 @@ babel_iface_opt_list:
 babel_iface:
   babel_iface_start iface_patt_list_nopx babel_iface_opt_list babel_iface_finish;
 
-dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_BABEL_METRIC); } ;
-
 CF_CLI_HELP(SHOW BABEL, ..., [[Show information about Babel protocol]]);
 
 CF_CLI(SHOW BABEL INTERFACES, optproto opttext, [<name>] [\"<interface>\"], [[Show information about Babel interfaces]])
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index d1e97cd5..1a2104ad 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -1170,7 +1170,6 @@ bfd_show_sessions(struct proto *P)
 struct protocol proto_bfd = {
   .name =		"BFD",
   .template =		"bfd%d",
-  .class =		PROTOCOL_BFD,
   .proto_size =		sizeof(struct bfd_proto),
   .config_size =	sizeof(struct bfd_config),
   .init =		bfd_init,
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 4c67b161..72a4f68a 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -21,6 +21,7 @@
 #include "lib/resource.h"
 #include "lib/string.h"
 #include "lib/unaligned.h"
+#include "lib/macro.h"
 
 #include "bgp.h"
 
@@ -64,28 +65,37 @@
  * format - Optional hook that converts eattr to textual representation.
  */
 
-
-struct bgp_attr_desc {
-  const char *name;
-  uint type;
-  uint flags;
-  void (*export)(struct bgp_export_state *s, eattr *a);
-  int  (*encode)(struct bgp_write_state *s, eattr *a, byte *buf, uint size);
-  void (*decode)(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to);
-  void (*format)(const eattr *ea, byte *buf, uint size);
+union bgp_attr_desc {
+  struct ea_class class;
+  struct {
+    EA_CLASS_INSIDE;
+    uint flags;
+    void (*export)(struct bgp_export_state *s, eattr *a);
+    int  (*encode)(struct bgp_write_state *s, eattr *a, byte *buf, uint size);
+    void (*decode)(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to);
+  };
 };
 
-static const struct bgp_attr_desc bgp_attr_table[];
+static union bgp_attr_desc bgp_attr_table[];
+static inline const union bgp_attr_desc *bgp_find_attr_desc(eattr *a)
+{
+  const struct ea_class *class = ea_class_find(a->id);
 
-static inline int bgp_attr_known(uint code);
+  if ((class < &bgp_attr_table[0].class) || (class >= &bgp_attr_table[BGP_ATTR_MAX].class))
+    return NULL;
+
+  return (const union bgp_attr_desc *) class;
+}
+
+#define BGP_EA_ID(code)	(bgp_attr_table[code].id)
+#define EA_BGP_ID(code)	(((union bgp_attr_desc *) ea_class_find(code)) - bgp_attr_table)
 
 void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
 {
-  ASSERT(bgp_attr_known(code));
+  const union bgp_attr_desc *desc = &bgp_attr_table[code];
 
   ea_set_attr(to, EA_LITERAL_EMBEDDED(
-	EA_CODE(PROTOCOL_BGP, code),
-	bgp_attr_table[code].type,
+	&desc->class,
 	flags & ~BAF_EXT_LEN,
 	val
 	));
@@ -93,11 +103,10 @@ void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
 
 void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad)
 {
-  ASSERT(bgp_attr_known(code));
+  const union bgp_attr_desc *desc = &bgp_attr_table[code];
 
   ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
-	EA_CODE(PROTOCOL_BGP, code),
-	bgp_attr_table[code].type,
+	&desc->class,
 	flags & ~BAF_EXT_LEN,
 	ad
 	));
@@ -106,17 +115,23 @@ void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *a
 void
 bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len)
 {
-  ASSERT(bgp_attr_known(code));
+  const union bgp_attr_desc *desc = &bgp_attr_table[code];
 
   ea_set_attr(to, EA_LITERAL_STORE_ADATA(
-	EA_CODE(PROTOCOL_BGP, code),
-	bgp_attr_table[code].type,
+	&desc->class,
 	flags & ~BAF_EXT_LEN,
 	data,
 	len
 	));
 }
 
+void
+bgp_unset_attr(ea_list **to, uint code)
+{
+  const union bgp_attr_desc *desc = &bgp_attr_table[code];
+  ea_unset_attr(to, 0, &desc->class);
+}
+
 #define REPORT(msg, args...) \
   ({ log(L_REMOTE "%s: " msg, s->proto->p.name, ## args); })
 
@@ -172,7 +187,7 @@ bgp_encode_u8(struct bgp_write_state *s UNUSED, eattr *a, byte *buf, uint size)
   if (size < (3+1))
     return -1;
 
-  bgp_put_attr_hdr3(buf, EA_ID(a->id), a->flags, 1);
+  bgp_put_attr_hdr3(buf, EA_BGP_ID(a->id), a->flags, 1);
   buf[3] = a->u.data;
 
   return 3+1;
@@ -184,7 +199,7 @@ bgp_encode_u32(struct bgp_write_state *s UNUSED, eattr *a, byte *buf, uint size)
   if (size < (3+4))
     return -1;
 
-  bgp_put_attr_hdr3(buf, EA_ID(a->id), a->flags, 4);
+  bgp_put_attr_hdr3(buf, EA_BGP_ID(a->id), a->flags, 4);
   put_u32(buf+3, a->u.data);
 
   return 3+4;
@@ -198,7 +213,7 @@ bgp_encode_u32s(struct bgp_write_state *s UNUSED, eattr *a, byte *buf, uint size
   if (size < (4+len))
     return -1;
 
-  uint hdr = bgp_put_attr_hdr(buf, EA_ID(a->id), a->flags, len);
+  uint hdr = bgp_put_attr_hdr(buf, EA_BGP_ID(a->id), a->flags, len);
   put_u32s(buf + hdr, (u32 *) a->u.ptr->data, len / 4);
 
   return hdr + len;
@@ -219,7 +234,7 @@ bgp_put_attr(byte *buf, uint size, uint code, uint flags, const byte *data, uint
 static int
 bgp_encode_raw(struct bgp_write_state *s UNUSED, eattr *a, byte *buf, uint size)
 {
-  return bgp_put_attr(buf, size, EA_ID(a->id), a->flags, a->u.ptr->data, a->u.ptr->length);
+  return bgp_put_attr(buf, size, EA_BGP_ID(a->id), a->flags, a->u.ptr->data, a->u.ptr->length);
 }
 
 
@@ -359,7 +374,7 @@ bgp_aigp_set_metric(struct linpool *pool, const struct adata *ad, u64 metric)
 int
 bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
 {
-  eattr *a = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AIGP));
+  eattr *a = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_AIGP));
   if (!a)
     return 0;
 
@@ -993,11 +1008,30 @@ bgp_format_mpls_label_stack(const eattr *a, byte *buf, uint size)
   pos[lnum ? -1 : 0] = 0;
 }
 
+static inline void
+bgp_export_unknown(struct bgp_export_state *s UNUSED, eattr *a)
+{
+  if (!(a->flags & BAF_TRANSITIVE))
+    UNSET(a);
+
+  a->flags |= BAF_PARTIAL;
+}
+
 static inline void
 bgp_decode_unknown(struct bgp_parse_state *s UNUSED, uint code, uint flags, byte *data, uint len, ea_list **to)
 {
+  if (!(flags & BAF_OPTIONAL))
+    WITHDRAW("Unknown attribute (code %u) - conflicting flags (%02x)", code, flags);
+
   /* Cannot use bgp_set_attr_data() as it works on known attributes only */
-  ea_set_attr_data(to, EA_CODE(PROTOCOL_BGP, code), flags, T_OPAQUE, data, len);
+  ea_set_attr_data(to, &bgp_attr_table[code].class, flags, data, len);
+}
+
+static inline void
+bgp_format_unknown(const eattr *a, byte *buf, uint size)
+{
+  if (a->flags & BAF_TRANSITIVE)
+    bsnprintf(buf, size, "(transitive)");
 }
 
 
@@ -1005,9 +1039,9 @@ bgp_decode_unknown(struct bgp_parse_state *s UNUSED, uint code, uint flags, byte
  *	Attribute table
  */
 
-static const struct bgp_attr_desc bgp_attr_table[] = {
+static union bgp_attr_desc bgp_attr_table[BGP_ATTR_MAX] = {
   [BA_ORIGIN] = {
-    .name = "origin",
+    .name = "bgp_origin",
     .type = T_ENUM_BGP_ORIGIN,
     .flags = BAF_TRANSITIVE,
     .export = bgp_export_origin,
@@ -1016,14 +1050,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_origin,
   },
   [BA_AS_PATH] = {
-    .name = "as_path",
+    .name = "bgp_path",
     .type = T_PATH,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_as_path,
     .decode = bgp_decode_as_path,
   },
   [BA_NEXT_HOP] = {
-    .name = "next_hop",
+    .name = "bgp_next_hop",
     .type = T_IP,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_next_hop,
@@ -1031,14 +1065,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_next_hop,
   },
   [BA_MULTI_EXIT_DISC] = {
-    .name = "med",
+    .name = "bgp_med",
     .type = T_INT,
     .flags = BAF_OPTIONAL,
     .encode = bgp_encode_u32,
     .decode = bgp_decode_med,
   },
   [BA_LOCAL_PREF] = {
-    .name = "local_pref",
+    .name = "bgp_local_pref",
     .type = T_INT,
     .flags = BAF_TRANSITIVE,
     .export = bgp_export_local_pref,
@@ -1046,14 +1080,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_local_pref,
   },
   [BA_ATOMIC_AGGR] = {
-    .name = "atomic_aggr",
+    .name = "bgp_atomic_aggr",
     .type = T_OPAQUE,
     .flags = BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_atomic_aggr,
   },
   [BA_AGGREGATOR] = {
-    .name = "aggregator",
+    .name = "bgp_aggregator",
     .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_aggregator,
@@ -1061,7 +1095,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_aggregator,
   },
   [BA_COMMUNITY] = {
-    .name = "community",
+    .name = "bgp_community",
     .type = T_CLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_community,
@@ -1069,7 +1103,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_community,
   },
   [BA_ORIGINATOR_ID] = {
-    .name = "originator_id",
+    .name = "bgp_originator_id",
     .type = T_QUAD,
     .flags = BAF_OPTIONAL,
     .export = bgp_export_originator_id,
@@ -1077,7 +1111,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_originator_id,
   },
   [BA_CLUSTER_LIST] = {
-    .name = "cluster_list",
+    .name = "bgp_cluster_list",
     .type = T_CLIST,
     .flags = BAF_OPTIONAL,
     .export = bgp_export_cluster_list,
@@ -1086,19 +1120,19 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_cluster_list,
   },
   [BA_MP_REACH_NLRI] = {
-    .name = "mp_reach_nlri",
+    .name = "bgp_mp_reach_nlri",
     .type = T_OPAQUE,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_reach_nlri,
   },
   [BA_MP_UNREACH_NLRI] = {
-    .name = "mp_unreach_nlri",
+    .name = "bgp_mp_unreach_nlri",
     .type = T_OPAQUE,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_unreach_nlri,
   },
   [BA_EXT_COMMUNITY] = {
-    .name = "ext_community",
+    .name = "bgp_ext_community",
     .type = T_ECLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_ext_community,
@@ -1106,14 +1140,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_ext_community,
   },
   [BA_AS4_PATH] = {
-    .name = "as4_path",
+    .name = "bgp_as4_path",
     .type = T_PATH,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_as4_path,
   },
   [BA_AS4_AGGREGATOR] = {
-    .name = "as4_aggregator",
+    .name = "bgp_as4_aggregator",
     .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
@@ -1121,7 +1155,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_aggregator,
   },
   [BA_AIGP] = {
-    .name = "aigp",
+    .name = "bgp_aigp",
     .type = T_OPAQUE,
     .flags = BAF_OPTIONAL | BAF_DECODE_FLAGS,
     .export = bgp_export_aigp,
@@ -1130,7 +1164,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .format = bgp_format_aigp,
   },
   [BA_LARGE_COMMUNITY] = {
-    .name = "large_community",
+    .name = "bgp_large_community",
     .type = T_LCLIST,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_large_community,
@@ -1138,8 +1172,9 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_large_community,
   },
   [BA_MPLS_LABEL_STACK] = {
-    .name = "mpls_label_stack",
+    .name = "bgp_mpls_label_stack",
     .type = T_CLIST,
+    .readonly = 1,
     .export = bgp_export_mpls_label_stack,
     .encode = bgp_encode_mpls_label_stack,
     .decode = bgp_decode_mpls_label_stack,
@@ -1147,12 +1182,32 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
 };
 
-static inline int
-bgp_attr_known(uint code)
+eattr *
+bgp_find_attr(ea_list *attrs, uint code)
 {
-  return (code < ARRAY_SIZE(bgp_attr_table)) && bgp_attr_table[code].name;
+  return ea_find(attrs, BGP_EA_ID(code));
 }
 
+void
+bgp_register_attrs(void)
+{
+  for (uint i=0; i<ARRAY_SIZE(bgp_attr_table); i++)
+  {
+    if (!bgp_attr_table[i].name)
+      bgp_attr_table[i] = (union bgp_attr_desc) {
+	.name = mb_sprintf(&root_pool, "bgp_unknown_0x%02x", i),
+	.type = T_OPAQUE,
+	.flags = BAF_OPTIONAL,
+	.readonly = 1,
+	.export = bgp_export_unknown,
+	.encode = bgp_encode_raw,
+	.decode = bgp_decode_unknown,
+	.format = bgp_format_unknown,
+      };
+
+    ea_register_init(&bgp_attr_table[i].class);
+  }
+}
 
 /*
  *	Attribute export
@@ -1161,38 +1216,24 @@ bgp_attr_known(uint code)
 static inline void
 bgp_export_attr(struct bgp_export_state *s, eattr *a, ea_list *to)
 {
-  if (EA_PROTO(a->id) != PROTOCOL_BGP)
+  const union bgp_attr_desc *desc = bgp_find_attr_desc(a);
+  if (!desc)
     return;
 
-  uint code = EA_ID(a->id);
-
-  if (bgp_attr_known(code))
-  {
-    const struct bgp_attr_desc *desc = &bgp_attr_table[code];
-
-    /* The flags might have been zero if the attr was added by filters */
-    a->flags = (a->flags & BAF_PARTIAL) | desc->flags;
-
-    /* Set partial bit if new opt-trans attribute is attached to non-local route */
-    if ((s->src != NULL) && (a->originated) &&
-	(a->flags & BAF_OPTIONAL) && (a->flags & BAF_TRANSITIVE))
-      a->flags |= BAF_PARTIAL;
-
-    /* Call specific hook */
-    CALL(desc->export, s, a);
-
-    /* Attribute might become undefined in hook */
-    if (a->undef)
-      return;
-  }
-  else
-  {
-    /* Don't re-export unknown non-transitive attributes */
-    if (!(a->flags & BAF_TRANSITIVE))
-      return;
+  /* The flags might have been zero if the attr was added locally */
+  a->flags = (a->flags & BAF_PARTIAL) | desc->flags;
 
+  /* Set partial bit if new opt-trans attribute is attached to non-local route */
+  if ((s->src != NULL) && (a->originated) &&
+      (a->flags & BAF_OPTIONAL) && (a->flags & BAF_TRANSITIVE))
     a->flags |= BAF_PARTIAL;
-  }
+
+  /* Call specific hook */
+  CALL(desc->export, s, a);
+
+  /* Attribute might become undefined in hook */
+  if (a->undef)
+    return;
 
   /* Append updated attribute */
   to->attrs[to->count++] = *a;
@@ -1240,14 +1281,9 @@ bgp_export_attrs(struct bgp_export_state *s, const ea_list *a)
 static inline int
 bgp_encode_attr(struct bgp_write_state *s, eattr *a, byte *buf, uint size)
 {
-  ASSERT(EA_PROTO(a->id) == PROTOCOL_BGP);
-
-  uint code = EA_ID(a->id);
-
-  if (bgp_attr_known(code))
-    return bgp_attr_table[code].encode(s, a, buf, size);
-  else
-    return bgp_encode_raw(s, a, buf, size);
+  const union bgp_attr_desc *desc = bgp_find_attr_desc(a);
+  ASSERT_DIE(desc);
+  return desc->encode(s, a, buf, size);
 }
 
 /**
@@ -1312,7 +1348,7 @@ bgp_cluster_list_loopy(struct bgp_proto *p, ea_list *attrs)
 }
 
 static inline void
-bgp_decode_attr(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to)
+bgp_decode_attr(struct bgp_parse_state *s, byte code, byte flags, byte *data, uint len, ea_list **to)
 {
   /* Handle duplicate attributes; RFC 7606 3 (g) */
   if (BIT32_TEST(s->attrs_seen, code))
@@ -1324,24 +1360,15 @@ bgp_decode_attr(struct bgp_parse_state *s, uint code, uint flags, byte *data, ui
   }
   BIT32_SET(s->attrs_seen, code);
 
-  if (bgp_attr_known(code))
-  {
-    const struct bgp_attr_desc *desc = &bgp_attr_table[code];
+  ASSERT_DIE(bgp_attr_table[code].id);
+  const union bgp_attr_desc *desc = &bgp_attr_table[code];
 
-    /* Handle conflicting flags; RFC 7606 3 (c) */
-    if (((flags ^ desc->flags) & (BAF_OPTIONAL | BAF_TRANSITIVE)) &&
-	!(desc->flags & BAF_DECODE_FLAGS))
-      WITHDRAW("Malformed %s attribute - conflicting flags (%02x)", desc->name, flags);
+  /* Handle conflicting flags; RFC 7606 3 (c) */
+  if (((flags ^ desc->flags) & (BAF_OPTIONAL | BAF_TRANSITIVE)) &&
+      !(desc->flags & BAF_DECODE_FLAGS))
+    WITHDRAW("Malformed %s attribute - conflicting flags (%02x, expected %02x)", desc->name, flags, desc->flags);
 
-    desc->decode(s, code, flags, data, len, to);
-  }
-  else /* Unknown attribute */
-  {
-    if (!(flags & BAF_OPTIONAL))
-      WITHDRAW("Unknown attribute (code %u) - conflicting flags (%02x)", code, flags);
-
-    bgp_decode_unknown(s, code, flags, data, len, to);
-  }
+  desc->decode(s, code, flags, data, len, to);
 }
 
 /**
@@ -1359,7 +1386,8 @@ bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len)
 {
   struct bgp_proto *p = s->proto;
   ea_list *attrs = NULL;
-  uint code, flags, alen;
+  uint alen;
+  byte code, flags;
   byte *pos = data;
 
   /* Parse the attributes */
@@ -1703,7 +1731,7 @@ bgp_preexport(struct proto *P, rte *e)
   /* Handle well-known communities, RFC 1997 */
   struct eattr *c;
   if (p->cf->interpret_communities &&
-      (c = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY))))
+      (c = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY))))
   {
     const struct adata *d = c->u.ptr;
 
@@ -1880,7 +1908,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old)
 static inline u32
 bgp_get_neighbor(rte *r)
 {
-  eattr *e = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+  eattr *e = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
   u32 as;
 
   if (e && as_path_get_first_regular(e->u.ptr, &as))
@@ -1901,7 +1929,7 @@ rte_stale(rte *r)
     return 0;
 
   /* If staleness is unknown, compute and cache it */
-  eattr *a = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
+  eattr *a = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY));
   if (a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE))
   {
     r->pflags |= BGP_REF_STALE;
@@ -1947,8 +1975,8 @@ bgp_rte_better(rte *new, rte *old)
     return 1;
 
  /* Start with local preferences */
-  x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
-  y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
+  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
+  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
   n = x ? x->u.data : new_bgp->cf->default_local_pref;
   o = y ? y->u.data : old_bgp->cf->default_local_pref;
   if (n > o)
@@ -1967,8 +1995,8 @@ bgp_rte_better(rte *new, rte *old)
   /* RFC 4271 9.1.2.2. a)  Use AS path lengths */
   if (new_bgp->cf->compare_path_lengths || old_bgp->cf->compare_path_lengths)
   {
-    x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
-    y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+    x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+    y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
     n = x ? as_path_getlen(x->u.ptr) : AS_PATH_MAXLEN;
     o = y ? as_path_getlen(y->u.ptr) : AS_PATH_MAXLEN;
     if (n < o)
@@ -1978,8 +2006,8 @@ bgp_rte_better(rte *new, rte *old)
   }
 
   /* RFC 4271 9.1.2.2. b) Use origins */
-  x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
-  y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
+  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
+  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
   n = x ? x->u.data : ORIGIN_INCOMPLETE;
   o = y ? y->u.data : ORIGIN_INCOMPLETE;
   if (n < o)
@@ -2001,8 +2029,8 @@ bgp_rte_better(rte *new, rte *old)
   if (new_bgp->cf->med_metric || old_bgp->cf->med_metric ||
       (bgp_get_neighbor(new) == bgp_get_neighbor(old)))
   {
-    x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC));
-    y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC));
+    x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
     n = x ? x->u.data : new_bgp->cf->default_med;
     o = y ? y->u.data : old_bgp->cf->default_med;
     if (n < o)
@@ -2027,8 +2055,8 @@ bgp_rte_better(rte *new, rte *old)
 
   /* RFC 4271 9.1.2.2. f) Compare BGP identifiers */
   /* RFC 4456 9. a) Use ORIGINATOR_ID instead of local neighbor ID */
-  x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID));
-  y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID));
+  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_ORIGINATOR_ID));
+  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_ORIGINATOR_ID));
   n = x ? x->u.data : new_bgp->remote_id;
   o = y ? y->u.data : old_bgp->remote_id;
 
@@ -2045,8 +2073,8 @@ bgp_rte_better(rte *new, rte *old)
     return 0;
 
   /* RFC 4456 9. b) Compare cluster list lengths */
-  x = ea_find(new->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST));
-  y = ea_find(old->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST));
+  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_CLUSTER_LIST));
+  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_CLUSTER_LIST));
   n = x ? int_set_get_size(x->u.ptr) : 0;
   o = y ? int_set_get_size(y->u.ptr) : 0;
   if (n < o)
@@ -2080,8 +2108,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
     return 0;
 
   /* Start with local preferences */
-  x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
-  y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
+  x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
+  y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
   p = x ? x->u.data : pri_bgp->cf->default_local_pref;
   s = y ? y->u.data : sec_bgp->cf->default_local_pref;
   if (p != s)
@@ -2090,8 +2118,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   /* RFC 4271 9.1.2.2. a)  Use AS path lengths */
   if (pri_bgp->cf->compare_path_lengths || sec_bgp->cf->compare_path_lengths)
   {
-    x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
-    y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+    x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+    y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
     p = x ? as_path_getlen(x->u.ptr) : AS_PATH_MAXLEN;
     s = y ? as_path_getlen(y->u.ptr) : AS_PATH_MAXLEN;
 
@@ -2103,8 +2131,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   }
 
   /* RFC 4271 9.1.2.2. b) Use origins */
-  x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
-  y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
+  x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
+  y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
   p = x ? x->u.data : ORIGIN_INCOMPLETE;
   s = y ? y->u.data : ORIGIN_INCOMPLETE;
   if (p != s)
@@ -2114,8 +2142,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   if (pri_bgp->cf->med_metric || sec_bgp->cf->med_metric ||
       (bgp_get_neighbor(pri) == bgp_get_neighbor(sec)))
   {
-    x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC));
-    y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC));
+    x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
     p = x ? x->u.data : pri_bgp->cf->default_med;
     s = y ? y->u.data : sec_bgp->cf->default_med;
     if (p != s)
@@ -2281,7 +2309,7 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 struct rte *
 bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
 {
-  eattr *a = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
+  eattr *a = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY));
   const struct adata *ad = a ? a->u.ptr : NULL;
   uint flags = a ? a->flags : BAF_PARTIAL;
 
@@ -2346,37 +2374,11 @@ bgp_process_as4_attrs(ea_list **attrs, struct linpool *pool)
   }
 }
 
-int
-bgp_get_attr(const eattr *a, byte *buf, int buflen)
-{
-  uint i = EA_ID(a->id);
-  const struct bgp_attr_desc *d;
-  int len;
-
-  if (bgp_attr_known(i))
-  {
-    d = &bgp_attr_table[i];
-    len = bsprintf(buf, "%s", d->name);
-    buf += len;
-    if (d->format)
-    {
-      *buf++ = ':';
-      *buf++ = ' ';
-      d->format(a, buf, buflen - len - 2);
-      return GA_FULL;
-    }
-    return GA_NAME;
-  }
-
-  bsprintf(buf, "%02x%s", i, (a->flags & BAF_TRANSITIVE) ? " [t]" : "");
-  return GA_NAME;
-}
-
 void
 bgp_get_route_info(rte *e, byte *buf)
 {
-  eattr *p = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
-  eattr *o = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
+  eattr *p = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+  eattr *o = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
   u32 origas;
 
   buf += bsprintf(buf, " (%d", e->attrs->pref);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index aec78a45..bd4c68b7 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -2576,7 +2576,6 @@ struct channel_class channel_bgp = {
 struct protocol proto_bgp = {
   .name = 		"BGP",
   .template = 		"bgp%d",
-  .class =		PROTOCOL_BGP,
   .preference = 	DEF_PREF_BGP,
   .channel_mask =	NB_IP | NB_VPN | NB_FLOW,
   .proto_size =		sizeof(struct bgp_proto),
@@ -2588,7 +2587,6 @@ struct protocol proto_bgp = {
   .reconfigure = 	bgp_reconfigure,
   .copy_config = 	bgp_copy_config,
   .get_status = 	bgp_get_status,
-  .get_attr = 		bgp_get_attr,
   .get_route_info = 	bgp_get_route_info,
   .show_proto_info = 	bgp_show_proto_info
 };
@@ -2596,4 +2594,5 @@ struct protocol proto_bgp = {
 void bgp_build(void)
 {
   proto_build(&proto_bgp);
+  bgp_register_attrs();
 }
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index de5bd836..e04e3bd0 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -538,17 +538,13 @@ rte_resolvable(rte *rt)
 
 /* attrs.c */
 
-static inline eattr *
-bgp_find_attr(ea_list *attrs, uint code)
-{
-  return ea_find(attrs, EA_CODE(PROTOCOL_BGP, code));
-}
+eattr *
+bgp_find_attr(ea_list *attrs, uint code);
 
 void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val);
 void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad);
 void bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len);
-
-#define bgp_unset_attr(to, code) ea_unset_attr(to, 0, code)
+void bgp_unset_attr(ea_list **to, uint code);
 
 int bgp_encode_mp_reach_mrt(struct bgp_write_state *s, eattr *a, byte *buf, uint size);
 
@@ -573,7 +569,6 @@ struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
 u32 bgp_rte_igp_metric(struct rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old);
 int bgp_preexport(struct proto *, struct rte *);
-int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
 void bgp_get_route_info(struct rte *, byte *buf);
 int bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad);
 
@@ -590,6 +585,8 @@ bgp_total_aigp_metric(rte *r)
   return metric;
 }
 
+void bgp_register_attrs(void);
+
 
 /* packets.c */
 
@@ -626,26 +623,31 @@ void bgp_update_next_hop(struct bgp_export_state *s, eattr *a, ea_list **to);
 
 #define BAF_DECODE_FLAGS	0x0100	/* Private flag - attribute flags are handled by the decode hook */
 
-#define BA_ORIGIN		0x01	/* RFC 4271 */		/* WM */
-#define BA_AS_PATH		0x02				/* WM */
-#define BA_NEXT_HOP		0x03				/* WM */
-#define BA_MULTI_EXIT_DISC	0x04				/* ON */
-#define BA_LOCAL_PREF		0x05				/* WD */
-#define BA_ATOMIC_AGGR		0x06				/* WD */
-#define BA_AGGREGATOR		0x07				/* OT */
-#define BA_COMMUNITY		0x08	/* RFC 1997 */		/* OT */
-#define BA_ORIGINATOR_ID	0x09	/* RFC 4456 */		/* ON */
-#define BA_CLUSTER_LIST		0x0a	/* RFC 4456 */		/* ON */
-#define BA_MP_REACH_NLRI	0x0e	/* RFC 4760 */
-#define BA_MP_UNREACH_NLRI	0x0f	/* RFC 4760 */
-#define BA_EXT_COMMUNITY	0x10	/* RFC 4360 */
-#define BA_AS4_PATH             0x11	/* RFC 6793 */
-#define BA_AS4_AGGREGATOR       0x12	/* RFC 6793 */
-#define BA_AIGP			0x1a	/* RFC 7311 */
-#define BA_LARGE_COMMUNITY	0x20	/* RFC 8092 */
+enum bgp_attr_id {
+  BA_ORIGIN		= 0x01,	/* RFC 4271 */		/* WM */
+  BA_AS_PATH		= 0x02,				/* WM */
+  BA_NEXT_HOP		= 0x03,				/* WM */
+  BA_MULTI_EXIT_DISC	= 0x04,				/* ON */
+  BA_LOCAL_PREF		= 0x05,				/* WD */
+  BA_ATOMIC_AGGR	= 0x06,				/* WD */
+  BA_AGGREGATOR		= 0x07,				/* OT */
+  BA_COMMUNITY		= 0x08,	/* RFC 1997 */		/* OT */
+  BA_ORIGINATOR_ID	= 0x09,	/* RFC 4456 */		/* ON */
+  BA_CLUSTER_LIST	= 0x0a,	/* RFC 4456 */		/* ON */
+  BA_MP_REACH_NLRI	= 0x0e,	/* RFC 4760 */
+  BA_MP_UNREACH_NLRI	= 0x0f,	/* RFC 4760 */
+  BA_EXT_COMMUNITY	= 0x10,	/* RFC 4360 */
+  BA_AS4_PATH		= 0x11,	/* RFC 6793 */
+  BA_AS4_AGGREGATOR	= 0x12,	/* RFC 6793 */
+  BA_AIGP		= 0x1a,	/* RFC 7311 */
+  BA_LARGE_COMMUNITY	= 0x20,	/* RFC 8092 */
 
 /* Bird's private internal BGP attributes */
-#define BA_MPLS_LABEL_STACK	0xfe	/* MPLS label stack transfer attribute */
+  BA_MPLS_LABEL_STACK	= 0x100, /* MPLS label stack transfer attribute */
+
+/* Maximum */
+  BGP_ATTR_MAX,
+};
 
 /* BGP connection states */
 
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 6a78f79b..db261bbb 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -316,36 +316,6 @@ bgp_channel_end:
 
 bgp_proto_channel: bgp_channel_start bgp_channel_opt_list bgp_channel_end;
 
-
-dynamic_attr: BGP_ORIGIN
-	{ $$ = f_new_dynamic_attr(T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
-dynamic_attr: BGP_PATH
-	{ $$ = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
-dynamic_attr: BGP_NEXT_HOP
-	{ $$ = f_new_dynamic_attr(T_IP, EA_CODE(PROTOCOL_BGP, BA_NEXT_HOP)); } ;
-dynamic_attr: BGP_MED
-	{ $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC)); } ;
-dynamic_attr: BGP_LOCAL_PREF
-	{ $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
-dynamic_attr: BGP_ATOMIC_AGGR
-	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
-dynamic_attr: BGP_AGGREGATOR
-	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
-dynamic_attr: BGP_COMMUNITY
-	{ $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
-dynamic_attr: BGP_ORIGINATOR_ID
-	{ $$ = f_new_dynamic_attr(T_QUAD, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID)); } ;
-dynamic_attr: BGP_CLUSTER_LIST
-	{ $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST)); } ;
-dynamic_attr: BGP_EXT_COMMUNITY
-	{ $$ = f_new_dynamic_attr(T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
-dynamic_attr: BGP_AIGP
-	{ $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
-dynamic_attr: BGP_LARGE_COMMUNITY
-	{ $$ = f_new_dynamic_attr(T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
-
-
-
 CF_ENUM(T_ENUM_BGP_ORIGIN, ORIGIN_, IGP, EGP, INCOMPLETE)
 
 CF_CODE
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index c595f298..e45f7cb7 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -907,7 +907,6 @@ mrt_copy_config(struct proto_config *dest UNUSED, struct proto_config *src UNUSE
 struct protocol proto_mrt = {
   .name =		"MRT",
   .template =		"mrt%d",
-  .class =		PROTOCOL_MRT,
   .proto_size =		sizeof(struct mrt_proto),
   .config_size =	sizeof(struct mrt_config),
   .init =		mrt_init,
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index a8972d2c..136e1dcb 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -505,11 +505,6 @@ ospf_iface:
   ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); }
  ;
 
-dynamic_attr: OSPF_METRIC1 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC1); } ;
-dynamic_attr: OSPF_METRIC2 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC2); } ;
-dynamic_attr: OSPF_TAG { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_TAG); } ;
-dynamic_attr: OSPF_ROUTER_ID { $$ = f_new_dynamic_attr(T_QUAD, EA_OSPF_ROUTER_ID); } ;
-
 CF_CLI_HELP(SHOW OSPF, ..., [[Show information about OSPF protocol]]);
 CF_CLI(SHOW OSPF, optproto, [<name>], [[Show information about OSPF protocol]])
 { PROTO_WALK_CMD($3, &proto_ospf, p) ospf_sh(p); };
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index d8bcc838..66d0eba6 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -106,6 +106,7 @@
 
 #include <stdlib.h>
 #include "ospf.h"
+#include "lib/macro.h"
 
 static int ospf_preexport(struct proto *P, rte *new);
 static void ospf_reload_routes(struct channel *C);
@@ -386,7 +387,7 @@ ospf_init(struct proto_config *CF)
 static int
 ospf_rte_better(struct rte *new, struct rte *old)
 {
-  u32 new_metric1 = ea_get_int(new->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY);
+  u32 new_metric1 = ea_get_int(new->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
 
   if (new_metric1 == LSINFINITY)
     return 0;
@@ -396,13 +397,13 @@ ospf_rte_better(struct rte *new, struct rte *old)
 
   if(new->attrs->source == RTS_OSPF_EXT2)
   {
-    u32 old_metric2 = ea_get_int(old->attrs->eattrs, EA_OSPF_METRIC2, LSINFINITY);
-    u32 new_metric2 = ea_get_int(new->attrs->eattrs, EA_OSPF_METRIC2, LSINFINITY);
+    u32 old_metric2 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
+    u32 new_metric2 = ea_get_int(new->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
     if(new_metric2 < old_metric2) return 1;
     if(new_metric2 > old_metric2) return 0;
   }
 
-  u32 old_metric1 = ea_get_int(old->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY);
+  u32 old_metric1 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
   if (new_metric1 < old_metric1)
     return 1;
 
@@ -415,7 +416,7 @@ ospf_rte_igp_metric(struct rte *rt)
   if (rt->attrs->source == RTS_OSPF_EXT2)
     return IGP_METRIC_UNKNOWN;
 
-  return ea_get_int(rt->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY);
+  return ea_get_int(rt->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
 }
 
 void
@@ -587,42 +588,26 @@ ospf_get_route_info(rte * rte, byte * buf)
   }
 
   buf += bsprintf(buf, " %s", type);
-  buf += bsprintf(buf, " (%d/%d", rte->attrs->pref, ea_get_int(rte->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY));
+  buf += bsprintf(buf, " (%d/%d", rte->attrs->pref, ea_get_int(rte->attrs->eattrs, &ea_ospf_metric1, LSINFINITY));
   if (rte->attrs->source == RTS_OSPF_EXT2)
-    buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs->eattrs, EA_OSPF_METRIC2, LSINFINITY));
+    buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs->eattrs, &ea_ospf_metric2, LSINFINITY));
   buf += bsprintf(buf, ")");
   if (rte->attrs->source == RTS_OSPF_EXT1 || rte->attrs->source == RTS_OSPF_EXT2)
   {
-    eattr *ea = ea_find(rte->attrs->eattrs, EA_OSPF_TAG);
+    eattr *ea = ea_find(rte->attrs->eattrs, &ea_ospf_tag);
     if (ea && (ea->u.data > 0))
       buf += bsprintf(buf, " [%x]", ea->u.data);
   }
   
-  eattr *ea = ea_find(rte->attrs->eattrs, EA_OSPF_ROUTER_ID);
+  eattr *ea = ea_find(rte->attrs->eattrs, &ea_ospf_router_id);
   if (ea)
     buf += bsprintf(buf, " [%R]", ea->u.data);
 }
 
-static int
-ospf_get_attr(const eattr * a, byte * buf, int buflen UNUSED)
+static void
+ospf_tag_format(const eattr * a, byte * buf, uint buflen)
 {
-  switch (a->id)
-  {
-  case EA_OSPF_METRIC1:
-    bsprintf(buf, "metric1");
-    return GA_NAME;
-  case EA_OSPF_METRIC2:
-    bsprintf(buf, "metric2");
-    return GA_NAME;
-  case EA_OSPF_TAG:
-    bsprintf(buf, "tag: 0x%08x", a->u.data);
-    return GA_FULL;
-  case EA_OSPF_ROUTER_ID:
-    bsprintf(buf, "router_id");
-    return GA_NAME;
-  default:
-    return GA_UNKNOWN;
-  }
+  bsnprintf(buf, buflen, "0x%08x", a->u.data);
 }
 
 static void
@@ -1520,7 +1505,6 @@ ospf_sh_lsadb(struct lsadb_show_data *ld)
 struct protocol proto_ospf = {
   .name =		"OSPF",
   .template =		"ospf%d",
-  .class =		PROTOCOL_OSPF,
   .preference =		DEF_PREF_OSPF,
   .channel_mask =	NB_IP,
   .proto_size =		sizeof(struct ospf_proto),
@@ -1531,12 +1515,39 @@ struct protocol proto_ospf = {
   .shutdown =		ospf_shutdown,
   .reconfigure =	ospf_reconfigure,
   .get_status =		ospf_get_status,
-  .get_attr =		ospf_get_attr,
   .get_route_info =	ospf_get_route_info
 };
 
+struct ea_class ea_ospf_metric1 = {
+  .name = "ospf_metric1",
+  .type = T_INT,
+};
+
+struct ea_class ea_ospf_metric2 = {
+  .name = "ospf_metric2",
+  .type = T_INT,
+};
+
+struct ea_class ea_ospf_tag = {
+  .name = "ospf_tag",
+  .type = T_INT,
+  .format = ospf_tag_format,
+};
+
+struct ea_class ea_ospf_router_id = {
+  .name = "ospf_router_id",
+  .type = T_QUAD,
+};
+
 void
 ospf_build(void)
 {
   proto_build(&proto_ospf);
+
+  EA_REGISTER_ALL(
+      &ea_ospf_metric1,
+      &ea_ospf_metric2,
+      &ea_ospf_tag,
+      &ea_ospf_router_id
+  );
 }
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3d0d57d9..7bed5c85 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -939,12 +939,7 @@ struct lsadb_show_data {
   u32 router;		/* Advertising router, 0 -> all */
 };
 
-
-#define EA_OSPF_METRIC1	EA_CODE(PROTOCOL_OSPF, 0)
-#define EA_OSPF_METRIC2	EA_CODE(PROTOCOL_OSPF, 1)
-#define EA_OSPF_TAG	EA_CODE(PROTOCOL_OSPF, 2)
-#define EA_OSPF_ROUTER_ID EA_CODE(PROTOCOL_OSPF, 3)
-
+extern struct ea_class ea_ospf_metric1, ea_ospf_metric2, ea_ospf_tag, ea_ospf_router_id;
 
 /*
  * For regular networks, neighbor address must match network prefix.
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 5969b7c7..55bad599 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2075,18 +2075,18 @@ again1:
 	eattrs.l = (ea_list) {};
 
 	eattrs.a[eattrs.l.count++] =
-	  EA_LITERAL_EMBEDDED(EA_OSPF_METRIC1, T_INT, 0, nf->n.metric1);
+	  EA_LITERAL_EMBEDDED(&ea_ospf_metric1, 0, nf->n.metric1);
 
 	if (nf->n.type == RTS_OSPF_EXT2)
 	  eattrs.a[eattrs.l.count++] =
-	    EA_LITERAL_EMBEDDED(EA_OSPF_METRIC2, T_INT, 0, nf->n.metric2);
+	    EA_LITERAL_EMBEDDED(&ea_ospf_metric2, 0, nf->n.metric2);
 
 	if ((nf->n.type == RTS_OSPF_EXT1) || (nf->n.type == RTS_OSPF_EXT2))
 	  eattrs.a[eattrs.l.count++] =
-	    EA_LITERAL_EMBEDDED(EA_OSPF_TAG, T_INT, 0, nf->n.tag);
+	    EA_LITERAL_EMBEDDED(&ea_ospf_tag, 0, nf->n.tag);
 
 	eattrs.a[eattrs.l.count++] =
-	  EA_LITERAL_EMBEDDED(EA_OSPF_ROUTER_ID, T_QUAD, 0, nf->n.rid);
+	  EA_LITERAL_EMBEDDED(&ea_ospf_router_id, 0, nf->n.rid);
 
 	a0.eattrs = &eattrs.l;
 
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 9fe68264..db423dc8 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -1338,8 +1338,8 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
 
   /* Get route attributes */
   rta *a = new->attrs;
-  eattr *m1a = ea_find(a->eattrs, EA_OSPF_METRIC1);
-  eattr *m2a = ea_find(a->eattrs, EA_OSPF_METRIC2);
+  eattr *m1a = ea_find(a->eattrs, &ea_ospf_metric1);
+  eattr *m2a = ea_find(a->eattrs, &ea_ospf_metric2);
   uint m1 = m1a ? m1a->u.data : 0;
   uint m2 = m2a ? m2a->u.data : 10000;
 
@@ -1363,7 +1363,7 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
 
   uint ebit = m2a || !m1a;
   uint metric = ebit ? m2 : m1;
-  uint tag = ea_get_int(a->eattrs, EA_OSPF_TAG, 0);
+  uint tag = ea_get_int(a->eattrs, &ea_ospf_tag, 0);
 
   ip_addr fwd = IPA_NONE;
   if ((a->dest == RTD_UNICAST) && use_gw_for_fwaddr(p, a->nh.gw, a->nh.iface))
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index dde7e473..2978100b 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -306,7 +306,6 @@ perf_copy_config(struct proto_config *dest UNUSED, struct proto_config *src UNUS
 struct protocol proto_perf = {
   .name = 		"Perf",
   .template =		"perf%d",
-  .class =		PROTOCOL_PERF,
   .channel_mask = 	NB_IP,
   .proto_size =		sizeof(struct perf_proto),
   .config_size = 	sizeof(struct perf_config),
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 483ece67..7a39beff 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -293,7 +293,6 @@ pipe_update_debug(struct proto *P)
 struct protocol proto_pipe = {
   .name =		"Pipe",
   .template =		"pipe%d",
-  .class =		PROTOCOL_PIPE,
   .proto_size =		sizeof(struct pipe_proto),
   .config_size =	sizeof(struct pipe_config),
   .postconfig =		pipe_postconfig,
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index 0a339cb4..f40fdcca 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -336,9 +336,6 @@ radv_sensitive:
  | SENSITIVE bool { $$ = $2; }
  ;
 
-dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
-dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(T_INT, EA_RA_LIFETIME); } ;
-
 CF_CODE
 
 CF_END
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 7985997a..5734dbc9 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include "radv.h"
+#include "lib/macro.h"
 
 /**
  * DOC: Router Advertisements
@@ -42,6 +43,8 @@
  * RFC 6106 - DNS extensions (RDDNS, DNSSL)
  */
 
+static struct ea_class ea_radv_preference, ea_radv_lifetime;
+
 static void radv_prune_prefixes(struct radv_iface *ifa);
 static void radv_prune_routes(struct radv_proto *p);
 
@@ -444,11 +447,11 @@ radv_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   {
     /* Update */
 
-    ea = ea_find(new->attrs->eattrs, EA_RA_PREFERENCE);
+    ea = ea_find(new->attrs->eattrs, &ea_radv_preference);
     uint preference = ea ? ea->u.data : RA_PREF_MEDIUM;
     uint preference_set = !!ea;
 
-    ea = ea_find(new->attrs->eattrs, EA_RA_LIFETIME);
+    ea = ea_find(new->attrs->eattrs, &ea_radv_lifetime);
     uint lifetime = ea ? ea->u.data : 0;
     uint lifetime_set = !!ea;
 
@@ -738,27 +741,26 @@ radv_pref_str(u32 pref)
   }
 }
 
-/* The buffer has some minimal size */
-static int
-radv_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
+static void
+radv_preference_format(const eattr *a, byte *buf, uint buflen)
 {
-  switch (a->id)
-  {
-  case EA_RA_PREFERENCE:
-    bsprintf(buf, "preference: %s", radv_pref_str(a->u.data));
-    return GA_FULL;
-  case EA_RA_LIFETIME:
-    bsprintf(buf, "lifetime");
-    return GA_NAME;
-  default:
-    return GA_UNKNOWN;
-  }
+  bsnprintf(buf, buflen, "%s", radv_pref_str(a->u.data));
 }
 
+static struct ea_class ea_radv_preference = {
+  .name = "radv_preference",
+  .type = T_ENUM_RA_PREFERENCE,
+  .format = radv_preference_format,
+};
+
+static struct ea_class ea_radv_lifetime = {
+  .name = "radv_lifetime",
+  .type = T_INT,
+};
+
 struct protocol proto_radv = {
   .name =		"RAdv",
   .template =		"radv%d",
-  .class =		PROTOCOL_RADV,
   .channel_mask =	NB_IP6,
   .proto_size =		sizeof(struct radv_proto),
   .config_size =	sizeof(struct radv_config),
@@ -769,11 +771,15 @@ struct protocol proto_radv = {
   .reconfigure =	radv_reconfigure,
   .copy_config =	radv_copy_config,
   .get_status =		radv_get_status,
-  .get_attr =		radv_get_attr
 };
 
 void
 radv_build(void)
 {
   proto_build(&proto_radv);
+
+  EA_REGISTER_ALL(
+      &ea_radv_preference,
+      &ea_radv_lifetime
+      );
 }
diff --git a/proto/radv/radv.h b/proto/radv/radv.h
index 5cca3aca..c9219bda 100644
--- a/proto/radv/radv.h
+++ b/proto/radv/radv.h
@@ -195,10 +195,6 @@ struct radv_iface
 #define RA_PREF_HIGH	0x08
 #define RA_PREF_MASK	0x18
 
-/* Attributes */
-#define EA_RA_PREFERENCE	EA_CODE(PROTOCOL_RADV, 0)
-#define EA_RA_LIFETIME		EA_CODE(PROTOCOL_RADV, 1)
-
 #ifdef LOCAL_DEBUG
 #define RADV_FORCE_DEBUG 1
 #else
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 3934d337..234e9029 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -190,9 +190,6 @@ rip_iface:
   rip_iface_start iface_patt_list_nopx rip_iface_opt_list rip_iface_finish;
 
 
-dynamic_attr: RIP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_RIP_METRIC); } ;
-dynamic_attr: RIP_TAG { $$ = f_new_dynamic_attr(T_INT, EA_RIP_TAG); } ;
-
 CF_CLI_HELP(SHOW RIP, ..., [[Show information about RIP protocol]]);
 
 CF_CLI(SHOW RIP INTERFACES, optproto opttext, [<name>] [\"<interface>\"], [[Show information about RIP interfaces]])
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 2b5babcb..52a3bd2c 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -78,6 +78,7 @@
 
 #include <stdlib.h>
 #include "rip.h"
+#include "lib/macro.h"
 
 
 static inline void rip_lock_neighbor(struct rip_neighbor *n);
@@ -88,6 +89,7 @@ static inline void rip_iface_kick_timer(struct rip_iface *ifa);
 static void rip_iface_timer(timer *timer);
 static void rip_trigger_update(struct rip_proto *p);
 
+static struct ea_class ea_rip_metric, ea_rip_tag, ea_rip_from;
 
 /*
  *	RIP routes
@@ -200,9 +202,9 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
     } ea_block = {
       .l.count = 3,
       .a = {
-	EA_LITERAL_EMBEDDED(EA_RIP_METRIC, T_INT, 0, rt_metric),
-	EA_LITERAL_EMBEDDED(EA_RIP_TAG, T_INT, 0, rt_tag),
-	EA_LITERAL_DIRECT_ADATA(EA_RIP_FROM, T_IFACE, 0, &ea_block.riad.ad),
+	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt_metric),
+	EA_LITERAL_EMBEDDED(&ea_rip_tag, 0, rt_tag),
+	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &ea_block.riad.ad),
       },
       .riad = {
 	.ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },
@@ -326,9 +328,9 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
   if (new)
   {
     /* Update */
-    u32 rt_tag = ea_get_int(new->attrs->eattrs, EA_RIP_TAG, 0);
-    u32 rt_metric = ea_get_int(new->attrs->eattrs, EA_RIP_METRIC, 1);
-    const eattr *rie = ea_find(new->attrs->eattrs, EA_RIP_FROM);
+    u32 rt_tag = ea_get_int(new->attrs->eattrs, &ea_rip_tag, 0);
+    u32 rt_metric = ea_get_int(new->attrs->eattrs, &ea_rip_metric, 1);
+    const eattr *rie = ea_find(new->attrs->eattrs, &ea_rip_from);
     struct iface *rt_from = rie ? ((struct rip_iface_adata *) rie->u.ptr)->iface : NULL;
 
     if (rt_metric > p->infinity)
@@ -1095,8 +1097,8 @@ rip_rte_better(struct rte *new, struct rte *old)
   ASSERT_DIE(new->src == old->src);
   struct rip_proto *p = (struct rip_proto *) new->src->proto;
 
-  u32 new_metric = ea_get_int(new->attrs->eattrs, EA_RIP_METRIC, p->infinity);
-  u32 old_metric = ea_get_int(old->attrs->eattrs, EA_RIP_METRIC, p->infinity);
+  u32 new_metric = ea_get_int(new->attrs->eattrs, &ea_rip_metric, p->infinity);
+  u32 old_metric = ea_get_int(old->attrs->eattrs, &ea_rip_metric, p->infinity);
 
   return new_metric < old_metric;
 }
@@ -1104,7 +1106,7 @@ rip_rte_better(struct rte *new, struct rte *old)
 static u32
 rip_rte_igp_metric(struct rte *rt)
 {
-  return ea_get_int(rt->attrs->eattrs, EA_RIP_METRIC, IGP_METRIC_UNKNOWN);
+  return ea_get_int(rt->attrs->eattrs, &ea_rip_metric, IGP_METRIC_UNKNOWN);
 }
 
 static void
@@ -1205,8 +1207,8 @@ static void
 rip_get_route_info(rte *rte, byte *buf)
 {
   struct rip_proto *p = (struct rip_proto *) rte->src->proto;
-  u32 rt_metric = ea_get_int(rte->attrs->eattrs, EA_RIP_METRIC, p->infinity);
-  u32 rt_tag = ea_get_int(rte->attrs->eattrs, EA_RIP_TAG, 0);
+  u32 rt_metric = ea_get_int(rte->attrs->eattrs, &ea_rip_metric, p->infinity);
+  u32 rt_tag = ea_get_int(rte->attrs->eattrs, &ea_rip_tag, 0);
 
   buf += bsprintf(buf, " (%d/%d)", rte->attrs->pref, rt_metric);
 
@@ -1214,24 +1216,29 @@ rip_get_route_info(rte *rte, byte *buf)
     bsprintf(buf, " [%04x]", rt_tag);
 }
 
-static int
-rip_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
+static void
+rip_tag_format(const eattr *a, byte *buf, uint buflen)
 {
-  switch (a->id)
-  {
-  case EA_RIP_METRIC:
-    bsprintf(buf, "metric: %d", a->u.data);
-    return GA_FULL;
-
-  case EA_RIP_TAG:
-    bsprintf(buf, "tag: %04x", a->u.data);
-    return GA_FULL;
-
-  default:
-    return GA_UNKNOWN;
-  }
+  bsnprintf(buf, buflen, "tag: %04x", a->u.data);
 }
 
+static struct ea_class ea_rip_metric = {
+  .name = "rip_metric",
+  .type = T_INT,
+};
+
+static struct ea_class ea_rip_tag = {
+  .name = "rip_tag",
+  .type = T_INT,
+  .format = rip_tag_format,
+};
+
+static struct ea_class ea_rip_from = {
+  .name = "rip_from",
+  .type = T_IFACE,
+  .readonly = 1,
+};
+
 void
 rip_show_interfaces(struct proto *P, const char *iff)
 {
@@ -1334,7 +1341,6 @@ rip_dump(struct proto *P)
 struct protocol proto_rip = {
   .name =		"RIP",
   .template =		"rip%d",
-  .class =		PROTOCOL_RIP,
   .preference =		DEF_PREF_RIP,
   .channel_mask =	NB_IP,
   .proto_size =		sizeof(struct rip_proto),
@@ -1346,11 +1352,16 @@ struct protocol proto_rip = {
   .shutdown =		rip_shutdown,
   .reconfigure =	rip_reconfigure,
   .get_route_info =	rip_get_route_info,
-  .get_attr =		rip_get_attr
 };
 
 void
 rip_build(void)
 {
   proto_build(&proto_rip);
+
+  EA_REGISTER_ALL(
+      &ea_rip_metric,
+      &ea_rip_tag,
+      &ea_rip_from
+      );
 }
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index a6fa3326..a01f8d3b 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -195,10 +195,6 @@ struct rip_rte
 #define RIP_ENTRY_VALID		1	/* Valid outgoing route */
 #define RIP_ENTRY_STALE		2	/* Stale outgoing route, waiting for GC */
 
-#define EA_RIP_METRIC		EA_CODE(PROTOCOL_RIP, 0)
-#define EA_RIP_TAG		EA_CODE(PROTOCOL_RIP, 1)
-#define EA_RIP_FROM		EA_CODE(PROTOCOL_RIP, 2)
-
 static inline int rip_is_v2(struct rip_proto *p)
 { return p->rip2; }
 
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 6e111a81..d4e95a83 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -935,7 +935,6 @@ rpki_copy_config(struct proto_config *dest UNUSED, struct proto_config *src UNUS
 struct protocol proto_rpki = {
   .name = 		"RPKI",
   .template = 		"rpki%d",
-  .class =		PROTOCOL_RPKI,
   .preference = 	DEF_PREF_RPKI,
   .proto_size = 	sizeof(struct rpki_proto),
   .config_size =	sizeof(struct rpki_config),
diff --git a/proto/static/static.c b/proto/static/static.c
index 42febcd4..090ec875 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -408,16 +408,16 @@ static_reload_routes(struct channel *C)
 static int
 static_rte_better(rte *new, rte *old)
 {
-  u32 n = ea_get_int(new->attrs->eattrs, EA_GEN_IGP_METRIC, IGP_METRIC_UNKNOWN);
-  u32 o = ea_get_int(old->attrs->eattrs, EA_GEN_IGP_METRIC, IGP_METRIC_UNKNOWN);
+  u32 n = ea_get_int(new->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 o = ea_get_int(old->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   return n < o;
 }
 
 static int
 static_rte_mergable(rte *pri, rte *sec)
 {
-  u32 a = ea_get_int(pri->attrs->eattrs, EA_GEN_IGP_METRIC, IGP_METRIC_UNKNOWN);
-  u32 b = ea_get_int(sec->attrs->eattrs, EA_GEN_IGP_METRIC, IGP_METRIC_UNKNOWN);
+  u32 a = ea_get_int(pri->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 b = ea_get_int(sec->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   return a == b;
 }
 
@@ -711,7 +711,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src)
 static void
 static_get_route_info(rte *rte, byte *buf)
 {
-  eattr *a = ea_find(rte->attrs->eattrs, EA_GEN_IGP_METRIC);
+  eattr *a = ea_find(rte->attrs->eattrs, &ea_gen_igp_metric);
   if (a)
     buf += bsprintf(buf, " (%d/%u)", rte->attrs->pref, a->u.data);
   else
@@ -769,7 +769,6 @@ static_show(struct proto *P)
 struct protocol proto_static = {
   .name =		"Static",
   .template =		"static%d",
-  .class =		PROTOCOL_STATIC,
   .preference =		DEF_PREF_STATIC,
   .channel_mask =	NB_ANY,
   .proto_size =		sizeof(struct static_proto),
diff --git a/sysdep/linux/krt-sys.h b/sysdep/linux/krt-sys.h
index 8897f889..aa90f6e4 100644
--- a/sysdep/linux/krt-sys.h
+++ b/sysdep/linux/krt-sys.h
@@ -34,38 +34,6 @@ static inline struct ifa * kif_get_primary_ip(struct iface *i UNUSED) { return N
 
 #define KRT_ALLOW_MERGE_PATHS	1
 
-#define EA_KRT_PREFSRC		EA_CODE(PROTOCOL_KERNEL, 0x10)
-#define EA_KRT_REALM		EA_CODE(PROTOCOL_KERNEL, 0x11)
-#define EA_KRT_SCOPE		EA_CODE(PROTOCOL_KERNEL, 0x12)
-
-
-#define KRT_METRICS_MAX		0x10	/* RTAX_QUICKACK+1 */
-#define KRT_METRICS_OFFSET	0x20	/* Offset of EA_KRT_* vs RTAX_* */
-
-#define KRT_FEATURES_MAX	4
-
-/*
- * Following attributes are parts of RTA_METRICS kernel route attribute, their
- * ids must be consistent with their RTAX_* constants (+ KRT_METRICS_OFFSET)
- */
-#define EA_KRT_METRICS		EA_CODE(PROTOCOL_KERNEL, 0x20)	/* Dummy one */
-#define EA_KRT_LOCK		EA_CODE(PROTOCOL_KERNEL, 0x21)
-#define EA_KRT_MTU		EA_CODE(PROTOCOL_KERNEL, 0x22)
-#define EA_KRT_WINDOW		EA_CODE(PROTOCOL_KERNEL, 0x23)
-#define EA_KRT_RTT		EA_CODE(PROTOCOL_KERNEL, 0x24)
-#define EA_KRT_RTTVAR		EA_CODE(PROTOCOL_KERNEL, 0x25)
-#define EA_KRT_SSTRESH		EA_CODE(PROTOCOL_KERNEL, 0x26)
-#define EA_KRT_CWND		EA_CODE(PROTOCOL_KERNEL, 0x27)
-#define EA_KRT_ADVMSS		EA_CODE(PROTOCOL_KERNEL, 0x28)
-#define EA_KRT_REORDERING 	EA_CODE(PROTOCOL_KERNEL, 0x29)
-#define EA_KRT_HOPLIMIT		EA_CODE(PROTOCOL_KERNEL, 0x2a)
-#define EA_KRT_INITCWND		EA_CODE(PROTOCOL_KERNEL, 0x2b)
-#define EA_KRT_FEATURES		EA_CODE(PROTOCOL_KERNEL, 0x2c)
-#define EA_KRT_RTO_MIN		EA_CODE(PROTOCOL_KERNEL, 0x2d)
-#define EA_KRT_INITRWND		EA_CODE(PROTOCOL_KERNEL, 0x2e)
-#define EA_KRT_QUICKACK		EA_CODE(PROTOCOL_KERNEL, 0x2f)
-
-
 struct krt_params {
   u32 table_id;				/* Kernel table ID we sync with */
   u32 metric;				/* Kernel metric used for all routes */
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index f31b88c7..17e17789 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -28,39 +28,22 @@ kern_sys_item:
  | NETLINK RX BUFFER expr { THIS_KRT->sys.netlink_rx_buffer = $4; }
  ;
 
-dynamic_attr: KRT_PREFSRC	{ $$ = f_new_dynamic_attr(T_IP, EA_KRT_PREFSRC); } ;
-dynamic_attr: KRT_REALM	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_REALM); } ;
-dynamic_attr: KRT_SCOPE	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_SCOPE); } ;
-
-dynamic_attr: KRT_MTU		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_MTU); } ;
-dynamic_attr: KRT_WINDOW	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_WINDOW); } ;
-dynamic_attr: KRT_RTT		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTT); } ;
-dynamic_attr: KRT_RTTVAR	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTTVAR); } ;
-dynamic_attr: KRT_SSTRESH	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_SSTRESH); } ;
-dynamic_attr: KRT_CWND		{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_CWND); } ;
-dynamic_attr: KRT_ADVMSS	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_ADVMSS); } ;
-dynamic_attr: KRT_REORDERING	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_REORDERING); } ;
-dynamic_attr: KRT_HOPLIMIT	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_HOPLIMIT); } ;
-dynamic_attr: KRT_INITCWND	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITCWND); } ;
-dynamic_attr: KRT_RTO_MIN	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTO_MIN); } ;
-dynamic_attr: KRT_INITRWND	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITRWND); } ;
-dynamic_attr: KRT_QUICKACK	{ $$ = f_new_dynamic_attr(T_INT, EA_KRT_QUICKACK); } ;
-
 /* Bits of EA_KRT_LOCK, based on RTAX_* constants */
 
-attr_bit: KRT_LOCK_MTU	{ $$ = f_new_dynamic_attr_bit(2, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_WINDOW	{ $$ = f_new_dynamic_attr_bit(3, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_RTT	{ $$ = f_new_dynamic_attr_bit(4, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_RTTVAR	{ $$ = f_new_dynamic_attr_bit(5, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_SSTRESH	{ $$ = f_new_dynamic_attr_bit(6, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_CWND	{ $$ = f_new_dynamic_attr_bit(7, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_ADVMSS	{ $$ = f_new_dynamic_attr_bit(8, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_REORDERING { $$ = f_new_dynamic_attr_bit(9, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_HOPLIMIT { $$ = f_new_dynamic_attr_bit(10, EA_KRT_LOCK); } ;
-attr_bit: KRT_LOCK_RTO_MIN { $$ = f_new_dynamic_attr_bit(13, EA_KRT_LOCK); } ;
+attr_bit: KRT_LOCK_MTU	{ $$ = f_new_dynamic_attr_bit(2, "krt_lock"); } ;
+attr_bit: KRT_LOCK_WINDOW	{ $$ = f_new_dynamic_attr_bit(3, "krt_lock"); } ;
+attr_bit: KRT_LOCK_RTT	{ $$ = f_new_dynamic_attr_bit(4, "krt_lock"); } ;
+attr_bit: KRT_LOCK_RTTVAR	{ $$ = f_new_dynamic_attr_bit(5, "krt_lock"); } ;
+attr_bit: KRT_LOCK_SSTRESH	{ $$ = f_new_dynamic_attr_bit(6, "krt_lock"); } ;
+attr_bit: KRT_LOCK_CWND	{ $$ = f_new_dynamic_attr_bit(7, "krt_lock"); } ;
+attr_bit: KRT_LOCK_ADVMSS	{ $$ = f_new_dynamic_attr_bit(8, "krt_lock"); } ;
+attr_bit: KRT_LOCK_REORDERING { $$ = f_new_dynamic_attr_bit(9, "krt_lock"); } ;
+attr_bit: KRT_LOCK_HOPLIMIT { $$ = f_new_dynamic_attr_bit(10, "krt_lock"); } ;
+attr_bit: KRT_LOCK_RTO_MIN { $$ = f_new_dynamic_attr_bit(13, "krt_lock"); } ;
 
-attr_bit: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, EA_KRT_FEATURES); } ;
-attr_bit: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr_bit(3, EA_KRT_FEATURES); } ;
+/* Bits of EA_KRT_FEATURES */
+attr_bit: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, "krt_features"); } ;
+attr_bit: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr_bit(3, "krt_features"); } ;
 
 
 CF_CODE
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 81e02b4c..23d41b56 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -26,6 +26,7 @@
 #include "lib/socket.h"
 #include "lib/string.h"
 #include "lib/hash.h"
+#include "lib/macro.h"
 #include "conf/conf.h"
 
 #include <asm/types.h>
@@ -121,6 +122,101 @@ struct nl_parse_state
   u32 rta_flow;		/* Used during parsing */
 };
 
+/*
+ *	Netlink eattr definitions
+ */
+
+#define KRT_METRICS_MAX		ARRAY_SIZE(ea_krt_metrics)
+#define KRT_FEATURES_MAX	4
+
+static void krt_bitfield_format(const eattr *e, byte *buf, uint buflen);
+
+static struct ea_class
+  ea_krt_prefsrc = {
+    .name = "krt_prefsrc",
+    .type = T_IP,
+  },
+  ea_krt_realm = {
+    .name = "krt_realm",
+    .type = T_INT,
+  },
+  ea_krt_scope = {
+    .name = "krt_scope",
+    .type = T_INT,
+  };
+
+static struct ea_class ea_krt_metrics[] = {
+  [RTAX_LOCK] = {
+    .name = "krt_lock",
+    .type = T_INT,
+    .format = krt_bitfield_format,
+  },
+  [RTAX_FEATURES] = {
+    .name = "krt_features",
+    .type = T_INT,
+    .format = krt_bitfield_format,
+  },
+#define KRT_METRIC_INT(_rtax, _name)	[_rtax] = { .name = _name, .type = T_INT }
+  KRT_METRIC_INT(RTAX_MTU, "krt_mtu"),
+  KRT_METRIC_INT(RTAX_WINDOW, "krt_window"),
+  KRT_METRIC_INT(RTAX_RTT, "krt_rtt"),
+  KRT_METRIC_INT(RTAX_RTTVAR, "krt_rttvar"),
+  KRT_METRIC_INT(RTAX_SSTHRESH, "krt_sstresh"),
+  KRT_METRIC_INT(RTAX_CWND, "krt_cwnd"),
+  KRT_METRIC_INT(RTAX_ADVMSS, "krt_advmss"),
+  KRT_METRIC_INT(RTAX_REORDERING, "krt_reordering"),
+  KRT_METRIC_INT(RTAX_HOPLIMIT, "krt_hoplimit"),
+  KRT_METRIC_INT(RTAX_INITCWND, "krt_initcwnd"),
+  KRT_METRIC_INT(RTAX_RTO_MIN, "krt_rto_min"),
+  KRT_METRIC_INT(RTAX_INITRWND, "krt_initrwnd"),
+  KRT_METRIC_INT(RTAX_QUICKACK, "krt_quickack"),
+#undef KRT_METRIC_INT
+};
+
+static const char *krt_metrics_names[KRT_METRICS_MAX] = {
+  NULL, "lock", "mtu", "window", "rtt", "rttvar", "sstresh", "cwnd", "advmss",
+  "reordering", "hoplimit", "initcwnd", "features", "rto_min", "initrwnd", "quickack"
+};
+
+static const char *krt_features_names[KRT_FEATURES_MAX] = {
+  "ecn", NULL, NULL, "allfrag"
+};
+
+static void
+krt_bitfield_format(const eattr *a, byte *buf, uint buflen)
+{
+  if (a->id == ea_krt_metrics[RTAX_LOCK].id)
+    ea_format_bitfield(a, buf, buflen, krt_metrics_names, 2, KRT_METRICS_MAX);
+  else if (a->id == ea_krt_metrics[RTAX_FEATURES].id)
+    ea_format_bitfield(a, buf, buflen, krt_features_names, 0, KRT_FEATURES_MAX);
+}
+
+static void
+nl_ea_register(void)
+{
+  EA_REGISTER_ALL(
+      &ea_krt_prefsrc,
+      &ea_krt_realm,
+      &ea_krt_scope
+      );
+
+  for (uint i = 0; i < KRT_METRICS_MAX; i++)
+  {
+    if (!ea_krt_metrics[i].name)
+      ea_krt_metrics[i] = (struct ea_class) {
+	.name = mb_sprintf(&root_pool, "krt_metric_%d", i),
+	.type = T_INT,
+      };
+
+    ea_register_init(&ea_krt_metrics[i]);
+  }
+
+  for (uint i = 1; i < KRT_METRICS_MAX; i++)
+    ASSERT_DIE(ea_krt_metrics[i].id == ea_krt_metrics[0].id + i);
+}
+
+
+
 /*
  *	Synchronous Netlink interface
  */
@@ -734,7 +830,7 @@ static void
 nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, ea_list *eattrs)
 {
   struct rtattr *a = nl_open_attr(h, bufsize, RTA_MULTIPATH);
-  eattr *flow = ea_find(eattrs, EA_KRT_REALM);
+  eattr *flow = ea_find(eattrs, &ea_krt_realm);
 
   for (; nh; nh = nh->next)
   {
@@ -1399,7 +1495,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
     priority = 0;
   else if (KRT_CF->sys.metric)
     priority = KRT_CF->sys.metric;
-  else if ((op != NL_OP_DELETE) && (ea = ea_find(eattrs, EA_KRT_METRIC)))
+  else if ((op != NL_OP_DELETE) && (ea = ea_find(eattrs, &ea_krt_metric)))
     priority = ea->u.data;
 
   if (priority)
@@ -1412,15 +1508,15 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   /* Default scope is LINK for device routes, UNIVERSE otherwise */
   if (p->af == AF_MPLS)
     r->r.rtm_scope = RT_SCOPE_UNIVERSE;
-  else if (ea = ea_find(eattrs, EA_KRT_SCOPE))
+  else if (ea = ea_find(eattrs, &ea_krt_scope))
     r->r.rtm_scope = ea->u.data;
   else
     r->r.rtm_scope = (dest == RTD_UNICAST && ipa_zero(nh->gw)) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
 
-  if (ea = ea_find(eattrs, EA_KRT_PREFSRC))
+  if (ea = ea_find(eattrs, &ea_krt_prefsrc))
     nl_add_attr_ipa(&r->h, rsize, RTA_PREFSRC, *(ip_addr *)ea->u.ptr->data);
 
-  if (ea = ea_find(eattrs, EA_KRT_REALM))
+  if (ea = ea_find(eattrs, &ea_krt_realm))
     nl_add_attr_u32(&r->h, rsize, RTA_FLOW, ea->u.data);
 
 
@@ -1428,9 +1524,9 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   metrics[0] = 0;
 
   struct ea_walk_state ews = { .eattrs = eattrs };
-  while (ea = ea_walk(&ews, EA_KRT_METRICS, KRT_METRICS_MAX))
+  while (ea = ea_walk(&ews, ea_krt_metrics[0].id, KRT_METRICS_MAX))
   {
-    int id = ea->id - EA_KRT_METRICS;
+    int id = ea->id - ea_krt_metrics[0].id;
     metrics[0] |= 1 << id;
     metrics[id] = ea->u.data;
   }
@@ -1581,21 +1677,15 @@ nl_announce_route(struct nl_parse_state *s)
   rte *e = rte_get_temp(s->attrs, s->proto->p.main_source);
   e->net = s->net;
 
-  EA_LOCAL_LIST(2) ea0 = {
+  EA_LOCAL_LIST(2) ea = {
     .l = { .count = 2, .next = e->attrs->eattrs },
-    .a[0] = (eattr) {
-      .id = EA_KRT_SOURCE,
-      .type = T_INT,
-      .u.data = s->krt_proto,
-    },
-    .a[1] = (eattr) {
-      .id = EA_KRT_METRIC,
-      .type = T_INT,
-      .u.data = s->krt_metric,
+    .a = {
+      EA_LITERAL_EMBEDDED(&ea_krt_source, 0, s->krt_proto),
+      EA_LITERAL_EMBEDDED(&ea_krt_metric, 0, s->krt_metric),
     },
   };
 
-  e->attrs->eattrs = &ea0.l;
+  e->attrs->eattrs = &ea.l;
 
   if (s->scan)
     krt_got_route(s->proto, e, s->krt_src);
@@ -1867,20 +1957,20 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 
   if (i->rtm_scope != def_scope)
     ea_set_attr(&ra->eattrs,
-	EA_LITERAL_EMBEDDED(EA_KRT_SCOPE, T_INT, 0, i->rtm_scope));
+	EA_LITERAL_EMBEDDED(&ea_krt_scope, 0, i->rtm_scope));
 
   if (a[RTA_PREFSRC])
-    {
-      ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
+  {
+    ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
 
-      ea_set_attr(&ra->eattrs,
-	  EA_LITERAL_STORE_ADATA(EA_KRT_PREFSRC, T_IP, 0, &ps, sizeof(ps)));
-    }
+    ea_set_attr(&ra->eattrs,
+	EA_LITERAL_STORE_ADATA(&ea_krt_prefsrc, 0, &ps, sizeof(ps)));
+  }
 
   /* Can be set per-route or per-nexthop */
   if (s->rta_flow)
     ea_set_attr(&ra->eattrs,
-	EA_LITERAL_EMBEDDED(EA_KRT_REALM, T_INT, 0, s->rta_flow));
+	EA_LITERAL_EMBEDDED(&ea_krt_realm, 0, s->rta_flow));
 
   if (a[RTA_METRICS])
     {
@@ -1891,11 +1981,10 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	  return;
 	}
 
-      for (int t = 1; t < KRT_METRICS_MAX; t++)
+      for (uint t = 1; t < KRT_METRICS_MAX; t++)
 	if (metrics[0] & (1 << t))
 	  ea_set_attr(&ra->eattrs,
-	      EA_LITERAL_EMBEDDED(EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t),
-		T_INT, 0, metrics[t]));
+	      EA_LITERAL_EMBEDDED(&ea_krt_metrics[t], 0, metrics[t]));
     }
 
   /*
@@ -2133,6 +2222,8 @@ krt_sys_io_init(void)
 {
   nl_linpool = lp_new_default(krt_pool);
   HASH_INIT(nl_table_map, krt_pool, 6);
+
+  nl_ea_register();
 }
 
 int
@@ -2186,56 +2277,6 @@ krt_sys_copy_config(struct krt_config *d, struct krt_config *s)
   d->sys.metric = s->sys.metric;
 }
 
-static const char *krt_metrics_names[KRT_METRICS_MAX] = {
-  NULL, "lock", "mtu", "window", "rtt", "rttvar", "sstresh", "cwnd", "advmss",
-  "reordering", "hoplimit", "initcwnd", "features", "rto_min", "initrwnd", "quickack"
-};
-
-static const char *krt_features_names[KRT_FEATURES_MAX] = {
-  "ecn", NULL, NULL, "allfrag"
-};
-
-int
-krt_sys_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
-{
-  switch (a->id)
-  {
-  case EA_KRT_PREFSRC:
-    bsprintf(buf, "prefsrc");
-    return GA_NAME;
-
-  case EA_KRT_REALM:
-    bsprintf(buf, "realm");
-    return GA_NAME;
-
-  case EA_KRT_SCOPE:
-    bsprintf(buf, "scope");
-    return GA_NAME;
-
-  case EA_KRT_LOCK:
-    buf += bsprintf(buf, "lock:");
-    ea_format_bitfield(a, buf, buflen, krt_metrics_names, 2, KRT_METRICS_MAX);
-    return GA_FULL;
-
-  case EA_KRT_FEATURES:
-    buf += bsprintf(buf, "features:");
-    ea_format_bitfield(a, buf, buflen, krt_features_names, 0, KRT_FEATURES_MAX);
-    return GA_FULL;
-
-  default:;
-    int id = (int)EA_ID(a->id) - KRT_METRICS_OFFSET;
-    if (id > 0 && id < KRT_METRICS_MAX)
-    {
-      bsprintf(buf, "%s", krt_metrics_names[id]);
-      return GA_NAME;
-    }
-
-    return GA_UNKNOWN;
-  }
-}
-
-
-
 void
 kif_sys_start(struct kif_proto *p UNUSED)
 {
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 2a3f41de..9300e9c8 100644
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -122,9 +122,6 @@ kif_iface:
   kif_iface_start iface_patt_list_nopx kif_iface_opt_list;
 
 
-dynamic_attr: KRT_SOURCE { $$ = f_new_dynamic_attr(T_INT, EA_KRT_SOURCE); } ;
-dynamic_attr: KRT_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_KRT_METRIC); } ;
-
 CF_CODE
 
 CF_END
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0ebc4fb3..4da51ce2 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -232,7 +232,6 @@ kif_copy_config(struct proto_config *dest, struct proto_config *src)
 struct protocol proto_unix_iface = {
   .name = 		"Device",
   .template = 		"device%d",
-  .class =		PROTOCOL_DEVICE,
   .proto_size =		sizeof(struct kif_proto),
   .config_size =	sizeof(struct kif_config),
   .preconfig =		kif_preconfig,
@@ -287,7 +286,7 @@ static struct tbf rl_alien = TBF_DEFAULT_LOG_LIMITS;
 static inline u32
 krt_metric(rte *a)
 {
-  eattr *ea = ea_find(a->attrs->eattrs, EA_KRT_METRIC);
+  eattr *ea = ea_find(a->attrs->eattrs, &ea_krt_metric);
   return ea ? ea->u.data : 0;
 }
 
@@ -1133,24 +1132,15 @@ krt_copy_config(struct proto_config *dest, struct proto_config *src)
   krt_sys_copy_config(d, s);
 }
 
-static int
-krt_get_attr(const eattr *a, byte *buf, int buflen)
-{
-  switch (a->id)
-  {
-  case EA_KRT_SOURCE:
-    bsprintf(buf, "source");
-    return GA_NAME;
-
-  case EA_KRT_METRIC:
-    bsprintf(buf, "metric");
-    return GA_NAME;
-
-  default:
-    return krt_sys_get_attr(a, buf, buflen);
-  }
-}
+struct ea_class ea_krt_source = {
+  .name = "krt_source",
+  .type = T_INT,
+};
 
+struct ea_class ea_krt_metric = {
+  .name = "krt_metric",
+  .type = T_INT,
+};
 
 #ifdef CONFIG_IP6_SADR_KERNEL
 #define MAYBE_IP6_SADR	NB_IP6_SADR
@@ -1167,7 +1157,6 @@ krt_get_attr(const eattr *a, byte *buf, int buflen)
 struct protocol proto_unix_kernel = {
   .name =		"Kernel",
   .template =		"kernel%d",
-  .class =		PROTOCOL_KERNEL,
   .preference =		DEF_PREF_INHERITED,
   .channel_mask =	NB_IP | MAYBE_IP6_SADR | MAYBE_MPLS,
   .proto_size =		sizeof(struct krt_proto),
@@ -1179,7 +1168,6 @@ struct protocol proto_unix_kernel = {
   .shutdown =		krt_shutdown,
   .reconfigure =	krt_reconfigure,
   .copy_config =	krt_copy_config,
-  .get_attr =		krt_get_attr,
 #ifdef KRT_ALLOW_LEARN
   .dump =		krt_dump,
 #endif
@@ -1189,4 +1177,9 @@ void
 krt_build(void)
 {
   proto_build(&proto_unix_kernel);
+
+  EA_REGISTER_ALL(
+      &ea_krt_source,
+      &ea_krt_metric,
+      );
 }
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 20858cd7..04b04162 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -21,8 +21,12 @@ struct kif_proto;
 
 #define KRT_DEFAULT_ECMP_LIMIT	16
 
+#if 0
 #define EA_KRT_SOURCE	EA_CODE(PROTOCOL_KERNEL, 0)
 #define EA_KRT_METRIC	EA_CODE(PROTOCOL_KERNEL, 1)
+#endif
+
+extern struct ea_class ea_krt_source, ea_krt_metric;
 
 #define KRT_REF_SEEN	0x1	/* Seen in table */
 #define KRT_REF_BEST	0x2	/* Best in table */
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 9bb37e5d..8fdad4e6 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -881,8 +881,8 @@ main(int argc, char **argv)
   resource_init();
   timer_init();
   olock_init();
-  io_init();
   rt_init();
+  io_init();
   if_init();
 //  roa_init();
   config_init();
diff --git a/test/bt-utils.c b/test/bt-utils.c
index ce9a49d7..509b5ed4 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -62,8 +62,8 @@ bt_bird_init(void)
 
   olock_init();
   timer_init();
-  io_init();
   rt_init();
+  io_init();
   if_init();
   config_init();
 
@@ -72,9 +72,6 @@ bt_bird_init(void)
 
 void bt_bird_cleanup(void)
 {
-  for (int i = 0; i < PROTOCOL__MAX; i++)
-    class_to_protocol[i] = NULL;
-
   config = new_config = NULL;
 }
 

From 8ebac84bc8d51e2404ce6d6dc5e35fb261830596 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Apr 2022 13:56:04 +0200
Subject: [PATCH 127/431] Moved advertising router info (FROM attribute) to
 eattrs

---
 filter/config.Y     |  3 +--
 filter/data.h       |  3 +--
 filter/f-inst.c     |  5 -----
 lib/route.h         | 10 +++++++++-
 nest/rt-attr.c      |  9 ++++++---
 nest/rt-show.c      |  5 +++--
 nest/rt-table.c     |  5 ++++-
 proto/babel/babel.c |  4 ++--
 proto/bgp/packets.c |  3 ++-
 proto/rip/rip.c     | 40 ++++++++++++++++++++--------------------
 10 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index dcfae788..e24233aa 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -762,8 +762,7 @@ symbol_value: CF_SYM_KNOWN
  ;
 
 static_attr:
-   FROM    { $$ = f_new_static_attr(T_IP,         SA_FROM,	0); }
- | GW      { $$ = f_new_static_attr(T_IP,         SA_GW,	0); }
+   GW      { $$ = f_new_static_attr(T_IP,         SA_GW,	0); }
  | NET     { $$ = f_new_static_attr(T_NET,	  SA_NET,	1); }
  | PROTO   { $$ = f_new_static_attr(T_STRING,     SA_PROTO,	1); }
  | SOURCE  { $$ = f_new_static_attr(T_ENUM_RTS,   SA_SOURCE,	1); }
diff --git a/filter/data.h b/filter/data.h
index 0e25ccd9..a0a164ed 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -22,8 +22,7 @@ struct f_val {
 #define fputip(a)   ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
 
 enum f_sa_code {
-  SA_FROM = 1,
-  SA_GW,
+  SA_GW = 1,
   SA_NET,
   SA_PROTO,
   SA_SOURCE,
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 9530d9ad..7158d22e 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -533,7 +533,6 @@
 
       switch (sa.sa_code)
       {
-      case SA_FROM:	RESULT(sa.type, ip, rta->from); break;
       case SA_GW:	RESULT(sa.type, ip, rta->nh.gw); break;
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
@@ -563,10 +562,6 @@
 
       switch (sa.sa_code)
       {
-      case SA_FROM:
-	rta->from = v1.val.ip;
-	break;
-
       case SA_GW:
 	{
 	  ip_addr ip = v1.val.ip;
diff --git a/lib/route.h b/lib/route.h
index be72bb16..e02c63b3 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -84,7 +84,6 @@ typedef struct rta {
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
-  ip_addr from;				/* Advertising router */
   u16 cached:1;				/* Are attributes cached? */
   u16 source:7;				/* Route source (RTS_...) */
   u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
@@ -219,6 +218,13 @@ static inline eattr *ea_find_by_name(ea_list *l, const char *name)
     (ea ? ea->u.data : (_def)); \
     })
 
+#define ea_get_ip(_l, _ident, _def)  ({ \
+    struct ea_class *cls = ea_class_find((_ident)); \
+    ASSERT_DIE(cls->type == T_IP); \
+    const eattr *ea = ea_find((_l), cls->id); \
+    (ea ? *((const ip_addr *) ea->u.ptr->data) : (_def)); \
+    })
+
 eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
 void ea_dump(ea_list *);
 int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
@@ -300,6 +306,8 @@ u32 rt_get_igp_metric(rte *rt);
 #define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
 					   protocol-specific metric is availabe */
 
+/* From: Advertising router */
+extern struct ea_class ea_gen_from;
 
 /* Next hop structures */
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index e5d87b53..87f54b0d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -70,6 +70,11 @@ struct ea_class ea_gen_preference = {
   .type = T_INT,
 };
 
+struct ea_class ea_gen_from = {
+  .name = "from",
+  .type = T_IP,
+};
+
 const char * const rta_src_names[RTS_MAX] = {
   [RTS_STATIC]		= "static",
   [RTS_INHERIT]		= "inherit",
@@ -1229,7 +1234,6 @@ rta_hash(rta *a)
 #define MIX(f) mem_hash_mix(&h, &(a->f), sizeof(a->f));
 #define BMIX(f) mem_hash_mix_num(&h, a->f);
   MIX(hostentry);
-  MIX(from);
   BMIX(source);
   BMIX(scope);
   BMIX(dest);
@@ -1244,7 +1248,6 @@ rta_same(rta *x, rta *y)
   return (x->source == y->source &&
 	  x->scope == y->scope &&
 	  x->dest == y->dest &&
-	  ipa_equal(x->from, y->from) &&
 	  x->hostentry == y->hostentry &&
 	  nexthop_same(&(x->nh), &(y->nh)) &&
 	  ea_same(x->eattrs, y->eattrs));
@@ -1398,7 +1401,6 @@ rta_dump(rta *a)
 	rtd[a->dest], a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
-  debug(" <-%I", a->from);
   if (a->dest == RTD_UNICAST)
     for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)
       {
@@ -1475,6 +1477,7 @@ rta_init(void)
 
   ea_register_init(&ea_gen_preference);
   ea_register_init(&ea_gen_igp_metric);
+  ea_register_init(&ea_gen_from);
 }
 
 /*
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 1c764d8c..be4c0186 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -48,8 +48,9 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   struct nexthop *nh;
 
   tm_format_time(tm, &config->tf_route, e->lastmod);
-  if (ipa_nonzero(a->from) && !ipa_equal(a->from, a->nh.gw))
-    bsprintf(from, " from %I", a->from);
+  ip_addr a_from = ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE);
+  if (ipa_nonzero(a_from) && !ipa_equal(a_from, a->nh.gw))
+    bsprintf(from, " from %I", a_from);
   else
     from[0] = 0;
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 919576bd..e8b04e0b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2596,7 +2596,10 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, i
   u32 orig_b = ea_get_int(rb->attrs->eattrs, "bgp_originator_id", 0);
 
   /* Originator is either ORIGINATOR_ID (if present), or BGP neighbor address (if not) */
-  if ((orig_a != orig_b) || (!orig_a && !orig_b && !ipa_equal(a->from, rb->attrs->from)))
+  if ((orig_a != orig_b) || (!orig_a && !orig_b && !ipa_equal(
+	  ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE),
+	  ea_get_ip(rb->attrs->eattrs, &ea_gen_from, IPA_NONE)
+	  )))
     return 0;
 
 
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index afd0b1e1..f4503b99 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -645,11 +645,12 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   {
     struct {
       ea_list l;
-      eattr a[4];
+      eattr a[5];
     } eattrs = {
       .l.count = ARRAY_SIZE(eattrs.a),
       .a = {
 	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference),
+	EA_LITERAL_STORE_ADATA(&ea_gen_from, 0, &r->neigh->addr, sizeof(r->neigh->addr)),
 	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
 	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
 	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
@@ -660,7 +661,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       .source = RTS_BABEL,
       .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNICAST,
-      .from = r->neigh->addr,
       .nh.gw = r->next_hop,
       .nh.iface = r->neigh->ifa->iface,
       .eattrs = &eattrs.l,
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 45a4b1de..9760ebee 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2476,8 +2476,9 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
 
     a->source = RTS_BGP;
     a->scope = SCOPE_UNIVERSE;
-    a->from = s->proto->remote_ip;
     a->eattrs = ea;
+
+    ea_set_attr_data(&a->eattrs, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr));
     ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, c->c.preference);
 
     c->desc->decode_next_hop(s, nh, nh_len, a);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 244bcd0a..7c097a92 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -157,7 +157,18 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
       .dest = RTD_UNICAST,
     };
 
-    u8 rt_metric = rt->metric;
+    struct {
+      ea_list l;
+      eattr a[2];
+    } ea_block = {
+      .l.count = ARRAY_SIZE(ea_block.a),
+      .a = {
+	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference),
+	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt->metric),
+      },
+    };
+    a0.eattrs = &ea_block.l;
+
     u16 rt_tag = rt->tag;
 
     if (p->ecmp)
@@ -189,30 +200,19 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
     else
     {
       /* Unipath route */
-      a0.from = rt->from->nbr->addr;
       a0.nh.gw = rt->next_hop;
       a0.nh.iface = rt->from->ifa->iface;
+      ea_set_attr_data(&a0.eattrs, &ea_gen_from, 0, &rt->from->nbr->addr, sizeof(ip_addr));
     }
 
-    struct {
-      ea_list l;
-      eattr a[4];
-      struct rip_iface_adata riad;
-    } ea_block = {
-      .l.count = ARRAY_SIZE(ea_block.a),
-      .a = {
-	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference),
-	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt_metric),
-	EA_LITERAL_EMBEDDED(&ea_rip_tag, 0, rt_tag),
-	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &ea_block.riad.ad),
-      },
-      .riad = {
-	.ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },
-	.iface = a0.nh.iface,
-      },
-    };
+    ea_set_attr_u32(&a0.eattrs, &ea_rip_tag, 0, rt_tag);
 
-    a0.eattrs = &ea_block.l;
+    struct rip_iface_adata riad = {
+      .ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },
+      .iface = a0.nh.iface,
+    };
+    ea_set_attr(&a0.eattrs,
+	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &riad.ad));
 
     rta *a = rta_lookup(&a0);
     rte *e = rte_get_temp(a, p->p.main_source);

From cce974e8ea992d0e6d2f649eca7880b436d91d71 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 May 2022 12:24:30 +0200
Subject: [PATCH 128/431] Conf: Allowing keyword redefinition

Some tokens are both keywords and symbols. For now, we allow only
specific keywords to be redefined; in future, more of the keywords may
be added to this category.

The redefinable keywords must be specified in any .Y file as follows:

  toksym: THE_KEYWORD ;

See proto/bgp/config.Y for an example.

Also dropped a lot of unused terminals.
---
 conf/cf-lex.l          | 13 ++++++-------
 conf/confbase.Y        |  8 +++++---
 conf/gen_keywords.m4   |  3 +--
 conf/gen_parser.m4     |  2 +-
 filter/config.Y        | 32 ++++++++++++++++----------------
 nest/config.Y          | 10 +++++-----
 proto/babel/config.Y   |  2 +-
 proto/bgp/config.Y     | 13 +++++++------
 proto/ospf/config.Y    |  2 +-
 proto/radv/config.Y    |  2 +-
 proto/rip/config.Y     |  2 +-
 sysdep/linux/netlink.Y |  3 ---
 sysdep/unix/krt.Y      |  2 +-
 13 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index e84e1d9d..11bcdb18 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -709,10 +709,7 @@ cf_lex_symbol(const char *data)
   struct symbol *sym = cf_get_symbol(data);
   cf_lval.s = sym;
 
-  if (sym->class != SYM_VOID)
-    return CF_SYM_KNOWN;
-
-  /* Is it a keyword? */
+  /* Is it a keyword? Prefer the keyword. */
   struct keyword *k = HASH_FIND(kw_hash, KW, data);
   if (k)
   {
@@ -725,9 +722,11 @@ cf_lex_symbol(const char *data)
     }
   }
 
-  /* OK, undefined symbol */
-  cf_lval.s = sym;
-  return CF_SYM_UNDEFINED;
+  /* OK, only a symbol. */
+  if (sym->class == SYM_VOID)
+    return CF_SYM_UNDEFINED;
+  else
+    return CF_SYM_KNOWN;
 }
 
 static void
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 2286b257..8a27c3d5 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -116,7 +116,7 @@ CF_DECLS
 %type <mls> label_stack_start label_stack
 
 %type <t> text opttext
-%type <s> symbol
+%type <s> symbol symbol_known toksym 
 
 %nonassoc PREFIX_DUMMY
 %left AND OR
@@ -162,7 +162,7 @@ definition:
 expr:
    NUM
  | '(' term ')' { $$ = f_eval_int(f_linearize($2)); }
- | CF_SYM_KNOWN {
+ | symbol_known {
      if ($1->class != (SYM_CONSTANT | T_INT)) cf_error("Number constant expected");
      $$ = SYM_VAL($1).i; }
  ;
@@ -173,7 +173,9 @@ expr_us:
  | expr US { $$ = $1 US_; }
  ;
 
-symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN ;
+toksym: FROM ;
+symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN | toksym ;
+symbol_known: CF_SYM_KNOWN | toksym ;
 
 /* Switches */
 
diff --git a/conf/gen_keywords.m4 b/conf/gen_keywords.m4
index 0c1dc545..53226e4d 100644
--- a/conf/gen_keywords.m4
+++ b/conf/gen_keywords.m4
@@ -26,8 +26,7 @@ m4_define(CF_DEFINES, `m4_divert(-1)')
 m4_define(CF_handle_kw, `m4_divert(1){ "m4_translit($1,[[A-Z]],[[a-z]])", $1, NULL },
 m4_divert(-1)')
 m4_define(CF_keywd, `m4_ifdef([[CF_tok_$1]],,[[m4_define([[CF_tok_$1]],1)CF_handle_kw($1)]])')
-m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token[[]]CF_toks
-)DNL')
+m4_define(CF_KEYWORDS, `CF_iterate([[CF_keywd]], [[$@]])DNL')
 
 # CLI commands generate keywords as well
 m4_define(CF_CLI, `CF_KEYWORDS(m4_translit($1, [[ ]], [[,]]))
diff --git a/conf/gen_parser.m4 b/conf/gen_parser.m4
index 5b378a93..af4b1455 100644
--- a/conf/gen_parser.m4
+++ b/conf/gen_parser.m4
@@ -31,7 +31,7 @@ m4_define(CF_iterate, `m4_define([[CF_iter]], m4_defn([[$1]]))CF_itera($2)')
 
 # Keywords act as untyped %token
 m4_define(CF_keywd, `m4_ifdef([[CF_tok_$1]],,[[m4_define([[CF_tok_$1]],1)m4_define([[CF_toks]],CF_toks $1)]])')
-m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token[[]]CF_toks
+m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token<s>[[]]CF_toks
 )DNL')
 
 # CLI commands
diff --git a/filter/config.Y b/filter/config.Y
index e24233aa..7dcdb779 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -291,8 +291,8 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 	LEN, MAXLEN,
 	DATA, DATA1, DATA2,
 	DEFINED,
-	ADD, DELETE, CONTAINS, RESET,
-	PREPEND, FIRST, LAST, LAST_NONAGGREGATED, MATCH,
+	ADD, DELETE, RESET,
+	PREPEND, FIRST, LAST, LAST_NONAGGREGATED,
 	MIN, MAX,
 	EMPTY,
 	FILTER, WHERE, EVAL, ATTRIBUTE,
@@ -357,7 +357,7 @@ custom_attr: ATTRIBUTE type symbol ';' {
 
 conf: bt_test_suite ;
 bt_test_suite:
- BT_TEST_SUITE '(' CF_SYM_KNOWN ',' text ')' {
+ BT_TEST_SUITE '(' symbol_known ',' text ')' {
   cf_assert_symbol($3, SYM_FUNCTION);
   struct f_bt_test_suite *t = cfg_allocz(sizeof(struct f_bt_test_suite));
   t->fn = $3->function;
@@ -370,7 +370,7 @@ bt_test_suite:
 
 conf: bt_test_same ;
 bt_test_same:
- BT_TEST_SAME '(' CF_SYM_KNOWN ',' CF_SYM_KNOWN ',' NUM ')' {
+ BT_TEST_SAME '(' symbol_known ',' symbol_known ',' NUM ')' {
   cf_assert_symbol($3, SYM_FUNCTION);
   cf_assert_symbol($5, SYM_FUNCTION);
   struct f_bt_test_suite *t = cfg_allocz(sizeof(struct f_bt_test_suite));
@@ -448,7 +448,7 @@ function_vars:
 filter_body: function_body ;
 
 filter:
-   CF_SYM_KNOWN {
+   symbol_known {
      cf_assert_symbol($1, SYM_FILTER);
      $$ = $1->filter;
    }
@@ -549,7 +549,7 @@ set_atom:
      if (f_eval(f_linearize($2), &($$)) > F_RETURN) cf_error("Runtime error");
      if (!f_valid_set_type($$.type)) cf_error("Set-incompatible type");
    }
- | CF_SYM_KNOWN {
+ | symbol_known {
      cf_assert_symbol($1, SYM_CONSTANT);
      if (!f_valid_set_type(SYM_TYPE($1))) cf_error("%s: set-incompatible type", $1->name);
      $$ = *$1->val;
@@ -719,7 +719,7 @@ var_list: /* EMPTY */ { $$ = NULL; }
  | var_list ',' term { $$ = $3; $$->next = $1; }
 
 function_call:
-   CF_SYM_KNOWN '(' var_list ')' {
+   symbol_known '(' var_list ')' {
      if ($1->class != SYM_FUNCTION)
        cf_error("You can't call something which is not a function. Really.");
 
@@ -743,7 +743,7 @@ function_call:
    }
  ;
 
-symbol_value: CF_SYM_KNOWN
+symbol_value: symbol_known 
   {
     switch ($1->class) {
       case SYM_CONSTANT_RANGE:
@@ -872,7 +872,7 @@ cmd:
  | IF term THEN block ELSE block {
      $$ = f_new_inst(FI_CONDITION, $2, $4, $6);
    }
- | CF_SYM_KNOWN '=' term ';' {
+ | symbol_known '=' term ';' {
      switch ($1->class) {
        case SYM_VARIABLE_RANGE:
 	 $$ = f_new_inst(FI_VAR_SET, $3, $1);
@@ -895,7 +895,7 @@ cmd:
        cf_error( "This static attribute is read-only.");
      $$ = f_new_inst(FI_RTA_SET, $3, $1);
    }
- | UNSET '(' CF_SYM_KNOWN ')' ';' {
+ | UNSET '(' symbol_known ')' ';' {
      if ($3->class != SYM_ATTRIBUTE)
        cf_error("Can't unset %s", $3->name);
      if ($3->attribute->readonly)
@@ -933,11 +933,11 @@ cmd:
       $$ = f_new_inst(FI_SWITCH, $2, build_tree($4));
    }
 
- | CF_SYM_KNOWN '.' EMPTY ';' { $$ = f_generate_empty($1); }
- | CF_SYM_KNOWN '.' PREPEND '(' term ')' ';'   { $$ = f_generate_complex_sym( FI_PATH_PREPEND, $1, $5 ); }
- | CF_SYM_KNOWN '.' ADD '(' term ')' ';'       { $$ = f_generate_complex_sym( FI_CLIST_ADD, $1, $5 ); }
- | CF_SYM_KNOWN '.' DELETE '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_DEL, $1, $5 ); }
- | CF_SYM_KNOWN '.' FILTER '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_FILTER, $1, $5 ); }
+ | symbol_known '.' EMPTY ';' { $$ = f_generate_empty($1); }
+ | symbol_known '.' PREPEND '(' term ')' ';'   { $$ = f_generate_complex_sym( FI_PATH_PREPEND, $1, $5 ); }
+ | symbol_known '.' ADD '(' term ')' ';'       { $$ = f_generate_complex_sym( FI_CLIST_ADD, $1, $5 ); }
+ | symbol_known '.' DELETE '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_DEL, $1, $5 ); }
+ | symbol_known '.' FILTER '(' term ')' ';'    { $$ = f_generate_complex_sym( FI_CLIST_FILTER, $1, $5 ); }
  | BT_ASSERT '(' get_cf_position term get_cf_position ')' ';' { $$ = assert_done($4, $3 + 1, $5 - 1); }
  | BT_CHECK_ASSIGN '(' get_cf_position lvalue get_cf_position ',' term ')' ';' { $$ = assert_assign(&$4, $7, $3 + 1, $5 - 1); }
  ;
@@ -948,7 +948,7 @@ get_cf_position:
 };
 
 lvalue:
-   CF_SYM_KNOWN {
+   symbol_known {
       switch ($1->class) {
 	case SYM_VARIABLE_RANGE:
 	  $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1 };
diff --git a/nest/config.Y b/nest/config.Y
index c2913506..c144f0f3 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -118,11 +118,11 @@ CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, SADR, MPLS)
 CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED, RPKI)
 CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CHANNELS, INTERFACES)
 CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512)
-CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
+CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
 CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION)
 CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP)
 CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
-CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS)
+CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
 CF_KEYWORDS(CHECK, LINK)
 CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME)
@@ -659,7 +659,7 @@ r_args:
      $$->addr = $3;
      $$->addr_mode = RSD_ADDR_IN;
    }
-| r_args TABLE CF_SYM_KNOWN {
+| r_args TABLE symbol_known {
      cf_assert_symbol($3, SYM_TABLE);
      $$ = $1;
      rt_show_add_table($$, $3->table->table);
@@ -704,7 +704,7 @@ r_args:
      $$ = $1;
      $$->filtered = 1;
    }
- | r_args export_mode CF_SYM_KNOWN {
+ | r_args export_mode symbol_known {
      cf_assert_symbol($3, SYM_PROTO);
      struct proto_config *c = (struct proto_config *) $3->proto;
      $$ = $1;
@@ -721,7 +721,7 @@ r_args:
      $$->export_channel = $3;
      $$->tables_defined_by = RSD_TDB_INDIRECT;
    }
- | r_args PROTOCOL CF_SYM_KNOWN {
+ | r_args PROTOCOL symbol_known {
      cf_assert_symbol($3, SYM_PROTO);
      struct proto_config *c = (struct proto_config *) $3->proto;
      $$ = $1;
diff --git a/proto/babel/config.Y b/proto/babel/config.Y
index 82419b20..a4350eed 100644
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@ -24,7 +24,7 @@ CF_DECLS
 
 CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
 	TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
-	NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
+	NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS,
 	ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE)
 
 CF_GRAMMAR
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index db261bbb..b4d8b83f 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -19,18 +19,17 @@ CF_DECLS
 
 CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, HOLD, TIME, CONNECT, RETRY, KEEPALIVE,
 	MULTIHOP, STARTUP, VIA, NEXT, HOP, SELF, DEFAULT, PATH, METRIC, ERROR,
-	START, DELAY, FORGET, WAIT, ENABLE, DISABLE, AFTER, BGP_PATH,
-	BGP_LOCAL_PREF, BGP_MED, BGP_ORIGIN, BGP_NEXT_HOP, BGP_ATOMIC_AGGR,
-	BGP_AGGREGATOR, BGP_COMMUNITY, BGP_EXT_COMMUNITY, BGP_LARGE_COMMUNITY,
+	START, DELAY, FORGET, WAIT, ENABLE, DISABLE, AFTER,
+	BGP_LOCAL_PREF, BGP_MED, 
 	SOURCE, ADDRESS, PASSWORD, RR, RS, CLIENT, CLUSTER, ID, AS4, ADVERTISE,
 	IPV4, CAPABILITIES, LIMIT, PASSIVE, PREFER, OLDER, MISSING, LLADDR,
-	DROP, IGNORE, ROUTE, REFRESH, INTERPRET, COMMUNITIES, BGP_ORIGINATOR_ID,
-	BGP_CLUSTER_LIST, IGP, TABLE, GATEWAY, DIRECT, RECURSIVE, MED, TTL,
+	DROP, IGNORE, ROUTE, REFRESH, INTERPRET, COMMUNITIES,
+	IGP, TABLE, GATEWAY, DIRECT, RECURSIVE, MED, TTL,
 	SECURITY, DETERMINISTIC, SECONDARY, ALLOW, BFD, ADD, PATHS, RX, TX,
 	GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
 	STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,
 	LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
-	DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
+	DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
 	FIRST, FREE, VALIDATE, BASE)
 
 %type <i> bgp_nh
@@ -44,6 +43,8 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,
 
 CF_GRAMMAR
 
+toksym: BGP_MED | BGP_LOCAL_PREF ;
+
 proto: bgp_proto '}'  ;
 
 bgp_proto_start: proto_start BGP {
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 136e1dcb..bc3df8db 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -190,7 +190,7 @@ ospf_check_auth(void)
 
 CF_DECLS
 
-CF_KEYWORDS(OSPF, V2, V3, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID)
+CF_KEYWORDS(OSPF, V2, V3)
 CF_KEYWORDS(AREA, NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT)
 CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT)
 CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP)
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index f40fdcca..fb68d2e5 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -33,7 +33,7 @@ CF_KEYWORDS(RADV, PREFIX, INTERFACE, MIN, MAX, RA, DELAY, INTERVAL, SOLICITED,
 	RETRANS, TIMER, CURRENT, HOP, LIMIT, DEFAULT, VALID, PREFERRED, MULT,
 	LIFETIME, SKIP, ONLINK, AUTONOMOUS, RDNSS, DNSSL, NS, DOMAIN, LOCAL,
 	TRIGGER, SENSITIVE, PREFERENCE, LOW, MEDIUM, HIGH, PROPAGATE, ROUTE,
-	ROUTES, RA_PREFERENCE, RA_LIFETIME)
+	ROUTES)
 
 CF_ENUM(T_ENUM_RA_PREFERENCE, RA_PREF_, LOW, MEDIUM, HIGH)
 
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 234e9029..3c0973b1 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -37,7 +37,7 @@ CF_KEYWORDS(RIP, NG, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT,
 	    PASSIVE, VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO,
 	    TIME, BFD, AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5,
 	    TTL, SECURITY, RX, TX, BUFFER, LENGTH, PRIORITY, ONLY, LINK,
-	    DEMAND, CIRCUIT, RIP_METRIC, RIP_TAG)
+	    DEMAND, CIRCUIT)
 
 %type <i> rip_variant rip_auth
 
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 17e17789..7ba8c7c9 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -11,9 +11,6 @@ CF_HDR
 CF_DECLS
 
 CF_KEYWORDS(KERNEL, TABLE, METRIC, NETLINK, RX, BUFFER,
-	    KRT_PREFSRC, KRT_REALM, KRT_SCOPE, KRT_MTU, KRT_WINDOW,
-	    KRT_RTT, KRT_RTTVAR, KRT_SSTRESH, KRT_CWND, KRT_ADVMSS, KRT_REORDERING,
-	    KRT_HOPLIMIT, KRT_INITCWND, KRT_RTO_MIN, KRT_INITRWND, KRT_QUICKACK,
 	    KRT_LOCK_MTU, KRT_LOCK_WINDOW, KRT_LOCK_RTT, KRT_LOCK_RTTVAR,
 	    KRT_LOCK_SSTRESH, KRT_LOCK_CWND, KRT_LOCK_ADVMSS, KRT_LOCK_REORDERING,
 	    KRT_LOCK_HOPLIMIT, KRT_LOCK_RTO_MIN, KRT_FEATURE_ECN, KRT_FEATURE_ALLFRAG)
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 9300e9c8..4ce9a328 100644
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -29,7 +29,7 @@ kif_set_preferred(ip_addr ip)
 
 CF_DECLS
 
-CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, KRT_SOURCE, KRT_METRIC, MERGE, PATHS)
+CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, MERGE, PATHS)
 CF_KEYWORDS(INTERFACE, PREFERRED)
 
 %type <i> kern_mp_limit

From 0c4e0e4a635169cada395144dd67d1e66f1c9649 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 May 2022 12:33:01 +0200
Subject: [PATCH 129/431] Removed forgotten remnants of unused enum rtc

---
 bird-gdb.py   | 1 -
 filter/data.c | 1 -
 lib/type.h    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index 3cf65a9c..62c0ec87 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -25,7 +25,6 @@ class BIRDFValPrinter(BIRDPrinter):
             "T_ENUM_RTS": "i",
             "T_ENUM_BGP_ORIGIN": "i",
             "T_ENUM_SCOPE": "i",
-            "T_ENUM_RTC": "i",
             "T_ENUM_RTD": "i",
             "T_ENUM_ROA": "i",
             "T_ENUM_NETTYPE": "i",
diff --git a/filter/data.c b/filter/data.c
index 425dfdd3..9dab1915 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -38,7 +38,6 @@ static const char * const f_type_str[] = {
   [T_ENUM_RTS]	= "enum rts",
   [T_ENUM_BGP_ORIGIN] = "enum bgp_origin",
   [T_ENUM_SCOPE] = "enum scope",
-  [T_ENUM_RTC]	= "enum rtc",
   [T_ENUM_RTD]	= "enum rtd",
   [T_ENUM_ROA]	= "enum roa",
   [T_ENUM_NETTYPE] = "enum nettype",
diff --git a/lib/type.h b/lib/type.h
index e43389f3..abce1a1f 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -79,7 +79,6 @@ enum btype {
 
   T_ENUM_RTS = 0x31,
   T_ENUM_SCOPE = 0x33,
-  T_ENUM_RTC = 0x35,
   T_ENUM_RTD = 0x37,
   T_ENUM_ROA = 0x39,
   T_ENUM_NETTYPE = 0x3b,

From d8661a4397e4576ac404661b192dd99d928e7890 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Apr 2022 10:25:14 +0200
Subject: [PATCH 130/431] Joined the RTA igp_metric and EA igp_metric
 attributes

---
 lib/route.h         |  7 ++-----
 nest/rt-attr.c      |  2 --
 nest/rt-table.c     |  6 ++++--
 proto/bgp/attrs.c   | 16 ++++++++--------
 proto/bgp/packets.c |  2 +-
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index f24fd555..3b368696 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -85,7 +85,6 @@ typedef struct rta {
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
   ip_addr from;				/* Advertising router */
-  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */
   u16 cached:1;				/* Are attributes cached? */
   u16 source:7;				/* Route source (RTS_...) */
   u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
@@ -118,10 +117,6 @@ typedef struct rta {
 #define RTD_PROHIBIT 4			/* Administratively prohibited */
 #define RTD_MAX 5
 
-#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
-					   protocol-specific metric is availabe */
-
-
 extern const char * rta_dest_names[RTD_MAX];
 
 static inline const char *rta_dest_name(uint n)
@@ -186,6 +181,8 @@ struct ea_class_ref {
   struct ea_class *class;
 };
 
+#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
+					   protocol-specific metric is availabe */
 extern struct ea_class ea_gen_igp_metric;
 
 void ea_register_init(struct ea_class *);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index a763db4d..6bb27623 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1225,7 +1225,6 @@ rta_hash(rta *a)
 #define BMIX(f) mem_hash_mix_num(&h, a->f);
   MIX(hostentry);
   MIX(from);
-  MIX(igp_metric);
   BMIX(source);
   BMIX(scope);
   BMIX(dest);
@@ -1241,7 +1240,6 @@ rta_same(rta *x, rta *y)
   return (x->source == y->source &&
 	  x->scope == y->scope &&
 	  x->dest == y->dest &&
-	  x->igp_metric == y->igp_metric &&
 	  ipa_equal(x->from, y->from) &&
 	  x->hostentry == y->hostentry &&
 	  nexthop_same(&(x->nh), &(y->nh)) &&
diff --git a/nest/rt-table.c b/nest/rt-table.c
index af59d63b..01194e02 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2386,7 +2386,8 @@ rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls)
 {
   a->hostentry = he;
   a->dest = he->dest;
-  a->igp_metric = he->igp_metric;
+
+  ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, he->igp_metric);
 
   if (a->dest != RTD_UNICAST)
   {
@@ -2483,7 +2484,8 @@ rta_next_hop_outdated(rta *a)
   if (!he->src)
     return a->dest != RTD_UNREACHABLE;
 
-  return (a->dest != he->dest) || (a->igp_metric != he->igp_metric) ||
+  return (a->dest != he->dest) ||
+    (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != he->igp_metric) ||
     (!he->nexthop_linkable) || !nexthop_same(&(a->nh), &(he->src->nh));
 }
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 72a4f68a..597cf96c 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -383,7 +383,7 @@ bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
     return 0;
 
   u64 aigp = get_u64(b + 3);
-  u64 step = e->attrs->igp_metric;
+  u64 step = rt_get_igp_metric(e);
 
   if (!rte_resolvable(e) || (step >= IGP_METRIC_UNKNOWN))
     step = BGP_AIGP_MAX;
@@ -2046,8 +2046,8 @@ bgp_rte_better(rte *new, rte *old)
     return 1;
 
   /* RFC 4271 9.1.2.2. e) Compare IGP metrics */
-  n = new_bgp->cf->igp_metric ? new->attrs->igp_metric : 0;
-  o = old_bgp->cf->igp_metric ? old->attrs->igp_metric : 0;
+  n = new_bgp->cf->igp_metric ? rt_get_igp_metric(new) : 0;
+  o = old_bgp->cf->igp_metric ? rt_get_igp_metric(old) : 0;
   if (n < o)
     return 1;
   if (n > o)
@@ -2155,8 +2155,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
     return 0;
 
   /* RFC 4271 9.1.2.2. e) Compare IGP metrics */
-  p = pri_bgp->cf->igp_metric ? pri->attrs->igp_metric : 0;
-  s = sec_bgp->cf->igp_metric ? sec->attrs->igp_metric : 0;
+  p = pri_bgp->cf->igp_metric ? rt_get_igp_metric(pri) : 0;
+  s = sec_bgp->cf->igp_metric ? rt_get_igp_metric(sec) : 0;
   if (p != s)
     return 0;
 
@@ -2394,14 +2394,14 @@ bgp_get_route_info(rte *e, byte *buf)
   {
     buf += bsprintf(buf, "/%lu", metric);
   }
-  else if (e->attrs->igp_metric)
+  else if (metric = rt_get_igp_metric(e))
   {
     if (!rte_resolvable(e))
       buf += bsprintf(buf, "/-");
-    else if (e->attrs->igp_metric >= IGP_METRIC_UNKNOWN)
+    else if (metric >= IGP_METRIC_UNKNOWN)
       buf += bsprintf(buf, "/?");
     else
-      buf += bsprintf(buf, "/%d", e->attrs->igp_metric);
+      buf += bsprintf(buf, "/%d", metric);
   }
   buf += bsprintf(buf, ") [");
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index a18ff373..5c9bb8ba 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -969,7 +969,7 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     a->dest = RTD_UNICAST;
     a->nh.gw = nbr->addr;
     a->nh.iface = nbr->iface;
-    a->igp_metric = c->cf->cost;
+    ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, c->cf->cost);
   }
   else /* GW_RECURSIVE */
   {

From 337c04c45e1472d6d9b531a3c55f1f2d30ebf308 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Apr 2022 12:24:26 +0200
Subject: [PATCH 131/431] Moved route preference to eattrs

---
 doc/bird.sgml         |  3 +--
 filter/config.Y       |  2 --
 filter/data.h         |  1 -
 filter/f-inst.c       |  5 -----
 lib/route.h           | 24 +++++++++++++++++-------
 nest/rt-attr.c        | 11 ++++++++---
 nest/rt-dev.c         |  3 ++-
 nest/rt-show.c        |  2 +-
 nest/rt-table.c       |  9 ++++++---
 nest/rt.h             |  1 +
 proto/babel/babel.c   | 12 +++++++-----
 proto/bgp/attrs.c     |  6 +++---
 proto/bgp/packets.c   |  2 +-
 proto/ospf/ospf.c     |  2 +-
 proto/ospf/rt.c       |  6 ++++--
 proto/perf/perf.c     |  3 ++-
 proto/rip/rip.c       |  8 ++++----
 proto/rpki/rpki.c     |  3 ++-
 proto/static/static.c |  7 ++++---
 sysdep/unix/krt.c     |  2 +-
 20 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 4df1d94f..a71624aa 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1732,8 +1732,7 @@ Common route attributes are:
 	default value for new routes is <cf/SCOPE_UNIVERSE/.
 
 	<tag><label id="rta-preference"><m/int/ preference</tag>
-	Preference of the route. Valid values are 0-65535. (See the chapter
-	about routing tables.)
+	Preference of the route.
 
 	<tag><label id="rta-from"><m/ip/ from</tag>
 	The router which the route has originated from.
diff --git a/filter/config.Y b/filter/config.Y
index f21f1c8e..dcfae788 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -286,7 +286,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 	IF, THEN, ELSE, CASE,
 	TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,
 	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS,
-	PREFERENCE,
 	ROA_CHECK, ASN, SRC, DST,
 	IS_V4, IS_V6,
 	LEN, MAXLEN,
@@ -773,7 +772,6 @@ static_attr:
  | IFNAME  { $$ = f_new_static_attr(T_STRING,     SA_IFNAME,	0); }
  | IFINDEX { $$ = f_new_static_attr(T_INT,        SA_IFINDEX,	1); }
  | WEIGHT  { $$ = f_new_static_attr(T_INT,        SA_WEIGHT,	0); }
- | PREFERENCE { $$ = f_new_static_attr(T_INT,	  SA_PREF,	0); }
  | GW_MPLS { $$ = f_new_static_attr(T_INT,        SA_GW_MPLS,	0); }
  ;
 
diff --git a/filter/data.h b/filter/data.h
index 4d2622ab..0e25ccd9 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -32,7 +32,6 @@ enum f_sa_code {
   SA_IFNAME,
   SA_IFINDEX,
   SA_WEIGHT,
-  SA_PREF,
   SA_GW_MPLS,
 } PACKED;
 
diff --git a/filter/f-inst.c b/filter/f-inst.c
index c5947955..9530d9ad 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -543,7 +543,6 @@
       case SA_IFNAME:	RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
       case SA_IFINDEX:	RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
       case SA_WEIGHT:	RESULT(sa.type, i, rta->nh.weight + 1); break;
-      case SA_PREF:	RESULT(sa.type, i, rta->pref); break;
       case SA_GW_MPLS:	RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
 
       default:
@@ -648,10 +647,6 @@
         }
 	break;
 
-      case SA_PREF:
-	rta->pref = v1.val.i;
-	break;
-
       default:
 	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
       }
diff --git a/lib/route.h b/lib/route.h
index 3b368696..be72bb16 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -89,7 +89,6 @@ typedef struct rta {
   u16 source:7;				/* Route source (RTS_...) */
   u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
   u16 dest:4;				/* Route destination type (RTD_...) */
-  word pref;
   struct nexthop nh;			/* Next hop */
 } rta;
 
@@ -181,10 +180,6 @@ struct ea_class_ref {
   struct ea_class *class;
 };
 
-#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
-					   protocol-specific metric is availabe */
-extern struct ea_class ea_gen_igp_metric;
-
 void ea_register_init(struct ea_class *);
 struct ea_class_ref *ea_register_alloc(pool *, struct ea_class);
 
@@ -290,6 +285,23 @@ static inline void
 ea_set_attr_data(ea_list **to, const struct ea_class *def, uint flags, void *data, uint len)
 { ea_set_attr(to, EA_LITERAL_STORE_ADATA(def, flags, data, len)); }
 
+/*
+ *	Common route attributes
+ */
+
+/* Preference: first-order comparison */
+extern struct ea_class ea_gen_preference;
+static inline u32 rt_get_preference(rte *rt)
+{ return ea_get_int(rt->attrs->eattrs, &ea_gen_preference, 0); }
+
+/* IGP metric: second-order comparison */
+extern struct ea_class ea_gen_igp_metric;
+u32 rt_get_igp_metric(rte *rt);
+#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
+					   protocol-specific metric is availabe */
+
+
+/* Next hop structures */
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
 
@@ -319,6 +331,4 @@ void rta_dump(rta *);
 void rta_dump_all(void);
 void rta_show(struct cli *, rta *);
 
-u32 rt_get_igp_metric(rte *rt);
-
 #endif
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 6bb27623..e5d87b53 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -65,6 +65,11 @@ struct ea_class ea_gen_igp_metric = {
   .type = T_INT,
 };
 
+struct ea_class ea_gen_preference = {
+  .name = "preference",
+  .type = T_INT,
+};
+
 const char * const rta_src_names[RTS_MAX] = {
   [RTS_STATIC]		= "static",
   [RTS_INHERIT]		= "inherit",
@@ -1228,7 +1233,6 @@ rta_hash(rta *a)
   BMIX(source);
   BMIX(scope);
   BMIX(dest);
-  MIX(pref);
 #undef MIX
 
   return mem_hash_value(&h) ^ nexthop_hash(&(a->nh)) ^ ea_hash(a->eattrs);
@@ -1389,8 +1393,8 @@ rta_dump(rta *a)
 			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
   static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
 
-  debug("pref=%d uc=%d %s %s%s h=%04x",
-	a->pref, a->uc, rts[a->source], ip_scope_text(a->scope),
+  debug("uc=%d %s %s%s h=%04x",
+	a->uc, rts[a->source], ip_scope_text(a->scope),
 	rtd[a->dest], a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
@@ -1469,6 +1473,7 @@ rta_init(void)
   rte_src_init();
   ea_class_init();
 
+  ea_register_init(&ea_gen_preference);
   ea_register_init(&ea_gen_igp_metric);
 }
 
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index bdf8584d..696b37b8 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -83,13 +83,14 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       struct rte_src *src = rt_get_source(P, ad->iface->index);
 
       rta a0 = {
-	.pref = c->preference,
 	.source = RTS_DEVICE,
 	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
 	.nh.iface = ad->iface,
       };
 
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, c->preference);
+
       a = rta_lookup(&a0);
       e = rte_get_temp(a, src);
       e->pflags = 0;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 7d02f52e..1c764d8c 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -61,7 +61,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   if (get_route_info)
     get_route_info(e, info);
   else
-    bsprintf(info, " (%d)", a->pref);
+    bsprintf(info, " (%d)", rt_get_preference(e));
 
   if (d->last_table != d->tab)
     rt_show_table(c, d);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 01194e02..919576bd 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -652,9 +652,12 @@ rte_better(rte *new, rte *old)
   if (!rte_is_valid(new))
     return 0;
 
-  if (new->attrs->pref > old->attrs->pref)
+  u32 np = rt_get_preference(new);
+  u32 op = rt_get_preference(old);
+
+  if (np > op)
     return 1;
-  if (new->attrs->pref < old->attrs->pref)
+  if (np < op)
     return 0;
   if (new->src->proto->proto != old->src->proto->proto)
     {
@@ -678,7 +681,7 @@ rte_mergable(rte *pri, rte *sec)
   if (!rte_is_valid(pri) || !rte_is_valid(sec))
     return 0;
 
-  if (pri->attrs->pref != sec->attrs->pref)
+  if (rt_get_preference(pri) != rt_get_preference(sec))
     return 0;
 
   if (pri->src->proto->proto != sec->src->proto->proto)
diff --git a/nest/rt.h b/nest/rt.h
index 7451a261..6bd9cd38 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -329,6 +329,7 @@ int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *
 #define DEF_PREF_BGP		100	/* BGP */
 #define DEF_PREF_RPKI		100	/* RPKI */
 #define DEF_PREF_INHERITED	10	/* Routes inherited from other routing daemons */
+#define DEF_PREF_UNKNOWN	0	/* Routes with no preference set */
 
 /*
  *	Route Origin Authorization
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 97dca4ac..afd0b1e1 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -645,10 +645,11 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   {
     struct {
       ea_list l;
-      eattr a[3];
+      eattr a[4];
     } eattrs = {
-      .l.count = 3,
+      .l.count = ARRAY_SIZE(eattrs.a),
       .a = {
+	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference),
 	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
 	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
 	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
@@ -659,7 +660,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       .source = RTS_BABEL,
       .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNICAST,
-      .pref = c->preference,
       .from = r->neigh->addr,
       .nh.gw = r->next_hop,
       .nh.iface = r->neigh->ifa->iface,
@@ -687,9 +687,10 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       .source = RTS_BABEL,
       .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNREACHABLE,
-      .pref = 1,
     };
 
+    ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, 1);
+
     rta *a = rta_lookup(&a0);
     rte *rte = rte_get_temp(a, p->p.main_source);
     rte->pflags = 0;
@@ -2025,7 +2026,8 @@ babel_get_route_info(rte *rte, byte *buf)
   if (e)
     memcpy(&rid, e->u.ptr->data, sizeof(u64));
 
-  buf += bsprintf(buf, " (%d/%d) [%lR]", rte->attrs->pref,
+  buf += bsprintf(buf, " (%d/%d) [%lR]",
+      rt_get_preference(rte),
       ea_get_int(rte->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY), rid);
 }
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 597cf96c..097ba9a2 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2169,7 +2169,7 @@ bgp_rte_mergable(rte *pri, rte *sec)
 static inline int
 same_group(rte *r, u32 lpref, u32 lasn)
 {
-  return (r->attrs->pref == lpref) && (bgp_get_neighbor(r) == lasn);
+  return (rt_get_preference(r) == lpref) && (bgp_get_neighbor(r) == lasn);
 }
 
 static inline int
@@ -2184,7 +2184,7 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 {
   rte *r, *s;
   rte *key = new ? new : old;
-  u32 lpref = key->attrs->pref;
+  u32 lpref = rt_get_preference(key);
   u32 lasn = bgp_get_neighbor(key);
   int old_suppressed = old ? !!(old->pflags & BGP_REF_SUPPRESSED) : 0;
 
@@ -2381,7 +2381,7 @@ bgp_get_route_info(rte *e, byte *buf)
   eattr *o = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
   u32 origas;
 
-  buf += bsprintf(buf, " (%d", e->attrs->pref);
+  buf += bsprintf(buf, " (%d", rt_get_preference(e));
 
   if (e->pflags & BGP_REF_SUPPRESSED)
     buf += bsprintf(buf, "-");
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 5c9bb8ba..45a4b1de 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2478,7 +2478,7 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
     a->scope = SCOPE_UNIVERSE;
     a->from = s->proto->remote_ip;
     a->eattrs = ea;
-    a->pref = c->c.preference;
+    ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, c->c.preference);
 
     c->desc->decode_next_hop(s, nh, nh_len, a);
     bgp_finish_attrs(s, a);
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 66d0eba6..427c2c86 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -588,7 +588,7 @@ ospf_get_route_info(rte * rte, byte * buf)
   }
 
   buf += bsprintf(buf, " %s", type);
-  buf += bsprintf(buf, " (%d/%d", rte->attrs->pref, ea_get_int(rte->attrs->eattrs, &ea_ospf_metric1, LSINFINITY));
+  buf += bsprintf(buf, " (%d/%d", rt_get_preference(rte), ea_get_int(rte->attrs->eattrs, &ea_ospf_metric1, LSINFINITY));
   if (rte->attrs->source == RTS_OSPF_EXT2)
     buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs->eattrs, &ea_ospf_metric2, LSINFINITY));
   buf += bsprintf(buf, ")");
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 55bad599..3d8cf22c 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2057,7 +2057,6 @@ again1:
 	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
 	.nh = *(nf->n.nhs),
-	.pref = p->p.main_channel->preference,
       };
 
       if (reload || ort_changed(nf, &a0))
@@ -2069,11 +2068,14 @@ again1:
 
 	struct {
 	  ea_list l;
-	  eattr a[4];
+	  eattr a[5];
 	} eattrs;
 
 	eattrs.l = (ea_list) {};
 
+	eattrs.a[eattrs.l.count++] =
+	  EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference);
+
 	eattrs.a[eattrs.l.count++] =
 	  EA_LITERAL_EMBEDDED(&ea_ospf_metric1, 0, nf->n.metric1);
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 2978100b..7b18866c 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -146,12 +146,13 @@ perf_loop(void *data)
 	.source = RTS_PERF,
 	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
-	.pref = p->p.main_channel->preference,
 	.nh.iface = p->ifa->iface,
 	.nh.gw = gw,
 	.nh.weight = 1,
       };
 
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
+
       p->data[i].a = rta_lookup(&a0);
     }
     else
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 52a3bd2c..244bcd0a 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -152,7 +152,6 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
   {
     /* Update */
     rta a0 = {
-      .pref = p->p.main_channel->preference,
       .source = RTS_RIP,
       .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNICAST,
@@ -197,11 +196,12 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 
     struct {
       ea_list l;
-      eattr a[3];
+      eattr a[4];
       struct rip_iface_adata riad;
     } ea_block = {
-      .l.count = 3,
+      .l.count = ARRAY_SIZE(ea_block.a),
       .a = {
+	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference),
 	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt_metric),
 	EA_LITERAL_EMBEDDED(&ea_rip_tag, 0, rt_tag),
 	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &ea_block.riad.ad),
@@ -1210,7 +1210,7 @@ rip_get_route_info(rte *rte, byte *buf)
   u32 rt_metric = ea_get_int(rte->attrs->eattrs, &ea_rip_metric, p->infinity);
   u32 rt_tag = ea_get_int(rte->attrs->eattrs, &ea_rip_tag, 0);
 
-  buf += bsprintf(buf, " (%d/%d)", rte->attrs->pref, rt_metric);
+  buf += bsprintf(buf, " (%d/%d)", rt_get_preference(rte), rt_metric);
 
   if (rt_tag)
     bsprintf(buf, " [%04x]", rt_tag);
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index d4e95a83..710764e2 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -121,12 +121,13 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
   struct rpki_proto *p = cache->p;
 
   rta a0 = {
-    .pref = channel->preference,
     .source = RTS_RPKI,
     .scope = SCOPE_UNIVERSE,
     .dest = RTD_NONE,
   };
 
+  ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, channel->preference);
+
   rta *a = rta_lookup(&a0);
   rte *e = rte_get_temp(a, p->p.main_source);
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 090ec875..d4b1c5f3 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -58,7 +58,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
   a->source = RTS_STATIC;
   a->scope = SCOPE_UNIVERSE;
   a->dest = r->dest;
-  a->pref = p->p.main_channel->preference;
+  ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
 
   if (r->dest == RTD_UNICAST)
   {
@@ -712,10 +712,11 @@ static void
 static_get_route_info(rte *rte, byte *buf)
 {
   eattr *a = ea_find(rte->attrs->eattrs, &ea_gen_igp_metric);
+  u32 pref = rt_get_preference(rte);
   if (a)
-    buf += bsprintf(buf, " (%d/%u)", rte->attrs->pref, a->u.data);
+    buf += bsprintf(buf, " (%d/%u)", pref, a->u.data);
   else
-    buf += bsprintf(buf, " (%d)", rte->attrs->pref);
+    buf += bsprintf(buf, " (%d)", pref);
 }
 
 static void
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 4da51ce2..b8e7670e 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -438,7 +438,7 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
   rte *g, **gg, *best, **bestp, *old_best;
 
   ASSERT(!e->attrs->cached);
-  e->attrs->pref = p->p.main_channel->preference;
+  ea_set_attr_u32(&e->attrs->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
 
   e->attrs = rta_lookup(e->attrs);
 

From 702c04fbef222e802ca4dfac645dc75ede522db6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 May 2022 12:41:54 +0200
Subject: [PATCH 132/431] Removing the route scope attribute. Use custom
 attributes instead.

The route scope attribute was used for simple user route marking. As
there is a better tool for this (custom attributes), the old and limited
way can be dropped.
---
 doc/bird.sgml          | 8 --------
 filter/config.Y        | 1 -
 filter/data.h          | 1 -
 filter/f-inst.c        | 5 -----
 filter/test.conf2      | 6 ------
 lib/route.h            | 1 -
 nest/rt-attr.c         | 8 +++-----
 nest/rt-dev.c          | 1 -
 proto/babel/babel.c    | 2 --
 proto/bgp/packets.c    | 1 -
 proto/ospf/rt.c        | 1 -
 proto/perf/perf.c      | 1 -
 proto/rip/rip.c        | 1 -
 proto/rpki/rpki.c      | 1 -
 proto/static/static.c  | 1 -
 sysdep/bsd/krt-sock.c  | 1 -
 sysdep/linux/netlink.c | 1 -
 17 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index a71624aa..aa058b37 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1723,14 +1723,6 @@ Common route attributes are:
 	primary key of the routing table. Read-only. (See the <ref id="routes"
 	name="chapter about routes">.)
 
-	<tag><label id="rta-scope"><m/enum/ scope</tag>
-	The scope of the route. Possible values: <cf/SCOPE_HOST/ for routes
-	local to this host, <cf/SCOPE_LINK/ for those specific for a physical
-	link, <cf/SCOPE_SITE/ and <cf/SCOPE_ORGANIZATION/ for private routes and
-	<cf/SCOPE_UNIVERSE/ for globally visible routes. This attribute is not
-	interpreted by BIRD and can be used to mark routes in filters. The
-	default value for new routes is <cf/SCOPE_UNIVERSE/.
-
 	<tag><label id="rta-preference"><m/int/ preference</tag>
 	Preference of the route.
 
diff --git a/filter/config.Y b/filter/config.Y
index 7dcdb779..6af39c10 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -766,7 +766,6 @@ static_attr:
  | NET     { $$ = f_new_static_attr(T_NET,	  SA_NET,	1); }
  | PROTO   { $$ = f_new_static_attr(T_STRING,     SA_PROTO,	1); }
  | SOURCE  { $$ = f_new_static_attr(T_ENUM_RTS,   SA_SOURCE,	1); }
- | SCOPE   { $$ = f_new_static_attr(T_ENUM_SCOPE, SA_SCOPE,	0); }
  | DEST    { $$ = f_new_static_attr(T_ENUM_RTD,   SA_DEST,	0); }
  | IFNAME  { $$ = f_new_static_attr(T_STRING,     SA_IFNAME,	0); }
  | IFINDEX { $$ = f_new_static_attr(T_INT,        SA_IFINDEX,	1); }
diff --git a/filter/data.h b/filter/data.h
index a0a164ed..49b29499 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -26,7 +26,6 @@ enum f_sa_code {
   SA_NET,
   SA_PROTO,
   SA_SOURCE,
-  SA_SCOPE,
   SA_DEST,
   SA_IFNAME,
   SA_IFINDEX,
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 7158d22e..5eacc716 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -537,7 +537,6 @@
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
       case SA_SOURCE:	RESULT(sa.type, i, rta->source); break;
-      case SA_SCOPE:	RESULT(sa.type, i, rta->scope); break;
       case SA_DEST:	RESULT(sa.type, i, rta->dest); break;
       case SA_IFNAME:	RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
       case SA_IFINDEX:	RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
@@ -579,10 +578,6 @@
 	}
 	break;
 
-      case SA_SCOPE:
-	rta->scope = v1.val.i;
-	break;
-
       case SA_DEST:
 	{
 	  int i = v1.val.i;
diff --git a/filter/test.conf2 b/filter/test.conf2
index e95f9563..9fc8330f 100644
--- a/filter/test.conf2
+++ b/filter/test.conf2
@@ -38,12 +38,6 @@ protocol static {
 			print from;
 			from = 1.2.3.4;
 			print from;
-			print scope;
-			scope = SCOPE_HOST;
-			print scope;
-			if !(scope ~ [ SCOPE_HOST, SCOPE_SITE ]) then {
-				print "Failed in test";
-			}
 
 			preference = 15;
 			print preference;
diff --git a/lib/route.h b/lib/route.h
index e02c63b3..40ba150d 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -86,7 +86,6 @@ typedef struct rta {
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
   u16 cached:1;				/* Are attributes cached? */
   u16 source:7;				/* Route source (RTS_...) */
-  u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
   u16 dest:4;				/* Route destination type (RTD_...) */
   struct nexthop nh;			/* Next hop */
 } rta;
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 87f54b0d..a892bfd5 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1235,7 +1235,6 @@ rta_hash(rta *a)
 #define BMIX(f) mem_hash_mix_num(&h, a->f);
   MIX(hostentry);
   BMIX(source);
-  BMIX(scope);
   BMIX(dest);
 #undef MIX
 
@@ -1246,7 +1245,6 @@ static inline int
 rta_same(rta *x, rta *y)
 {
   return (x->source == y->source &&
-	  x->scope == y->scope &&
 	  x->dest == y->dest &&
 	  x->hostentry == y->hostentry &&
 	  nexthop_same(&(x->nh), &(y->nh)) &&
@@ -1396,8 +1394,8 @@ rta_dump(rta *a)
 			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
   static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
 
-  debug("uc=%d %s %s%s h=%04x",
-	a->uc, rts[a->source], ip_scope_text(a->scope),
+  debug("uc=%d %s %s h=%04x",
+	a->uc, rts[a->source],
 	rtd[a->dest], a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
@@ -1443,7 +1441,7 @@ rta_dump_all(void)
 void
 rta_show(struct cli *c, rta *a)
 {
-  cli_printf(c, -1008, "\tType: %s %s", rta_src_names[a->source], ip_scope_text(a->scope));
+  cli_printf(c, -1008, "\tType: %s", rta_src_names[a->source]);
 
   for(ea_list *eal = a->eattrs; eal; eal=eal->next)
     for(int i=0; i<eal->count; i++)
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 696b37b8..ffd5afd5 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -84,7 +84,6 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
 
       rta a0 = {
 	.source = RTS_DEVICE,
-	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
 	.nh.iface = ad->iface,
       };
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index f4503b99..cd221c7b 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -659,7 +659,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
 
     rta a0 = {
       .source = RTS_BABEL,
-      .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNICAST,
       .nh.gw = r->next_hop,
       .nh.iface = r->neigh->ifa->iface,
@@ -685,7 +684,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     /* Unreachable */
     rta a0 = {
       .source = RTS_BABEL,
-      .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNREACHABLE,
     };
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 9760ebee..62d60e9a 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2475,7 +2475,6 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
     a = allocz(RTA_MAX_SIZE);
 
     a->source = RTS_BGP;
-    a->scope = SCOPE_UNIVERSE;
     a->eattrs = ea;
 
     ea_set_attr_data(&a->eattrs, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr));
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 3d8cf22c..ddc5b162 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2054,7 +2054,6 @@ again1:
     {
       rta a0 = {
 	.source = nf->n.type,
-	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
 	.nh = *(nf->n.nhs),
       };
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 7b18866c..47a2867d 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -144,7 +144,6 @@ perf_loop(void *data)
     if (!p->attrs_per_rte || !(i % p->attrs_per_rte)) {
       struct rta a0 = {
 	.source = RTS_PERF,
-	.scope = SCOPE_UNIVERSE,
 	.dest = RTD_UNICAST,
 	.nh.iface = p->ifa->iface,
 	.nh.gw = gw,
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 7c097a92..f5442606 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -153,7 +153,6 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
     /* Update */
     rta a0 = {
       .source = RTS_RIP,
-      .scope = SCOPE_UNIVERSE,
       .dest = RTD_UNICAST,
     };
 
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 710764e2..af963f49 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -122,7 +122,6 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
 
   rta a0 = {
     .source = RTS_RPKI,
-    .scope = SCOPE_UNIVERSE,
     .dest = RTD_NONE,
   };
 
diff --git a/proto/static/static.c b/proto/static/static.c
index d4b1c5f3..ff833b16 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -56,7 +56,6 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
   rta *a = allocz(RTA_MAX_SIZE);
   struct rte_src *src = static_get_source(p, r->index);
   a->source = RTS_STATIC;
-  a->scope = SCOPE_UNIVERSE;
   a->dest = r->dest;
   ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
 
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 844b9f83..bc6b1839 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -521,7 +521,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   rta a = {
     .src = p->p.main_source,
     .source = RTS_INHERIT,
-    .scope = SCOPE_UNIVERSE,
   };
 
   /* reject/blackhole routes have also set RTF_GATEWAY,
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 23d41b56..c506c71c 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1855,7 +1855,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 
   rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
   ra->source = RTS_INHERIT;
-  ra->scope = SCOPE_UNIVERSE;
 
   if (a[RTA_FLOW])
     s->rta_flow = rta_get_u32(a[RTA_FLOW]);

From 1c30b689ddd032ef8000fb7836348a48ba3184ff Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 May 2022 14:41:51 +0200
Subject: [PATCH 133/431] Moved route source attribute (RTS_*) to eattrs

---
 filter/config.Y        |  3 +--
 filter/data.h          |  1 -
 filter/f-inst.c        |  1 -
 lib/route.h            | 12 +++++++++---
 lib/type_test.c        |  1 +
 nest/rt-attr.c         | 32 ++++++++++++++++++++------------
 nest/rt-dev.c          |  2 +-
 nest/rt-table.c        |  8 ++++----
 proto/babel/babel.c    |  6 +++---
 proto/bgp/attrs.c      |  2 +-
 proto/bgp/config.Y     |  2 +-
 proto/bgp/packets.c    |  2 +-
 proto/ospf/ospf.c      | 22 +++++++++++++---------
 proto/ospf/rt.c        | 21 ++++++++++++++++-----
 proto/perf/perf.c      |  2 +-
 proto/rip/rip.c        |  4 ++--
 proto/rpki/rpki.c      |  2 +-
 proto/static/static.c  |  2 +-
 sysdep/bsd/krt-sock.c  |  3 ++-
 sysdep/linux/netlink.c |  2 +-
 20 files changed, 79 insertions(+), 51 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index 6af39c10..ca792593 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -285,7 +285,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 	SET, STRING, BGPMASK, BGPPATH, CLIST, ECLIST, LCLIST,
 	IF, THEN, ELSE, CASE,
 	TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,
-	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS,
+	FROM, GW, NET, MASK, PROTO, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS,
 	ROA_CHECK, ASN, SRC, DST,
 	IS_V4, IS_V6,
 	LEN, MAXLEN,
@@ -765,7 +765,6 @@ static_attr:
    GW      { $$ = f_new_static_attr(T_IP,         SA_GW,	0); }
  | NET     { $$ = f_new_static_attr(T_NET,	  SA_NET,	1); }
  | PROTO   { $$ = f_new_static_attr(T_STRING,     SA_PROTO,	1); }
- | SOURCE  { $$ = f_new_static_attr(T_ENUM_RTS,   SA_SOURCE,	1); }
  | DEST    { $$ = f_new_static_attr(T_ENUM_RTD,   SA_DEST,	0); }
  | IFNAME  { $$ = f_new_static_attr(T_STRING,     SA_IFNAME,	0); }
  | IFINDEX { $$ = f_new_static_attr(T_INT,        SA_IFINDEX,	1); }
diff --git a/filter/data.h b/filter/data.h
index 49b29499..23db4a85 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -25,7 +25,6 @@ enum f_sa_code {
   SA_GW = 1,
   SA_NET,
   SA_PROTO,
-  SA_SOURCE,
   SA_DEST,
   SA_IFNAME,
   SA_IFINDEX,
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 5eacc716..23271ce7 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -536,7 +536,6 @@
       case SA_GW:	RESULT(sa.type, ip, rta->nh.gw); break;
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
-      case SA_SOURCE:	RESULT(sa.type, i, rta->source); break;
       case SA_DEST:	RESULT(sa.type, i, rta->dest); break;
       case SA_IFNAME:	RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
       case SA_IFINDEX:	RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
diff --git a/lib/route.h b/lib/route.h
index 40ba150d..8fdb5d8b 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -85,7 +85,6 @@ typedef struct rta {
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
   u16 cached:1;				/* Are attributes cached? */
-  u16 source:7;				/* Route source (RTS_...) */
   u16 dest:4;				/* Route destination type (RTD_...) */
   struct nexthop nh;			/* Next hop */
 } rta;
@@ -131,12 +130,13 @@ static inline int rte_is_reachable(rte *r)
 typedef struct eattr {
   word id;				/* EA_CODE(PROTOCOL_..., protocol-dependent ID) */
   byte flags;				/* Protocol-dependent flags */
-  byte type:5;				/* Attribute type */
+  byte type;				/* Attribute type */
+  byte rfu:5;
   byte originated:1;			/* The attribute has originated locally */
   byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
   byte undef:1;				/* Explicitly undefined */
 
-  PADDING(unused, 0, 4);
+  PADDING(unused, 3, 3);
 
   union bval u;
 } eattr;
@@ -308,6 +308,12 @@ u32 rt_get_igp_metric(rte *rt);
 /* From: Advertising router */
 extern struct ea_class ea_gen_from;
 
+/* Source: An old method to devise the route source protocol and kind.
+ * To be superseded in a near future by something more informative. */
+extern struct ea_class ea_gen_source;
+static inline u32 rt_get_source_attr(rte *rt)
+{ return ea_get_int(rt->attrs->eattrs, &ea_gen_source, 0); }
+
 /* Next hop structures */
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
diff --git a/lib/type_test.c b/lib/type_test.c
index 20e7630b..b526db69 100644
--- a/lib/type_test.c
+++ b/lib/type_test.c
@@ -54,6 +54,7 @@ t_eattr(void)
   e.id = ~0;
   e.flags = ~0;
   e.type = ~0;
+  e.rfu = ~0;
   e.originated = ~0;
   e.fresh = ~0;
   e.undef = ~0;
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index a892bfd5..39fd7db4 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -92,6 +92,22 @@ const char * const rta_src_names[RTS_MAX] = {
   [RTS_RPKI]		= "RPKI",
 };
 
+static void
+ea_gen_source_format(const eattr *a, byte *buf, uint size)
+{
+  if ((a->u.data >= RTS_MAX) || !rta_src_names[a->u.data])
+    bsnprintf(buf, size, "unknown");
+  else
+    bsnprintf(buf, size, "%s", rta_src_names[a->u.data]);
+}
+
+struct ea_class ea_gen_source = {
+  .name = "source",
+  .type = T_ENUM_RTS,
+  .readonly = 1,
+  .format = ea_gen_source_format,
+};
+
 const char * rta_dest_names[RTD_MAX] = {
   [RTD_NONE]		= "",
   [RTD_UNICAST]		= "unicast",
@@ -1234,7 +1250,6 @@ rta_hash(rta *a)
 #define MIX(f) mem_hash_mix(&h, &(a->f), sizeof(a->f));
 #define BMIX(f) mem_hash_mix_num(&h, a->f);
   MIX(hostentry);
-  BMIX(source);
   BMIX(dest);
 #undef MIX
 
@@ -1244,8 +1259,7 @@ rta_hash(rta *a)
 static inline int
 rta_same(rta *x, rta *y)
 {
-  return (x->source == y->source &&
-	  x->dest == y->dest &&
+  return (x->dest == y->dest &&
 	  x->hostentry == y->hostentry &&
 	  nexthop_same(&(x->nh), &(y->nh)) &&
 	  ea_same(x->eattrs, y->eattrs));
@@ -1388,15 +1402,10 @@ rta_do_cow(rta *o, linpool *lp)
 void
 rta_dump(rta *a)
 {
-  static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
-			 "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",
-			 "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1",
-			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
   static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
 
-  debug("uc=%d %s %s h=%04x",
-	a->uc, rts[a->source],
-	rtd[a->dest], a->hash_key);
+  debug("uc=%d %s h=%04x",
+	a->uc, rtd[a->dest], a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
   if (a->dest == RTD_UNICAST)
@@ -1441,8 +1450,6 @@ rta_dump_all(void)
 void
 rta_show(struct cli *c, rta *a)
 {
-  cli_printf(c, -1008, "\tType: %s", rta_src_names[a->source]);
-
   for(ea_list *eal = a->eattrs; eal; eal=eal->next)
     for(int i=0; i<eal->count; i++)
       ea_show(c, &eal->attrs[i]);
@@ -1476,6 +1483,7 @@ rta_init(void)
   ea_register_init(&ea_gen_preference);
   ea_register_init(&ea_gen_igp_metric);
   ea_register_init(&ea_gen_from);
+  ea_register_init(&ea_gen_source);
 }
 
 /*
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index ffd5afd5..af6506f6 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -83,12 +83,12 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       struct rte_src *src = rt_get_source(P, ad->iface->index);
 
       rta a0 = {
-	.source = RTS_DEVICE,
 	.dest = RTD_UNICAST,
 	.nh.iface = ad->iface,
       };
 
       ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, c->preference);
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_DEVICE);
 
       a = rta_lookup(&a0);
       e = rte_get_temp(a, src);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e8b04e0b..4f119ac0 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2588,7 +2588,7 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, i
   trie_add_prefix(tab_flow->flowspec_trie, &dst, (nb ? nb->n.addr->pxlen : 0), max_pxlen);
 
   /* No best-match BGP route -> no flowspec */
-  if (!rb || (rb->attrs->source != RTS_BGP))
+  if (!rb || (rt_get_source_attr(rb) != RTS_BGP))
     return 0;
 
   /* Find ORIGINATOR_ID values */
@@ -2620,7 +2620,7 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, i
       continue;
 
     rte *rc = nc->routes;
-    if (rc->attrs->source != RTS_BGP)
+    if (rt_get_source_attr(rc) != RTS_BGP)
       return 0;
 
     if (rta_get_first_asn(rc->attrs) != asn_b)
@@ -2637,7 +2637,7 @@ static rte *
 rt_flowspec_update_rte(rtable *tab, rte *r)
 {
 #ifdef CONFIG_BGP
-  if (r->attrs->source != RTS_BGP)
+  if (rt_get_source_attr(r) != RTS_BGP)
     return NULL;
 
   struct bgp_channel *bc = (struct bgp_channel *) r->sender;
@@ -3471,7 +3471,7 @@ rt_get_igp_metric(rte *rt)
   if (ea)
     return ea->u.data;
 
-  if (rt->attrs->source == RTS_DEVICE)
+  if (rt_get_source_attr(rt) == RTS_DEVICE)
     return 0;
 
   if (rt->src->proto->rte_igp_metric)
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index cd221c7b..a7dcee09 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -645,12 +645,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   {
     struct {
       ea_list l;
-      eattr a[5];
+      eattr a[6];
     } eattrs = {
       .l.count = ARRAY_SIZE(eattrs.a),
       .a = {
 	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference),
 	EA_LITERAL_STORE_ADATA(&ea_gen_from, 0, &r->neigh->addr, sizeof(r->neigh->addr)),
+	EA_LITERAL_EMBEDDED(&ea_gen_source, 0, RTS_BABEL),
 	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
 	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
 	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
@@ -658,7 +659,6 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
     };
 
     rta a0 = {
-      .source = RTS_BABEL,
       .dest = RTD_UNICAST,
       .nh.gw = r->next_hop,
       .nh.iface = r->neigh->ifa->iface,
@@ -683,11 +683,11 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   {
     /* Unreachable */
     rta a0 = {
-      .source = RTS_BABEL,
       .dest = RTD_UNREACHABLE,
     };
 
     ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, 1);
+    ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_BABEL);
 
     rta *a = rta_lookup(&a0);
     rte *rte = rte_get_temp(a, p->p.main_source);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 097ba9a2..1efc26ce 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -402,7 +402,7 @@ bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
 static inline int
 bgp_init_aigp_metric(rte *e, u64 *metric, const struct adata **ad)
 {
-  if (e->attrs->source == RTS_BGP)
+  if (rt_get_source_attr(e) == RTS_BGP)
     return 0;
 
   *metric = rt_get_igp_metric(e);
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index b4d8b83f..24f3ec8f 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -43,7 +43,7 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,
 
 CF_GRAMMAR
 
-toksym: BGP_MED | BGP_LOCAL_PREF ;
+toksym: BGP_MED | BGP_LOCAL_PREF | SOURCE ;
 
 proto: bgp_proto '}'  ;
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 62d60e9a..0aa4dc40 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2474,11 +2474,11 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
   {
     a = allocz(RTA_MAX_SIZE);
 
-    a->source = RTS_BGP;
     a->eattrs = ea;
 
     ea_set_attr_data(&a->eattrs, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr));
     ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, c->c.preference);
+    ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_BGP);
 
     c->desc->decode_next_hop(s, nh, nh_len, a);
     bgp_finish_attrs(s, a);
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 427c2c86..731adaa5 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -392,15 +392,18 @@ ospf_rte_better(struct rte *new, struct rte *old)
   if (new_metric1 == LSINFINITY)
     return 0;
 
-  if(new->attrs->source < old->attrs->source) return 1;
-  if(new->attrs->source > old->attrs->source) return 0;
+  u32 ns = rt_get_source_attr(new);
+  u32 os = rt_get_source_attr(old);
 
-  if(new->attrs->source == RTS_OSPF_EXT2)
+  if (ns < os) return 1;
+  if (ns > os) return 0;
+
+  if (ns == RTS_OSPF_EXT2)
   {
     u32 old_metric2 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
     u32 new_metric2 = ea_get_int(new->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
-    if(new_metric2 < old_metric2) return 1;
-    if(new_metric2 > old_metric2) return 0;
+    if (new_metric2 < old_metric2) return 1;
+    if (new_metric2 > old_metric2) return 0;
   }
 
   u32 old_metric1 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
@@ -413,7 +416,7 @@ ospf_rte_better(struct rte *new, struct rte *old)
 static u32
 ospf_rte_igp_metric(struct rte *rt)
 {
-  if (rt->attrs->source == RTS_OSPF_EXT2)
+  if (rt_get_source_attr(rt) == RTS_OSPF_EXT2)
     return IGP_METRIC_UNKNOWN;
 
   return ea_get_int(rt->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
@@ -571,7 +574,8 @@ ospf_get_route_info(rte * rte, byte * buf)
 {
   char *type = "<bug>";
 
-  switch (rte->attrs->source)
+  uint source = rt_get_source_attr(rte);
+  switch (source)
   {
   case RTS_OSPF:
     type = "I";
@@ -589,10 +593,10 @@ ospf_get_route_info(rte * rte, byte * buf)
 
   buf += bsprintf(buf, " %s", type);
   buf += bsprintf(buf, " (%d/%d", rt_get_preference(rte), ea_get_int(rte->attrs->eattrs, &ea_ospf_metric1, LSINFINITY));
-  if (rte->attrs->source == RTS_OSPF_EXT2)
+  if (source == RTS_OSPF_EXT2)
     buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs->eattrs, &ea_ospf_metric2, LSINFINITY));
   buf += bsprintf(buf, ")");
-  if (rte->attrs->source == RTS_OSPF_EXT1 || rte->attrs->source == RTS_OSPF_EXT2)
+  if (source == RTS_OSPF_EXT1 || source == RTS_OSPF_EXT2)
   {
     eattr *ea = ea_find(rte->attrs->eattrs, &ea_ospf_tag);
     if (ea && (ea->u.data > 0))
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index ddc5b162..91739056 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2004,11 +2004,19 @@ static inline int
 ort_changed(ort *nf, rta *nr)
 {
   rta *or = nf->old_rta;
-  return !or ||
+
+  if (!or ||
     (nf->n.metric1 != nf->old_metric1) || (nf->n.metric2 != nf->old_metric2) ||
     (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid) ||
-    (nr->source != or->source) || (nr->dest != or->dest) ||
-    !nexthop_same(&(nr->nh), &(or->nh));
+    (nr->dest != or->dest) ||
+    !nexthop_same(&(nr->nh), &(or->nh)))
+    return 1;
+
+  if (	ea_get_int(nr->eattrs, &ea_gen_source, 0)
+     != ea_get_int(or->eattrs, &ea_gen_source, 0))
+    return 1;
+
+  return 0;
 }
 
 static void
@@ -2053,7 +2061,6 @@ again1:
     if (nf->n.type) /* Add the route */
     {
       rta a0 = {
-	.source = nf->n.type,
 	.dest = RTD_UNICAST,
 	.nh = *(nf->n.nhs),
       };
@@ -2067,7 +2074,7 @@ again1:
 
 	struct {
 	  ea_list l;
-	  eattr a[5];
+	  eattr a[6];
 	} eattrs;
 
 	eattrs.l = (ea_list) {};
@@ -2075,6 +2082,9 @@ again1:
 	eattrs.a[eattrs.l.count++] =
 	  EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference);
 
+	eattrs.a[eattrs.l.count++] = 
+	  EA_LITERAL_EMBEDDED(&ea_gen_source, 0, nf->n.type);
+
 	eattrs.a[eattrs.l.count++] =
 	  EA_LITERAL_EMBEDDED(&ea_ospf_metric1, 0, nf->n.metric1);
 
@@ -2089,6 +2099,7 @@ again1:
 	eattrs.a[eattrs.l.count++] =
 	  EA_LITERAL_EMBEDDED(&ea_ospf_router_id, 0, nf->n.rid);
 
+	ASSERT_DIE(ARRAY_SIZE(eattrs.a) >= eattrs.l.count);
 	a0.eattrs = &eattrs.l;
 
 	rta *a = rta_lookup(&a0);
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 47a2867d..4329556c 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -143,7 +143,6 @@ perf_loop(void *data)
 
     if (!p->attrs_per_rte || !(i % p->attrs_per_rte)) {
       struct rta a0 = {
-	.source = RTS_PERF,
 	.dest = RTD_UNICAST,
 	.nh.iface = p->ifa->iface,
 	.nh.gw = gw,
@@ -151,6 +150,7 @@ perf_loop(void *data)
       };
 
       ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_PERF);
 
       p->data[i].a = rta_lookup(&a0);
     }
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index f5442606..f7f34c27 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -152,17 +152,17 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
   {
     /* Update */
     rta a0 = {
-      .source = RTS_RIP,
       .dest = RTD_UNICAST,
     };
 
     struct {
       ea_list l;
-      eattr a[2];
+      eattr a[3];
     } ea_block = {
       .l.count = ARRAY_SIZE(ea_block.a),
       .a = {
 	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference),
+	EA_LITERAL_EMBEDDED(&ea_gen_source, 0, RTS_RIP),
 	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt->metric),
       },
     };
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index af963f49..56d8add2 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -121,11 +121,11 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
   struct rpki_proto *p = cache->p;
 
   rta a0 = {
-    .source = RTS_RPKI,
     .dest = RTD_NONE,
   };
 
   ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, channel->preference);
+  ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_RPKI);
 
   rta *a = rta_lookup(&a0);
   rte *e = rte_get_temp(a, p->p.main_source);
diff --git a/proto/static/static.c b/proto/static/static.c
index ff833b16..1400e985 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -55,9 +55,9 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 {
   rta *a = allocz(RTA_MAX_SIZE);
   struct rte_src *src = static_get_source(p, r->index);
-  a->source = RTS_STATIC;
   a->dest = r->dest;
   ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
+  ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_STATIC);
 
   if (r->dest == RTD_UNICAST)
   {
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index bc6b1839..61ac7a5c 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -520,9 +520,10 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
 
   rta a = {
     .src = p->p.main_source,
-    .source = RTS_INHERIT,
   };
 
+  ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_INHERIT);
+
   /* reject/blackhole routes have also set RTF_GATEWAY,
      we wil check them first. */
 
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index c506c71c..e0219ce0 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1854,7 +1854,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     nl_announce_route(s);
 
   rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
-  ra->source = RTS_INHERIT;
+  ea_set_attr_u32(&ra->eattrs, &ea_gen_source, 0, RTS_INHERIT);
 
   if (a[RTA_FLOW])
     s->rta_flow = rta_get_u32(a[RTA_FLOW]);

From f2e725a76882ba6b75c3ce4fb3c760bd83462410 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 5 May 2022 19:28:56 +0200
Subject: [PATCH 134/431] All outstanding MPLS label stacks are stored as adata

---
 conf/confbase.Y       | 16 +++++++++-------
 lib/ip.h              |  4 ----
 lib/route.h           |  5 ++++-
 nest/rt-attr.c        | 11 +++++++++--
 nest/rt-table.c       | 27 +++++++++++----------------
 nest/rt.h             |  6 +++---
 proto/bgp/packets.c   | 43 +++++++++++++++++++++++--------------------
 proto/static/static.c | 28 +++++++++-------------------
 proto/static/static.h |  2 +-
 9 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 8a27c3d5..9a83083c 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -92,7 +92,7 @@ CF_DECLS
   struct proto_spec ps;
   struct channel_limit cl;
   struct timeformat *tf;
-  mpls_label_stack *mls;
+  struct adata *ad;
   struct bytestring *bs;
 }
 
@@ -113,7 +113,7 @@ CF_DECLS
 %type <a> ipa
 %type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
 %type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_ net_ip6_sadr_ net_mpls_
-%type <mls> label_stack_start label_stack
+%type <ad> label_stack_start label_stack
 
 %type <t> text opttext
 %type <s> symbol symbol_known toksym 
@@ -351,17 +351,19 @@ net_or_ipa:
 
 label_stack_start: NUM
 {
-  $$ = cfg_allocz(sizeof(mpls_label_stack));
-  $$->len = 1;
-  $$->stack[0] = $1;
+  $$ = cfg_allocz(ADATA_SIZE(MPLS_MAX_LABEL_STACK * sizeof(u32)));
+  $$->length = sizeof(u32);
+  *((u32 *)$$->data) = $1;
 };
 
 label_stack:
     label_stack_start
   | label_stack '/' NUM {
-    if ($1->len >= MPLS_MAX_LABEL_STACK)
+    if ($1->length >= MPLS_MAX_LABEL_STACK * sizeof(u32))
       cf_error("Too many labels in stack");
-    $1->stack[$1->len++] = $3;
+
+    *((u32 *)($$->data + $1->length)) = $3;
+    $1->length += sizeof(u32);
     $$ = $1;
   }
 ;
diff --git a/lib/ip.h b/lib/ip.h
index 9eef2e16..8f975aba 100644
--- a/lib/ip.h
+++ b/lib/ip.h
@@ -363,10 +363,6 @@ static inline ip6_addr ip6_ntoh(ip6_addr a)
 { return _MI6(ntohl(_I0(a)), ntohl(_I1(a)), ntohl(_I2(a)), ntohl(_I3(a))); }
 
 #define MPLS_MAX_LABEL_STACK 8
-typedef struct mpls_label_stack {
-  uint len;
-  u32 stack[MPLS_MAX_LABEL_STACK];
-} mpls_label_stack;
 
 static inline int
 mpls_get(const char *buf, int buflen, u32 *stack)
diff --git a/lib/route.h b/lib/route.h
index 8fdb5d8b..5423ada3 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -70,7 +70,6 @@ struct nexthop {
   struct nexthop *next;
   byte flags;
   byte weight;
-  byte labels_orig;			/* Number of labels before hostentry was applied */
   byte labels;				/* Number of all labels */
   u32 label[0];
 };
@@ -314,6 +313,10 @@ extern struct ea_class ea_gen_source;
 static inline u32 rt_get_source_attr(rte *rt)
 { return ea_get_int(rt->attrs->eattrs, &ea_gen_source, 0); }
 
+/* MPLS labels: Use with a recursive nexthop specification
+ * to add additional labels to the resolved nexthop */
+extern struct ea_class ea_mpls_labels;
+
 /* Next hop structures */
 
 #define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 39fd7db4..dc4fe785 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -108,6 +108,12 @@ struct ea_class ea_gen_source = {
   .format = ea_gen_source_format,
 };
 
+struct ea_class ea_mpls_labels = {
+  .name = "mpls_labels",
+  .type = T_CLIST,
+  .readonly = 1,
+};
+
 const char * rta_dest_names[RTD_MAX] = {
   [RTD_NONE]		= "",
   [RTD_UNICAST]		= "unicast",
@@ -220,7 +226,7 @@ nexthop__same(struct nexthop *x, struct nexthop *y)
   {
     if (!ipa_equal(x->gw, y->gw) || (x->iface != y->iface) ||
 	(x->flags != y->flags) || (x->weight != y->weight) ||
-	(x->labels_orig != y->labels_orig) || (x->labels != y->labels))
+	(x->labels != y->labels))
       return 0;
 
     for (int i = 0; i < x->labels; i++)
@@ -402,7 +408,6 @@ nexthop_copy(struct nexthop *o)
       n->next = NULL;
       n->flags = o->flags;
       n->weight = o->weight;
-      n->labels_orig = o->labels_orig;
       n->labels = o->labels;
       for (int i=0; i<o->labels; i++)
 	n->label[i] = o->label[i];
@@ -1484,6 +1489,8 @@ rta_init(void)
   ea_register_init(&ea_gen_igp_metric);
   ea_register_init(&ea_gen_from);
   ea_register_init(&ea_gen_source);
+
+  ea_register_init(&ea_mpls_labels);
 }
 
 /*
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 4f119ac0..37f17bbc 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2385,7 +2385,7 @@ rt_preconfig(struct config *c)
  */
 
 void
-rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls)
+rta_apply_hostentry(rta *a, struct hostentry *he)
 {
   a->hostentry = he;
   a->dest = he->dest;
@@ -2397,15 +2397,12 @@ rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls)
     /* No nexthop */
 no_nexthop:
     a->nh = (struct nexthop) {};
-    if (mls)
-    { /* Store the label stack for later changes */
-      a->nh.labels_orig = a->nh.labels = mls->len;
-      memcpy(a->nh.label, mls->stack, mls->len * sizeof(u32));
-    }
     return;
   }
 
-  if (((!mls) || (!mls->len)) && he->nexthop_linkable)
+  eattr *mls_ea = ea_find(a->eattrs, &ea_mpls_labels);
+
+  if (!mls_ea && he->nexthop_linkable)
   { /* Just link the nexthop chain, no label append happens. */
     memcpy(&(a->nh), &(he->src->nh), nexthop_size(&(he->src->nh)));
     return;
@@ -2414,6 +2411,9 @@ no_nexthop:
   struct nexthop *nhp = NULL, *nhr = NULL;
   int skip_nexthop = 0;
 
+  const struct adata *mls = mls_ea ? mls_ea->u.ptr : NULL;
+  uint mls_cnt = mls ? mls->length / sizeof(u32) : 0;
+
   for (struct nexthop *nh = &(he->src->nh); nh; nh = nh->next)
   {
     if (skip_nexthop)
@@ -2430,17 +2430,16 @@ no_nexthop:
 
     if (mls)
     {
-      nhp->labels = nh->labels + mls->len;
-      nhp->labels_orig = mls->len;
+      nhp->labels = nh->labels + mls_cnt;
       if (nhp->labels <= MPLS_MAX_LABEL_STACK)
       {
 	memcpy(nhp->label, nh->label, nh->labels * sizeof(u32)); /* First the hostentry labels */
-	memcpy(&(nhp->label[nh->labels]), mls->stack, mls->len * sizeof(u32)); /* Then the bottom labels */
+	memcpy(&(nhp->label[nh->labels]), mls->data, mls->length); /* Then the bottom labels */
       }
       else
       {
 	log(L_WARN "Sum of label stack sizes %d + %d = %d exceedes allowed maximum (%d)",
-	    nh->labels, mls->len, nhp->labels, MPLS_MAX_LABEL_STACK);
+	    nh->labels, mls_cnt, nhp->labels, MPLS_MAX_LABEL_STACK);
 	skip_nexthop++;
 	continue;
       }
@@ -2448,7 +2447,6 @@ no_nexthop:
     else if (nh->labels)
     {
       nhp->labels = nh->labels;
-      nhp->labels_orig = 0;
       memcpy(nhp->label, nh->label, nh->labels * sizeof(u32));
     }
 
@@ -2501,10 +2499,7 @@ rt_next_hop_update_rte(rtable *tab UNUSED, rte *old)
   rta *a = alloca(RTA_MAX_SIZE);
   memcpy(a, old->attrs, rta_size(old->attrs));
 
-  mpls_label_stack mls = { .len = a->nh.labels_orig };
-  memcpy(mls.stack, &a->nh.label[a->nh.labels - mls.len], mls.len * sizeof(u32));
-
-  rta_apply_hostentry(a, old->attrs->hostentry, &mls);
+  rta_apply_hostentry(a, old->attrs->hostentry);
   a->cached = 0;
 
   rte *e = sl_alloc(rte_slab);
diff --git a/nest/rt.h b/nest/rt.h
index 6bd9cd38..50be7e0b 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -281,12 +281,12 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t
 #define RSEM_EXPORTED	4		/* Routes marked in export map */
 
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
-void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);
+void rta_apply_hostentry(rta *a, struct hostentry *he);
 
 static inline void
-rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll, mpls_label_stack *mls)
+rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll)
 {
-  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep), mls);
+  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep));
 }
 
 /*
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 0aa4dc40..f8228313 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -980,15 +980,18 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     s->hostentry = rt_get_hostentry(tab, gw, ll, c->c.table);
 
     if (!s->mpls)
-      rta_apply_hostentry(a, s->hostentry, NULL);
+      rta_apply_hostentry(a, s->hostentry);
 
     /* With MPLS, hostentry is applied later in bgp_apply_mpls_labels() */
   }
 }
 
 static void
-bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 *labels, uint lnum)
+bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a)
 {
+  u32 *labels = (u32 *) s->mpls_labels->data;
+  u32 lnum = s->mpls_labels->length / sizeof(u32);
+
   if (lnum > MPLS_MAX_LABEL_STACK)
   {
     REPORT("Too many MPLS labels ($u)", lnum);
@@ -1001,7 +1004,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 *labels, uint lnum)
 
   /* Handle implicit NULL as empty MPLS stack */
   if ((lnum == 1) && (labels[0] == BGP_MPLS_NULL))
-    lnum = 0;
+    lnum = s->mpls_labels->length = 0;
 
   if (s->channel->cf->gw_mode == GW_DIRECT)
   {
@@ -1009,13 +1012,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 *labels, uint lnum)
     memcpy(a->nh.label, labels, 4*lnum);
   }
   else /* GW_RECURSIVE */
-  {
-    mpls_label_stack ms;
-
-    ms.len = lnum;
-    memcpy(ms.stack, labels, 4*lnum);
-    rta_apply_hostentry(a, s->hostentry, &ms);
-  }
+    rta_apply_hostentry(a, s->hostentry);
 }
 
 static void
@@ -1418,7 +1415,13 @@ bgp_encode_mpls_labels(struct bgp_write_state *s UNUSED, const adata *mpls, byte
 static void
 bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *pxlen, rta *a)
 {
-  u32 labels[BGP_MPLS_MAX], label;
+  struct {
+    struct adata ad;
+    u32 labels[BGP_MPLS_MAX];
+  } labels_adata;
+
+  u32 *labels = labels_adata.labels;
+  u32 label;
   uint lnum = 0;
 
   do {
@@ -1440,19 +1443,19 @@ bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *p
   if (!a)
     return;
 
+  labels_adata.ad.length = lnum * sizeof(u32);
+
   /* Attach MPLS attribute unless we already have one */
   if (!s->mpls_labels)
-  {
-    s->mpls_labels = lp_alloc_adata(s->pool, 4*BGP_MPLS_MAX);
-    bgp_set_attr_ptr(&(a->eattrs), BA_MPLS_LABEL_STACK, 0, s->mpls_labels);
-  }
-
-  /* Overwrite data in the attribute */
-  s->mpls_labels->length = 4*lnum;
-  memcpy(s->mpls_labels->data, labels, 4*lnum);
+    ea_set_attr(&(a->eattrs),
+	EA_LITERAL_DIRECT_ADATA(&ea_mpls_labels, 0,
+	  (s->mpls_labels = tmp_store_adata(labels, BGP_MPLS_MAX * sizeof(u32)))));
+  else
+    /* Overwrite data in the attribute */
+    memcpy(s->mpls_labels, &labels_adata, sizeof labels_adata);
 
   /* Update next hop entry in rta */
-  bgp_apply_mpls_labels(s, a, labels, lnum);
+  bgp_apply_mpls_labels(s, a);
 
   /* Attributes were changed, invalidate cached entry */
   rta_free(s->cached_rta);
diff --git a/proto/static/static.c b/proto/static/static.c
index 1400e985..e792a148 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -76,8 +76,8 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
       nh->weight = r2->weight;
       if (r2->mls)
       {
-	nh->labels = r2->mls->len;
-	memcpy(nh->label, r2->mls->stack, r2->mls->len * sizeof(u32));
+	nh->labels = r2->mls->length / sizeof(u32);
+	memcpy(nh->label, r2->mls->data, r2->mls->length);
       }
 
       nexthop_insert(&nhs, nh);
@@ -92,7 +92,11 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
   if (r->dest == RTDX_RECURSIVE)
   {
     rtable *tab = ipa_is_ip4(r->via) ? p->igp_table_ip4 : p->igp_table_ip6;
-    rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE, r->mls);
+    if (r->mls)
+      ea_set_attr(&a->eattrs,
+	  EA_LITERAL_DIRECT_ADATA(&ea_mpls_labels, 0, r->mls));
+
+    rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE);
   }
 
   /* Already announced */
@@ -314,31 +318,17 @@ static_same_dest(struct static_route *x, struct static_route *y)
 	  (x->weight != y->weight) ||
 	  (x->use_bfd != y->use_bfd) ||
 	  (!x->mls != !y->mls) ||
-	  ((x->mls) && (y->mls) && (x->mls->len != y->mls->len)))
+	  ((x->mls) && (y->mls) && adata_same(x->mls, y->mls)))
 	return 0;
-
-      if (!x->mls)
-	continue;
-
-      for (uint i = 0; i < x->mls->len; i++)
-	if (x->mls->stack[i] != y->mls->stack[i])
-	  return 0;
     }
     return !x && !y;
 
   case RTDX_RECURSIVE:
     if (!ipa_equal(x->via, y->via) ||
 	(!x->mls != !y->mls) ||
-	((x->mls) && (y->mls) && (x->mls->len != y->mls->len)))
+	((x->mls) && (y->mls) && adata_same(x->mls, y->mls)))
       return 0;
 
-    if (!x->mls)
-      return 1;
-
-    for (uint i = 0; i < x->mls->len; i++)
-      if (x->mls->stack[i] != y->mls->stack[i])
-	return 0;
-
     return 1;
 
   default:
diff --git a/proto/static/static.h b/proto/static/static.h
index d99f7ebd..ea7ca33b 100644
--- a/proto/static/static.h
+++ b/proto/static/static.h
@@ -49,7 +49,7 @@ struct static_route {
   byte weight;				/* Multipath next hop weight */
   byte use_bfd;				/* Configured to use BFD */
   struct bfd_request *bfd_req;		/* BFD request, if BFD is used */
-  mpls_label_stack *mls;		/* MPLS label stack; may be NULL */
+  struct adata *mls;			/* MPLS label stack; may be NULL */
 };
 
 /*

From f15f2fcee7eeb5a100bd204a0e67018e25953420 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 5 May 2022 18:08:37 +0200
Subject: [PATCH 135/431] Moved nexthop from struct rta to extended attribute.

This doesn't do anything more than to put the whole structure inside
adata. The overall performance is certainly going downhill; we'll
optimize this later.

Anyway, this is one of the latest items inside rta and in several
commits we may drop rta completely and move to eattrs-only routes.
---
 filter/f-inst.c        | 139 +++++++++++++------
 lib/attrs.h            |   2 +
 lib/route.h            |  65 ++++++---
 lib/type.h             |   1 +
 nest/rt-attr.c         | 304 +++++++++++++++--------------------------
 nest/rt-dev.c          |   7 +-
 nest/rt-show.c         |   9 +-
 nest/rt-table.c        | 156 ++++++++++++---------
 proto/babel/babel.c    |  51 ++++---
 proto/bgp/packets.c    |  68 ++++++---
 proto/ospf/rt.c        | 164 +++++++++++-----------
 proto/ospf/rt.h        |   4 +-
 proto/ospf/topology.c  |  16 ++-
 proto/ospf/topology.h  |   4 +-
 proto/perf/perf.c      |  10 +-
 proto/rip/rip.c        |  54 ++++++--
 proto/static/static.c  |  34 +++--
 sysdep/linux/netlink.c | 183 +++++++++++++++----------
 sysdep/unix/krt.c      |  10 +-
 19 files changed, 722 insertions(+), 559 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 23271ce7..8ce78a99 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -529,27 +529,47 @@
     {
       STATIC_ATTR;
       ACCESS_RTE;
+      ACCESS_EATTRS;
       struct rta *rta = (*fs->rte)->attrs;
 
       switch (sa.sa_code)
       {
-      case SA_GW:	RESULT(sa.type, ip, rta->nh.gw); break;
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
       case SA_DEST:	RESULT(sa.type, i, rta->dest); break;
-      case SA_IFNAME:	RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
-      case SA_IFINDEX:	RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
-      case SA_WEIGHT:	RESULT(sa.type, i, rta->nh.weight + 1); break;
-      case SA_GW_MPLS:	RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
-
       default:
-	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
+	{
+	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct nexthop *nh = nh_ea ? &((struct nexthop_adata *) nh_ea->u.ptr)->nh : NULL;
+
+	  switch (sa.sa_code)
+	  {
+	    case SA_GW:
+	      RESULT(sa.type, ip, nh ? nh->gw : IPA_NONE);
+	      break;
+	    case SA_IFNAME:
+	      RESULT(sa.type, s, (nh && nh->iface) ? nh->iface->name : "");
+	      break;
+	    case SA_IFINDEX:
+	      RESULT(sa.type, i, (nh && nh->iface) ? nh->iface->index : 0);
+	      break;
+	    case SA_WEIGHT:
+	      RESULT(sa.type, i, (nh ? nh->weight : 0) + 1);
+	      break;
+	    case SA_GW_MPLS:
+	      RESULT(sa.type, i, (nh && nh->labels) ? nh->label[0] : MPLS_NULL);
+	      break;
+	    default:
+	      bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
+	  }
+	}
       }
     }
   }
 
   INST(FI_RTA_SET, 1, 0) {
     ACCESS_RTE;
+    ACCESS_EATTRS;
     ARG_ANY(1);
     STATIC_ATTR;
     ARG_TYPE(1, sa.type);
@@ -558,37 +578,51 @@
     {
       struct rta *rta = (*fs->rte)->attrs;
 
-      switch (sa.sa_code)
-      {
-      case SA_GW:
-	{
-	  ip_addr ip = v1.val.ip;
-	  struct iface *ifa = ipa_is_link_local(ip) ? rta->nh.iface : NULL;
-	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, 0);
-	  if (!n || (n->scope == SCOPE_HOST))
-	    runtime( "Invalid gw address" );
-
-	  rta->dest = RTD_UNICAST;
-	  rta->nh.gw = ip;
-	  rta->nh.iface = n->iface;
-	  rta->nh.next = NULL;
-	  rta->hostentry = NULL;
-	  rta->nh.labels = 0;
-	}
-	break;
-
-      case SA_DEST:
+      if (sa.sa_code == SA_DEST)
 	{
 	  int i = v1.val.i;
 	  if ((i != RTD_BLACKHOLE) && (i != RTD_UNREACHABLE) && (i != RTD_PROHIBIT))
 	    runtime( "Destination can be changed only to blackhole, unreachable or prohibit" );
 
 	  rta->dest = i;
-	  rta->nh.gw = IPA_NONE;
-	  rta->nh.iface = NULL;
-	  rta->nh.next = NULL;
-	  rta->hostentry = NULL;
-	  rta->nh.labels = 0;
+	  ea_unset_attr(fs->eattrs, 1, &ea_gen_nexthop);
+	}
+      else
+      {
+	union {
+	  struct nexthop_adata nha;
+	  struct {
+	    struct adata ad;
+	    struct nexthop nh;
+	    u32 label;
+	  };
+	} nha;
+
+	nha.ad = (struct adata) {
+	  .length = sizeof (struct nexthop_adata) - sizeof (struct adata),
+	};
+
+	eattr *a = NULL;
+
+	switch (sa.sa_code)
+	  {
+      case SA_GW:
+	{
+	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+
+	  ip_addr ip = v1.val.ip;
+	  struct iface *ifa = (ipa_is_link_local(ip) && nh_ea) ?
+	    ((struct nexthop_adata *) nh_ea->u.ptr)->nh.iface : NULL;
+	  
+	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, 0);
+	  if (!n || (n->scope == SCOPE_HOST))
+	    runtime( "Invalid gw address" );
+
+	  rta->dest = RTD_UNICAST;
+	  nha.nh = (struct nexthop) {
+	    .gw = ip,
+	    .iface = n->iface,
+	  };
 	}
 	break;
 
@@ -599,11 +633,9 @@
 	    runtime( "Invalid iface name" );
 
 	  rta->dest = RTD_UNICAST;
-	  rta->nh.gw = IPA_NONE;
-	  rta->nh.iface = ifa;
-	  rta->nh.next = NULL;
-	  rta->hostentry = NULL;
-	  rta->nh.labels = 0;
+	  nha.nh = (struct nexthop) {
+	    .iface = ifa,
+	  };
 	}
 	break;
 
@@ -612,13 +644,20 @@
 	  if (v1.val.i >= 0x100000)
 	    runtime( "Invalid MPLS label" );
 
+	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  if (!nh_ea)
+	    runtime( "No nexthop to add a MPLS label to" );
+
+	  nha.nh = ((struct nexthop_adata *) nh_ea->u.ptr)->nh;
+	  
 	  if (v1.val.i != MPLS_NULL)
 	  {
-	    rta->nh.label[0] = v1.val.i;
-	    rta->nh.labels = 1;
+	    nha.nh.label[0] = v1.val.i;
+	    nha.nh.labels = 1;
+	    nha.ad.length = sizeof nha - sizeof (struct adata);
 	  }
 	  else
-	    rta->nh.labels = 0;
+	    nha.nh.labels = 0;
 	}
 	break;
 
@@ -630,14 +669,32 @@
 	  if (rta->dest != RTD_UNICAST)
 	    runtime( "Setting weight needs regular nexthop " );
 
+	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  if (!nh_ea)
+	    runtime( "No nexthop to set weight on" );
+
+	  struct nexthop_adata *nhax = (struct nexthop_adata *)
+	    tmp_copy_adata(&((struct nexthop_adata *) nh_ea->u.ptr)->ad);
+
 	  /* Set weight on all next hops */
-	  for (struct nexthop *nh = &rta->nh; nh; nh = nh->next)
+	  NEXTHOP_WALK(nh, nhax)
 	    nh->weight = i - 1;
+
+	  a = ea_set_attr(fs->eattrs,
+	      EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhax->ad));
         }
 	break;
 
       default:
 	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
+	  }
+
+	if (!a)
+	  a = ea_set_attr(fs->eattrs,
+	      EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nha.ad)));
+
+	a->originated = 1;
+	a->fresh = 1;
       }
     }
   }
diff --git a/lib/attrs.h b/lib/attrs.h
index d2638f3f..79b7b14a 100644
--- a/lib/attrs.h
+++ b/lib/attrs.h
@@ -37,7 +37,9 @@ lp_store_adata(struct linpool *pool, const void *buf, uint len)
   return ad;
 }
 
+#define tmp_alloc_adata(len)	  lp_alloc_adata(tmp_linpool, len)
 #define tmp_store_adata(buf, len) lp_store_adata(tmp_linpool, buf, len)
+#define tmp_copy_adata(ad)	  tmp_store_adata((ad)->data, (ad)->length)
 
 static inline int adata_same(const struct adata *a, const struct adata *b)
 { return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
diff --git a/lib/route.h b/lib/route.h
index 5423ada3..29a78e90 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -67,13 +67,18 @@ void rt_prune_sources(void);
 struct nexthop {
   ip_addr gw;				/* Next hop */
   struct iface *iface;			/* Outgoing interface */
-  struct nexthop *next;
   byte flags;
   byte weight;
   byte labels;				/* Number of all labels */
   u32 label[0];
 };
 
+/* For packing one into eattrs */
+struct nexthop_adata {
+  struct adata ad;
+  struct nexthop nh;
+};
+
 #define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
 
 
@@ -85,7 +90,6 @@ typedef struct rta {
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
   u16 cached:1;				/* Are attributes cached? */
   u16 dest:4;				/* Route destination type (RTD_...) */
-  struct nexthop nh;			/* Next hop */
 } rta;
 
 #define RTS_STATIC 1			/* Normal static route */
@@ -286,9 +290,22 @@ ea_set_attr_u32(ea_list **to, const struct ea_class *def, uint flags, u64 data)
 { ea_set_attr(to, EA_LITERAL_EMBEDDED(def, flags, data)); }
 
 static inline void
-ea_set_attr_data(ea_list **to, const struct ea_class *def, uint flags, void *data, uint len)
+ea_set_attr_data(ea_list **to, const struct ea_class *def, uint flags, const void *data, uint len)
 { ea_set_attr(to, EA_LITERAL_STORE_ADATA(def, flags, data, len)); }
 
+static inline void
+ea_copy_attr(ea_list **to, ea_list *from, const struct ea_class *def)
+{
+  eattr *e = ea_find_by_class(from, def);
+  if (e)
+    if (e->type & EAF_EMBEDDED)
+      ea_set_attr_u32(to, def, e->flags, e->u.data);
+    else
+      ea_set_attr_data(to, def, e->flags, e->u.ptr->data, e->u.ptr->length);
+  else
+    ea_unset_attr(to, 0, def);
+}
+
 /*
  *	Common route attributes
  */
@@ -317,25 +334,39 @@ static inline u32 rt_get_source_attr(rte *rt)
  * to add additional labels to the resolved nexthop */
 extern struct ea_class ea_mpls_labels;
 
+/* Next hop: For now, stored as adata */
+extern struct ea_class ea_gen_nexthop;
+
 /* Next hop structures */
 
-#define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
+#define NEXTHOP_ALIGNMENT	(_Alignof(struct nexthop))
+#define NEXTHOP_MAX_SIZE	(sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
+#define NEXTHOP_SIZE(_nh)	NEXTHOP_SIZE_CNT(((_nh)->labels))
+#define NEXTHOP_SIZE_CNT(cnt)	BIRD_ALIGN((sizeof(struct nexthop) + sizeof(u32) * (cnt)), NEXTHOP_ALIGNMENT)
+#define nexthop_size(nh)	NEXTHOP_SIZE((nh))
+
+#define NEXTHOP_NEXT(_nh)	((void *) (_nh) + NEXTHOP_SIZE(_nh))
+#define NEXTHOP_END(_nhad)	((_nhad)->ad.data + (_nhad)->ad.length)
+#define NEXTHOP_VALID(_nh, _nhad) ((void *) (_nh) < (void *) NEXTHOP_END(_nhad))
+#define NEXTHOP_ONE(_nhad)	(NEXTHOP_NEXT(&(_nhad)->nh) == NEXTHOP_END(_nhad))
+
+#define NEXTHOP_WALK(_iter, _nhad) for ( \
+    struct nexthop *_iter = &(_nhad)->nh; \
+    (void *) _iter < (void *) NEXTHOP_END(_nhad); \
+    _iter = NEXTHOP_NEXT(_iter))
+
+
+static inline int nexthop_same(struct nexthop_adata *x, struct nexthop_adata *y)
+{ return adata_same(&x->ad, &y->ad); }
+struct nexthop_adata *nexthop_merge(struct nexthop_adata *x, struct nexthop_adata *y, int max, linpool *lp);
+struct nexthop_adata *nexthop_sort(struct nexthop_adata *x, linpool *lp);
+int nexthop_is_sorted(struct nexthop_adata *x);
+
 
-static inline size_t nexthop_size(const struct nexthop *nh)
-{ return sizeof(struct nexthop) + sizeof(u32)*nh->labels; }
-int nexthop__same(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops */
-static inline int nexthop_same(struct nexthop *x, struct nexthop *y)
-{ return (x == y) || nexthop__same(x, y); }
-struct nexthop *nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp);
-struct nexthop *nexthop_sort(struct nexthop *x);
-static inline void nexthop_link(struct rta *a, struct nexthop *from)
-{ memcpy(&a->nh, from, nexthop_size(from)); }
-void nexthop_insert(struct nexthop **n, struct nexthop *y);
-int nexthop_is_sorted(struct nexthop *x);
 
 void rta_init(void);
-static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }
-#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
+#define rta_size(...) (sizeof(rta))
+#define RTA_MAX_SIZE (sizeof(rta))
 rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
 static inline int rta_is_cached(rta *r) { return r->cached; }
 static inline rta *rta_clone(rta *r) { r->uc++; return r; }
diff --git a/lib/type.h b/lib/type.h
index abce1a1f..6da86c77 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -52,6 +52,7 @@ enum btype {
 /* Something but inaccessible. */
   T_OPAQUE = 0x02,		/* Opaque byte string (not filterable) */
   T_IFACE = 0x0c,		/* Pointer to an interface (inside adata) */
+  T_NEXTHOP_LIST = 0x2c,	/* The whole nexthop block */
 
 /* Types shared with eattrs */
   T_INT = 0x01,			/* 32-bit unsigned integer number */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index dc4fe785..bd7ca425 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -57,6 +57,7 @@
 #include "lib/string.h"
 
 #include <stddef.h>
+#include <stdlib.h>
 
 const adata null_adata;		/* adata of length 0 */
 
@@ -108,6 +109,11 @@ struct ea_class ea_gen_source = {
   .format = ea_gen_source_format,
 };
 
+struct ea_class ea_gen_nexthop = {
+  .name = "nexthop",
+  .type = T_NEXTHOP_LIST,
+};
+
 struct ea_class ea_mpls_labels = {
   .name = "mpls_labels",
   .type = T_CLIST,
@@ -124,8 +130,7 @@ const char * rta_dest_names[RTD_MAX] = {
 
 pool *rta_pool;
 
-static slab *rta_slab_[4];
-static slab *nexthop_slab_[4];
+static slab *rta_slab;
 static slab *rte_src_slab;
 
 static struct idm src_ids;
@@ -204,50 +209,10 @@ rt_prune_sources(void)
  *	Multipath Next Hop
  */
 
-static inline u32
-nexthop_hash(struct nexthop *x)
-{
-  u32 h = 0;
-  for (; x; x = x->next)
-  {
-    h ^= ipa_hash(x->gw) ^ (h << 5) ^ (h >> 9);
-
-    for (int i = 0; i < x->labels; i++)
-      h ^= x->label[i] ^ (h << 6) ^ (h >> 7);
-  }
-
-  return h;
-}
-
-int
-nexthop__same(struct nexthop *x, struct nexthop *y)
-{
-  for (; x && y; x = x->next, y = y->next)
-  {
-    if (!ipa_equal(x->gw, y->gw) || (x->iface != y->iface) ||
-	(x->flags != y->flags) || (x->weight != y->weight) ||
-	(x->labels != y->labels))
-      return 0;
-
-    for (int i = 0; i < x->labels; i++)
-      if (x->label[i] != y->label[i])
-	return 0;
-  }
-
-  return x == y;
-}
-
 static int
 nexthop_compare_node(const struct nexthop *x, const struct nexthop *y)
 {
   int r;
-
-  if (!x)
-    return 1;
-
-  if (!y)
-    return -1;
-
   /* Should we also compare flags ? */
 
   r = ((int) y->weight) - ((int) x->weight);
@@ -272,23 +237,16 @@ nexthop_compare_node(const struct nexthop *x, const struct nexthop *y)
   return ((int) x->iface->index) - ((int) y->iface->index);
 }
 
-static inline struct nexthop *
-nexthop_copy_node(const struct nexthop *src, linpool *lp)
+static int
+nexthop_compare_qsort(const void *x, const void *y)
 {
-  struct nexthop *n = lp_alloc(lp, nexthop_size(src));
-
-  memcpy(n, src, nexthop_size(src));
-  n->next = NULL;
-
-  return n;
+  return nexthop_compare_node( *(const struct nexthop **) x, *(const struct nexthop **) y );
 }
 
 /**
  * nexthop_merge - merge nexthop lists
  * @x: list 1
  * @y: list 2
- * @rx: reusability of list @x
- * @ry: reusability of list @y
  * @max: max number of nexthops
  * @lp: linpool for allocating nexthops
  *
@@ -305,134 +263,111 @@ nexthop_copy_node(const struct nexthop *src, linpool *lp)
  * resulting list is no longer needed. When reusability is not set, the
  * corresponding lists are not modified nor linked from the resulting list.
  */
-struct nexthop *
-nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp)
+struct nexthop_adata *
+nexthop_merge(struct nexthop_adata *xin, struct nexthop_adata *yin, int max, linpool *lp)
 {
-  struct nexthop *root = NULL;
-  struct nexthop **n = &root;
+  uint outlen = ADATA_SIZE(xin->ad.length) + ADATA_SIZE(yin->ad.length);
+  struct nexthop_adata *out = lp_alloc(lp, outlen);
+  out->ad.length = outlen - sizeof (struct adata);
 
-  while ((x || y) && max--)
+  struct nexthop *x = &xin->nh, *y = &yin->nh, *cur = &out->nh;
+  int xvalid, yvalid;
+
+  while (max--)
   {
-    int cmp = nexthop_compare_node(x, y);
+    xvalid = NEXTHOP_VALID(x, xin);
+    yvalid = NEXTHOP_VALID(y, yin);
 
-    if (cmp < 0)
-    {
-      ASSUME(x);
-      *n = rx ? x : nexthop_copy_node(x, lp);
-      x = x->next;
-    }
-    else if (cmp > 0)
-    {
-      ASSUME(y);
-      *n = ry ? y : nexthop_copy_node(y, lp);
-      y = y->next;
-    }
-    else
-    {
-      ASSUME(x && y);
-      *n = rx ? x : (ry ? y : nexthop_copy_node(x, lp));
-      x = x->next;
-      y = y->next;
-    }
-    n = &((*n)->next);
-  }
-  *n = NULL;
-
-  return root;
-}
-
-void
-nexthop_insert(struct nexthop **n, struct nexthop *x)
-{
-  for (; *n; n = &((*n)->next))
-  {
-    int cmp = nexthop_compare_node(*n, x);
-
-    if (cmp < 0)
-      continue;
-    else if (cmp > 0)
+    if (!xvalid && !yvalid)
       break;
+
+    ASSUME(NEXTHOP_VALID(cur, out));
+
+    int cmp = !xvalid ? 1 : !yvalid ? -1 : nexthop_compare_node(x, y);
+
+    if (cmp < 0)
+    {
+      ASSUME(NEXTHOP_VALID(x, xin));
+      memcpy(cur, x, nexthop_size(x));
+      x = NEXTHOP_NEXT(x);
+    }
+    else if (cmp > 0)
+    {
+      ASSUME(NEXTHOP_VALID(y, yin));
+      memcpy(cur, y, nexthop_size(y));
+      y = NEXTHOP_NEXT(y);
+    }
     else
-      return;
+    {
+      ASSUME(NEXTHOP_VALID(x, xin));
+      memcpy(cur, x, nexthop_size(x));
+      x = NEXTHOP_NEXT(x);
+
+      ASSUME(NEXTHOP_VALID(y, yin));
+      y = NEXTHOP_NEXT(y);
+    }
+    cur = NEXTHOP_NEXT(cur);
   }
 
-  x->next = *n;
-  *n = x;
+  out->ad.length = (void *) cur - (void *) out->ad.data;
+
+  return out;
 }
 
-struct nexthop *
-nexthop_sort(struct nexthop *x)
+struct nexthop_adata *
+nexthop_sort(struct nexthop_adata *nhad, linpool *lp)
 {
-  struct nexthop *s = NULL;
+  /* Count the nexthops */
+  uint cnt = 0;
+  NEXTHOP_WALK(nh, nhad)
+    cnt++;
 
-  /* Simple insert-sort */
-  while (x)
+  if (cnt <= 1)
+    return nhad;
+
+  /* Get pointers to them */
+  struct nexthop **sptr = tmp_alloc(cnt * sizeof(struct nexthop *));
+
+  uint i = 0;
+  NEXTHOP_WALK(nh, nhad)
+    sptr[i++] = nh;
+
+  /* Sort the pointers */
+  qsort(sptr, cnt, sizeof(struct nexthop *), nexthop_compare_qsort);
+
+  /* Allocate the output */
+  struct nexthop_adata *out = (struct nexthop_adata *) lp_alloc_adata(lp, nhad->ad.length);
+  struct nexthop *dest = &out->nh;
+
+  /* Deduplicate nexthops while storing them */
+  for (uint i = 0; i < cnt; i++)
   {
-    struct nexthop *n = x;
-    x = n->next;
-    n->next = NULL;
+    if (i && !nexthop_compare_node(sptr[i], sptr[i-1]))
+      continue;
 
-    nexthop_insert(&s, n);
+    memcpy(dest, sptr[i], NEXTHOP_SIZE(sptr[i]));
+    dest = NEXTHOP_NEXT(dest);
   }
 
-  return s;
+  out->ad.length = (void *) dest - (void *) out->ad.data;
+  return out;
 }
 
 int
-nexthop_is_sorted(struct nexthop *x)
+nexthop_is_sorted(struct nexthop_adata *nhad)
 {
-  for (; x && x->next; x = x->next)
-    if (nexthop_compare_node(x, x->next) >= 0)
+  struct nexthop *prev = NULL;
+  NEXTHOP_WALK(nh, nhad)
+  {
+    if (prev && (nexthop_compare_node(prev, nh) >= 0))
       return 0;
 
+    prev = nh;
+  }
+
   return 1;
 }
 
-static inline slab *
-nexthop_slab(struct nexthop *nh)
-{
-  return nexthop_slab_[MIN(nh->labels, 3)];
-}
-
-static struct nexthop *
-nexthop_copy(struct nexthop *o)
-{
-  struct nexthop *first = NULL;
-  struct nexthop **last = &first;
-
-  for (; o; o = o->next)
-    {
-      struct nexthop *n = sl_allocz(nexthop_slab(o));
-      n->gw = o->gw;
-      n->iface = o->iface;
-      n->next = NULL;
-      n->flags = o->flags;
-      n->weight = o->weight;
-      n->labels = o->labels;
-      for (int i=0; i<o->labels; i++)
-	n->label[i] = o->label[i];
-
-      *last = n;
-      last = &(n->next);
-    }
-
-  return first;
-}
-
-static void
-nexthop_free(struct nexthop *o)
-{
-  struct nexthop *n;
-
-  while (o)
-    {
-      n = o->next;
-      sl_free(o);
-      o = n;
-    }
-}
-
-
 /*
  *	Extended Attributes
  */
@@ -1122,6 +1057,23 @@ ea_show(struct cli *c, const eattr *e)
   cli_printf(c, -1012, "\t%s", buf);
 }
 
+static void
+nexthop_dump(const struct adata *ad)
+{
+  struct nexthop_adata *nhad = (struct nexthop_adata *) ad;
+
+  debug(":");
+
+  NEXTHOP_WALK(nh, nhad)
+    {
+      if (ipa_nonzero(nh->gw)) debug(" ->%I", nh->gw);
+      if (nh->labels) debug(" L %d", nh->label[0]);
+      for (int i=1; i<nh->labels; i++)
+	debug("/%d", nh->label[i]);
+      debug(" [%s]", nh->iface ? nh->iface->name : "???");
+    }
+}
+
 /**
  * ea_dump - dump an extended attribute
  * @e: attribute to be dumped
@@ -1157,6 +1109,8 @@ ea_dump(ea_list *e)
 	    debug("o");
 	  if (a->type & EAF_EMBEDDED)
 	    debug(":%08x", a->u.data);
+	  else if (a->id == ea_gen_nexthop.id)
+	    nexthop_dump(a->u.ptr);
 	  else
 	    {
 	      int j, len = a->u.ptr->length;
@@ -1258,7 +1212,7 @@ rta_hash(rta *a)
   BMIX(dest);
 #undef MIX
 
-  return mem_hash_value(&h) ^ nexthop_hash(&(a->nh)) ^ ea_hash(a->eattrs);
+  return mem_hash_value(&h) ^ ea_hash(a->eattrs);
 }
 
 static inline int
@@ -1266,24 +1220,16 @@ rta_same(rta *x, rta *y)
 {
   return (x->dest == y->dest &&
 	  x->hostentry == y->hostentry &&
-	  nexthop_same(&(x->nh), &(y->nh)) &&
 	  ea_same(x->eattrs, y->eattrs));
 }
 
-static inline slab *
-rta_slab(rta *a)
-{
-  return rta_slab_[a->nh.labels > 2 ? 3 : a->nh.labels];
-}
-
 static rta *
 rta_copy(rta *o)
 {
-  rta *r = sl_alloc(rta_slab(o));
+  rta *r = sl_alloc(rta_slab);
 
   memcpy(r, o, rta_size(o));
   r->uc = 1;
-  r->nh.next = nexthop_copy(o->nh.next);
   if (!r->eattrs)
     return r;
 
@@ -1375,8 +1321,6 @@ rta__free(rta *a)
   if (a->next)
     a->next->pprev = a->pprev;
   rt_unlock_hostentry(a->hostentry);
-  if (a->nh.next)
-    nexthop_free(a->nh.next);
   ea_free(a->eattrs);
   a->cached = 0;
   sl_free(a);
@@ -1387,12 +1331,6 @@ rta_do_cow(rta *o, linpool *lp)
 {
   rta *r = lp_alloc(lp, rta_size(o));
   memcpy(r, o, rta_size(o));
-  for (struct nexthop **nhn = &(r->nh.next), *nho = o->nh.next; nho; nho = nho->next)
-    {
-      *nhn = lp_alloc(lp, nexthop_size(nho));
-      memcpy(*nhn, nho, nexthop_size(nho));
-      nhn = &((*nhn)->next);
-    }
   r->cached = 0;
   r->uc = 0;
   return r;
@@ -1413,15 +1351,6 @@ rta_dump(rta *a)
 	a->uc, rtd[a->dest], a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
-  if (a->dest == RTD_UNICAST)
-    for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)
-      {
-	if (ipa_nonzero(nh->gw)) debug(" ->%I", nh->gw);
-	if (nh->labels) debug(" L %d", nh->label[0]);
-	for (int i=1; i<nh->labels; i++)
-	  debug("/%d", nh->label[i]);
-	debug(" [%s]", nh->iface ? nh->iface->name : "???");
-      }
   if (a->eattrs)
     {
       debug(" EA: ");
@@ -1471,15 +1400,7 @@ rta_init(void)
 {
   rta_pool = rp_new(&root_pool, "Attributes");
 
-  rta_slab_[0] = sl_new(rta_pool, sizeof(rta));
-  rta_slab_[1] = sl_new(rta_pool, sizeof(rta) + sizeof(u32));
-  rta_slab_[2] = sl_new(rta_pool, sizeof(rta) + sizeof(u32)*2);
-  rta_slab_[3] = sl_new(rta_pool, sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK);
-
-  nexthop_slab_[0] = sl_new(rta_pool, sizeof(struct nexthop));
-  nexthop_slab_[1] = sl_new(rta_pool, sizeof(struct nexthop) + sizeof(u32));
-  nexthop_slab_[2] = sl_new(rta_pool, sizeof(struct nexthop) + sizeof(u32)*2);
-  nexthop_slab_[3] = sl_new(rta_pool, sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK);
+  rta_slab = sl_new(rta_pool, sizeof(rta));
 
   rta_alloc_hash();
   rte_src_init();
@@ -1489,6 +1410,7 @@ rta_init(void)
   ea_register_init(&ea_gen_igp_metric);
   ea_register_init(&ea_gen_from);
   ea_register_init(&ea_gen_source);
+  ea_register_init(&ea_gen_nexthop);
 
   ea_register_init(&ea_mpls_labels);
 }
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index af6506f6..9953e270 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -84,11 +84,16 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
 
       rta a0 = {
 	.dest = RTD_UNICAST,
-	.nh.iface = ad->iface,
+      };
+
+      struct nexthop_adata nhad = {
+	.nh = { .iface = ad->iface, },
+	.ad = { .length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data, },
       };
 
       ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, c->preference);
       ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_DEVICE);
+      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
 
       a = rta_lookup(&a0);
       e = rte_get_temp(a, src);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index be4c0186..32f7aa2d 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -45,11 +45,12 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   rta *a = e->attrs;
   int sync_error = d->kernel ? krt_get_sync_error(d->kernel, e) : 0;
   void (*get_route_info)(struct rte *, byte *buf);
-  struct nexthop *nh;
+  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 
   tm_format_time(tm, &config->tf_route, e->lastmod);
   ip_addr a_from = ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE);
-  if (ipa_nonzero(a_from) && !ipa_equal(a_from, a->nh.gw))
+  if (ipa_nonzero(a_from) && (!nhad || !ipa_equal(a_from, nhad->nh.gw)))
     bsprintf(from, " from %I", a_from);
   else
     from[0] = 0;
@@ -71,7 +72,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 	     e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
   if (a->dest == RTD_UNICAST)
-    for (nh = &(a->nh); nh; nh = nh->next)
+    NEXTHOP_WALK(nh, nhad)
     {
       char mpls[MPLS_MAX_LABEL_STACK*12 + 5], *lsp = mpls;
       char *onlink = (nh->flags & RNF_ONLINK) ? " onlink" : "";
@@ -85,7 +86,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 	}
       *lsp = '\0';
 
-      if (a->nh.next)
+      if (!NEXTHOP_ONE(nhad))
 	bsprintf(weight, " weight %d", nh->weight + 1);
 
       if (ipa_nonzero(nh->gw))
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 37f17bbc..6f948ada 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -940,18 +940,11 @@ rt_notify_accepted(struct channel *c, net *net, rte *new_changed, rte *old_chang
     rte_free(new_free);
 }
 
-
-static struct nexthop *
-nexthop_merge_rta(struct nexthop *nhs, rta *a, linpool *pool, int max)
-{
-  return nexthop_merge(nhs, &(a->nh), 1, 0, max, pool);
-}
-
 rte *
 rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int silent)
 {
   // struct proto *p = c->proto;
-  struct nexthop *nhs = NULL;
+  struct nexthop_adata *nhs = NULL;
   rte *best0, *best, *rt0, *rt, *tmp;
 
   best0 = net->routes;
@@ -976,21 +969,31 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
       continue;
 
     if (rte_is_reachable(rt))
-      nhs = nexthop_merge_rta(nhs, rt->attrs, pool, c->merge_limit);
+    {
+      eattr *nhea = ea_find(rt->attrs->eattrs, &ea_gen_nexthop);
+      ASSERT_DIE(nhea);
+
+      if (nhs)
+	nhs = nexthop_merge(nhs, (struct nexthop_adata *) nhea->u.ptr, c->merge_limit, pool);
+      else
+	nhs = (struct nexthop_adata *) nhea->u.ptr;
+    }
 
     if (tmp)
       rte_free(tmp);
   }
 
+
   if (nhs)
   {
-    nhs = nexthop_merge_rta(nhs, best->attrs, pool, c->merge_limit);
+    eattr *nhea = ea_find(best->attrs->eattrs, &ea_gen_nexthop);
+    ASSERT_DIE(nhea);
 
-    if (nhs->next)
-    {
-      best = rte_cow_rta(best, pool);
-      nexthop_link(best->attrs, nhs);
-    }
+    nhs = nexthop_merge(nhs, (struct nexthop_adata *) nhea->u.ptr, c->merge_limit, pool);
+
+    best = rte_cow_rta(best, pool);
+    ea_set_attr(&best->attrs->eattrs,
+	EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhs->ad));
   }
 
   if (best != best0)
@@ -1184,7 +1187,16 @@ rte_validate(rte *e)
     return 0;
   }
 
-  if ((e->attrs->dest == RTD_UNICAST) && !nexthop_is_sorted(&(e->attrs->nh)))
+  eattr *nhea = ea_find(e->attrs->eattrs, &ea_gen_nexthop);
+  if ((!nhea) != (e->attrs->dest != RTD_UNICAST))
+  {
+    log(L_WARN "Ignoring route %N with destination %d and %snexthop received via %s",
+	n->n.addr, e->attrs->dest, (nhea ? "" : "no "), e->sender->proto->name);
+    return 0;
+  }
+
+  if ((e->attrs->dest == RTD_UNICAST) &&
+      !nexthop_is_sorted((struct nexthop_adata *) nhea->u.ptr))
   {
     log(L_WARN "Ignoring unsorted multipath route %N received via %s",
 	n->n.addr, e->sender->proto->name);
@@ -2395,8 +2407,7 @@ rta_apply_hostentry(rta *a, struct hostentry *he)
   if (a->dest != RTD_UNICAST)
   {
     /* No nexthop */
-no_nexthop:
-    a->nh = (struct nexthop) {};
+    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
     return;
   }
 
@@ -2404,74 +2415,71 @@ no_nexthop:
 
   if (!mls_ea && he->nexthop_linkable)
   { /* Just link the nexthop chain, no label append happens. */
-    memcpy(&(a->nh), &(he->src->nh), nexthop_size(&(he->src->nh)));
+    ea_copy_attr(&a->eattrs, he->src->eattrs, &ea_gen_nexthop);
     return;
   }
 
-  struct nexthop *nhp = NULL, *nhr = NULL;
-  int skip_nexthop = 0;
-
   const struct adata *mls = mls_ea ? mls_ea->u.ptr : NULL;
   uint mls_cnt = mls ? mls->length / sizeof(u32) : 0;
 
-  for (struct nexthop *nh = &(he->src->nh); nh; nh = nh->next)
+  eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = (struct nexthop_adata *) he_nh_ea->u.ptr;
+
+  uint total_size = OFFSETOF(struct nexthop_adata, nh);
+
+  NEXTHOP_WALK(nh, nhad)
   {
-    if (skip_nexthop)
-      skip_nexthop--;
-    else
+    if (nh->labels + mls_cnt > MPLS_MAX_LABEL_STACK)
     {
-      nhr = nhp;
-      nhp = (nhp ? (nhp->next = lp_alloc(rte_update_pool, NEXTHOP_MAX_SIZE)) : &(a->nh));
+      log(L_WARN "Sum of label stack sizes %d + %d = %d exceedes allowed maximum (%d)",
+	    nh->labels, mls_cnt, nh->labels + mls_cnt, MPLS_MAX_LABEL_STACK);
+      continue;
     }
 
-    memset(nhp, 0, NEXTHOP_MAX_SIZE);
-    nhp->iface = nh->iface;
-    nhp->weight = nh->weight;
+    total_size += NEXTHOP_SIZE_CNT(nh->labels + mls_cnt);
+  }
 
-    if (mls)
+  if (total_size == OFFSETOF(struct nexthop_adata, nh))
+  {
+    a->dest = RTD_UNREACHABLE;
+    log(L_WARN "No valid nexthop remaining, setting route unreachable");
+
+    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
+    return;
+  }
+
+  struct nexthop_adata *new = (struct nexthop_adata *) tmp_alloc_adata(total_size);
+  struct nexthop *dest = &new->nh;
+
+  NEXTHOP_WALK(nh, nhad)
+  {
+    if (nh->labels + mls_cnt > MPLS_MAX_LABEL_STACK)
+      continue;
+
+    memcpy(dest, nh, NEXTHOP_SIZE(nh));
+    if (mls_cnt)
     {
-      nhp->labels = nh->labels + mls_cnt;
-      if (nhp->labels <= MPLS_MAX_LABEL_STACK)
-      {
-	memcpy(nhp->label, nh->label, nh->labels * sizeof(u32)); /* First the hostentry labels */
-	memcpy(&(nhp->label[nh->labels]), mls->data, mls->length); /* Then the bottom labels */
-      }
-      else
-      {
-	log(L_WARN "Sum of label stack sizes %d + %d = %d exceedes allowed maximum (%d)",
-	    nh->labels, mls_cnt, nhp->labels, MPLS_MAX_LABEL_STACK);
-	skip_nexthop++;
-	continue;
-      }
-    }
-    else if (nh->labels)
-    {
-      nhp->labels = nh->labels;
-      memcpy(nhp->label, nh->label, nh->labels * sizeof(u32));
+      memcpy(&(dest->label[dest->labels]), mls->data, mls->length);
+      dest->labels += mls_cnt;
     }
 
     if (ipa_nonzero(nh->gw))
-    {
-      nhp->gw = nh->gw;			/* Router nexthop */
-      nhp->flags |= (nh->flags & RNF_ONLINK);
-    }
+      /* Router nexthop */
+      dest->flags = (dest->flags & RNF_ONLINK);
     else if (!(nh->iface->flags & IF_MULTIACCESS) || (nh->iface->flags & IF_LOOPBACK))
-      nhp->gw = IPA_NONE;		/* PtP link - no need for nexthop */
+      dest->gw = IPA_NONE;		/* PtP link - no need for nexthop */
     else if (ipa_nonzero(he->link))
-      nhp->gw = he->link;		/* Device nexthop with link-local address known */
+      dest->gw = he->link;		/* Device nexthop with link-local address known */
     else
-      nhp->gw = he->addr;		/* Device nexthop with link-local address unknown */
+      dest->gw = he->addr;		/* Device nexthop with link-local address unknown */
+
+    dest = NEXTHOP_NEXT(dest);
   }
 
-  if (skip_nexthop)
-    if (nhr)
-      nhr->next = NULL;
-    else
-    {
-      a->dest = RTD_UNREACHABLE;
-      log(L_WARN "No valid nexthop remaining, setting route unreachable");
-      goto no_nexthop;
-    }
+  /* Fix final length */
+  new->ad.length = (void *) dest - (void *) new->ad.data;
+  ea_set_attr(&a->eattrs, EA_LITERAL_DIRECT_ADATA(
+	&ea_gen_nexthop, 0, &new->ad));
 }
 
 static inline int
@@ -2485,9 +2493,14 @@ rta_next_hop_outdated(rta *a)
   if (!he->src)
     return a->dest != RTD_UNREACHABLE;
 
+  eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
+  eattr *a_nh_ea = ea_find(a->eattrs, &ea_gen_nexthop);
+
   return (a->dest != he->dest) ||
     (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != he->igp_metric) ||
-    (!he->nexthop_linkable) || !nexthop_same(&(a->nh), &(he->src->nh));
+    (!he->nexthop_linkable) ||
+    (!he_nh_ea != !a_nh_ea) ||
+    (he_nh_ea && a_nh_ea && !adata_same(he_nh_ea->u.ptr, a_nh_ea->u.ptr));
 }
 
 static inline rte *
@@ -3507,7 +3520,14 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 
       if (a->dest == RTD_UNICAST)
 	{
-	  for (struct nexthop *nh = &(a->nh); nh; nh = nh->next)
+	  eattr *ea = ea_find(a->eattrs, &ea_gen_nexthop);
+	  if (!ea)
+	    {
+	      log(L_WARN "No nexthop in unicast route");
+	      goto done;
+	    }
+	    
+	  NEXTHOP_WALK(nh, (struct nexthop_adata *) ea->u.ptr)
 	    if (ipa_zero(nh->gw))
 	      {
 		if (if_local_addr(he->addr, nh->iface))
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index a7dcee09..9a43f484 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -643,26 +643,14 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
 
   if (r)
   {
-    struct {
-      ea_list l;
-      eattr a[6];
-    } eattrs = {
-      .l.count = ARRAY_SIZE(eattrs.a),
-      .a = {
-	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference),
-	EA_LITERAL_STORE_ADATA(&ea_gen_from, 0, &r->neigh->addr, sizeof(r->neigh->addr)),
-	EA_LITERAL_EMBEDDED(&ea_gen_source, 0, RTS_BABEL),
-	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
-	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
-	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
-      }
-    };
-
-    rta a0 = {
-      .dest = RTD_UNICAST,
-      .nh.gw = r->next_hop,
-      .nh.iface = r->neigh->ifa->iface,
-      .eattrs = &eattrs.l,
+    struct nexthop_adata nhad = {
+      .nh = {
+	.gw = r->next_hop,
+	.iface = r->neigh->ifa->iface,
+      },
+      .ad = {
+	.length = sizeof nhad - sizeof nhad.ad,
+      },
     };
 
     /*
@@ -671,7 +659,28 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
      * have routing work.
      */
     if (!neigh_find(&p->p, r->next_hop, r->neigh->ifa->iface, 0))
-      a0.nh.flags = RNF_ONLINK;
+      nhad.nh.flags = RNF_ONLINK;
+    
+    struct {
+      ea_list l;
+      eattr a[7];
+    } eattrs = {
+      .l.count = ARRAY_SIZE(eattrs.a),
+      .a = {
+	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, c->preference),
+	EA_LITERAL_STORE_ADATA(&ea_gen_from, 0, &r->neigh->addr, sizeof(r->neigh->addr)),
+	EA_LITERAL_EMBEDDED(&ea_gen_source, 0, RTS_BABEL),
+	EA_LITERAL_STORE_ADATA(&ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length),
+	EA_LITERAL_EMBEDDED(&ea_babel_metric, 0, r->metric),
+	EA_LITERAL_STORE_ADATA(&ea_babel_router_id, 0, &r->router_id, sizeof(r->router_id)),
+	EA_LITERAL_EMBEDDED(&ea_babel_seqno, 0, r->seqno),
+      }
+    };
+
+    rta a0 = {
+      .dest = RTD_UNICAST,
+      .eattrs = &eattrs.l,
+    };
 
     rta *a = rta_lookup(&a0);
     rte *rte = rte_get_temp(a, p->p.main_source);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index f8228313..fd0a1be4 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -966,10 +966,19 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     if (nbr->scope == SCOPE_HOST)
       WITHDRAW(BAD_NEXT_HOP " - address %I is local", nbr->addr);
 
-    a->dest = RTD_UNICAST;
-    a->nh.gw = nbr->addr;
-    a->nh.iface = nbr->iface;
     ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, c->cf->cost);
+
+    a->dest = RTD_UNICAST;
+    struct nexthop_adata nhad = {
+      .nh = {
+	.gw = nbr->addr,
+	.iface = nbr->iface,
+      },
+      .ad = {
+	.length = sizeof nhad - sizeof nhad.ad,
+      },
+    };
+    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
   }
   else /* GW_RECURSIVE */
   {
@@ -998,7 +1007,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a)
 
     a->dest = RTD_UNREACHABLE;
     a->hostentry = NULL;
-    a->nh = (struct nexthop) { };
+    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
     return;
   }
 
@@ -1008,8 +1017,16 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a)
 
   if (s->channel->cf->gw_mode == GW_DIRECT)
   {
-    a->nh.labels = lnum;
-    memcpy(a->nh.label, labels, 4*lnum);
+    eattr *e = ea_find(a->eattrs, &ea_gen_nexthop);
+    struct {
+      struct nexthop_adata nhad;
+      u32 labels[MPLS_MAX_LABEL_STACK];
+    } nh;
+    
+    memcpy(&nh.nhad, e->u.ptr, sizeof(struct adata) + e->u.ptr->length);
+    nh.nhad.nh.labels = lnum;
+    memcpy(nh.labels, labels, lnum * sizeof(u32));
+    nh.nhad.ad.length = sizeof nh.nhad + lnum * sizeof(u32);
   }
   else /* GW_RECURSIVE */
     rta_apply_hostentry(a, s->hostentry);
@@ -1076,7 +1093,7 @@ bgp_use_next_hop(struct bgp_export_state *s, eattr *a)
   return p->neigh && (p->neigh->iface == ifa);
 }
 
-static inline int
+static inline struct nexthop *
 bgp_use_gateway(struct bgp_export_state *s)
 {
   struct bgp_proto *p = s->proto;
@@ -1085,22 +1102,35 @@ bgp_use_gateway(struct bgp_export_state *s)
 
   /* Handle next hop self option - also applies to gateway */
   if (c->cf->next_hop_self && bgp_match_src(s, c->cf->next_hop_self))
-    return 0;
+    return NULL;
+
+  /* Unreachable */
+  if (ra->dest != RTD_UNICAST)
+    return NULL;
+
+  eattr *nhea = ea_find(ra->eattrs, &ea_gen_nexthop);
+  if (!nhea)
+    return NULL;
 
   /* We need one valid global gateway */
-  if ((ra->dest != RTD_UNICAST) || ra->nh.next || ipa_zero(ra->nh.gw) || ipa_is_link_local(ra->nh.gw))
-    return 0;
+  struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
+  if (!NEXTHOP_ONE(nhad) || ipa_zero(nhad->nh.gw) ||
+      ipa_is_link_local(nhad->nh.gw))
+    return NULL;
 
   /* Check for non-matching AF */
-  if ((ipa_is_ip4(ra->nh.gw) != bgp_channel_is_ipv4(c)) && !c->ext_next_hop)
-    return 0;
+  if ((ipa_is_ip4(nhad->nh.gw) != bgp_channel_is_ipv4(c)) && !c->ext_next_hop)
+    return NULL;
 
   /* Use it when exported to internal peers */
   if (p->is_interior)
-    return 1;
+    return &nhad->nh;
 
   /* Use it when forwarded to single-hop BGP peer on on the same iface */
-  return p->neigh && (p->neigh->iface == ra->nh.iface);
+  if (p->neigh && (p->neigh->iface == nhad->nh.iface))
+    return &nhad->nh;
+
+  return NULL;
 }
 
 static void
@@ -1108,17 +1138,17 @@ bgp_update_next_hop_ip(struct bgp_export_state *s, eattr *a, ea_list **to)
 {
   if (!a || !bgp_use_next_hop(s, a))
   {
-    if (bgp_use_gateway(s))
+    struct nexthop *nhloc;
+    if (nhloc = bgp_use_gateway(s))
     {
-      rta *ra = s->route->attrs;
-      ip_addr nh[1] = { ra->nh.gw };
+      ip_addr nh[1] = { nhloc->gw };
       bgp_set_attr_data(to, BA_NEXT_HOP, 0, nh, 16);
 
       if (s->mpls)
       {
 	u32 implicit_null = BGP_MPLS_NULL;
-	u32 *labels = ra->nh.labels ? ra->nh.label : &implicit_null;
-	uint lnum = ra->nh.labels ? ra->nh.labels : 1;
+	u32 *labels = nhloc->labels ? nhloc->label : &implicit_null;
+	uint lnum = nhloc->labels ? nhloc->labels : 1;
 	bgp_set_attr_data(to, BA_MPLS_LABEL_STACK, 0, labels, lnum * 4);
       }
     }
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 91739056..6070fd34 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -28,24 +28,30 @@ nh_is_vlink(struct nexthop *nhs)
 static inline int
 unresolved_vlink(ort *ort)
 {
-  return ort->n.nhs && nh_is_vlink(ort->n.nhs);
+  return ort->n.nhs && nh_is_vlink(&ort->n.nhs->nh);
 }
 
-static inline struct nexthop *
+static inline struct nexthop_adata *
 new_nexthop(struct ospf_proto *p, ip_addr gw, struct iface *iface, byte weight)
 {
-  struct nexthop *nh = lp_allocz(p->nhpool, sizeof(struct nexthop));
-  nh->gw = gw;
-  nh->iface = iface;
-  nh->weight = weight;
-  return nh;
+  struct nexthop_adata *nhad = lp_alloc(p->nhpool, sizeof(struct nexthop_adata));
+  *nhad = (struct nexthop_adata) {
+    .ad = { .length = sizeof *nhad - sizeof nhad->ad, },
+    .nh = {
+      .gw = gw,
+      .iface = iface,
+      .weight = weight,
+    },
+  };
+
+  return nhad;
 }
 
 /* Returns true if there are device nexthops in n */
 static inline int
-has_device_nexthops(const struct nexthop *n)
+has_device_nexthops(struct nexthop_adata *nhad)
 {
-  for (; n; n = n->next)
+  NEXTHOP_WALK(n, nhad)
     if (ipa_zero(n->gw))
       return 1;
 
@@ -53,38 +59,22 @@ has_device_nexthops(const struct nexthop *n)
 }
 
 /* Replace device nexthops with nexthops to gw */
-static struct nexthop *
-fix_device_nexthops(struct ospf_proto *p, const struct nexthop *n, ip_addr gw)
+static struct nexthop_adata *
+fix_device_nexthops(struct ospf_proto *p, struct nexthop_adata *old, ip_addr gw)
 {
-  struct nexthop *root1 = NULL;
-  struct nexthop *root2 = NULL;
-  struct nexthop **nn1 = &root1;
-  struct nexthop **nn2 = &root2;
-
   if (!p->ecmp)
-    return new_nexthop(p, gw, n->iface, n->weight);
-
-  /* This is a bit tricky. We cannot just copy the list and update n->gw,
-     because the list should stay sorted, so we create two lists, one with new
-     gateways and one with old ones, and then merge them. */
-
-  for (; n; n = n->next)
   {
-    struct nexthop *nn = new_nexthop(p, ipa_zero(n->gw) ? gw : n->gw, n->iface, n->weight);
-
-    if (ipa_zero(n->gw))
-    {
-      *nn1 = nn;
-      nn1 = &(nn->next);
-    }
-    else
-    {
-      *nn2 = nn;
-      nn2 = &(nn->next);
-    }
+    struct nexthop_adata *new = (struct nexthop_adata *) lp_store_adata(p->nhpool, old->ad.data, old->ad.length);
+    new->nh.gw = gw;
+    return new;
   }
 
-  return nexthop_merge(root1, root2, 1, 1, p->ecmp, p->nhpool);
+  struct nexthop_adata *tmp = (struct nexthop_adata *) tmp_copy_adata(&old->ad);
+  NEXTHOP_WALK(n, tmp)
+    if (ipa_zero(n->gw))
+      n->gw = gw;
+
+  return nexthop_sort(tmp, p->nhpool);
 }
 
 
@@ -169,9 +159,9 @@ orta_compare(const struct ospf_proto *p, const orta *new, const orta *old)
     return -1;
   if (!new->nhs)
     return 1;
-  if (nh_is_vlink(new->nhs))
+  if (nh_is_vlink(&new->nhs->nh))
     return -1;
-  if (nh_is_vlink(old->nhs))
+  if (nh_is_vlink(&old->nhs->nh))
     return 1;
 
 
@@ -279,11 +269,7 @@ ort_merge(struct ospf_proto *p, ort *o, const orta *new)
   orta *old = &o->n;
 
   if (old->nhs != new->nhs)
-  {
-    old->nhs = nexthop_merge(old->nhs, new->nhs, old->nhs_reuse, new->nhs_reuse,
-			  p->ecmp, p->nhpool);
-    old->nhs_reuse = 1;
-  }
+    old->nhs = nexthop_merge(old->nhs, new->nhs, p->ecmp, p->nhpool);
 
   if (old->rid < new->rid)
     old->rid = new->rid;
@@ -295,11 +281,7 @@ ort_merge_ext(struct ospf_proto *p, ort *o, const orta *new)
   orta *old = &o->n;
 
   if (old->nhs != new->nhs)
-  {
-    old->nhs = nexthop_merge(old->nhs, new->nhs, old->nhs_reuse, new->nhs_reuse,
-			  p->ecmp, p->nhpool);
-    old->nhs_reuse = 1;
-  }
+    old->nhs = nexthop_merge(old->nhs, new->nhs, p->ecmp, p->nhpool);
 
   if (old->tag != new->tag)
     old->tag = 0;
@@ -1165,7 +1147,7 @@ ospf_check_vlinks(struct ospf_proto *p)
 
       if (tmp && (tmp->color == INSPF) && ipa_nonzero(tmp->lb) && tmp->nhs)
       {
-	struct ospf_iface *nhi = ospf_iface_find(p, tmp->nhs->iface);
+	struct ospf_iface *nhi = ospf_iface_find(p, tmp->nhs->nh.iface);
 
 	if ((ifa->state != OSPF_IS_PTP)
 	    || (ifa->vifa != nhi)
@@ -1579,10 +1561,7 @@ ospf_ext_spf(struct ospf_proto *p)
 
       /* Replace device nexthops with nexthops to forwarding address from LSA */
       if (has_device_nexthops(nfa.nhs))
-      {
 	nfa.nhs = fix_device_nexthops(p, nfa.nhs, rt.fwaddr);
-	nfa.nhs_reuse = 1;
-      }
     }
 
     if (rt.ebit)
@@ -1726,10 +1705,10 @@ ospf_rt_spf(struct ospf_proto *p)
 
 
 static inline int
-inherit_nexthops(struct nexthop *pn)
+inherit_nexthops(struct nexthop_adata *pn)
 {
   /* Proper nexthops (with defined GW) or dummy vlink nexthops (without iface) */
-  return pn && (ipa_nonzero(pn->gw) || !pn->iface);
+  return pn && (ipa_nonzero(pn->nh.gw) || !pn->nh.iface);
 }
 
 static inline ip_addr
@@ -1744,12 +1723,12 @@ link_lsa_lladdr(struct ospf_proto *p, struct top_hash_entry *en)
   return ospf_is_ip4(p) ? ipa_from_ip4(ospf3_6to4(ll)) : ipa_from_ip6(ll);
 }
 
-static struct nexthop *
+static struct nexthop_adata *
 calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
 	      struct top_hash_entry *par, int pos, uint data, uint lif, uint nif)
 {
   struct ospf_proto *p = oa->po;
-  struct nexthop *pn = par->nhs;
+  struct nexthop_adata *pn = par->nhs;
   struct top_hash_entry *link = NULL;
   struct ospf_iface *ifa = NULL;
   ip_addr nh = IPA_NONE;
@@ -1827,10 +1806,10 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
 	return NULL;
     }
 
-    struct nexthop *nhs = new_nexthop(p, nh, ifa->iface, ifa->ecmp_weight);
+    struct nexthop_adata *nhs = new_nexthop(p, nh, ifa->iface, ifa->ecmp_weight);
 
     if (ifa->addr->flags & IA_HOST)
-      nhs->flags = RNF_ONLINK;
+      nhs->nh.flags = RNF_ONLINK;
 
     return nhs;
   }
@@ -1851,7 +1830,7 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
       if (ipa_zero(en->lb))
 	goto bad;
 
-      return new_nexthop(p, en->lb, pn->iface, pn->weight);
+      return new_nexthop(p, en->lb, pn->nh.iface, pn->nh.weight);
     }
     else /* OSPFv3 */
     {
@@ -1859,7 +1838,7 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
        * Next-hop is taken from lladdr field of Link-LSA, en->lb_id
        * is computed in link_back().
        */
-      link = ospf_hash_find(p->gr, pn->iface->index, en->lb_id, rid, LSA_T_LINK);
+      link = ospf_hash_find(p->gr, pn->nh.iface->index, en->lb_id, rid, LSA_T_LINK);
       if (!link)
 	return NULL;
 
@@ -1867,7 +1846,7 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
       if (ipa_zero(nh))
 	return NULL;
 
-      return new_nexthop(p, nh, pn->iface, pn->weight);
+      return new_nexthop(p, nh, pn->nh.iface, pn->nh.weight);
     }
   }
 
@@ -1914,7 +1893,7 @@ add_cand(struct ospf_area *oa, struct top_hash_entry *en, struct top_hash_entry
   if (!link_back(oa, en, par, lif, nif))
     return;
 
-  struct nexthop *nhs = calc_next_hop(oa, en, par, pos, data, lif, nif);
+  struct nexthop_adata *nhs = calc_next_hop(oa, en, par, pos, data, lif, nif);
   if (!nhs)
   {
     log(L_WARN "%s: Cannot find next hop for LSA (Type: %04x, Id: %R, Rt: %R)",
@@ -1923,7 +1902,7 @@ add_cand(struct ospf_area *oa, struct top_hash_entry *en, struct top_hash_entry
   }
 
   /* If en->dist > 0, we know that en->color == CANDIDATE and en->nhs is defined. */
-  if ((dist == en->dist) && !nh_is_vlink(en->nhs))
+  if ((dist == en->dist) && !nh_is_vlink(&en->nhs->nh))
   {
     /*
      * For multipath, we should merge nexthops. We merge regular nexthops only.
@@ -1947,13 +1926,11 @@ add_cand(struct ospf_area *oa, struct top_hash_entry *en, struct top_hash_entry
      */
 
     /* Keep old ones */
-    if (!p->ecmp || nh_is_vlink(nhs) || (nhs == en->nhs))
+    if (!p->ecmp || nh_is_vlink(&nhs->nh) || (nhs == en->nhs))
       return;
 
     /* Merge old and new */
-    int new_reuse = (par->nhs != nhs);
-    en->nhs = nexthop_merge(en->nhs, nhs, en->nhs_reuse, new_reuse, p->ecmp, p->nhpool);
-    en->nhs_reuse = 1;
+    en->nhs = nexthop_merge(en->nhs, nhs, p->ecmp, p->nhpool);
     return;
   }
 
@@ -1967,7 +1944,6 @@ add_cand(struct ospf_area *oa, struct top_hash_entry *en, struct top_hash_entry
   en->nhs = nhs;
   en->dist = dist;
   en->color = CANDIDATE;
-  en->nhs_reuse = (par->nhs != nhs);
 
   prev = NULL;
 
@@ -2008,10 +1984,23 @@ ort_changed(ort *nf, rta *nr)
   if (!or ||
     (nf->n.metric1 != nf->old_metric1) || (nf->n.metric2 != nf->old_metric2) ||
     (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid) ||
-    (nr->dest != or->dest) ||
-    !nexthop_same(&(nr->nh), &(or->nh)))
+    (nr->dest != or->dest))
     return 1;
 
+  eattr *nhea_n = ea_find(nr->eattrs, &ea_gen_nexthop);
+  eattr *nhea_o = ea_find(or->eattrs, &ea_gen_nexthop);
+  if (!nhea_n != !nhea_o)
+    return 1;
+
+  if (nhea_n && nhea_o)
+  {
+    struct nexthop_adata *nhad_n = (struct nexthop_adata *) nhea_n->u.ptr;
+    struct nexthop_adata *nhad_o = (struct nexthop_adata *) nhea_o->u.ptr;
+
+    if (!nexthop_same(nhad_n, nhad_o))
+      return 1;
+  }
+
   if (	ea_get_int(nr->eattrs, &ea_gen_source, 0)
      != ea_get_int(or->eattrs, &ea_gen_source, 0))
     return 1;
@@ -2038,10 +2027,9 @@ again1:
   FIB_ITERATE_START(fib, &fit, ort, nf)
   {
     /* Sanity check of next-hop addresses, failure should not happen */
-    if (nf->n.type)
+    if (nf->n.type && nf->n.nhs)
     {
-      struct nexthop *nh;
-      for (nh = nf->n.nhs; nh; nh = nh->next)
+      NEXTHOP_WALK(nh, nf->n.nhs)
 	if (ipa_nonzero(nh->gw))
 	{
 	  neighbor *nbr = neigh_find(&p->p, nh->gw, nh->iface,
@@ -2062,9 +2050,24 @@ again1:
     {
       rta a0 = {
 	.dest = RTD_UNICAST,
-	.nh = *(nf->n.nhs),
       };
 
+      struct {
+	ea_list l;
+	eattr a[7];
+      } eattrs;
+
+      eattrs.l = (ea_list) {};
+
+      eattrs.a[eattrs.l.count++] =
+	EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference);
+
+      eattrs.a[eattrs.l.count++] = 
+	EA_LITERAL_EMBEDDED(&ea_gen_source, 0, nf->n.type);
+
+      eattrs.a[eattrs.l.count++] =
+	EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nf->n.nhs->ad);
+
       if (reload || ort_changed(nf, &a0))
       {
 	nf->old_metric1 = nf->n.metric1;
@@ -2072,19 +2075,6 @@ again1:
 	nf->old_tag = nf->n.tag;
 	nf->old_rid = nf->n.rid;
 
-	struct {
-	  ea_list l;
-	  eattr a[6];
-	} eattrs;
-
-	eattrs.l = (ea_list) {};
-
-	eattrs.a[eattrs.l.count++] =
-	  EA_LITERAL_EMBEDDED(&ea_gen_preference, 0, p->p.main_channel->preference);
-
-	eattrs.a[eattrs.l.count++] = 
-	  EA_LITERAL_EMBEDDED(&ea_gen_source, 0, nf->n.type);
-
 	eattrs.a[eattrs.l.count++] =
 	  EA_LITERAL_EMBEDDED(&ea_ospf_metric1, 0, nf->n.metric1);
 
diff --git a/proto/ospf/rt.h b/proto/ospf/rt.h
index 094e125b..180216b7 100644
--- a/proto/ospf/rt.h
+++ b/proto/ospf/rt.h
@@ -18,8 +18,6 @@
 typedef struct orta
 {
   u8 type;			/* RTS_OSPF_* */
-  u8 nhs_reuse;			/* Whether nhs nodes can be reused during merging.
-				   See a note in rt.c:add_cand() */
   u32 options;
   /*
    * For ORT_ROUTER routes, options field are router-LSA style
@@ -53,7 +51,7 @@ typedef struct orta
   struct ospf_area *oa;
   struct ospf_area *voa;	/* Used when route is replaced in ospf_rt_sum_tr(),
 				   NULL otherwise */
-  struct nexthop *nhs;		/* Next hops computed during SPF */
+  struct nexthop_adata *nhs;	/* Next hops computed during SPF */
   struct top_hash_entry *en;	/* LSA responsible for this orta */
 }
 orta;
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index db423dc8..ca4620cc 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -1366,8 +1366,20 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   uint tag = ea_get_int(a->eattrs, &ea_ospf_tag, 0);
 
   ip_addr fwd = IPA_NONE;
-  if ((a->dest == RTD_UNICAST) && use_gw_for_fwaddr(p, a->nh.gw, a->nh.iface))
-    fwd = a->nh.gw;
+  if (a->dest == RTD_UNICAST)
+  {
+    eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+    if (!nhea)
+    {
+      log(L_ERR "%s: Unicast route without nexthop for %N",
+	  p->p.name, n->n.addr);
+      return;
+    }
+
+    struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
+    if (use_gw_for_fwaddr(p, nhad->nh.gw, nhad->nh.iface))
+      fwd = nhad->nh.gw;
+  }
 
   /* NSSA-LSA with P-bit set must have non-zero forwarding address */
   if (oa && ipa_zero(fwd))
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h
index 535d1f1b..fe102f77 100644
--- a/proto/ospf/topology.h
+++ b/proto/ospf/topology.h
@@ -28,7 +28,7 @@ struct top_hash_entry
   u16 next_lsa_opts;		/* For postponed LSA origination */
   btime inst_time;		/* Time of installation into DB */
   struct ort *nf;		/* Reference fibnode for sum and ext LSAs, NULL for otherwise */
-  struct nexthop *nhs;		/* Computed nexthops - valid only in ospf_rt_spf() */
+  struct nexthop_adata *nhs;	/* Computed nexthops - valid only in ospf_rt_spf() */
   ip_addr lb;			/* In OSPFv2, link back address. In OSPFv3, any global address in the area useful for vlinks */
   u32 lb_id;			/* Interface ID of link back iface (for bcast or NBMA networks) */
   u32 dist;			/* Distance from the root */
@@ -39,8 +39,6 @@ struct top_hash_entry
 #define CANDIDATE 1
 #define INSPF 2
   u8 mode;			/* LSA generated during RT calculation (LSA_RTCALC or LSA_STALE)*/
-  u8 nhs_reuse;			/* Whether nhs nodes can be reused during merging.
-				   See a note in rt.c:add_cand() */
 };
 
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 4329556c..8642e0a1 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -144,13 +144,19 @@ perf_loop(void *data)
     if (!p->attrs_per_rte || !(i % p->attrs_per_rte)) {
       struct rta a0 = {
 	.dest = RTD_UNICAST,
+      };
+
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
+      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_PERF);
+
+      struct nexthop_adata nhad = {
 	.nh.iface = p->ifa->iface,
 	.nh.gw = gw,
 	.nh.weight = 1,
       };
 
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_PERF);
+      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0,
+	  &nhad.ad.data, sizeof nhad - sizeof nhad.ad);
 
       p->data[i].a = rta_lookup(&a0);
     }
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index f7f34c27..425a411c 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -169,38 +169,58 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
     a0.eattrs = &ea_block.l;
 
     u16 rt_tag = rt->tag;
+    struct iface *rt_from = NULL;
 
     if (p->ecmp)
     {
       /* ECMP route */
-      struct nexthop *nhs = NULL;
       int num = 0;
 
+      for (rt = en->routes; rt && (num < p->ecmp); rt = rt->next)
+	if (rip_valid_rte(rt))
+	  num++;
+
+      struct nexthop_adata *nhad = (struct nexthop_adata *) tmp_alloc_adata((num+1) * sizeof(struct nexthop));
+      struct nexthop *nh = &nhad->nh;
+
       for (rt = en->routes; rt && (num < p->ecmp); rt = rt->next)
       {
 	if (!rip_valid_rte(rt))
-	    continue;
+	  continue;
 
-	struct nexthop *nh = allocz(sizeof(struct nexthop));
+	*nh = (struct nexthop) {
+	  .gw = rt->next_hop,
+	  .iface = rt->from->ifa->iface,
+	  .weight = rt->from->ifa->cf->ecmp_weight,
+	};
 
-	nh->gw = rt->next_hop;
-	nh->iface = rt->from->ifa->iface;
-	nh->weight = rt->from->ifa->cf->ecmp_weight;
+	if (!rt_from)
+	  rt_from = rt->from->ifa->iface;
 
-	nexthop_insert(&nhs, nh);
-	num++;
+	nh = NEXTHOP_NEXT(nh);
 
 	if (rt->tag != rt_tag)
 	  rt_tag = 0;
       }
 
-      a0.nh = *nhs;
+      nhad->ad.length = ((void *) nh - (void *) nhad->ad.data);
+
+      ea_set_attr(&a0.eattrs,
+	  EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0,
+	    &(nexthop_sort(nhad, tmp_linpool)->ad)));
     }
     else
     {
       /* Unipath route */
-      a0.nh.gw = rt->next_hop;
-      a0.nh.iface = rt->from->ifa->iface;
+      rt_from = rt->from->ifa->iface;
+
+      struct nexthop_adata nhad = {
+	.nh.gw = rt->next_hop,
+	.nh.iface = rt->from->ifa->iface,
+      };
+
+      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0,
+	  &nhad.ad.data, sizeof nhad - sizeof nhad.ad);
       ea_set_attr_data(&a0.eattrs, &ea_gen_from, 0, &rt->from->nbr->addr, sizeof(ip_addr));
     }
 
@@ -208,7 +228,7 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 
     struct rip_iface_adata riad = {
       .ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },
-      .iface = a0.nh.iface,
+      .iface = rt_from,
     };
     ea_set_attr(&a0.eattrs,
 	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &riad.ad));
@@ -362,8 +382,14 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
     en->metric = rt_metric;
     en->tag = rt_tag;
     en->from = (new->src->proto == P) ? rt_from : NULL;
-    en->iface = new->attrs->nh.iface;
-    en->next_hop = new->attrs->nh.gw;
+
+    eattr *nhea = ea_find(new->attrs->eattrs, &ea_gen_nexthop);
+    if (nhea)
+    {
+      struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
+      en->iface = nhad->nh.iface;
+      en->next_hop = nhad->nh.gw;
+    }
   }
   else
   {
diff --git a/proto/static/static.c b/proto/static/static.c
index e792a148..2e4a46a6 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -61,32 +61,40 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 
   if (r->dest == RTD_UNICAST)
   {
-    struct static_route *r2;
-    struct nexthop *nhs = NULL;
+    uint sz = 0;
+    for (struct static_route *r2 = r; r2; r2 = r2->mp_next)
+      if (r2->active)
+	sz += NEXTHOP_SIZE_CNT(r2->mls ? r2->mls->length / sizeof(u32) : 0);
 
-    for (r2 = r; r2; r2 = r2->mp_next)
+    if (!sz)
+      goto withdraw;
+
+    struct nexthop_adata *nhad = allocz(sz + sizeof *nhad);
+    struct nexthop *nh = &nhad->nh;
+
+    for (struct static_route *r2 = r; r2; r2 = r2->mp_next)
     {
       if (!r2->active)
 	continue;
 
-      struct nexthop *nh = allocz(NEXTHOP_MAX_SIZE);
-      nh->gw = r2->via;
-      nh->iface = r2->neigh->iface;
-      nh->flags = r2->onlink ? RNF_ONLINK : 0;
-      nh->weight = r2->weight;
+      *nh = (struct nexthop) {
+	.gw = r2->via,
+	.iface = r2->neigh->iface,
+	.flags = r2->onlink ? RNF_ONLINK : 0,
+	.weight = r2->weight,
+      };
+
       if (r2->mls)
       {
 	nh->labels = r2->mls->length / sizeof(u32);
 	memcpy(nh->label, r2->mls->data, r2->mls->length);
       }
 
-      nexthop_insert(&nhs, nh);
+      nh = NEXTHOP_NEXT(nh);
     }
 
-    if (!nhs)
-      goto withdraw;
-
-    nexthop_link(a, nhs);
+    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0,
+	nhad->ad.data, (void *) nh - (void *) nhad->ad.data);
   }
 
   if (r->dest == RTDX_RECURSIVE)
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index e0219ce0..fdfd4885 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -827,12 +827,12 @@ nl_add_nexthop(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af UNUS
 }
 
 static void
-nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, ea_list *eattrs)
+nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop_adata *nhad, int af, ea_list *eattrs)
 {
   struct rtattr *a = nl_open_attr(h, bufsize, RTA_MULTIPATH);
   eattr *flow = ea_find(eattrs, &ea_krt_realm);
 
-  for (; nh; nh = nh->next)
+  NEXTHOP_WALK(nh, nhad)
   {
     struct rtnexthop *rtnh = nl_open_nexthop(h, bufsize);
 
@@ -856,31 +856,44 @@ nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, e
   nl_close_attr(h, a);
 }
 
-static struct nexthop *
+static struct nexthop_adata *
 nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr *n, struct rtattr *ra, int af, int krt_src)
 {
   struct rtattr *a[BIRD_RTA_MAX];
-  struct rtnexthop *nh = RTA_DATA(ra);
-  struct nexthop *rv, *first, **last;
-  unsigned len = RTA_PAYLOAD(ra);
+  struct rtnexthop *nh, *orig_nh = RTA_DATA(ra);
+  unsigned len, orig_len = RTA_PAYLOAD(ra);
+  uint cnt = 0;
 
-  first = NULL;
-  last = &first;
-
-  while (len)
+  /* First count the nexthops */
+  for (len = orig_len, nh = orig_nh; len; len -= NLMSG_ALIGN(nh->rtnh_len), nh = RTNH_NEXT(nh))
     {
       /* Use RTNH_OK(nh,len) ?? */
       if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
 	goto err;
 
       if ((nh->rtnh_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
-	goto next;
+	;
+      else
+	cnt++;
+    }
 
-      *last = rv = lp_allocz(s->pool, NEXTHOP_MAX_SIZE);
-      last = &(rv->next);
+  struct nexthop_adata *nhad = lp_allocz(s->pool, cnt * NEXTHOP_MAX_SIZE + sizeof *nhad);
+  struct nexthop *rv = &nhad->nh;
+
+  for (len = orig_len, nh = orig_nh; len; len -= NLMSG_ALIGN(nh->rtnh_len), nh = RTNH_NEXT(nh))
+    {
+      /* Use RTNH_OK(nh,len) ?? */
+      if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
+	goto err;
+
+      if ((nh->rtnh_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
+	continue;
+
+      *rv = (struct nexthop) {
+	.weight = nh->rtnh_hops,
+	.iface = if_find_by_index(nh->rtnh_ifindex),
+      };
 
-      rv->weight = nh->rtnh_hops;
-      rv->iface = if_find_by_index(nh->rtnh_ifindex);
       if (!rv->iface)
 	{
 	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", n, nh->rtnh_ifindex);
@@ -959,16 +972,14 @@ nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr
       }
 #endif
 
-    next:
-      len -= NLMSG_ALIGN(nh->rtnh_len);
-      nh = RTNH_NEXT(nh);
+      rv = NEXTHOP_NEXT(rv);
     }
 
-  /* Ensure nexthops are sorted to satisfy nest invariant */
-  if (!nexthop_is_sorted(first))
-    first = nexthop_sort(first);
+  /* Store final length */
+  nhad->ad.length = (void *) rv - (void *) nhad->ad.data;
 
-  return first;
+  /* Ensure nexthops are sorted to satisfy nest invariant */
+  return nexthop_is_sorted(nhad) ? nhad : nexthop_sort(nhad, s->pool);
 
 err:
   log(L_ERR "KRT: Received strange multipath route %N", n);
@@ -1412,22 +1423,23 @@ krt_capable(rte *e)
 }
 
 static inline int
-nh_bufsize(struct nexthop *nh)
+nh_bufsize(struct nexthop_adata *nhad)
 {
   int rv = 0;
-  for (; nh != NULL; nh = nh->next)
+  NEXTHOP_WALK(nh, nhad)
     rv += RTNH_LENGTH(RTA_LENGTH(sizeof(ip_addr)));
   return rv;
 }
 
 static int
-nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
+nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop_adata *nh)
 {
   eattr *ea;
   net *net = e->net;
   rta *a = e->attrs;
   ea_list *eattrs = a->eattrs;
-  int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh));
+
+  int bufsize = 128 + KRT_METRICS_MAX*8 + (nh ? nh_bufsize(nh) : 0);
   u32 priority = 0;
 
   struct {
@@ -1511,7 +1523,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
   else if (ea = ea_find(eattrs, &ea_krt_scope))
     r->r.rtm_scope = ea->u.data;
   else
-    r->r.rtm_scope = (dest == RTD_UNICAST && ipa_zero(nh->gw)) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
+    r->r.rtm_scope = (dest == RTD_UNICAST && ipa_zero(nh->nh.gw)) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
 
   if (ea = ea_find(eattrs, &ea_krt_prefsrc))
     nl_add_attr_ipa(&r->h, rsize, RTA_PREFSRC, *(ip_addr *)ea->u.ptr->data);
@@ -1540,14 +1552,14 @@ dest:
     {
     case RTD_UNICAST:
       r->r.rtm_type = RTN_UNICAST;
-      if (nh->next && !krt_ecmp6(p))
+      if (!NEXTHOP_ONE(nh) && !krt_ecmp6(p))
 	nl_add_multipath(&r->h, rsize, nh, p->af, eattrs);
       else
       {
-	nl_add_attr_u32(&r->h, rsize, RTA_OIF, nh->iface->index);
-	nl_add_nexthop(&r->h, rsize, nh, p->af);
+	nl_add_attr_u32(&r->h, rsize, RTA_OIF, nh->nh.iface->index);
+	nl_add_nexthop(&r->h, rsize, &nh->nh, p->af);
 
-	if (nh->flags & RNF_ONLINK)
+	if (nh->nh.flags & RNF_ONLINK)
 	  r->r.rtm_flags |= RTNH_F_ONLINK;
       }
       break;
@@ -1576,21 +1588,35 @@ nl_add_rte(struct krt_proto *p, rte *e)
   rta *a = e->attrs;
   int err = 0;
 
-  if (krt_ecmp6(p) && a->nh.next)
+  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+
+  if (krt_ecmp6(p) && nhad && !NEXTHOP_ONE(nhad))
   {
-    struct nexthop *nh = &(a->nh);
+    uint cnt = 0;
+    NEXTHOP_WALK(nh, nhad)
+    {
+      struct {
+	struct nexthop_adata nhad;
+	u32 labels[MPLS_MAX_LABEL_STACK];
+      } nhx;
+      memcpy(&nhx.nhad.nh, nh, NEXTHOP_SIZE(nh));
+      nhx.nhad.ad.length = (void *) NEXTHOP_NEXT(&nhx.nhad.nh) - (void *) nhx.nhad.ad.data;
 
-    err = nl_send_route(p, e, NL_OP_ADD, RTD_UNICAST, nh);
-    if (err < 0)
-      return err;
-
-    for (nh = nh->next; nh; nh = nh->next)
-      err += nl_send_route(p, e, NL_OP_APPEND, RTD_UNICAST, nh);
+      if (!cnt++)
+      {
+	err = nl_send_route(p, e, NL_OP_ADD, RTD_UNICAST, &nhx.nhad);
+	if (err < 0)
+	  return err;
+      }
+      else
+	err += nl_send_route(p, e, NL_OP_APPEND, RTD_UNICAST, &nhx.nhad);
+    }
 
     return err;
   }
 
-  return nl_send_route(p, e, NL_OP_ADD, a->dest, &(a->nh));
+  return nl_send_route(p, e, NL_OP_ADD, a->dest, nhad);
 }
 
 static inline int
@@ -1610,7 +1636,9 @@ static inline int
 nl_replace_rte(struct krt_proto *p, rte *e)
 {
   rta *a = e->attrs;
-  return nl_send_route(p, e, NL_OP_REPLACE, a->dest, &(a->nh));
+  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+  return nl_send_route(p, e, NL_OP_REPLACE, a->dest, nhad);
 }
 
 
@@ -1861,6 +1889,15 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   else
     s->rta_flow = 0;
 
+  union {
+    struct {
+      struct adata ad;
+      struct nexthop nh;
+      u32 labels[MPLS_MAX_LABEL_STACK];
+    };
+    struct nexthop_adata nhad;
+  } nhad = {};
+
   switch (i->rtm_type)
     {
     case RTN_UNICAST:
@@ -1868,49 +1905,50 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 
       if (a[RTA_MULTIPATH])
         {
-	  struct nexthop *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
+	  struct nexthop_adata *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
 	  if (!nh)
 	    SKIP("strange RTA_MULTIPATH\n");
 
-	  nexthop_link(ra, nh);
+	  ea_set_attr(&ra->eattrs, EA_LITERAL_DIRECT_ADATA(
+		&ea_gen_nexthop, 0, &nh->ad));
 	  break;
 	}
 
       if ((i->rtm_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
 	SKIP("ignore RTNH_F_DEAD\n");
 
-      ra->nh.iface = if_find_by_index(oif);
-      if (!ra->nh.iface)
+      nhad.nh.iface = if_find_by_index(oif);
+      if (!nhad.nh.iface)
 	{
 	  log(L_ERR "KRT: Received route %N with unknown ifindex %u", net->n.addr, oif);
 	  return;
 	}
 
       if (a[RTA_GATEWAY])
-	ra->nh.gw = rta_get_ipa(a[RTA_GATEWAY]);
+	nhad.nh.gw = rta_get_ipa(a[RTA_GATEWAY]);
 
 #ifdef HAVE_MPLS_KERNEL
       if (a[RTA_VIA])
-	ra->nh.gw = rta_get_via(a[RTA_VIA]);
+	nhad.nh.gw = rta_get_via(a[RTA_VIA]);
 #endif
 
-      if (ipa_nonzero(ra->nh.gw))
+      if (ipa_nonzero(nhad.nh.gw))
 	{
 	  /* Silently skip strange 6to4 routes */
 	  const net_addr_ip6 sit = NET_ADDR_IP6(IP6_NONE, 96);
-	  if ((i->rtm_family == AF_INET6) && ipa_in_netX(ra->nh.gw, (net_addr *) &sit))
+	  if ((i->rtm_family == AF_INET6) && ipa_in_netX(nhad.nh.gw, (net_addr *) &sit))
 	    return;
 
 	  if (i->rtm_flags & RTNH_F_ONLINK)
-	    ra->nh.flags |= RNF_ONLINK;
+	    nhad.nh.flags |= RNF_ONLINK;
 
 	  neighbor *nbr;
-	  nbr = neigh_find(&p->p, ra->nh.gw, ra->nh.iface,
-			   (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
+	  nbr = neigh_find(&p->p, nhad.nh.gw, nhad.nh.iface,
+			   (nhad.nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
 	  if (!nbr || (nbr->scope == SCOPE_HOST))
 	    {
 	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr,
-                  ra->nh.gw);
+                  nhad.nh.gw);
 	      return;
 	    }
 	}
@@ -1932,10 +1970,10 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     }
 
 #ifdef HAVE_MPLS_KERNEL
-  if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !ra->nh.next)
-    ra->nh.labels = rta_get_mpls(a[RTA_NEWDST], ra->nh.label);
+  if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !a[RTA_MULTIPATH])
+    nhad.nh.labels = rta_get_mpls(a[RTA_NEWDST], nhad.nh.label);
 
-  if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !ra->nh.next)
+  if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !a[RTA_MULTIPATH])
     {
       switch (rta_get_u16(a[RTA_ENCAP_TYPE]))
 	{
@@ -1944,7 +1982,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	      struct rtattr *enca[BIRD_RTA_MAX];
 	      nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
 	      nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
-	      ra->nh.labels = rta_get_mpls(enca[RTA_DST], ra->nh.label);
+	      nhad.nh.labels = rta_get_mpls(enca[RTA_DST], nhad.nh.label);
 	      break;
 	    }
 	  default:
@@ -1954,6 +1992,9 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     }
 #endif
 
+  /* Finalize the nexthop */
+  nhad.ad.length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data;
+
   if (i->rtm_scope != def_scope)
     ea_set_attr(&ra->eattrs,
 	EA_LITERAL_EMBEDDED(&ea_krt_scope, 0, i->rtm_scope));
@@ -1999,6 +2040,10 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     /* Store the new route */
     s->net = net;
     s->attrs = ra;
+
+    ea_set_attr_data(&ra->eattrs, &ea_gen_nexthop, 0,
+	nhad.ad.data, nhad.ad.length);
+
     s->proto = p;
     s->new = new;
     s->krt_src = krt_src;
@@ -2009,20 +2054,18 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   else
   {
     /* Merge next hops with the stored route */
-    rta *oa = s->attrs;
+    eattr *nhea = ea_find(s->attrs->eattrs, &ea_gen_nexthop);
+    struct nexthop_adata *nhad_old = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 
-    struct nexthop *nhs = &oa->nh;
-    nexthop_insert(&nhs, &ra->nh);
-
-    /* Perhaps new nexthop is inserted at the first position */
-    if (nhs == &ra->nh)
-    {
-      /* Swap rtas */
-      s->attrs = ra;
-
-      /* Keep old eattrs */
-      ra->eattrs = oa->eattrs;
-    }
+    if (nhad_old)
+      ea_set_attr(&s->attrs->eattrs,
+	  EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, 
+	    &(nexthop_merge(nhad_old, &nhad.nhad,
+		KRT_CF->merge_paths, s->pool)->ad)
+	  ));
+    else
+      ea_set_attr_data(&s->attrs->eattrs, &ea_gen_nexthop, 0,
+	  nhad.ad.data, nhad.ad.length);
   }
 }
 
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index b8e7670e..89e9e97e 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -611,10 +611,14 @@ krt_same_dest(rte *k, rte *e)
   if (ka->dest != ea->dest)
     return 0;
 
-  if (ka->dest == RTD_UNICAST)
-    return nexthop_same(&(ka->nh), &(ea->nh));
+  if (ka->dest != RTD_UNICAST)
+    return 1;
 
-  return 1;
+  eattr *nhea_k = ea_find(ka->eattrs, &ea_gen_nexthop);
+  eattr *nhea_e = ea_find(ea->eattrs, &ea_gen_nexthop);
+
+  ASSUME(nhea_k && nhea_e);
+  return adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
 }
 
 /*

From 4fe9881d625f10e44109a649e369a413bd98de71 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 15 May 2022 15:53:35 +0200
Subject: [PATCH 136/431] Moved hostentry to eattr

---
 lib/ip.h              |   2 +-
 lib/route.h           |   7 +--
 lib/type.h            |   1 +
 nest/rt-attr.c        |  56 ++++++++++++++++----
 nest/rt-table.c       | 115 ++++++++++++++++++++++++++----------------
 nest/rt.h             |  46 +++++++----------
 proto/bgp/bgp.h       |   1 -
 proto/bgp/packets.c   |  47 +++++++----------
 proto/pipe/pipe.c     |   3 +-
 proto/static/static.c |   8 +--
 10 files changed, 161 insertions(+), 125 deletions(-)

diff --git a/lib/ip.h b/lib/ip.h
index 8f975aba..20e7a336 100644
--- a/lib/ip.h
+++ b/lib/ip.h
@@ -362,7 +362,7 @@ static inline ip6_addr ip6_hton(ip6_addr a)
 static inline ip6_addr ip6_ntoh(ip6_addr a)
 { return _MI6(ntohl(_I0(a)), ntohl(_I1(a)), ntohl(_I2(a)), ntohl(_I3(a))); }
 
-#define MPLS_MAX_LABEL_STACK 8
+#define MPLS_MAX_LABEL_STACK 16
 
 static inline int
 mpls_get(const char *buf, int buflen, u32 *stack)
diff --git a/lib/route.h b/lib/route.h
index 29a78e90..3ce8021d 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -87,7 +87,6 @@ typedef struct rta {
   u32 uc;				/* Use count */
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
-  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
   u16 cached:1;				/* Are attributes cached? */
   u16 dest:4;				/* Route destination type (RTD_...) */
 } rta;
@@ -172,6 +171,8 @@ struct ea_class {
   uint readonly:1;			/* This attribute can't be changed by filters */ \
   uint conf:1;				/* Requested by config */ \
   void (*format)(const eattr *ea, byte *buf, uint size); \
+  void (*stored)(const eattr *ea);	/* When stored into global hash */ \
+  void (*freed)(const eattr *ea);	/* When released from global hash */ \
 
   EA_CLASS_INSIDE;
 };
@@ -330,10 +331,6 @@ extern struct ea_class ea_gen_source;
 static inline u32 rt_get_source_attr(rte *rt)
 { return ea_get_int(rt->attrs->eattrs, &ea_gen_source, 0); }
 
-/* MPLS labels: Use with a recursive nexthop specification
- * to add additional labels to the resolved nexthop */
-extern struct ea_class ea_mpls_labels;
-
 /* Next hop: For now, stored as adata */
 extern struct ea_class ea_gen_nexthop;
 
diff --git a/lib/type.h b/lib/type.h
index 6da86c77..65a032ec 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -53,6 +53,7 @@ enum btype {
   T_OPAQUE = 0x02,		/* Opaque byte string (not filterable) */
   T_IFACE = 0x0c,		/* Pointer to an interface (inside adata) */
   T_NEXTHOP_LIST = 0x2c,	/* The whole nexthop block */
+  T_HOSTENTRY = 0x2e,		/* Hostentry with possible MPLS labels */
 
 /* Types shared with eattrs */
   T_INT = 0x01,			/* 32-bit unsigned integer number */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index bd7ca425..cf3ab659 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -114,10 +114,48 @@ struct ea_class ea_gen_nexthop = {
   .type = T_NEXTHOP_LIST,
 };
 
-struct ea_class ea_mpls_labels = {
-  .name = "mpls_labels",
-  .type = T_CLIST,
+/*
+ * ea_set_hostentry() acquires hostentry from hostcache.
+ * New hostentry has zero use count. Cached rta locks its
+ * hostentry (increases its use count), uncached rta does not lock it.
+ * Hostentry with zero use count is removed asynchronously
+ * during host cache update, therefore it is safe to hold
+ * such hostentry temporarily as long as you hold the table lock.
+ *
+ * There is no need to hold a lock for hostentry->dep table, because that table
+ * contains routes responsible for that hostentry, and therefore is non-empty if
+ * given hostentry has non-zero use count. If the hostentry has zero use count,
+ * the entry is removed before dep is referenced.
+ *
+ * The protocol responsible for routes with recursive next hops should hold a
+ * lock for a 'source' table governing that routes (argument tab),
+ * because its routes reference hostentries related to the governing table.
+ * When all such routes are
+ * removed, rtas are immediately removed achieving zero uc. Then the 'source'
+ * table lock could be immediately released, although hostentries may still
+ * exist - they will be freed together with the 'source' table.
+ */
+
+  static void
+ea_gen_hostentry_stored(const eattr *ea)
+{
+  struct hostentry_adata *had = (struct hostentry_adata *) ea->u.ptr;
+  had->he->uc++;
+}
+
+static void
+ea_gen_hostentry_freed(const eattr *ea)
+{
+  struct hostentry_adata *had = (struct hostentry_adata *) ea->u.ptr;
+  had->he->uc--;
+}
+
+struct ea_class ea_gen_hostentry = {
+  .name = "hostentry",
+  .type = T_HOSTENTRY,
   .readonly = 1,
+  .stored = ea_gen_hostentry_stored,
+  .freed = ea_gen_hostentry_freed,
 };
 
 const char * rta_dest_names[RTD_MAX] = {
@@ -876,6 +914,8 @@ ea_list_ref(ea_list *l)
 
       struct ea_class *cl = ea_class_global[a->id];
       ASSERT_DIE(cl && cl->uc);
+
+      CALL(cl->stored, a);
       cl->uc++;
     }
 }
@@ -890,6 +930,8 @@ ea_list_unref(ea_list *l)
 
       struct ea_class *cl = ea_class_global[a->id];
       ASSERT_DIE(cl && cl->uc);
+
+      CALL(cl->freed, a);
       if (!--cl->uc)
 	ea_class_free(cl);
     }
@@ -1206,9 +1248,7 @@ rta_hash(rta *a)
 {
   u64 h;
   mem_hash_init(&h);
-#define MIX(f) mem_hash_mix(&h, &(a->f), sizeof(a->f));
 #define BMIX(f) mem_hash_mix_num(&h, a->f);
-  MIX(hostentry);
   BMIX(dest);
 #undef MIX
 
@@ -1219,7 +1259,6 @@ static inline int
 rta_same(rta *x, rta *y)
 {
   return (x->dest == y->dest &&
-	  x->hostentry == y->hostentry &&
 	  ea_same(x->eattrs, y->eattrs));
 }
 
@@ -1303,7 +1342,6 @@ rta_lookup(rta *o)
   r = rta_copy(o);
   r->hash_key = h;
   r->cached = 1;
-  rt_lock_hostentry(r->hostentry);
   rta_insert(r);
 
   if (++rta_cache_count > rta_cache_limit)
@@ -1320,7 +1358,6 @@ rta__free(rta *a)
   *a->pprev = a->next;
   if (a->next)
     a->next->pprev = a->pprev;
-  rt_unlock_hostentry(a->hostentry);
   ea_free(a->eattrs);
   a->cached = 0;
   sl_free(a);
@@ -1411,8 +1448,7 @@ rta_init(void)
   ea_register_init(&ea_gen_from);
   ea_register_init(&ea_gen_source);
   ea_register_init(&ea_gen_nexthop);
-
-  ea_register_init(&ea_mpls_labels);
+  ea_register_init(&ea_gen_hostentry);
 }
 
 /*
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6f948ada..d98f33e4 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -124,7 +124,8 @@ static void rt_next_hop_update(rtable *tab);
 static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_flowspec_notify(rtable *tab, net *net);
-
+static inline rte *rt_next_hop_update_rte(rtable *tab, rte *old);
+static struct hostentry *rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 
 static void
 net_init_with_trie(struct fib *f, void *N)
@@ -1581,13 +1582,6 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
       new->sender = c;
 
       stats->imp_updates_received++;
-      if (!rte_validate(new))
-	{
-	  rte_trace_in(D_FILTERS, c, new, "invalid");
-	  stats->imp_updates_invalid++;
-	  goto drop;
-	}
-
       if (filter == FILTER_REJECT)
 	{
 	  stats->imp_updates_filtered++;
@@ -1613,6 +1607,23 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	    new->flags |= REF_FILTERED;
 	  }
 	}
+
+      rte *new_resolved = rt_next_hop_update_rte(c->table, new);
+      if (new_resolved)
+      {
+	rte_free(new);
+	new = new_resolved;
+      }
+
+      /* After all checks, updates and filters have been done,
+       * validate the route */
+      if (!rte_validate(new))
+	{
+	  rte_trace_in(D_FILTERS, c, new, "invalid");
+	  stats->imp_updates_invalid++;
+	  goto drop;
+	}
+
       if (!rta_is_cached(new->attrs)) /* Need to copy attributes */
 	new->attrs = rta_lookup(new->attrs);
       new->flags |= REF_COW;
@@ -2397,9 +2408,29 @@ rt_preconfig(struct config *c)
  */
 
 void
-rta_apply_hostentry(rta *a, struct hostentry *he)
+ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
 {
-  a->hostentry = he;
+  struct {
+    struct adata ad;
+    struct hostentry *he;
+    u32 labels[lnum];
+  } *head = (void *) tmp_alloc_adata(sizeof *head - sizeof(struct adata));
+
+  head->he = rt_get_hostentry(tab, gw, ll, dep);
+  memcpy(head->labels, labels, lnum * sizeof(u32));
+
+  ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
+	&ea_gen_hostentry, 0, &head->ad));
+}
+
+
+static void
+rta_apply_hostentry(rta *a, struct hostentry_adata *head)
+{
+  struct hostentry *he = head->he;
+  u32 *labels = head->labels;
+  u32 lnum = (u32 *) (head->ad.data + head->ad.length) - labels;
+
   a->dest = he->dest;
 
   ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, he->igp_metric);
@@ -2411,17 +2442,12 @@ rta_apply_hostentry(rta *a, struct hostentry *he)
     return;
   }
 
-  eattr *mls_ea = ea_find(a->eattrs, &ea_mpls_labels);
-
-  if (!mls_ea && he->nexthop_linkable)
+  if (!lnum && he->nexthop_linkable)
   { /* Just link the nexthop chain, no label append happens. */
     ea_copy_attr(&a->eattrs, he->src->eattrs, &ea_gen_nexthop);
     return;
   }
 
-  const struct adata *mls = mls_ea ? mls_ea->u.ptr : NULL;
-  uint mls_cnt = mls ? mls->length / sizeof(u32) : 0;
-
   eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = (struct nexthop_adata *) he_nh_ea->u.ptr;
 
@@ -2429,14 +2455,14 @@ rta_apply_hostentry(rta *a, struct hostentry *he)
 
   NEXTHOP_WALK(nh, nhad)
   {
-    if (nh->labels + mls_cnt > MPLS_MAX_LABEL_STACK)
+    if (nh->labels + lnum > MPLS_MAX_LABEL_STACK)
     {
       log(L_WARN "Sum of label stack sizes %d + %d = %d exceedes allowed maximum (%d)",
-	    nh->labels, mls_cnt, nh->labels + mls_cnt, MPLS_MAX_LABEL_STACK);
+	    nh->labels, lnum, nh->labels + lnum, MPLS_MAX_LABEL_STACK);
       continue;
     }
 
-    total_size += NEXTHOP_SIZE_CNT(nh->labels + mls_cnt);
+    total_size += NEXTHOP_SIZE_CNT(nh->labels + lnum);
   }
 
   if (total_size == OFFSETOF(struct nexthop_adata, nh))
@@ -2453,14 +2479,14 @@ rta_apply_hostentry(rta *a, struct hostentry *he)
 
   NEXTHOP_WALK(nh, nhad)
   {
-    if (nh->labels + mls_cnt > MPLS_MAX_LABEL_STACK)
+    if (nh->labels + lnum > MPLS_MAX_LABEL_STACK)
       continue;
 
     memcpy(dest, nh, NEXTHOP_SIZE(nh));
-    if (mls_cnt)
+    if (lnum)
     {
-      memcpy(&(dest->label[dest->labels]), mls->data, mls->length);
-      dest->labels += mls_cnt;
+      memcpy(&(dest->label[dest->labels]), labels, lnum * sizeof labels[0]);
+      dest->labels += lnum;
     }
 
     if (ipa_nonzero(nh->gw))
@@ -2482,42 +2508,43 @@ rta_apply_hostentry(rta *a, struct hostentry *he)
 	&ea_gen_nexthop, 0, &new->ad));
 }
 
-static inline int
+static inline struct hostentry_adata *
 rta_next_hop_outdated(rta *a)
 {
-  struct hostentry *he = a->hostentry;
+  eattr *heea = ea_find(a->eattrs, &ea_gen_hostentry);
+  if (!heea)
+    return NULL;
 
-  if (!he)
-    return 0;
+  struct hostentry_adata *head = (struct hostentry_adata *) heea->u.ptr;
 
-  if (!he->src)
-    return a->dest != RTD_UNREACHABLE;
+  if (!head->he->src)
+    return (a->dest != RTD_UNREACHABLE) ? head : NULL;
 
-  eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
+  eattr *he_nh_ea = ea_find(head->he->src->eattrs, &ea_gen_nexthop);
   eattr *a_nh_ea = ea_find(a->eattrs, &ea_gen_nexthop);
 
-  return (a->dest != he->dest) ||
-    (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != he->igp_metric) ||
-    (!he->nexthop_linkable) ||
-    (!he_nh_ea != !a_nh_ea) ||
-    (he_nh_ea && a_nh_ea && !adata_same(he_nh_ea->u.ptr, a_nh_ea->u.ptr));
+  return ((a->dest != head->he->dest) ||
+      (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != head->he->igp_metric) ||
+      (!head->he->nexthop_linkable) ||
+      (!he_nh_ea != !a_nh_ea) ||
+      (he_nh_ea && a_nh_ea && !adata_same(he_nh_ea->u.ptr, a_nh_ea->u.ptr)))
+    ? head : NULL;
 }
 
 static inline rte *
 rt_next_hop_update_rte(rtable *tab UNUSED, rte *old)
 {
-  if (!rta_next_hop_outdated(old->attrs))
+  struct hostentry_adata *head = rta_next_hop_outdated(old->attrs);
+  if (!head)
     return NULL;
 
-  rta *a = alloca(RTA_MAX_SIZE);
-  memcpy(a, old->attrs, rta_size(old->attrs));
-
-  rta_apply_hostentry(a, old->attrs->hostentry);
-  a->cached = 0;
+  rta a = *old->attrs;
+  a.cached = 0;
+  rta_apply_hostentry(&a, head);
 
   rte *e = sl_alloc(rte_slab);
   memcpy(e, old, sizeof(rte));
-  e->attrs = rta_lookup(a);
+  e->attrs = rta_lookup(&a);
   rt_lock_source(e->src);
 
   return e;
@@ -3510,7 +3537,7 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
       rta *a = e->attrs;
       pxlen = n->n.addr->pxlen;
 
-      if (a->hostentry)
+      if (ea_find(a->eattrs, &ea_gen_hostentry))
 	{
 	  /* Recursive route should not depend on another recursive route */
 	  log(L_WARN "Next hop address %I resolvable through recursive route for %N",
@@ -3583,7 +3610,7 @@ rt_update_hostcache(rtable *tab)
   tab->hcu_scheduled = 0;
 }
 
-struct hostentry *
+static struct hostentry *
 rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
 {
   struct hostentry *he;
diff --git a/nest/rt.h b/nest/rt.h
index 50be7e0b..eb3f8454 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -280,39 +280,27 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t
 #define RSEM_NOEXPORT	3		/* Routes rejected by export filter */
 #define RSEM_EXPORTED	4		/* Routes marked in export map */
 
-struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
-void rta_apply_hostentry(rta *a, struct hostentry *he);
+/* Host entry: Resolve hook for recursive nexthops */
+extern struct ea_class ea_gen_hostentry;
+struct hostentry_adata {
+  adata ad;
+  struct hostentry *he;
+  u32 labels[0];
+};
 
-static inline void
-rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll)
-{
-  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep));
-}
+void
+ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum]);
 
 /*
- * rta_set_recursive_next_hop() acquires hostentry from hostcache and fills
- * rta->hostentry field.  New hostentry has zero use count. Cached rta locks its
- * hostentry (increases its use count), uncached rta does not lock it. Hostentry
- * with zero use count is removed asynchronously during host cache update,
- * therefore it is safe to hold such hostentry temorarily. Hostentry holds a
- * lock for a 'source' rta, mainly to share multipath nexthops.
- *
- * There is no need to hold a lock for hostentry->dep table, because that table
- * contains routes responsible for that hostentry, and therefore is non-empty if
- * given hostentry has non-zero use count. If the hostentry has zero use count,
- * the entry is removed before dep is referenced.
- *
- * The protocol responsible for routes with recursive next hops should hold a
- * lock for a 'source' table governing that routes (argument tab to
- * rta_set_recursive_next_hop()), because its routes reference hostentries
- * (through rta) related to the governing table. When all such routes are
- * removed, rtas are immediately removed achieving zero uc. Then the 'source'
- * table lock could be immediately released, although hostentries may still
- * exist - they will be freed together with the 'source' table.
- */
+struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
+void rta_apply_hostentry(rta *a, struct hostentry *he, u32 lnum, u32 labels[lnum]);
 
-static inline void rt_lock_hostentry(struct hostentry *he) { if (he) he->uc++; }
-static inline void rt_unlock_hostentry(struct hostentry *he) { if (he) he->uc--; }
+static inline void
+rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
+{
+  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep), lnum, labels);
+}
+*/
 
 int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, int interior);
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index e04e3bd0..6abb7870 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -456,7 +456,6 @@ struct bgp_parse_state {
   uint err_subcode;
   jmp_buf err_jmpbuf;
 
-  struct hostentry *hostentry;
   adata *mpls_labels;
 
   /* Cached state for bgp_rte_update() */
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index fd0a1be4..b07320aa 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -986,27 +986,24 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
       WITHDRAW(BAD_NEXT_HOP " - zero address");
 
     rtable *tab = ipa_is_ip4(gw) ? c->igp_table_ip4 : c->igp_table_ip6;
-    s->hostentry = rt_get_hostentry(tab, gw, ll, c->c.table);
-
-    if (!s->mpls)
-      rta_apply_hostentry(a, s->hostentry);
-
-    /* With MPLS, hostentry is applied later in bgp_apply_mpls_labels() */
+    if (s->mpls)
+    {
+      u32 labels[BGP_MPLS_MAX];
+      ea_set_hostentry(&a->eattrs, c->c.table, tab, gw, ll, BGP_MPLS_MAX, labels);
+    }
+    else
+      ea_set_hostentry(&a->eattrs, c->c.table, tab, gw, ll, 0, NULL);
   }
 }
 
 static void
-bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a)
+bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[lnum])
 {
-  u32 *labels = (u32 *) s->mpls_labels->data;
-  u32 lnum = s->mpls_labels->length / sizeof(u32);
-
   if (lnum > MPLS_MAX_LABEL_STACK)
   {
     REPORT("Too many MPLS labels ($u)", lnum);
 
     a->dest = RTD_UNREACHABLE;
-    a->hostentry = NULL;
     ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
     return;
   }
@@ -1029,7 +1026,13 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a)
     nh.nhad.ad.length = sizeof nh.nhad + lnum * sizeof(u32);
   }
   else /* GW_RECURSIVE */
-    rta_apply_hostentry(a, s->hostentry);
+  {
+    eattr *e = ea_find(a->eattrs, &ea_gen_hostentry);
+    ASSERT_DIE(e);
+    struct hostentry_adata *head = (void *) e->u.ptr;
+    memcpy(&head->labels, labels, lnum * sizeof(u32));
+    head->ad.length = (void *)(&head->labels[lnum]) - (void *) head->ad.data;
+  }
 }
 
 static void
@@ -1445,12 +1448,7 @@ bgp_encode_mpls_labels(struct bgp_write_state *s UNUSED, const adata *mpls, byte
 static void
 bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *pxlen, rta *a)
 {
-  struct {
-    struct adata ad;
-    u32 labels[BGP_MPLS_MAX];
-  } labels_adata;
-
-  u32 *labels = labels_adata.labels;
+  u32 labels[BGP_MPLS_MAX];
   u32 label;
   uint lnum = 0;
 
@@ -1473,19 +1471,8 @@ bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *p
   if (!a)
     return;
 
-  labels_adata.ad.length = lnum * sizeof(u32);
-
-  /* Attach MPLS attribute unless we already have one */
-  if (!s->mpls_labels)
-    ea_set_attr(&(a->eattrs),
-	EA_LITERAL_DIRECT_ADATA(&ea_mpls_labels, 0,
-	  (s->mpls_labels = tmp_store_adata(labels, BGP_MPLS_MAX * sizeof(u32)))));
-  else
-    /* Overwrite data in the attribute */
-    memcpy(s->mpls_labels, &labels_adata, sizeof labels_adata);
-
   /* Update next hop entry in rta */
-  bgp_apply_mpls_labels(s, a);
+  bgp_apply_mpls_labels(s, a, lnum, labels);
 
   /* Attributes were changed, invalidate cached entry */
   rta_free(s->cached_rta);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 7a39beff..e458a238 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -75,7 +75,8 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
       memcpy(a, new->attrs, rta_size(new->attrs));
 
       a->cached = 0;
-      a->hostentry = NULL;
+      ea_unset_attr(&a->eattrs, 0, &ea_gen_hostentry);
+
       e = rte_get_temp(a, src);
       e->pflags = new->pflags;
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 2e4a46a6..5102617f 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -100,11 +100,11 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
   if (r->dest == RTDX_RECURSIVE)
   {
     rtable *tab = ipa_is_ip4(r->via) ? p->igp_table_ip4 : p->igp_table_ip6;
-    if (r->mls)
-      ea_set_attr(&a->eattrs,
-	  EA_LITERAL_DIRECT_ADATA(&ea_mpls_labels, 0, r->mls));
+    u32 *labels = r->mls ? (void *) r->mls->data : NULL;
+    u32 lnum = r->mls ? r->mls->length / sizeof(u32) : 0;
 
-    rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE);
+    ea_set_hostentry(&a->eattrs, p->p.main_channel->table, tab,
+	r->via, IPA_NONE, lnum, labels);
   }
 
   /* Already announced */

From 950775f6fa3d569a9d7cd05e33538d35e895d688 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 15 May 2022 18:09:30 +0200
Subject: [PATCH 137/431] Route destination field merged with nexthop
 attribute; splitting flowspec validation result out.

As there is either a nexthop or another destination specification
(or othing in case of ROAs and Flowspec), it may be merged together.
This code is somehow quirky and should be replaced in future by better
implementation of nexthop.

Also flowspec validation result has its own attribute now as it doesn't
have anything to do with route nexthop.
---
 filter/f-inst.c        |  81 +++++++++++++++++----------------
 lib/route.h            |  60 ++++++++++++++++++++++---
 lib/type.h             |   1 +
 nest/config.Y          |   2 +-
 nest/rt-attr.c         |  24 +++++-----
 nest/rt-dev.c          |   5 +--
 nest/rt-show.c         |   5 ++-
 nest/rt-table.c        | 100 ++++++++++++++++++++---------------------
 nest/rt.h              |   1 -
 proto/babel/babel.c    |  18 ++++----
 proto/bgp/attrs.c      |  17 +++++--
 proto/bgp/bgp.h        |   4 +-
 proto/bgp/packets.c    |  25 ++++++-----
 proto/ospf/rt.c        |   4 +-
 proto/ospf/topology.c  |  11 +----
 proto/perf/perf.c      |   4 +-
 proto/rip/rip.c        |   4 +-
 proto/rpki/rpki.c      |   4 +-
 proto/static/static.c  |   6 ++-
 sysdep/linux/netlink.c |  78 +++++++++++++++++---------------
 sysdep/unix/krt.c      |   9 +---
 21 files changed, 250 insertions(+), 213 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 8ce78a99..c2abd5aa 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -530,20 +530,24 @@
       STATIC_ATTR;
       ACCESS_RTE;
       ACCESS_EATTRS;
-      struct rta *rta = (*fs->rte)->attrs;
 
       switch (sa.sa_code)
       {
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
-      case SA_DEST:	RESULT(sa.type, i, rta->dest); break;
       default:
 	{
-	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
-	  struct nexthop *nh = nh_ea ? &((struct nexthop_adata *) nh_ea->u.ptr)->nh : NULL;
+	  struct eattr *nhea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+	  struct nexthop *nh = nhad ? &nhad->nh : NULL;
 
 	  switch (sa.sa_code)
 	  {
+	    case SA_DEST:
+	      RESULT(sa.type, i, nhad ?
+		  (NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest)
+		  : RTD_NONE);
+	      break;
 	    case SA_GW:
 	      RESULT(sa.type, ip, nh ? nh->gw : IPA_NONE);
 	      break;
@@ -576,36 +580,33 @@
 
     f_rta_cow(fs);
     {
-      struct rta *rta = (*fs->rte)->attrs;
+      union {
+	struct nexthop_adata nha;
+	struct {
+	  struct adata ad;
+	  struct nexthop nh;
+	  u32 label;
+	};
+      } nha;
 
-      if (sa.sa_code == SA_DEST)
+      nha.ad = (struct adata) {
+	.length = sizeof (struct nexthop_adata) - sizeof (struct adata),
+      };
+
+      eattr *a = NULL;
+
+      switch (sa.sa_code)
+      {
+      case SA_DEST:
 	{
 	  int i = v1.val.i;
 	  if ((i != RTD_BLACKHOLE) && (i != RTD_UNREACHABLE) && (i != RTD_PROHIBIT))
 	    runtime( "Destination can be changed only to blackhole, unreachable or prohibit" );
 
-	  rta->dest = i;
-	  ea_unset_attr(fs->eattrs, 1, &ea_gen_nexthop);
+	  nha.nha.dest = i;
+	  nha.ad.length = NEXTHOP_DEST_SIZE;
+	  break;
 	}
-      else
-      {
-	union {
-	  struct nexthop_adata nha;
-	  struct {
-	    struct adata ad;
-	    struct nexthop nh;
-	    u32 label;
-	  };
-	} nha;
-
-	nha.ad = (struct adata) {
-	  .length = sizeof (struct nexthop_adata) - sizeof (struct adata),
-	};
-
-	eattr *a = NULL;
-
-	switch (sa.sa_code)
-	  {
       case SA_GW:
 	{
 	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
@@ -618,7 +619,6 @@
 	  if (!n || (n->scope == SCOPE_HOST))
 	    runtime( "Invalid gw address" );
 
-	  rta->dest = RTD_UNICAST;
 	  nha.nh = (struct nexthop) {
 	    .gw = ip,
 	    .iface = n->iface,
@@ -632,7 +632,6 @@
 	  if (!ifa)
 	    runtime( "Invalid iface name" );
 
-	  rta->dest = RTD_UNICAST;
 	  nha.nh = (struct nexthop) {
 	    .iface = ifa,
 	  };
@@ -666,15 +665,16 @@
 	  int i = v1.val.i;
 	  if (i < 1 || i > 256)
 	    runtime( "Setting weight value out of bounds" );
-	  if (rta->dest != RTD_UNICAST)
-	    runtime( "Setting weight needs regular nexthop " );
 
 	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
 	  if (!nh_ea)
 	    runtime( "No nexthop to set weight on" );
 
-	  struct nexthop_adata *nhax = (struct nexthop_adata *)
-	    tmp_copy_adata(&((struct nexthop_adata *) nh_ea->u.ptr)->ad);
+	  struct nexthop_adata *nhad = (struct nexthop_adata *) nh_ea->u.ptr;
+	  if (!NEXTHOP_IS_REACHABLE(nhad))
+	    runtime( "Setting weight needs regular nexthop " );
+
+	  struct nexthop_adata *nhax = (struct nexthop_adata *) tmp_copy_adata(&nhad->ad);
 
 	  /* Set weight on all next hops */
 	  NEXTHOP_WALK(nh, nhax)
@@ -687,15 +687,14 @@
 
       default:
 	bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
-	  }
-
-	if (!a)
-	  a = ea_set_attr(fs->eattrs,
-	      EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nha.ad)));
-
-	a->originated = 1;
-	a->fresh = 1;
       }
+
+      if (!a)
+	a = ea_set_attr(fs->eattrs,
+	    EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nha.ad)));
+
+      a->originated = 1;
+      a->fresh = 1;
     }
   }
 
diff --git a/lib/route.h b/lib/route.h
index 3ce8021d..1d8877c8 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -76,9 +76,17 @@ struct nexthop {
 /* For packing one into eattrs */
 struct nexthop_adata {
   struct adata ad;
-  struct nexthop nh;
+  /* There is either a set of nexthops or a special destination (RTD_*) */
+  union {
+    struct nexthop nh;
+    uint dest;
+  };
 };
 
+#define NEXTHOP_DEST_SIZE	(OFFSETOF(struct nexthop_adata, dest) + sizeof(uint) - OFFSETOF(struct adata, data))
+#define NEXTHOP_DEST_LITERAL(x)	((struct nexthop_adata) { \
+      .ad.length = NEXTHOP_DEST_SIZE, .dest = (x), })
+
 #define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
 
 
@@ -88,7 +96,6 @@ typedef struct rta {
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   u16 cached:1;				/* Are attributes cached? */
-  u16 dest:4;				/* Route destination type (RTD_...) */
 } rta;
 
 #define RTS_STATIC 1			/* Normal static route */
@@ -109,7 +116,7 @@ typedef struct rta {
 #define RTS_MAX 16
 
 #define RTD_NONE 0			/* Undefined next hop */
-#define RTD_UNICAST 1			/* Next hop is neighbor router */
+#define RTD_UNICAST 1			/* A standard next hop */
 #define RTD_BLACKHOLE 2			/* Silently drop packets */
 #define RTD_UNREACHABLE 3		/* Reject as unreachable */
 #define RTD_PROHIBIT 4			/* Administratively prohibited */
@@ -120,10 +127,6 @@ extern const char * rta_dest_names[RTD_MAX];
 static inline const char *rta_dest_name(uint n)
 { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
 
-/* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
-static inline int rte_is_reachable(rte *r)
-{ return r->attrs->dest == RTD_UNICAST; }
-
 
 /*
  *	Extended Route Attributes
@@ -331,9 +334,24 @@ extern struct ea_class ea_gen_source;
 static inline u32 rt_get_source_attr(rte *rt)
 { return ea_get_int(rt->attrs->eattrs, &ea_gen_source, 0); }
 
+/* Flowspec validation result */
+#define FLOWSPEC_UNKNOWN	0
+#define FLOWSPEC_VALID		1
+#define FLOWSPEC_INVALID	2
+
+extern struct ea_class ea_gen_flowspec_valid;
+static inline u32 rt_get_flowspec_valid(rte *rt)
+{ return ea_get_int(rt->attrs->eattrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN); }
+
 /* Next hop: For now, stored as adata */
 extern struct ea_class ea_gen_nexthop;
 
+static inline void ea_set_dest(struct ea_list **to, uint flags, uint dest)
+{
+  struct nexthop_adata nhad = NEXTHOP_DEST_LITERAL(dest);
+  ea_set_attr_data(to, &ea_gen_nexthop, flags, &nhad.ad.data, nhad.ad.length);
+}
+
 /* Next hop structures */
 
 #define NEXTHOP_ALIGNMENT	(_Alignof(struct nexthop))
@@ -359,7 +377,35 @@ struct nexthop_adata *nexthop_merge(struct nexthop_adata *x, struct nexthop_adat
 struct nexthop_adata *nexthop_sort(struct nexthop_adata *x, linpool *lp);
 int nexthop_is_sorted(struct nexthop_adata *x);
 
+#define NEXTHOP_IS_REACHABLE(nhad)	((nhad)->ad.length > NEXTHOP_DEST_SIZE)
 
+/* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
+static inline int rte_is_reachable(rte *r)
+{
+  eattr *nhea = ea_find(r->attrs->eattrs, &ea_gen_nexthop);
+  if (!nhea)
+    return 0;
+
+  struct nexthop_adata *nhad = (void *) nhea->u.ptr;
+  return NEXTHOP_IS_REACHABLE(nhad);
+}
+
+static inline int nhea_dest(eattr *nhea)
+{
+  if (!nhea)
+    return RTD_NONE;
+
+  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+  if (NEXTHOP_IS_REACHABLE(nhad))
+    return RTD_UNICAST;
+  else
+    return nhad->dest;
+}
+
+static inline int rte_dest(rte *r)
+{
+  return nhea_dest(ea_find(r->attrs->eattrs, &ea_gen_nexthop));
+}
 
 void rta_init(void);
 #define rta_size(...) (sizeof(rta))
diff --git a/lib/type.h b/lib/type.h
index 65a032ec..b54744c1 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -66,6 +66,7 @@ enum btype {
 
   T_ENUM_BGP_ORIGIN = 0x11,	/* BGP Origin enum */
   T_ENUM_RA_PREFERENCE = 0x13,	/* RA Preference enum */
+  T_ENUM_FLOWSPEC_VALID = 0x15,	/* Flowspec validation result */
 
 #define EAF_TYPE__MAX 0x1f
 #define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
diff --git a/nest/config.Y b/nest/config.Y
index c144f0f3..6a35cdd2 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -133,7 +133,7 @@ CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4,
 CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
 	RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL)
 CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)
-CF_ENUM(T_ENUM_RTD, RTD_, UNICAST, BLACKHOLE, UNREACHABLE, PROHIBIT)
+CF_ENUM(T_ENUM_RTD, RTD_, BLACKHOLE, UNREACHABLE, PROHIBIT)
 CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID)
 CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index cf3ab659..b5be936b 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -166,6 +166,12 @@ const char * rta_dest_names[RTD_MAX] = {
   [RTD_PROHIBIT]	= "prohibited",
 };
 
+struct ea_class ea_gen_flowspec_valid = {
+  .name = "flowspec_valid",
+  .type = T_ENUM_FLOWSPEC_VALID,
+  .readonly = 1,
+};
+
 pool *rta_pool;
 
 static slab *rta_slab;
@@ -1246,20 +1252,13 @@ rta_alloc_hash(void)
 static inline uint
 rta_hash(rta *a)
 {
-  u64 h;
-  mem_hash_init(&h);
-#define BMIX(f) mem_hash_mix_num(&h, a->f);
-  BMIX(dest);
-#undef MIX
-
-  return mem_hash_value(&h) ^ ea_hash(a->eattrs);
+  return ea_hash(a->eattrs);
 }
 
 static inline int
 rta_same(rta *x, rta *y)
 {
-  return (x->dest == y->dest &&
-	  ea_same(x->eattrs, y->eattrs));
+  return ea_same(x->eattrs, y->eattrs);
 }
 
 static rta *
@@ -1382,10 +1381,8 @@ rta_do_cow(rta *o, linpool *lp)
 void
 rta_dump(rta *a)
 {
-  static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
-
-  debug("uc=%d %s h=%04x",
-	a->uc, rtd[a->dest], a->hash_key);
+  debug("uc=%d h=%04x",
+	a->uc, a->hash_key);
   if (!a->cached)
     debug(" !CACHED");
   if (a->eattrs)
@@ -1449,6 +1446,7 @@ rta_init(void)
   ea_register_init(&ea_gen_source);
   ea_register_init(&ea_gen_nexthop);
   ea_register_init(&ea_gen_hostentry);
+  ea_register_init(&ea_gen_flowspec_valid);
 }
 
 /*
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 9953e270..c50e018c 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -82,10 +82,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       /* Use iface ID as local source ID */
       struct rte_src *src = rt_get_source(P, ad->iface->index);
 
-      rta a0 = {
-	.dest = RTD_UNICAST,
-      };
-
+      rta a0 = {};
       struct nexthop_adata nhad = {
 	.nh = { .iface = ad->iface, },
 	.ad = { .length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data, },
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 32f7aa2d..0ad8f5c6 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -47,6 +47,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   void (*get_route_info)(struct rte *, byte *buf);
   eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+  int dest = NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest;
 
   tm_format_time(tm, &config->tf_route, e->lastmod);
   ip_addr a_from = ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE);
@@ -68,10 +69,10 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   if (d->last_table != d->tab)
     rt_show_table(c, d);
 
-  cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest),
+  cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(dest),
 	     e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
-  if (a->dest == RTD_UNICAST)
+  if (dest == RTD_UNICAST)
     NEXTHOP_WALK(nh, nhad)
     {
       char mpls[MPLS_MAX_LABEL_STACK*12 + 5], *lsp = mpls;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d98f33e4..539e04d0 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -699,7 +699,7 @@ rte_trace(struct channel *c, rte *e, int dir, char *msg)
 {
   log(L_TRACE "%s.%s %c %s %N %uL %uG %s",
       c->proto->name, c->name ?: "?", dir, msg, e->net->n.addr, e->src->private_id, e->src->global_id,
-      rta_dest_name(e->attrs->dest));
+      rta_dest_name(rte_dest(e)));
 }
 
 static inline void
@@ -1177,26 +1177,17 @@ rte_validate(rte *e)
     return 0;
   }
 
-  if (net_type_match(n->n.addr, NB_DEST) == !e->attrs->dest)
-  {
-    /* Exception for flowspec that failed validation */
-    if (net_is_flow(n->n.addr) && (e->attrs->dest == RTD_UNREACHABLE))
-      return 1;
-
-    log(L_WARN "Ignoring route %N with invalid dest %d received via %s",
-	n->n.addr, e->attrs->dest, e->sender->proto->name);
-    return 0;
-  }
-
   eattr *nhea = ea_find(e->attrs->eattrs, &ea_gen_nexthop);
-  if ((!nhea) != (e->attrs->dest != RTD_UNICAST))
+  int dest = nhea_dest(nhea);
+
+  if (net_type_match(n->n.addr, NB_DEST) == !dest)
   {
-    log(L_WARN "Ignoring route %N with destination %d and %snexthop received via %s",
-	n->n.addr, e->attrs->dest, (nhea ? "" : "no "), e->sender->proto->name);
+    log(L_WARN "Ignoring route %N with invalid dest %d received via %s",
+	n->n.addr, dest, e->sender->proto->name);
     return 0;
   }
 
-  if ((e->attrs->dest == RTD_UNICAST) &&
+  if ((dest == RTD_UNICAST) &&
       !nexthop_is_sorted((struct nexthop_adata *) nhea->u.ptr))
   {
     log(L_WARN "Ignoring unsorted multipath route %N received via %s",
@@ -2431,25 +2422,26 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
   u32 *labels = head->labels;
   u32 lnum = (u32 *) (head->ad.data + head->ad.length) - labels;
 
-  a->dest = he->dest;
-
   ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, he->igp_metric);
 
-  if (a->dest != RTD_UNICAST)
+  if (!he->src)
   {
-    /* No nexthop */
-    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
-    return;
-  }
-
-  if (!lnum && he->nexthop_linkable)
-  { /* Just link the nexthop chain, no label append happens. */
-    ea_copy_attr(&a->eattrs, he->src->eattrs, &ea_gen_nexthop);
+    ea_set_dest(&a->eattrs, 0, RTD_UNREACHABLE);
     return;
   }
 
   eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
+  ASSERT_DIE(he_nh_ea);
+
   struct nexthop_adata *nhad = (struct nexthop_adata *) he_nh_ea->u.ptr;
+  int idest = nhea_dest(he_nh_ea);
+
+  if ((idest != RTD_UNICAST) ||
+      !lnum && he->nexthop_linkable)
+  { /* Just link the nexthop chain, no label append happens. */
+    ea_copy_attr(&a->eattrs, he->src->eattrs, &ea_gen_nexthop);
+    return;
+  }
 
   uint total_size = OFFSETOF(struct nexthop_adata, nh);
 
@@ -2467,10 +2459,14 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
 
   if (total_size == OFFSETOF(struct nexthop_adata, nh))
   {
-    a->dest = RTD_UNREACHABLE;
     log(L_WARN "No valid nexthop remaining, setting route unreachable");
 
-    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
+    struct nexthop_adata nha = {
+      .ad.length = NEXTHOP_DEST_SIZE,
+      .dest = RTD_UNREACHABLE,
+    };
+
+    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0, &nha.ad.data, nha.ad.length);
     return;
   }
 
@@ -2511,19 +2507,28 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
 static inline struct hostentry_adata *
 rta_next_hop_outdated(rta *a)
 {
+  /* First retrieve the hostentry */
   eattr *heea = ea_find(a->eattrs, &ea_gen_hostentry);
   if (!heea)
     return NULL;
 
   struct hostentry_adata *head = (struct hostentry_adata *) heea->u.ptr;
 
-  if (!head->he->src)
-    return (a->dest != RTD_UNREACHABLE) ? head : NULL;
-
-  eattr *he_nh_ea = ea_find(head->he->src->eattrs, &ea_gen_nexthop);
+  /* If no nexthop is present, we have to create one */
   eattr *a_nh_ea = ea_find(a->eattrs, &ea_gen_nexthop);
+  if (!a_nh_ea)
+    return head;
 
-  return ((a->dest != head->he->dest) ||
+  struct nexthop_adata *nhad = (struct nexthop_adata *) a_nh_ea->u.ptr;
+
+  /* Shortcut for unresolvable hostentry */
+  if (!head->he->src)
+    return NEXTHOP_IS_REACHABLE(nhad) ? head : NULL;
+
+  /* Comparing our nexthop with the hostentry nexthop */
+  eattr *he_nh_ea = ea_find(head->he->src->eattrs, &ea_gen_nexthop);
+
+  return (
       (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != head->he->igp_metric) ||
       (!head->he->nexthop_linkable) ||
       (!he_nh_ea != !a_nh_ea) ||
@@ -2682,16 +2687,16 @@ rt_flowspec_update_rte(rtable *tab, rte *r)
   const net_addr *n = r->net->n.addr;
   struct bgp_proto *p = (void *) r->src->proto;
   int valid = rt_flowspec_check(bc->base_table, tab, n, r->attrs, p->is_interior);
-  int dest = valid ? RTD_NONE : RTD_UNREACHABLE;
-
-  if (dest == r->attrs->dest)
+  int old = rt_get_flowspec_valid(r);
+  if (old == valid)
     return NULL;
 
   rta *a = alloca(RTA_MAX_SIZE);
   memcpy(a, r->attrs, rta_size(r->attrs));
-  a->dest = dest;
   a->cached = 0;
 
+  ea_set_attr_u32(&a->eattrs, &ea_gen_flowspec_valid, 0, valid);
+
   rte *new = sl_alloc(rte_slab);
   memcpy(new, r, sizeof(rte));
   new->attrs = rta_lookup(a);
@@ -3524,7 +3529,6 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 
   /* Reset the hostentry */
   he->src = NULL;
-  he->dest = RTD_UNREACHABLE;
   he->nexthop_linkable = 0;
   he->igp_metric = 0;
 
@@ -3545,16 +3549,12 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 	  goto done;
 	}
 
-      if (a->dest == RTD_UNICAST)
-	{
-	  eattr *ea = ea_find(a->eattrs, &ea_gen_nexthop);
-	  if (!ea)
-	    {
-	      log(L_WARN "No nexthop in unicast route");
-	      goto done;
-	    }
-	    
-	  NEXTHOP_WALK(nh, (struct nexthop_adata *) ea->u.ptr)
+      eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+      ASSERT_DIE(nhea);
+      struct nexthop_adata *nhad = (void *) nhea->u.ptr;
+
+      if (NEXTHOP_IS_REACHABLE(nhad))
+	  NEXTHOP_WALK(nh, nhad)
 	    if (ipa_zero(nh->gw))
 	      {
 		if (if_local_addr(he->addr, nh->iface))
@@ -3567,10 +3567,8 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 
 		direct++;
 	      }
-	}
 
       he->src = rta_clone(a);
-      he->dest = a->dest;
       he->nexthop_linkable = !direct;
       he->igp_metric = rt_get_igp_metric(e);
     }
diff --git a/nest/rt.h b/nest/rt.h
index eb3f8454..6f15fec6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -144,7 +144,6 @@ struct hostentry {
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
   struct rta *src;			/* Source rta entry */
-  byte dest;				/* Chosen route destination type (RTD_...) */
   byte nexthop_linkable;		/* Nexthop list is completely non-device */
   u32 igp_metric;			/* Chosen route IGP metric */
 };
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 9a43f484..b90dcd3f 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -677,10 +677,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       }
     };
 
-    rta a0 = {
-      .dest = RTD_UNICAST,
-      .eattrs = &eattrs.l,
-    };
+    rta a0 = { .eattrs = &eattrs.l, };
 
     rta *a = rta_lookup(&a0);
     rte *rte = rte_get_temp(a, p->p.main_source);
@@ -691,12 +688,11 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   else if (e->valid && (e->router_id != p->router_id))
   {
     /* Unreachable */
-    rta a0 = {
-      .dest = RTD_UNREACHABLE,
-    };
+    rta a0 = {};
 
     ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, 1);
     ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_BABEL);
+    ea_set_dest(&a0.eattrs, 0, RTD_UNREACHABLE);
 
     rta *a = rta_lookup(&a0);
     rte *rte = rte_get_temp(a, p->p.main_source);
@@ -2263,9 +2259,13 @@ babel_kick_timer(struct babel_proto *p)
 static int
 babel_preexport(struct proto *P, struct rte *new)
 {
-  struct rta *a = new->attrs;
+  if (new->src->proto != P)
+    return 0;
+
   /* Reject our own unreachable routes */
-  if ((a->dest == RTD_UNREACHABLE) && (new->src->proto == P))
+  eattr *ea = ea_find(new->attrs->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = (void *) ea->u.ptr;
+  if (!NEXTHOP_IS_REACHABLE(nhad))
     return -1;
 
   return 0;
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1efc26ce..6a9e4026 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1711,9 +1711,20 @@ bgp_preexport(struct proto *P, rte *e)
   if (src == NULL)
     return 0;
 
-  /* Reject flowspec that failed validation */
-  if ((e->attrs->dest == RTD_UNREACHABLE) && net_is_flow(e->net->n.addr))
-      return -1;
+  /* Reject flowspec that failed or are pending validation */
+  if (net_is_flow(e->net->n.addr))
+    switch (rt_get_flowspec_valid(e))
+    {
+      case FLOWSPEC_VALID:
+	break;
+      case FLOWSPEC_INVALID:
+	return -1;
+      case FLOWSPEC_UNKNOWN:
+	if ((rt_get_source_attr(e) == RTS_BGP) &&
+	    ((struct bgp_channel *) e->sender)->base_table)
+	  return -1;
+	break;
+    }
 
   /* IBGP route reflection, RFC 4456 */
   if (p->is_internal && src->is_internal && (p->local_as == src->local_as))
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 6abb7870..2f98dc1b 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -519,7 +519,9 @@ struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id);
 static inline int
 rte_resolvable(rte *rt)
 {
-  return rt->attrs->dest != RTD_UNREACHABLE;
+  eattr *nhea = ea_find(rt->attrs->eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nhad = (void *) nhea->u.ptr;
+  return NEXTHOP_IS_REACHABLE(nhad) || (nhad->dest != RTD_UNREACHABLE);
 }
 
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index b07320aa..4c46c60e 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -968,7 +968,6 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
 
     ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, c->cf->cost);
 
-    a->dest = RTD_UNICAST;
     struct nexthop_adata nhad = {
       .nh = {
 	.gw = nbr->addr,
@@ -1003,8 +1002,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[ln
   {
     REPORT("Too many MPLS labels ($u)", lnum);
 
-    a->dest = RTD_UNREACHABLE;
-    ea_unset_attr(&a->eattrs, 0, &ea_gen_nexthop);
+    ea_set_dest(&a->eattrs, 0, RTD_UNREACHABLE);
     return;
   }
 
@@ -1039,15 +1037,21 @@ static void
 bgp_apply_flow_validation(struct bgp_parse_state *s, const net_addr *n, rta *a)
 {
   struct bgp_channel *c = s->channel;
-  int valid = rt_flowspec_check(c->base_table, c->c.table, n, a, s->proto->is_interior);
-  a->dest = valid ? RTD_NONE : RTD_UNREACHABLE;
+  uint valid = rt_flowspec_check(c->base_table, c->c.table, n, a, s->proto->is_interior);
 
-  /* Invalidate cached rta if dest changes */
-  if (s->cached_rta && (s->cached_rta->dest != a->dest))
+  /* Invalidate cached rta */
+  if (s->cached_rta)
   {
+    /* Has't changed */
+    if (valid == ea_get_int(s->cached_rta->eattrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN))
+      return;
+
     rta_free(s->cached_rta);
     s->cached_rta = NULL;
   }
+
+  /* Set the value */
+  ea_set_attr_u32(&a->eattrs, &ea_gen_flowspec_valid, 0, valid);
 }
 
 static int
@@ -1107,17 +1111,14 @@ bgp_use_gateway(struct bgp_export_state *s)
   if (c->cf->next_hop_self && bgp_match_src(s, c->cf->next_hop_self))
     return NULL;
 
-  /* Unreachable */
-  if (ra->dest != RTD_UNICAST)
-    return NULL;
-
   eattr *nhea = ea_find(ra->eattrs, &ea_gen_nexthop);
   if (!nhea)
     return NULL;
 
   /* We need one valid global gateway */
   struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
-  if (!NEXTHOP_ONE(nhad) || ipa_zero(nhad->nh.gw) ||
+  if (!NEXTHOP_IS_REACHABLE(nhad) ||
+      !NEXTHOP_ONE(nhad) || ipa_zero(nhad->nh.gw) ||
       ipa_is_link_local(nhad->nh.gw))
     return NULL;
 
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 6070fd34..afe4a01f 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -1983,8 +1983,7 @@ ort_changed(ort *nf, rta *nr)
 
   if (!or ||
     (nf->n.metric1 != nf->old_metric1) || (nf->n.metric2 != nf->old_metric2) ||
-    (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid) ||
-    (nr->dest != or->dest))
+    (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid))
     return 1;
 
   eattr *nhea_n = ea_find(nr->eattrs, &ea_gen_nexthop);
@@ -2049,7 +2048,6 @@ again1:
     if (nf->n.type) /* Add the route */
     {
       rta a0 = {
-	.dest = RTD_UNICAST,
       };
 
       struct {
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index ca4620cc..09ec9f28 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -1366,16 +1366,9 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   uint tag = ea_get_int(a->eattrs, &ea_ospf_tag, 0);
 
   ip_addr fwd = IPA_NONE;
-  if (a->dest == RTD_UNICAST)
+  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  if (nhea)
   {
-    eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
-    if (!nhea)
-    {
-      log(L_ERR "%s: Unicast route without nexthop for %N",
-	  p->p.name, n->n.addr);
-      return;
-    }
-
     struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
     if (use_gw_for_fwaddr(p, nhad->nh.gw, nhad->nh.iface))
       fwd = nhad->nh.gw;
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 8642e0a1..d1ff6adf 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -142,9 +142,7 @@ perf_loop(void *data)
     *((net_addr_ip4 *) &(p->data[i].net)) = random_net_ip4();
 
     if (!p->attrs_per_rte || !(i % p->attrs_per_rte)) {
-      struct rta a0 = {
-	.dest = RTD_UNICAST,
-      };
+      struct rta a0 = {};
 
       ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
       ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_PERF);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 425a411c..a0f2fdc0 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -151,9 +151,7 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
   if (rt)
   {
     /* Update */
-    rta a0 = {
-      .dest = RTD_UNICAST,
-    };
+    rta a0 = {};
 
     struct {
       ea_list l;
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 56d8add2..4318cbb7 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -120,9 +120,7 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
 {
   struct rpki_proto *p = cache->p;
 
-  rta a0 = {
-    .dest = RTD_NONE,
-  };
+  rta a0 = {};
 
   ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, channel->preference);
   ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_RPKI);
diff --git a/proto/static/static.c b/proto/static/static.c
index 5102617f..806849c4 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -55,7 +55,6 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 {
   rta *a = allocz(RTA_MAX_SIZE);
   struct rte_src *src = static_get_source(p, r->index);
-  a->dest = r->dest;
   ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
   ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_STATIC);
 
@@ -97,7 +96,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 	nhad->ad.data, (void *) nh - (void *) nhad->ad.data);
   }
 
-  if (r->dest == RTDX_RECURSIVE)
+  else if (r->dest == RTDX_RECURSIVE)
   {
     rtable *tab = ipa_is_ip4(r->via) ? p->igp_table_ip4 : p->igp_table_ip6;
     u32 *labels = r->mls ? (void *) r->mls->data : NULL;
@@ -107,6 +106,9 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
 	r->via, IPA_NONE, lnum, labels);
   }
 
+  else if (r->dest)
+    ea_set_dest(&a->eattrs, 0, r->dest);
+
   /* Already announced */
   if (r->state == SRS_CLEAN)
     return;
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index fdfd4885..40f6212e 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1407,11 +1407,16 @@ HASH_DEFINE_REHASH_FN(RTH, struct krt_proto)
 int
 krt_capable(rte *e)
 {
-  rta *a = e->attrs;
+  eattr *ea = ea_find(e->attrs->eattrs, &ea_gen_nexthop);
+  if (!ea)
+    return 0;
 
-  switch (a->dest)
+  struct nexthop_adata *nhad = (void *) ea->u.ptr;
+  if (NEXTHOP_IS_REACHABLE(nhad))
+    return 1;
+
+  switch (nhad->dest)
   {
-    case RTD_UNICAST:
     case RTD_BLACKHOLE:
     case RTD_UNREACHABLE:
     case RTD_PROHIBIT:
@@ -1591,7 +1596,7 @@ nl_add_rte(struct krt_proto *p, rte *e)
   eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 
-  if (krt_ecmp6(p) && nhad && !NEXTHOP_ONE(nhad))
+  if (krt_ecmp6(p) && nhad && NEXTHOP_IS_REACHABLE(nhad) && !NEXTHOP_ONE(nhad))
   {
     uint cnt = 0;
     NEXTHOP_WALK(nh, nhad)
@@ -1616,7 +1621,8 @@ nl_add_rte(struct krt_proto *p, rte *e)
     return err;
   }
 
-  return nl_send_route(p, e, NL_OP_ADD, a->dest, nhad);
+  return nl_send_route(p, e, NL_OP_ADD,
+      NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest, nhad);
 }
 
 static inline int
@@ -1638,7 +1644,8 @@ nl_replace_rte(struct krt_proto *p, rte *e)
   rta *a = e->attrs;
   eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
-  return nl_send_route(p, e, NL_OP_REPLACE, a->dest, nhad);
+  return nl_send_route(p, e, NL_OP_REPLACE,
+      NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest, nhad);
 }
 
 
@@ -1901,8 +1908,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   switch (i->rtm_type)
     {
     case RTN_UNICAST:
-      ra->dest = RTD_UNICAST;
-
       if (a[RTA_MULTIPATH])
         {
 	  struct nexthop_adata *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
@@ -1953,15 +1958,40 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	    }
 	}
 
+#ifdef HAVE_MPLS_KERNEL
+      if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !a[RTA_MULTIPATH])
+	nhad.nh.labels = rta_get_mpls(a[RTA_NEWDST], nhad.nh.label);
+
+      if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !a[RTA_MULTIPATH])
+	{
+	  switch (rta_get_u16(a[RTA_ENCAP_TYPE]))
+	    {
+	      case LWTUNNEL_ENCAP_MPLS:
+		{
+		  struct rtattr *enca[BIRD_RTA_MAX];
+		  nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
+		  nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
+		  nhad.nh.labels = rta_get_mpls(enca[RTA_DST], nhad.nh.label);
+		  break;
+		}
+	      default:
+		SKIP("unknown encapsulation method %d\n", rta_get_u16(a[RTA_ENCAP_TYPE]));
+		break;
+	    }
+	}
+#endif
+
+      /* Finalize the nexthop */
+      nhad.ad.length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data;
       break;
     case RTN_BLACKHOLE:
-      ra->dest = RTD_BLACKHOLE;
+      nhad.nhad = NEXTHOP_DEST_LITERAL(RTD_BLACKHOLE);
       break;
     case RTN_UNREACHABLE:
-      ra->dest = RTD_UNREACHABLE;
+      nhad.nhad = NEXTHOP_DEST_LITERAL(RTD_UNREACHABLE);
       break;
     case RTN_PROHIBIT:
-      ra->dest = RTD_PROHIBIT;
+      nhad.nhad = NEXTHOP_DEST_LITERAL(RTD_PROHIBIT);
       break;
     /* FIXME: What about RTN_THROW? */
     default:
@@ -1969,32 +1999,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
       return;
     }
 
-#ifdef HAVE_MPLS_KERNEL
-  if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !a[RTA_MULTIPATH])
-    nhad.nh.labels = rta_get_mpls(a[RTA_NEWDST], nhad.nh.label);
-
-  if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !a[RTA_MULTIPATH])
-    {
-      switch (rta_get_u16(a[RTA_ENCAP_TYPE]))
-	{
-	  case LWTUNNEL_ENCAP_MPLS:
-	    {
-	      struct rtattr *enca[BIRD_RTA_MAX];
-	      nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
-	      nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
-	      nhad.nh.labels = rta_get_mpls(enca[RTA_DST], nhad.nh.label);
-	      break;
-	    }
-	  default:
-	    SKIP("unknown encapsulation method %d\n", rta_get_u16(a[RTA_ENCAP_TYPE]));
-	    break;
-	}
-    }
-#endif
-
-  /* Finalize the nexthop */
-  nhad.ad.length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data;
-
   if (i->rtm_scope != def_scope)
     ea_set_attr(&ra->eattrs,
 	EA_LITERAL_EMBEDDED(&ea_krt_scope, 0, i->rtm_scope));
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 89e9e97e..a0789936 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -608,17 +608,10 @@ krt_same_dest(rte *k, rte *e)
 {
   rta *ka = k->attrs, *ea = e->attrs;
 
-  if (ka->dest != ea->dest)
-    return 0;
-
-  if (ka->dest != RTD_UNICAST)
-    return 1;
-
   eattr *nhea_k = ea_find(ka->eattrs, &ea_gen_nexthop);
   eattr *nhea_e = ea_find(ea->eattrs, &ea_gen_nexthop);
 
-  ASSUME(nhea_k && nhea_e);
-  return adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
+  return (!nhea_k == !nhea_e) && adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
 }
 
 /*

From 938742decc6e1d6d3a0375dd012b75172e747bbc Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 May 2022 12:03:03 +0200
Subject: [PATCH 138/431] Squashing the route attribute structure into one
 level.

For now, all route attributes are stored as eattrs in ea_list. This
should make route manipulation easier and it also allows for a layered
approach of route attributes where updates from filters will be stored
as an overlay over the previous version.
---
 filter/f-inst.c        |   8 +--
 filter/filter.c        |  41 ++---------
 lib/route.h            |  52 +++++++-------
 nest/config.Y          |   2 +-
 nest/rt-attr.c         | 160 ++++++++++++-----------------------------
 nest/rt-dev.c          |  12 ++--
 nest/rt-show.c         |  12 ++--
 nest/rt-table.c        |  88 +++++++++++------------
 nest/rt.h              |  19 ++---
 proto/babel/babel.c    |  34 ++++-----
 proto/bgp/attrs.c      |  66 ++++++++---------
 proto/bgp/bgp.h        |  10 +--
 proto/bgp/packets.c    | 127 +++++++++++++++-----------------
 proto/mrt/mrt.c        |   2 +-
 proto/ospf/ospf.c      |  20 +++---
 proto/ospf/rt.c        |  32 ++++-----
 proto/ospf/rt.h        |   2 +-
 proto/ospf/topology.c  |  10 +--
 proto/perf/perf.c      |  12 ++--
 proto/pipe/pipe.c      |   8 +--
 proto/radv/radv.c      |   4 +-
 proto/rip/rip.c        |  36 +++++-----
 proto/rpki/rpki.c      |  10 ++-
 proto/static/static.c  |  24 +++----
 sysdep/linux/netlink.c |  40 +++++------
 sysdep/unix/krt.c      |  18 +++--
 26 files changed, 352 insertions(+), 497 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index c2abd5aa..65a0b011 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -212,7 +212,7 @@
  *	m4_dnl	  NEVER_CONSTANT-> don't generate pre-interpretation code at all
  *	m4_dnl	  ACCESS_RTE	-> check that route is available, also NEVER_CONSTANT
  *	m4_dnl	  ACCESS_EATTRS	-> pre-cache the eattrs; use only with ACCESS_RTE
- *	m4_dnl	  f_rta_cow(fs)	-> function to call before any change to route should be done
+ *	m4_dnl	  f_rte_cow(fs)	-> function to call before any change to route should be done
  *
  *	m4_dnl	If you are stymied, see FI_CALL or FI_CONSTANT or just search for
  *	m4_dnl	the mentioned macros in this file to see what is happening there in wild.
@@ -578,7 +578,7 @@
     STATIC_ATTR;
     ARG_TYPE(1, sa.type);
 
-    f_rta_cow(fs);
+    f_rte_cow(fs);
     {
       union {
 	struct nexthop_adata nha;
@@ -741,7 +741,7 @@
       if (da->type >= EAF_TYPE__MAX)
 	bug("Unsupported attribute type");
 
-      f_rta_cow(fs);
+      f_rte_cow(fs);
 
       switch (da->type) {
       case T_OPAQUE:
@@ -770,7 +770,7 @@
     ACCESS_RTE;
     ACCESS_EATTRS;
 
-    f_rta_cow(fs);
+    f_rte_cow(fs);
     ea_unset_attr(fs->eattrs, 1, da);
   }
 
diff --git a/filter/filter.c b/filter/filter.c
index 9bedb938..ff6a3419 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -76,9 +76,6 @@ struct filter_state {
   /* The route we are processing. This may be NULL to indicate no route available. */
   struct rte **rte;
 
-  /* The old rta to be freed after filters are done. */
-  struct rta *old_rta;
-
   /* Cached pointer to ea_list */
   struct ea_list **eattrs;
 
@@ -99,7 +96,7 @@ void (*bt_assert_hook)(int result, const struct f_line_item *assert);
 
 static inline void f_cache_eattrs(struct filter_state *fs)
 {
-  fs->eattrs = &((*fs->rte)->attrs->eattrs);
+  fs->eattrs = &((*fs->rte)->attrs);
 }
 
 static inline void f_rte_cow(struct filter_state *fs)
@@ -110,33 +107,6 @@ static inline void f_rte_cow(struct filter_state *fs)
   *fs->rte = rte_cow(*fs->rte);
 }
 
-/*
- * rta_cow - prepare rta for modification by filter
- */
-static void
-f_rta_cow(struct filter_state *fs)
-{
-  if (!rta_is_cached((*fs->rte)->attrs))
-    return;
-
-  /* Prepare to modify rte */
-  f_rte_cow(fs);
-
-  /* Store old rta to free it later, it stores reference from rte_cow() */
-  fs->old_rta = (*fs->rte)->attrs;
-
-  /*
-   * Get shallow copy of rta. Fields eattrs and nexthops of rta are shared
-   * with fs->old_rta (they will be copied when the cached rta will be obtained
-   * at the end of f_run()), also the lock of hostentry is inherited (we
-   * suppose hostentry is not changed by filters).
-   */
-  (*fs->rte)->attrs = rta_do_cow((*fs->rte)->attrs, tmp_linpool);
-
-  /* Re-cache the ea_list */
-  f_cache_eattrs(fs);
-}
-
 static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
 
 /**
@@ -289,7 +259,7 @@ f_run(const struct filter *filter, struct rte **rte, int flags)
   /* Run the interpreter itself */
   enum filter_return fret = interpret(&filter_state, filter->root, NULL);
 
-  if (filter_state.old_rta) {
+  if (filter_state.eattrs && !ea_is_cached(*filter_state.eattrs)) {
     /*
      * Cached rta was modified and filter_state->rte contains now an uncached one,
      * sharing some part with the cached one. The cached rta should
@@ -302,6 +272,10 @@ f_run(const struct filter *filter, struct rte **rte, int flags)
      * This is not the problem if rte was COW, because original rte
      * also holds the same rta.
      */
+    ea_list *cached = *filter_state.eattrs;
+    while (cached && !ea_is_cached(cached))
+      cached = cached->next;
+
     if (!rte_cow) {
       /* Cache the new attrs */
       (*filter_state.rte)->attrs = rta_lookup((*filter_state.rte)->attrs);
@@ -311,8 +285,7 @@ f_run(const struct filter *filter, struct rte **rte, int flags)
     }
 
     /* Uncache the old attrs and drop the pointer as it is invalid now. */
-    rta_free(filter_state.old_rta);
-    filter_state.old_rta = NULL;
+    rta_free(cached);
   }
 
   /* Process the filter output, log it and return */
diff --git a/lib/route.h b/lib/route.h
index 1d8877c8..3f6fc5a9 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -21,7 +21,7 @@ typedef struct rte {
   struct network *net;			/* Network this RTE belongs to */
   struct rte_src *src;			/* Route source that created the route */
   struct channel *sender;		/* Channel used to send the route to the routing table */
-  struct rta *attrs;			/* Attributes of this route */
+  struct ea_list *attrs;		/* Attributes of this route */
   u32 id;				/* Table specific route id */
   byte flags;				/* Flags (REF_...) */
   byte pflags;				/* Protocol-specific flags */
@@ -90,14 +90,6 @@ struct nexthop_adata {
 #define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
 
 
-typedef struct rta {
-  struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
-  u32 hash_key;				/* Hash over important fields */
-  struct ea_list *eattrs;		/* Extended Attribute chain */
-  u16 cached:1;				/* Are attributes cached? */
-} rta;
-
 #define RTS_STATIC 1			/* Normal static route */
 #define RTS_INHERIT 2			/* Route inherited from kernel */
 #define RTS_DEVICE 3			/* Device route */
@@ -153,6 +145,10 @@ typedef struct eattr {
 #define EA_BIT_GET(ea) ((ea) >> 24)
 
 typedef struct ea_list {
+  struct ea_list *next_hash;		/* Next in hash chain */
+  struct ea_list **pprev_hash;		/* Previous in hash chain */
+  u32 uc;				/* Use count */
+  u32 hash_key;				/* List hash */
   struct ea_list *next;			/* In case we have an override list */
   byte flags;				/* Flags: EALF_... */
   byte rfu;
@@ -162,7 +158,7 @@ typedef struct ea_list {
 
 #define EALF_SORTED 1			/* Attributes are sorted by code */
 #define EALF_BISECT 2			/* Use interval bisection for searching */
-#define EALF_CACHED 4			/* Attributes belonging to cached rta */
+#define EALF_CACHED 4			/* List is cached */
 
 struct ea_class {
 #define EA_CLASS_INSIDE \
@@ -317,7 +313,7 @@ ea_copy_attr(ea_list **to, ea_list *from, const struct ea_class *def)
 /* Preference: first-order comparison */
 extern struct ea_class ea_gen_preference;
 static inline u32 rt_get_preference(rte *rt)
-{ return ea_get_int(rt->attrs->eattrs, &ea_gen_preference, 0); }
+{ return ea_get_int(rt->attrs, &ea_gen_preference, 0); }
 
 /* IGP metric: second-order comparison */
 extern struct ea_class ea_gen_igp_metric;
@@ -332,7 +328,7 @@ extern struct ea_class ea_gen_from;
  * To be superseded in a near future by something more informative. */
 extern struct ea_class ea_gen_source;
 static inline u32 rt_get_source_attr(rte *rt)
-{ return ea_get_int(rt->attrs->eattrs, &ea_gen_source, 0); }
+{ return ea_get_int(rt->attrs, &ea_gen_source, 0); }
 
 /* Flowspec validation result */
 #define FLOWSPEC_UNKNOWN	0
@@ -341,7 +337,7 @@ static inline u32 rt_get_source_attr(rte *rt)
 
 extern struct ea_class ea_gen_flowspec_valid;
 static inline u32 rt_get_flowspec_valid(rte *rt)
-{ return ea_get_int(rt->attrs->eattrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN); }
+{ return ea_get_int(rt->attrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN); }
 
 /* Next hop: For now, stored as adata */
 extern struct ea_class ea_gen_nexthop;
@@ -382,7 +378,7 @@ int nexthop_is_sorted(struct nexthop_adata *x);
 /* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
 static inline int rte_is_reachable(rte *r)
 {
-  eattr *nhea = ea_find(r->attrs->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(r->attrs, &ea_gen_nexthop);
   if (!nhea)
     return 0;
 
@@ -404,21 +400,23 @@ static inline int nhea_dest(eattr *nhea)
 
 static inline int rte_dest(rte *r)
 {
-  return nhea_dest(ea_find(r->attrs->eattrs, &ea_gen_nexthop));
+  return nhea_dest(ea_find(r->attrs, &ea_gen_nexthop));
 }
 
 void rta_init(void);
-#define rta_size(...) (sizeof(rta))
-#define RTA_MAX_SIZE (sizeof(rta))
-rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
-static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) { r->uc++; return r; }
-void rta__free(rta *r);
-static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
-rta *rta_do_cow(rta *o, linpool *lp);
-static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
-void rta_dump(rta *);
-void rta_dump_all(void);
-void rta_show(struct cli *, rta *);
+ea_list *ea_lookup(ea_list *);		/* Get a cached (and normalized) variant of this attribute list */
+static inline int ea_is_cached(ea_list *r) { return r->flags & EALF_CACHED; }
+static inline ea_list *ea_clone(ea_list *r) { r->uc++; return r; }
+void ea__free(ea_list *r);
+static inline void ea_free(ea_list *r) { if (r && !--r->uc) ea__free(r); }
+
+void ea_dump(ea_list *);
+void ea_dump_all(void);
+void ea_show_list(struct cli *, ea_list *);
+
+#define rta_lookup	ea_lookup
+#define rta_is_cached	ea_is_cached
+#define rta_clone	ea_clone
+#define rta_free	ea_free
 
 #endif
diff --git a/nest/config.Y b/nest/config.Y
index 6a35cdd2..773673e8 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -849,7 +849,7 @@ CF_CLI(DUMP INTERFACES,,, [[Dump interface information]])
 CF_CLI(DUMP NEIGHBORS,,, [[Dump neighbor cache]])
 { neigh_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP ATTRIBUTES,,, [[Dump attribute cache]])
-{ rta_dump_all(); cli_msg(0, ""); } ;
+{ ea_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP ROUTES,,, [[Dump routing table]])
 { rt_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP PROTOCOLS,,, [[Dump protocol information]])
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index b5be936b..6927751f 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -174,7 +174,6 @@ struct ea_class ea_gen_flowspec_valid = {
 
 pool *rta_pool;
 
-static slab *rta_slab;
 static slab *rte_src_slab;
 
 static struct idm src_ids;
@@ -943,17 +942,6 @@ ea_list_unref(ea_list *l)
     }
 }
 
-static inline void
-ea_free(ea_list *o)
-{
-  if (o)
-    {
-      ea_list_unref(o);
-      ASSERT(!o->next);
-      mb_free(o);
-    }
-}
-
 void
 ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max)
 {
@@ -1050,7 +1038,7 @@ ea_show_lc_set(struct cli *c, const struct adata *ad, byte *pos, byte *buf, byte
  * If the protocol defining the attribute provides its own
  * get_attr() hook, it's consulted first.
  */
-void
+static void
 ea_show(struct cli *c, const eattr *e)
 {
   const struct adata *ad = (e->type & EAF_EMBEDDED) ? NULL : e->u.ptr;
@@ -1141,10 +1129,11 @@ ea_dump(ea_list *e)
     }
   while (e)
     {
-      debug("[%c%c%c]",
+      debug("[%c%c%c] uc=%d h=%08x",
 	    (e->flags & EALF_SORTED) ? 'S' : 's',
 	    (e->flags & EALF_BISECT) ? 'B' : 'b',
-	    (e->flags & EALF_CACHED) ? 'C' : 'c');
+	    (e->flags & EALF_CACHED) ? 'C' : 'c',
+	    e->uc, e->hash_key);
       for(i=0; i<e->count; i++)
 	{
 	  eattr *a = &e->attrs[i];
@@ -1236,12 +1225,12 @@ static uint rta_cache_count;
 static uint rta_cache_size = 32;
 static uint rta_cache_limit;
 static uint rta_cache_mask;
-static rta **rta_hash_table;
+static ea_list **rta_hash_table;
 
 static void
 rta_alloc_hash(void)
 {
-  rta_hash_table = mb_allocz(rta_pool, sizeof(rta *) * rta_cache_size);
+  rta_hash_table = mb_allocz(rta_pool, sizeof(ea_list *) * rta_cache_size);
   if (rta_cache_size < 32768)
     rta_cache_limit = rta_cache_size * 2;
   else
@@ -1249,44 +1238,14 @@ rta_alloc_hash(void)
   rta_cache_mask = rta_cache_size - 1;
 }
 
-static inline uint
-rta_hash(rta *a)
-{
-  return ea_hash(a->eattrs);
-}
-
-static inline int
-rta_same(rta *x, rta *y)
-{
-  return ea_same(x->eattrs, y->eattrs);
-}
-
-static rta *
-rta_copy(rta *o)
-{
-  rta *r = sl_alloc(rta_slab);
-
-  memcpy(r, o, rta_size(o));
-  r->uc = 1;
-  if (!r->eattrs)
-    return r;
-
-  uint elen = ea_list_size(o->eattrs);
-  r->eattrs = mb_alloc(rta_pool, elen);
-  ea_list_copy(r->eattrs, o->eattrs, elen);
-  ea_list_ref(r->eattrs);
-  r->eattrs->flags |= EALF_CACHED;
-  return r;
-}
-
 static inline void
-rta_insert(rta *r)
+rta_insert(ea_list *r)
 {
   uint h = r->hash_key & rta_cache_mask;
-  r->next = rta_hash_table[h];
-  if (r->next)
-    r->next->pprev = &r->next;
-  r->pprev = &rta_hash_table[h];
+  r->next_hash = rta_hash_table[h];
+  if (r->next_hash)
+    r->next_hash->pprev_hash = &r->next_hash;
+  r->pprev_hash = &rta_hash_table[h];
   rta_hash_table[h] = r;
 }
 
@@ -1295,8 +1254,8 @@ rta_rehash(void)
 {
   uint ohs = rta_cache_size;
   uint h;
-  rta *r, *n;
-  rta **oht = rta_hash_table;
+  ea_list *r, *n;
+  ea_list **oht = rta_hash_table;
 
   rta_cache_size = 2*rta_cache_size;
   DBG("Rehashing rta cache from %d to %d entries.\n", ohs, rta_cache_size);
@@ -1304,7 +1263,7 @@ rta_rehash(void)
   for(h=0; h<ohs; h++)
     for(r=oht[h]; r; r=n)
       {
-	n = r->next;
+	n = r->next_hash;
 	rta_insert(r);
       }
   mb_free(oht);
@@ -1323,24 +1282,29 @@ rta_rehash(void)
  * The extended attribute lists attached to the &rta are automatically
  * converted to the normalized form.
  */
-rta *
-rta_lookup(rta *o)
+ea_list *
+ea_lookup(ea_list *o)
 {
-  rta *r;
+  ea_list *r;
   uint h;
 
-  ASSERT(!o->cached);
-  if (o->eattrs)
-    o->eattrs = ea_normalize(o->eattrs);
+  ASSERT(!ea_is_cached(o));
+  o = ea_normalize(o);
+  h = ea_hash(o);
 
-  h = rta_hash(o);
-  for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
-    if (r->hash_key == h && rta_same(r, o))
-      return rta_clone(r);
+  for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next_hash)
+    if (r->hash_key == h && ea_same(r, o))
+      return ea_clone(r);
 
-  r = rta_copy(o);
+  uint elen = ea_list_size(o);
+  r = mb_alloc(rta_pool, elen);
+  ea_list_copy(r, o, elen);
+  ea_list_ref(r);
+
+  r->flags |= EALF_CACHED;
   r->hash_key = h;
-  r->cached = 1;
+  r->uc = 1;
+
   rta_insert(r);
 
   if (++rta_cache_count > rta_cache_limit)
@@ -1350,46 +1314,17 @@ rta_lookup(rta *o)
 }
 
 void
-rta__free(rta *a)
+ea__free(ea_list *a)
 {
-  ASSERT(rta_cache_count && a->cached);
+  ASSERT(rta_cache_count && ea_is_cached(a));
   rta_cache_count--;
-  *a->pprev = a->next;
-  if (a->next)
-    a->next->pprev = a->pprev;
-  ea_free(a->eattrs);
-  a->cached = 0;
-  sl_free(a);
-}
+  *a->pprev_hash = a->next_hash;
+  if (a->next_hash)
+    a->next_hash->pprev_hash = a->pprev_hash;
 
-rta *
-rta_do_cow(rta *o, linpool *lp)
-{
-  rta *r = lp_alloc(lp, rta_size(o));
-  memcpy(r, o, rta_size(o));
-  r->cached = 0;
-  r->uc = 0;
-  return r;
-}
-
-/**
- * rta_dump - dump route attributes
- * @a: attribute structure to dump
- *
- * This function takes a &rta and dumps its contents to the debug output.
- */
-void
-rta_dump(rta *a)
-{
-  debug("uc=%d h=%04x",
-	a->uc, a->hash_key);
-  if (!a->cached)
-    debug(" !CACHED");
-  if (a->eattrs)
-    {
-      debug(" EA: ");
-      ea_dump(a->eattrs);
-    }
+  ASSERT(!a->next);
+  ea_list_unref(a);
+  mb_free(a);
 }
 
 /**
@@ -1399,26 +1334,23 @@ rta_dump(rta *a)
  * to the debug output.
  */
 void
-rta_dump_all(void)
+ea_dump_all(void)
 {
-  rta *a;
-  uint h;
-
   debug("Route attribute cache (%d entries, rehash at %d):\n", rta_cache_count, rta_cache_limit);
-  for(h=0; h<rta_cache_size; h++)
-    for(a=rta_hash_table[h]; a; a=a->next)
+  for (uint h=0; h < rta_cache_size; h++)
+    for (ea_list *a = rta_hash_table[h]; a; a = a->next_hash)
       {
 	debug("%p ", a);
-	rta_dump(a);
+	ea_dump(a);
 	debug("\n");
       }
   debug("\n");
 }
 
 void
-rta_show(struct cli *c, rta *a)
+ea_show_list(struct cli *c, ea_list *eal)
 {
-  for(ea_list *eal = a->eattrs; eal; eal=eal->next)
+  for( ; eal; eal=eal->next)
     for(int i=0; i<eal->count; i++)
       ea_show(c, &eal->attrs[i]);
 }
@@ -1434,8 +1366,6 @@ rta_init(void)
 {
   rta_pool = rp_new(&root_pool, "Attributes");
 
-  rta_slab = sl_new(rta_pool, sizeof(rta));
-
   rta_alloc_hash();
   rte_src_init();
   ea_class_init();
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index c50e018c..63f8a26b 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -71,7 +71,6 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
     }
   else if (flags & IF_CHANGE_UP)
     {
-      rta *a;
       rte *e;
 
       DBG("dev_if_notify: %s:%I going up\n", ad->iface->name, ad->ip);
@@ -82,18 +81,17 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
       /* Use iface ID as local source ID */
       struct rte_src *src = rt_get_source(P, ad->iface->index);
 
-      rta a0 = {};
+      ea_list *ea = NULL;
       struct nexthop_adata nhad = {
 	.nh = { .iface = ad->iface, },
 	.ad = { .length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data, },
       };
 
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, c->preference);
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_DEVICE);
-      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
+      ea_set_attr_u32(&ea, &ea_gen_preference, 0, c->preference);
+      ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_DEVICE);
+      ea_set_attr_data(&ea, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
 
-      a = rta_lookup(&a0);
-      e = rte_get_temp(a, src);
+      e = rte_get_temp(rta_lookup(ea), src);
       e->pflags = 0;
       rte_update2(c, net, e, src);
     }
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 0ad8f5c6..2cbc500a 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -42,23 +42,23 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 {
   byte from[IPA_MAX_TEXT_LENGTH+8];
   byte tm[TM_DATETIME_BUFFER_SIZE], info[256];
-  rta *a = e->attrs;
+  ea_list *a = e->attrs;
   int sync_error = d->kernel ? krt_get_sync_error(d->kernel, e) : 0;
   void (*get_route_info)(struct rte *, byte *buf);
-  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(a, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
   int dest = NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest;
 
   tm_format_time(tm, &config->tf_route, e->lastmod);
-  ip_addr a_from = ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE);
+  ip_addr a_from = ea_get_ip(a, &ea_gen_from, IPA_NONE);
   if (ipa_nonzero(a_from) && (!nhad || !ipa_equal(a_from, nhad->nh.gw)))
     bsprintf(from, " from %I", a_from);
   else
     from[0] = 0;
 
   /* Need to normalize the extended attributes */
-  if (d->verbose && !rta_is_cached(a) && a->eattrs)
-    a->eattrs = ea_normalize(a->eattrs);
+  if (d->verbose && !rta_is_cached(a) && a)
+    a = ea_normalize(a);
 
   get_route_info = e->src->proto->proto->get_route_info;
   if (get_route_info)
@@ -99,7 +99,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     }
 
   if (d->verbose)
-    rta_show(c, a);
+    ea_show_list(c, a);
 }
 
 static void
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 539e04d0..e3dab120 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -564,7 +564,7 @@ rte_find(net *net, struct rte_src *src)
  * the protocol.
  */
 rte *
-rte_get_temp(rta *a, struct rte_src *src)
+rte_get_temp(ea_list *a, struct rte_src *src)
 {
   rte *e = sl_alloc(rte_slab);
 
@@ -608,15 +608,15 @@ rte_do_cow(rte *r)
  * Result: a pointer to the new writable &rte with writable &rta.
  */
 rte *
-rte_cow_rta(rte *r, linpool *lp)
+rte_cow_rta(rte *r)
 {
   if (!rta_is_cached(r->attrs))
     return r;
 
   r = rte_cow(r);
-  rta *a = rta_do_cow(r->attrs, lp);
+
+  /* This looks stupid but should DWIW. */
   rta_free(r->attrs);
-  r->attrs = a;
   return r;
 }
 
@@ -971,7 +971,7 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
 
     if (rte_is_reachable(rt))
     {
-      eattr *nhea = ea_find(rt->attrs->eattrs, &ea_gen_nexthop);
+      eattr *nhea = ea_find(rt->attrs, &ea_gen_nexthop);
       ASSERT_DIE(nhea);
 
       if (nhs)
@@ -987,13 +987,13 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
 
   if (nhs)
   {
-    eattr *nhea = ea_find(best->attrs->eattrs, &ea_gen_nexthop);
+    eattr *nhea = ea_find(best->attrs, &ea_gen_nexthop);
     ASSERT_DIE(nhea);
 
     nhs = nexthop_merge(nhs, (struct nexthop_adata *) nhea->u.ptr, c->merge_limit, pool);
 
-    best = rte_cow_rta(best, pool);
-    ea_set_attr(&best->attrs->eattrs,
+    best = rte_cow_rta(best);
+    ea_set_attr(&best->attrs,
 	EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhs->ad));
   }
 
@@ -1177,7 +1177,7 @@ rte_validate(rte *e)
     return 0;
   }
 
-  eattr *nhea = ea_find(e->attrs->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(e->attrs, &ea_gen_nexthop);
   int dest = nhea_dest(nhea);
 
   if (net_type_match(n->n.addr, NB_DEST) == !dest)
@@ -1808,7 +1808,7 @@ rte_dump(rte *e)
   net *n = e->net;
   debug("%-1N ", n->n.addr);
   debug("PF=%02x ", e->pflags);
-  rta_dump(e->attrs);
+  ea_dump(e->attrs);
   debug("\n");
 }
 
@@ -2416,21 +2416,21 @@ ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr g
 
 
 static void
-rta_apply_hostentry(rta *a, struct hostentry_adata *head)
+rta_apply_hostentry(ea_list **to, struct hostentry_adata *head)
 {
   struct hostentry *he = head->he;
   u32 *labels = head->labels;
   u32 lnum = (u32 *) (head->ad.data + head->ad.length) - labels;
 
-  ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, he->igp_metric);
+  ea_set_attr_u32(to, &ea_gen_igp_metric, 0, he->igp_metric);
 
   if (!he->src)
   {
-    ea_set_dest(&a->eattrs, 0, RTD_UNREACHABLE);
+    ea_set_dest(to, 0, RTD_UNREACHABLE);
     return;
   }
 
-  eattr *he_nh_ea = ea_find(he->src->eattrs, &ea_gen_nexthop);
+  eattr *he_nh_ea = ea_find(he->src, &ea_gen_nexthop);
   ASSERT_DIE(he_nh_ea);
 
   struct nexthop_adata *nhad = (struct nexthop_adata *) he_nh_ea->u.ptr;
@@ -2439,7 +2439,7 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
   if ((idest != RTD_UNICAST) ||
       !lnum && he->nexthop_linkable)
   { /* Just link the nexthop chain, no label append happens. */
-    ea_copy_attr(&a->eattrs, he->src->eattrs, &ea_gen_nexthop);
+    ea_copy_attr(to, he->src, &ea_gen_nexthop);
     return;
   }
 
@@ -2466,7 +2466,7 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
       .dest = RTD_UNREACHABLE,
     };
 
-    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0, &nha.ad.data, nha.ad.length);
+    ea_set_attr_data(to, &ea_gen_nexthop, 0, &nha.ad.data, nha.ad.length);
     return;
   }
 
@@ -2500,22 +2500,22 @@ rta_apply_hostentry(rta *a, struct hostentry_adata *head)
 
   /* Fix final length */
   new->ad.length = (void *) dest - (void *) new->ad.data;
-  ea_set_attr(&a->eattrs, EA_LITERAL_DIRECT_ADATA(
+  ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
 	&ea_gen_nexthop, 0, &new->ad));
 }
 
 static inline struct hostentry_adata *
-rta_next_hop_outdated(rta *a)
+rta_next_hop_outdated(ea_list *a)
 {
   /* First retrieve the hostentry */
-  eattr *heea = ea_find(a->eattrs, &ea_gen_hostentry);
+  eattr *heea = ea_find(a, &ea_gen_hostentry);
   if (!heea)
     return NULL;
 
   struct hostentry_adata *head = (struct hostentry_adata *) heea->u.ptr;
 
   /* If no nexthop is present, we have to create one */
-  eattr *a_nh_ea = ea_find(a->eattrs, &ea_gen_nexthop);
+  eattr *a_nh_ea = ea_find(a, &ea_gen_nexthop);
   if (!a_nh_ea)
     return head;
 
@@ -2526,10 +2526,10 @@ rta_next_hop_outdated(rta *a)
     return NEXTHOP_IS_REACHABLE(nhad) ? head : NULL;
 
   /* Comparing our nexthop with the hostentry nexthop */
-  eattr *he_nh_ea = ea_find(head->he->src->eattrs, &ea_gen_nexthop);
+  eattr *he_nh_ea = ea_find(head->he->src, &ea_gen_nexthop);
 
   return (
-      (ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != head->he->igp_metric) ||
+      (ea_get_int(a, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != head->he->igp_metric) ||
       (!head->he->nexthop_linkable) ||
       (!he_nh_ea != !a_nh_ea) ||
       (he_nh_ea && a_nh_ea && !adata_same(he_nh_ea->u.ptr, a_nh_ea->u.ptr)))
@@ -2543,13 +2543,12 @@ rt_next_hop_update_rte(rtable *tab UNUSED, rte *old)
   if (!head)
     return NULL;
 
-  rta a = *old->attrs;
-  a.cached = 0;
-  rta_apply_hostentry(&a, head);
+  ea_list *ea = old->attrs;
+  rta_apply_hostentry(&ea, head);
 
   rte *e = sl_alloc(rte_slab);
   memcpy(e, old, sizeof(rte));
-  e->attrs = rta_lookup(&a);
+  e->attrs = rta_lookup(ea);
   rt_lock_source(e->src);
 
   return e;
@@ -2579,23 +2578,23 @@ net_flow_has_dst_prefix(const net_addr *n)
 }
 
 static inline int
-rta_as_path_is_empty(rta *a)
+rta_as_path_is_empty(ea_list *a)
 {
-  eattr *e = ea_find(a->eattrs, "bgp_path");
+  eattr *e = ea_find(a, "bgp_path");
   return !e || (as_path_getlen(e->u.ptr) == 0);
 }
 
 static inline u32
-rta_get_first_asn(rta *a)
+rta_get_first_asn(ea_list *a)
 {
-  eattr *e = ea_find(a->eattrs, "bgp_path");
+  eattr *e = ea_find(a, "bgp_path");
   u32 asn;
 
   return (e && as_path_get_first_regular(e->u.ptr, &asn)) ? asn : 0;
 }
 
 int
-rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, int interior)
+rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *a, int interior)
 {
   ASSERT(rt_is_ip(tab_ip));
   ASSERT(rt_is_flow(tab_flow));
@@ -2632,13 +2631,13 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, i
     return 0;
 
   /* Find ORIGINATOR_ID values */
-  u32 orig_a = ea_get_int(a->eattrs, "bgp_originator_id", 0);
-  u32 orig_b = ea_get_int(rb->attrs->eattrs, "bgp_originator_id", 0);
+  u32 orig_a = ea_get_int(a, "bgp_originator_id", 0);
+  u32 orig_b = ea_get_int(rb->attrs, "bgp_originator_id", 0);
 
   /* Originator is either ORIGINATOR_ID (if present), or BGP neighbor address (if not) */
   if ((orig_a != orig_b) || (!orig_a && !orig_b && !ipa_equal(
-	  ea_get_ip(a->eattrs, &ea_gen_from, IPA_NONE),
-	  ea_get_ip(rb->attrs->eattrs, &ea_gen_from, IPA_NONE)
+	  ea_get_ip(a, &ea_gen_from, IPA_NONE),
+	  ea_get_ip(rb->attrs, &ea_gen_from, IPA_NONE)
 	  )))
     return 0;
 
@@ -2691,15 +2690,12 @@ rt_flowspec_update_rte(rtable *tab, rte *r)
   if (old == valid)
     return NULL;
 
-  rta *a = alloca(RTA_MAX_SIZE);
-  memcpy(a, r->attrs, rta_size(r->attrs));
-  a->cached = 0;
-
-  ea_set_attr_u32(&a->eattrs, &ea_gen_flowspec_valid, 0, valid);
+  ea_list *a = r->attrs;
+  ea_set_attr_u32(&a, &ea_gen_flowspec_valid, 0, valid);
 
   rte *new = sl_alloc(rte_slab);
   memcpy(new, r, sizeof(rte));
-  new->attrs = rta_lookup(a);
+  new->attrs = ea_lookup(a);
 
   return new;
 #else
@@ -3506,7 +3502,7 @@ if_local_addr(ip_addr a, struct iface *i)
 u32
 rt_get_igp_metric(rte *rt)
 {
-  eattr *ea = ea_find(rt->attrs->eattrs, "igp_metric");
+  eattr *ea = ea_find(rt->attrs, "igp_metric");
 
   if (ea)
     return ea->u.data;
@@ -3523,7 +3519,7 @@ rt_get_igp_metric(rte *rt)
 static int
 rt_update_hostentry(rtable *tab, struct hostentry *he)
 {
-  rta *old_src = he->src;
+  ea_list *old_src = he->src;
   int direct = 0;
   int pxlen = 0;
 
@@ -3538,10 +3534,10 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
   if (n)
     {
       rte *e = n->routes;
-      rta *a = e->attrs;
+      ea_list *a = e->attrs;
       pxlen = n->n.addr->pxlen;
 
-      if (ea_find(a->eattrs, &ea_gen_hostentry))
+      if (ea_find(a, &ea_gen_hostentry))
 	{
 	  /* Recursive route should not depend on another recursive route */
 	  log(L_WARN "Next hop address %I resolvable through recursive route for %N",
@@ -3549,7 +3545,7 @@ rt_update_hostentry(rtable *tab, struct hostentry *he)
 	  goto done;
 	}
 
-      eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+      eattr *nhea = ea_find(a, &ea_gen_nexthop);
       ASSERT_DIE(nhea);
       struct nexthop_adata *nhad = (void *) nhea->u.ptr;
 
diff --git a/nest/rt.h b/nest/rt.h
index 6f15fec6..f7cc164d 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -143,7 +143,7 @@ struct hostentry {
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
-  struct rta *src;			/* Source rta entry */
+  ea_list *src;				/* Source attributes */
   byte nexthop_linkable;		/* Nexthop list is completely non-device */
   u32 igp_metric;			/* Chosen route IGP metric */
 };
@@ -185,7 +185,7 @@ static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) f
 net *net_get(rtable *tab, const net_addr *addr);
 net *net_route(rtable *tab, const net_addr *n);
 rte *rte_find(net *net, struct rte_src *src);
-rte *rte_get_temp(struct rta *, struct rte_src *src);
+rte *rte_get_temp(ea_list *, struct rte_src *src);
 void rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 /* rte_update() moved to protocol.h to avoid dependency conflicts */
 int rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter);
@@ -198,7 +198,7 @@ void rte_dump(rte *);
 void rte_free(rte *);
 rte *rte_do_cow(rte *);
 static inline rte * rte_cow(rte *r) { return (r->flags & REF_COW) ? rte_do_cow(r) : r; }
-rte *rte_cow_rta(rte *r, linpool *lp);
+rte *rte_cow_rta(rte *r);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 int rt_feed_channel(struct channel *c);
@@ -290,18 +290,7 @@ struct hostentry_adata {
 void
 ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum]);
 
-/*
-struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
-void rta_apply_hostentry(rta *a, struct hostentry *he, u32 lnum, u32 labels[lnum]);
-
-static inline void
-rta_set_recursive_next_hop(rtable *dep, rta *a, rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
-{
-  rta_apply_hostentry(a, rt_get_hostentry(tab, gw, ll, dep), lnum, labels);
-}
-*/
-
-int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *a, int interior);
+int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *a, int interior);
 
 
 /*
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index b90dcd3f..e3903c67 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -677,10 +677,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
       }
     };
 
-    rta a0 = { .eattrs = &eattrs.l, };
-
-    rta *a = rta_lookup(&a0);
-    rte *rte = rte_get_temp(a, p->p.main_source);
+    rte *rte = rte_get_temp(rta_lookup(&eattrs.l), p->p.main_source);
 
     e->unreachable = 0;
     rte_update2(c, e->n.addr, rte, p->p.main_source);
@@ -688,14 +685,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
   else if (e->valid && (e->router_id != p->router_id))
   {
     /* Unreachable */
-    rta a0 = {};
+    ea_list *ea = NULL;
 
-    ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, 1);
-    ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_BABEL);
-    ea_set_dest(&a0.eattrs, 0, RTD_UNREACHABLE);
+    ea_set_attr_u32(&ea, &ea_gen_preference, 0, 1);
+    ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_BABEL);
+    ea_set_dest(&ea, 0, RTD_UNREACHABLE);
 
-    rta *a = rta_lookup(&a0);
-    rte *rte = rte_get_temp(a, p->p.main_source);
+    rte *rte = rte_get_temp(rta_lookup(ea), p->p.main_source);
     rte->pflags = 0;
 
     e->unreachable = 1;
@@ -2025,13 +2021,13 @@ static void
 babel_get_route_info(rte *rte, byte *buf)
 {
   u64 rid = 0;
-  eattr *e = ea_find(rte->attrs->eattrs, &ea_babel_router_id);
+  eattr *e = ea_find(rte->attrs, &ea_babel_router_id);
   if (e)
     memcpy(&rid, e->u.ptr->data, sizeof(u64));
 
   buf += bsprintf(buf, " (%d/%d) [%lR]",
       rt_get_preference(rte),
-      ea_get_int(rte->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY), rid);
+      ea_get_int(rte->attrs, &ea_babel_metric, BABEL_INFINITY), rid);
 }
 
 static void
@@ -2263,7 +2259,7 @@ babel_preexport(struct proto *P, struct rte *new)
     return 0;
 
   /* Reject our own unreachable routes */
-  eattr *ea = ea_find(new->attrs->eattrs, &ea_gen_nexthop);
+  eattr *ea = ea_find(new->attrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = (void *) ea->u.ptr;
   if (!NEXTHOP_IS_REACHABLE(nhad))
     return -1;
@@ -2286,13 +2282,13 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
   {
     /* Update */
     uint rt_seqno;
-    uint rt_metric = ea_get_int(new->attrs->eattrs, &ea_babel_metric, 0);
+    uint rt_metric = ea_get_int(new->attrs, &ea_babel_metric, 0);
     u64 rt_router_id = 0;
 
     if (new->src->proto == P)
     {
-      rt_seqno = ea_get_int(new->attrs->eattrs, &ea_babel_seqno, 0);
-      eattr *e = ea_find(new->attrs->eattrs, &ea_babel_router_id);
+      rt_seqno = ea_get_int(new->attrs, &ea_babel_seqno, 0);
+      eattr *e = ea_find(new->attrs, &ea_babel_router_id);
       if (e)
 	memcpy(&rt_router_id, e->u.ptr->data, sizeof(u64));
     }
@@ -2343,8 +2339,8 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net,
 static int
 babel_rte_better(struct rte *new, struct rte *old)
 {
-  uint new_metric = ea_get_int(new->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
-  uint old_metric = ea_get_int(old->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
+  uint new_metric = ea_get_int(new->attrs, &ea_babel_metric, BABEL_INFINITY);
+  uint old_metric = ea_get_int(old->attrs, &ea_babel_metric, BABEL_INFINITY);
 
   return new_metric < old_metric;
 }
@@ -2352,7 +2348,7 @@ babel_rte_better(struct rte *new, struct rte *old)
 static u32
 babel_rte_igp_metric(struct rte *rt)
 {
-  return ea_get_int(rt->attrs->eattrs, &ea_babel_metric, BABEL_INFINITY);
+  return ea_get_int(rt->attrs, &ea_babel_metric, BABEL_INFINITY);
 }
 
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 6a9e4026..c605bb07 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -374,7 +374,7 @@ bgp_aigp_set_metric(struct linpool *pool, const struct adata *ad, u64 metric)
 int
 bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
 {
-  eattr *a = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_AIGP));
+  eattr *a = ea_find(e->attrs, BGP_EA_ID(BA_AIGP));
   if (!a)
     return 0;
 
@@ -1492,13 +1492,13 @@ loop:
 }
 
 void
-bgp_finish_attrs(struct bgp_parse_state *s, rta *a)
+bgp_finish_attrs(struct bgp_parse_state *s, ea_list **to)
 {
   /* AIGP test here instead of in bgp_decode_aigp() - we need to know channel */
   if (BIT32_TEST(s->attrs_seen, BA_AIGP) && !s->channel->cf->aigp)
   {
     REPORT("Discarding AIGP attribute received on non-AIGP session");
-    bgp_unset_attr(&a->eattrs, BA_AIGP);
+    bgp_unset_attr(to, BA_AIGP);
   }
 }
 
@@ -1735,14 +1735,14 @@ bgp_preexport(struct proto *P, rte *e)
 
     /* Generally, this should be handled when path is received, but we check it
        also here as rr_cluster_id may be undefined or different in src. */
-    if (p->rr_cluster_id && bgp_cluster_list_loopy(p, e->attrs->eattrs))
+    if (p->rr_cluster_id && bgp_cluster_list_loopy(p, e->attrs))
       return -1;
   }
 
   /* Handle well-known communities, RFC 1997 */
   struct eattr *c;
   if (p->cf->interpret_communities &&
-      (c = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY))))
+      (c = ea_find(e->attrs, BGP_EA_ID(BA_COMMUNITY))))
   {
     const struct adata *d = c->u.ptr;
 
@@ -1893,7 +1893,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old)
 
   if (new)
   {
-    struct ea_list *attrs = bgp_update_attrs(p, c, new, new->attrs->eattrs, tmp_linpool);
+    struct ea_list *attrs = bgp_update_attrs(p, c, new, new->attrs, tmp_linpool);
 
     /* Error during attribute processing */
     if (!attrs)
@@ -1919,7 +1919,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old)
 static inline u32
 bgp_get_neighbor(rte *r)
 {
-  eattr *e = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+  eattr *e = ea_find(r->attrs, BGP_EA_ID(BA_AS_PATH));
   u32 as;
 
   if (e && as_path_get_first_regular(e->u.ptr, &as))
@@ -1940,7 +1940,7 @@ rte_stale(rte *r)
     return 0;
 
   /* If staleness is unknown, compute and cache it */
-  eattr *a = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY));
+  eattr *a = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
   if (a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE))
   {
     r->pflags |= BGP_REF_STALE;
@@ -1986,8 +1986,8 @@ bgp_rte_better(rte *new, rte *old)
     return 1;
 
  /* Start with local preferences */
-  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
-  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
+  x = ea_find(new->attrs, BGP_EA_ID(BA_LOCAL_PREF));
+  y = ea_find(old->attrs, BGP_EA_ID(BA_LOCAL_PREF));
   n = x ? x->u.data : new_bgp->cf->default_local_pref;
   o = y ? y->u.data : old_bgp->cf->default_local_pref;
   if (n > o)
@@ -2006,8 +2006,8 @@ bgp_rte_better(rte *new, rte *old)
   /* RFC 4271 9.1.2.2. a)  Use AS path lengths */
   if (new_bgp->cf->compare_path_lengths || old_bgp->cf->compare_path_lengths)
   {
-    x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
-    y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+    x = ea_find(new->attrs, BGP_EA_ID(BA_AS_PATH));
+    y = ea_find(old->attrs, BGP_EA_ID(BA_AS_PATH));
     n = x ? as_path_getlen(x->u.ptr) : AS_PATH_MAXLEN;
     o = y ? as_path_getlen(y->u.ptr) : AS_PATH_MAXLEN;
     if (n < o)
@@ -2017,8 +2017,8 @@ bgp_rte_better(rte *new, rte *old)
   }
 
   /* RFC 4271 9.1.2.2. b) Use origins */
-  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
-  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
+  x = ea_find(new->attrs, BGP_EA_ID(BA_ORIGIN));
+  y = ea_find(old->attrs, BGP_EA_ID(BA_ORIGIN));
   n = x ? x->u.data : ORIGIN_INCOMPLETE;
   o = y ? y->u.data : ORIGIN_INCOMPLETE;
   if (n < o)
@@ -2040,8 +2040,8 @@ bgp_rte_better(rte *new, rte *old)
   if (new_bgp->cf->med_metric || old_bgp->cf->med_metric ||
       (bgp_get_neighbor(new) == bgp_get_neighbor(old)))
   {
-    x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
-    y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    x = ea_find(new->attrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    y = ea_find(old->attrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
     n = x ? x->u.data : new_bgp->cf->default_med;
     o = y ? y->u.data : old_bgp->cf->default_med;
     if (n < o)
@@ -2066,8 +2066,8 @@ bgp_rte_better(rte *new, rte *old)
 
   /* RFC 4271 9.1.2.2. f) Compare BGP identifiers */
   /* RFC 4456 9. a) Use ORIGINATOR_ID instead of local neighbor ID */
-  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_ORIGINATOR_ID));
-  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_ORIGINATOR_ID));
+  x = ea_find(new->attrs, BGP_EA_ID(BA_ORIGINATOR_ID));
+  y = ea_find(old->attrs, BGP_EA_ID(BA_ORIGINATOR_ID));
   n = x ? x->u.data : new_bgp->remote_id;
   o = y ? y->u.data : old_bgp->remote_id;
 
@@ -2084,8 +2084,8 @@ bgp_rte_better(rte *new, rte *old)
     return 0;
 
   /* RFC 4456 9. b) Compare cluster list lengths */
-  x = ea_find(new->attrs->eattrs, BGP_EA_ID(BA_CLUSTER_LIST));
-  y = ea_find(old->attrs->eattrs, BGP_EA_ID(BA_CLUSTER_LIST));
+  x = ea_find(new->attrs, BGP_EA_ID(BA_CLUSTER_LIST));
+  y = ea_find(old->attrs, BGP_EA_ID(BA_CLUSTER_LIST));
   n = x ? int_set_get_size(x->u.ptr) : 0;
   o = y ? int_set_get_size(y->u.ptr) : 0;
   if (n < o)
@@ -2119,8 +2119,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
     return 0;
 
   /* Start with local preferences */
-  x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
-  y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_LOCAL_PREF));
+  x = ea_find(pri->attrs, BGP_EA_ID(BA_LOCAL_PREF));
+  y = ea_find(sec->attrs, BGP_EA_ID(BA_LOCAL_PREF));
   p = x ? x->u.data : pri_bgp->cf->default_local_pref;
   s = y ? y->u.data : sec_bgp->cf->default_local_pref;
   if (p != s)
@@ -2129,8 +2129,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   /* RFC 4271 9.1.2.2. a)  Use AS path lengths */
   if (pri_bgp->cf->compare_path_lengths || sec_bgp->cf->compare_path_lengths)
   {
-    x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
-    y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
+    x = ea_find(pri->attrs, BGP_EA_ID(BA_AS_PATH));
+    y = ea_find(sec->attrs, BGP_EA_ID(BA_AS_PATH));
     p = x ? as_path_getlen(x->u.ptr) : AS_PATH_MAXLEN;
     s = y ? as_path_getlen(y->u.ptr) : AS_PATH_MAXLEN;
 
@@ -2142,8 +2142,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   }
 
   /* RFC 4271 9.1.2.2. b) Use origins */
-  x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
-  y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
+  x = ea_find(pri->attrs, BGP_EA_ID(BA_ORIGIN));
+  y = ea_find(sec->attrs, BGP_EA_ID(BA_ORIGIN));
   p = x ? x->u.data : ORIGIN_INCOMPLETE;
   s = y ? y->u.data : ORIGIN_INCOMPLETE;
   if (p != s)
@@ -2153,8 +2153,8 @@ bgp_rte_mergable(rte *pri, rte *sec)
   if (pri_bgp->cf->med_metric || sec_bgp->cf->med_metric ||
       (bgp_get_neighbor(pri) == bgp_get_neighbor(sec)))
   {
-    x = ea_find(pri->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
-    y = ea_find(sec->attrs->eattrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    x = ea_find(pri->attrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
+    y = ea_find(sec->attrs, BGP_EA_ID(BA_MULTI_EXIT_DISC));
     p = x ? x->u.data : pri_bgp->cf->default_med;
     s = y ? y->u.data : sec_bgp->cf->default_med;
     if (p != s)
@@ -2320,7 +2320,7 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 struct rte *
 bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
 {
-  eattr *a = ea_find(r->attrs->eattrs, BGP_EA_ID(BA_COMMUNITY));
+  eattr *a = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
   const struct adata *ad = a ? a->u.ptr : NULL;
   uint flags = a ? a->flags : BAF_PARTIAL;
 
@@ -2330,8 +2330,8 @@ bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
   if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
     return r;
 
-  r = rte_cow_rta(r, pool);
-  bgp_set_attr_ptr(&(r->attrs->eattrs), BA_COMMUNITY, flags,
+  r = rte_cow_rta(r);
+  bgp_set_attr_ptr(&(r->attrs), BA_COMMUNITY, flags,
 		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
   r->pflags |= BGP_REF_STALE;
 
@@ -2388,8 +2388,8 @@ bgp_process_as4_attrs(ea_list **attrs, struct linpool *pool)
 void
 bgp_get_route_info(rte *e, byte *buf)
 {
-  eattr *p = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_AS_PATH));
-  eattr *o = ea_find(e->attrs->eattrs, BGP_EA_ID(BA_ORIGIN));
+  eattr *p = ea_find(e->attrs, BGP_EA_ID(BA_AS_PATH));
+  eattr *o = ea_find(e->attrs, BGP_EA_ID(BA_ORIGIN));
   u32 origas;
 
   buf += bsprintf(buf, " (%d", rt_get_preference(e));
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 2f98dc1b..376b463f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -67,10 +67,10 @@ struct bgp_af_desc {
   u8 no_igp;
   const char *name;
   uint (*encode_nlri)(struct bgp_write_state *s, struct bgp_bucket *buck, byte *buf, uint size);
-  void (*decode_nlri)(struct bgp_parse_state *s, byte *pos, uint len, rta *a);
+  void (*decode_nlri)(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a);
   void (*update_next_hop)(struct bgp_export_state *s, eattr *nh, ea_list **to);
   uint (*encode_next_hop)(struct bgp_write_state *s, eattr *nh, byte *buf, uint size);
-  void (*decode_next_hop)(struct bgp_parse_state *s, byte *pos, uint len, rta *a);
+  void (*decode_next_hop)(struct bgp_parse_state *s, byte *pos, uint len, ea_list **to);
 };
 
 
@@ -461,7 +461,7 @@ struct bgp_parse_state {
   /* Cached state for bgp_rte_update() */
   u32 last_id;
   struct rte_src *last_src;
-  rta *cached_rta;
+  ea_list *cached_ea;
 };
 
 #define BGP_PORT		179
@@ -519,7 +519,7 @@ struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id);
 static inline int
 rte_resolvable(rte *rt)
 {
-  eattr *nhea = ea_find(rt->attrs->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(rt->attrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = (void *) nhea->u.ptr;
   return NEXTHOP_IS_REACHABLE(nhad) || (nhad->dest != RTD_UNREACHABLE);
 }
@@ -551,7 +551,7 @@ int bgp_encode_mp_reach_mrt(struct bgp_write_state *s, eattr *a, byte *buf, uint
 
 int bgp_encode_attrs(struct bgp_write_state *s, ea_list *attrs, byte *buf, byte *end);
 ea_list * bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len);
-void bgp_finish_attrs(struct bgp_parse_state *s, rta *a);
+void bgp_finish_attrs(struct bgp_parse_state *s, ea_list **to);
 
 void bgp_init_bucket_table(struct bgp_channel *c);
 void bgp_free_bucket_table(struct bgp_channel *c);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 4c46c60e..e72ec222 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -943,7 +943,7 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, uint len)
 #define MISMATCHED_AF	" - mismatched address family (%I for %s)"
 
 static void
-bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
+bgp_apply_next_hop(struct bgp_parse_state *s, ea_list **to, ip_addr gw, ip_addr ll)
 {
   struct bgp_proto *p = s->proto;
   struct bgp_channel *c = s->channel;
@@ -966,7 +966,7 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     if (nbr->scope == SCOPE_HOST)
       WITHDRAW(BAD_NEXT_HOP " - address %I is local", nbr->addr);
 
-    ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, c->cf->cost);
+    ea_set_attr_u32(to, &ea_gen_igp_metric, 0, c->cf->cost);
 
     struct nexthop_adata nhad = {
       .nh = {
@@ -977,7 +977,7 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
 	.length = sizeof nhad - sizeof nhad.ad,
       },
     };
-    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
+    ea_set_attr_data(to, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
   }
   else /* GW_RECURSIVE */
   {
@@ -988,21 +988,21 @@ bgp_apply_next_hop(struct bgp_parse_state *s, rta *a, ip_addr gw, ip_addr ll)
     if (s->mpls)
     {
       u32 labels[BGP_MPLS_MAX];
-      ea_set_hostentry(&a->eattrs, c->c.table, tab, gw, ll, BGP_MPLS_MAX, labels);
+      ea_set_hostentry(to, c->c.table, tab, gw, ll, BGP_MPLS_MAX, labels);
     }
     else
-      ea_set_hostentry(&a->eattrs, c->c.table, tab, gw, ll, 0, NULL);
+      ea_set_hostentry(to, c->c.table, tab, gw, ll, 0, NULL);
   }
 }
 
 static void
-bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[lnum])
+bgp_apply_mpls_labels(struct bgp_parse_state *s, ea_list **to, u32 lnum, u32 labels[lnum])
 {
   if (lnum > MPLS_MAX_LABEL_STACK)
   {
     REPORT("Too many MPLS labels ($u)", lnum);
 
-    ea_set_dest(&a->eattrs, 0, RTD_UNREACHABLE);
+    ea_set_dest(to, 0, RTD_UNREACHABLE);
     return;
   }
 
@@ -1012,7 +1012,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[ln
 
   if (s->channel->cf->gw_mode == GW_DIRECT)
   {
-    eattr *e = ea_find(a->eattrs, &ea_gen_nexthop);
+    eattr *e = ea_find(*to, &ea_gen_nexthop);
     struct {
       struct nexthop_adata nhad;
       u32 labels[MPLS_MAX_LABEL_STACK];
@@ -1025,7 +1025,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[ln
   }
   else /* GW_RECURSIVE */
   {
-    eattr *e = ea_find(a->eattrs, &ea_gen_hostentry);
+    eattr *e = ea_find(*to, &ea_gen_hostentry);
     ASSERT_DIE(e);
     struct hostentry_adata *head = (void *) e->u.ptr;
     memcpy(&head->labels, labels, lnum * sizeof(u32));
@@ -1034,24 +1034,24 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[ln
 }
 
 static void
-bgp_apply_flow_validation(struct bgp_parse_state *s, const net_addr *n, rta *a)
+bgp_apply_flow_validation(struct bgp_parse_state *s, const net_addr *n, ea_list **to)
 {
   struct bgp_channel *c = s->channel;
-  uint valid = rt_flowspec_check(c->base_table, c->c.table, n, a, s->proto->is_interior);
+  uint valid = rt_flowspec_check(c->base_table, c->c.table, n, *to, s->proto->is_interior);
 
   /* Invalidate cached rta */
-  if (s->cached_rta)
+  if (s->cached_ea)
   {
     /* Has't changed */
-    if (valid == ea_get_int(s->cached_rta->eattrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN))
+    if (valid == ea_get_int(s->cached_ea, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN))
       return;
 
-    rta_free(s->cached_rta);
-    s->cached_rta = NULL;
+    rta_free(s->cached_ea);
+    s->cached_ea = NULL;
   }
 
   /* Set the value */
-  ea_set_attr_u32(&a->eattrs, &ea_gen_flowspec_valid, 0, valid);
+  ea_set_attr_u32(to, &ea_gen_flowspec_valid, 0, valid);
 }
 
 static int
@@ -1105,13 +1105,13 @@ bgp_use_gateway(struct bgp_export_state *s)
 {
   struct bgp_proto *p = s->proto;
   struct bgp_channel *c = s->channel;
-  rta *ra = s->route->attrs;
+  ea_list *ra = s->route->attrs;
 
   /* Handle next hop self option - also applies to gateway */
   if (c->cf->next_hop_self && bgp_match_src(s, c->cf->next_hop_self))
     return NULL;
 
-  eattr *nhea = ea_find(ra->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(ra, &ea_gen_nexthop);
   if (!nhea)
     return NULL;
 
@@ -1229,7 +1229,7 @@ bgp_encode_next_hop_ip(struct bgp_write_state *s, eattr *a, byte *buf, uint size
 }
 
 static void
-bgp_decode_next_hop_ip(struct bgp_parse_state *s, byte *data, uint len, rta *a)
+bgp_decode_next_hop_ip(struct bgp_parse_state *s, byte *data, uint len, ea_list **to)
 {
   struct bgp_channel *c = s->channel;
   struct adata *ad = lp_alloc_adata(s->pool, 32);
@@ -1270,8 +1270,8 @@ bgp_decode_next_hop_ip(struct bgp_parse_state *s, byte *data, uint len, rta *a)
 
   // XXXX validate next hop
 
-  bgp_set_attr_ptr(&(a->eattrs), BA_NEXT_HOP, 0, ad);
-  bgp_apply_next_hop(s, a, nh[0], nh[1]);
+  bgp_set_attr_ptr(to, BA_NEXT_HOP, 0, ad);
+  bgp_apply_next_hop(s, to, nh[0], nh[1]);
 }
 
 static uint
@@ -1309,7 +1309,7 @@ bgp_encode_next_hop_vpn(struct bgp_write_state *s, eattr *a, byte *buf, uint siz
 }
 
 static void
-bgp_decode_next_hop_vpn(struct bgp_parse_state *s, byte *data, uint len, rta *a)
+bgp_decode_next_hop_vpn(struct bgp_parse_state *s, byte *data, uint len, ea_list **to)
 {
   struct bgp_channel *c = s->channel;
   struct adata *ad = lp_alloc_adata(s->pool, 32);
@@ -1351,8 +1351,8 @@ bgp_decode_next_hop_vpn(struct bgp_parse_state *s, byte *data, uint len, rta *a)
 
   // XXXX validate next hop
 
-  bgp_set_attr_ptr(&(a->eattrs), BA_NEXT_HOP, 0, ad);
-  bgp_apply_next_hop(s, a, nh[0], nh[1]);
+  bgp_set_attr_ptr(to, BA_NEXT_HOP, 0, ad);
+  bgp_apply_next_hop(s, to, nh[0], nh[1]);
 }
 
 
@@ -1364,7 +1364,7 @@ bgp_encode_next_hop_none(struct bgp_write_state *s UNUSED, eattr *a UNUSED, byte
 }
 
 static void
-bgp_decode_next_hop_none(struct bgp_parse_state *s UNUSED, byte *data UNUSED, uint len UNUSED, rta *a UNUSED)
+bgp_decode_next_hop_none(struct bgp_parse_state *s UNUSED, byte *data UNUSED, uint len UNUSED, ea_list **to UNUSED)
 {
   /*
    * Although we expect no next hop and RFC 7606 7.11 states that attribute
@@ -1389,15 +1389,15 @@ bgp_update_next_hop_none(struct bgp_export_state *s UNUSED, eattr *a, ea_list **
  */
 
 static void
-bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, rta *a0)
+bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, ea_list *a0)
 {
   if (path_id != s->last_id)
   {
     s->last_src = rt_get_source(&s->proto->p, path_id);
     s->last_id = path_id;
 
-    rta_free(s->cached_rta);
-    s->cached_rta = NULL;
+    ea_free(s->cached_ea);
+    s->cached_ea = NULL;
   }
 
   if (!a0)
@@ -1412,16 +1412,10 @@ bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, rta *a
   }
 
   /* Prepare cached route attributes */
-  if (s->cached_rta == NULL)
-  {
-    /* Workaround for rta_lookup() breaking eattrs */
-    ea_list *ea = a0->eattrs;
-    s->cached_rta = rta_lookup(a0);
-    a0->eattrs = ea;
-  }
+  if (s->cached_ea == NULL)
+    s->cached_ea = ea_lookup(a0);
 
-  rta *a = rta_clone(s->cached_rta);
-  rte *e = rte_get_temp(a, s->last_src);
+  rte *e = rte_get_temp(rta_clone(s->cached_ea), s->last_src);
 
   e->pflags = 0;
   rte_update3(&s->channel->c, n, e, s->last_src);
@@ -1447,7 +1441,7 @@ bgp_encode_mpls_labels(struct bgp_write_state *s UNUSED, const adata *mpls, byte
 }
 
 static void
-bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *pxlen, rta *a)
+bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *pxlen, ea_list **to)
 {
   u32 labels[BGP_MPLS_MAX];
   u32 label;
@@ -1469,15 +1463,15 @@ bgp_decode_mpls_labels(struct bgp_parse_state *s, byte **pos, uint *len, uint *p
   }
   while (!(label & BGP_MPLS_BOS));
 
-  if (!a)
+  if (!*to)
     return;
 
   /* Update next hop entry in rta */
-  bgp_apply_mpls_labels(s, a, lnum, labels);
+  bgp_apply_mpls_labels(s, to, lnum, labels);
 
   /* Attributes were changed, invalidate cached entry */
-  rta_free(s->cached_rta);
-  s->cached_rta = NULL;
+  rta_free(s->cached_ea);
+  s->cached_ea = NULL;
 
   return;
 }
@@ -1520,7 +1514,7 @@ bgp_encode_nlri_ip4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
 }
 
 static void
-bgp_decode_nlri_ip4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_ip4(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -1546,7 +1540,7 @@ bgp_decode_nlri_ip4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Decode MPLS labels */
     if (s->mpls)
-      bgp_decode_mpls_labels(s, &pos, &len, &l, a);
+      bgp_decode_mpls_labels(s, &pos, &len, &l, &a);
 
     if (l > IP4_MAX_PREFIX_LENGTH)
       bgp_parse_error(s, 10);
@@ -1605,7 +1599,7 @@ bgp_encode_nlri_ip6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
 }
 
 static void
-bgp_decode_nlri_ip6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_ip6(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -1631,7 +1625,7 @@ bgp_decode_nlri_ip6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Decode MPLS labels */
     if (s->mpls)
-      bgp_decode_mpls_labels(s, &pos, &len, &l, a);
+      bgp_decode_mpls_labels(s, &pos, &len, &l, &a);
 
     if (l > IP6_MAX_PREFIX_LENGTH)
       bgp_parse_error(s, 10);
@@ -1693,7 +1687,7 @@ bgp_encode_nlri_vpn4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
 }
 
 static void
-bgp_decode_nlri_vpn4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_vpn4(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -1719,7 +1713,7 @@ bgp_decode_nlri_vpn4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Decode MPLS labels */
     if (s->mpls)
-      bgp_decode_mpls_labels(s, &pos, &len, &l, a);
+      bgp_decode_mpls_labels(s, &pos, &len, &l, &a);
 
     /* Decode route distinguisher */
     if (l < 64)
@@ -1790,7 +1784,7 @@ bgp_encode_nlri_vpn6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
 }
 
 static void
-bgp_decode_nlri_vpn6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_vpn6(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -1816,7 +1810,7 @@ bgp_decode_nlri_vpn6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Decode MPLS labels */
     if (s->mpls)
-      bgp_decode_mpls_labels(s, &pos, &len, &l, a);
+      bgp_decode_mpls_labels(s, &pos, &len, &l, &a);
 
     /* Decode route distinguisher */
     if (l < 64)
@@ -1877,7 +1871,7 @@ bgp_encode_nlri_flow4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
 }
 
 static void
-bgp_decode_nlri_flow4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_flow4(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -1930,7 +1924,7 @@ bgp_decode_nlri_flow4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Apply validation procedure per RFC 8955 (6) */
     if (a && s->channel->cf->validate)
-      bgp_apply_flow_validation(s, n, a);
+      bgp_apply_flow_validation(s, n, &a);
 
     bgp_rte_update(s, n, path_id, a);
   }
@@ -1969,7 +1963,7 @@ bgp_encode_nlri_flow6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
 }
 
 static void
-bgp_decode_nlri_flow6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
+bgp_decode_nlri_flow6(struct bgp_parse_state *s, byte *pos, uint len, ea_list *a)
 {
   while (len)
   {
@@ -2022,7 +2016,7 @@ bgp_decode_nlri_flow6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
 
     /* Apply validation procedure per RFC 8955 (6) */
     if (a && s->channel->cf->validate)
-      bgp_apply_flow_validation(s, n, a);
+      bgp_apply_flow_validation(s, n, &a);
 
     bgp_rte_update(s, n, path_id, a);
   }
@@ -2472,7 +2466,6 @@ static inline void
 bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_list *ea, byte *nh, uint nh_len)
 {
   struct bgp_channel *c = bgp_get_channel(s->proto, afi);
-  rta *a = NULL;
 
   if (!c)
     DISCARD(BAD_AFI, BGP_AFI(afi), BGP_SAFI(afi));
@@ -2493,26 +2486,22 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis
 
   if (ea)
   {
-    a = allocz(RTA_MAX_SIZE);
+    ea_set_attr_data(&ea, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr));
+    ea_set_attr_u32(&ea, &ea_gen_preference, 0, c->c.preference);
+    ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_BGP);
 
-    a->eattrs = ea;
-
-    ea_set_attr_data(&a->eattrs, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr));
-    ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, c->c.preference);
-    ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_BGP);
-
-    c->desc->decode_next_hop(s, nh, nh_len, a);
-    bgp_finish_attrs(s, a);
+    c->desc->decode_next_hop(s, nh, nh_len, &ea);
+    bgp_finish_attrs(s, &ea);
 
     /* Handle withdraw during next hop decoding */
     if (s->err_withdraw)
-      a = NULL;
+      ea = NULL;
   }
 
-  c->desc->decode_nlri(s, nlri, len, a);
+  c->desc->decode_nlri(s, nlri, len, ea);
 
-  rta_free(s->cached_rta);
-  s->cached_rta = NULL;
+  rta_free(s->cached_ea);
+  s->cached_ea = NULL;
 }
 
 static void
@@ -2617,7 +2606,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
 		    ea, s.mp_next_hop_data, s.mp_next_hop_len);
 
 done:
-  rta_free(s.cached_rta);
+  rta_free(s.cached_ea);
   lp_restore(tmp_linpool, &tmpp);
   return;
 }
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index e45f7cb7..7b6e7772 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -423,7 +423,7 @@ mrt_rib_table_header(struct mrt_table_dump_state *s, net_addr *n)
 static void
 mrt_rib_table_entry_bgp_attrs(struct mrt_table_dump_state *s, rte *r)
 {
-  struct ea_list *eattrs = r->attrs->eattrs;
+  struct ea_list *eattrs = r->attrs;
   buffer *b = &s->buf;
 
   if (!eattrs)
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 731adaa5..87911531 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -387,7 +387,7 @@ ospf_init(struct proto_config *CF)
 static int
 ospf_rte_better(struct rte *new, struct rte *old)
 {
-  u32 new_metric1 = ea_get_int(new->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
+  u32 new_metric1 = ea_get_int(new->attrs, &ea_ospf_metric1, LSINFINITY);
 
   if (new_metric1 == LSINFINITY)
     return 0;
@@ -400,13 +400,13 @@ ospf_rte_better(struct rte *new, struct rte *old)
 
   if (ns == RTS_OSPF_EXT2)
   {
-    u32 old_metric2 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
-    u32 new_metric2 = ea_get_int(new->attrs->eattrs, &ea_ospf_metric2, LSINFINITY);
+    u32 old_metric2 = ea_get_int(old->attrs, &ea_ospf_metric2, LSINFINITY);
+    u32 new_metric2 = ea_get_int(new->attrs, &ea_ospf_metric2, LSINFINITY);
     if (new_metric2 < old_metric2) return 1;
     if (new_metric2 > old_metric2) return 0;
   }
 
-  u32 old_metric1 = ea_get_int(old->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
+  u32 old_metric1 = ea_get_int(old->attrs, &ea_ospf_metric1, LSINFINITY);
   if (new_metric1 < old_metric1)
     return 1;
 
@@ -419,7 +419,7 @@ ospf_rte_igp_metric(struct rte *rt)
   if (rt_get_source_attr(rt) == RTS_OSPF_EXT2)
     return IGP_METRIC_UNKNOWN;
 
-  return ea_get_int(rt->attrs->eattrs, &ea_ospf_metric1, LSINFINITY);
+  return ea_get_int(rt->attrs, &ea_ospf_metric1, LSINFINITY);
 }
 
 void
@@ -535,7 +535,7 @@ ospf_shutdown(struct proto *P)
   /* Cleanup locked rta entries */
   FIB_WALK(&p->rtf, ort, nf)
   {
-    rta_free(nf->old_rta);
+    ea_free(nf->old_ea);
   }
   FIB_WALK_END;
 
@@ -592,18 +592,18 @@ ospf_get_route_info(rte * rte, byte * buf)
   }
 
   buf += bsprintf(buf, " %s", type);
-  buf += bsprintf(buf, " (%d/%d", rt_get_preference(rte), ea_get_int(rte->attrs->eattrs, &ea_ospf_metric1, LSINFINITY));
+  buf += bsprintf(buf, " (%d/%d", rt_get_preference(rte), ea_get_int(rte->attrs, &ea_ospf_metric1, LSINFINITY));
   if (source == RTS_OSPF_EXT2)
-    buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs->eattrs, &ea_ospf_metric2, LSINFINITY));
+    buf += bsprintf(buf, "/%d", ea_get_int(rte->attrs, &ea_ospf_metric2, LSINFINITY));
   buf += bsprintf(buf, ")");
   if (source == RTS_OSPF_EXT1 || source == RTS_OSPF_EXT2)
   {
-    eattr *ea = ea_find(rte->attrs->eattrs, &ea_ospf_tag);
+    eattr *ea = ea_find(rte->attrs, &ea_ospf_tag);
     if (ea && (ea->u.data > 0))
       buf += bsprintf(buf, " [%x]", ea->u.data);
   }
   
-  eattr *ea = ea_find(rte->attrs->eattrs, &ea_ospf_router_id);
+  eattr *ea = ea_find(rte->attrs, &ea_ospf_router_id);
   if (ea)
     buf += bsprintf(buf, " [%R]", ea->u.data);
 }
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index afe4a01f..3889d634 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -1977,17 +1977,17 @@ add_cand(struct ospf_area *oa, struct top_hash_entry *en, struct top_hash_entry
 }
 
 static inline int
-ort_changed(ort *nf, rta *nr)
+ort_changed(ort *nf, ea_list *nr)
 {
-  rta *or = nf->old_rta;
+  ea_list *or = nf->old_ea;
 
   if (!or ||
     (nf->n.metric1 != nf->old_metric1) || (nf->n.metric2 != nf->old_metric2) ||
     (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid))
     return 1;
 
-  eattr *nhea_n = ea_find(nr->eattrs, &ea_gen_nexthop);
-  eattr *nhea_o = ea_find(or->eattrs, &ea_gen_nexthop);
+  eattr *nhea_n = ea_find(nr, &ea_gen_nexthop);
+  eattr *nhea_o = ea_find(or, &ea_gen_nexthop);
   if (!nhea_n != !nhea_o)
     return 1;
 
@@ -2000,8 +2000,8 @@ ort_changed(ort *nf, rta *nr)
       return 1;
   }
 
-  if (	ea_get_int(nr->eattrs, &ea_gen_source, 0)
-     != ea_get_int(or->eattrs, &ea_gen_source, 0))
+  if (	ea_get_int(nr, &ea_gen_source, 0)
+     != ea_get_int(or, &ea_gen_source, 0))
     return 1;
 
   return 0;
@@ -2047,9 +2047,6 @@ again1:
 
     if (nf->n.type) /* Add the route */
     {
-      rta a0 = {
-      };
-
       struct {
 	ea_list l;
 	eattr a[7];
@@ -2066,7 +2063,7 @@ again1:
       eattrs.a[eattrs.l.count++] =
 	EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nf->n.nhs->ad);
 
-      if (reload || ort_changed(nf, &a0))
+      if (reload || ort_changed(nf, &eattrs.l))
       {
 	nf->old_metric1 = nf->n.metric1;
 	nf->old_metric2 = nf->n.metric2;
@@ -2088,24 +2085,25 @@ again1:
 	  EA_LITERAL_EMBEDDED(&ea_ospf_router_id, 0, nf->n.rid);
 
 	ASSERT_DIE(ARRAY_SIZE(eattrs.a) >= eattrs.l.count);
-	a0.eattrs = &eattrs.l;
 
-	rta *a = rta_lookup(&a0);
+	ea_list *a = rta_lookup(&eattrs.l);
 	rte *e = rte_get_temp(a, p->p.main_source);
 
-	rta_free(nf->old_rta);
-	nf->old_rta = rta_clone(a);
+	rta_free(nf->old_ea);
+	nf->old_ea = rta_clone(a);
 
+	/*
 	DBG("Mod rte type %d - %N via %I on iface %s, met %d\n",
 	    a0.source, nf->fn.addr, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1);
+	    */
 	rte_update(&p->p, nf->fn.addr, e);
       }
     }
-    else if (nf->old_rta)
+    else if (nf->old_ea)
     {
       /* Remove the route */
-      rta_free(nf->old_rta);
-      nf->old_rta = NULL;
+      rta_free(nf->old_ea);
+      nf->old_ea = NULL;
 
       rte_update(&p->p, nf->fn.addr, NULL);
     }
diff --git a/proto/ospf/rt.h b/proto/ospf/rt.h
index 180216b7..88eefef9 100644
--- a/proto/ospf/rt.h
+++ b/proto/ospf/rt.h
@@ -78,7 +78,7 @@ typedef struct ort
    */
   orta n;
   u32 old_metric1, old_metric2, old_tag, old_rid;
-  rta *old_rta;
+  ea_list *old_ea;
   u32 lsa_id;
   u8 external_rte;
   u8 area_net;
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 09ec9f28..e3dd0885 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -1337,9 +1337,9 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   ASSERT(p->asbr);
 
   /* Get route attributes */
-  rta *a = new->attrs;
-  eattr *m1a = ea_find(a->eattrs, &ea_ospf_metric1);
-  eattr *m2a = ea_find(a->eattrs, &ea_ospf_metric2);
+  ea_list *a = new->attrs;
+  eattr *m1a = ea_find(a, &ea_ospf_metric1);
+  eattr *m2a = ea_find(a, &ea_ospf_metric2);
   uint m1 = m1a ? m1a->u.data : 0;
   uint m2 = m2a ? m2a->u.data : 10000;
 
@@ -1363,10 +1363,10 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
 
   uint ebit = m2a || !m1a;
   uint metric = ebit ? m2 : m1;
-  uint tag = ea_get_int(a->eattrs, &ea_ospf_tag, 0);
+  uint tag = ea_get_int(a, &ea_ospf_tag, 0);
 
   ip_addr fwd = IPA_NONE;
-  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(a, &ea_gen_nexthop);
   if (nhea)
   {
     struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index d1ff6adf..17e4041b 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -85,7 +85,7 @@ random_net_ip4(void)
 }
 
 struct perf_random_routes {
-  struct rta *a;
+  ea_list *a;
   net_addr net;
 };
 
@@ -142,10 +142,10 @@ perf_loop(void *data)
     *((net_addr_ip4 *) &(p->data[i].net)) = random_net_ip4();
 
     if (!p->attrs_per_rte || !(i % p->attrs_per_rte)) {
-      struct rta a0 = {};
+      ea_list *ea = NULL;
 
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
-      ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_PERF);
+      ea_set_attr_u32(&ea, &ea_gen_preference, 0, p->p.main_channel->preference);
+      ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_PERF);
 
       struct nexthop_adata nhad = {
 	.nh.iface = p->ifa->iface,
@@ -153,10 +153,10 @@ perf_loop(void *data)
 	.nh.weight = 1,
       };
 
-      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0,
+      ea_set_attr_data(&ea, &ea_gen_nexthop, 0,
 	  &nhad.ad.data, sizeof nhad - sizeof nhad.ad);
 
-      p->data[i].a = rta_lookup(&a0);
+      p->data[i].a = rta_lookup(ea);
     }
     else
       p->data[i].a = rta_clone(p->data[i-1].a);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index e458a238..bdffed3b 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -55,7 +55,6 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
   struct rte_src *src;
 
   rte *e;
-  rta *a;
 
   if (!new && !old)
     return;
@@ -71,11 +70,8 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
     {
       src = new->src;
 
-      a = alloca(rta_size(new->attrs));
-      memcpy(a, new->attrs, rta_size(new->attrs));
-
-      a->cached = 0;
-      ea_unset_attr(&a->eattrs, 0, &ea_gen_hostentry);
+      ea_list *a = new->attrs;
+      ea_unset_attr(&a, 0, &ea_gen_hostentry);
 
       e = rte_get_temp(a, src);
       e->pflags = new->pflags;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 5734dbc9..c0715b68 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -447,11 +447,11 @@ radv_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
   {
     /* Update */
 
-    ea = ea_find(new->attrs->eattrs, &ea_radv_preference);
+    ea = ea_find(new->attrs, &ea_radv_preference);
     uint preference = ea ? ea->u.data : RA_PREF_MEDIUM;
     uint preference_set = !!ea;
 
-    ea = ea_find(new->attrs->eattrs, &ea_radv_lifetime);
+    ea = ea_find(new->attrs, &ea_radv_lifetime);
     uint lifetime = ea ? ea->u.data : 0;
     uint lifetime_set = !!ea;
 
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index a0f2fdc0..ce452ac7 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -151,8 +151,6 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
   if (rt)
   {
     /* Update */
-    rta a0 = {};
-
     struct {
       ea_list l;
       eattr a[3];
@@ -164,7 +162,8 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 	EA_LITERAL_EMBEDDED(&ea_rip_metric, 0, rt->metric),
       },
     };
-    a0.eattrs = &ea_block.l;
+
+    ea_list *ea = &ea_block.l;
 
     u16 rt_tag = rt->tag;
     struct iface *rt_from = NULL;
@@ -203,7 +202,7 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 
       nhad->ad.length = ((void *) nh - (void *) nhad->ad.data);
 
-      ea_set_attr(&a0.eattrs,
+      ea_set_attr(&ea,
 	  EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0,
 	    &(nexthop_sort(nhad, tmp_linpool)->ad)));
     }
@@ -217,22 +216,21 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
 	.nh.iface = rt->from->ifa->iface,
       };
 
-      ea_set_attr_data(&a0.eattrs, &ea_gen_nexthop, 0,
+      ea_set_attr_data(&ea, &ea_gen_nexthop, 0,
 	  &nhad.ad.data, sizeof nhad - sizeof nhad.ad);
-      ea_set_attr_data(&a0.eattrs, &ea_gen_from, 0, &rt->from->nbr->addr, sizeof(ip_addr));
+      ea_set_attr_data(&ea, &ea_gen_from, 0, &rt->from->nbr->addr, sizeof(ip_addr));
     }
 
-    ea_set_attr_u32(&a0.eattrs, &ea_rip_tag, 0, rt_tag);
+    ea_set_attr_u32(&ea, &ea_rip_tag, 0, rt_tag);
 
     struct rip_iface_adata riad = {
       .ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) },
       .iface = rt_from,
     };
-    ea_set_attr(&a0.eattrs,
+    ea_set_attr(&ea,
 	EA_LITERAL_DIRECT_ADATA(&ea_rip_from, 0, &riad.ad));
 
-    rta *a = rta_lookup(&a0);
-    rte *e = rte_get_temp(a, p->p.main_source);
+    rte *e = rte_get_temp(rta_lookup(ea), p->p.main_source);
 
     rte_update(&p->p, en->n.addr, e);
   }
@@ -345,9 +343,9 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
   if (new)
   {
     /* Update */
-    u32 rt_tag = ea_get_int(new->attrs->eattrs, &ea_rip_tag, 0);
-    u32 rt_metric = ea_get_int(new->attrs->eattrs, &ea_rip_metric, 1);
-    const eattr *rie = ea_find(new->attrs->eattrs, &ea_rip_from);
+    u32 rt_tag = ea_get_int(new->attrs, &ea_rip_tag, 0);
+    u32 rt_metric = ea_get_int(new->attrs, &ea_rip_metric, 1);
+    const eattr *rie = ea_find(new->attrs, &ea_rip_from);
     struct iface *rt_from = rie ? ((struct rip_iface_adata *) rie->u.ptr)->iface : NULL;
 
     if (rt_metric > p->infinity)
@@ -381,7 +379,7 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, s
     en->tag = rt_tag;
     en->from = (new->src->proto == P) ? rt_from : NULL;
 
-    eattr *nhea = ea_find(new->attrs->eattrs, &ea_gen_nexthop);
+    eattr *nhea = ea_find(new->attrs, &ea_gen_nexthop);
     if (nhea)
     {
       struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
@@ -1120,8 +1118,8 @@ rip_rte_better(struct rte *new, struct rte *old)
   ASSERT_DIE(new->src == old->src);
   struct rip_proto *p = (struct rip_proto *) new->src->proto;
 
-  u32 new_metric = ea_get_int(new->attrs->eattrs, &ea_rip_metric, p->infinity);
-  u32 old_metric = ea_get_int(old->attrs->eattrs, &ea_rip_metric, p->infinity);
+  u32 new_metric = ea_get_int(new->attrs, &ea_rip_metric, p->infinity);
+  u32 old_metric = ea_get_int(old->attrs, &ea_rip_metric, p->infinity);
 
   return new_metric < old_metric;
 }
@@ -1129,7 +1127,7 @@ rip_rte_better(struct rte *new, struct rte *old)
 static u32
 rip_rte_igp_metric(struct rte *rt)
 {
-  return ea_get_int(rt->attrs->eattrs, &ea_rip_metric, IGP_METRIC_UNKNOWN);
+  return ea_get_int(rt->attrs, &ea_rip_metric, IGP_METRIC_UNKNOWN);
 }
 
 static void
@@ -1230,8 +1228,8 @@ static void
 rip_get_route_info(rte *rte, byte *buf)
 {
   struct rip_proto *p = (struct rip_proto *) rte->src->proto;
-  u32 rt_metric = ea_get_int(rte->attrs->eattrs, &ea_rip_metric, p->infinity);
-  u32 rt_tag = ea_get_int(rte->attrs->eattrs, &ea_rip_tag, 0);
+  u32 rt_metric = ea_get_int(rte->attrs, &ea_rip_metric, p->infinity);
+  u32 rt_tag = ea_get_int(rte->attrs, &ea_rip_tag, 0);
 
   buf += bsprintf(buf, " (%d/%d)", rt_get_preference(rte), rt_metric);
 
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 4318cbb7..2d36f1fb 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -120,13 +120,11 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
 {
   struct rpki_proto *p = cache->p;
 
-  rta a0 = {};
+  ea_list *ea = NULL;
+  ea_set_attr_u32(&ea, &ea_gen_preference, 0, channel->preference);
+  ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_RPKI);
 
-  ea_set_attr_u32(&a0.eattrs, &ea_gen_preference, 0, channel->preference);
-  ea_set_attr_u32(&a0.eattrs, &ea_gen_source, 0, RTS_RPKI);
-
-  rta *a = rta_lookup(&a0);
-  rte *e = rte_get_temp(a, p->p.main_source);
+  rte *e = rte_get_temp(rta_lookup(ea), p->p.main_source);
 
   e->pflags = 0;
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 806849c4..29285d37 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -53,10 +53,10 @@ static inline struct rte_src * static_get_source(struct static_proto *p, uint i)
 static void
 static_announce_rte(struct static_proto *p, struct static_route *r)
 {
-  rta *a = allocz(RTA_MAX_SIZE);
+  ea_list *ea = NULL;
   struct rte_src *src = static_get_source(p, r->index);
-  ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
-  ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_STATIC);
+  ea_set_attr_u32(&ea, &ea_gen_preference, 0, p->p.main_channel->preference);
+  ea_set_attr_u32(&ea, &ea_gen_source, 0, RTS_STATIC);
 
   if (r->dest == RTD_UNICAST)
   {
@@ -92,7 +92,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
       nh = NEXTHOP_NEXT(nh);
     }
 
-    ea_set_attr_data(&a->eattrs, &ea_gen_nexthop, 0,
+    ea_set_attr_data(&ea, &ea_gen_nexthop, 0,
 	nhad->ad.data, (void *) nh - (void *) nhad->ad.data);
   }
 
@@ -102,19 +102,19 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     u32 *labels = r->mls ? (void *) r->mls->data : NULL;
     u32 lnum = r->mls ? r->mls->length / sizeof(u32) : 0;
 
-    ea_set_hostentry(&a->eattrs, p->p.main_channel->table, tab,
+    ea_set_hostentry(&ea, p->p.main_channel->table, tab,
 	r->via, IPA_NONE, lnum, labels);
   }
 
   else if (r->dest)
-    ea_set_dest(&a->eattrs, 0, r->dest);
+    ea_set_dest(&ea, 0, r->dest);
 
   /* Already announced */
   if (r->state == SRS_CLEAN)
     return;
 
   /* We skip rta_lookup() here */
-  rte *e = rte_get_temp(a, src);
+  rte *e = rte_get_temp(ea, src);
   e->pflags = 0;
 
   if (r->cmds)
@@ -407,16 +407,16 @@ static_reload_routes(struct channel *C)
 static int
 static_rte_better(rte *new, rte *old)
 {
-  u32 n = ea_get_int(new->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
-  u32 o = ea_get_int(old->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 n = ea_get_int(new->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 o = ea_get_int(old->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   return n < o;
 }
 
 static int
 static_rte_mergable(rte *pri, rte *sec)
 {
-  u32 a = ea_get_int(pri->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
-  u32 b = ea_get_int(sec->attrs->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 a = ea_get_int(pri->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
+  u32 b = ea_get_int(sec->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   return a == b;
 }
 
@@ -710,7 +710,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src)
 static void
 static_get_route_info(rte *rte, byte *buf)
 {
-  eattr *a = ea_find(rte->attrs->eattrs, &ea_gen_igp_metric);
+  eattr *a = ea_find(rte->attrs, &ea_gen_igp_metric);
   u32 pref = rt_get_preference(rte);
   if (a)
     buf += bsprintf(buf, " (%d/%u)", pref, a->u.data);
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 40f6212e..4cfd7c80 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -111,7 +111,7 @@ struct nl_parse_state
   int merge;
 
   net *net;
-  rta *attrs;
+  ea_list *attrs;
   struct krt_proto *proto;
   s8 new;
   s8 krt_src;
@@ -1407,7 +1407,7 @@ HASH_DEFINE_REHASH_FN(RTH, struct krt_proto)
 int
 krt_capable(rte *e)
 {
-  eattr *ea = ea_find(e->attrs->eattrs, &ea_gen_nexthop);
+  eattr *ea = ea_find(e->attrs, &ea_gen_nexthop);
   if (!ea)
     return 0;
 
@@ -1441,8 +1441,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop_adat
 {
   eattr *ea;
   net *net = e->net;
-  rta *a = e->attrs;
-  ea_list *eattrs = a->eattrs;
+  ea_list *eattrs = e->attrs;
 
   int bufsize = 128 + KRT_METRICS_MAX*8 + (nh ? nh_bufsize(nh) : 0);
   u32 priority = 0;
@@ -1590,10 +1589,10 @@ dest:
 static inline int
 nl_add_rte(struct krt_proto *p, rte *e)
 {
-  rta *a = e->attrs;
+  ea_list *ea = e->attrs;
   int err = 0;
 
-  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(ea, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 
   if (krt_ecmp6(p) && nhad && NEXTHOP_IS_REACHABLE(nhad) && !NEXTHOP_ONE(nhad))
@@ -1641,8 +1640,7 @@ nl_delete_rte(struct krt_proto *p, rte *e)
 static inline int
 nl_replace_rte(struct krt_proto *p, rte *e)
 {
-  rta *a = e->attrs;
-  eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
+  eattr *nhea = ea_find(e->attrs, &ea_gen_nexthop);
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
   return nl_send_route(p, e, NL_OP_REPLACE,
       NEXTHOP_IS_REACHABLE(nhad) ? RTD_UNICAST : nhad->dest, nhad);
@@ -1713,14 +1711,14 @@ nl_announce_route(struct nl_parse_state *s)
   e->net = s->net;
 
   EA_LOCAL_LIST(2) ea = {
-    .l = { .count = 2, .next = e->attrs->eattrs },
+    .l = { .count = 2, .next = e->attrs },
     .a = {
       EA_LITERAL_EMBEDDED(&ea_krt_source, 0, s->krt_proto),
       EA_LITERAL_EMBEDDED(&ea_krt_metric, 0, s->krt_metric),
     },
   };
 
-  e->attrs->eattrs = &ea.l;
+  e->attrs = &ea.l;
 
   if (s->scan)
     krt_got_route(s->proto, e, s->krt_src);
@@ -1888,8 +1886,8 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   if (s->net && !nl_mergable_route(s, net, p, priority, i->rtm_type, i->rtm_family))
     nl_announce_route(s);
 
-  rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
-  ea_set_attr_u32(&ra->eattrs, &ea_gen_source, 0, RTS_INHERIT);
+  ea_list *ra = NULL;
+  ea_set_attr_u32(&ra, &ea_gen_source, 0, RTS_INHERIT);
 
   if (a[RTA_FLOW])
     s->rta_flow = rta_get_u32(a[RTA_FLOW]);
@@ -1914,7 +1912,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 	  if (!nh)
 	    SKIP("strange RTA_MULTIPATH\n");
 
-	  ea_set_attr(&ra->eattrs, EA_LITERAL_DIRECT_ADATA(
+	  ea_set_attr(&ra, EA_LITERAL_DIRECT_ADATA(
 		&ea_gen_nexthop, 0, &nh->ad));
 	  break;
 	}
@@ -2000,20 +1998,20 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     }
 
   if (i->rtm_scope != def_scope)
-    ea_set_attr(&ra->eattrs,
+    ea_set_attr(&ra,
 	EA_LITERAL_EMBEDDED(&ea_krt_scope, 0, i->rtm_scope));
 
   if (a[RTA_PREFSRC])
   {
     ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
 
-    ea_set_attr(&ra->eattrs,
+    ea_set_attr(&ra,
 	EA_LITERAL_STORE_ADATA(&ea_krt_prefsrc, 0, &ps, sizeof(ps)));
   }
 
   /* Can be set per-route or per-nexthop */
   if (s->rta_flow)
-    ea_set_attr(&ra->eattrs,
+    ea_set_attr(&ra,
 	EA_LITERAL_EMBEDDED(&ea_krt_realm, 0, s->rta_flow));
 
   if (a[RTA_METRICS])
@@ -2027,7 +2025,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
 
       for (uint t = 1; t < KRT_METRICS_MAX; t++)
 	if (metrics[0] & (1 << t))
-	  ea_set_attr(&ra->eattrs,
+	  ea_set_attr(&ra,
 	      EA_LITERAL_EMBEDDED(&ea_krt_metrics[t], 0, metrics[t]));
     }
 
@@ -2045,7 +2043,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     s->net = net;
     s->attrs = ra;
 
-    ea_set_attr_data(&ra->eattrs, &ea_gen_nexthop, 0,
+    ea_set_attr_data(&ra, &ea_gen_nexthop, 0,
 	nhad.ad.data, nhad.ad.length);
 
     s->proto = p;
@@ -2058,17 +2056,17 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
   else
   {
     /* Merge next hops with the stored route */
-    eattr *nhea = ea_find(s->attrs->eattrs, &ea_gen_nexthop);
+    eattr *nhea = ea_find(s->attrs, &ea_gen_nexthop);
     struct nexthop_adata *nhad_old = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 
     if (nhad_old)
-      ea_set_attr(&s->attrs->eattrs,
+      ea_set_attr(&s->attrs,
 	  EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, 
 	    &(nexthop_merge(nhad_old, &nhad.nhad,
 		KRT_CF->merge_paths, s->pool)->ad)
 	  ));
     else
-      ea_set_attr_data(&s->attrs->eattrs, &ea_gen_nexthop, 0,
+      ea_set_attr_data(&s->attrs, &ea_gen_nexthop, 0,
 	  nhad.ad.data, nhad.ad.length);
   }
 }
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index a0789936..3edbdfa2 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -286,7 +286,7 @@ static struct tbf rl_alien = TBF_DEFAULT_LOG_LIMITS;
 static inline u32
 krt_metric(rte *a)
 {
-  eattr *ea = ea_find(a->attrs->eattrs, &ea_krt_metric);
+  eattr *ea = ea_find(a->attrs, &ea_krt_metric);
   return ea ? ea->u.data : 0;
 }
 
@@ -306,8 +306,7 @@ static void
 krt_learn_announce_update(struct krt_proto *p, rte *e)
 {
   net *n = e->net;
-  rta *aa = rta_clone(e->attrs);
-  rte *ee = rte_get_temp(aa, p->p.main_source);
+  rte *ee = rte_get_temp(ea_clone(e->attrs), p->p.main_source);
   rte_update(&p->p, n->n.addr, ee);
 }
 
@@ -437,10 +436,9 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
   net *n = net_get(p->krt_table, n0->n.addr);
   rte *g, **gg, *best, **bestp, *old_best;
 
-  ASSERT(!e->attrs->cached);
-  ea_set_attr_u32(&e->attrs->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
-
-  e->attrs = rta_lookup(e->attrs);
+  ea_list *ea = e->attrs;
+  ea_set_attr_u32(&ea, &ea_gen_preference, 0, p->p.main_channel->preference);
+  e->attrs = rta_lookup(ea);
 
   old_best = n->routes;
   for(gg=&n->routes; g = *gg; gg = &g->next)
@@ -606,10 +604,10 @@ reject:
 static int
 krt_same_dest(rte *k, rte *e)
 {
-  rta *ka = k->attrs, *ea = e->attrs;
+  ea_list *ka = k->attrs, *ea = e->attrs;
 
-  eattr *nhea_k = ea_find(ka->eattrs, &ea_gen_nexthop);
-  eattr *nhea_e = ea_find(ea->eattrs, &ea_gen_nexthop);
+  eattr *nhea_k = ea_find(ka, &ea_gen_nexthop);
+  eattr *nhea_e = ea_find(ea, &ea_gen_nexthop);
 
   return (!nhea_k == !nhea_e) && adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
 }

From 8fd3811d9d29d73570e03147eb024a4e5fde199b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Jun 2022 12:18:23 +0200
Subject: [PATCH 139/431] Fixing FlowSpec validation for v3 internal API

Validation is called internally from route table at the same place where
nexthop resolution is done. Also accounting for rte->sender semantics
change (not a channel but the import hook instead).
---
 nest/rt-table.c     | 45 +++++++++++++++++++++++++++++++++++++++++----
 proto/bgp/attrs.c   | 39 +++++++++++++++++++++------------------
 proto/bgp/packets.c | 23 -----------------------
 3 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8677c177..491ae1d9 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -122,6 +122,7 @@ static void rt_notify_hostcache(rtable *tab, net *net);
 static void rt_update_hostcache(rtable *tab);
 static void rt_next_hop_update(rtable *tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
+static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_flowspec_notify(rtable *tab, net *net);
@@ -1570,7 +1571,10 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
 	}
 
       if (new)
-	rt_next_hop_resolve_rte(new);
+	if (net_is_flow(n))
+	  rt_flowspec_resolve_rte(new, c);
+	else
+	  rt_next_hop_resolve_rte(new);
 
       if (new && !rte_validate(c, new))
 	{
@@ -2804,7 +2808,7 @@ rt_flowspec_update_rte(rtable *tab, net *n, rte *r)
   if (rt_get_source_attr(r) != RTS_BGP)
     return NULL;
 
-  struct bgp_channel *bc = (struct bgp_channel *) r->sender;
+  struct bgp_channel *bc = (struct bgp_channel *) SKIP_BACK(struct channel, in_req, r->sender->req);
   if (!bc->base_table)
     return NULL;
 
@@ -2816,7 +2820,7 @@ rt_flowspec_update_rte(rtable *tab, net *n, rte *r)
     return NULL;
 
   rta *a = alloca(RTA_MAX_SIZE);
-  memcpy(a, r->attrs, rta_size(r->attrs));
+  *a = *r->attrs;
   a->dest = dest;
   a->cached = 0;
 
@@ -2830,6 +2834,35 @@ rt_flowspec_update_rte(rtable *tab, net *n, rte *r)
 #endif
 }
 
+static inline void
+rt_flowspec_resolve_rte(rte *r, struct channel *c)
+{
+#ifdef CONFIG_BGP
+  if (rt_get_source_attr(r) != RTS_BGP)
+    return;
+
+  struct bgp_channel *bc = (struct bgp_channel *) c;
+  if (!bc->base_table)
+    return;
+
+  struct bgp_proto *p = (void *) r->src->proto;
+  int valid = rt_flowspec_check(bc->base_table, c->in_req.hook->table, r->net, r->attrs, p->is_interior);
+  int dest = valid ? RTD_NONE : RTD_UNREACHABLE;
+
+  if (dest == r->attrs->dest)
+    return;
+
+  if (r->attrs->cached)
+  {
+    rta *a = tmp_alloc(RTA_MAX_SIZE);
+    *a = *r->attrs;
+    a->cached = 0;
+    r->attrs = a;
+  }
+
+  r->attrs->dest = dest;
+#endif
+}
 
 static inline int
 rt_next_hop_update_net(rtable *tab, net *n)
@@ -2861,6 +2894,9 @@ rt_next_hop_update_net(rtable *tab, net *n)
 	  ? rt_flowspec_update_rte(tab, n, &e->rte)
 	  : rt_next_hop_update_rte(tab, n, &e->rte);
 
+	if (!new)
+	  continue;
+
 	/* Call a pre-comparison hook */
 	/* Not really an efficient way to compute this */
 	if (e->rte.src->proto->rte_recalculate)
@@ -2876,7 +2912,8 @@ rt_next_hop_update_net(rtable *tab, net *n)
 	*k = e = new;
       }
 
-  ASSERT_DIE(pos == count);
+  ASSERT_DIE(pos <= count);
+  count = pos;
 
   /* Find the new best route */
   struct rte_storage **new_best = NULL;
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 11b1c728..ccfda4df 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2390,25 +2390,28 @@ bgp_get_route_info(rte *e, byte *buf)
 
   buf += bsprintf(buf, " (%d", rt_get_preference(e));
 
-  if (e->pflags & BGP_REF_SUPPRESSED)
-    buf += bsprintf(buf, "-");
-
-  if (rte_stale(e))
-    buf += bsprintf(buf, "s");
-
-  u64 metric = bgp_total_aigp_metric(e);
-  if (metric < BGP_AIGP_MAX)
+  if (!net_is_flow(e->net))
   {
-    buf += bsprintf(buf, "/%lu", metric);
-  }
-  else if (metric = rt_get_igp_metric(e))
-  {
-    if (!rta_resolvable(e->attrs))
-      buf += bsprintf(buf, "/-");
-    else if (metric >= IGP_METRIC_UNKNOWN)
-      buf += bsprintf(buf, "/?");
-    else
-      buf += bsprintf(buf, "/%d", metric);
+    if (e->pflags & BGP_REF_SUPPRESSED)
+      buf += bsprintf(buf, "-");
+
+    if (rte_stale(e))
+      buf += bsprintf(buf, "s");
+
+    u64 metric = bgp_total_aigp_metric(e);
+    if (metric < BGP_AIGP_MAX)
+    {
+      buf += bsprintf(buf, "/%lu", metric);
+    }
+    else if (metric = rt_get_igp_metric(e))
+    {
+      if (!rta_resolvable(e->attrs))
+	buf += bsprintf(buf, "/-");
+      else if (metric >= IGP_METRIC_UNKNOWN)
+	buf += bsprintf(buf, "/?");
+      else
+	buf += bsprintf(buf, "/%d", metric);
+    }
   }
   buf += bsprintf(buf, ") [");
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index ce2848c0..06b563b0 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1035,21 +1035,6 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, rta *a, u32 lnum, u32 labels[ln
   }
 }
 
-static void
-bgp_apply_flow_validation(struct bgp_parse_state *s, const net_addr *n, rta *a)
-{
-  struct bgp_channel *c = s->channel;
-  int valid = rt_flowspec_check(c->base_table, c->c.table, n, a, s->proto->is_interior);
-  a->dest = valid ? RTD_NONE : RTD_UNREACHABLE;
-
-  /* Invalidate cached rta if dest changes */
-  if (s->cached_rta && (s->cached_rta->dest != a->dest))
-  {
-    rta_free(s->cached_rta);
-    s->cached_rta = NULL;
-  }
-}
-
 static int
 bgp_match_src(struct bgp_export_state *s, int mode)
 {
@@ -1928,10 +1913,6 @@ bgp_decode_nlri_flow4(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
     net_fill_flow4(n, px, pxlen, pos, flen);
     ADVANCE(pos, len, flen);
 
-    /* Apply validation procedure per RFC 8955 (6) */
-    if (a && s->channel->cf->validate)
-      bgp_apply_flow_validation(s, n, a);
-
     bgp_rte_update(s, n, path_id, a);
   }
 }
@@ -2020,10 +2001,6 @@ bgp_decode_nlri_flow6(struct bgp_parse_state *s, byte *pos, uint len, rta *a)
     net_fill_flow6(n, px, pxlen, pos, flen);
     ADVANCE(pos, len, flen);
 
-    /* Apply validation procedure per RFC 8955 (6) */
-    if (a && s->channel->cf->validate)
-      bgp_apply_flow_validation(s, n, a);
-
     bgp_rte_update(s, n, path_id, a);
   }
 }

From 54d94f4b1a5b9d8f2943236323d789290bb7bb2f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 16 Jun 2022 12:39:08 +0200
Subject: [PATCH 140/431] Showing the nexthop resolution target in import
 tables

---
 nest/rt-show.c  | 16 ++++++++++++++--
 proto/bgp/bgp.h |  3 +++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/nest/rt-show.c b/nest/rt-show.c
index f3852d17..35036fe6 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -71,8 +71,13 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   if (d->last_table != d->tab)
     rt_show_table(c, d);
 
-  cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, 
-      net_is_flow(e->net) ? flowspec_valid_name(flowspec_valid) : rta_dest_name(dest),
+  eattr *heea;
+  struct hostentry_adata *had = NULL;
+  if (!net_is_flow(e->net) && (dest == RTD_NONE) && (heea = ea_find(a, &ea_gen_hostentry)))
+    had = (struct hostentry_adata *) heea->u.ptr;
+
+  cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia,
+      net_is_flow(e->net) ? flowspec_valid_name(flowspec_valid) : had ? "recursive" : rta_dest_name(dest),
       e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
   if (dest == RTD_UNICAST)
@@ -100,6 +105,13 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 	cli_printf(c, -1007, "\tdev %s%s%s",
 		   nh->iface->name, mpls,  onlink, weight);
     }
+  else if (had)
+    {
+      if (ipa_nonzero(had->he->link) && !ipa_equal(had->he->link, had->he->addr))
+	cli_printf(c, -1007, "\tvia %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
+      else
+	cli_printf(c, -1007, "\tvia %I table %s", had->he->addr, had->he->tab->name);
+    }
 
   if (d->verbose)
     ea_show_list(c, a);
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index b3966bc3..cca7873a 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -520,6 +520,9 @@ static inline int
 rte_resolvable(const rte *rt)
 {
   eattr *nhea = ea_find(rt->attrs, &ea_gen_nexthop);
+  if (!nhea)
+    return 0;
+
   struct nexthop_adata *nhad = (void *) nhea->u.ptr;
   return NEXTHOP_IS_REACHABLE(nhad) || (nhad->dest != RTD_UNREACHABLE);
 }

From 8c92f47ac77f267368b6d6bd161689a0c0bc5e5a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 16 Jun 2022 23:24:53 +0200
Subject: [PATCH 141/431] Route attribute storage keeps the previous layers

---
 lib/attrs.h       |  2 +-
 lib/route.h       |  4 +--
 nest/rt-attr.c    | 74 ++++++++++++++++++++++++++++++-----------------
 nest/rt-show.c    |  2 +-
 proto/bgp/attrs.c |  4 +--
 proto/mrt/mrt.c   |  2 +-
 6 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/lib/attrs.h b/lib/attrs.h
index 79b7b14a..a75abcd3 100644
--- a/lib/attrs.h
+++ b/lib/attrs.h
@@ -42,7 +42,7 @@ lp_store_adata(struct linpool *pool, const void *buf, uint len)
 #define tmp_copy_adata(ad)	  tmp_store_adata((ad)->data, (ad)->length)
 
 static inline int adata_same(const struct adata *a, const struct adata *b)
-{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
+{ return (!a && !b) || (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
 
 
 
diff --git a/lib/route.h b/lib/route.h
index 1b2f4de6..7e28b91e 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -237,7 +237,7 @@ ea_list *ea_append(ea_list *to, ea_list *what);
 void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
 
 /* Normalize ea_list; allocates the result from tmp_linpool */
-ea_list *ea_normalize(const ea_list *e);
+ea_list *ea_normalize(ea_list *e, int overlay);
 
 uint ea_list_size(ea_list *);
 void ea_list_copy(ea_list *dest, ea_list *src, uint size);
@@ -414,7 +414,7 @@ static inline int rte_dest(const rte *r)
 
 void rta_init(void);
 ea_list *ea_lookup(ea_list *);		/* Get a cached (and normalized) variant of this attribute list */
-static inline int ea_is_cached(ea_list *r) { return r->flags & EALF_CACHED; }
+static inline int ea_is_cached(const ea_list *r) { return r->flags & EALF_CACHED; }
 static inline ea_list *ea_clone(ea_list *r) { r->uc++; return r; }
 void ea__free(ea_list *r);
 static inline void ea_free(ea_list *r) { if (r && !--r->uc) ea__free(r); }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 31e2057e..c0f81b9d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -726,8 +726,8 @@ ea_do_prune(ea_list *e)
 	s++;
 
       /* Now s0 is the most recent version, s[-1] the oldest one */
-      /* Drop undefs */
-      if (s0->undef)
+      /* Drop undefs unless this is a true overlay */
+      if (s0->undef && !e->next)
 	continue;
 
       /* Copy the newest version to destination */
@@ -760,18 +760,15 @@ ea_do_prune(ea_list *e)
 static void
 ea_sort(ea_list *e)
 {
-  while (e)
-    {
-      if (!(e->flags & EALF_SORTED))
-	{
-	  ea_do_sort(e);
-	  ea_do_prune(e);
-	  e->flags |= EALF_SORTED;
-	}
-      if (e->count > 5)
-	e->flags |= EALF_BISECT;
-      e = e->next;
-    }
+  if (!(e->flags & EALF_SORTED))
+  {
+    ea_do_sort(e);
+    ea_do_prune(e);
+    e->flags |= EALF_SORTED;
+  }
+
+  if (e->count > 5)
+    e->flags |= EALF_BISECT;
 }
 
 /**
@@ -782,7 +779,7 @@ ea_sort(ea_list *e)
  * a given &ea_list after merging with ea_merge().
  */
 static unsigned
-ea_scan(const ea_list *e)
+ea_scan(const ea_list *e, int overlay)
 {
   unsigned cnt = 0;
 
@@ -790,6 +787,8 @@ ea_scan(const ea_list *e)
     {
       cnt += e->count;
       e = e->next;
+      if (e && overlay && ea_is_cached(e))
+	break;
     }
   return sizeof(ea_list) + sizeof(eattr)*cnt;
 }
@@ -809,27 +808,32 @@ ea_scan(const ea_list *e)
  * by calling ea_sort().
  */
 static void
-ea_merge(const ea_list *e, ea_list *t)
+ea_merge(ea_list *e, ea_list *t, int overlay)
 {
   eattr *d = t->attrs;
 
   t->flags = 0;
   t->count = 0;
-  t->next = NULL;
+
   while (e)
     {
       memcpy(d, e->attrs, sizeof(eattr)*e->count);
       t->count += e->count;
       d += e->count;
       e = e->next;
+
+      if (e && overlay && ea_is_cached(e))
+	break;
     }
+
+  t->next = e;
 }
 
 ea_list *
-ea_normalize(const ea_list *e)
+ea_normalize(ea_list *e, int overlay)
 {
-  ea_list *t = tmp_alloc(ea_scan(e));
-  ea_merge(e, t);
+  ea_list *t = tmp_alloc(ea_scan(e, overlay));
+  ea_merge(e, t, overlay);
   ea_sort(t);
 
   return t->count ? t : NULL;
@@ -850,7 +854,8 @@ ea_same(ea_list *x, ea_list *y)
 
   if (!x || !y)
     return x == y;
-  ASSERT(!x->next && !y->next);
+  if (x->next != y->next)
+    return 0;
   if (x->count != y->count)
     return 0;
   for(c=0; c<x->count; c++)
@@ -876,13 +881,12 @@ ea_list_size(ea_list *o)
   unsigned i, elen;
 
   ASSERT_DIE(o);
-  ASSERT_DIE(!o->next);
   elen = BIRD_CPU_ALIGN(sizeof(ea_list) + sizeof(eattr) * o->count);
 
   for(i=0; i<o->count; i++)
     {
       eattr *a = &o->attrs[i];
-      if (!(a->type & EAF_EMBEDDED))
+      if (!a->undef && !(a->type & EAF_EMBEDDED))
 	elen += ADATA_SIZE(a->u.ptr->length);
     }
 
@@ -899,7 +903,7 @@ ea_list_copy(ea_list *n, ea_list *o, uint elen)
   for(uint i=0; i<o->count; i++)
     {
       eattr *a = &n->attrs[i];
-      if (!(a->type & EAF_EMBEDDED))
+      if (!a->undef && !(a->type & EAF_EMBEDDED))
 	{
 	  unsigned size = ADATA_SIZE(a->u.ptr->length);
 	  ASSERT_DIE(adpos + size <= elen);
@@ -923,12 +927,21 @@ ea_list_ref(ea_list *l)
       eattr *a = &l->attrs[i];
       ASSERT_DIE(a->id < ea_class_max);
 
+      if (a->undef)
+	continue;
+
       struct ea_class *cl = ea_class_global[a->id];
       ASSERT_DIE(cl && cl->uc);
 
       CALL(cl->stored, a);
       cl->uc++;
     }
+
+  if (l->next)
+  {
+    ASSERT_DIE(ea_is_cached(l->next));
+    ea_clone(l->next);
+  }
 }
 
 static void
@@ -939,6 +952,9 @@ ea_list_unref(ea_list *l)
       eattr *a = &l->attrs[i];
       ASSERT_DIE(a->id < ea_class_max);
 
+      if (a->undef)
+	continue;
+
       struct ea_class *cl = ea_class_global[a->id];
       ASSERT_DIE(cl && cl->uc);
 
@@ -946,6 +962,9 @@ ea_list_unref(ea_list *l)
       if (!--cl->uc)
 	ea_class_free(cl);
     }
+
+  if (l->next)
+    ea_free(l->next);
 }
 
 void
@@ -1183,11 +1202,13 @@ ea_hash(ea_list *e)
 
   if (e)			/* Assuming chain of length 1 */
     {
-      ASSERT_DIE(!e->next);
+      h ^= mem_hash(&e->next, sizeof(e->next));
       for(i=0; i<e->count; i++)
 	{
 	  struct eattr *a = &e->attrs[i];
 	  h ^= a->id; h *= mul;
+	  if (a->undef)
+	    continue;
 	  if (a->type & EAF_EMBEDDED)
 	    h ^= a->u.data;
 	  else
@@ -1295,7 +1316,7 @@ ea_lookup(ea_list *o)
   uint h;
 
   ASSERT(!ea_is_cached(o));
-  o = ea_normalize(o);
+  o = ea_normalize(o, 1);
   h = ea_hash(o);
 
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next_hash)
@@ -1328,7 +1349,6 @@ ea__free(ea_list *a)
   if (a->next_hash)
     a->next_hash->pprev_hash = a->pprev_hash;
 
-  ASSERT(!a->next);
   ea_list_unref(a);
   mb_free(a);
 }
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 35036fe6..8bf74754 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -60,7 +60,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 
   /* Need to normalize the extended attributes */
   if (d->verbose && !rta_is_cached(a) && a)
-    a = ea_normalize(a);
+    a = ea_normalize(a, 0);
 
   get_route_info = e->src->proto->proto->get_route_info;
   if (get_route_info)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 6d33ef2e..46e949bf 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1253,10 +1253,10 @@ bgp_export_attr(struct bgp_export_state *s, eattr *a, ea_list *to)
  * Result: one sorted attribute list segment, or NULL if attributes are unsuitable.
  */
 static inline ea_list *
-bgp_export_attrs(struct bgp_export_state *s, const ea_list *a)
+bgp_export_attrs(struct bgp_export_state *s, ea_list *a)
 {
   /* Merge the attribute list */
-  ea_list *new = ea_normalize(a);
+  ea_list *new = ea_normalize(a, 0);
   ASSERT_DIE(new);
 
   uint i, count;
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index fcc1dcfe..fcbe317b 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -431,7 +431,7 @@ mrt_rib_table_entry_bgp_attrs(struct mrt_table_dump_state *s, rte *r)
 
   /* Attribute list must be normalized for bgp_encode_attrs() */
   if (!rta_is_cached(r->attrs))
-    eattrs = ea_normalize(eattrs);
+    eattrs = ea_normalize(eattrs, 0);
 
   mrt_buffer_need(b, MRT_ATTR_BUFFER_SIZE);
   byte *pos = b->pos;

From becab5072d6d84d6f9c9402387a9e1c14dcc384d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 16 Jun 2022 23:24:56 +0200
Subject: [PATCH 142/431] Import tables are stored as an attribute layer inside
 the main tables.

The separate import tables were too memory-greedy, there is no need for
them being stored as full-sized tables.
---
 lib/route.h         |   3 +-
 nest/config.Y       |  13 +++-
 nest/proto.c        |  77 ++++++++++---------
 nest/protocol.h     |  16 ++--
 nest/rt-attr.c      |   4 +-
 nest/rt-show.c      |  12 ++-
 nest/rt-table.c     | 181 ++++++--------------------------------------
 nest/rt.h           |   1 +
 proto/bgp/bgp.c     |  12 +--
 proto/bgp/packets.c |   2 +-
 proto/ospf/rt.c     |   2 +-
 proto/perf/perf.c   |   2 +-
 proto/pipe/pipe.c   |   2 +-
 13 files changed, 101 insertions(+), 226 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 7e28b91e..f7b089d9 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -161,6 +161,7 @@ typedef struct ea_list {
 #define EALF_SORTED 1			/* Attributes are sorted by code */
 #define EALF_BISECT 2			/* Use interval bisection for searching */
 #define EALF_CACHED 4			/* List is cached */
+#define EALF_OVERLAY  8			/* List is an overlay in the same table */
 
 struct ea_class {
 #define EA_CLASS_INSIDE \
@@ -413,7 +414,7 @@ static inline int rte_dest(const rte *r)
 }
 
 void rta_init(void);
-ea_list *ea_lookup(ea_list *);		/* Get a cached (and normalized) variant of this attribute list */
+ea_list *ea_lookup(ea_list *, int overlay);		/* Get a cached (and normalized) variant of this attribute list */
 static inline int ea_is_cached(const ea_list *r) { return r->flags & EALF_CACHED; }
 static inline ea_list *ea_clone(ea_list *r) { r->uc++; return r; }
 void ea__free(ea_list *r);
diff --git a/nest/config.Y b/nest/config.Y
index 2d73b4c7..ea7e1266 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -311,7 +311,14 @@ channel_item_:
  | IMPORT LIMIT limit_spec { this_channel->in_limit = $3; }
  | EXPORT LIMIT limit_spec { this_channel->out_limit = $3; }
  | PREFERENCE expr { this_channel->preference = $2; check_u16($2); }
- | IMPORT KEEP FILTERED bool { this_channel->in_keep_filtered = $4; }
+ | IMPORT KEEP FILTERED bool {
+     if ($4)
+       this_channel->in_keep |= RIK_REJECTED;
+     else if ((this_channel->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
+       cf_error("Import keep filtered is implied by the import table.");
+     else
+       this_channel->in_keep &= ~RIK_REJECTED;
+   }
  | RPKI RELOAD bool { this_channel->rpki_reload = $3; }
  ;
 
@@ -674,8 +681,8 @@ r_args:
      $$->tables_defined_by = RSD_TDB_ALL;
    }
  | r_args IMPORT TABLE channel_arg {
-     if (!$4->in_table) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->in_table);
+     if (!($4->in_keep & RIK_PREFILTER)) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
+     rt_show_add_table($$, $4->table)->prefilter = $4;
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
diff --git a/nest/proto.c b/nest/proto.c
index 77817888..5e67d940 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -224,7 +224,7 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->preference = cf->preference;
   c->debug = cf->debug;
   c->merge_limit = cf->merge_limit;
-  c->in_keep_filtered = cf->in_keep_filtered;
+  c->in_keep = cf->in_keep;
   c->rpki_reload = cf->rpki_reload;
 
   c->channel_state = CS_DOWN;
@@ -294,7 +294,7 @@ static void
 channel_roa_in_changed(struct rt_subscription *s)
 {
   struct channel *c = s->data;
-  int active = c->reload_event && ev_active(c->reload_event);
+  int active = !!c->reload_req.hook;
 
   CD(c, "Reload triggered by RPKI change%s", active ? " - already active" : "");
 
@@ -379,7 +379,7 @@ channel_roa_subscribe_filter(struct channel *c, int dir)
 #ifdef CONFIG_BGP
   /* No automatic reload for BGP channels without in_table / out_table */
   if (c->channel == &channel_bgp)
-    valid = dir ? !!c->in_table : !!c->out_table;
+    valid = dir ? ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER) : !!c->out_table;
 #endif
 
   struct filter_iterator fit;
@@ -534,9 +534,6 @@ channel_import_stopped(struct rt_import_request *req)
 
   req->hook = NULL;
 
-  if (c->in_table)
-    rt_prune_sync(c->in_table, 1);
-
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
 
@@ -603,43 +600,48 @@ channel_schedule_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
 
-  rt_reload_channel_abort(c);
-  ev_schedule_work(c->reload_event);
+  rt_request_export(c->table, &c->reload_req);
 }
 
 static void
-channel_reload_loop(void *ptr)
+channel_reload_stopped(struct rt_export_request *req)
 {
-  struct channel *c = ptr;
-
-  /* Start reload */
-  if (!c->reload_active)
-    c->reload_pending = 0;
-
-  if (!rt_reload_channel(c))
-  {
-    ev_schedule_work(c->reload_event);
-    return;
-  }
+  struct channel *c = SKIP_BACK(struct channel, reload_req, req);
 
   /* Restart reload */
   if (c->reload_pending)
     channel_request_reload(c);
 }
 
+static void
+channel_reload_log_state_change(struct rt_export_request *req, u8 state)
+{
+  if (state == TES_READY)
+    rt_stop_export(req, channel_reload_stopped);
+}
+
+static void
+channel_reload_dump_req(struct rt_export_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, reload_req, req);
+  debug("  Channel %s.%s import reload request %p\n", c->proto->name, c->name, req);
+}
+
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
 /* Called by protocol to activate in_table */
 void
 channel_setup_in_table(struct channel *c)
 {
-  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
+  c->reload_req = (struct rt_export_request) {
+    .name = mb_sprintf(c->proto->pool, "%s.%s.import", c->proto->name, c->name),
+    .trace_routes = c->debug | c->proto->debug,
+    .export_bulk = channel_reload_export_bulk,
+    .dump_req = channel_reload_dump_req,
+    .log_state_change = channel_reload_log_state_change,
+  };
 
-  cf->name = "import";
-  cf->addr_type = c->net_type;
-  cf->internal = 1;
-
-  c->in_table = rt_setup(c->proto->pool, cf);
-
-  c->reload_event = ev_new_init(c->proto->pool, channel_reload_loop, c);
+  c->in_keep |= RIK_PREFILTER;
 }
 
 /* Called by protocol to activate out_table */
@@ -680,10 +682,10 @@ static void
 channel_do_pause(struct channel *c)
 {
   /* Need to abort feeding */
-  if (c->reload_event)
+  if (c->reload_req.hook)
   {
-    ev_postpone(c->reload_event);
-    rt_reload_channel_abort(c);
+    c->reload_pending = 0;
+    rt_stop_export(&c->reload_req, channel_reload_stopped);
   }
 
   /* Stop export */
@@ -710,15 +712,13 @@ channel_do_stop(struct channel *c)
   CALL(c->channel->shutdown, c);
 
   /* This have to be done in here, as channel pool is freed before channel_do_down() */
-  c->in_table = NULL;
-  c->reload_event = NULL;
   c->out_table = NULL;
 }
 
 static void
 channel_do_down(struct channel *c)
 {
-  ASSERT(!c->reload_active);
+  ASSERT(!c->reload_req.hook);
 
   c->proto->active_channels--;
 
@@ -726,8 +726,6 @@ channel_do_down(struct channel *c)
   memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
   memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
 
-  c->in_table = NULL;
-  c->reload_event = NULL;
   c->out_table = NULL;
 
   /* The in_table and out_table are going to be freed by freeing their resource pools. */
@@ -922,7 +920,9 @@ int
 channel_reconfigure(struct channel *c, struct channel_config *cf)
 {
   /* FIXME: better handle these changes, also handle in_keep_filtered */
-  if ((c->table != cf->table->table) || (cf->ra_mode && (c->ra_mode != cf->ra_mode)))
+  if ((c->table != cf->table->table) ||
+      (cf->ra_mode && (c->ra_mode != cf->ra_mode)) ||
+      (cf->in_keep != c->in_keep))
     return 0;
 
   /* Note that filter_same() requires arguments in (new, old) order */
@@ -949,7 +949,6 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   c->preference = cf->preference;
   c->debug = cf->debug;
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
-  c->in_keep_filtered = cf->in_keep_filtered;
   c->rpki_reload = cf->rpki_reload;
 
   /* Execute channel-specific reconfigure hook */
@@ -2099,7 +2098,7 @@ channel_show_stats(struct channel *c)
   u32 in_routes = c->in_limit.count;
   u32 out_routes = c->out_limit.count;
 
-  if (c->in_keep_filtered)
+  if (c->in_keep)
     cli_msg(-1006, "    Routes:         %u imported, %u filtered, %u exported, %u preferred",
 	    in_routes, (rx_routes - in_routes), out_routes, SRI(pref));
   else
diff --git a/nest/protocol.h b/nest/protocol.h
index aeb60ac6..b482ed99 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -454,7 +454,7 @@ struct channel_config {
   const struct filter *in_filter, *out_filter; /* Attached filters */
 
   struct channel_limit rx_limit;	/* Limit for receiving routes from protocol
-					   (relevant when in_keep_filtered is active) */
+					   (relevant when in_keep & RIK_REJECTED) */
   struct channel_limit in_limit;	/* Limit for importing routes from protocol */
   struct channel_limit out_limit;	/* Limit for exporting routes to protocol */
 
@@ -463,7 +463,7 @@ struct channel_config {
   u16 preference;			/* Default route preference */
   u32 debug;				/* Debugging flags (D_*) */
   u8 merge_limit;			/* Maximal number of nexthops for RA_MERGED */
-  u8 in_keep_filtered;			/* Routes rejected in import filter are kept */
+  u8 in_keep;				/* Which states of routes to keep (RIK_*) */
   u8 rpki_reload;			/* RPKI changes trigger channel reload */
 };
 
@@ -480,7 +480,7 @@ struct channel {
   struct bmap export_map;		/* Keeps track which routes were really exported */
   struct bmap export_reject_map;	/* Keeps track which routes were rejected by export filter */
 
-  struct limit rx_limit;		/* Receive limit (for in_keep_filtered) */
+  struct limit rx_limit;		/* Receive limit (for in_keep & RIK_REJECTED) */
   struct limit in_limit;		/* Input limit */
   struct limit out_limit;		/* Output limit */
 
@@ -517,7 +517,7 @@ struct channel {
   u16 preference;			/* Default route preference */
   u32 debug;				/* Debugging flags (D_*) */
   u8 merge_limit;			/* Maximal number of nexthops for RA_MERGED */
-  u8 in_keep_filtered;			/* Routes rejected in import filter are kept */
+  u8 in_keep;				/* Which states of routes to keep (RIK_*) */
   u8 disabled;
   u8 stale;				/* Used in reconfiguration */
 
@@ -529,11 +529,7 @@ struct channel {
 
   btime last_state_change;		/* Time of last state transition */
 
-  struct rtable *in_table;		/* Internal table for received routes */
-  struct event *reload_event;		/* Event responsible for reloading from in_table */
-  struct fib_iterator reload_fit;	/* FIB iterator in in_table used during reloading */
-  struct rte_storage *reload_next_rte;	/* Route iterator in in_table used during reloading */
-  u8 reload_active;			/* Iterator reload_fit is linked */
+  struct rt_export_request reload_req;	/* Feeder for import reload */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
@@ -544,6 +540,8 @@ struct channel {
   list roa_subscriptions;		/* List of active ROA table subscriptions based on filters roa_check() */
 };
 
+#define RIK_REJECTED	1			/* Routes rejected in import filter are kept */
+#define RIK_PREFILTER	(2 | RIK_REJECTED)	/* All routes' attribute state before import filter is kept */
 
 /*
  * Channel states
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index c0f81b9d..35f85274 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1310,13 +1310,13 @@ rta_rehash(void)
  * converted to the normalized form.
  */
 ea_list *
-ea_lookup(ea_list *o)
+ea_lookup(ea_list *o, int overlay)
 {
   ea_list *r;
   uint h;
 
   ASSERT(!ea_is_cached(o));
-  o = ea_normalize(o, 1);
+  o = ea_normalize(o, overlay);
   h = ea_hash(o);
 
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next_hash)
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 8bf74754..12ddc816 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -26,7 +26,8 @@ rt_show_table(struct cli *c, struct rt_show_data *d)
     return;
 
   if (d->last_table) cli_printf(c, -1007, "");
-  cli_printf(c, -1007, "Table %s:", d->tab->table->name);
+  cli_printf(c, -1007, "Table %s:",
+      d->tab->prefilter ? "import" : d->tab->table->name);
   d->last_table = d->tab;
 }
 
@@ -156,7 +157,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 
   for (struct rte_storage *er = n->routes; er; er = er->next)
     {
-      if (rte_is_filtered(&er->rte) != d->filtered)
+      if (!d->tab->prefilter && (rte_is_filtered(&er->rte) != d->filtered))
 	continue;
 
       d->rt_counter++;
@@ -167,6 +168,11 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	continue;
 
       struct rte e = er->rte;
+      if (d->tab->prefilter)
+	if (e.sender != d->tab->prefilter->in_req.hook)
+	  continue;
+	else while (e.attrs->next)
+	  e.attrs = e.attrs->next;
 
       /* Export channel is down, do not try to export routes to it */
       if (ec && !ec->out_req.hook)
@@ -239,7 +245,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	else
 	  ia[0] = 0;
 
-	rt_show_rte(c, ia, &e, d, (n->routes == er));
+	rt_show_rte(c, ia, &e, d, !d->tab->prefilter && (n->routes == er));
 	first_show = 0;
       }
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 1631e00f..975da363 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -606,7 +606,7 @@ rte_store(const rte *r, net *net, rtable *tab)
   if (ea_is_cached(e->rte.attrs))
     e->rte.attrs = rta_clone(e->rte.attrs);
   else
-    e->rte.attrs = rta_lookup(e->rte.attrs);
+    e->rte.attrs = rta_lookup(e->rte.attrs, 1);
 
   return e;
 }
@@ -1513,7 +1513,7 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 
   if (new_in && !old_in)
     if (CHANNEL_LIMIT_PUSH(c, IN))
-      if (c->in_keep_filtered)
+      if (c->in_keep & RIK_REJECTED)
       {
 	new->flags |= REF_FILTERED;
 	return new;
@@ -1527,8 +1527,6 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
   return new;
 }
 
-static void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
-
 void
 rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
@@ -1537,15 +1535,13 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
-  if (c->in_table && !rte_update_in(c, n, new, src))
-    return;
+  /* The import reloader requires prefilter routes to be the first layer */
+  if (new && (c->in_keep & RIK_PREFILTER))
+    if (ea_is_cached(new->attrs) && !new->attrs->next)
+      new->attrs = ea_clone(new->attrs);
+    else
+      new->attrs = ea_lookup(new->attrs, 0);
 
-  return rte_update_direct(c, n, new, src);
-}
-
-static void
-rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
-{
   const struct filter *filter = c->in_filter;
   struct channel_import_stats *stats = &c->import_stats;
 
@@ -1563,7 +1559,7 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
 	  stats->updates_filtered++;
 	  channel_rte_trace_in(D_FILTERS, c, new, "filtered out");
 
-	  if (c->in_keep_filtered)
+	  if (c->in_keep & RIK_REJECTED)
 	    new->flags |= REF_FILTERED;
 	  else
 	    new = NULL;
@@ -1588,6 +1584,11 @@ rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src
 
   rte_import(&c->in_req, n, new, src);
 
+  /* Now the route attributes are kept by the in-table cached version
+   * and we may drop the local handle */
+  if (new && (c->in_keep & RIK_PREFILTER))
+    ea_free(new->attrs);
+
   rte_update_unlock();
 }
 
@@ -3183,154 +3184,22 @@ done:
  *	Import table
  */
 
-int
-rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
+
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
 {
-  struct rtable *tab = c->in_table;
-  net *net;
+  struct channel *c = SKIP_BACK(struct channel, reload_req, req);
 
-  if (new)
-    net = net_get(tab, n);
-  else
-  {
-    net = net_find(tab, n);
-
-    if (!net)
-      goto drop_withdraw;
-  }
-
-  /* Find the old rte */
-  struct rte_storage **pos = rte_find(net, src);
-  if (*pos)
+  for (uint i=0; i<count; i++)
+    if (feed[i]->sender == c->in_req.hook)
     {
-      rte *old = &(*pos)->rte;
-      if (new && rte_same(old, new))
-      {
-	/* Refresh the old rte, continue with update to main rtable */
-	if (old->flags & (REF_STALE | REF_DISCARD | REF_MODIFY))
-	{
-	  old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
-	  return 1;
-	}
+      /* Strip the later attribute layers */
+      rte new = *feed[i];
+      while (new.attrs->next)
+	new.attrs = new.attrs->next;
 
-	goto drop_update;
-      }
-
-      if (!new)
-	CHANNEL_LIMIT_POP(c, RX);
-
-      /* Move iterator if needed */
-      if (*pos == c->reload_next_rte)
-	c->reload_next_rte = (*pos)->next;
-
-      /* Remove the old rte */
-      struct rte_storage *del = *pos;
-      *pos = (*pos)->next;
-      rte_free(del);
-      tab->rt_count--;
+      /* And reload the route */
+      rte_update(c, net, &new, new.src);
     }
-  else if (new)
-    {
-      if (CHANNEL_LIMIT_PUSH(c, RX))
-      {
-	/* Required by rte_trace_in() */
-	new->net = n;
-
-	channel_rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
-	goto drop_update;
-      }
-    }
-  else
-    goto drop_withdraw;
-
-  if (!new)
-  {
-    if (!net->routes)
-      fib_delete(&tab->fib, net);
-
-    return 1;
-  }
-
-  /* Insert the new rte */
-  struct rte_storage *e = rte_store(new, net, tab);
-  e->rte.lastmod = current_time();
-  e->next = *pos;
-  *pos = e;
-  tab->rt_count++;
-  return 1;
-
-drop_update:
-  c->import_stats.updates_received++;
-  c->in_req.hook->stats.updates_ignored++;
-
-  if (!net->routes)
-    fib_delete(&tab->fib, net);
-
-  return 0;
-
-drop_withdraw:
-  c->import_stats.withdraws_received++;
-  c->in_req.hook->stats.withdraws_ignored++;
-  return 0;
-}
-
-int
-rt_reload_channel(struct channel *c)
-{
-  struct rtable *tab = c->in_table;
-  struct fib_iterator *fit = &c->reload_fit;
-  int max_feed = 64;
-
-  ASSERT(c->channel_state == CS_UP);
-
-  if (!c->reload_active)
-  {
-    FIB_ITERATE_INIT(fit, &tab->fib);
-    c->reload_active = 1;
-  }
-
-  do {
-    for (struct rte_storage *e = c->reload_next_rte; e; e = e->next)
-    {
-      if (max_feed-- <= 0)
-      {
-	c->reload_next_rte = e;
-	debug("%s channel reload burst split (max_feed=%d)", c->proto->name, max_feed);
-	return 0;
-      }
-
-      rte r = e->rte;
-      rte_update_direct(c, r.net, &r, r.src);
-    }
-
-    c->reload_next_rte = NULL;
-
-    FIB_ITERATE_START(&tab->fib, fit, net, n)
-    {
-      if (c->reload_next_rte = n->routes)
-      {
-	FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
-	break;
-      }
-    }
-    FIB_ITERATE_END;
-  }
-  while (c->reload_next_rte);
-
-  c->reload_active = 0;
-  return 1;
-}
-
-void
-rt_reload_channel_abort(struct channel *c)
-{
-  if (c->reload_active)
-  {
-    /* Unlink the iterator */
-    fit_get(&c->in_table->fib, &c->reload_fit);
-    c->reload_next_rte = NULL;
-    c->reload_active = 0;
-  }
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index 32bba6a6..d5e28cb6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -387,6 +387,7 @@ struct rt_show_data_rtable {
   node n;
   rtable *table;
   struct channel *export_channel;
+  struct channel *prefilter;
 };
 
 struct rt_show_data {
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 84430287..8df99420 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -900,9 +900,6 @@ bgp_refresh_begin(struct bgp_channel *c)
 
   c->load_state = BFS_REFRESHING;
   rt_refresh_begin(c->c.table, &c->c.in_req);
-
-  if (c->c.in_table)
-    rt_refresh_begin(c->c.in_table, &c->c.in_req);
 }
 
 /**
@@ -924,9 +921,6 @@ bgp_refresh_end(struct bgp_channel *c)
 
   c->load_state = BFS_NONE;
   rt_refresh_end(c->c.table, &c->c.in_req);
-
-  if (c->c.in_table)
-    rt_prune_sync(c->c.in_table, 0);
 }
 
 
@@ -1393,9 +1387,9 @@ bgp_reload_routes(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
-  ASSERT(p->conn && (p->route_refresh || c->c.in_table));
+  ASSERT(p->conn && (p->route_refresh || (C->in_keep & RIK_PREFILTER)));
 
-  if (c->c.in_table)
+  if (C->in_keep & RIK_PREFILTER)
     channel_schedule_reload(C);
   else
     bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
@@ -2153,7 +2147,7 @@ bgp_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impor
       (new->cost != old->cost))
   {
     /* import_changed itself does not force ROUTE_REFRESH when import_table is active */
-    if (c->c.in_table && (c->c.channel_state == CS_UP))
+    if ((c->c.in_keep & RIK_PREFILTER) && (c->c.channel_state == CS_UP))
       bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
 
     *import_changed = 1;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 45ee4ed2..c2e98340 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1392,7 +1392,7 @@ bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, ea_lis
 
   /* Prepare cached route attributes */
   if (s->cached_ea == NULL)
-    s->cached_ea = ea_lookup(a0);
+    s->cached_ea = ea_lookup(a0, 0);
 
   rte e0 = {
     .attrs = s->cached_ea,
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index aedf3df6..69c2907d 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2086,7 +2086,7 @@ again1:
 
 	ASSERT_DIE(ARRAY_SIZE(eattrs.a) >= eattrs.l.count);
 
-	ea_list *eal = ea_lookup(&eattrs.l);
+	ea_list *eal = ea_lookup(&eattrs.l, 0);
 	ea_free(nf->old_ea);
 	nf->old_ea = eal;
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 67ad2ada..d82ac8aa 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -156,7 +156,7 @@ perf_loop(void *data)
       ea_set_attr_data(&ea, &ea_gen_nexthop, 0,
 	  &nhad.ad.data, sizeof nhad - sizeof nhad.ad);
 
-      p->data[i].a = rta_lookup(ea);
+      p->data[i].a = rta_lookup(ea, 0);
     }
     else
       p->data[i].a = rta_clone(p->data[i-1].a);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 99d4b737..d12e6731 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -126,7 +126,7 @@ pipe_postconfig(struct proto_config *CF)
   if (cc->rx_limit.action)
     cf_error("Pipe protocol does not support receive limits");
 
-  if (cc->in_keep_filtered)
+  if (cc->in_keep)
     cf_error("Pipe protocol prohibits keeping filtered routes");
 
   cc->debug = cf->c.debug;

From 050b4b4e5e6d4c05345bed2ec62c865258b4e7ee Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 20 Jun 2022 21:29:10 +0200
Subject: [PATCH 143/431] Table export generalized to allow for exporting from
 non-tables

---
 nest/proto.c    |  6 ++--
 nest/rt-table.c | 90 ++++++++++++++++++++++++++++++++++---------------
 nest/rt.h       | 17 +++++++---
 3 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 5e67d940..8513b9cb 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -498,7 +498,7 @@ channel_start_export(struct channel *c)
   }
 
   DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
-  rt_request_export(c->table, &c->out_req);
+  rt_request_export(&c->table->exporter, &c->out_req);
 }
 
 static void
@@ -552,7 +552,7 @@ channel_export_stopped(struct rt_export_request *req)
   {
     c->refeeding = 1;
     c->refeed_pending = 0;
-    rt_request_export(c->table, req);
+    rt_request_export(&c->table->exporter, req);
     return;
   }
 
@@ -600,7 +600,7 @@ channel_schedule_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
 
-  rt_request_export(c->table, &c->reload_req);
+  rt_request_export(&c->table->exporter, &c->reload_req);
 }
 
 static void
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 975da363..14c80138 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -139,7 +139,6 @@ const char *rt_import_state_name_array[TIS_MAX] = {
 
 const char *rt_export_state_name_array[TES_MAX] = {
   [TES_DOWN] = "DOWN",
-  [TES_HUNGRY] = "HUNGRY",
   [TES_FEEDING] = "FEEDING",
   [TES_READY] = "READY",
   [TES_STOP] = "STOP"
@@ -1183,7 +1182,7 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   }
 
   struct rt_export_hook *eh;
-  WALK_LIST(eh, tab->exports)
+  WALK_LIST(eh, tab->exporter.hooks)
   {
     if (eh->export_state == TES_STOP)
       continue;
@@ -1677,11 +1676,21 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
   return v > 0;
 }
 
+static void
+rt_table_export_done(struct rt_export_hook *hook)
+{
+  struct rt_exporter *re = hook->table;
+  struct rtable *tab = SKIP_BACK(struct rtable, exporter, re);
+
+  rt_unlock_table(tab);
+  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+}
+
 static void
 rt_export_stopped(void *data)
 {
   struct rt_export_hook *hook = data;
-  rtable *tab = hook->table;
+  struct rt_exporter *tab = hook->table;
 
   /* Unlist */
   rem_node(&hook->n);
@@ -1689,14 +1698,13 @@ rt_export_stopped(void *data)
   /* Reporting the channel as stopped. */
   hook->stopped(hook->req);
 
+  /* Reporting the hook as finished. */
+  tab->done(hook);
+
   /* Freeing the hook together with its coroutine. */
   rfree(hook->pool);
-  rt_unlock_table(tab);
-
-  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
 }
 
-
 static inline void
 rt_set_import_state(struct rt_import_hook *hook, u8 state)
 {
@@ -1748,54 +1756,73 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
   hook->stopped = stopped;
 }
 
-void
-rt_request_export(rtable *tab, struct rt_export_request *req)
+static struct rt_export_hook *
+rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 {
+  rtable *tab = SKIP_BACK(rtable, exporter, re);
   rt_lock_table(tab);
 
   pool *p = rp_new(tab->rp, "Export hook");
-  struct rt_export_hook *hook = req->hook = mb_allocz(p, sizeof(struct rt_export_hook));
+  struct rt_export_hook *hook = mb_allocz(p, sizeof(struct rt_export_hook));
   hook->pool = p;
   hook->lp = lp_new_default(p);
-  
-  hook->req = req;
-  hook->table = tab;
 
   /* stats zeroed by mb_allocz */
 
-  rt_set_export_state(hook, TES_HUNGRY);
-
-  hook->n = (node) {};
-  add_tail(&tab->exports, &hook->n);
-
   FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
 
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
+  hook->event = ev_new_init(p, rt_feed_channel, hook);
+
+  return hook;
+}
+
+void
+rt_request_export(struct rt_exporter *re, struct rt_export_request *req)
+{
+  struct rt_export_hook *hook = req->hook = re->start(re, req);
+
+  hook->req = req;
+  hook->table = re;
+
+  hook->n = (node) {};
+  add_tail(&re->hooks, &hook->n);
+
   rt_set_export_state(hook, TES_FEEDING);
 
-  hook->event = ev_new_init(p, rt_feed_channel, hook);
   ev_schedule_work(hook->event);
 }
 
+static void
+rt_table_export_stop(struct rt_export_hook *hook)
+{
+  rtable *tab = SKIP_BACK(rtable, exporter, hook->table);
+
+  if (hook->export_state == TES_FEEDING)
+    fit_get(&tab->fib, &hook->feed_fit);
+}
+
 void
 rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_request *))
 {
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
-  rtable *tab = hook->table;
-
-  /* Stop feeding */
+  /* Cancel the feeder event */
   ev_postpone(hook->event);
 
-  if (hook->export_state == TES_FEEDING)
-    fit_get(&tab->fib, &hook->feed_fit);
+  /* Stop feeding from the exporter */
+  hook->table->stop(hook);
 
+  /* Reset the event as the stopped event */
   hook->event->hook = rt_export_stopped;
   hook->stopped = stopped;
 
+  /* Update export state */
   rt_set_export_state(hook, TES_STOP);
+
+  /* Run the stopped event */
   ev_schedule(hook->event);
 }
 
@@ -1948,7 +1975,7 @@ rt_dump_hooks(rtable *tab)
   }
 
   struct rt_export_hook *eh;
-  WALK_LIST(eh, tab->exports)
+  WALK_LIST(eh, tab->exporter.hooks)
   {
     eh->req->dump_req(eh->req);
     debug("  Export hook %p requested by %p:"
@@ -2252,10 +2279,17 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   init_list(&t->flowspec_links);
 
+  t->exporter = (struct rt_exporter) {
+    .start = rt_table_export_start,
+    .stop = rt_table_export_stop,
+    .done = rt_table_export_done,
+  };
+  init_list(&t->exporter.hooks);
+
   if (!(t->internal = cf->internal))
   {
     init_list(&t->imports);
-    init_list(&t->exports);
+
     hmap_init(&t->id_map, p, 1024);
     hmap_set(&t->id_map, 0);
 
@@ -3138,7 +3172,9 @@ rt_feed_channel(void *data)
 
   ASSERT(c->export_state == TES_FEEDING);
 
-  FIB_ITERATE_START(&c->table->fib, fit, net, n)
+  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+
+  FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
       if (max_feed <= 0)
 	{
diff --git a/nest/rt.h b/nest/rt.h
index d5e28cb6..0f5a5ba7 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -56,6 +56,16 @@ struct rtable_config {
   btime max_settle_time;		/* Maximum settle time for notifications */
 };
 
+struct rt_export_hook;
+struct rt_export_request;
+
+struct rt_exporter {
+  list hooks;				/* Registered route export hooks */
+  struct rt_export_hook *(*start)(struct rt_exporter *, struct rt_export_request *);
+  void (*stop)(struct rt_export_hook *);
+  void (*done)(struct rt_export_hook *);
+};
+
 typedef struct rtable {
   resource r;
   node n;				/* Node in list of all tables */
@@ -69,7 +79,7 @@ typedef struct rtable {
   u32 rt_count;				/* Number of routes in the table */
 
   list imports;				/* Registered route importers */
-  list exports;				/* Registered route exporters */
+  struct rt_exporter exporter;		/* Exporter API structure */
 
   struct hmap id_map;
   struct hostcache *hostcache;
@@ -221,7 +231,7 @@ struct rt_export_request {
 
 struct rt_export_hook {
   node n;
-  rtable *table;			/* The connected table */
+  struct rt_exporter *table;		/* The connected table */
 
   pool *pool;
   linpool *lp;
@@ -255,14 +265,13 @@ struct rt_export_hook {
 #define TIS_MAX		6
 
 #define TES_DOWN	0
-#define TES_HUNGRY	1
 #define TES_FEEDING	2
 #define TES_READY	3
 #define TES_STOP	4
 #define TES_MAX		5
 
 void rt_request_import(rtable *tab, struct rt_import_request *req);
-void rt_request_export(rtable *tab, struct rt_export_request *req);
+void rt_request_export(struct rt_exporter *tab, struct rt_export_request *req);
 
 void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
 void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));

From 9c9059fd172dcc2f8805529de4b3174f280c109c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 22 Jun 2022 12:45:42 +0200
Subject: [PATCH 144/431] Allowed optimized exporting of a subprefix tree

Added an option for export filter to allow for prefiltering based on the
prefix. Routes outside the given prefix are completely ignored. Config
is simple:

	export in <net> <filter>;
---
 doc/bird.sgml       |  8 ++--
 nest/config.Y       |  6 +++
 nest/proto.c        |  8 +++-
 nest/protocol.h     |  2 +
 nest/rt-table.c     | 89 +++++++++++++++++++++++++++++++++++++--------
 nest/rt.h           |  3 ++
 proto/pipe/config.Y |  6 +++
 proto/pipe/pipe.c   |  8 ++++
 proto/pipe/pipe.h   |  1 +
 9 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index d17de23f..c9ce670b 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -914,10 +914,12 @@ inherited from templates can be updated by new definitions.
 	<cf/none/ is for dropping all routes. Default: <cf/all/ (except for
 	EBGP).
 
-	<tag><label id="proto-export">export <m/filter/</tag>
+	<tag><label id="proto-export">export [ in <m/prefix/ ] <m/filter/</tag>
 	This is similar to the <cf>import</cf> keyword, except that it works in
-	the direction from the routing table to the protocol. Default: <cf/none/
-	(except for EBGP).
+	the direction from the routing table to the protocol. If <cf/in/ keyword is used,
+	only routes inside the given prefix are exported. Other routes are completely
+	ignored (e.g. no logging and no statistics).
+	Default: <cf/none/ (except for EBGP).
 
 	<tag><label id="proto-import-keep-filtered">import keep filtered <m/switch/</tag>
 	Usually, if an import filter rejects a route, the route is forgotten.
diff --git a/nest/config.Y b/nest/config.Y
index ea7e1266..c3f2532f 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -306,6 +306,12 @@ channel_item_:
      this_channel->table = $2;
    }
  | IMPORT imexport { this_channel->in_filter = $2; }
+ | EXPORT IN net_any imexport {
+     if (this_channel->net_type && ($3->type != this_channel->net_type))
+       cf_error("Incompatible export prefilter type");
+     this_channel->out_subprefix = $3;
+     this_channel->out_filter = $4;
+   }
  | EXPORT imexport { this_channel->out_filter = $2; }
  | RECEIVE LIMIT limit_spec { this_channel->rx_limit = $3; }
  | IMPORT LIMIT limit_spec { this_channel->in_limit = $3; }
diff --git a/nest/proto.c b/nest/proto.c
index 8513b9cb..3792fde4 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -214,6 +214,7 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
 
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
+  c->out_subprefix = cf->out_subprefix;
 
   channel_init_limit(c, &c->rx_limit, PLD_RX, &cf->rx_limit);
   channel_init_limit(c, &c->in_limit, PLD_IN, &cf->in_limit);
@@ -467,6 +468,7 @@ channel_start_export(struct channel *c)
 
   c->out_req = (struct rt_export_request) {
     .name = rn,
+    .addr_in = c->out_subprefix,
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
@@ -922,7 +924,10 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   /* FIXME: better handle these changes, also handle in_keep_filtered */
   if ((c->table != cf->table->table) ||
       (cf->ra_mode && (c->ra_mode != cf->ra_mode)) ||
-      (cf->in_keep != c->in_keep))
+      (cf->in_keep != c->in_keep) ||
+      cf->out_subprefix && c->out_subprefix &&
+	  !net_equal(cf->out_subprefix, c->out_subprefix) ||
+      (!cf->out_subprefix != !c->out_subprefix))
     return 0;
 
   /* Note that filter_same() requires arguments in (new, old) order */
@@ -947,6 +952,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   // c->ra_mode = cf->ra_mode;
   c->merge_limit = cf->merge_limit;
   c->preference = cf->preference;
+  c->out_req.addr_in = c->out_subprefix = cf->out_subprefix;
   c->debug = cf->debug;
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->rpki_reload = cf->rpki_reload;
diff --git a/nest/protocol.h b/nest/protocol.h
index b482ed99..a1701a7e 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -452,6 +452,7 @@ struct channel_config {
   struct proto_config *parent;		/* Where channel is defined (proto or template) */
   struct rtable_config *table;		/* Table we're attached to */
   const struct filter *in_filter, *out_filter; /* Attached filters */
+  const net_addr *out_subprefix;	/* Export only subprefixes of this net */
 
   struct channel_limit rx_limit;	/* Limit for receiving routes from protocol
 					   (relevant when in_keep & RIK_REJECTED) */
@@ -477,6 +478,7 @@ struct channel {
   struct rtable *table;
   const struct filter *in_filter;	/* Input filter */
   const struct filter *out_filter;	/* Output filter */
+  const net_addr *out_subprefix;	/* Export only subprefixes of this net */
   struct bmap export_map;		/* Keeps track which routes were really exported */
   struct bmap export_reject_map;	/* Keeps track which routes were rejected by export filter */
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 14c80138..afafef62 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -126,7 +126,9 @@ static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_flowspec_notify(rtable *tab, net *net);
-static void rt_feed_channel(void *);
+static void rt_feed_by_fib(void *);
+static void rt_feed_by_trie(void *);
+static uint rt_feed_net(struct rt_export_hook *c, net *n);
 
 const char *rt_import_state_name_array[TIS_MAX] = {
   [TIS_DOWN] = "DOWN",
@@ -1187,6 +1189,9 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
     if (eh->export_state == TES_STOP)
       continue;
 
+    if (eh->req->addr_in && !net_in_netX(net->n.addr, eh->req->addr_in))
+      continue;
+
     if (new)
       eh->stats.updates_received++;
     else
@@ -1768,13 +1773,21 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
   hook->lp = lp_new_default(p);
 
   /* stats zeroed by mb_allocz */
-
-  FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
+  if (tab->trie && req->addr_in && net_val_match(tab->addr_type, NB_IP))
+  {
+    hook->walk_state = mb_allocz(p, sizeof (struct f_trie_walk_state));
+    hook->walk_lock = rt_lock_trie(tab);
+    trie_walk_init(hook->walk_state, tab->trie, req->addr_in);
+    hook->event = ev_new_init(p, rt_feed_by_trie, hook);
+  }
+  else
+  {
+    FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
+    hook->event = ev_new_init(p, rt_feed_by_fib, hook);
+  }
 
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
-  hook->event = ev_new_init(p, rt_feed_channel, hook);
-
   return hook;
 }
 
@@ -3154,7 +3167,7 @@ rt_commit(struct config *new, struct config *old)
 }
 
 /**
- * rt_feed_channel - advertise all routes to a channel
+ * rt_feed_by_fib - advertise all routes to a channel by walking a fib
  * @c: channel to be fed
  *
  * This function performs one pass of advertisement of routes to a channel that
@@ -3163,7 +3176,7 @@ rt_commit(struct config *new, struct config *old)
  * order not to monopolize CPU time.)
  */
 static void
-rt_feed_channel(void *data)
+rt_feed_by_fib(void *data)
 {
   struct rt_export_hook *c = data;
 
@@ -3183,9 +3196,55 @@ rt_feed_channel(void *data)
 	  return;
 	}
 
-      if (c->export_state != TES_FEEDING)
-	goto done;
+      ASSERT(c->export_state == TES_FEEDING);
 
+      if (!c->req->addr_in || net_in_netX(n->n.addr, c->req->addr_in))
+	max_feed -= rt_feed_net(c, n);
+    }
+  FIB_ITERATE_END;
+
+  rt_set_export_state(c, TES_READY);
+}
+
+static void
+rt_feed_by_trie(void *data)
+{
+  struct rt_export_hook *c = data;
+  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+
+  ASSERT_DIE(c->walk_state);
+  struct f_trie_walk_state *ws = c->walk_state;
+
+  int max_feed = 256;
+
+  ASSERT_DIE(c->export_state == TES_FEEDING);
+
+  net_addr addr;
+  while (trie_walk_next(ws, &addr))
+  {
+    net *n = net_find(tab, &addr);
+    if (!n)
+      continue;
+
+    if ((max_feed -= rt_feed_net(c, n)) <= 0)
+      return;
+
+    ASSERT_DIE(c->export_state == TES_FEEDING);
+  }
+
+  rt_unlock_trie(tab, c->walk_lock);
+  c->walk_lock = NULL;
+
+  mb_free(c->walk_state);
+  c->walk_state = NULL;
+
+  rt_set_export_state(c, TES_READY);
+}
+
+
+static uint
+rt_feed_net(struct rt_export_hook *c, net *n)
+{
       if (c->req->export_bulk)
       {
 	uint count = rte_feed_count(n);
@@ -3196,23 +3255,21 @@ rt_feed_channel(void *data)
 	  rte_feed_obtain(n, feed, count);
 	  struct rt_pending_export rpe = { .new_best = n->routes };
 	  c->req->export_bulk(c->req, n->n.addr, &rpe, feed, count);
-	  max_feed -= count;
 	  rte_update_unlock();
 	}
+	return count;
       }
-      else if (n->routes && rte_is_valid(&n->routes->rte))
+
+      if (n->routes && rte_is_valid(&n->routes->rte))
       {
 	rte_update_lock();
 	struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
 	c->req->export_one(c->req, n->n.addr, &rpe);
-	max_feed--;
 	rte_update_unlock();
+	return 1;
       }
-    }
-  FIB_ITERATE_END;
 
-done:
-  rt_set_export_state(c, TES_READY);
+      return 0;
 }
 
 
diff --git a/nest/rt.h b/nest/rt.h
index 0f5a5ba7..57e117da 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -212,6 +212,7 @@ struct rt_pending_export {
 
 struct rt_export_request {
   struct rt_export_hook *hook;		/* Table part of the export */
+  const net_addr *addr_in;		/* Subnet export request */
   char *name;
   u8 trace_routes;
 
@@ -245,6 +246,8 @@ struct rt_export_hook {
   } stats;
 
   struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
+  struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
+  struct f_trie *walk_lock;		/* Locked trie for walking */
 
   btime last_state_change;		/* Time of last state transition */
 
diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y
index c869de9f..0990168e 100644
--- a/proto/pipe/config.Y
+++ b/proto/pipe/config.Y
@@ -41,6 +41,12 @@ pipe_proto:
    pipe_proto_start '{'
  | pipe_proto proto_item ';'
  | pipe_proto channel_item_ ';'
+ | pipe_proto IMPORT IN net_any imexport ';' {
+    if (this_channel->net_type && ($4->type != this_channel->net_type))
+      cf_error("Incompatible export prefilter type");
+    PIPE_CFG->in_subprefix = $4;
+    this_channel->in_filter = $5;
+  }
  | pipe_proto PEER TABLE rtable ';' { PIPE_CFG->peer = $4; }
  | pipe_proto MAX GENERATION expr ';' {
     if (($4 < 1) || ($4 > 254)) cf_error("Max generation must be in range 1..254, got %u", $4);
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index d12e6731..351db36b 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -123,6 +123,12 @@ pipe_postconfig(struct proto_config *CF)
   if (cc->table->addr_type != cf->peer->addr_type)
     cf_error("Primary table and peer table must have the same type");
 
+  if (cc->out_subprefix && (cc->table->addr_type != cc->out_subprefix->type))
+    cf_error("Export subprefix must match table type");
+
+  if (cf->in_subprefix && (cc->table->addr_type != cf->in_subprefix->type))
+    cf_error("Import subprefix must match table type");
+
   if (cc->rx_limit.action)
     cf_error("Pipe protocol does not support receive limits");
 
@@ -142,6 +148,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
     .channel = cc->channel,
     .table = cc->table,
     .out_filter = cc->out_filter,
+    .out_subprefix = cc->out_subprefix,
     .in_limit = cc->in_limit,
     .ra_mode = RA_ANY,
     .debug = cc->debug,
@@ -153,6 +160,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
     .channel = cc->channel,
     .table = cf->peer,
     .out_filter = cc->in_filter,
+    .out_subprefix = cf->in_subprefix,
     .in_limit = cc->out_limit,
     .ra_mode = RA_ANY,
     .debug = cc->debug,
diff --git a/proto/pipe/pipe.h b/proto/pipe/pipe.h
index 60c857eb..a6534e1c 100644
--- a/proto/pipe/pipe.h
+++ b/proto/pipe/pipe.h
@@ -12,6 +12,7 @@
 struct pipe_config {
   struct proto_config c;
   struct rtable_config *peer;		/* Table we're connected to */
+  const net_addr *in_subprefix;
   u8 max_generation;
 };
 

From 5c1ebe012e1bbfec52b4fba8b59edd355a7dff91 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 26 Jun 2022 14:11:08 +0200
Subject: [PATCH 145/431] Fixed forgotten preference handling in filters

---
 conf/confbase.Y  | 2 +-
 filter/test.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 9a83083c..58890cd6 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -173,7 +173,7 @@ expr_us:
  | expr US { $$ = $1 US_; }
  ;
 
-toksym: FROM ;
+toksym: FROM | PREFERENCE ;
 symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN | toksym ;
 symbol_known: CF_SYM_KNOWN | toksym ;
 
diff --git a/filter/test.conf b/filter/test.conf
index 21e7330f..eb9cc30c 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -1445,6 +1445,8 @@ bool t;
 	rip_metric = 14;
 	unset(rip_metric);
 
+	preference = 1234;
+
 	test_ca_int1 = 42;
 	test_ca_ip2 = 1.3.5.7;
 	test_ca_quad3 = 2.4.6.8;

From 13ef5e53dd4a98c80261139b4c9ce4b1074cac40 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Jun 2022 15:27:26 +0200
Subject: [PATCH 146/431] The show-route CLI command now uses the route export
 API

In the multithreaded environment, it is not supposed that anybody
traverses the routing table as the CLI show-route was doing. Now the
routing table traversal is gone and CLI won't hold the table locked
while computing filters.
---
 nest/cli.c      |   8 +-
 nest/cli.h      |   4 +-
 nest/config.Y   |   1 +
 nest/rt-show.c  | 279 +++++++++++++++++++++++++-----------------------
 nest/rt-table.c |  11 +-
 nest/rt.h       |   8 +-
 proto/mrt/mrt.c |   7 +-
 7 files changed, 169 insertions(+), 149 deletions(-)

diff --git a/nest/cli.c b/nest/cli.c
index b54a0d76..31deef03 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -319,7 +319,6 @@ cli_new(void *priv)
   c->event->data = c;
   c->cont = cli_hello;
   c->parser_pool = lp_new_default(c->pool);
-  c->show_pool = lp_new_default(c->pool);
   c->rx_buf = mb_alloc(c->pool, CLI_RX_BUF_SIZE);
   ev_schedule(c->event);
   return c;
@@ -409,11 +408,14 @@ void
 cli_free(cli *c)
 {
   cli_set_log_echo(c, 0, 0);
+  int defer = 0;
   if (c->cleanup)
-    c->cleanup(c);
+    defer = c->cleanup(c);
   if (c == cmd_reconfig_stored_cli)
     cmd_reconfig_stored_cli = NULL;
-  rfree(c->pool);
+
+  if (!defer)
+    rfree(c->pool);
 }
 
 /**
diff --git a/nest/cli.h b/nest/cli.h
index 8a3294c5..92572968 100644
--- a/nest/cli.h
+++ b/nest/cli.h
@@ -33,12 +33,12 @@ typedef struct cli {
   struct cli_out *tx_buf, *tx_pos, *tx_write;
   event *event;
   void (*cont)(struct cli *c);
-  void (*cleanup)(struct cli *c);
+  int (*cleanup)(struct cli *c);	/* Return 0 if finished and cli may be freed immediately.
+					   Otherwise return 1 and call rfree(c->pool) when appropriate. */
   void *rover;				/* Private to continuation routine */
   int last_reply;
   int restricted;			/* CLI is restricted to read-only commands */
   struct linpool *parser_pool;		/* Pool used during parsing */
-  struct linpool *show_pool;		/* Pool used during route show */
   byte *ring_buf;			/* Ring buffer for asynchronous messages */
   byte *ring_end, *ring_read, *ring_write;	/* Pointers to the ring buffer */
   uint ring_overflow;			/* Counter of ring overflows */
diff --git a/nest/config.Y b/nest/config.Y
index c3f2532f..ec10dd69 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -653,6 +653,7 @@ r_args:
      init_list(&($$->tables));
      $$->filter = FILTER_ACCEPT;
      $$->running_on_config = config;
+     $$->cli = this_cli;
    }
  | r_args net_any {
      $$ = $1;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 12ddc816..1404f7e6 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -19,8 +19,10 @@
 #include "sysdep/unix/krt.h"
 
 static void
-rt_show_table(struct cli *c, struct rt_show_data *d)
+rt_show_table(struct rt_show_data *d)
 {
+  struct cli *c = d->cli;
+
   /* No table blocks in 'show route count' */
   if (d->stats == 2)
     return;
@@ -70,7 +72,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     bsprintf(info, " (%d)", rt_get_preference(e));
 
   if (d->last_table != d->tab)
-    rt_show_table(c, d);
+    rt_show_table(d);
 
   eattr *heea;
   struct hostentry_adata *had = NULL;
@@ -118,32 +120,10 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     ea_show_list(c, a);
 }
 
-static uint
-rte_feed_count(net *n)
-{
-  uint count = 0;
-  for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
-      count++;
-  return count;
-}
-
 static void
-rte_feed_obtain(net *n, rte **feed, uint count)
-{
-  uint i = 0;
-  for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
-    {
-      ASSERT_DIE(i < count);
-      feed[i++] = &e->rte;
-    }
-  ASSERT_DIE(i == count);
-}
-
-static void
-rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
+rt_show_net(struct rt_show_data *d, const net_addr *n, rte **feed, uint count)
 {
+  struct cli *c = d->cli;
   byte ia[NET_MAX_TEXT_LENGTH+1];
   struct channel *ec = d->tab->export_channel;
 
@@ -155,9 +135,9 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
   int first_show = 1;
   int pass = 0;
 
-  for (struct rte_storage *er = n->routes; er; er = er->next)
+  for (uint i = 0; i < count; i++)
     {
-      if (!d->tab->prefilter && (rte_is_filtered(&er->rte) != d->filtered))
+      if (!d->tab->prefilter && (rte_is_filtered(feed[i]) != d->filtered))
 	continue;
 
       d->rt_counter++;
@@ -167,7 +147,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       if (pass)
 	continue;
 
-      struct rte e = er->rte;
+      struct rte e = *feed[i];
       if (d->tab->prefilter)
 	if (e.sender != d->tab->prefilter->in_req.hook)
 	  continue;
@@ -190,13 +170,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
 	{
 	  /* Special case for merged export */
 	  pass = 1;
-	  uint count = rte_feed_count(n);
-	  if (!count)
-	    goto skip;
-
-	  rte **feed = alloca(count * sizeof(rte *));
-	  rte_feed_obtain(n, feed, count);
-	  rte *em = rt_export_merged(ec, feed, count, c->show_pool, 1);
+	  rte *em = rt_export_merged(ec, feed, count, tmp_linpool, 1);
 
 	  if (em)
 	    e = *em;
@@ -241,159 +215,166 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       if (d->stats < 2)
       {
 	if (first_show)
-	  net_format(n->n.addr, ia, sizeof(ia));
+	  net_format(n, ia, sizeof(ia));
 	else
 	  ia[0] = 0;
 
-	rt_show_rte(c, ia, &e, d, !d->tab->prefilter && (n->routes == er));
+	rt_show_rte(c, ia, &e, d, !d->tab->prefilter && !i);
 	first_show = 0;
       }
 
       d->show_counter++;
 
     skip:
-      lp_flush(c->show_pool);
-
       if (d->primary_only)
 	break;
     }
+
+  if ((d->show_counter - d->show_counter_last_flush) > 64)
+  {
+    d->show_counter_last_flush = d->show_counter;
+    cli_write_trigger(d->cli);
+  }
 }
 
 static void
+rt_show_net_export_bulk(struct rt_export_request *req, const net_addr *n,
+    struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+{
+  struct rt_show_data *d = SKIP_BACK(struct rt_show_data, req, req);
+  return rt_show_net(d, n, feed, count);
+}
+
+static void
+rt_show_export_stopped_cleanup(struct rt_export_request *req)
+{
+  struct rt_show_data *d = SKIP_BACK(struct rt_show_data, req, req);
+
+  /* The hook is now invalid */
+  req->hook = NULL;
+
+  /* Unlock referenced tables */
+  struct rt_show_data_rtable *tab;
+  WALK_LIST(tab, d->tables)
+    rt_unlock_table(tab->table);
+
+  /* And free the CLI (deferred) */
+  rfree(d->cli->pool);
+}
+
+static int
 rt_show_cleanup(struct cli *c)
 {
   struct rt_show_data *d = c->rover;
-  struct rt_show_data_rtable *tab;
 
-  /* Unlink the iterator */
-  if (d->table_open && !d->trie_walk)
-    fit_get(&d->tab->table->fib, &d->fit);
+  /* Cancel the feed */
+  if (d->req.hook)
+  {
+    rt_stop_export(&d->req, rt_show_export_stopped_cleanup);
+    return 1;
+  }
+  else
+    return 0;
+}
 
-  if (d->walk_lock)
-    rt_unlock_trie(d->tab->table, d->walk_lock);
+static void rt_show_export_stopped(struct rt_export_request *req);
 
-  /* Unlock referenced tables */
-  WALK_LIST(tab, d->tables)
-    rt_unlock_table(tab->table);
+static void
+rt_show_log_state_change(struct rt_export_request *req, u8 state)
+{
+  if (state == TES_READY)
+    rt_stop_export(req, rt_show_export_stopped);
 }
 
 static void
-rt_show_cont(struct cli *c)
+rt_show_dump_req(struct rt_export_request *req)
 {
-  struct rt_show_data *d = c->rover;
-  struct rtable *tab = d->tab->table;
-#ifdef DEBUGGING
-  unsigned max = 4;
-#else
-  unsigned max = 64;
-#endif
-  struct fib *fib = &tab->fib;
-  struct fib_iterator *it = &d->fit;
+  debug("  CLI Show Route Feed %p\n", req);
+}
+
+static void
+rt_show_cont(struct rt_show_data *d)
+{
+  struct cli *c = d->cli;
 
   if (d->running_on_config && (d->running_on_config != config))
   {
     cli_printf(c, 8004, "Stopped due to reconfiguration");
-    goto done;
+
+    /* Unlock referenced tables */
+    struct rt_show_data_rtable *tab;
+    WALK_LIST(tab, d->tables)
+      rt_unlock_table(tab->table);
+
+    /* No more action */
+    c->cleanup = NULL;
+    c->cont = NULL;
+    c->rover = NULL;
+    cli_write_trigger(c);
+    return;
   }
 
-  if (!d->table_open)
-  {
-    /* We use either trie-based walk or fib-based walk */
-    d->trie_walk = tab->trie &&
-      (d->addr_mode == RSD_ADDR_IN) &&
-      net_val_match(tab->addr_type, NB_IP);
+  d->req = (struct rt_export_request) {
+    .addr_in = (d->addr_mode == RSD_ADDR_IN) ? d->addr : NULL,
+    .name = "CLI Show Route",
+    .export_bulk = rt_show_net_export_bulk,
+    .dump_req = rt_show_dump_req,
+    .log_state_change = rt_show_log_state_change,
+  };
 
-    if (d->trie_walk && !d->walk_state)
-      d->walk_state = lp_allocz(c->parser_pool, sizeof (struct f_trie_walk_state));
+  d->table_counter++;
+  d->kernel = rt_show_get_kernel(d);
 
-    if (d->trie_walk)
-    {
-      d->walk_lock = rt_lock_trie(tab);
-      trie_walk_init(d->walk_state, tab->trie, d->addr);
-    }
-    else
-      FIB_ITERATE_INIT(&d->fit, &tab->fib);
+  d->show_counter_last = d->show_counter;
+  d->rt_counter_last   = d->rt_counter;
+  d->net_counter_last  = d->net_counter;
 
-    d->table_open = 1;
-    d->table_counter++;
-    d->kernel = rt_show_get_kernel(d);
+  if (d->tables_defined_by & RSD_TDB_SET)
+    rt_show_table(d);
 
-    d->show_counter_last = d->show_counter;
-    d->rt_counter_last   = d->rt_counter;
-    d->net_counter_last  = d->net_counter;
+  rt_request_export(&d->tab->table->exporter, &d->req);
+}
 
-    if (d->tables_defined_by & RSD_TDB_SET)
-      rt_show_table(c, d);
-  }
+static void
+rt_show_export_stopped(struct rt_export_request *req)
+{
+  struct rt_show_data *d = SKIP_BACK(struct rt_show_data, req, req);
 
-  if (d->trie_walk)
-  {
-    /* Trie-based walk */
-    net_addr addr;
-    while (trie_walk_next(d->walk_state, &addr))
-    {
-      net *n = net_find(tab, &addr);
-      if (!n)
-	continue;
-
-      rt_show_net(c, n, d);
-
-      if (!--max)
-	return;
-    }
-
-    rt_unlock_trie(tab, d->walk_lock);
-    d->walk_lock = NULL;
-  }
-  else
-  {
-    /* fib-based walk */
-    FIB_ITERATE_START(fib, it, net, n)
-    {
-      if ((d->addr_mode == RSD_ADDR_IN) && (!net_in_netX(n->n.addr, d->addr)))
-	goto next;
-
-      if (!max--)
-      {
-	FIB_ITERATE_PUT(it);
-	return;
-      }
-      rt_show_net(c, n, d);
-
-    next:;
-    }
-    FIB_ITERATE_END;
-  }
+  /* The hook is now invalid */
+  req->hook = NULL;
 
   if (d->stats)
   {
     if (d->last_table != d->tab)
-      rt_show_table(c, d);
+      rt_show_table(d);
 
-    cli_printf(c, -1007, "%d of %d routes for %d networks in table %s",
+    cli_printf(d->cli, -1007, "%d of %d routes for %d networks in table %s",
 	       d->show_counter - d->show_counter_last, d->rt_counter - d->rt_counter_last,
-	       d->net_counter - d->net_counter_last, tab->name);
+	       d->net_counter - d->net_counter_last, d->tab->table->name);
   }
 
   d->kernel = NULL;
-  d->table_open = 0;
   d->tab = NODE_NEXT(d->tab);
 
   if (NODE_VALID(d->tab))
-    return;
+    return rt_show_cont(d);
 
+  /* Unlock referenced tables */
+  struct rt_show_data_rtable *tab;
+  WALK_LIST(tab, d->tables)
+    rt_unlock_table(tab->table);
+
+  /* Printout total stats */
   if (d->stats && (d->table_counter > 1))
   {
-    if (d->last_table) cli_printf(c, -1007, "");
-    cli_printf(c, 14, "Total: %d of %d routes for %d networks in %d tables",
+    if (d->last_table) cli_printf(d->cli, -1007, "");
+    cli_printf(d->cli, 14, "Total: %d of %d routes for %d networks in %d tables",
 	       d->show_counter, d->rt_counter, d->net_counter, d->table_counter);
   }
   else
-    cli_printf(c, 0, "");
+    cli_printf(d->cli, 0, "");
 
-done:
-  rt_show_cleanup(c);
-  c->cont = c->cleanup = NULL;
+  cli_write_trigger(d->cli);
 }
 
 struct rt_show_data_rtable *
@@ -491,6 +472,12 @@ rt_show_prepare_tables(struct rt_show_data *d)
     cf_error("No valid tables");
 }
 
+static void
+rt_show_dummy_cont(struct cli *c UNUSED)
+{
+  /* Explicitly do nothing to prevent CLI from trying to parse another command. */
+}
+
 void
 rt_show(struct rt_show_data *d)
 {
@@ -510,12 +497,16 @@ rt_show(struct rt_show_data *d)
 
     /* There is at least one table */
     d->tab = HEAD(d->tables);
-    this_cli->cont = rt_show_cont;
     this_cli->cleanup = rt_show_cleanup;
     this_cli->rover = d;
+    this_cli->cont = rt_show_dummy_cont;
+    rt_show_cont(d);
   }
   else
   {
+    uint max = 64;
+    rte **feed = mb_alloc(d->cli->pool, sizeof(rte *) * max);
+
     WALK_LIST(tab, d->tables)
     {
       d->tab = tab;
@@ -526,8 +517,24 @@ rt_show(struct rt_show_data *d)
       else
 	n = net_find(tab->table, d->addr);
 
-      if (n)
-	rt_show_net(this_cli, n, d);
+      uint count = 0;
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	count++;
+
+      if (!count)
+	continue;
+
+      if (count > max)
+      {
+	do max *= 2; while (count > max);
+	feed = mb_realloc(feed, sizeof(rte *) * max);
+      }
+
+      uint i = 0;
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	feed[i++] = &e->rte;
+
+      rt_show_net(d, n->n.addr, feed, count);
     }
 
     if (d->rt_counter)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index afafef62..ed0132ca 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1813,7 +1813,16 @@ rt_table_export_stop(struct rt_export_hook *hook)
   rtable *tab = SKIP_BACK(rtable, exporter, hook->table);
 
   if (hook->export_state == TES_FEEDING)
-    fit_get(&tab->fib, &hook->feed_fit);
+    if (hook->walk_lock)
+    {
+      rt_unlock_trie(tab, hook->walk_lock);
+      hook->walk_lock = NULL;
+
+      mb_free(hook->walk_state);
+      hook->walk_state = NULL;
+    }
+    else
+      fit_get(&tab->fib, &hook->feed_fit);
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index 57e117da..c959d358 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -403,13 +403,12 @@ struct rt_show_data_rtable {
 };
 
 struct rt_show_data {
+  struct cli *cli;			/* Pointer back to the CLI */
   net_addr *addr;
   list tables;
   struct rt_show_data_rtable *tab;	/* Iterator over table list */
   struct rt_show_data_rtable *last_table; /* Last table in output */
-  struct fib_iterator fit;		/* Iterator over networks in table */
-  struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
-  struct f_trie *walk_lock;		/* Locked trie for walking */
+  struct rt_export_request req;		/* Export request in use */
   int verbose, tables_defined_by;
   const struct filter *filter;
   struct proto *show_protocol;
@@ -420,10 +419,9 @@ struct rt_show_data {
   struct rt_export_hook *kernel_export_hook;
   int export_mode, addr_mode, primary_only, filtered, stats;
 
-  int table_open;			/* Iteration (fit) is open */
-  int trie_walk;			/* Current table is iterated using trie */
   int net_counter, rt_counter, show_counter, table_counter;
   int net_counter_last, rt_counter_last, show_counter_last;
+  int show_counter_last_flush;
 };
 
 void rt_show(struct rt_show_data *);
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index fcbe317b..5ef4cd44 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -703,14 +703,17 @@ mrt_dump_cont(struct cli *c)
 
   cli_printf(c, 0, "");
   mrt_table_dump_free(c->rover);
-  c->cont = c->cleanup = c->rover = NULL;
+  c->cont = NULL;
+  c->cleanup = NULL;
+  c->rover = NULL;
 }
 
-static void
+static int
 mrt_dump_cleanup(struct cli *c)
 {
   mrt_table_dump_free(c->rover);
   c->rover = NULL;
+  return 0;
 }
 
 void

From dfb61dfceaa72dda477a5433a193da316dccef7f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 26 Jun 2022 14:48:55 +0200
Subject: [PATCH 147/431] Fixed undefined attribute handling

---
 nest/rt-attr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 35f85274..ed3aaf01 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -727,7 +727,7 @@ ea_do_prune(ea_list *e)
 
       /* Now s0 is the most recent version, s[-1] the oldest one */
       /* Drop undefs unless this is a true overlay */
-      if (s0->undef && !e->next)
+      if (s0->undef && (s[-1].undef || !e->next))
 	continue;
 
       /* Copy the newest version to destination */
@@ -1081,7 +1081,7 @@ ea_show(struct cli *c, const eattr *e)
   *pos++ = ' ';
 
   if (e->undef)
-    bsprintf(pos, "undefined (should not happen)");
+    return;
   else if (cls->format)
     cls->format(e, buf, end - buf);
   else

From 0f2f5ac58c8bc487ad62d153bfc5ebdb97d54fbd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 11:04:57 +0200
Subject: [PATCH 148/431] Fixed minor bugs in handling some route attributes

---
 filter/config.Y | 11 +++++++----
 filter/f-inst.c | 12 ++++++++++++
 nest/rt-attr.c  |  9 ++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index ca792593..8cecf936 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -27,6 +27,9 @@ static inline u32 pair_b(u32 p) { return p & 0xFFFF; }
     cf_error("Can't empty %s: not an attribute", sym->name); \
   f_generate_complex(fi_code, sym->attribute, arg); \
 })
+
+#define f_generate_complex_default(fi_code, da, arg, def) \
+  f_new_inst(FI_EA_SET, f_new_inst(fi_code, f_new_inst(FI_DEFAULT, f_new_inst(FI_EA_GET, da), f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = def })), arg), da)
   
 
 /*
@@ -902,10 +905,10 @@ cmd:
    }
  | attr_bit '=' term ';' {
      $$ = f_new_inst(FI_CONDITION, $3,
-	f_generate_complex(FI_BITOR, $1.class,
-	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)})),
-	f_generate_complex(FI_BITAND, $1.class,
-	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}))
+	f_generate_complex_default(FI_BITOR, $1.class,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)}), 0),
+	f_generate_complex_default(FI_BITAND, $1.class,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}), 0)
      );
    }
  | break_command print_list ';' {
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 9ff5f79a..e7b642ab 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -768,6 +768,18 @@
     ea_unset_attr(fs->eattrs, 1, da);
   }
 
+  INST(FI_DEFAULT, 2, 1) {
+    ARG_ANY(1);
+    ARG_ANY(2);
+
+    log(L_INFO "Type of arg 1 is: %d", v1.type);
+
+    if (v1.type == T_VOID)
+      RESULT_VAL(v2);
+    else
+      RESULT_VAL(v1);
+  }
+
   INST(FI_LENGTH, 1, 1) {	/* Get length of */
     ARG_ANY(1);
     switch(v1.type) {
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index ed3aaf01..cec1d7cf 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -836,7 +836,7 @@ ea_normalize(ea_list *e, int overlay)
   ea_merge(e, t, overlay);
   ea_sort(t);
 
-  return t->count ? t : NULL;
+  return t->count ? t : t->next;
 }
 
 /**
@@ -1075,11 +1075,6 @@ ea_show(struct cli *c, const eattr *e)
   struct ea_class *cls = ea_class_global[e->id];
   ASSERT_DIE(cls);
 
-  pos += bsprintf(pos, "%s", cls->name);
-
-  *pos++ = ':';
-  *pos++ = ' ';
-
   if (e->undef)
     return;
   else if (cls->format)
@@ -1115,7 +1110,7 @@ ea_show(struct cli *c, const eattr *e)
 	  bsprintf(pos, "<type %02x>", e->type);
       }
 
-  cli_printf(c, -1012, "\t%s", buf);
+  cli_printf(c, -1012, "\t%s: %s", cls->name, buf);
 }
 
 static void

From d2142ad4050c64991f856734bafadd527c28e74b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 12:14:05 +0200
Subject: [PATCH 149/431] Fixed displaying BGP and RIP attributes after recent
 reworks

---
 filter/test.conf  |  4 ----
 lib/route.h       |  1 +
 nest/rt-attr.c    | 41 +++++++++++++++++++++++------------------
 proto/bgp/attrs.c |  4 ++++
 proto/rip/rip.c   |  2 +-
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/filter/test.conf b/filter/test.conf
index eb9cc30c..cd2fa8db 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -1470,11 +1470,7 @@ bool t;
 	bgp_community = -empty-;
 	bgp_originator_id = 9.7.5.3;
 	bgp_cluster_list = -empty-;
-	t = defined(bgp_mp_reach_nlri);
-	t = defined(bgp_mp_unreach_nlri);
 	bgp_ext_community = --empty--;
-	bgp_as4_path = +empty+;
-	t = defined(bgp_as4_aggregator);
 	t = defined(bgp_aigp);
 	bgp_large_community = ---empty---;
 	t = defined(bgp_mpls_label_stack);
diff --git a/lib/route.h b/lib/route.h
index f7b089d9..130465f9 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -172,6 +172,7 @@ struct ea_class {
   btype type;				/* Data type ID */ \
   uint readonly:1;			/* This attribute can't be changed by filters */ \
   uint conf:1;				/* Requested by config */ \
+  uint hidden:1;			/* Technical attribute, do not show, do not expose to filters */ \
   void (*format)(const eattr *ea, byte *buf, uint size); \
   void (*stored)(const eattr *ea);	/* When stored into global hash */ \
   void (*freed)(const eattr *ea);	/* When released from global hash */ \
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index cec1d7cf..0881b61b 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -436,7 +436,8 @@ ea_class_free(struct ea_class *cl)
   /* No more ea class references. Unregister the attribute. */
   idm_free(&ea_class_idm, cl->id);
   ea_class_global[cl->id] = NULL;
-  ea_lex_unregister(cl);
+  if (!cl->hidden)
+    ea_lex_unregister(cl);
 }
 
 static void
@@ -492,7 +493,8 @@ ea_register(pool *p, struct ea_class *def)
   ASSERT_DIE(def->id < ea_class_max);
   ea_class_global[def->id] = def;
 
-  ea_lex_register(def);
+  if (!def->hidden)
+    ea_lex_register(def);
 
   return ea_ref_class(p, def);
 }
@@ -1017,37 +1019,40 @@ opaque_format(const struct adata *ad, byte *buf, uint size)
 }
 
 static inline void
-ea_show_int_set(struct cli *c, const struct adata *ad, int way, byte *pos, byte *buf, byte *end)
+ea_show_int_set(struct cli *c, const char *name, const struct adata *ad, int way, byte *buf)
 {
-  int i = int_set_format(ad, way, 0, pos, end - pos);
-  cli_printf(c, -1012, "\t%s", buf);
+  int nlen = strlen(name);
+  int i = int_set_format(ad, way, 0, buf, CLI_MSG_SIZE - nlen - 3);
+  cli_printf(c, -1012, "\t%s: %s", name, buf);
   while (i)
     {
-      i = int_set_format(ad, way, i, buf, end - buf - 1);
+      i = int_set_format(ad, way, i, buf, CLI_MSG_SIZE - 1);
       cli_printf(c, -1012, "\t\t%s", buf);
     }
 }
 
 static inline void
-ea_show_ec_set(struct cli *c, const struct adata *ad, byte *pos, byte *buf, byte *end)
+ea_show_ec_set(struct cli *c, const char *name, const struct adata *ad, byte *buf)
 {
-  int i = ec_set_format(ad, 0, pos, end - pos);
-  cli_printf(c, -1012, "\t%s", buf);
+  int nlen = strlen(name);
+  int i = ec_set_format(ad, 0, buf, CLI_MSG_SIZE - nlen - 3);
+  cli_printf(c, -1012, "\t%s: %s", name, buf);
   while (i)
     {
-      i = ec_set_format(ad, i, buf, end - buf - 1);
+      i = ec_set_format(ad, i, buf, CLI_MSG_SIZE - 1);
       cli_printf(c, -1012, "\t\t%s", buf);
     }
 }
 
 static inline void
-ea_show_lc_set(struct cli *c, const struct adata *ad, byte *pos, byte *buf, byte *end)
+ea_show_lc_set(struct cli *c, const char *name, const struct adata *ad, byte *buf)
 {
-  int i = lc_set_format(ad, 0, pos, end - pos);
-  cli_printf(c, -1012, "\t%s", buf);
+  int nlen = strlen(name);
+  int i = lc_set_format(ad, 0, buf, CLI_MSG_SIZE - nlen - 3);
+  cli_printf(c, -1012, "\t%s: %s", name, buf);
   while (i)
     {
-      i = lc_set_format(ad, i, buf, end - buf - 1);
+      i = lc_set_format(ad, i, buf, CLI_MSG_SIZE - 1);
       cli_printf(c, -1012, "\t\t%s", buf);
     }
 }
@@ -1075,7 +1080,7 @@ ea_show(struct cli *c, const eattr *e)
   struct ea_class *cls = ea_class_global[e->id];
   ASSERT_DIE(cls);
 
-  if (e->undef)
+  if (e->undef || cls->hidden)
     return;
   else if (cls->format)
     cls->format(e, buf, end - buf);
@@ -1098,13 +1103,13 @@ ea_show(struct cli *c, const eattr *e)
 	  as_path_format(ad, pos, end - pos);
 	  break;
 	case T_CLIST:
-	  ea_show_int_set(c, ad, 1, pos, buf, end);
+	  ea_show_int_set(c, cls->name, ad, 1, buf);
 	  return;
 	case T_ECLIST:
-	  ea_show_ec_set(c, ad, pos, buf, end);
+	  ea_show_ec_set(c, cls->name, ad, buf);
 	  return;
 	case T_LCLIST:
-	  ea_show_lc_set(c, ad, pos, buf, end);
+	  ea_show_lc_set(c, cls->name, ad, buf);
 	  return;
 	default:
 	  bsprintf(pos, "<type %02x>", e->type);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 46e949bf..22a53dce 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1122,12 +1122,14 @@ static union bgp_attr_desc bgp_attr_table[BGP_ATTR_MAX] = {
   [BA_MP_REACH_NLRI] = {
     .name = "bgp_mp_reach_nlri",
     .type = T_OPAQUE,
+    .hidden = 1,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_reach_nlri,
   },
   [BA_MP_UNREACH_NLRI] = {
     .name = "bgp_mp_unreach_nlri",
     .type = T_OPAQUE,
+    .hidden = 1,
     .flags = BAF_OPTIONAL,
     .decode = bgp_decode_mp_unreach_nlri,
   },
@@ -1142,6 +1144,7 @@ static union bgp_attr_desc bgp_attr_table[BGP_ATTR_MAX] = {
   [BA_AS4_PATH] = {
     .name = "bgp_as4_path",
     .type = T_PATH,
+    .hidden = 1,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_as4_path,
@@ -1149,6 +1152,7 @@ static union bgp_attr_desc bgp_attr_table[BGP_ATTR_MAX] = {
   [BA_AS4_AGGREGATOR] = {
     .name = "bgp_as4_aggregator",
     .type = T_OPAQUE,
+    .hidden = 1,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .encode = bgp_encode_raw,
     .decode = bgp_decode_as4_aggregator,
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index d6edac14..f5c01380 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -1240,7 +1240,7 @@ rip_get_route_info(rte *rte, byte *buf)
 static void
 rip_tag_format(const eattr *a, byte *buf, uint buflen)
 {
-  bsnprintf(buf, buflen, "tag: %04x", a->u.data);
+  bsnprintf(buf, buflen, "%04x", a->u.data);
 }
 
 static struct ea_class ea_rip_metric = {

From c431d9c33c72203498133d7e2422423c37c4719d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 12:32:15 +0200
Subject: [PATCH 150/431] Fixed new route comparison

---
 nest/proto.c    |  2 +-
 nest/rt-table.c | 35 +++++++++++++++++++++++++----------
 nest/rt.h       |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 3792fde4..0daf59f4 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -177,7 +177,7 @@ proto_find_channel_by_name(struct proto *p, const char *n)
   return NULL;
 }
 
-rte * channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
 
 void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
 void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ed0132ca..41b6337e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1282,6 +1282,14 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
 
+  /* If the new route is identical to the old one, we find the attributes in
+   * cache and clone these with no performance drop. OTOH, if we were to lookup
+   * the attributes, such a route definitely hasn't been anywhere yet,
+   * therefore it's definitely worth the time. */
+  struct rte_storage *new_stored = NULL;
+  if (new)
+    new = &(new_stored = rte_store(new, net, table))->rte;
+
   /* Find and remove original route from the same protocol */
   struct rte_storage **before_old = rte_find(net, src);
 
@@ -1304,7 +1312,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 		c->table->name, net->n.addr, old->src->proto->name, old->src->private_id, old->src->global_id);
 	}
 
-	  if (new && rte_same(old, new))
+	  if (new && rte_same(old, &new_stored->rte))
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
 
@@ -1315,6 +1323,10 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 		  stats->updates_ignored++;
 		  rt_rte_trace_in(D_ROUTES, req, new, "ignored");
 		}
+
+	      /* We need to free the already stored route here before returning */
+	      rte_free(new_stored);
+	      return;
 	  }
 
 	*before_old = (*before_old)->next;
@@ -1327,8 +1339,13 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
       return;
     }
 
-  if (req->preimport)
-    new = req->preimport(req, new, old);
+  /* If rejected by import limit, we need to pretend there is no route */
+  if (req->preimport && (req->preimport(req, new, old) == 0))
+  {
+    rte_free(new_stored);
+    new_stored = NULL;
+    new = NULL;
+  }
 
   int new_ok = rte_is_ok(new);
   int old_ok = rte_is_ok(old);
@@ -1343,8 +1360,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   if (old_ok || new_ok)
     table->last_rt_change = current_time();
 
-  struct rte_storage *new_stored = new ? rte_store(new, net, table) : NULL;
-
   if (table->config->sorted)
     {
       /* If routes are sorted, just insert new route to appropriate position */
@@ -1500,14 +1515,14 @@ rte_update_unlock(void)
     lp_flush(rte_update_pool);
 }
 
-rte *
+int
 channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 {
   struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
   if (new && !old)
     if (CHANNEL_LIMIT_PUSH(c, RX))
-      return NULL;
+      return 0;
 
   if (!new && old)
     CHANNEL_LIMIT_POP(c, RX);
@@ -1520,15 +1535,15 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
       if (c->in_keep & RIK_REJECTED)
       {
 	new->flags |= REF_FILTERED;
-	return new;
+	return 1;
       }
       else
-	return NULL;
+	return 0;
 
   if (!new_in && old_in)
     CHANNEL_LIMIT_POP(c, IN);
 
-  return new;
+  return 1;
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index c959d358..70e0283f 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -181,7 +181,7 @@ struct rt_import_request {
   void (*log_state_change)(struct rt_import_request *req, u8 state);
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
    * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
-  struct rte *(*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
+  int (*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
   struct rte *(*rte_modify)(struct rte *, struct linpool *);
 };
 

From d5cac1a4ef49f4159f3b95f53a405f81d785711b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 12:44:11 +0200
Subject: [PATCH 151/431] Route attribute display now normalizes ea_lists.

This is needed to display every attribute only once with overlay
attribute lists recently introduced.
---
 nest/rt-attr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 0881b61b..049dc72a 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1376,9 +1376,9 @@ ea_dump_all(void)
 void
 ea_show_list(struct cli *c, ea_list *eal)
 {
-  for( ; eal; eal=eal->next)
-    for(int i=0; i<eal->count; i++)
-      ea_show(c, &eal->attrs[i]);
+  ea_list *n = ea_normalize(eal, 0);
+  for (int i  =0; i < n->count; i++)
+    ea_show(c, &n->attrs[i]);
 }
 
 /**

From bdd6f728399a7601eaeff7165645fb0c597d309d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 13:39:28 +0200
Subject: [PATCH 152/431] Moved nexthop + hostentry display to other eattrs

---
 nest/rt-attr.c        | 59 +++++++++++++++++++++++++++++++++++++++++--
 nest/rt-show.c        | 41 ++++++------------------------
 nest/rt.h             |  2 ++
 proto/static/static.c |  2 +-
 4 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 049dc72a..ba036cd2 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1057,6 +1057,49 @@ ea_show_lc_set(struct cli *c, const char *name, const struct adata *ad, byte *bu
     }
 }
 
+void
+ea_show_nexthop_list(struct cli *c, struct nexthop_adata *nhad)
+{
+  if (!NEXTHOP_IS_REACHABLE(nhad))
+    return;
+
+  NEXTHOP_WALK(nh, nhad)
+  {
+    char mpls[MPLS_MAX_LABEL_STACK*12 + 5], *lsp = mpls;
+    char *onlink = (nh->flags & RNF_ONLINK) ? " onlink" : "";
+    char weight[16] = "";
+
+    if (nh->labels)
+    {
+      lsp += bsprintf(lsp, " mpls %d", nh->label[0]);
+      for (int i=1;i<nh->labels; i++)
+	lsp += bsprintf(lsp, "/%d", nh->label[i]);
+    }
+    *lsp = '\0';
+
+    if (!NEXTHOP_ONE(nhad))
+      bsprintf(weight, " weight %d", nh->weight + 1);
+
+    if (ipa_nonzero(nh->gw))
+      cli_printf(c, -1007, "\tvia %I on %s%s%s%s",
+	  nh->gw, nh->iface->name, mpls, onlink, weight);
+    else
+      cli_printf(c, -1007, "\tdev %s%s%s",
+	  nh->iface->name, mpls,  onlink, weight);
+  }
+}
+
+void
+ea_show_hostentry(const struct adata *ad, byte *buf, uint size)
+{
+  const struct hostentry_adata *had = (const struct hostentry_adata *) ad;
+
+  if (ipa_nonzero(had->he->link) && !ipa_equal(had->he->link, had->he->addr))
+    bsnprintf(buf, size, "via %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
+  else
+    bsnprintf(buf, size, "via %I table %s", had->he->addr, had->he->tab->name);
+}
+
 /**
  * ea_show - print an &eattr to CLI
  * @c: destination CLI
@@ -1088,6 +1131,9 @@ ea_show(struct cli *c, const eattr *e)
     switch (e->type)
       {
 	case T_INT:
+	  if ((cls == &ea_gen_igp_metric) && e->u.data >= IGP_METRIC_UNKNOWN)
+	    return;
+
 	  bsprintf(pos, "%u", e->u.data);
 	  break;
 	case T_OPAQUE:
@@ -1111,6 +1157,12 @@ ea_show(struct cli *c, const eattr *e)
 	case T_LCLIST:
 	  ea_show_lc_set(c, cls->name, ad, buf);
 	  return;
+	case T_NEXTHOP_LIST:
+	  ea_show_nexthop_list(c, (struct nexthop_adata *) e->u.ptr);
+	  return;
+	case T_HOSTENTRY:
+	  ea_show_hostentry(ad, pos, end - pos);
+	  break;
 	default:
 	  bsprintf(pos, "<type %02x>", e->type);
       }
@@ -1396,12 +1448,15 @@ rta_init(void)
   rte_src_init();
   ea_class_init();
 
+  /* These attributes are required to be first for nice "show route" output */
+  ea_register_init(&ea_gen_nexthop);
+  ea_register_init(&ea_gen_hostentry);
+
+  /* Other generic route attributes */
   ea_register_init(&ea_gen_preference);
   ea_register_init(&ea_gen_igp_metric);
   ea_register_init(&ea_gen_from);
   ea_register_init(&ea_gen_source);
-  ea_register_init(&ea_gen_nexthop);
-  ea_register_init(&ea_gen_hostentry);
   ea_register_init(&ea_gen_flowspec_valid);
 }
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 1404f7e6..ac6653ec 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -83,41 +83,16 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
       net_is_flow(e->net) ? flowspec_valid_name(flowspec_valid) : had ? "recursive" : rta_dest_name(dest),
       e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
-  if (dest == RTD_UNICAST)
-    NEXTHOP_WALK(nh, nhad)
-    {
-      char mpls[MPLS_MAX_LABEL_STACK*12 + 5], *lsp = mpls;
-      char *onlink = (nh->flags & RNF_ONLINK) ? " onlink" : "";
-      char weight[16] = "";
-
-      if (nh->labels)
-	{
-	  lsp += bsprintf(lsp, " mpls %d", nh->label[0]);
-	  for (int i=1;i<nh->labels; i++)
-	    lsp += bsprintf(lsp, "/%d", nh->label[i]);
-	}
-      *lsp = '\0';
-
-      if (!NEXTHOP_ONE(nhad))
-	bsprintf(weight, " weight %d", nh->weight + 1);
-
-      if (ipa_nonzero(nh->gw))
-	cli_printf(c, -1007, "\tvia %I on %s%s%s%s",
-		   nh->gw, nh->iface->name, mpls, onlink, weight);
-      else
-	cli_printf(c, -1007, "\tdev %s%s%s",
-		   nh->iface->name, mpls,  onlink, weight);
-    }
-  else if (had)
-    {
-      if (ipa_nonzero(had->he->link) && !ipa_equal(had->he->link, had->he->addr))
-	cli_printf(c, -1007, "\tvia %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
-      else
-	cli_printf(c, -1007, "\tvia %I table %s", had->he->addr, had->he->tab->name);
-    }
-
   if (d->verbose)
     ea_show_list(c, a);
+  else if (dest == RTD_UNICAST)
+    ea_show_nexthop_list(c, nhad);
+  else if (had)
+  {
+    char hetext[256];
+    ea_show_hostentry(&had->ad, hetext, sizeof hetext);
+    cli_printf(c, -1007, "\t%s", hetext);
+  }
 }
 
 static void
diff --git a/nest/rt.h b/nest/rt.h
index 70e0283f..745f96ef 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -459,6 +459,8 @@ struct hostentry_adata {
 void
 ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum]);
 
+void ea_show_hostentry(const struct adata *ad, byte *buf, uint size);
+void ea_show_nexthop_list(struct cli *c, struct nexthop_adata *nhad);
 
 /*
  *	Default protocol preferences
diff --git a/proto/static/static.c b/proto/static/static.c
index d1d5b92b..f0a514f7 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -695,7 +695,7 @@ static_get_route_info(rte *rte, byte *buf)
 {
   eattr *a = ea_find(rte->attrs, &ea_gen_igp_metric);
   u32 pref = rt_get_preference(rte);
-  if (a)
+  if (a && (a->u.data < IGP_METRIC_UNKNOWN))
     buf += bsprintf(buf, " (%d/%u)", pref, a->u.data);
   else
     buf += bsprintf(buf, " (%d)", pref);

From dc720a085f0f805891eb086bf96dac99c8a1b7da Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Jun 2022 19:53:06 +0200
Subject: [PATCH 153/431] Show route uses the export request also for one-net
 queries

---
 nest/config.Y   |  10 ++--
 nest/proto.c    |   5 +-
 nest/rt-show.c  | 118 ++++++++++++++---------------------------------
 nest/rt-table.c | 119 ++++++++++++++++++++++++++++++++++++++----------
 nest/rt.h       |  26 +++++++----
 5 files changed, 153 insertions(+), 125 deletions(-)

diff --git a/nest/config.Y b/nest/config.Y
index ec10dd69..7c163f74 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -659,20 +659,20 @@ r_args:
      $$ = $1;
      if ($$->addr) cf_error("Only one prefix expected");
      $$->addr = $2;
-     $$->addr_mode = RSD_ADDR_EQUAL;
+     $$->addr_mode = TE_ADDR_EQUAL;
    }
  | r_args FOR r_args_for {
      $$ = $1;
      if ($$->addr) cf_error("Only one prefix expected");
      $$->addr = $3;
-     $$->addr_mode = RSD_ADDR_FOR;
+     $$->addr_mode = TE_ADDR_FOR;
    }
  | r_args IN net_any {
      $$ = $1;
      if ($$->addr) cf_error("Only one prefix expected");
      if (!net_type_match($3, NB_IP)) cf_error("Only IP networks accepted for 'in' argument");
      $$->addr = $3;
-     $$->addr_mode = RSD_ADDR_IN;
+     $$->addr_mode = TE_ADDR_IN;
    }
 | r_args TABLE symbol_known {
      cf_assert_symbol($3, SYM_TABLE);
@@ -689,12 +689,12 @@ r_args:
    }
  | r_args IMPORT TABLE channel_arg {
      if (!($4->in_keep & RIK_PREFILTER)) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->table)->prefilter = $4;
+     rt_show_add_exporter($$, &$4->table->exporter, "import")->prefilter = $4;
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
      if (!$4->out_table) cf_error("No export table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->out_table);
+     rt_show_add_exporter($$, &$4->out_table->exporter, "export");
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args FILTER filter {
diff --git a/nest/proto.c b/nest/proto.c
index 0daf59f4..e7be8001 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -468,7 +468,8 @@ channel_start_export(struct channel *c)
 
   c->out_req = (struct rt_export_request) {
     .name = rn,
-    .addr_in = c->out_subprefix,
+    .addr = c->out_subprefix,
+    .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
@@ -952,7 +953,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   // c->ra_mode = cf->ra_mode;
   c->merge_limit = cf->merge_limit;
   c->preference = cf->preference;
-  c->out_req.addr_in = c->out_subprefix = cf->out_subprefix;
+  c->out_req.addr = c->out_subprefix = cf->out_subprefix;
   c->debug = cf->debug;
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->rpki_reload = cf->rpki_reload;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index ac6653ec..c3294518 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -29,24 +29,17 @@ rt_show_table(struct rt_show_data *d)
 
   if (d->last_table) cli_printf(c, -1007, "");
   cli_printf(c, -1007, "Table %s:",
-      d->tab->prefilter ? "import" : d->tab->table->name);
+      d->tab->name);
   d->last_table = d->tab;
 }
 
-static inline struct krt_proto *
-rt_show_get_kernel(struct rt_show_data *d)
-{
-  struct proto_config *krt = d->tab->table->config->krt_attached;
-  return krt ? (struct krt_proto *) krt->proto : NULL;
-}
-
 static void
 rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary)
 {
   byte from[IPA_MAX_TEXT_LENGTH+8];
   byte tm[TM_DATETIME_BUFFER_SIZE], info[256];
   ea_list *a = e->attrs;
-  int sync_error = d->kernel ? krt_get_sync_error(d->kernel, e) : 0;
+  int sync_error = d->tab->kernel ? krt_get_sync_error(d->tab->kernel, e) : 0;
   void (*get_route_info)(struct rte *, byte *buf);
   eattr *nhea = net_type_match(e->net, NB_DEST) ?
     ea_find(a, &ea_gen_nexthop) : NULL;
@@ -228,11 +221,6 @@ rt_show_export_stopped_cleanup(struct rt_export_request *req)
   /* The hook is now invalid */
   req->hook = NULL;
 
-  /* Unlock referenced tables */
-  struct rt_show_data_rtable *tab;
-  WALK_LIST(tab, d->tables)
-    rt_unlock_table(tab->table);
-
   /* And free the CLI (deferred) */
   rfree(d->cli->pool);
 }
@@ -276,11 +264,6 @@ rt_show_cont(struct rt_show_data *d)
   {
     cli_printf(c, 8004, "Stopped due to reconfiguration");
 
-    /* Unlock referenced tables */
-    struct rt_show_data_rtable *tab;
-    WALK_LIST(tab, d->tables)
-      rt_unlock_table(tab->table);
-
     /* No more action */
     c->cleanup = NULL;
     c->cont = NULL;
@@ -290,15 +273,15 @@ rt_show_cont(struct rt_show_data *d)
   }
 
   d->req = (struct rt_export_request) {
-    .addr_in = (d->addr_mode == RSD_ADDR_IN) ? d->addr : NULL,
+    .addr = d->addr,
     .name = "CLI Show Route",
     .export_bulk = rt_show_net_export_bulk,
     .dump_req = rt_show_dump_req,
     .log_state_change = rt_show_log_state_change,
+    .addr_mode = d->addr_mode,
   };
 
   d->table_counter++;
-  d->kernel = rt_show_get_kernel(d);
 
   d->show_counter_last = d->show_counter;
   d->rt_counter_last   = d->rt_counter;
@@ -307,7 +290,7 @@ rt_show_cont(struct rt_show_data *d)
   if (d->tables_defined_by & RSD_TDB_SET)
     rt_show_table(d);
 
-  rt_request_export(&d->tab->table->exporter, &d->req);
+  rt_request_export(d->tab->table, &d->req);
 }
 
 static void
@@ -325,19 +308,14 @@ rt_show_export_stopped(struct rt_export_request *req)
 
     cli_printf(d->cli, -1007, "%d of %d routes for %d networks in table %s",
 	       d->show_counter - d->show_counter_last, d->rt_counter - d->rt_counter_last,
-	       d->net_counter - d->net_counter_last, d->tab->table->name);
+	       d->net_counter - d->net_counter_last, d->tab->name);
   }
 
-  d->kernel = NULL;
   d->tab = NODE_NEXT(d->tab);
 
   if (NODE_VALID(d->tab))
     return rt_show_cont(d);
 
-  /* Unlock referenced tables */
-  struct rt_show_data_rtable *tab;
-  WALK_LIST(tab, d->tables)
-    rt_unlock_table(tab->table);
 
   /* Printout total stats */
   if (d->stats && (d->table_counter > 1))
@@ -346,6 +324,8 @@ rt_show_export_stopped(struct rt_export_request *req)
     cli_printf(d->cli, 14, "Total: %d of %d routes for %d networks in %d tables",
 	       d->show_counter, d->rt_counter, d->net_counter, d->table_counter);
   }
+  else if (!d->rt_counter && ((d->addr_mode == TE_ADDR_EQUAL) || (d->addr_mode == TE_ADDR_FOR)))
+    cli_printf(d->cli, 8001, "Network not found");
   else
     cli_printf(d->cli, 0, "");
 
@@ -353,14 +333,27 @@ rt_show_export_stopped(struct rt_export_request *req)
 }
 
 struct rt_show_data_rtable *
-rt_show_add_table(struct rt_show_data *d, rtable *t)
+rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *name)
 {
   struct rt_show_data_rtable *tab = cfg_allocz(sizeof(struct rt_show_data_rtable));
   tab->table = t;
+  tab->name = name;
   add_tail(&(d->tables), &(tab->n));
   return tab;
 }
 
+struct rt_show_data_rtable *
+rt_show_add_table(struct rt_show_data *d, struct rtable *t)
+{
+  struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter, t->name);
+
+  struct proto_config *krt = t->config->krt_attached;
+  if (krt)
+    rsdr->kernel = (struct krt_proto *) krt->proto;
+
+  return rsdr;
+}
+
 static inline void
 rt_show_get_default_tables(struct rt_show_data *d)
 {
@@ -415,16 +408,16 @@ rt_show_prepare_tables(struct rt_show_data *d)
     if (d->export_mode)
     {
       if (!tab->export_channel && d->export_channel &&
-	  (tab->table == d->export_channel->table))
+	  (tab->table == &d->export_channel->table->exporter))
 	tab->export_channel = d->export_channel;
 
       if (!tab->export_channel && d->export_protocol)
-	tab->export_channel = proto_find_channel_by_table(d->export_protocol, tab->table);
+	tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter, tab->table));
 
       if (!tab->export_channel)
       {
 	if (d->tables_defined_by & RSD_TDB_NMN)
-	  cf_error("No export channel for table %s", tab->table->name);
+	  cf_error("No export channel for table %s", tab->name);
 
 	rem_node(&(tab->n));
 	continue;
@@ -435,7 +428,7 @@ rt_show_prepare_tables(struct rt_show_data *d)
     if (d->addr && (tab->table->addr_type != d->addr->type))
     {
       if (d->tables_defined_by & RSD_TDB_NMN)
-	cf_error("Incompatible type of prefix/ip for table %s", tab->table->name);
+	cf_error("Incompatible type of prefix/ip for table %s", tab->name);
 
       rem_node(&(tab->n));
       continue;
@@ -456,65 +449,20 @@ rt_show_dummy_cont(struct cli *c UNUSED)
 void
 rt_show(struct rt_show_data *d)
 {
-  struct rt_show_data_rtable *tab;
-  net *n;
-
   /* Filtered routes are neither exported nor have sensible ordering */
   if (d->filtered && (d->export_mode || d->primary_only))
     cf_error("Incompatible show route options");
 
   rt_show_prepare_tables(d);
 
-  if (!d->addr || (d->addr_mode == RSD_ADDR_IN))
-  {
-    WALK_LIST(tab, d->tables)
-      rt_lock_table(tab->table);
+  if (EMPTY_LIST(d->tables))
+    cf_error("No suitable tables found");
 
-    /* There is at least one table */
-    d->tab = HEAD(d->tables);
-    this_cli->cleanup = rt_show_cleanup;
-    this_cli->rover = d;
-    this_cli->cont = rt_show_dummy_cont;
-    rt_show_cont(d);
-  }
-  else
-  {
-    uint max = 64;
-    rte **feed = mb_alloc(d->cli->pool, sizeof(rte *) * max);
+  d->tab = HEAD(d->tables);
 
-    WALK_LIST(tab, d->tables)
-    {
-      d->tab = tab;
-      d->kernel = rt_show_get_kernel(d);
+  this_cli->cleanup = rt_show_cleanup;
+  this_cli->rover = d;
+  this_cli->cont = rt_show_dummy_cont;
 
-      if (d->addr_mode == RSD_ADDR_FOR)
-	n = net_route(tab->table, d->addr);
-      else
-	n = net_find(tab->table, d->addr);
-
-      uint count = 0;
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	count++;
-
-      if (!count)
-	continue;
-
-      if (count > max)
-      {
-	do max *= 2; while (count > max);
-	feed = mb_realloc(feed, sizeof(rte *) * max);
-      }
-
-      uint i = 0;
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	feed[i++] = &e->rte;
-
-      rt_show_net(d, n->n.addr, feed, count);
-    }
-
-    if (d->rt_counter)
-      cli_msg(0, "");
-    else
-      cli_msg(8001, "Network not found");
-  }
+  rt_show_cont(d);
 }
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 41b6337e..7fcc43af 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -128,6 +128,8 @@ static inline void rt_schedule_notify(rtable *tab);
 static void rt_flowspec_notify(rtable *tab, net *net);
 static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
+static void rt_feed_equal(void *);
+static void rt_feed_for(void *);
 static uint rt_feed_net(struct rt_export_hook *c, net *n);
 
 const char *rt_import_state_name_array[TIS_MAX] = {
@@ -1189,8 +1191,27 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
     if (eh->export_state == TES_STOP)
       continue;
 
-    if (eh->req->addr_in && !net_in_netX(net->n.addr, eh->req->addr_in))
-      continue;
+    switch (eh->req->addr_mode)
+    {
+      case TE_ADDR_NONE:
+	break;
+
+      case TE_ADDR_IN:
+	if (!net_in_netX(net->n.addr, eh->req->addr))
+	  continue;
+	break;
+
+      case TE_ADDR_EQUAL:
+	if (!net_equal(net->n.addr, eh->req->addr))
+	  continue;
+	break;
+
+      case TE_ADDR_FOR:
+	bug("Continuos export of best prefix match not implemented yet.");
+
+      default:
+	bug("Strange table export address mode: %d", eh->req->addr_mode);
+    }
 
     if (new)
       eh->stats.updates_received++;
@@ -1788,17 +1809,33 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
   hook->lp = lp_new_default(p);
 
   /* stats zeroed by mb_allocz */
-  if (tab->trie && req->addr_in && net_val_match(tab->addr_type, NB_IP))
+  switch (req->addr_mode)
   {
-    hook->walk_state = mb_allocz(p, sizeof (struct f_trie_walk_state));
-    hook->walk_lock = rt_lock_trie(tab);
-    trie_walk_init(hook->walk_state, tab->trie, req->addr_in);
-    hook->event = ev_new_init(p, rt_feed_by_trie, hook);
-  }
-  else
-  {
-    FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
-    hook->event = ev_new_init(p, rt_feed_by_fib, hook);
+    case TE_ADDR_IN:
+      if (tab->trie && net_val_match(tab->addr_type, NB_IP))
+      {
+	hook->walk_state = mb_allocz(p, sizeof (struct f_trie_walk_state));
+	hook->walk_lock = rt_lock_trie(tab);
+	trie_walk_init(hook->walk_state, tab->trie, req->addr);
+	hook->event = ev_new_init(p, rt_feed_by_trie, hook);
+	break;
+      }
+      /* fall through */
+    case TE_ADDR_NONE:
+      FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
+      hook->event = ev_new_init(p, rt_feed_by_fib, hook);
+      break;
+
+    case TE_ADDR_EQUAL:
+      hook->event = ev_new_init(p, rt_feed_equal, hook);
+      break;
+
+    case TE_ADDR_FOR:
+      hook->event = ev_new_init(p, rt_feed_for, hook);
+      break;
+
+    default:
+      bug("Requested an unknown export address mode");
   }
 
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
@@ -1817,8 +1854,8 @@ rt_request_export(struct rt_exporter *re, struct rt_export_request *req)
   hook->n = (node) {};
   add_tail(&re->hooks, &hook->n);
 
+  /* Regular export */
   rt_set_export_state(hook, TES_FEEDING);
-
   ev_schedule_work(hook->event);
 }
 
@@ -1827,17 +1864,19 @@ rt_table_export_stop(struct rt_export_hook *hook)
 {
   rtable *tab = SKIP_BACK(rtable, exporter, hook->table);
 
-  if (hook->export_state == TES_FEEDING)
-    if (hook->walk_lock)
-    {
-      rt_unlock_trie(tab, hook->walk_lock);
-      hook->walk_lock = NULL;
+  if (hook->export_state != TES_FEEDING)
+    return;
 
-      mb_free(hook->walk_state);
-      hook->walk_state = NULL;
-    }
-    else
-      fit_get(&tab->fib, &hook->feed_fit);
+  if (hook->walk_lock)
+  {
+    rt_unlock_trie(tab, hook->walk_lock);
+    hook->walk_lock = NULL;
+
+    mb_free(hook->walk_state);
+    hook->walk_state = NULL;
+  }
+  else
+    fit_get(&tab->fib, &hook->feed_fit);
 }
 
 void
@@ -2317,6 +2356,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->flowspec_links);
 
   t->exporter = (struct rt_exporter) {
+    .addr_type = t->addr_type,
     .start = rt_table_export_start,
     .stop = rt_table_export_stop,
     .done = rt_table_export_done,
@@ -3222,7 +3262,7 @@ rt_feed_by_fib(void *data)
 
       ASSERT(c->export_state == TES_FEEDING);
 
-      if (!c->req->addr_in || net_in_netX(n->n.addr, c->req->addr_in))
+      if ((c->req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->req->addr))
 	max_feed -= rt_feed_net(c, n);
     }
   FIB_ITERATE_END;
@@ -3265,6 +3305,37 @@ rt_feed_by_trie(void *data)
   rt_set_export_state(c, TES_READY);
 }
 
+static void
+rt_feed_equal(void *data)
+{
+  struct rt_export_hook *c = data;
+  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+
+  ASSERT_DIE(c->export_state == TES_FEEDING);
+  ASSERT_DIE(c->req->addr_mode == TE_ADDR_EQUAL);
+
+  net *n = net_find(tab, c->req->addr);
+  if (n)
+    rt_feed_net(c, n);
+
+  rt_set_export_state(c, TES_READY);
+}
+
+static void
+rt_feed_for(void *data)
+{
+  struct rt_export_hook *c = data;
+  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+
+  ASSERT_DIE(c->export_state == TES_FEEDING);
+  ASSERT_DIE(c->req->addr_mode == TE_ADDR_FOR);
+
+  net *n = net_route(tab, c->req->addr);
+  if (n)
+    rt_feed_net(c, n);
+
+  rt_set_export_state(c, TES_READY);
+}
 
 static uint
 rt_feed_net(struct rt_export_hook *c, net *n)
diff --git a/nest/rt.h b/nest/rt.h
index 745f96ef..3ed56fcc 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -61,6 +61,7 @@ struct rt_export_request;
 
 struct rt_exporter {
   list hooks;				/* Registered route export hooks */
+  uint addr_type;			/* Type of address data exported (NET_*) */
   struct rt_export_hook *(*start)(struct rt_exporter *, struct rt_export_request *);
   void (*stop)(struct rt_export_hook *);
   void (*done)(struct rt_export_hook *);
@@ -212,9 +213,10 @@ struct rt_pending_export {
 
 struct rt_export_request {
   struct rt_export_hook *hook;		/* Table part of the export */
-  const net_addr *addr_in;		/* Subnet export request */
   char *name;
+  const net_addr *addr;			/* Network prefilter address */
   u8 trace_routes;
+  u8 addr_mode;				/* Network prefilter mode (TE_ADDR_*) */
 
   /* There are two methods of export. You can either request feeding every single change
    * or feeding the whole route feed. In case of regular export, &export_one is preferred.
@@ -273,9 +275,18 @@ struct rt_export_hook {
 #define TES_STOP	4
 #define TES_MAX		5
 
+/* Value of addr_mode */
+#define TE_ADDR_NONE	0		/* No address matching */
+#define TE_ADDR_EQUAL	1		/* Exact query - show route <addr> */
+#define TE_ADDR_FOR	2		/* Longest prefix match - show route for <addr> */
+#define TE_ADDR_IN	3		/* Interval query - show route in <addr> */
+
+
 void rt_request_import(rtable *tab, struct rt_import_request *req);
 void rt_request_export(struct rt_exporter *tab, struct rt_export_request *req);
 
+void rt_export_once(struct rt_exporter *tab, struct rt_export_request *req);
+
 void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
 void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));
 
@@ -397,9 +408,11 @@ extern const int rt_default_ecmp;
 
 struct rt_show_data_rtable {
   node n;
-  rtable *table;
+  const char *name;
+  struct rt_exporter *table;
   struct channel *export_channel;
   struct channel *prefilter;
+  struct krt_proto *kernel;
 };
 
 struct rt_show_data {
@@ -415,7 +428,6 @@ struct rt_show_data {
   struct proto *export_protocol;
   struct channel *export_channel;
   struct config *running_on_config;
-  struct krt_proto *kernel;
   struct rt_export_hook *kernel_export_hook;
   int export_mode, addr_mode, primary_only, filtered, stats;
 
@@ -425,7 +437,8 @@ struct rt_show_data {
 };
 
 void rt_show(struct rt_show_data *);
-struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t);
+struct rt_show_data_rtable * rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *name);
+struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, struct rtable *t);
 
 /* Value of table definition mode in struct rt_show_data */
 #define RSD_TDB_DEFAULT	  0		/* no table specified */
@@ -436,11 +449,6 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t
 #define RSD_TDB_SET	  0x1		/* internal: show empty tables */
 #define RSD_TDB_NMN	  0x2		/* internal: need matching net */
 
-/* Value of addr_mode */
-#define RSD_ADDR_EQUAL	1		/* Exact query - show route <addr> */
-#define RSD_ADDR_FOR	2		/* Longest prefix match - show route for <addr> */
-#define RSD_ADDR_IN	3		/* Interval query - show route in <addr> */
-
 /* Value of export_mode in struct rt_show_data */
 #define RSEM_NONE	0		/* Export mode not used */
 #define RSEM_PREEXPORT	1		/* Routes ready for export, before filtering */

From fd72c696784ba74e793db1fb7c44668c47a383b2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Jun 2022 10:51:00 +0200
Subject: [PATCH 154/431] Attribute lists split to storage headers and data to
 save BGP memory

---
 lib/route.h    | 29 +++++++++++++++++++++--------
 nest/rt-attr.c | 39 ++++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 130465f9..30be7c4e 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -147,10 +147,6 @@ typedef struct eattr {
 #define EA_BIT_GET(ea) ((ea) >> 24)
 
 typedef struct ea_list {
-  struct ea_list *next_hash;		/* Next in hash chain */
-  struct ea_list **pprev_hash;		/* Previous in hash chain */
-  u32 uc;				/* Use count */
-  u32 hash_key;				/* List hash */
   struct ea_list *next;			/* In case we have an override list */
   byte flags;				/* Flags: EALF_... */
   byte rfu;
@@ -158,10 +154,17 @@ typedef struct ea_list {
   eattr attrs[0];			/* Attribute definitions themselves */
 } ea_list;
 
+struct ea_storage {
+  struct ea_storage *next_hash;		/* Next in hash chain */
+  struct ea_storage **pprev_hash;	/* Previous in hash chain */
+  u32 uc;				/* Use count */
+  u32 hash_key;				/* List hash */
+  ea_list l[0];				/* The list itself */
+};
+
 #define EALF_SORTED 1			/* Attributes are sorted by code */
 #define EALF_BISECT 2			/* Use interval bisection for searching */
 #define EALF_CACHED 4			/* List is cached */
-#define EALF_OVERLAY  8			/* List is an overlay in the same table */
 
 struct ea_class {
 #define EA_CLASS_INSIDE \
@@ -417,9 +420,19 @@ static inline int rte_dest(const rte *r)
 void rta_init(void);
 ea_list *ea_lookup(ea_list *, int overlay);		/* Get a cached (and normalized) variant of this attribute list */
 static inline int ea_is_cached(const ea_list *r) { return r->flags & EALF_CACHED; }
-static inline ea_list *ea_clone(ea_list *r) { r->uc++; return r; }
-void ea__free(ea_list *r);
-static inline void ea_free(ea_list *r) { if (r && !--r->uc) ea__free(r); }
+static inline struct ea_storage *ea_get_storage(ea_list *r)
+{
+  ASSERT_DIE(ea_is_cached(r));
+  return SKIP_BACK(struct ea_storage, l, r);
+}
+
+static inline ea_list *ea_clone(ea_list *r) { ea_get_storage(r)->uc++; return r; }
+void ea__free(struct ea_storage *r);
+static inline void ea_free(ea_list *l) {
+  if (!l) return;
+  struct ea_storage *r = ea_get_storage(l);
+  if (!--r->uc) ea__free(r);
+}
 
 void ea_dump(ea_list *);
 void ea_dump_all(void);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index ba036cd2..a66d4c6e 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1206,11 +1206,12 @@ ea_dump(ea_list *e)
     }
   while (e)
     {
+      struct ea_storage *s = ea_is_cached(e) ? ea_get_storage(e) : NULL;
       debug("[%c%c%c] uc=%d h=%08x",
 	    (e->flags & EALF_SORTED) ? 'S' : 's',
 	    (e->flags & EALF_BISECT) ? 'B' : 'b',
 	    (e->flags & EALF_CACHED) ? 'C' : 'c',
-	    e->uc, e->hash_key);
+	    s ? s->uc : 0, s ? s->hash_key : 0);
       for(i=0; i<e->count; i++)
 	{
 	  eattr *a = &e->attrs[i];
@@ -1304,12 +1305,12 @@ static uint rta_cache_count;
 static uint rta_cache_size = 32;
 static uint rta_cache_limit;
 static uint rta_cache_mask;
-static ea_list **rta_hash_table;
+static struct ea_storage **rta_hash_table;
 
 static void
 rta_alloc_hash(void)
 {
-  rta_hash_table = mb_allocz(rta_pool, sizeof(ea_list *) * rta_cache_size);
+  rta_hash_table = mb_allocz(rta_pool, sizeof(struct ea_storage *) * rta_cache_size);
   if (rta_cache_size < 32768)
     rta_cache_limit = rta_cache_size * 2;
   else
@@ -1318,7 +1319,7 @@ rta_alloc_hash(void)
 }
 
 static inline void
-rta_insert(ea_list *r)
+rta_insert(struct ea_storage *r)
 {
   uint h = r->hash_key & rta_cache_mask;
   r->next_hash = rta_hash_table[h];
@@ -1333,8 +1334,8 @@ rta_rehash(void)
 {
   uint ohs = rta_cache_size;
   uint h;
-  ea_list *r, *n;
-  ea_list **oht = rta_hash_table;
+  struct ea_storage *r, *n;
+  struct ea_storage **oht = rta_hash_table;
 
   rta_cache_size = 2*rta_cache_size;
   DBG("Rehashing rta cache from %d to %d entries.\n", ohs, rta_cache_size);
@@ -1364,7 +1365,7 @@ rta_rehash(void)
 ea_list *
 ea_lookup(ea_list *o, int overlay)
 {
-  ea_list *r;
+  struct ea_storage *r;
   uint h;
 
   ASSERT(!ea_is_cached(o));
@@ -1372,15 +1373,15 @@ ea_lookup(ea_list *o, int overlay)
   h = ea_hash(o);
 
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next_hash)
-    if (r->hash_key == h && ea_same(r, o))
-      return ea_clone(r);
+    if (r->hash_key == h && ea_same(r->l, o))
+      return ea_clone(r->l);
 
   uint elen = ea_list_size(o);
-  r = mb_alloc(rta_pool, elen);
-  ea_list_copy(r, o, elen);
-  ea_list_ref(r);
+  r = mb_alloc(rta_pool, elen + sizeof(struct ea_storage));
+  ea_list_copy(r->l, o, elen);
+  ea_list_ref(r->l);
 
-  r->flags |= EALF_CACHED;
+  r->l->flags |= EALF_CACHED;
   r->hash_key = h;
   r->uc = 1;
 
@@ -1389,19 +1390,19 @@ ea_lookup(ea_list *o, int overlay)
   if (++rta_cache_count > rta_cache_limit)
     rta_rehash();
 
-  return r;
+  return r->l;
 }
 
 void
-ea__free(ea_list *a)
+ea__free(struct ea_storage *a)
 {
-  ASSERT(rta_cache_count && ea_is_cached(a));
+  ASSERT(rta_cache_count);
   rta_cache_count--;
   *a->pprev_hash = a->next_hash;
   if (a->next_hash)
     a->next_hash->pprev_hash = a->pprev_hash;
 
-  ea_list_unref(a);
+  ea_list_unref(a->l);
   mb_free(a);
 }
 
@@ -1416,10 +1417,10 @@ ea_dump_all(void)
 {
   debug("Route attribute cache (%d entries, rehash at %d):\n", rta_cache_count, rta_cache_limit);
   for (uint h=0; h < rta_cache_size; h++)
-    for (ea_list *a = rta_hash_table[h]; a; a = a->next_hash)
+    for (struct ea_storage *a = rta_hash_table[h]; a; a = a->next_hash)
       {
 	debug("%p ", a);
-	ea_dump(a);
+	ea_dump(a->l);
 	debug("\n");
       }
   debug("\n");

From 61842ff3157d323f4d13b92effeca1c56c1dd262 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Jun 2022 12:57:18 +0200
Subject: [PATCH 155/431] Fixed bad import table attributes freeing

---
 nest/rt-table.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 7fcc43af..afa0ec5c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1627,7 +1627,14 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   /* Now the route attributes are kept by the in-table cached version
    * and we may drop the local handle */
   if (new && (c->in_keep & RIK_PREFILTER))
-    ea_free(new->attrs);
+  {
+    /* There may be some updates on top of the original attribute block */
+    ea_list *a = new->attrs;
+    while (a->next)
+      a = a->next;
+
+    ea_free(a);
+  }
 
   rte_update_unlock();
 }

From b06911f6ef1b4cd3f7ea541b062187e80a934dd8 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 29 Jun 2022 12:51:07 +0200
Subject: [PATCH 156/431] Do not try to check flowspec validity for piped
 routes

---
 nest/rt-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index afa0ec5c..5adf6346 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2925,7 +2925,7 @@ static struct rte_storage *
 rt_flowspec_update_rte(rtable *tab, net *n, rte *r)
 {
 #ifdef CONFIG_BGP
-  if (rt_get_source_attr(r) != RTS_BGP)
+  if (r->generation || (rt_get_source_attr(r) != RTS_BGP))
     return NULL;
 
   struct bgp_channel *bc = (struct bgp_channel *) SKIP_BACK(struct channel, in_req, r->sender->req);

From d5e3272f3d9b1bad7ceb6d0d5897a7269e28a537 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 29 Jun 2022 13:22:40 +0200
Subject: [PATCH 157/431] Hash: iterable now per partes by an iterator

It's now possible to pause iteration through hash. This requires
struct hash_iterator to be allocated somewhere handy.

The iteration itself is surrounded by HASH_WALK_ITER and
HASH_WALK_ITER_END. Call HASH_WALK_ITER_PUT to ask for pausing; it may
still do some more iterations until it comes to a suitable pausing
point. The iterator must be initalized to an empty structure. No cleanup
is needed if iteration is abandoned inbetween.
---
 lib/hash.h      | 40 ++++++++++++++++++++++++++++++----------
 lib/hash_test.c | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/lib/hash.h b/lib/hash.h
index 8febb33f..ebb2857a 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -10,7 +10,7 @@
 #ifndef _BIRD_HASH_H_
 #define _BIRD_HASH_H_
 
-#define HASH(type)		struct { type **data; uint count, order; }
+#define HASH(type)		struct { type **data; uint count; u16 iterators; u8 order; u8 down_requested:1; }
 #define HASH_TYPE(v)		typeof(** (v).data)
 #define HASH_SIZE(v)		(1U << (v).order)
 
@@ -125,20 +125,26 @@
 
 #define HASH_MAY_STEP_DOWN_(v,pool,rehash_fn,args)			\
   ({                                                                    \
-    if (((v).count < (HASH_SIZE(v) REHASH_LO_MARK(args))) &&		\
-	((v).order > (REHASH_LO_BOUND(args))))				\
+    if ((v).iterators)							\
+      (v).down_requested = 1;						\
+    else if (((v).count < (HASH_SIZE(v) REHASH_LO_MARK(args))) &&	\
+	     ((v).order > (REHASH_LO_BOUND(args))))			\
       rehash_fn(&(v), pool, -(REHASH_LO_STEP(args)));			\
   })
 
 #define HASH_MAY_RESIZE_DOWN_(v,pool,rehash_fn,args)			\
   ({                                                                    \
-    uint _o = (v).order;							\
-    while (((v).count < ((1U << _o) REHASH_LO_MARK(args))) &&		\
-	   (_o > (REHASH_LO_BOUND(args))))				\
-      _o -= (REHASH_LO_STEP(args));					\
-    if (_o < (v).order)							\
-      rehash_fn(&(v), pool, _o - (v).order);				\
-  })
+    if ((v).iterators)							\
+      (v).down_requested = 1;						\
+    else {								\
+      uint _o = (v).order;						\
+      while (((v).count < ((1U << _o) REHASH_LO_MARK(args))) &&		\
+	     (_o > (REHASH_LO_BOUND(args))))				\
+	_o -= (REHASH_LO_STEP(args));					\
+      if (_o < (v).order)						\
+	rehash_fn(&(v), pool, _o - (v).order);				\
+    }									\
+   })
 
 
 #define HASH_INSERT2(v,id,pool,node)					\
@@ -195,6 +201,20 @@
 #define HASH_WALK_FILTER_END } while (0)
 
 
+#define HASH_WALK_ITER(v, id, n, iter)					\
+  do {									\
+    uint _hash_walk_iter_put = 0;					\
+    uint _shift = 32 - (v).order;					\
+    for ( ; !_hash_walk_iter_put; (iter) += (1U << _shift)) {		\
+      _hash_walk_iter_put = ((iter) + (1U << _shift) == 0);		\
+      for (HASH_TYPE(v) *n = (v).data[(iter) >> _shift]; n; n = id##_NEXT((n)))\
+	if (HASH_FN(v, id, id##_KEY(n)) >= ((iter) >> _shift))		\
+
+#define HASH_WALK_ITER_PUT	(_hash_walk_iter_put = 1)
+
+#define HASH_WALK_ITER_END } } while (0)
+
+
 static inline void
 mem_hash_init(u64 *h)
 {
diff --git a/lib/hash_test.c b/lib/hash_test.c
index 4bce7017..ecfcdd66 100644
--- a/lib/hash_test.c
+++ b/lib/hash_test.c
@@ -285,6 +285,46 @@ t_walk_filter(void)
   return 1;
 }
 
+static int
+t_walk_iter(void)
+{
+  init_hash();
+  fill_hash();
+
+  u32 hit = 0;
+
+  u32 prev_hash = ~0;
+  for (uint cnt = 0; cnt < MAX_NUM; )
+  {
+    u32 last_hash = ~0;
+//    printf("PUT!\n");
+    HASH_WALK_ITER(hash, TEST, n, hit)
+    {
+      cnt++;
+      u32 cur_hash = HASH_FN(hash, TEST, n->key);
+      /*
+      printf("C%08x L%08x P%08x K%08x H%08x N%p S%d I%ld\n",
+	  cur_hash, last_hash, prev_hash, n->key, hit, n, _shift, n - &nodes[0]);
+	  */
+
+      if (last_hash == ~0U)
+      {
+	if (prev_hash != ~0U)
+	  bt_assert(prev_hash < cur_hash);
+	last_hash = prev_hash = cur_hash;
+      }
+      else
+	bt_assert(last_hash == cur_hash);
+
+      if (cnt < MAX_NUM)
+	HASH_WALK_ITER_PUT;
+    }
+    HASH_WALK_ITER_END;
+  }
+
+  return 1;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -299,6 +339,7 @@ main(int argc, char *argv[])
   bt_test_suite(t_walk_delsafe_remove, 	"HASH_WALK_DELSAFE and HASH_REMOVE");
   bt_test_suite(t_walk_delsafe_remove2,	"HASH_WALK_DELSAFE and HASH_REMOVE2. HASH_REMOVE2 is HASH_REMOVE and smart auto-resize function");
   bt_test_suite(t_walk_filter,		"HASH_WALK_FILTER");
+  bt_test_suite(t_walk_iter,		"HASH_WALK_ITER");
 
   return bt_exit_value();
 }

From 6b0368cc2c317d1acc0881a96b32ded291d82741 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 20 Jun 2022 19:10:49 +0200
Subject: [PATCH 158/431] Export tables merged with BGP prefix hash

Until now, if export table was enabled, Nest was storing exactly the
route before rt_notify() was called on it. This was quite sloppy and
spooky and it also wasn't reflecting the changes BGP does before
sending. And as BGP is storing the routes to be sent anyway, we are
simply keeping the already-sent routes in there to better rule out
unneeded reexports.

Some of the route attributes (IGP metric, preference) make no sense in
BGP, therefore these will be probably replaced by something sensible.
Also the nexthop shown in the short output is the BGP nexthop.
---
 lib/route.h         |   2 +
 nest/config.Y       |   2 +-
 nest/proto.c        |  16 ---
 nest/protocol.h     |   3 +-
 nest/rt-attr.c      |  27 ++++-
 nest/rt-table.c     | 168 +++-------------------------
 nest/rt.h           |  20 +++-
 proto/bgp/attrs.c   | 266 ++++++++++++++++++++++++++++++++++++++++----
 proto/bgp/bgp.c     |   7 +-
 proto/bgp/bgp.h     |  19 +++-
 proto/bgp/packets.c |  32 +++---
 11 files changed, 342 insertions(+), 220 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 30be7c4e..68596316 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -35,6 +35,7 @@ typedef struct rte {
 #define REF_STALE	4		/* Route is stale in a refresh cycle */
 #define REF_DISCARD	8		/* Route is scheduled for discard */
 #define REF_MODIFY	16		/* Route is scheduled for modify */
+#define REF_PENDING	32		/* Route has not propagated completely yet */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
 static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
@@ -53,6 +54,7 @@ struct rte_src {
 
 struct rte_src *rt_find_source(struct proto *p, u32 id);
 struct rte_src *rt_get_source(struct proto *p, u32 id);
+struct rte_src *rt_find_source_global(u32 id);
 static inline void rt_lock_source(struct rte_src *src) { src->uc++; }
 static inline void rt_unlock_source(struct rte_src *src) { src->uc--; }
 void rt_prune_sources(void);
diff --git a/nest/config.Y b/nest/config.Y
index 7c163f74..edddfc2b 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -694,7 +694,7 @@ r_args:
    }
  | r_args EXPORT TABLE channel_arg {
      if (!$4->out_table) cf_error("No export table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_exporter($$, &$4->out_table->exporter, "export");
+     rt_show_add_exporter($$, $4->out_table, "export");
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args FILTER filter {
diff --git a/nest/proto.c b/nest/proto.c
index e7be8001..061205c1 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -559,10 +559,6 @@ channel_export_stopped(struct rt_export_request *req)
     return;
   }
 
-  /* Free the routes from out_table */
-  if (c->out_table)
-    rt_prune_sync(c->out_table, 1);
-
   mb_free(c->out_req.name);
   c->out_req.name = NULL;
 
@@ -647,18 +643,6 @@ channel_setup_in_table(struct channel *c)
   c->in_keep |= RIK_PREFILTER;
 }
 
-/* Called by protocol to activate out_table */
-void
-channel_setup_out_table(struct channel *c)
-{
-  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
-  cf->name = "export";
-  cf->addr_type = c->net_type;
-  cf->internal = 1;
-
-  c->out_table = rt_setup(c->proto->pool, cf);
-}
-
 
 static void
 channel_do_start(struct channel *c)
diff --git a/nest/protocol.h b/nest/protocol.h
index a1701a7e..3ccd364a 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -537,7 +537,7 @@ struct channel {
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
   u8 rpki_reload;			/* RPKI changes trigger channel reload */
 
-  struct rtable *out_table;		/* Internal table for exported routes */
+  struct rt_exporter *out_table;	/* Internal table for exported routes */
 
   list roa_subscriptions;		/* List of active ROA table subscriptions based on filters roa_check() */
 };
@@ -610,7 +610,6 @@ int proto_configure_channel(struct proto *p, struct channel **c, struct channel_
 
 void channel_set_state(struct channel *c, uint state);
 void channel_setup_in_table(struct channel *c);
-void channel_setup_out_table(struct channel *c);
 void channel_schedule_reload(struct channel *c);
 
 static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index a66d4c6e..b31bc5cc 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -197,11 +197,14 @@ static struct idm src_ids;
 #define RSH_INIT_ORDER		6
 
 static HASH(struct rte_src) src_hash;
+static struct rte_src **rte_src_global;
+static uint rte_src_global_max = SRC_ID_INIT_SIZE;
 
 static void
 rte_src_init(void)
 {
   rte_src_slab = sl_new(rta_pool, sizeof(struct rte_src));
+  rte_src_global = mb_allocz(rta_pool, sizeof(struct rte_src *) * rte_src_global_max);
 
   idm_init(&src_ids, rta_pool, SRC_ID_INIT_SIZE);
 
@@ -232,10 +235,27 @@ rt_get_source(struct proto *p, u32 id)
   src->uc = 0;
 
   HASH_INSERT2(src_hash, RSH, rta_pool, src);
+  if (src->global_id >= rte_src_global_max)
+  {
+    rte_src_global = mb_realloc(rte_src_global, sizeof(struct rte_src *) * (rte_src_global_max *= 2));
+    memset(&rte_src_global[rte_src_global_max / 2], 0,
+	sizeof(struct rte_src *) * (rte_src_global_max / 2));
+  }
+
+  rte_src_global[src->global_id] = src;
 
   return src;
 }
 
+struct rte_src *
+rt_find_source_global(u32 id)
+{
+  if (id >= rte_src_global_max)
+    return NULL;
+  else
+    return rte_src_global[id];
+}
+
 void
 rt_prune_sources(void)
 {
@@ -1081,8 +1101,11 @@ ea_show_nexthop_list(struct cli *c, struct nexthop_adata *nhad)
       bsprintf(weight, " weight %d", nh->weight + 1);
 
     if (ipa_nonzero(nh->gw))
-      cli_printf(c, -1007, "\tvia %I on %s%s%s%s",
-	  nh->gw, nh->iface->name, mpls, onlink, weight);
+      if (nh->iface)
+	cli_printf(c, -1007, "\tvia %I on %s%s%s%s",
+	    nh->gw, nh->iface->name, mpls, onlink, weight);
+      else
+	cli_printf(c, -1007, "\tvia %I", nh->gw);
     else
       cli_printf(c, -1007, "\tdev %s%s%s",
 	  nh->iface->name, mpls,  onlink, weight);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 5adf6346..29690414 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -820,17 +820,6 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
   if (!new && old)
     CHANNEL_LIMIT_POP(c, OUT);
 
-  /* Apply export table */
-  struct rte_storage *old_exported = NULL;
-  if (c->out_table)
-  {
-    if (!rte_update_out(c, net, new, old, &old_exported))
-    {
-      channel_rte_trace_out(D_ROUTES, c, new, "idempotent");
-      return;
-    }
-  }
-
   if (new)
     stats->updates_accepted++;
   else
@@ -852,10 +841,7 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
       channel_rte_trace_out(D_ROUTES, c, old, "removed");
   }
 
-  p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
-
-  if (c->out_table && old_exported)
-    rte_free(old_exported);
+  p->rt_notify(p, c, net, new, old);
 }
 
 static void
@@ -1747,7 +1733,7 @@ rt_export_stopped(void *data)
   hook->stopped(hook->req);
 
   /* Reporting the hook as finished. */
-  tab->done(hook);
+  CALL(tab->done, hook);
 
   /* Freeing the hook together with its coroutine. */
   rfree(hook->pool);
@@ -1763,7 +1749,7 @@ rt_set_import_state(struct rt_import_hook *hook, u8 state)
     hook->req->log_state_change(hook->req, state);
 }
 
-static inline void
+void
 rt_set_export_state(struct rt_export_hook *hook, u8 state)
 {
   hook->last_state_change = current_time();
@@ -1874,16 +1860,22 @@ rt_table_export_stop(struct rt_export_hook *hook)
   if (hook->export_state != TES_FEEDING)
     return;
 
-  if (hook->walk_lock)
+  switch (hook->req->addr_mode)
   {
-    rt_unlock_trie(tab, hook->walk_lock);
-    hook->walk_lock = NULL;
-
-    mb_free(hook->walk_state);
-    hook->walk_state = NULL;
+    case TE_ADDR_IN:
+      if (hook->walk_lock)
+      {
+	rt_unlock_trie(tab, hook->walk_lock);
+	hook->walk_lock = NULL;
+	mb_free(hook->walk_state);
+	hook->walk_state = NULL;
+	break;
+      }
+      /* fall through */
+    case TE_ADDR_NONE:
+      fit_get(&tab->fib, &hook->feed_fit);
+      break;
   }
-  else
-    fit_get(&tab->fib, &hook->feed_fit);
 }
 
 void
@@ -1896,7 +1888,7 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   ev_postpone(hook->event);
 
   /* Stop feeding from the exporter */
-  hook->table->stop(hook);
+  CALL(hook->table->stop, hook);
 
   /* Reset the event as the stopped event */
   hook->event->hook = rt_export_stopped;
@@ -3397,130 +3389,6 @@ void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *n
     }
 }
 
-void
-rt_prune_sync(rtable *t, int all)
-{
-  struct fib_iterator fit;
-
-  FIB_ITERATE_INIT(&fit, &t->fib);
-
-again:
-  FIB_ITERATE_START(&t->fib, &fit, net, n)
-  {
-    struct rte_storage *e, **ee = &n->routes;
-
-    while (e = *ee)
-    {
-      if (all || (e->rte.flags & (REF_STALE | REF_DISCARD)))
-      {
-	*ee = e->next;
-	rte_free(e);
-	t->rt_count--;
-      }
-      else
-	ee = &e->next;
-    }
-
-    if (all || !n->routes)
-    {
-      FIB_ITERATE_PUT(&fit);
-      fib_delete(&t->fib, n);
-      goto again;
-    }
-  }
-  FIB_ITERATE_END;
-}
-
-
-/*
- *	Export table
- */
-
-int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old0, struct rte_storage **old_exported)
-{
-  struct rtable *tab = c->out_table;
-  struct rte_src *src;
-  net *net;
-
-  if (new)
-  {
-    net = net_get(tab, n);
-    src = new->src;
-  }
-  else
-  {
-    net = net_find(tab, n);
-    src = old0->src;
-
-    if (!net)
-      goto drop;
-  }
-
-  /* Find the old rte */
-  struct rte_storage **pos = (c->ra_mode == RA_ANY) ? rte_find(net, src) : &net->routes;
-  struct rte_storage *old = NULL;
-
-  if (old = *pos)
-  {
-    if (new && rte_same(&(*pos)->rte, new))
-      goto drop;
-
-    /* Remove the old rte */
-    *pos = old->next;
-    *old_exported = old;
-    tab->rt_count--;
-  }
-
-  if (!new)
-  {
-    if (!old)
-      goto drop;
-
-    if (!net->routes)
-      fib_delete(&tab->fib, net);
-
-    return 1;
-  }
-
-  /* Insert the new rte */
-  struct rte_storage *e = rte_store(new, net, tab);
-  e->rte.lastmod = current_time();
-  e->next = *pos;
-  *pos = e;
-  tab->rt_count++;
-  return 1;
-
-drop:
-  return 0;
-}
-
-void
-rt_refeed_channel(struct channel *c)
-{
-  if (!c->out_table)
-  {
-    channel_request_feeding(c);
-    return;
-  }
-
-  ASSERT_DIE(c->ra_mode != RA_ANY);
-
-  c->proto->feed_begin(c, 0);
-
-  FIB_WALK(&c->out_table->fib, net, n)
-  {
-    if (!n->routes)
-      continue;
-
-    rte e = n->routes->rte;
-    c->proto->rt_notify(c->proto, c, n->n.addr, &e, NULL);
-  }
-  FIB_WALK_END;
-
-  c->proto->feed_end(c);
-}
-
 
 /*
  *	Hostcache
diff --git a/nest/rt.h b/nest/rt.h
index 3ed56fcc..5a8c5a19 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -247,14 +247,20 @@ struct rt_export_hook {
     u32 withdraws_received;		/* Number of route withdraws received */
   } stats;
 
-  struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
-  struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
-  struct f_trie *walk_lock;		/* Locked trie for walking */
+  union {
+    struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
+    struct {
+      struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
+      struct f_trie *walk_lock;			/* Locked trie for walking */
+    };
+    u32 hash_iter;				/* Iterator over hash */
+  };
 
   btime last_state_change;		/* Time of last state transition */
 
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
   u8 export_state;			/* Route export state (TES_*, see below) */
+  u8 feed_type;				/* Which feeding method is used (TFT_*, see below) */
 
   struct event *event;			/* Event running all the export operations */
 
@@ -282,6 +288,10 @@ struct rt_export_hook {
 #define TE_ADDR_IN	3		/* Interval query - show route in <addr> */
 
 
+#define TFT_FIB		1
+#define TFT_TRIE	2
+#define TFT_HASH	3
+
 void rt_request_import(rtable *tab, struct rt_import_request *req);
 void rt_request_export(struct rt_exporter *tab, struct rt_export_request *req);
 
@@ -296,6 +306,8 @@ const char *rt_export_state_name(u8 state);
 static inline u8 rt_import_get_state(struct rt_import_hook *ih) { return ih ? ih->import_state : TIS_DOWN; }
 static inline u8 rt_export_get_state(struct rt_export_hook *eh) { return eh ? eh->export_state : TES_DOWN; }
 
+void rt_set_export_state(struct rt_export_hook *hook, u8 state);
+
 void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, struct rte_src *src);
 
 /* Types of route announcement, also used as flags */
@@ -386,8 +398,6 @@ int rt_reload_channel(struct channel *c);
 void rt_reload_channel_abort(struct channel *c);
 void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
-int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old, struct rte_storage **old_exported);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
 static inline int rt_is_ip(rtable *tab)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 22a53dce..084c9b63 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1550,7 +1550,6 @@ bgp_free_bucket_table(struct bgp_channel *c)
 static struct bgp_bucket *
 bgp_get_bucket(struct bgp_channel *c, ea_list *new)
 {
-
   /* Hash and lookup */
   u32 hash = ea_hash(new);
   struct bgp_bucket *b = HASH_FIND(c->bucket_hash, RBH, new, hash);
@@ -1571,8 +1570,7 @@ bgp_get_bucket(struct bgp_channel *c, ea_list *new)
   /* Copy the ea_list */
   ea_list_copy(b->eattrs, new, ea_size);
 
-  /* Insert the bucket to send queue and bucket hash */
-  add_tail(&c->bucket_queue, &b->send_node);
+  /* Insert the bucket to bucket hash */
   HASH_INSERT2(c->bucket_hash, RBH, c->pool, b);
 
   return b;
@@ -1590,14 +1588,30 @@ bgp_get_withdraw_bucket(struct bgp_channel *c)
   return c->withdraw_bucket;
 }
 
-void
-bgp_free_bucket(struct bgp_channel *c, struct bgp_bucket *b)
+static void
+bgp_free_bucket_xx(struct bgp_channel *c, struct bgp_bucket *b)
 {
-  rem_node(&b->send_node);
   HASH_REMOVE2(c->bucket_hash, RBH, c->pool, b);
   mb_free(b);
 }
 
+int
+bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b)
+{
+  /* Won't free the withdraw bucket */
+  if (b == c->withdraw_bucket)
+    return 0;
+
+  if (EMPTY_LIST(b->prefixes))
+    rem_node(&b->send_node);
+
+  if (b->px_uc || !EMPTY_LIST(b->prefixes))
+    return 0;
+
+  bgp_free_bucket_xx(c, b);
+  return 1;
+}
+
 void
 bgp_defer_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 {
@@ -1617,8 +1631,8 @@ bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
     struct bgp_prefix *px = HEAD(b->prefixes);
 
     log(L_ERR "%s: - withdrawing %N", p->p.name, &px->net);
-    rem_node(&px->buck_node);
-    add_tail(&wb->prefixes, &px->buck_node);
+    rem_node(&px->buck_node_xx);
+    add_tail(&wb->prefixes, &px->buck_node_xx);
   }
 }
 
@@ -1629,7 +1643,7 @@ bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 
 #define PXH_KEY(px)		px->net, px->path_id, px->hash
 #define PXH_NEXT(px)		px->next
-#define PXH_EQ(n1,i1,h1,n2,i2,h2) h1 == h2 && i1 == i2 && net_equal(n1, n2)
+#define PXH_EQ(n1,i1,h1,n2,i2,h2) h1 == h2 && (c->add_path_tx ? (i1 == i2) : 1) && net_equal(n1, n2)
 #define PXH_FN(n,i,h)		h
 
 #define PXH_REHASH		bgp_pxh_rehash
@@ -1659,15 +1673,13 @@ bgp_free_prefix_table(struct bgp_channel *c)
 static struct bgp_prefix *
 bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
 {
+  u32 path_id_hash = c->add_path_tx ? path_id : 0;
   /* We must use a different hash function than the rtable */
-  u32 hash = u32_hash(net_hash(net) ^ u32_hash(path_id));
-  struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id, hash);
+  u32 hash = u32_hash(net_hash(net) ^ u32_hash(path_id_hash));
+  struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id_hash, hash);
 
   if (px)
-  {
-    rem_node(&px->buck_node);
     return px;
-  }
 
   if (c->prefix_slab)
     px = sl_alloc(c->prefix_slab);
@@ -1684,10 +1696,64 @@ bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
   return px;
 }
 
-void
+static void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px);
+
+static inline int
+bgp_update_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *b)
+{
+#define BPX_TRACE(what)	do { \
+  if (c->c.debug & D_ROUTES) log(L_TRACE "%s.%s < %s %N %uG %s", \
+      c->c.proto->name, c->c.name, what, \
+      px->net, px->path_id, (b == c->withdraw_bucket) ? "withdraw" : "update"); } while (0)
+  px->lastmod = current_time();
+
+  /* Already queued for the same bucket */
+  if (px->cur == b)
+  {
+    BPX_TRACE("already queued");
+    return 0;
+  }
+
+  /* Unqueue from the old bucket */
+  if (px->cur)
+  {
+    rem_node(&px->buck_node_xx);
+    bgp_done_bucket(c, px->cur);
+  }
+
+  /* The new bucket is the same as we sent before */
+  if ((px->last == b) || c->c.out_table && !px->last && (b == c->withdraw_bucket))
+  {
+    if (px->cur)
+      BPX_TRACE("reverted");
+    else
+      BPX_TRACE("already sent");
+
+    /* Well, we haven't sent anything yet */
+    if (!px->last)
+      bgp_free_prefix(c, px);
+
+    px->cur = NULL;
+    return 0;
+  }
+
+  /* Enqueue the bucket if it has been empty */
+  if ((b != c->withdraw_bucket) && EMPTY_LIST(b->prefixes))
+    add_tail(&c->bucket_queue, &b->send_node);
+
+  /* Enqueue to the new bucket and indicate the change */
+  add_tail(&b->prefixes, &px->buck_node_xx);
+  px->cur = b;
+
+  BPX_TRACE("queued");
+  return 1;
+
+#undef BPX_TRACE
+}
+
+static void
 bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
 {
-  rem_node(&px->buck_node);
   HASH_REMOVE2(c->prefix_hash, PXH, c->pool, px);
 
   if (c->prefix_slab)
@@ -1696,6 +1762,167 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
     mb_free(px);
 }
 
+void
+bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *buck)
+{
+  /* Cleanup: We're called from bucket senders. */
+  ASSERT_DIE(px->cur == buck);
+  rem_node(&px->buck_node_xx);
+
+  /* We may want to store the updates */
+  if (c->c.out_table)
+  {
+    /* Nothing to be sent right now */
+    px->cur = NULL;
+
+    /* Unref the previous sent version */
+    if (px->last)
+      px->last->px_uc--;
+
+    /* Ref the current sent version */
+    if (buck != c->withdraw_bucket)
+    {
+      px->last = buck;
+      px->last->px_uc++;
+      return;
+    }
+
+    /* Prefixes belonging to the withdraw bucket are freed always */
+  }
+
+  bgp_free_prefix(c, px);
+}
+
+
+/*
+ *	Prefix hash table exporter
+ */
+
+static void
+bgp_out_table_feed(void *data)
+{
+  struct rt_export_hook *hook = data;
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, prefix_exporter, hook->table);
+
+  int max = 512;
+
+  const net_addr *neq = (hook->req->addr_mode == TE_ADDR_EQUAL) ? hook->req->addr : NULL;
+  const net_addr *cand = NULL;
+
+  do {
+    HASH_WALK_ITER(c->prefix_hash, PXH, n, hook->hash_iter)
+    {
+      switch (hook->req->addr_mode)
+      {
+	case TE_ADDR_IN:
+	  if (!net_in_netX(n->net, hook->req->addr))
+	    continue;
+	  /* fall through */
+	case TE_ADDR_NONE:
+	  /* Splitting only for multi-net exports */
+	  if (--max <= 0)
+	    HASH_WALK_ITER_PUT;
+	  break;
+
+	case TE_ADDR_FOR:
+	  if (!neq)
+	  {
+	    if (net_in_netX(hook->req->addr, n->net) && (!cand || (n->net->length > cand->length)))
+	      cand = n->net;
+	    continue;
+	  }
+	  /* fall through */
+	case TE_ADDR_EQUAL:
+	  if (!net_equal(n->net, neq))
+	    continue;
+	  break;
+      }
+
+      struct bgp_bucket *buck = n->cur ?: n->last;
+      ea_list *ea = NULL;
+      if (buck == c->withdraw_bucket)
+	ea_set_dest(&ea, 0, RTD_UNREACHABLE);
+      else
+      {
+	ea = buck->eattrs;
+	eattr *eanh = bgp_find_attr(ea, BA_NEXT_HOP);
+	ASSERT_DIE(eanh);
+	const ip_addr *nh = (const void *) eanh->u.ptr->data;
+
+	struct nexthop_adata nhad = {
+	  .ad = { .length = sizeof (struct nexthop_adata) - sizeof (struct adata), },
+	  .nh = { .gw = nh[0], },
+	};
+
+	ea_set_attr(&ea, EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nhad.ad)));
+      }
+
+      struct rte_storage es = {
+	.rte = {
+	  .attrs = ea,
+	  .net = n->net,
+	  .src = rt_find_source_global(n->path_id),
+	  .sender = NULL,
+	  .lastmod = n->lastmod,
+	  .flags = n->cur ? REF_PENDING : 0,
+	},
+      };
+
+      struct rt_pending_export rpe = {
+	.new = &es, .new_best = &es,
+      };
+
+      if (hook->req->export_bulk)
+      {
+	rte *feed = &es.rte;
+	hook->req->export_bulk(hook->req, n->net, &rpe, &feed, 1);
+      }
+      else if (hook->req->export_one)
+	hook->req->export_one(hook->req, n->net, &rpe);
+      else
+	bug("No export method in export request");
+    }
+    HASH_WALK_ITER_END;
+
+    neq = cand;
+    cand = NULL;
+  } while (neq);
+
+  if (hook->hash_iter)
+    ev_schedule_work(hook->event);
+  else
+    rt_set_export_state(hook, TES_READY);
+}
+
+static struct rt_export_hook *
+bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req UNUSED)
+{
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, prefix_exporter, re);
+  pool *p = rp_new(c->c.proto->pool, "Export hook");
+  struct rt_export_hook *hook = mb_allocz(p, sizeof(struct rt_export_hook));
+  hook->pool = p;
+  hook->lp = lp_new_default(p);
+  hook->event = ev_new_init(p, bgp_out_table_feed, hook);
+  hook->feed_type = TFT_HASH;
+
+  return hook;
+}
+
+void
+bgp_setup_out_table(struct bgp_channel *c)
+{
+  ASSERT_DIE(c->c.out_table == NULL);
+
+  c->prefix_exporter = (struct rt_exporter) {
+    .addr_type = c->c.table->addr_type,
+    .start = bgp_out_table_export_start,
+  };
+
+  init_list(&c->prefix_exporter.hooks);
+
+  c->c.out_table = &c->prefix_exporter;
+}
+
 
 /*
  *	BGP protocol glue
@@ -1894,7 +2121,6 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
   struct bgp_proto *p = (void *) P;
   struct bgp_channel *c = (void *) C;
   struct bgp_bucket *buck;
-  struct bgp_prefix *px;
   u32 path;
 
   if (new)
@@ -1915,10 +2141,8 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
     path = old->src->global_id;
   }
 
-  px = bgp_get_prefix(c, n, c->add_path_tx ? path : 0);
-  add_tail(&buck->prefixes, &px->buck_node);
-
-  bgp_schedule_packet(p->conn, c, PKT_UPDATE);
+  if (bgp_update_prefix(c, bgp_get_prefix(c, n, path), buck))
+    bgp_schedule_packet(p->conn, c, PKT_UPDATE);
 }
 
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 8df99420..6ffe8824 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1740,14 +1740,15 @@ bgp_channel_start(struct channel *C)
   }
 
   c->pool = p->p.pool; // XXXX
-  bgp_init_bucket_table(c);
-  bgp_init_prefix_table(c);
 
   if (c->cf->import_table)
     channel_setup_in_table(C);
 
   if (c->cf->export_table)
-    channel_setup_out_table(C);
+    bgp_setup_out_table(c);
+
+  bgp_init_bucket_table(c);
+  bgp_init_prefix_table(c);
 
   c->stale_timer = tm_new_init(c->pool, bgp_long_lived_stale_timeout, c, 0, 0);
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index cca7873a..003893e0 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -156,7 +156,7 @@ struct bgp_channel_config {
   u8 aigp_originate;			/* AIGP is originated automatically */
   u32 cost;				/* IGP cost for direct next hops */
   u8 import_table;			/* Use c.in_table as Adj-RIB-In */
-  u8 export_table;			/* Use c.out_table as Adj-RIB-Out */
+  u8 export_table;			/* Keep Adj-RIB-Out and export it */
 
   struct rtable_config *igp_table_ip4;	/* Table for recursive IPv4 next hop lookups */
   struct rtable_config *igp_table_ip6;	/* Table for recursive IPv6 next hop lookups */
@@ -357,6 +357,8 @@ struct bgp_channel {
   HASH(struct bgp_prefix) prefix_hash;	/* Prefixes to be sent */
   slab *prefix_slab;			/* Slab holding prefix nodes */
 
+  struct rt_exporter prefix_exporter;	/* Table-like exporter for prefix_hash */
+
   ip_addr next_hop_addr;		/* Local address for NEXT_HOP attribute */
   ip_addr link_addr;			/* Link-local version of next_hop_addr */
 
@@ -378,8 +380,11 @@ struct bgp_channel {
 };
 
 struct bgp_prefix {
-  node buck_node;			/* Node in per-bucket list */
+  node buck_node_xx;			/* Node in per-bucket list */
   struct bgp_prefix *next;		/* Node in prefix hash table */
+  struct bgp_bucket *last;		/* Last bucket sent with this prefix */
+  struct bgp_bucket *cur;		/* Current bucket (cur == last) if no update is required */
+  btime lastmod;			/* Last modification of this prefix */
   u32 hash;
   u32 path_id;
   net_addr net[0];
@@ -388,8 +393,9 @@ struct bgp_prefix {
 struct bgp_bucket {
   node send_node;			/* Node in send queue */
   struct bgp_bucket *next;		/* Node in bucket hash table */
-  list prefixes;			/* Prefixes in this bucket (struct bgp_prefix) */
+  list prefixes;			/* Prefixes to send in this bucket (struct bgp_prefix) */
   u32 hash;				/* Hash over extended attributes */
+  u32 px_uc;				/* How many prefixes are linking this bucket */
   ea_list eattrs[0];			/* Per-bucket extended attributes */
 };
 
@@ -556,15 +562,16 @@ int bgp_encode_attrs(struct bgp_write_state *s, ea_list *attrs, byte *buf, byte
 ea_list * bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len);
 void bgp_finish_attrs(struct bgp_parse_state *s, ea_list **to);
 
+void bgp_setup_out_table(struct bgp_channel *c);
+
 void bgp_init_bucket_table(struct bgp_channel *c);
 void bgp_free_bucket_table(struct bgp_channel *c);
-void bgp_free_bucket(struct bgp_channel *c, struct bgp_bucket *b);
-void bgp_defer_bucket(struct bgp_channel *c, struct bgp_bucket *b);
 void bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b);
+int bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b);
 
 void bgp_init_prefix_table(struct bgp_channel *c);
 void bgp_free_prefix_table(struct bgp_channel *c);
-void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
+void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *buck);
 
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index c2e98340..4d4ae3eb 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1488,7 +1488,7 @@ bgp_encode_nlri_ip4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -1573,7 +1573,7 @@ bgp_encode_nlri_ip6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -1661,7 +1661,7 @@ bgp_encode_nlri_vpn4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -1758,7 +1758,7 @@ bgp_encode_nlri_vpn6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -1845,7 +1845,7 @@ bgp_encode_nlri_flow4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
     memcpy(pos, net->data, flen);
     ADVANCE(pos, size, flen);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -1933,7 +1933,7 @@ bgp_encode_nlri_flow6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
     memcpy(pos, net->data, flen);
     ADVANCE(pos, size, flen);
 
-    bgp_free_prefix(s->channel, px);
+    bgp_done_prefix(s->channel, px, buck);
   }
 
   return pos - buf;
@@ -2167,6 +2167,8 @@ bgp_create_ip_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
    *	var	IPv4 Network Layer Reachability Information
    */
 
+  ASSERT_DIE(s->channel->withdraw_bucket != buck);
+
   int lr, la;
 
   la = bgp_encode_attrs(s, buck->eattrs, buf+4, buf + MAX_ATTRS_LENGTH);
@@ -2188,6 +2190,8 @@ bgp_create_ip_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
 static byte *
 bgp_create_mp_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *buf, byte *end)
 {
+  ASSERT_DIE(s->channel->withdraw_bucket != buck);
+
   /*
    *	2 B	IPv4 Withdrawn Routes Length (zero)
    *	---	IPv4 Withdrawn Routes NLRI (unused)
@@ -2341,9 +2345,8 @@ again: ;
     buck = HEAD(c->bucket_queue);
 
     /* Cleanup empty buckets */
-    if (EMPTY_LIST(buck->prefixes))
+    if (bgp_done_bucket(c, buck))
     {
-      bgp_free_bucket(c, buck);
       lp_restore(tmp_linpool, &tmpp);
       goto again;
     }
@@ -2352,10 +2355,7 @@ again: ;
       bgp_create_ip_reach(&s, buck, buf, end):
       bgp_create_mp_reach(&s, buck, buf, end);
 
-    if (EMPTY_LIST(buck->prefixes))
-      bgp_free_bucket(c, buck);
-    else
-      bgp_defer_bucket(c, buck);
+    bgp_done_bucket(c, buck);
 
     if (!res)
     {
@@ -2724,7 +2724,7 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, uint len)
   {
   case BGP_RR_REQUEST:
     BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
-    rt_refeed_channel(&c->c);
+    channel_request_feeding(&c->c);
     break;
 
   case BGP_RR_BEGIN:
@@ -2903,7 +2903,11 @@ bgp_schedule_packet(struct bgp_conn *conn, struct bgp_channel *c, int type)
 {
   ASSERT(conn->sk);
 
-  DBG("BGP: Scheduling packet type %d\n", type);
+  struct bgp_proto *p = conn->bgp;
+  if (c)
+    BGP_TRACE(D_PACKETS, "Scheduling packet type %d for channel %s", type, c->c.name);
+  else
+    BGP_TRACE(D_PACKETS, "Scheduling packet type %d", type);
 
   if (c)
   {

From 9efaf6bafea1c69629e59c6504980fb2986287fe Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 11 Jul 2022 17:04:52 +0200
Subject: [PATCH 159/431] Dropped the internal kernel protocol table for learnt
 routes.

The learnt routes are now pushed all into the connected table, not only
the best one. This shouldn't do any damage in well managed setups, yet
it should be noted that it is a change of behavior.

If anybody misses a feature which they implemented by misusing this
internal learn table, let us know, we'll consider implementing it in a
better way.
---
 sysdep/linux/netlink.c |   3 +-
 sysdep/unix/krt.c      | 239 ++---------------------------------------
 sysdep/unix/krt.h      |   4 -
 3 files changed, 11 insertions(+), 235 deletions(-)

diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index d802d3e0..656202ac 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -2042,11 +2042,10 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
     s->net = lp_alloc(s->pool, net->length);
     net_copy(s->net, net);
 
-    s->attrs = ra;
-
     ea_set_attr_data(&ra, &ea_gen_nexthop, 0,
 	nhad.ad.data, nhad.ad.length);
 
+    s->attrs = ra;
     s->proto = p;
     s->new = new;
     s->krt_src = krt_src;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index a37d3186..67d19cbb 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -302,236 +302,29 @@ krt_uptodate(rte *a, rte *b)
   return (a->attrs == b->attrs);
 }
 
-static void
-krt_learn_announce_update(struct krt_proto *p, rte *e)
-{
-  rte e0 = {
-    .attrs = ea_clone(e->attrs),
-    .src = p->p.main_source,
-  };
-
-  rte_update(p->p.main_channel, e->net, &e0, p->p.main_source);
-}
-
-static void
-krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
-{
-  rte_update(p->p.main_channel, n, NULL, p->p.main_source);
-}
-
 /* Called when alien route is discovered during scan */
 static void
 krt_learn_scan(struct krt_proto *p, rte *e)
 {
-  net *n = net_get(p->krt_table, e->net);
-  struct rte_storage *m, **mm;
+  rte e0 = {
+    .attrs = e->attrs,
+    .src = rt_get_source(&p->p, krt_metric(e)),
+  };
 
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
+  ea_set_attr_u32(&e0.attrs, &ea_gen_preference, 0, p->p.main_channel->preference);
 
-  for(mm = &n->routes; m = *mm; mm = &m->next)
-    if (krt_same_key(&m->rte, e))
-      break;
-  if (m)
-    {
-      if (krt_uptodate(&m->rte, e))
-	{
-	  krt_trace_in_rl(&rl_alien, p, e, "[alien] seen");
-	  rte_free(ee);
-	  m->rte.pflags |= KRT_REF_SEEN;
-	}
-      else
-	{
-	  krt_trace_in(p, e, "[alien] updated");
-	  *mm = m->next;
-	  rte_free(m);
-	  m = NULL;
-	}
-    }
-  else
-    krt_trace_in(p, e, "[alien] created");
-
-  if (!m)
-    {
-      ee->next = n->routes;
-      n->routes = ee;
-      ee->rte.pflags |= KRT_REF_SEEN;
-    }
-}
-
-static void
-krt_learn_prune(struct krt_proto *p)
-{
-  struct fib *fib = &p->krt_table->fib;
-  struct fib_iterator fit;
-
-  KRT_TRACE(p, D_EVENTS, "Pruning inherited routes");
-
-  FIB_ITERATE_INIT(&fit, fib);
-again:
-  FIB_ITERATE_START(fib, &fit, net, n)
-    {
-      struct rte_storage *e, **ee, *best, **pbest, *old_best;
-
-      /*
-       * Note that old_best may be NULL even if there was an old best route in
-       * the previous step, because it might be replaced in krt_learn_scan().
-       * But in that case there is a new valid best route.
-       */
-
-      old_best = NULL;
-      best = NULL;
-      pbest = NULL;
-      ee = &n->routes;
-      while (e = *ee)
-	{
-	  if (e->rte.pflags & KRT_REF_BEST)
-	    old_best = e;
-
-	  if (!(e->rte.pflags & KRT_REF_SEEN))
-	    {
-	      *ee = e->next;
-	      rte_free(e);
-	      continue;
-	    }
-
-	  if (!best || krt_metric(&best->rte) > krt_metric(&e->rte))
-	    {
-	      best = e;
-	      pbest = ee;
-	    }
-
-	  e->rte.pflags &= ~(KRT_REF_SEEN | KRT_REF_BEST);
-	  ee = &e->next;
-	}
-      if (!n->routes)
-	{
-	  DBG("%I/%d: deleting\n", n->n.prefix, n->n.pxlen);
-	  if (old_best)
-	    krt_learn_announce_delete(p, n->n.addr);
-
-	  FIB_ITERATE_PUT(&fit);
-	  fib_delete(fib, n);
-	  goto again;
-	}
-
-      best->rte.pflags |= KRT_REF_BEST;
-      *pbest = best->next;
-      best->next = n->routes;
-      n->routes = best;
-
-      if ((best != old_best) || p->reload)
-	{
-	  DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
-	  krt_learn_announce_update(p, &best->rte);
-	}
-      else
-	DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
-    }
-  FIB_ITERATE_END;
-
-  p->reload = 0;
+  rte_update(p->p.main_channel, e->net, &e0, e0.src);
 }
 
 static void
 krt_learn_async(struct krt_proto *p, rte *e, int new)
 {
-  net *n = net_get(p->krt_table, e->net);
-  struct rte_storage *g, **gg, *best, **bestp, *old_best;
-
-  ea_set_attr_u32(&e->attrs, &ea_gen_preference, 0, p->p.main_channel->preference);
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
-
-  old_best = n->routes;
-  for(gg=&n->routes; g = *gg; gg = &g->next)
-    if (krt_same_key(&g->rte, e))
-      break;
   if (new)
-    {
-      if (g)
-	{
-	  if (krt_uptodate(&g->rte, e))
-	    {
-	      krt_trace_in(p, e, "[alien async] same");
-	      rte_free(ee);
-	      return;
-	    }
-	  krt_trace_in(p, e, "[alien async] updated");
-	  *gg = g->next;
-	  rte_free(g);
-	}
-      else
-	krt_trace_in(p, e, "[alien async] created");
+    return krt_learn_scan(p, e);
 
-      ee->next = n->routes;
-      n->routes = ee;
-    }
-  else if (!g)
-    {
-      krt_trace_in(p, e, "[alien async] delete failed");
-      rte_free(ee);
-      return;
-    }
-  else
-    {
-      krt_trace_in(p, e, "[alien async] removed");
-      *gg = g->next;
-      rte_free(ee);
-      rte_free(g);
-    }
-  best = n->routes;
-  bestp = &n->routes;
-  for(gg=&n->routes; g=*gg; gg=&g->next)
-  {
-    if (krt_metric(&best->rte) > krt_metric(&g->rte))
-      {
-	best = g;
-	bestp = gg;
-      }
-
-    g->rte.pflags &= ~KRT_REF_BEST;
-  }
-
-  if (best)
-    {
-      best->rte.pflags |= KRT_REF_BEST;
-      *bestp = best->next;
-      best->next = n->routes;
-      n->routes = best;
-    }
-
-  if (best != old_best)
-    {
-      DBG("krt_learn_async: distributing change\n");
-      if (best)
-	krt_learn_announce_update(p, &best->rte);
-      else
-	krt_learn_announce_delete(p, n->n.addr);
-    }
-}
-
-static void
-krt_learn_init(struct krt_proto *p)
-{
-  if (KRT_CF->learn)
-  {
-    struct rtable_config *cf = mb_allocz(p->p.pool, sizeof(struct rtable_config));
-    cf->name = "Inherited";
-    cf->addr_type = p->p.net_type;
-    cf->internal = 1;
-
-    p->krt_table = rt_setup(p->p.pool, cf);
-  }
-}
-
-static void
-krt_dump(struct proto *P)
-{
-  struct krt_proto *p = (struct krt_proto *) P;
-
-  if (!KRT_CF->learn)
-    return;
-  debug("KRT: Table of inheritable routes\n");
-  rt_dump(p->krt_table);
+  struct rte_src *src = rt_find_source(&p->p, krt_metric(e));
+  if (src)
+    rte_update(p->p.main_channel, e->net, NULL, src);
 }
 
 #endif
@@ -738,11 +531,6 @@ krt_prune(struct krt_proto *p)
   }
   FIB_WALK_END;
 
-#ifdef KRT_ALLOW_LEARN
-  if (KRT_CF->learn)
-    krt_learn_prune(p);
-#endif
-
   if (p->ready)
     p->initialized = 1;
 }
@@ -1053,10 +841,6 @@ krt_start(struct proto *P)
   bmap_init(&p->seen_map, p->p.pool, 1024);
   add_tail(&krt_proto_list, &p->krt_node);
 
-#ifdef KRT_ALLOW_LEARN
-  krt_learn_init(p);
-#endif
-
   if (!krt_sys_start(p))
   {
     rem_node(&p->krt_node);
@@ -1172,9 +956,6 @@ struct protocol proto_unix_kernel = {
   .shutdown =		krt_shutdown,
   .reconfigure =	krt_reconfigure,
   .copy_config =	krt_copy_config,
-#ifdef KRT_ALLOW_LEARN
-  .dump =		krt_dump,
-#endif
 };
 
 void
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 69fc9aa1..e0d60cbd 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -55,10 +55,6 @@ struct krt_proto {
   struct proto p;
   struct krt_state sys;		/* Sysdep state */
 
-#ifdef KRT_ALLOW_LEARN
-  struct rtable *krt_table;	/* Internal table of inherited routes */
-#endif
-
 #ifndef CONFIG_ALL_TABLES_AT_ONCE
   timer *scan_timer;
 #endif

From 4ef2262bd575b071e43c30d0199398a5f6ac27a5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 11 Jul 2022 17:08:59 +0200
Subject: [PATCH 160/431] There are now no internal tables at all.

---
 nest/rt-table.c | 36 +++++++++++++++---------------------
 nest/rt.h       |  2 --
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 29690414..d30573de 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2293,9 +2293,6 @@ rt_free(resource *_r)
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
 
-  if (r->internal)
-    return;
-
   r->config->table = NULL;
   rem_node(&r->n);
 
@@ -2362,25 +2359,22 @@ rt_setup(pool *pp, struct rtable_config *cf)
   };
   init_list(&t->exporter.hooks);
 
-  if (!(t->internal = cf->internal))
+  init_list(&t->imports);
+
+  hmap_init(&t->id_map, p, 1024);
+  hmap_set(&t->id_map, 0);
+
+  init_list(&t->subscribers);
+
+  t->rt_event = ev_new_init(p, rt_event, t);
+  t->last_rt_change = t->gc_time = current_time();
+
+  t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
+
+  if (rt_is_flow(t))
   {
-    init_list(&t->imports);
-
-    hmap_init(&t->id_map, p, 1024);
-    hmap_set(&t->id_map, 0);
-
-    init_list(&t->subscribers);
-
-    t->rt_event = ev_new_init(p, rt_event, t);
-    t->last_rt_change = t->gc_time = current_time();
-
-    t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
-
-    if (rt_is_flow(t))
-    {
-      t->flowspec_trie = f_new_trie(lp_new_default(p), 0);
-      t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
-    }
+    t->flowspec_trie = f_new_trie(lp_new_default(p), 0);
+    t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
   }
 
   return t;
diff --git a/nest/rt.h b/nest/rt.h
index 5a8c5a19..4b347170 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -50,7 +50,6 @@ struct rtable_config {
   int gc_max_ops;			/* Maximum number of operations before GC is run */
   int gc_min_time;			/* Minimum time between two consecutive GC runs */
   byte sorted;				/* Routes of network are sorted according to rte_better() */
-  byte internal;			/* Internal table of a protocol */
   byte trie_used;			/* Rtable has attached trie */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
@@ -98,7 +97,6 @@ typedef struct rtable {
   byte prune_trie;			/* Prune prefix trie during next table prune */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
-  byte internal;			/* This table is internal for some other object */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct f_trie *trie_new;		/* New prefix trie defined during pruning */

From 080cbd1219ba86dd44712d0d24ceae884b34ec4b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 12 Jul 2022 10:36:10 +0200
Subject: [PATCH 161/431] Route refresh in tables uses a stale counter.

Until now, we were marking routes as REF_STALE and REF_DISCARD to
cleanup old routes after route refresh. This needed a synchronous route
table walk at both beginning and the end of route refresh routine,
marking the routes by the flags.

We avoid these walks by using a stale counter. Every route contains:
  u8 stale_cycle;
Every import hook contains:
  u8 stale_set;
  u8 stale_valid;
  u8 stale_pruned;
  u8 stale_pruning;

In base_state, stale_set == stale_valid == stale_pruned == stale_pruning
and all routes' stale_cycle also have the same value.

The route refresh looks like follows:
+ ----------- + --------- + ----------- + ------------- + ------------ +
|             | stale_set | stale_valid | stale_pruning | stale_pruned |
| Base        |     x     |      x      |        x      |       x      |
| Begin       |    x+1    |      x      |        x      |       x      |
  ... now routes are being inserted with stale_cycle == (x+1)
| End         |    x+1    |     x+1     |        x      |       x      |
  ... now table pruning routine is scheduled
| Prune begin |    x+1    |     x+1     |       x+1     |       x      |
  ... now routes with stale_cycle not between stale_set and stale_valid
      are deleted
| Prune end   |    x+1    |     x+1     |       x+1     |      x+1     |
+ ----------- + --------- + ----------- + ------------- + ------------ +

The pruning routine is asynchronous and may have high latency in
high-load environments. Therefore, multiple route refresh requests may
happen before the pruning routine starts, leading to this situation:

| Prune begin |    x+k    |     x+k     |    x -> x+k   |       x      |
  ... or even
| Prune begin |   x+k+1   |     x+k     |    x -> x+k   |       x      |
  ... if the prune event starts while another route refresh is running.

In such a case, the pruning routine still deletes routes not fitting
between stale_set and and stale_valid, effectively pruning the remnants
of all unpruned route refreshes from before:

| Prune end   |    x+k    |     x+k     |       x+k     |      x+k     |

In extremely rare cases, there may happen too many route refreshes
before any route prune routine finishes. If the difference between
stale_valid and stale_pruned becomes more than 128 when requesting for
another route refresh, the routine walks the table synchronously and
resets all the stale values to a base state, while logging a warning.
---
 lib/route.h          |  3 +-
 nest/rt-show.c       |  4 ++
 nest/rt-table.c      | 91 ++++++++++++++++++++++++++++++++------------
 nest/rt.h            |  8 +++-
 proto/bgp/bgp.c      | 18 ++++-----
 proto/rpki/packets.c |  8 ++--
 6 files changed, 90 insertions(+), 42 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 68596316..9f78ed00 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -29,11 +29,10 @@ typedef struct rte {
   u8 generation;			/* If this route import is based on other previously exported route,
 					   this value should be 1 + MAX(generation of the parent routes).
 					   Otherwise the route is independent and this value is zero. */
+  u8 stale_cycle;			/* Auxiliary value for route refresh */
 } rte;
 
 #define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_STALE	4		/* Route is stale in a refresh cycle */
-#define REF_DISCARD	8		/* Route is scheduled for discard */
 #define REF_MODIFY	16		/* Route is scheduled for modify */
 #define REF_PENDING	32		/* Route has not propagated completely yet */
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index c3294518..dd0fe595 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -77,7 +77,11 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
       e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info);
 
   if (d->verbose)
+  {
     ea_show_list(c, a);
+    cli_printf(c, -1008, "\tInternal route handling values: %uL %uG %uS",
+	e->src->private_id, e->src->global_id, e->stale_cycle);
+  }
   else if (dest == RTD_UNICAST)
     ea_show_nexthop_list(c, nhad);
   else if (had)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d30573de..2ba28e33 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1323,7 +1323,8 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
 
-	      old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
+	      old->flags &= ~REF_MODIFY;
+	      old->stale_cycle = new->stale_cycle;
 
 	      if (!rte_is_filtered(new))
 		{
@@ -1639,6 +1640,9 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
       nn = net_get(hook->table, n);
       new->net = nn->n.addr;
       new->sender = hook;
+
+      /* Set the stale cycle */
+      new->stale_cycle = hook->stale_set;
     }
   else if (!(nn = net_find(hook->table, n)))
     {
@@ -1916,15 +1920,38 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
  * flag in rt_refresh_end() and then removing such routes in the prune loop.
  */
 void
-rt_refresh_begin(rtable *t, struct rt_import_request *req)
+rt_refresh_begin(struct rt_import_request *req)
 {
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if (e->rte.sender == req->hook)
-	  e->rte.flags |= REF_STALE;
-    }
-  FIB_WALK_END;
+  struct rt_import_hook *hook = req->hook;
+  ASSERT_DIE(hook);
+  ASSERT_DIE(hook->stale_set == hook->stale_valid);
+
+  /* If the pruning routine is too slow */
+  if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
+      || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
+  {
+    log(L_WARN "Route refresh flood in table %s", hook->table->name);
+    FIB_WALK(&hook->table->fib, net, n)
+      {
+       for (struct rte_storage *e = n->routes; e; e = e->next)
+         if (e->rte.sender == req->hook)
+           e->rte.stale_cycle = 0;
+      }
+    FIB_WALK_END;
+    hook->stale_set = 1;
+    hook->stale_valid = 0;
+    hook->stale_pruned = 0;
+  }
+  /* Setting a new value of the stale modifier */
+  else if (!++hook->stale_set)
+  {
+    /* Let's reserve the stale_cycle zero value for always-invalid routes */
+    hook->stale_set = 1;
+    hook->stale_valid = 0;
+  }
+
+  if (req->trace_routes & D_STATES)
+    log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
 }
 
 /**
@@ -1936,34 +1963,32 @@ rt_refresh_begin(rtable *t, struct rt_import_request *req)
  * hook. See rt_refresh_begin() for description of refresh cycles.
  */
 void
-rt_refresh_end(rtable *t, struct rt_import_request *req)
+rt_refresh_end(struct rt_import_request *req)
 {
-  int prune = 0;
+  struct rt_import_hook *hook = req->hook;
+  ASSERT_DIE(hook);
 
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE))
-	  {
-	    e->rte.flags |= REF_DISCARD;
-	    prune = 1;
-	  }
-    }
-  FIB_WALK_END;
+  hook->stale_valid++;
+  ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  if (prune)
-    rt_schedule_prune(t);
+  rt_schedule_prune(hook->table);
+
+  if (req->trace_routes & D_STATES)
+    log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
 }
 
 void
 rt_modify_stale(rtable *t, struct rt_import_request *req)
 {
   int prune = 0;
+  struct rt_import_hook *s = req->hook;
 
   FIB_WALK(&t->fib, net, n)
     {
       for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
+	if ((e->rte.sender == s) &&
+	    !(e->rte.flags & REF_FILTERED) &&
+	    (e->rte.stale_cycle + 1 == s->stale_set))
 	  {
 	    e->rte.flags |= REF_MODIFY;
 	    prune = 1;
@@ -2434,6 +2459,13 @@ rt_prune_table(rtable *tab)
     WALK_LIST2(ih, n, tab->imports, n)
       if (ih->import_state == TIS_STOP)
 	rt_set_import_state(ih, TIS_FLUSHING);
+      else if ((ih->stale_valid != ih->stale_pruning) && (ih->stale_pruning == ih->stale_pruned))
+      {
+	ih->stale_pruning = ih->stale_valid;
+
+	if (ih->req->trace_routes & D_STATES)
+	  log(L_TRACE "%s: table prune after refresh begin [%u]", ih->req->name, ih->stale_pruning);
+      }
 
     FIB_ITERATE_INIT(fit, &tab->fib);
     tab->prune_state = 2;
@@ -2459,7 +2491,10 @@ again:
 
       for (struct rte_storage *e=n->routes; e; e=e->next)
       {
-	if ((e->rte.sender->import_state == TIS_FLUSHING) || (e->rte.flags & REF_DISCARD))
+	struct rt_import_hook *s = e->rte.sender;
+	if ((s->import_state == TIS_FLUSHING) ||
+	    (e->rte.stale_cycle < s->stale_valid) ||
+	    (e->rte.stale_cycle > s->stale_set))
 	  {
 	    rte_discard(n, &e->rte);
 	    limit--;
@@ -2544,6 +2579,12 @@ again:
       mb_free(ih);
       rt_unlock_table(tab);
     }
+    else if (ih->stale_pruning != ih->stale_pruned)
+    {
+      ih->stale_pruned = ih->stale_pruning;
+      if (ih->req->trace_routes & D_STATES)
+	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
+    }
 }
 
 /**
diff --git a/nest/rt.h b/nest/rt.h
index 4b347170..b9ae7d10 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -201,6 +201,10 @@ struct rt_import_hook {
   btime last_state_change;		/* Time of last state transition */
 
   u8 import_state;			/* IS_* */
+  u8 stale_set;				/* Set this stale_cycle to imported routes */
+  u8 stale_valid;			/* Routes with this stale_cycle and bigger are considered valid */
+  u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
+  u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
   void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
 };
@@ -381,8 +385,8 @@ net *net_get(rtable *tab, const net_addr *addr);
 net *net_route(rtable *tab, const net_addr *n);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
-void rt_refresh_begin(rtable *t, struct rt_import_request *);
-void rt_refresh_end(rtable *t, struct rt_import_request *);
+void rt_refresh_begin(struct rt_import_request *);
+void rt_refresh_end(struct rt_import_request *);
 void rt_modify_stale(rtable *t, struct rt_import_request *);
 void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 6ffe8824..d9008b9a 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -760,16 +760,16 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
       {
       case BGP_GRS_NONE:
 	c->gr_active = BGP_GRS_ACTIVE;
-	rt_refresh_begin(c->c.table, &c->c.in_req);
+	rt_refresh_begin(&c->c.in_req);
 	break;
 
       case BGP_GRS_ACTIVE:
-	rt_refresh_end(c->c.table, &c->c.in_req);
-	rt_refresh_begin(c->c.table, &c->c.in_req);
+	rt_refresh_end(&c->c.in_req);
+	rt_refresh_begin(&c->c.in_req);
 	break;
 
       case BGP_GRS_LLGR:
-	rt_refresh_begin(c->c.table, &c->c.in_req);
+	rt_refresh_begin(&c->c.in_req);
 	rt_modify_stale(c->c.table, &c->c.in_req);
 	break;
       }
@@ -777,8 +777,8 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
     else
     {
       /* Just flush the routes */
-      rt_refresh_begin(c->c.table, &c->c.in_req);
-      rt_refresh_end(c->c.table, &c->c.in_req);
+      rt_refresh_begin(&c->c.in_req);
+      rt_refresh_end(&c->c.in_req);
     }
 
     /* Reset bucket and prefix tables */
@@ -819,7 +819,7 @@ bgp_graceful_restart_done(struct bgp_channel *c)
     BGP_TRACE(D_EVENTS, "Neighbor graceful restart done");
 
   tm_stop(c->stale_timer);
-  rt_refresh_end(c->c.table, &c->c.in_req);
+  rt_refresh_end(&c->c.in_req);
 }
 
 /**
@@ -899,7 +899,7 @@ bgp_refresh_begin(struct bgp_channel *c)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
   c->load_state = BFS_REFRESHING;
-  rt_refresh_begin(c->c.table, &c->c.in_req);
+  rt_refresh_begin(&c->c.in_req);
 }
 
 /**
@@ -920,7 +920,7 @@ bgp_refresh_end(struct bgp_channel *c)
   { log(L_WARN "%s: END-OF-RR received without prior BEGIN-OF-RR, ignoring", p->p.name); return; }
 
   c->load_state = BFS_NONE;
-  rt_refresh_end(c->c.table, &c->c.in_req);
+  rt_refresh_end(&c->c.in_req);
 }
 
 
diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 4a52b54b..108da61b 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -661,9 +661,9 @@ rpki_handle_cache_response_pdu(struct rpki_cache *cache, const struct pdu_cache_
        * a refresh cycle.
        */
       if (cache->p->roa4_channel)
-	rt_refresh_begin(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
+	rt_refresh_begin(&cache->p->roa4_channel->in_req);
       if (cache->p->roa6_channel)
-	rt_refresh_begin(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
+	rt_refresh_begin(&cache->p->roa6_channel->in_req);
 
       cache->p->refresh_channels = 1;
     }
@@ -846,9 +846,9 @@ rpki_handle_end_of_data_pdu(struct rpki_cache *cache, const struct pdu_end_of_da
   {
     cache->p->refresh_channels = 0;
     if (cache->p->roa4_channel)
-      rt_refresh_end(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
+      rt_refresh_end(&cache->p->roa4_channel->in_req);
     if (cache->p->roa6_channel)
-      rt_refresh_end(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
+      rt_refresh_end(&cache->p->roa6_channel->in_req);
   }
 
   cache->last_update = current_time();

From bc2ce4aaa8d1e4d56776ee35352c5e2caa09a0e5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 12 Jul 2022 12:40:18 +0200
Subject: [PATCH 162/431] Removing the rte_modify API

For BGP LLGR purposes, there was an API allowing a protocol to directly
modify their stale routes in table before flushing them. This API was
called by the table prune routine which violates the future locking
requirements.

Instead of this, BGP now requests a special route export and reimports
these routes into the table, allowing for asynchronous execution without
locking the table on export.
---
 lib/route.h       |  1 -
 nest/proto.c      |  1 -
 nest/protocol.h   |  1 -
 nest/rt-table.c   | 51 --------------------------------------
 nest/rt.h         |  1 -
 proto/bgp/attrs.c | 62 +++++++++++++++++++++++++++++++++++------------
 proto/bgp/bgp.c   | 54 ++++++++++++++++++++++++++++++++++++++---
 proto/bgp/bgp.h   |  3 ++-
 8 files changed, 100 insertions(+), 74 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 9f78ed00..88a4373d 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -33,7 +33,6 @@ typedef struct rte {
 } rte;
 
 #define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_MODIFY	16		/* Route is scheduled for modify */
 #define REF_PENDING	32		/* Route has not propagated completely yet */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
diff --git a/nest/proto.c b/nest/proto.c
index 061205c1..72e479d7 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -438,7 +438,6 @@ channel_start_import(struct channel *c)
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
     .preimport = channel_preimport,
-    .rte_modify = c->proto->rte_modify,
   };
 
   ASSERT(c->channel_state == CS_UP);
diff --git a/nest/protocol.h b/nest/protocol.h
index 3ccd364a..026d42ab 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -189,7 +189,6 @@ struct proto {
   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
-  struct rte *(*rte_modify)(struct rte *, struct linpool *);
   void (*rte_insert)(struct network *, struct rte *);
   void (*rte_remove)(struct network *, struct rte *);
   u32 (*rte_igp_metric)(const struct rte *);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2ba28e33..50ddc141 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1322,8 +1322,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	  if (new && rte_same(old, &new_stored->rte))
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
-
-	      old->flags &= ~REF_MODIFY;
 	      old->stale_cycle = new->stale_cycle;
 
 	      if (!rte_is_filtered(new))
@@ -1673,24 +1671,6 @@ rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garb
   rte_update_unlock();
 }
 
-/* Modify existing route by protocol hook, used for long-lived graceful restart */
-static inline void
-rte_modify(net *net, rte *old)
-{
-  rte_update_lock();
-
-  rte *new = old->sender->req->rte_modify(old, rte_update_pool);
-  if (new != old)
-  {
-    if (new)
-      new->flags = old->flags & ~REF_MODIFY;
-
-    rte_recalculate(old->sender, net, new, old->src);
-  }
-
-  rte_update_unlock();
-}
-
 /* Check rtable for best route to given net whether it would be exported do p */
 int
 rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
@@ -1977,29 +1957,6 @@ rt_refresh_end(struct rt_import_request *req)
     log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
 }
 
-void
-rt_modify_stale(rtable *t, struct rt_import_request *req)
-{
-  int prune = 0;
-  struct rt_import_hook *s = req->hook;
-
-  FIB_WALK(&t->fib, net, n)
-    {
-      for (struct rte_storage *e = n->routes; e; e = e->next)
-	if ((e->rte.sender == s) &&
-	    !(e->rte.flags & REF_FILTERED) &&
-	    (e->rte.stale_cycle + 1 == s->stale_set))
-	  {
-	    e->rte.flags |= REF_MODIFY;
-	    prune = 1;
-	  }
-    }
-  FIB_WALK_END;
-
-  if (prune)
-    rt_schedule_prune(t);
-}
-
 /**
  * rte_dump - dump a route
  * @e: &rte to be dumped
@@ -2499,14 +2456,6 @@ again:
 	    rte_discard(n, &e->rte);
 	    limit--;
 
-	    goto rescan;
-	  }
-
-	if (e->rte.flags & REF_MODIFY)
-	  {
-	    rte_modify(n, &e->rte);
-	    limit--;
-
 	    goto rescan;
 	  }
       }
diff --git a/nest/rt.h b/nest/rt.h
index b9ae7d10..4a7a087f 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -181,7 +181,6 @@ struct rt_import_request {
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
    * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
   int (*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
-  struct rte *(*rte_modify)(struct rte *, struct linpool *);
 };
 
 struct rt_import_hook {
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 084c9b63..28eb6fee 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2546,27 +2546,59 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     return !old_suppressed;
 }
 
-rte *
-bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
+void
+bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
 {
-  eattr *ea = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
-  const struct adata *ad = ea ? ea->u.ptr : NULL;
-  uint flags = ea ? ea->flags : BAF_PARTIAL;
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  struct rt_import_hook *irh = c->c.in_req.hook;
 
-  if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
-    return NULL;
+  /* Find our routes among others */
+  for (uint i=0; i<count; i++)
+  {
+    rte *r = feed[i];
 
-  if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
-    return r;
+    /* Not our route */
+    if (r->sender != irh)
+      continue;
 
-  _Thread_local static rte e0;
-  e0 = *r;
+    /* A new route, do not mark as stale */
+    if (r->stale_cycle == irh->stale_set)
+      continue;
 
-  bgp_set_attr_ptr(&e0.attrs, BA_COMMUNITY, flags,
-		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
-  e0.pflags |= BGP_REF_STALE;
+    eattr *ea = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
+    const struct adata *ad = ea ? ea->u.ptr : NULL;
+    uint flags = ea ? ea->flags : BAF_PARTIAL;
 
-  return &e0;
+    /* LLGR not allowed, withdraw the route */
+    if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
+    {
+      rte_import(&c->c.in_req, n, NULL, r->src);
+      continue;
+    }
+
+    /* Route already marked as LLGR, do nothing */
+    if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
+      continue;
+
+    /* Store the tmp_linpool state to aggresively save memory */
+    struct lp_state tmpp;
+    lp_save(tmp_linpool, &tmpp);
+
+    /* Mark the route as LLGR */
+    rte e0 = *r;
+    bgp_set_attr_ptr(&e0.attrs, BA_COMMUNITY, flags, int_set_add(tmp_linpool, ad, BGP_COMM_LLGR_STALE));
+    e0.pflags &= ~BGP_REF_NOT_STALE;
+    e0.pflags |= BGP_REF_STALE;
+
+    /* We need to update the route but keep it stale. */
+    ASSERT_DIE(irh->stale_set == irh->stale_valid + 1);
+    irh->stale_set--;
+    rte_import(&c->c.in_req, n, &e0, r->src);
+    irh->stale_set++;
+
+    /* Restore the memory state */
+    lp_restore(tmp_linpool, &tmpp);
+  }
 }
 
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index d9008b9a..fb8fa529 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -139,6 +139,9 @@ static void bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd);
 static int bgp_incoming_connection(sock *sk, uint dummy UNUSED);
 static void bgp_listen_sock_err(sock *sk UNUSED, int err);
 
+static void bgp_graceful_restart_feed(struct bgp_channel *c);
+
+
 /**
  * bgp_open - open a BGP instance
  * @p: BGP instance
@@ -770,7 +773,7 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
 
       case BGP_GRS_LLGR:
 	rt_refresh_begin(&c->c.in_req);
-	rt_modify_stale(c->c.table, &c->c.in_req);
+	bgp_graceful_restart_feed(c);
 	break;
       }
     }
@@ -796,6 +799,52 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
   tm_start(p->gr_timer, p->conn->remote_caps->gr_time S);
 }
 
+static void
+bgp_graceful_restart_feed_done(struct rt_export_request *req)
+{
+  req->hook = NULL;
+}
+
+static void
+bgp_graceful_restart_feed_dump_req(struct rt_export_request *req)
+{
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  debug("  BGP-GR %s.%s export request %p\n", c->c.proto->name, c->c.name, req);
+}
+
+static void
+bgp_graceful_restart_feed_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  struct bgp_proto *p = (void *) c->c.proto;
+  BGP_TRACE(D_EVENTS, "Long-lived graceful restart export state changed to %s", rt_export_state_name(state));
+
+  if (state == TES_READY)
+    rt_stop_export(req, bgp_graceful_restart_feed_done);
+}
+
+static void
+bgp_graceful_restart_drop_export(struct rt_export_request *req UNUSED, const net_addr *n UNUSED, struct rt_pending_export *rpe UNUSED)
+{ /* Nothing to do */ }
+
+static void
+bgp_graceful_restart_feed(struct bgp_channel *c)
+{
+  c->stale_feed = (struct rt_export_request) {
+    .name = "BGP-GR",
+    .trace_routes = c->c.debug | c->c.proto->debug,
+    .dump_req = bgp_graceful_restart_feed_dump_req,
+    .log_state_change = bgp_graceful_restart_feed_log_state_change,
+    .export_bulk = bgp_rte_modify_stale,
+    .export_one = bgp_graceful_restart_drop_export,
+  };
+
+  rt_request_export(&c->c.table->exporter, &c->stale_feed);
+}
+
+
+
+
 /**
  * bgp_graceful_restart_done - finish active BGP graceful restart
  * @c: BGP channel
@@ -861,7 +910,7 @@ bgp_graceful_restart_timeout(timer *t)
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
       tm_start(c->stale_timer, c->stale_time S);
-      rt_modify_stale(c->c.table, &c->c.in_req);
+      bgp_graceful_restart_feed(c);
     }
   }
   else
@@ -1672,7 +1721,6 @@ bgp_init(struct proto_config *CF)
   P->rte_better = bgp_rte_better;
   P->rte_mergable = bgp_rte_mergable;
   P->rte_recalculate = cf->deterministic_med ? bgp_rte_recalculate : NULL;
-  P->rte_modify = bgp_rte_modify_stale;
   P->rte_igp_metric = bgp_rte_igp_metric;
 
   p->cf = cf;
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 003893e0..2e7615ea 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -371,6 +371,7 @@ struct bgp_channel {
 
   timer *stale_timer;			/* Long-lived stale timer for LLGR */
   u32 stale_time;			/* Stored LLGR stale time from last session */
+  struct rt_export_request stale_feed;	/* Feeder request for stale route modification */
 
   u8 add_path_rx;			/* Session expects receive of ADD-PATH extended NLRI */
   u8 add_path_tx;			/* Session expects transmit of ADD-PATH extended NLRI */
@@ -576,7 +577,7 @@ void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bu
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
 int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
-struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
+void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count);
 u32 bgp_rte_igp_metric(const rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
 int bgp_preexport(struct channel *, struct rte *);

From 1df20989c191353d9c6da4d8679f8cb1ead49f7f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 12 Jul 2022 14:46:06 +0200
Subject: [PATCH 163/431] Revert "Special table hooks rectified."

This reverts commit 44f26c49f966ca842ff9af55468de0b98c44b73e.
---
 lib/lists.c          |   9 -
 lib/lists.h          |   1 -
 nest/config.Y        |   4 +-
 nest/proto.c         | 434 +++++++------------------------
 nest/protocol.h      |  23 +-
 nest/route.h         |  35 ++-
 nest/rt-attr.c       |   3 +-
 nest/rt-show.c       |   7 +-
 nest/rt-table.c      | 595 +++++++++++++++++++++++++++++++------------
 proto/bgp/attrs.c    |  50 ++--
 proto/bgp/bgp.c      |  94 ++-----
 proto/bgp/bgp.h      |   3 +-
 proto/bgp/packets.c  |   2 +-
 proto/rpki/packets.c |   8 +-
 sysdep/unix/krt.c    | 256 +++++++++++++++++--
 sysdep/unix/krt.h    |   4 +
 16 files changed, 846 insertions(+), 682 deletions(-)

diff --git a/lib/lists.c b/lib/lists.c
index fe2b692b..200576cf 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -109,15 +109,6 @@ add_head(list *l, node *n)
   l->head = n;
 }
 
-LIST_INLINE void
-self_link(node *n)
-{
-  ASSUME(n->prev == NULL);
-  ASSUME(n->next == NULL);
-
-  n->prev = n->next = n;
-}
-
 /**
  * insert_node - insert a node to a list
  * @n: a new list node
diff --git a/lib/lists.h b/lib/lists.h
index 64b4a981..479f4ed1 100644
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -78,7 +78,6 @@ typedef union list {			/* In fact two overlayed nodes */
 #define LIST_INLINE
 void add_tail(list *, node *);
 void add_head(list *, node *);
-void self_link(node *);
 void rem_node(node *);
 void add_tail_list(list *, list *);
 void init_list(list *);
diff --git a/nest/config.Y b/nest/config.Y
index a56b25be..29d6b0db 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -644,12 +644,12 @@ r_args:
    }
  | r_args IMPORT TABLE channel_arg {
      if (!$4->in_table) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->in_table->tab);
+     rt_show_add_table($$, $4->in_table);
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
      if (!$4->out_table) cf_error("No export table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_table($$, $4->out_table->tab);
+     rt_show_add_table($$, $4->out_table);
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args FILTER filter {
diff --git a/nest/proto.c b/nest/proto.c
index cf448fd9..09582d2e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -47,7 +47,7 @@ static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
 
 extern struct protocol proto_unix_iface;
 
-static void channel_aux_request_refeed(struct channel_aux_table *cat);
+static void channel_request_reload(struct channel *c);
 static void proto_shutdown_loop(timer *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
@@ -88,9 +88,7 @@ channel_export_log_state_change(struct rt_export_request *req, u8 state)
   switch (state)
   {
     case TES_FEEDING:
-      if (c->out_table)
-	rt_refresh_begin(&c->out_table->push);
-      else if (c->proto->feed_begin)
+      if (c->proto->feed_begin)
 	c->proto->feed_begin(c, !c->refeeding);
       break;
     case TES_READY:
@@ -181,7 +179,6 @@ proto_find_channel_by_name(struct proto *p, const char *n)
 }
 
 rte * channel_preimport(struct rt_import_request *req, rte *new, rte *old);
-rte * channel_in_preimport(struct rt_import_request *req, rte *new, rte *old);
 
 void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
 void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
@@ -298,10 +295,14 @@ static void
 channel_roa_in_changed(struct rt_subscription *s)
 {
   struct channel *c = s->data;
+  int active = c->reload_event && ev_active(c->reload_event);
 
-  CD(c, "Reload triggered by RPKI change");
+  CD(c, "Reload triggered by RPKI change%s", active ? " - already active" : "");
 
-  channel_request_reload(c);
+  if (!active)
+    channel_request_reload(c);
+  else
+    c->reload_pending = 1;
 }
 
 static void
@@ -443,6 +444,7 @@ channel_start_import(struct channel *c)
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
     .preimport = channel_preimport,
+    .rte_modify = c->proto->rte_modify,
   };
 
   ASSERT(c->channel_state == CS_UP);
@@ -461,8 +463,7 @@ channel_start_export(struct channel *c)
 {
   if (c->out_req.hook)
   {
-    c->restart_export = 1;
-    log(L_WARN "%s.%s: Fast channel export restart", c->proto->name, c->name);
+    log(L_WARN "%s.%s: Attempted to start channel's already started export", c->proto->name, c->name);
     return;
   }
 
@@ -513,7 +514,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (c->out_req.hook || c->in_req.hook || c->out_table || c->in_table)
+      if (c->out_req.hook || c->in_req.hook)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -540,6 +541,9 @@ channel_import_stopped(struct rt_import_request *req)
 
   req->hook = NULL;
 
+  if (c->in_table)
+    rt_prune_sync(c->in_table, 1);
+
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
 
@@ -562,16 +566,14 @@ channel_export_stopped(struct rt_export_request *req)
     return;
   }
 
+  /* Free the routes from out_table */
+  if (c->out_table)
+    rt_prune_sync(c->out_table, 1);
+
   mb_free(c->out_req.name);
   c->out_req.name = NULL;
 
-  if (c->restart_export)
-  {
-    c->restart_export = 0;
-    channel_start_export(c);
-  }
-  else
-    channel_check_stopped(c);
+  channel_check_stopped(c);
 }
 
 static void
@@ -593,296 +595,72 @@ channel_feed_end(struct channel *c)
     return;
   }
 
-  if (c->out_table)
-    rt_refresh_end(&c->out_table->push);
-  else if (c->proto->feed_end)
+  if (c->proto->feed_end)
     c->proto->feed_end(c);
 
   if (c->refeed_pending)
     rt_stop_export(req, channel_export_stopped);
-}
-
-#define CHANNEL_AUX_TABLE_DUMP_REQ(inout, imex, pgimex, pushget)  static void \
-  channel_##inout##_##pushget##_dump_req(struct rt_##pgimex##_request *req) { \
-    struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, pushget, req); \
-    debug("  Channel %s.%s " #imex " table " #pushget " request %p\n", cat->c->proto->name, cat->c->name, req); }
-
-CHANNEL_AUX_TABLE_DUMP_REQ(in, import, import, push)
-CHANNEL_AUX_TABLE_DUMP_REQ(in, import, export, get)
-CHANNEL_AUX_TABLE_DUMP_REQ(out, export, import, push)
-CHANNEL_AUX_TABLE_DUMP_REQ(out, export, export, get)
-
-#undef CHANNEL_AUX_TABLE_DUMP_REQ
-
-static uint channel_aux_imex(struct channel_aux_table *cat)
-{
-  if (cat->c->in_table == cat)
-    return 0;
-  else if (cat->c->out_table == cat)
-    return 1;
   else
-    bug("Channel aux table must be in_table or out_table");
+    c->refeeding = 0;
+}
+
+/* Called by protocol for reload from in_table */
+void
+channel_schedule_reload(struct channel *c)
+{
+  ASSERT(c->in_req.hook);
+
+  rt_reload_channel_abort(c);
+  ev_schedule_work(c->reload_event);
 }
 
 static void
-channel_aux_stopped(void *data)
+channel_reload_loop(void *ptr)
 {
-  struct channel_aux_table *cat = data;
-  struct channel *c = cat->c;
+  struct channel *c = ptr;
 
-  if (channel_aux_imex(cat))
-    c->out_table = NULL;
-  else
-    c->in_table = NULL;
+  /* Start reload */
+  if (!c->reload_active)
+    c->reload_pending = 0;
 
-  mb_free(cat);
-  return channel_check_stopped(c);
-}
-
-static void
-channel_aux_import_stopped(struct rt_import_request *req)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  ASSERT_DIE(cat->stop);
-}
-
-static void
-channel_aux_export_stopped(struct rt_export_request *req)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  req->hook = NULL;
-
-  if (cat->refeed_pending && !cat->stop)
+  if (!rt_reload_channel(c))
   {
-    cat->refeed_pending = 0;
-    rt_request_export(cat->tab, req);
-  }
-  else
-    ASSERT_DIE(cat->stop);
-}
-
-static void
-channel_aux_stop(struct channel_aux_table *cat)
-{
-  cat->stop = 1;
-
-  rt_stop_import(&cat->push, channel_aux_import_stopped);
-  rt_stop_export(&cat->get, channel_aux_export_stopped);
-
-  rt_lock_table(cat->tab);
-  cat->tab->deleted = channel_aux_stopped;
-  cat->tab->del_data = cat;
-  rt_unlock_table(cat->tab);
-}
-
-static void
-channel_push_log_state_change(struct rt_import_request *req, u8 state)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  const char *imex = channel_aux_imex(cat) ? "export" : "import";
-  CD(cat->c, "Channel %s table import state changed to %s", imex, rt_import_state_name(state));
-}
-
-static void
-channel_get_log_state_change(struct rt_export_request *req, u8 state)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  const char *imex = channel_aux_imex(cat) ? "export" : "import";
-  CD(cat->c, "Channel %s table export state changed to %s", imex, rt_export_state_name(state));
-
-  switch (state)
-  {
-    case TES_FEEDING:
-      if (imex && cat->c->proto->feed_begin)
-	cat->c->proto->feed_begin(cat->c, !cat->c->refeeding);
-      else if (!imex)
-	rt_refresh_begin(&cat->c->in_req);
-      break;
-
-    case TES_READY:
-      if (imex && cat->c->proto->feed_end)
-	cat->c->proto->feed_end(cat->c);
-      else if (!imex)
-	rt_refresh_end(&cat->c->in_req);
-
-      if (cat->refeed_pending)
-	rt_stop_export(&cat->get, channel_aux_export_stopped);
-
-      break;
-  }
-}
-
-void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
-
-static void
-channel_in_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-
-  if (!rpe->new && !rpe->old)
+    ev_schedule_work(c->reload_event);
     return;
-
-  rte n0;
-  struct rte_src *src = rpe->new ? rpe->new->rte.src : rpe->old->rte.src;
-  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), src);
-}
-
-static void
-channel_in_export_one_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-
-  if (!rpe->new && !rpe->old)
-    return;
-
-  rte n0;
-  struct rte_src *src = rpe->old_best ? rpe->old_best->rte.src : rpe->new_best->rte.src;
-  rte_update_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), src);
-}
-
-static void
-channel_in_export_bulk_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  for (uint i=0; i<count; i++)
-  {
-    rte n0 = *feed[i];
-    rte_update_direct(cat->c, net, &n0, n0.src);
   }
-}
 
-static void
-channel_in_export_bulk_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  if (!count)
-    return;
-
-  rte n0 = *feed[0];
-  rte_update_direct(cat->c, net, &n0, n0.src);
-}
-
-void do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old);
-
-static void
-channel_out_export_one_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  rte n0;
-  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
-}
-
-static void
-channel_out_export_one_best(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  rte n0;
-  do_rt_notify_direct(cat->c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
-}
-
-static void
-channel_out_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
-  if (cat->c->ra_mode != RA_ANY)
-    ASSERT_DIE(count <= 1);
-
-  for (uint i=0; i<count; i++)
-  {
-    rte n0 = *feed[i];
-    do_rt_notify_direct(cat->c, net, &n0, NULL);
-  }
+  /* Restart reload */
+  if (c->reload_pending)
+    channel_request_reload(c);
 }
 
 /* Called by protocol to activate in_table */
 void
-channel_setup_in_table(struct channel *c, int best)
+channel_setup_in_table(struct channel *c)
 {
-  int nlen = sizeof("import") + strlen(c->name) + strlen(c->proto->name) + 3;
+  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
 
-  struct {
-    struct channel_aux_table cat;
-    struct rtable_config tab_cf;
-    char name[0];
-  } *cat = mb_allocz(c->proto->pool, sizeof(*cat) + nlen);
+  cf->name = "import";
+  cf->addr_type = c->net_type;
+  cf->internal = 1;
 
-  bsprintf(cat->name, "%s.%s.import", c->proto->name, c->name);
+  c->in_table = rt_setup(c->proto->pool, cf);
 
-  cat->tab_cf.name = cat->name;
-  cat->tab_cf.addr_type = c->net_type;
-
-  c->in_table = &cat->cat;
-  c->in_table->push = (struct rt_import_request) {
-    .name = cat->name,
-    .trace_routes = c->debug | c->proto->debug,
-    .dump_req = channel_in_push_dump_req,
-    .log_state_change = channel_push_log_state_change,
-    .preimport = channel_in_preimport,
-  };
-  c->in_table->get = (struct rt_export_request) {
-    .name = cat->name,
-    .trace_routes = c->debug | c->proto->debug,
-    .dump_req = channel_in_get_dump_req,
-    .log_state_change = channel_get_log_state_change,
-    .export_one = best ? channel_in_export_one_best : channel_in_export_one_any,
-    .export_bulk = best ? channel_in_export_bulk_best : channel_in_export_bulk_any,
-  };
-
-  c->in_table->c = c;
-  c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  self_link(&c->in_table->tab->n);
-
-  rt_request_import(c->in_table->tab, &c->in_table->push);
-  rt_request_export(c->in_table->tab, &c->in_table->get);
+  c->reload_event = ev_new_init(c->proto->pool, channel_reload_loop, c);
 }
 
 /* Called by protocol to activate out_table */
 void
 channel_setup_out_table(struct channel *c)
 {
-  int nlen = sizeof("export") + strlen(c->name) + strlen(c->proto->name) + 3;
+  struct rtable_config *cf = mb_allocz(c->proto->pool, sizeof(struct rtable_config));
+  cf->name = "export";
+  cf->addr_type = c->net_type;
+  cf->internal = 1;
 
-  struct {
-    struct channel_aux_table cat;
-    struct rtable_config tab_cf;
-    char name[0];
-  } *cat = mb_allocz(c->proto->pool, sizeof(*cat) + nlen);
-
-  bsprintf(cat->name, "%s.%s.export", c->proto->name, c->name);
-
-  cat->tab_cf.name = cat->name;
-  cat->tab_cf.addr_type = c->net_type;
-
-  c->out_table = &cat->cat;
-  c->out_table->push = (struct rt_import_request) {
-    .name = cat->name,
-    .trace_routes = c->debug | c->proto->debug,
-    .dump_req = channel_out_push_dump_req,
-    .log_state_change = channel_push_log_state_change,
-  };
-  c->out_table->get = (struct rt_export_request) {
-    .name = cat->name,
-    .trace_routes = c->debug | c->proto->debug,
-    .dump_req = channel_out_get_dump_req,
-    .log_state_change = channel_get_log_state_change,
-    .export_one = (c->ra_mode == RA_ANY) ? channel_out_export_one_any : channel_out_export_one_best,
-    .export_bulk = channel_out_export_bulk,
-  };
-
-  c->out_table->c = c;
-  c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
-  self_link(&c->out_table->tab->n);
-
-  rt_request_import(c->out_table->tab, &c->out_table->push);
-  rt_request_export(c->out_table->tab, &c->out_table->get);
+  c->out_table = rt_setup(c->proto->pool, cf);
 }
 
-static void
-channel_aux_request_refeed(struct channel_aux_table *cat)
-{
-  cat->refeed_pending = 1;
-  rt_stop_export(&cat->get, channel_aux_export_stopped);
-}
 
 static void
 channel_do_start(struct channel *c)
@@ -908,12 +686,16 @@ channel_do_up(struct channel *c)
 static void
 channel_do_pause(struct channel *c)
 {
+  /* Need to abort feeding */
+  if (c->reload_event)
+  {
+    ev_postpone(c->reload_event);
+    rt_reload_channel_abort(c);
+  }
+
   /* Stop export */
   if (c->out_req.hook)
-  {
     rt_stop_export(&c->out_req, channel_export_stopped);
-    c->refeeding = 0;
-  }
 
   channel_roa_unsubscribe_all(c);
 
@@ -924,13 +706,6 @@ channel_do_pause(struct channel *c)
 static void
 channel_do_stop(struct channel *c)
 {
-  /* Drop auxiliary tables */
-  if (c->in_table)
-    channel_aux_stop(c->in_table);
-
-  if (c->out_table)
-    channel_aux_stop(c->out_table);
-
   /* Stop import */
   if (c->in_req.hook)
     rt_stop_import(&c->in_req, channel_import_stopped);
@@ -941,13 +716,16 @@ channel_do_stop(struct channel *c)
 
   CALL(c->channel->shutdown, c);
 
-  channel_roa_unsubscribe_all(c);
+  /* This have to be done in here, as channel pool is freed before channel_do_down() */
+  c->in_table = NULL;
+  c->reload_event = NULL;
+  c->out_table = NULL;
 }
 
 static void
 channel_do_down(struct channel *c)
 {
-  ASSERT(!c->out_req.hook && !c->in_req.hook && !c->out_table && !c->in_table);
+  ASSERT(!c->reload_active);
 
   c->proto->active_channels--;
 
@@ -955,11 +733,13 @@ channel_do_down(struct channel *c)
   memset(&c->import_stats, 0, sizeof(struct channel_import_stats));
   memset(&c->export_stats, 0, sizeof(struct channel_export_stats));
 
-  CALL(c->channel->cleanup, c);
+  c->in_table = NULL;
+  c->reload_event = NULL;
+  c->out_table = NULL;
 
-  /* This have to be done in here, as channel pool is freed before channel_do_down() */
-  bmap_free(&c->export_map);
-  bmap_free(&c->export_reject_map);
+  /* The in_table and out_table are going to be freed by freeing their resource pools. */
+
+  CALL(c->channel->cleanup, c);
 
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
@@ -989,7 +769,7 @@ channel_set_state(struct channel *c, uint state)
     break;
 
   case CS_UP:
-    ASSERT(cs == CS_DOWN || cs == CS_START || cs == CS_PAUSE);
+    ASSERT(cs == CS_DOWN || cs == CS_START);
 
     if (cs == CS_DOWN)
       channel_do_start(c);
@@ -1039,8 +819,8 @@ channel_set_state(struct channel *c, uint state)
  * completed, it will switch back to ES_READY. This function can be called
  * even when feeding is already running, in that case it is restarted.
  */
-static void
-channel_request_table_feeding(struct channel *c)
+void
+channel_request_feeding(struct channel *c)
 {
   ASSERT(c->out_req.hook);
 
@@ -1048,18 +828,7 @@ channel_request_table_feeding(struct channel *c)
   rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
-void
-channel_request_feeding(struct channel *c)
-{
-  ASSERT(c->out_req.hook);
-
-  if (c->out_table)
-    channel_aux_request_refeed(c->out_table);
-  else
-    channel_request_table_feeding(c);
-}
-
-void
+static void
 channel_request_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
@@ -1067,29 +836,14 @@ channel_request_reload(struct channel *c)
 
   CD(c, "Reload requested");
 
-  if (c->in_table)
-    channel_aux_request_refeed(c->in_table);
-  else
-    c->proto->reload_routes(c);
-}
+  c->proto->reload_routes(c);
 
-void
-channel_refresh_begin(struct channel *c)
-{
-  CD(c, "Channel route refresh begin");
-  if (c->in_table)
-    rt_refresh_begin(&c->in_table->push);
-  else
-    rt_refresh_begin(&c->in_req);
-}
-
-void
-channel_refresh_end(struct channel *c)
-{
-  if (c->in_table)
-    rt_refresh_end(&c->in_table->push);
-  else
-    rt_refresh_end(&c->in_req);
+  /*
+   * Should this be done before reload_routes() hook?
+   * Perhaps, but routes are updated asynchronously.
+   */
+  channel_reset_limit(c, &c->rx_limit, PLD_RX);
+  channel_reset_limit(c, &c->in_limit, PLD_IN);
 }
 
 const struct channel_class channel_basic = {
@@ -1247,7 +1001,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
     channel_request_reload(c);
 
   if (export_changed)
-    channel_request_table_feeding(c);
+    channel_request_feeding(c);
 
 done:
   CD(c, "Reconfigured");
@@ -1960,7 +1714,7 @@ protos_dump_all(void)
   WALK_LIST(p, proto_list)
   {
 #define DPF(x)	(p->x ? " " #x : "")
-    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s\n",
+    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s%s\n",
 	p->name, p, p_states[p->proto_state], p->active_channels,
 	DPF(disabled), DPF(active), DPF(do_start), DPF(do_stop), DPF(reconfiguring));
 #undef DPF
@@ -1976,20 +1730,6 @@ protos_dump_all(void)
       debug("\tChannel state: %s/%s/%s\n", c_states[c->channel_state],
 	  c->in_req.hook ? rt_import_state_name(rt_import_get_state(c->in_req.hook)) : "-",
 	  c->out_req.hook ? rt_export_state_name(rt_export_get_state(c->out_req.hook)) : "-");
-      if (c->in_table)
-      {
-	debug("\tInput aux table:\n");
-	rt_dump_hooks(c->in_table->tab);
-	rt_dump(c->in_table->tab);
-	debug("\tEnd of input aux table.\n");
-      }
-      if (c->out_table)
-      {
-	debug("\tOutput aux table:\n");
-	rt_dump_hooks(c->in_table->tab);
-	rt_dump(c->in_table->tab);
-	debug("\tEnd of output aux table.\n");
-      }
     }
 
     if (p->proto->dump && (p->proto_state != PS_DOWN))
@@ -2411,11 +2151,11 @@ channel_show_stats(struct channel *c)
     cli_msg(-1006, "    Routes:         %u imported, %u exported, %u preferred",
 	    in_routes, out_routes, SRI(pref));
 
-  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored    limited    accepted");
-  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u %10u",
+  cli_msg(-1006, "    Route change stats:     received   rejected   filtered    ignored   RX limit   IN limit   accepted");
+  cli_msg(-1006, "      Import updates:     %10u %10u %10u %10u %10u %10u %10u",
 	  SCI(updates_received), SCI(updates_invalid),
 	  SCI(updates_filtered), SRI(updates_ignored),
-	  SCI(updates_limited_rx) + SCI(updates_limited_in),
+	  SCI(updates_limited_rx), SCI(updates_limited_in),
 	  SRI(updates_accepted));
   cli_msg(-1006, "      Import withdraws:   %10u %10u        --- %10u        --- %10u",
 	  SCI(withdraws_received), SCI(withdraws_invalid),
diff --git a/nest/protocol.h b/nest/protocol.h
index f9996b18..7447cbf0 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -207,6 +207,7 @@ struct proto {
   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
+  struct rte *(*rte_modify)(struct rte *, struct linpool *);
   void (*rte_insert)(struct network *, struct rte *);
   void (*rte_remove)(struct network *, struct rte *);
   u32 (*rte_igp_metric)(struct rte *);
@@ -543,29 +544,24 @@ struct channel {
   u8 reloadable;			/* Hook reload_routes() is allowed on the channel */
   u8 gr_lock;				/* Graceful restart mechanism should wait for this channel */
   u8 gr_wait;				/* Route export to channel is postponed until graceful restart */
-  u8 restart_export;			/* Route export should restart as soon as it stops */
 
   btime last_state_change;		/* Time of last state transition */
 
-  struct channel_aux_table *in_table;	/* Internal table for received routes */
+  struct rtable *in_table;		/* Internal table for received routes */
+  struct event *reload_event;		/* Event responsible for reloading from in_table */
+  struct fib_iterator reload_fit;	/* FIB iterator in in_table used during reloading */
+  struct rte_storage *reload_next_rte;	/* Route iterator in in_table used during reloading */
+  u8 reload_active;			/* Iterator reload_fit is linked */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
   u8 rpki_reload;			/* RPKI changes trigger channel reload */
 
-  struct channel_aux_table *out_table;	/* Internal table for exported routes */
+  struct rtable *out_table;		/* Internal table for exported routes */
 
   list roa_subscriptions;		/* List of active ROA table subscriptions based on filters roa_check() */
 };
 
-struct channel_aux_table {
-  struct channel *c;
-  struct rt_import_request push;
-  struct rt_export_request get;
-  rtable *tab;
-  u8 stop;
-  u8 refeed_pending;
-};
 
 /*
  * Channel states
@@ -631,7 +627,7 @@ struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
 
 void channel_set_state(struct channel *c, uint state);
-void channel_setup_in_table(struct channel *c, int best);
+void channel_setup_in_table(struct channel *c);
 void channel_setup_out_table(struct channel *c);
 void channel_schedule_reload(struct channel *c);
 
@@ -640,9 +636,6 @@ static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP)
 static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }
 
 void channel_request_feeding(struct channel *c);
-void channel_request_reload(struct channel *c);
-void channel_refresh_begin(struct channel *c);
-void channel_refresh_end(struct channel *c);
 void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 int channel_reconfigure(struct channel *c, struct channel_config *cf);
diff --git a/nest/route.h b/nest/route.h
index cb66be2a..d0568133 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -150,6 +150,7 @@ struct rtable_config {
   int gc_max_ops;			/* Maximum number of operations before GC is run */
   int gc_min_time;			/* Minimum time between two consecutive GC runs */
   byte sorted;				/* Routes of network are sorted according to rte_better() */
+  byte internal;			/* Internal table of a protocol */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
 };
@@ -171,8 +172,10 @@ typedef struct rtable {
   struct hmap id_map;
   struct hostcache *hostcache;
   struct rtable_config *config;		/* Configuration of this table */
-  void (*deleted)(void *);		/* Table should free itself. Call this when it is done. */
-  void *del_data;
+  struct config *deleted;		/* Table doesn't exist in current configuration,
+					 * delete as soon as use_count becomes 0 and remove
+					 * obstacle from this routing table.
+					 */
   struct event *rt_event;		/* Routing table event */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
@@ -181,6 +184,7 @@ typedef struct rtable {
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
+  byte internal;			/* This table is internal for some other object */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -245,7 +249,6 @@ typedef struct rte {
   u8 generation;			/* If this route import is based on other previously exported route,
 					   this value should be 1 + MAX(generation of the parent routes).
 					   Otherwise the route is independent and this value is zero. */
-  u8 stale_cycle;			/* Auxiliary value for route refresh */
 } rte;
 
 struct rte_storage {
@@ -253,11 +256,13 @@ struct rte_storage {
   struct rte rte;			/* Route data */
 };
 
-#define RTES_CLONE(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
-#define RTES_OR_NULL(r)		((r) ? &((r)->rte) : NULL)
+#define RTE_COPY(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
+#define RTE_OR_NULL(r)	((r) ? &((r)->rte) : NULL)
 
 #define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_USE_STALE	4		/* Do not reset route's stale_cycle to the actual value */
+#define REF_STALE	4		/* Route is stale in a refresh cycle */
+#define REF_DISCARD	8		/* Route is scheduled for discard */
+#define REF_MODIFY	16		/* Route is scheduled for modify */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
 static inline int rte_is_valid(const rte *r) { return r && !(r->flags & REF_FILTERED); }
@@ -278,6 +283,7 @@ struct rt_import_request {
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
    * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
   struct rte *(*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
+  struct rte *(*rte_modify)(struct rte *, struct linpool *);
 };
 
 struct rt_import_hook {
@@ -297,10 +303,6 @@ struct rt_import_hook {
   btime last_state_change;		/* Time of last state transition */
 
   u8 import_state;			/* IS_* */
-  u8 stale_set;				/* Set this stale_cycle to imported routes */
-  u8 stale_valid;			/* Routes with this stale_cycle and bigger are considered valid */
-  u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
-  u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
   void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
 };
@@ -453,9 +455,9 @@ void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
-
-void rt_refresh_begin(struct rt_import_request *);
-void rt_refresh_end(struct rt_import_request *);
+void rt_refresh_begin(rtable *t, struct rt_import_request *);
+void rt_refresh_end(rtable *t, struct rt_import_request *);
+void rt_modify_stale(rtable *t, struct rt_import_request *);
 void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
 void rte_free(struct rte_storage *, rtable *);
@@ -464,9 +466,15 @@ void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
 void rt_dump_hooks_all(void);
+int rt_reload_channel(struct channel *c);
+void rt_reload_channel_abort(struct channel *c);
+void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
+int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+int rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old, struct rte_storage **old_exported);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
+
 /* Default limit for ECMP next hops, defined in sysdep code */
 extern const int rt_default_ecmp;
 
@@ -781,7 +789,6 @@ void rta__free(rta *r);
 static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
-static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
 void rta_dump(rta *);
 void rta_dump_all(void);
 void rta_show(struct cli *, rta *);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 77fd3c3b..1bece201 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1245,7 +1245,8 @@ rta_do_cow(rta *o, linpool *lp)
       memcpy(*nhn, nho, nexthop_size(nho));
       nhn = &((*nhn)->next);
     }
-  rta_uncache(r);
+  r->cached = 0;
+  r->uc = 0;
   return r;
 }
 
diff --git a/nest/rt-show.c b/nest/rt-show.c
index d942b8e1..235d72e4 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -95,10 +95,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
     }
 
   if (d->verbose)
-  {
-    cli_printf(c, -1008, "\tInternal route ID: %uL %uG %uS", e->src->private_id, e->src->global_id, e->stale_cycle);
     rta_show(c, a);
-  }
 }
 
 static uint
@@ -106,7 +103,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
       count++;
   return count;
 }
@@ -116,7 +113,7 @@ rte_feed_obtain(net *n, rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2f480992..e7ff2816 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -50,6 +50,7 @@ pool *rt_table_pool;
 static linpool *rte_update_pool;
 
 list routing_tables;
+list deleted_routing_tables;
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
@@ -385,11 +386,9 @@ rte_mergable(rte *pri, rte *sec)
 static void
 rte_trace(const char *name, const rte *e, int dir, const char *msg)
 {
-  log(L_TRACE "%s %c %s %N src %uL %uG %uS %s%s",
-      name, dir, msg, e->net,
-      e->src->private_id, e->src->global_id, e->stale_cycle,
-      rta_dest_name(e->attrs->dest),
-      rte_is_filtered(e) ? " (filtered)" : "");
+  log(L_TRACE "%s %c %s %N %uL %uG %s",
+      name, dir, msg, e->net, e->src->private_id, e->src->global_id,
+      rta_dest_name(e->attrs->dest));
 }
 
 static inline void
@@ -428,7 +427,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
       count++;
   return count;
 }
@@ -438,7 +437,7 @@ rte_feed_obtain(net *n, struct rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
@@ -509,11 +508,10 @@ export_filter(struct channel *c, rte *rt, int silent)
   return export_filter_(c, rt, rte_update_pool, silent);
 }
 
-void do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old);
-
 static void
 do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
 {
+  struct proto *p = c->proto;
   struct channel_export_stats *stats = &c->export_stats;
 
   if (c->refeeding && new)
@@ -530,31 +528,28 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
   if (!new && old)
     CHANNEL_LIMIT_POP(c, OUT);
 
-  /* Store route export state */
-  if (old)
-    bmap_clear(&c->export_map, old->id);
-
-  if (new)
-    bmap_set(&c->export_map, new->id);
-
   /* Apply export table */
+  struct rte_storage *old_exported = NULL;
   if (c->out_table)
-    rte_import(&c->out_table->push, net, new, old ? old->src : new->src);
-  else
-    do_rt_notify_direct(c, net, new, old);
-}
-
-void
-do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte *old)
-{
-  struct proto *p = c->proto;
-  struct channel_export_stats *stats = &c->export_stats;
+  {
+    if (!rte_update_out(c, net, new, old, &old_exported))
+    {
+      channel_rte_trace_out(D_ROUTES, c, new, "idempotent");
+      return;
+    }
+  }
 
   if (new)
     stats->updates_accepted++;
   else
     stats->withdraws_accepted++;
 
+  if (old)
+    bmap_clear(&c->export_map, old->id);
+
+  if (new)
+    bmap_set(&c->export_map, new->id);
+
   if (p->debug & D_ROUTES)
   {
     if (new && old)
@@ -565,7 +560,10 @@ do_rt_notify_direct(struct channel *c, const net_addr *net, rte *new, const rte
       channel_rte_trace_out(D_ROUTES, c, old, "removed");
   }
 
-  p->rt_notify(p, c, net, new, old);
+  p->rt_notify(p, c, net, new, old_exported ? &old_exported->rte : old);
+
+  if (c->out_table && old_exported)
+    rte_free(old_exported, c->out_table);
 }
 
 static void
@@ -786,7 +784,7 @@ rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_
   rte n0;
 
   if (rpe->new_best != rpe->old_best)
-    rt_notify_basic(c, net, RTES_CLONE(rpe->new_best, &n0), RTES_OR_NULL(rpe->old_best));
+    rt_notify_basic(c, net, RTE_COPY(rpe->new_best, &n0), RTE_OR_NULL(rpe->old_best));
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -801,7 +799,7 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
   rte n0;
 
   if (rpe->new != rpe->old)
-    rt_notify_basic(c, net, RTES_CLONE(rpe->new, &n0), RTES_OR_NULL(rpe->old));
+    rt_notify_basic(c, net, RTE_COPY(rpe->new, &n0), RTE_OR_NULL(rpe->old));
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -976,10 +974,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
   rte *old = NULL;
 
-  /* Set the stale cycle unless already set */
-  if (new && !(new->flags & REF_USE_STALE))
-    new->stale_cycle = c->stale_set;
-
   /* Find and remove original route from the same protocol */
   struct rte_storage **before_old = rte_find(net, src);
 
@@ -1005,7 +999,8 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	  if (new && rte_same(old, new))
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
-	      old->stale_cycle = new->stale_cycle;
+
+	      old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
 
 	      if (!rte_is_filtered(new))
 		{
@@ -1143,23 +1138,18 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 	new_stored->rte.id = old->id;
     }
 
-  _Bool nb = (new_stored == net->routes);
-  _Bool ob = (old_best == old);
-
   /* Log the route change */
-  if (new_ok && old_ok)
-    {
-      const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
-      rt_rte_trace_in(D_ROUTES, req, &new_stored->rte, best_indicator[nb][ob]);
-    }
-  else if (new_ok)
-    rt_rte_trace_in(D_ROUTES, req, &new_stored->rte,
-	(!net->routes->next || !rte_is_ok(&net->routes->next->rte)) ? "added [sole]" :
-	nb ? "added [best]" : "added");
+  if (new_ok)
+    rt_rte_trace_in(D_ROUTES, req, &new_stored->rte, new_stored == net->routes ? "added [best]" : "added");
   else if (old_ok)
-    rt_rte_trace_in(D_ROUTES, req, old,
-	(!net->routes || !rte_is_ok(&net->routes->rte)) ? "removed [sole]" :
-	ob ? "removed [best]" : "removed");
+    {
+      if (old != old_best)
+	rt_rte_trace_in(D_ROUTES, req, old, "removed");
+      else if (net->routes && rte_is_ok(&net->routes->rte))
+	rt_rte_trace_in(D_ROUTES, req, old, "removed [replaced]");
+      else
+	rt_rte_trace_in(D_ROUTES, req, old, "removed [sole]");
+    }
 
   /* Propagate the route change */
   rte_announce(table, net, new_stored, old_stored,
@@ -1207,15 +1197,12 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
 {
   struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
-  if (!c->in_table)
-  {
-    if (new && !old)
-      if (CHANNEL_LIMIT_PUSH(c, RX))
-	return NULL;
+  if (new && !old)
+    if (CHANNEL_LIMIT_PUSH(c, RX))
+      return NULL;
 
-    if (!new && old)
-      CHANNEL_LIMIT_POP(c, RX);
-  }
+  if (!new && old)
+    CHANNEL_LIMIT_POP(c, RX);
 
   int new_in = new && !rte_is_filtered(new);
   int old_in = old && !rte_is_filtered(old);
@@ -1236,22 +1223,7 @@ channel_preimport(struct rt_import_request *req, rte *new, rte *old)
   return new;
 }
 
-rte *
-channel_in_preimport(struct rt_import_request *req, rte *new, rte *old)
-{
-  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-
-  if (new && !old)
-    if (CHANNEL_LIMIT_PUSH(cat->c, RX))
-      return NULL;
-
-  if (!new && old)
-    CHANNEL_LIMIT_POP(cat->c, RX);
-
-  return new;
-}
-
-void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
+static void rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);
 
 void
 rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
@@ -1261,14 +1233,13 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
+  if (c->in_table && !rte_update_in(c, n, new, src))
+    return;
 
-  if (c->in_table)
-    rte_import(&c->in_table->push, n, new, src);
-  else
-    rte_update_direct(c, n, new, src);
+  return rte_update_direct(c, n, new, src);
 }
 
-void
+static void
 rte_update_direct(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   const struct filter *filter = c->in_filter;
@@ -1352,6 +1323,24 @@ rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garb
   rte_update_unlock();
 }
 
+/* Modify existing route by protocol hook, used for long-lived graceful restart */
+static inline void
+rte_modify(net *net, rte *old)
+{
+  rte_update_lock();
+
+  rte *new = old->sender->req->rte_modify(old, rte_update_pool);
+  if (new != old)
+  {
+    if (new)
+      new->flags = old->flags & ~REF_MODIFY;
+
+    rte_recalculate(old->sender, net, new, old->src);
+  }
+
+  rte_update_unlock();
+}
+
 /* Check rtable for best route to given net whether it would be exported do p */
 int
 rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
@@ -1430,9 +1419,6 @@ rt_request_import(rtable *tab, struct rt_import_request *req)
   hook->req = req;
   hook->table = tab;
 
-  if (!hook->stale_set)
-    hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 1;
-
   rt_set_import_state(hook, TIS_UP);
 
   hook->n = (node) {};
@@ -1513,41 +1499,20 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
  * routes to the routing table (by rte_update()). After that, all protocol
  * routes (more precisely routes with @c as @sender) not sent during the
  * refresh cycle but still in the table from the past are pruned. This is
- * implemented by setting rte->stale_cycle to req->stale_set in rte_update()
- * and then dropping all routes with old stale_cycle values in table prune loop. */
+ * implemented by marking all related routes as stale by REF_STALE flag in
+ * rt_refresh_begin(), then marking all related stale routes with REF_DISCARD
+ * flag in rt_refresh_end() and then removing such routes in the prune loop.
+ */
 void
-rt_refresh_begin(struct rt_import_request *req)
+rt_refresh_begin(rtable *t, struct rt_import_request *req)
 {
-  struct rt_import_hook *hook = req->hook;
-  ASSERT_DIE(hook);
-
-  ASSERT_DIE(hook->stale_set == hook->stale_valid);
-
-  /* If the pruning routine is too slow */
-  if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
-      || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
-  {
-    log(L_WARN "Route refresh flood in table %s", hook->table->name);
-    FIB_WALK(&hook->table->fib, net, n)
-      {
-	for (struct rte_storage *e = n->routes; e; e = e->next)
-	  if (e->rte.sender == req->hook)
-	    e->rte.stale_cycle = 0;
-      }
-    FIB_WALK_END;
-    hook->stale_set = 1;
-    hook->stale_valid = 0;
-    hook->stale_pruned = 0;
-  }
-  else if (!++hook->stale_set)
-  {
-    /* Let's reserve the stale_cycle zero value for always-invalid routes */
-    hook->stale_set = 1;
-    hook->stale_valid = 0;
-  }
-
-  if (req->trace_routes & D_STATES)
-    log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
+  FIB_WALK(&t->fib, net, n)
+    {
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if (e->rte.sender == req->hook)
+	  e->rte.flags |= REF_STALE;
+    }
+  FIB_WALK_END;
 }
 
 /**
@@ -1559,18 +1524,43 @@ rt_refresh_begin(struct rt_import_request *req)
  * hook. See rt_refresh_begin() for description of refresh cycles.
  */
 void
-rt_refresh_end(struct rt_import_request *req)
+rt_refresh_end(rtable *t, struct rt_import_request *req)
 {
-  struct rt_import_hook *hook = req->hook;
-  ASSERT_DIE(hook);
+  int prune = 0;
 
-  hook->stale_valid++;
-  ASSERT_DIE(hook->stale_set == hook->stale_valid);
+  FIB_WALK(&t->fib, net, n)
+    {
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE))
+	  {
+	    e->rte.flags |= REF_DISCARD;
+	    prune = 1;
+	  }
+    }
+  FIB_WALK_END;
 
-  rt_schedule_prune(hook->table);
+  if (prune)
+    rt_schedule_prune(t);
+}
 
-  if (req->trace_routes & D_STATES)
-    log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+void
+rt_modify_stale(rtable *t, struct rt_import_request *req)
+{
+  int prune = 0;
+
+  FIB_WALK(&t->fib, net, n)
+    {
+      for (struct rte_storage *e = n->routes; e; e = e->next)
+	if ((e->rte.sender == req->hook) && (e->rte.flags & REF_STALE) && !(e->rte.flags & REF_FILTERED))
+	  {
+	    e->rte.flags |= REF_MODIFY;
+	    prune = 1;
+	  }
+    }
+  FIB_WALK_END;
+
+  if (prune)
+    rt_schedule_prune(t);
 }
 
 /**
@@ -1623,6 +1613,9 @@ rt_dump_all(void)
 
   WALK_LIST2(t, n, routing_tables, n)
     rt_dump(t);
+
+  WALK_LIST2(t, n, deleted_routing_tables, n)
+    rt_dump(t);
 }
 
 void
@@ -1665,6 +1658,9 @@ rt_dump_hooks_all(void)
 
   WALK_LIST2(t, n, routing_tables, n)
     rt_dump_hooks(t);
+
+  WALK_LIST2(t, n, deleted_routing_tables, n)
+    rt_dump_hooks(t);
 }
 
 static inline void
@@ -1800,7 +1796,9 @@ rt_free(resource *_r)
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
-  ASSERT_DIE(r->deleted);
+
+  if (r->internal)
+    return;
 
   r->config->table = NULL;
   rem_node(&r->n);
@@ -1855,17 +1853,20 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
 
-  init_list(&t->imports);
-  init_list(&t->exports);
-  hmap_init(&t->id_map, p, 1024);
-  hmap_set(&t->id_map, 0);
+  if (!(t->internal = cf->internal))
+  {
+    init_list(&t->imports);
+    init_list(&t->exports);
+    hmap_init(&t->id_map, p, 1024);
+    hmap_set(&t->id_map, 0);
 
-  init_list(&t->subscribers);
+    init_list(&t->subscribers);
 
-  t->rt_event = ev_new_init(p, rt_event, t);
-  t->last_rt_change = t->gc_time = current_time();
+    t->rt_event = ev_new_init(p, rt_event, t);
+    t->last_rt_change = t->gc_time = current_time();
 
-  t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
+    t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
+  }
 
   return t;
 }
@@ -1883,6 +1884,7 @@ rt_init(void)
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
+  init_list(&deleted_routing_tables);
 }
 
 
@@ -1923,13 +1925,6 @@ rt_prune_table(rtable *tab)
     WALK_LIST2(ih, n, tab->imports, n)
       if (ih->import_state == TIS_STOP)
 	rt_set_import_state(ih, TIS_FLUSHING);
-      else if ((ih->stale_valid != ih->stale_pruning) && (ih->stale_pruning == ih->stale_pruned))
-      {
-	ih->stale_pruning = ih->stale_valid;
-
-	if (ih->req->trace_routes & D_STATES)
-	  log(L_TRACE "%s: table prune after refresh begin [%u]", ih->req->name, ih->stale_pruning);
-      }
 
     FIB_ITERATE_INIT(fit, &tab->fib);
     tab->prune_state = 2;
@@ -1941,11 +1936,7 @@ again:
     rescan:
       for (struct rte_storage *e=n->routes; e; e=e->next)
       {
-	struct rt_import_hook *s = e->rte.sender;
-
-	if ((s->import_state == TIS_FLUSHING) ||
-	    (e->rte.stale_cycle < s->stale_valid) ||
-	    (e->rte.stale_cycle > s->stale_set))
+	if ((e->rte.sender->import_state == TIS_FLUSHING) || (e->rte.flags & REF_DISCARD))
 	  {
 	    if (limit <= 0)
 	      {
@@ -1957,6 +1948,21 @@ again:
 	    rte_discard(n, &e->rte);
 	    limit--;
 
+	    goto rescan;
+	  }
+
+	if (e->rte.flags & REF_MODIFY)
+	  {
+	    if (limit <= 0)
+	      {
+		FIB_ITERATE_PUT(fit);
+		ev_schedule(tab->rt_event);
+		return;
+	      }
+
+	    rte_modify(n, &e->rte);
+	    limit--;
+
 	    goto rescan;
 	  }
       }
@@ -1992,13 +1998,6 @@ again:
       mb_free(ih);
       rt_unlock_table(tab);
     }
-    else if (ih->stale_pruning != ih->stale_pruned)
-    {
-      ih->stale_pruned = ih->stale_pruning;
-
-      if (ih->req->trace_routes & D_STATES)
-	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
-    }
 }
 
 void
@@ -2205,10 +2204,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
   for (int i=0; i<count; i++)
   {
     _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
-    const char *best_indicator[2][2] = {
-      { "autoupdated", "autoupdated [-best]" },
-      { "autoupdated [+best]", "autoupdated [best]" }
-    };
+    const char *best_indicator[2][2] = { { "updated", "updated [-best]" }, { "updated [+best]", "updated [best]" } };
     rt_rte_trace_in(D_ROUTES, updates[i].new->rte.sender->req, &updates[i].new->rte, best_indicator[nb][ob]);
     rte_announce_i(tab, n, updates[i].new, updates[i].old, new, old_best);
   }
@@ -2312,12 +2308,11 @@ rt_unlock_table(rtable *r)
 {
   if (!--r->use_count && r->deleted)
     {
-      void *del_data = r->del_data;
-      void (*deleted)(void *) = r->deleted;
+      struct config *conf = r->deleted;
 
       /* Delete the routing table by freeing its pool */
       rt_shutdown(r);
-      deleted(del_data);
+      config_del_obstacle(conf);
     }
 }
 
@@ -2328,8 +2323,6 @@ rt_find_table_config(struct config *cf, char *name)
   return (sym && (sym->class == SYM_TABLE)) ? sym->table : NULL;
 }
 
-static void rt_config_del_obstacle(void *data) { config_del_obstacle(data); }
-
 /**
  * rt_commit - commit new routing table configuration
  * @new: new configuration
@@ -2368,10 +2361,9 @@ rt_commit(struct config *new, struct config *old)
 	      else
 		{
 		  DBG("\t%s: deleted\n", o->name);
-		  rt_lock_table(ot);
-		  ot->deleted = rt_config_del_obstacle;
-		  ot->del_data = old;
+		  ot->deleted = old;
 		  config_add_obstacle(old);
+		  rt_lock_table(ot);
 		  rt_unlock_table(ot);
 		}
 	    }
@@ -2449,6 +2441,285 @@ done:
 }
 
 
+/*
+ *	Import table
+ */
+
+int
+rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
+{
+  struct rtable *tab = c->in_table;
+  net *net;
+
+  if (new)
+    net = net_get(tab, n);
+  else
+  {
+    net = net_find(tab, n);
+
+    if (!net)
+      goto drop_withdraw;
+  }
+
+  /* Find the old rte */
+  struct rte_storage **pos = rte_find(net, src);
+  if (*pos)
+    {
+      rte *old = &(*pos)->rte;
+      if (new && rte_same(old, new))
+      {
+	/* Refresh the old rte, continue with update to main rtable */
+	if (old->flags & (REF_STALE | REF_DISCARD | REF_MODIFY))
+	{
+	  old->flags &= ~(REF_STALE | REF_DISCARD | REF_MODIFY);
+	  return 1;
+	}
+
+	goto drop_update;
+      }
+
+      if (!new)
+	CHANNEL_LIMIT_POP(c, RX);
+
+      /* Move iterator if needed */
+      if (*pos == c->reload_next_rte)
+	c->reload_next_rte = (*pos)->next;
+
+      /* Remove the old rte */
+      struct rte_storage *del = *pos;
+      *pos = (*pos)->next;
+      rte_free(del, tab);
+      tab->rt_count--;
+    }
+  else if (new)
+    {
+      if (CHANNEL_LIMIT_PUSH(c, RX))
+      {
+	/* Required by rte_trace_in() */
+	new->net = n;
+
+	channel_rte_trace_in(D_FILTERS, c, new, "ignored [limit]");
+	goto drop_update;
+      }
+    }
+  else
+    goto drop_withdraw;
+
+  if (!new)
+  {
+    if (!net->routes)
+      fib_delete(&tab->fib, net);
+
+    return 1;
+  }
+
+  /* Insert the new rte */
+  struct rte_storage *e = rte_store(new, net, tab);
+  e->rte.lastmod = current_time();
+  e->next = *pos;
+  *pos = e;
+  tab->rt_count++;
+  return 1;
+
+drop_update:
+  c->import_stats.updates_received++;
+  c->in_req.hook->stats.updates_ignored++;
+
+  if (!net->routes)
+    fib_delete(&tab->fib, net);
+
+  return 0;
+
+drop_withdraw:
+  c->import_stats.withdraws_received++;
+  c->in_req.hook->stats.withdraws_ignored++;
+  return 0;
+}
+
+int
+rt_reload_channel(struct channel *c)
+{
+  struct rtable *tab = c->in_table;
+  struct fib_iterator *fit = &c->reload_fit;
+  int max_feed = 64;
+
+  ASSERT(c->channel_state == CS_UP);
+
+  if (!c->reload_active)
+  {
+    FIB_ITERATE_INIT(fit, &tab->fib);
+    c->reload_active = 1;
+  }
+
+  do {
+    for (struct rte_storage *e = c->reload_next_rte; e; e = e->next)
+    {
+      if (max_feed-- <= 0)
+      {
+	c->reload_next_rte = e;
+	debug("%s channel reload burst split (max_feed=%d)", c->proto->name, max_feed);
+	return 0;
+      }
+
+      rte r = e->rte;
+      rte_update_direct(c, r.net, &r, r.src);
+    }
+
+    c->reload_next_rte = NULL;
+
+    FIB_ITERATE_START(&tab->fib, fit, net, n)
+    {
+      if (c->reload_next_rte = n->routes)
+      {
+	FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
+	break;
+      }
+    }
+    FIB_ITERATE_END;
+  }
+  while (c->reload_next_rte);
+
+  c->reload_active = 0;
+  return 1;
+}
+
+void
+rt_reload_channel_abort(struct channel *c)
+{
+  if (c->reload_active)
+  {
+    /* Unlink the iterator */
+    fit_get(&c->in_table->fib, &c->reload_fit);
+    c->reload_next_rte = NULL;
+    c->reload_active = 0;
+  }
+}
+
+void
+rt_prune_sync(rtable *t, int all)
+{
+  struct fib_iterator fit;
+
+  FIB_ITERATE_INIT(&fit, &t->fib);
+
+again:
+  FIB_ITERATE_START(&t->fib, &fit, net, n)
+  {
+    struct rte_storage *e, **ee = &n->routes;
+
+    while (e = *ee)
+    {
+      if (all || (e->rte.flags & (REF_STALE | REF_DISCARD)))
+      {
+	*ee = e->next;
+	rte_free(e, t);
+	t->rt_count--;
+      }
+      else
+	ee = &e->next;
+    }
+
+    if (all || !n->routes)
+    {
+      FIB_ITERATE_PUT(&fit);
+      fib_delete(&t->fib, n);
+      goto again;
+    }
+  }
+  FIB_ITERATE_END;
+}
+
+
+/*
+ *	Export table
+ */
+
+int
+rte_update_out(struct channel *c, const net_addr *n, rte *new, const rte *old0, struct rte_storage **old_exported)
+{
+  struct rtable *tab = c->out_table;
+  struct rte_src *src;
+  net *net;
+
+  if (new)
+  {
+    net = net_get(tab, n);
+    src = new->src;
+  }
+  else
+  {
+    net = net_find(tab, n);
+    src = old0->src;
+
+    if (!net)
+      goto drop;
+  }
+
+  /* Find the old rte */
+  struct rte_storage **pos = (c->ra_mode == RA_ANY) ? rte_find(net, src) : &net->routes;
+  struct rte_storage *old = NULL;
+
+  if (old = *pos)
+  {
+    if (new && rte_same(&(*pos)->rte, new))
+      goto drop;
+
+    /* Remove the old rte */
+    *pos = old->next;
+    *old_exported = old;
+    tab->rt_count--;
+  }
+
+  if (!new)
+  {
+    if (!old)
+      goto drop;
+
+    if (!net->routes)
+      fib_delete(&tab->fib, net);
+
+    return 1;
+  }
+
+  /* Insert the new rte */
+  struct rte_storage *e = rte_store(new, net, tab);
+  e->rte.lastmod = current_time();
+  e->next = *pos;
+  *pos = e;
+  tab->rt_count++;
+  return 1;
+
+drop:
+  return 0;
+}
+
+void
+rt_refeed_channel(struct channel *c)
+{
+  if (!c->out_table)
+  {
+    channel_request_feeding(c);
+    return;
+  }
+
+  ASSERT_DIE(c->ra_mode != RA_ANY);
+
+  c->proto->feed_begin(c, 0);
+
+  FIB_WALK(&c->out_table->fib, net, n)
+  {
+    if (!n->routes)
+      continue;
+
+    rte e = n->routes->rte;
+    c->proto->rt_notify(c->proto, c, n->n.addr, &e, NULL);
+  }
+  FIB_WALK_END;
+
+  c->proto->feed_end(c);
+}
+
+
 /*
  *	Hostcache
  */
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 892b26e3..90490b4f 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2267,44 +2267,30 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
     return !old_suppressed;
 }
 
-void
-bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+rte *
+bgp_rte_modify_stale(struct rte *r, struct linpool *pool)
 {
-  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
+  eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
+  const struct adata *ad = ea ? ea->u.ptr : NULL;
+  uint flags = ea ? ea->flags : BAF_PARTIAL;
 
-  do {
-    rte *r = feed[--count];
-    if (r->sender != c->c.in_req.hook)
-      continue;
+  if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
+    return NULL;
 
-    /* A new route, do not mark as stale */
-    if (r->stale_cycle == c->c.in_req.hook->stale_set)
-      continue;
+  if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
+    return r;
 
-    eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
-    const struct adata *ad = ea ? ea->u.ptr : NULL;
-    uint flags = ea ? ea->flags : BAF_PARTIAL;
+  rta *a = rta_do_cow(r->attrs, pool);
+  
+  _Thread_local static rte e0;
+  e0 = *r;
+  e0.attrs = a;
 
-    rte e0 = *r;
-    e0.flags |= REF_USE_STALE;
+  bgp_set_attr_ptr(&(a->eattrs), pool, BA_COMMUNITY, flags,
+		   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
+  e0.pflags |= BGP_REF_STALE;
 
-    if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
-      rte_import(&c->c.in_req, n, NULL, r->src);
-
-    else if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
-      rte_import(&c->c.in_req, n, &e0, r->src);
-
-    else {
-      rta *a = e0.attrs = rta_do_cow(r->attrs, bgp_linpool);
-
-      bgp_set_attr_ptr(&(a->eattrs), bgp_linpool, BA_COMMUNITY, flags,
-	  int_set_add(bgp_linpool, ad, BGP_COMM_LLGR_STALE));
-      e0.pflags |= BGP_REF_STALE;
-
-      rte_import(&c->c.in_req, n, &e0, r->src);
-      lp_flush(bgp_linpool);
-    }
-  } while (count);
+  return &e0;
 }
 
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 35e9ea59..78c36bc7 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -140,15 +140,6 @@ static void bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd);
 static int bgp_incoming_connection(sock *sk, uint dummy UNUSED);
 static void bgp_listen_sock_err(sock *sk UNUSED, int err);
 
-static void bgp_graceful_restart_feed(struct bgp_channel *c);
-static inline void channel_refresh_end_reload(struct channel *c)
-{
-  channel_refresh_end(c);
-
-  if (c->in_table)
-    channel_request_reload(c);
-}
-
 /**
  * bgp_open - open a BGP instance
  * @p: BGP instance
@@ -784,25 +775,25 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
       {
       case BGP_GRS_NONE:
 	c->gr_active = BGP_GRS_ACTIVE;
-	channel_refresh_begin(&c->c);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
 	break;
 
       case BGP_GRS_ACTIVE:
-	channel_refresh_end(&c->c);
-	channel_refresh_begin(&c->c);
+	rt_refresh_end(c->c.table, &c->c.in_req);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
 	break;
 
       case BGP_GRS_LLGR:
-	channel_refresh_begin(&c->c);
-	bgp_graceful_restart_feed(c);
+	rt_refresh_begin(c->c.table, &c->c.in_req);
+	rt_modify_stale(c->c.table, &c->c.in_req);
 	break;
       }
     }
     else
     {
       /* Just flush the routes */
-      channel_refresh_begin(&c->c);
-      channel_refresh_end(&c->c);
+      rt_refresh_begin(c->c.table, &c->c.in_req);
+      rt_refresh_end(c->c.table, &c->c.in_req);
     }
 
     /* Reset bucket and prefix tables */
@@ -820,50 +811,6 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
   tm_start(p->gr_timer, p->conn->remote_caps->gr_time S);
 }
 
-static void
-bgp_graceful_restart_feed_done(struct rt_export_request *req)
-{
-  req->hook = NULL;
-}
-
-static void
-bgp_graceful_restart_feed_dump_req(struct rt_export_request *req)
-{
-  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
-  debug("  BGP-GR %s.%s export request %p\n", c->c.proto->name, c->c.name, req);
-}
-
-static void
-bgp_graceful_restart_feed_log_state_change(struct rt_export_request *req, u8 state)
-{
-  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
-  struct bgp_proto *p = (void *) c->c.proto;
-  BGP_TRACE(D_EVENTS, "Long-lived graceful restart export state changed to %s", rt_export_state_name(state));
-
-  if (state == TES_READY)
-    rt_stop_export(req, bgp_graceful_restart_feed_done);
-}
-
-static void
-bgp_graceful_restart_drop_export(struct rt_export_request *req UNUSED, const net_addr *n UNUSED, struct rt_pending_export *rpe UNUSED)
-{ /* Nothing to do */ }
-
-static void
-bgp_graceful_restart_feed(struct bgp_channel *c)
-{
-  c->stale_feed = (struct rt_export_request) {
-    .name = "BGP-GR",
-    .trace_routes = c->c.debug | c->c.proto->debug,
-    .dump_req = bgp_graceful_restart_feed_dump_req,
-    .log_state_change = bgp_graceful_restart_feed_log_state_change,
-    .export_bulk = bgp_rte_modify_stale,
-    .export_one = bgp_graceful_restart_drop_export,
-  };
-
-  rt_request_export(c->c.table, &c->stale_feed);
-}
-
-
 /**
  * bgp_graceful_restart_done - finish active BGP graceful restart
  * @c: BGP channel
@@ -886,11 +833,8 @@ bgp_graceful_restart_done(struct bgp_channel *c)
   if (!p->gr_active_num)
     BGP_TRACE(D_EVENTS, "Neighbor graceful restart done");
 
-  if (c->stale_feed.hook)
-    rt_stop_export(&c->stale_feed, bgp_graceful_restart_feed_done);
-
   tm_stop(c->stale_timer);
-  channel_refresh_end_reload(&c->c);
+  rt_refresh_end(c->c.table, &c->c.in_req);
 }
 
 /**
@@ -932,7 +876,7 @@ bgp_graceful_restart_timeout(timer *t)
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
       tm_start(c->stale_timer, c->stale_time S);
-      bgp_graceful_restart_feed(c);
+      rt_modify_stale(c->c.table, &c->c.in_req);
     }
   }
   else
@@ -970,7 +914,10 @@ bgp_refresh_begin(struct bgp_channel *c)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
   c->load_state = BFS_REFRESHING;
-  channel_refresh_begin(&c->c);
+  rt_refresh_begin(c->c.table, &c->c.in_req);
+
+  if (c->c.in_table)
+    rt_refresh_begin(c->c.in_table, &c->c.in_req);
 }
 
 /**
@@ -991,7 +938,10 @@ bgp_refresh_end(struct bgp_channel *c)
   { log(L_WARN "%s: END-OF-RR received without prior BEGIN-OF-RR, ignoring", p->p.name); return; }
 
   c->load_state = BFS_NONE;
-  channel_refresh_end_reload(&c->c);
+  rt_refresh_end(c->c.table, &c->c.in_req);
+
+  if (c->c.in_table)
+    rt_prune_sync(c->c.in_table, 0);
 }
 
 
@@ -1458,9 +1408,12 @@ bgp_reload_routes(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
-  ASSERT(p->conn && (p->route_refresh));
+  ASSERT(p->conn && (p->route_refresh || c->c.in_table));
 
-  bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
+  if (c->c.in_table)
+    channel_schedule_reload(C);
+  else
+    bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
 }
 
 static void
@@ -1740,6 +1693,7 @@ bgp_init(struct proto_config *CF)
   P->rte_better = bgp_rte_better;
   P->rte_mergable = bgp_rte_mergable;
   P->rte_recalculate = cf->deterministic_med ? bgp_rte_recalculate : NULL;
+  P->rte_modify = bgp_rte_modify_stale;
   P->rte_igp_metric = bgp_rte_igp_metric;
 
   p->cf = cf;
@@ -1802,7 +1756,7 @@ bgp_channel_start(struct channel *C)
   bgp_init_prefix_table(c);
 
   if (c->cf->import_table)
-    channel_setup_in_table(C, 0);
+    channel_setup_in_table(C);
 
   if (c->cf->export_table)
     channel_setup_out_table(C);
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 342dc023..c79dd1b2 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -366,7 +366,6 @@ struct bgp_channel {
 
   timer *stale_timer;			/* Long-lived stale timer for LLGR */
   u32 stale_time;			/* Stored LLGR stale time from last session */
-  struct rt_export_request stale_feed;	/* Feeder request for stale route modification */
 
   u8 add_path_rx;			/* Session expects receive of ADD-PATH extended NLRI */
   u8 add_path_tx;			/* Session expects transmit of ADD-PATH extended NLRI */
@@ -586,7 +585,7 @@ void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
 int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
-void bgp_rte_modify_stale(struct rt_export_request *, const net_addr *, struct rt_pending_export *, rte **, uint);
+struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
 u32 bgp_rte_igp_metric(struct rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
 int bgp_preexport(struct channel *, struct rte *);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 647551e5..f1e6d7d2 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2695,7 +2695,7 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, uint len)
   {
   case BGP_RR_REQUEST:
     BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
-    channel_request_feeding(&c->c);
+    rt_refeed_channel(&c->c);
     break;
 
   case BGP_RR_BEGIN:
diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c
index 897edc09..943485d7 100644
--- a/proto/rpki/packets.c
+++ b/proto/rpki/packets.c
@@ -661,9 +661,9 @@ rpki_handle_cache_response_pdu(struct rpki_cache *cache, const struct pdu_cache_
        * a refresh cycle.
        */
       if (cache->p->roa4_channel)
-	rt_refresh_begin(&cache->p->roa4_channel->in_req);
+	rt_refresh_begin(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
       if (cache->p->roa6_channel)
-	rt_refresh_begin(&cache->p->roa6_channel->in_req);
+	rt_refresh_begin(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
 
       cache->p->refresh_channels = 1;
     }
@@ -819,9 +819,9 @@ rpki_handle_end_of_data_pdu(struct rpki_cache *cache, const struct pdu_end_of_da
   {
     cache->p->refresh_channels = 0;
     if (cache->p->roa4_channel)
-      rt_refresh_end(&cache->p->roa4_channel->in_req);
+      rt_refresh_end(cache->p->roa4_channel->table, &cache->p->roa4_channel->in_req);
     if (cache->p->roa6_channel)
-      rt_refresh_end(&cache->p->roa6_channel->in_req);
+      rt_refresh_end(cache->p->roa6_channel->table, &cache->p->roa6_channel->in_req);
   }
 
   cache->last_update = current_time();
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 609ee921..40a58442 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -285,24 +285,249 @@ krt_metric(rte *a)
 }
 
 static inline int
-krt_rte_better(rte *a, rte *b)
+krt_same_key(rte *a, rte *b)
 {
-  return (krt_metric(a) > krt_metric(b));
+  return (krt_metric(a) == krt_metric(b));
+}
+
+static inline int
+krt_uptodate(rte *a, rte *b)
+{
+  return (a->attrs == b->attrs);
+}
+
+static void
+krt_learn_announce_update(struct krt_proto *p, rte *e)
+{
+  rte e0 = {
+    .attrs = rta_clone(e->attrs),
+    .src = p->p.main_source,
+  };
+
+  rte_update(p->p.main_channel, e->net, &e0, p->p.main_source);
+}
+
+static void
+krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
+{
+  rte_update(p->p.main_channel, n, NULL, p->p.main_source);
 }
 
 /* Called when alien route is discovered during scan */
 static void
-krt_learn_rte(struct krt_proto *p, rte *e)
+krt_learn_scan(struct krt_proto *p, rte *e)
 {
-  e->src = rt_get_source(&p->p, krt_metric(e));
-  rte_update(p->p.main_channel, e->net, e, e->src);
+  net *n = net_get(p->krt_table, e->net);
+  struct rte_storage *m, **mm;
+
+  struct rte_storage *ee = rte_store(e, n, p->krt_table);
+
+  for(mm = &n->routes; m = *mm; mm = &m->next)
+    if (krt_same_key(&m->rte, e))
+      break;
+  if (m)
+    {
+      if (krt_uptodate(&m->rte, e))
+	{
+	  krt_trace_in_rl(&rl_alien, p, e, "[alien] seen");
+	  rte_free(ee, p->krt_table);
+	  m->rte.pflags |= KRT_REF_SEEN;
+	}
+      else
+	{
+	  krt_trace_in(p, e, "[alien] updated");
+	  *mm = m->next;
+	  rte_free(m, p->krt_table);
+	  m = NULL;
+	}
+    }
+  else
+    krt_trace_in(p, e, "[alien] created");
+
+  if (!m)
+    {
+      ee->next = n->routes;
+      n->routes = ee;
+      ee->rte.pflags |= KRT_REF_SEEN;
+    }
+}
+
+static void
+krt_learn_prune(struct krt_proto *p)
+{
+  struct fib *fib = &p->krt_table->fib;
+  struct fib_iterator fit;
+
+  KRT_TRACE(p, D_EVENTS, "Pruning inherited routes");
+
+  FIB_ITERATE_INIT(&fit, fib);
+again:
+  FIB_ITERATE_START(fib, &fit, net, n)
+    {
+      struct rte_storage *e, **ee, *best, **pbest, *old_best;
+
+      /*
+       * Note that old_best may be NULL even if there was an old best route in
+       * the previous step, because it might be replaced in krt_learn_scan().
+       * But in that case there is a new valid best route.
+       */
+
+      old_best = NULL;
+      best = NULL;
+      pbest = NULL;
+      ee = &n->routes;
+      while (e = *ee)
+	{
+	  if (e->rte.pflags & KRT_REF_BEST)
+	    old_best = e;
+
+	  if (!(e->rte.pflags & KRT_REF_SEEN))
+	    {
+	      *ee = e->next;
+	      rte_free(e, p->krt_table);
+	      continue;
+	    }
+
+	  if (!best || krt_metric(&best->rte) > krt_metric(&e->rte))
+	    {
+	      best = e;
+	      pbest = ee;
+	    }
+
+	  e->rte.pflags &= ~(KRT_REF_SEEN | KRT_REF_BEST);
+	  ee = &e->next;
+	}
+      if (!n->routes)
+	{
+	  DBG("%I/%d: deleting\n", n->n.prefix, n->n.pxlen);
+	  if (old_best)
+	    krt_learn_announce_delete(p, n->n.addr);
+
+	  FIB_ITERATE_PUT(&fit);
+	  fib_delete(fib, n);
+	  goto again;
+	}
+
+      best->rte.pflags |= KRT_REF_BEST;
+      *pbest = best->next;
+      best->next = n->routes;
+      n->routes = best;
+
+      if ((best != old_best) || p->reload)
+	{
+	  DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
+	  krt_learn_announce_update(p, &best->rte);
+	}
+      else
+	DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, krt_metric(&best->rte));
+    }
+  FIB_ITERATE_END;
+
+  p->reload = 0;
+}
+
+static void
+krt_learn_async(struct krt_proto *p, rte *e, int new)
+{
+  net *n = net_get(p->krt_table, e->net);
+  struct rte_storage *g, **gg, *best, **bestp, *old_best;
+
+  ASSERT(!e->attrs->cached);
+  e->attrs->pref = p->p.main_channel->preference;
+
+  struct rte_storage *ee = rte_store(e, n, p->krt_table);
+
+  old_best = n->routes;
+  for(gg=&n->routes; g = *gg; gg = &g->next)
+    if (krt_same_key(&g->rte, e))
+      break;
+  if (new)
+    {
+      if (g)
+	{
+	  if (krt_uptodate(&g->rte, e))
+	    {
+	      krt_trace_in(p, e, "[alien async] same");
+	      rte_free(ee, p->krt_table);
+	      return;
+	    }
+	  krt_trace_in(p, e, "[alien async] updated");
+	  *gg = g->next;
+	  rte_free(g, p->krt_table);
+	}
+      else
+	krt_trace_in(p, e, "[alien async] created");
+
+      ee->next = n->routes;
+      n->routes = ee;
+    }
+  else if (!g)
+    {
+      krt_trace_in(p, e, "[alien async] delete failed");
+      rte_free(ee, p->krt_table);
+      return;
+    }
+  else
+    {
+      krt_trace_in(p, e, "[alien async] removed");
+      *gg = g->next;
+      rte_free(ee, p->krt_table);
+      rte_free(g, p->krt_table);
+    }
+  best = n->routes;
+  bestp = &n->routes;
+  for(gg=&n->routes; g=*gg; gg=&g->next)
+  {
+    if (krt_metric(&best->rte) > krt_metric(&g->rte))
+      {
+	best = g;
+	bestp = gg;
+      }
+
+    g->rte.pflags &= ~KRT_REF_BEST;
+  }
+
+  if (best)
+    {
+      best->rte.pflags |= KRT_REF_BEST;
+      *bestp = best->next;
+      best->next = n->routes;
+      n->routes = best;
+    }
+
+  if (best != old_best)
+    {
+      DBG("krt_learn_async: distributing change\n");
+      if (best)
+	krt_learn_announce_update(p, &best->rte);
+      else
+	krt_learn_announce_delete(p, n->n.addr);
+    }
 }
 
 static void
 krt_learn_init(struct krt_proto *p)
 {
   if (KRT_CF->learn)
-    channel_setup_in_table(p->p.main_channel, 1);
+  {
+    struct rtable_config *cf = mb_allocz(p->p.pool, sizeof(struct rtable_config));
+    cf->name = "Inherited";
+    cf->addr_type = p->p.net_type;
+    cf->internal = 1;
+
+    p->krt_table = rt_setup(p->p.pool, cf);
+  }
+}
+
+static void
+krt_dump(struct proto *P)
+{
+  struct krt_proto *p = (struct krt_proto *) P;
+
+  if (!KRT_CF->learn)
+    return;
+  debug("KRT: Table of inheritable routes\n");
+  rt_dump(p->krt_table);
 }
 
 #endif
@@ -322,7 +547,7 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
       count++;
   return count;
 }
@@ -332,7 +557,7 @@ rte_feed_obtain(net *n, rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTES_OR_NULL(e)))
+    if (rte_is_valid(RTE_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
@@ -418,7 +643,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 
     case  KRT_SRC_ALIEN:
       if (KRT_CF->learn)
-	krt_learn_rte(p, e);
+	krt_learn_scan(p, e);
       else
 	krt_trace_in_rl(&rl_alien, p, e, "[alien] ignored");
       return;
@@ -487,11 +712,6 @@ static void
 krt_init_scan(struct krt_proto *p)
 {
   bmap_reset(&p->seen_map, 1024);
-
-#ifdef KRT_ALLOW_LEARN
-  if (KRT_CF->learn)
-    channel_refresh_begin(p->p.main_channel);
-#endif
 }
 
 static void
@@ -519,7 +739,7 @@ krt_prune(struct krt_proto *p)
 
 #ifdef KRT_ALLOW_LEARN
   if (KRT_CF->learn)
-    channel_refresh_end(p->p.main_channel);
+    krt_learn_prune(p);
 #endif
 
   if (p->ready)
@@ -561,7 +781,7 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
     case KRT_SRC_ALIEN:
       if (KRT_CF->learn)
 	{
-	  krt_learn_rte(p, e);
+	  krt_learn_async(p, e, new);
 	  return;
 	}
 #endif
@@ -807,7 +1027,6 @@ krt_init(struct proto_config *CF)
   p->p.if_notify = krt_if_notify;
   p->p.reload_routes = krt_reload_routes;
   p->p.feed_end = krt_feed_end;
-  p->p.rte_better = krt_rte_better;
 
   krt_sys_init(p);
   return &p->p;
@@ -963,4 +1182,7 @@ struct protocol proto_unix_kernel = {
   .reconfigure =	krt_reconfigure,
   .copy_config =	krt_copy_config,
   .get_attr =		krt_get_attr,
+#ifdef KRT_ALLOW_LEARN
+  .dump =		krt_dump,
+#endif
 };
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 968c5b16..f6ad6fde 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -51,6 +51,10 @@ struct krt_proto {
   struct proto p;
   struct krt_state sys;		/* Sysdep state */
 
+#ifdef KRT_ALLOW_LEARN
+  struct rtable *krt_table;	/* Internal table of inherited routes */
+#endif
+
 #ifndef CONFIG_ALL_TABLES_AT_ONCE
   timer *scan_timer;
 #endif

From 4ec443b5c283fc4f37629bc38ef3730e0a7cc932 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 13 Jul 2022 11:19:00 +0200
Subject: [PATCH 164/431] Fixed bug in repeated show route command

Introduced by 13ef5e53dd4a98c80261139b4c9ce4b1074cac40, the CLI was not
properly cleaned up when the command finished, causing BIRD to not parse
any other command after "show route".
---
 nest/rt-show.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/nest/rt-show.c b/nest/rt-show.c
index dd0fe595..1dbfaec2 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -259,6 +259,18 @@ rt_show_dump_req(struct rt_export_request *req)
   debug("  CLI Show Route Feed %p\n", req);
 }
 
+static void
+rt_show_done(struct rt_show_data *d)
+{
+  /* No more action */
+  d->cli->cleanup = NULL;
+  d->cli->cont = NULL;
+  d->cli->rover = NULL;
+
+  /* Write pending messages */
+  cli_write_trigger(d->cli);
+}
+
 static void
 rt_show_cont(struct rt_show_data *d)
 {
@@ -267,13 +279,7 @@ rt_show_cont(struct rt_show_data *d)
   if (d->running_on_config && (d->running_on_config != config))
   {
     cli_printf(c, 8004, "Stopped due to reconfiguration");
-
-    /* No more action */
-    c->cleanup = NULL;
-    c->cont = NULL;
-    c->rover = NULL;
-    cli_write_trigger(c);
-    return;
+    return rt_show_done(d);
   }
 
   d->req = (struct rt_export_request) {
@@ -320,7 +326,6 @@ rt_show_export_stopped(struct rt_export_request *req)
   if (NODE_VALID(d->tab))
     return rt_show_cont(d);
 
-
   /* Printout total stats */
   if (d->stats && (d->table_counter > 1))
   {
@@ -333,7 +338,8 @@ rt_show_export_stopped(struct rt_export_request *req)
   else
     cli_printf(d->cli, 0, "");
 
-  cli_write_trigger(d->cli);
+  /* No more route showing */
+  rt_show_done(d);
 }
 
 struct rt_show_data_rtable *

From 1c2851ecfa94f3d0b732a267c6c2db8b817c37f4 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Jul 2022 11:09:23 +0200
Subject: [PATCH 165/431] Fixed invalid routes handling

The invalid routes were filtered out before they could ever get
exported, yet some of the routines need them available, e.g. for
display or import reload.

Now the invalid routes are properly exported and dropped in channel
export routines instead.
---
 nest/rt-table.c   | 51 ++++++++++++++++++++++++-----------------------
 nest/rt.h         |  6 ++++--
 proto/bgp/attrs.c | 10 ++++------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e7281b2e..5e07c129 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -726,8 +726,8 @@ rte_feed_count(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
-      count++;
+    count++;
+
   return count;
 }
 
@@ -736,11 +736,11 @@ rte_feed_obtain(net *n, struct rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
-    if (rte_is_valid(RTE_OR_NULL(e)))
     {
       ASSERT_DIE(i < count);
       feed[i++] = &e->rte;
     }
+
   ASSERT_DIE(i == count);
 }
 
@@ -1059,10 +1059,15 @@ void
 rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  rte n0;
 
   if (rpe->new_best != rpe->old_best)
-    rt_notify_basic(c, net, RTE_COPY(rpe->new_best, &n0), RTE_OR_NULL(rpe->old_best));
+  {
+    rte n0 = RTE_COPY_VALID(rpe->new_best);
+    rte *o = RTE_VALID_OR_NULL(rpe->old_best);
+
+    if (n0.src || o)
+      rt_notify_basic(c, net, n0.src ? &n0 : NULL, o);
+  }
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -1074,10 +1079,14 @@ void
 rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  rte n0;
 
   if (rpe->new != rpe->old)
-    rt_notify_basic(c, net, RTE_COPY(rpe->new, &n0), RTE_OR_NULL(rpe->old));
+  {
+    rte n0 = RTE_COPY_VALID(rpe->new);
+    rte *o = RTE_VALID_OR_NULL(rpe->old);
+    if (n0.src || o)
+      rt_notify_basic(c, net, n0.src ? &n0 : NULL, o);
+  }
 
   /* Drop the old stored rejection if applicable.
    * new->id == old->id happens when updating hostentries. */
@@ -1091,10 +1100,11 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pendin
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
   for (uint i=0; i<count; i++)
-  {
-    rte n0 = *feed[i];
-    rt_notify_basic(c, net, &n0, NULL);
-  }
+    if (rte_is_valid(feed[i]))
+    {
+      rte n0 = *feed[i];
+      rt_notify_basic(c, net, &n0, NULL);
+    }
 }
 
 /**
@@ -1132,26 +1142,17 @@ static void
 rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
-  if (!rte_is_valid(RTE_OR_NULL(new)))
-    new = NULL;
-
-  if (!rte_is_valid(RTE_OR_NULL(old)))
-    old = NULL;
-
-  if (!rte_is_valid(RTE_OR_NULL(new_best)))
-    new_best = NULL;
-
-  if (!rte_is_valid(RTE_OR_NULL(old_best)))
-    old_best = NULL;
+  int new_best_valid = rte_is_valid(RTE_OR_NULL(new_best));
+  int old_best_valid = rte_is_valid(RTE_OR_NULL(old_best));
 
   if (!new && !old && !new_best && !old_best)
     return;
 
-  if (new_best != old_best)
+  if (new_best_valid || old_best_valid)
   {
-    if (new_best)
+    if (new_best_valid)
       new_best->rte.sender->stats.pref++;
-    if (old_best)
+    if (old_best_valid)
       old_best->rte.sender->stats.pref--;
 
     if (tab->hostcache)
diff --git a/nest/rt.h b/nest/rt.h
index b13c06be..bdbea05b 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -167,8 +167,10 @@ struct rte_storage {
   struct rte rte;			/* Route data */
 };
 
-#define RTE_COPY(r, l) ((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
-#define RTE_OR_NULL(r) ((r) ? &((r)->rte) : NULL)
+#define RTE_COPY(r)		((r) ? (r)->rte : (rte) {})
+#define RTE_COPY_VALID(r)	(((r) && (rte_is_valid(&(r)->rte))) ? (r)->rte : (rte) {})
+#define RTE_OR_NULL(r)		((r) ? &((r)->rte) : NULL)
+#define RTE_VALID_OR_NULL(r)	(((r) && (rte_is_valid(&(r)->rte))) ? &((r)->rte) : NULL)
 
 /* Table-channel connections */
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1ca77fd5..883a9746 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2557,12 +2557,10 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt
   {
     rte *r = feed[i];
 
-    /* Not our route */
-    if (r->sender != irh)
-      continue;
-
-    /* A new route, do not mark as stale */
-    if (r->stale_cycle == irh->stale_set)
+    if (
+	!rte_is_valid(r) ||			/* Not a valid route */
+	(r->sender != irh) ||			/* Not our route */
+	(r->stale_cycle == irh->stale_set))	/* A new route, do not mark as stale */
       continue;
 
     eattr *ea = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));

From 812edb85e14de1d5fe07a246176b4ed1a2ec0054 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 18 Jul 2022 10:26:55 +0200
Subject: [PATCH 166/431] Fixing build issues caused by a nonportable Makefile
 rule

---
 nest/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nest/Makefile b/nest/Makefile
index 0350c3b6..39617350 100644
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -6,7 +6,11 @@ $(call proto-build,dev_build)
 
 $(proto-build-c): $(lastword $(MAKEFILE_LIST))
 	$(E)echo GEN $@
-	$(Q)echo "#include \"lib/birdlib.h\"\n$(patsubst %,void %(void);\n,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %();\n,$(PROTO_BUILD))}" > $@
+	$(Q)echo "#include \"lib/birdlib.h\"" > $@
+	$(Q)$(patsubst %,echo 'void %(void);' >> $@;,$(PROTO_BUILD))
+	$(Q)echo "void protos_build_gen(void) {" >> $@
+	$(Q)$(patsubst %,echo '  %();'>>$@;,$(PROTO_BUILD))
+	$(Q)echo "}" >> $@
 
 tests_src :=
 tests_targets := $(tests_targets) $(tests-target-files)

From 9901ca6fb3683091c7eb424cbba8c7bc94e41cbb Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 18 Jul 2022 10:56:20 +0200
Subject: [PATCH 167/431] Fixed an annoying warning in ea_get_storage()

---
 lib/route.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/route.h b/lib/route.h
index 88a4373d..2d691215 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -423,7 +423,7 @@ static inline int ea_is_cached(const ea_list *r) { return r->flags & EALF_CACHED
 static inline struct ea_storage *ea_get_storage(ea_list *r)
 {
   ASSERT_DIE(ea_is_cached(r));
-  return SKIP_BACK(struct ea_storage, l, r);
+  return SKIP_BACK(struct ea_storage, l[0], r);
 }
 
 static inline ea_list *ea_clone(ea_list *r) { ea_get_storage(r)->uc++; return r; }

From e91754f5b9ef68d52f5ff3abcd24661034a0feed Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Jun 2022 19:53:34 +0200
Subject: [PATCH 168/431] Event lists rewritten to a single linked list

In multithreaded environment, we need to pass messages between workers.
This is done by queuing events to their respective queues. The
double-linked list is not really useful for that as it needs locking
everywhere.

This commit rewrites the event subsystem to use a single-linked list
where events are enqueued by a single atomic instruction and the queue
is processed after atomically moving the whole queue aside.
---
 configure.ac  |   2 +-
 lib/event.c   | 229 +++++++++++++++++++++++++++-----------------------
 lib/event.h   |  55 ++++++------
 lib/io-loop.h |   4 +-
 lib/locking.h |   1 -
 nest/proto.c  |   3 -
 6 files changed, 159 insertions(+), 135 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5e5f2c4e..330add87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,7 @@ case $sysdesc in
     ;;
 esac
 
-AC_CHECK_HEADERS_ONCE([alloca.h syslog.h])
+AC_CHECK_HEADERS_ONCE([alloca.h syslog.h stdatomic.h])
 AC_CHECK_HEADER([sys/mman.h], [AC_DEFINE([HAVE_MMAP], [1], [Define to 1 if mmap() is available.])], have_mman=no)
 AC_CHECK_FUNC([aligned_alloc], [AC_DEFINE([HAVE_ALIGNED_ALLOC], [1], [Define to 1 if aligned_alloc() is available.])], have_aligned_alloc=no)
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [#include <sys/socket.h>])
diff --git a/lib/event.c b/lib/event.c
index b0abd1d0..7effc315 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -23,27 +23,91 @@
 
 #include "nest/bird.h"
 #include "lib/event.h"
-#include "lib/locking.h"
 #include "lib/io-loop.h"
 
-extern _Thread_local struct coroutine *this_coro;
-
 event_list global_event_list;
 event_list global_work_list;
 
+STATIC_ASSERT(OFFSETOF(event_list, _sentinel.next) >= OFFSETOF(event_list, _end[0]));
+
+void
+ev_init_list(event_list *el, struct birdloop *loop, const char *name)
+{
+  el->name = name;
+  el->loop = loop;
+
+  atomic_store_explicit(&el->receiver, &el->_sentinel, memory_order_relaxed);
+  atomic_store_explicit(&el->_executor, &el->_sentinel, memory_order_relaxed);
+  atomic_store_explicit(&el->_sentinel.next, NULL, memory_order_relaxed);
+}
+
+/*
+ * The event list should work as a message passing point. Sending a message
+ * must be a fairly fast process with no locks and low waiting times. OTOH,
+ * processing messages always involves running the assigned code and the
+ * receiver is always a single one thread with no concurrency at all. There is
+ * also a postponing requirement to synchronously remove an event from a queue,
+ * yet we allow this only when the caller has its receiver event loop locked.
+ * It still means that the event may get postponed from other event in the same
+ * list, therefore we have to be careful.
+ */
+
+static inline int
+ev_remove_from(event *e, event * _Atomic * head)
+{
+  /* The head pointer stores where cur is pointed to from */
+  event * _Atomic *prev = head;
+
+  /* The current event in queue to check */
+  event *cur = atomic_load_explicit(prev, memory_order_acquire);
+
+  /* Pre-loaded next pointer; if NULL, this is sentinel */
+  event *next = atomic_load_explicit(&cur->next, memory_order_acquire);
+
+  while (next)
+  {
+    if (e == cur)
+    {
+      /* Check whether we have collided with somebody else
+       * adding an item to the queue. */
+      if (!atomic_compare_exchange_strong_explicit(
+	    prev, &cur, next,
+	    memory_order_acq_rel, memory_order_acquire))
+      {
+	/* This may happen only on list head */
+	ASSERT_DIE(prev == head);
+
+	/* Restart. The collision should never happen again. */
+	return ev_remove_from(e, head);
+      }
+
+      /* Successfully removed from the list; inactivate this event. */
+      atomic_store_explicit(&cur->next, NULL, memory_order_release);
+      return 1;
+    }
+
+    /* Go to the next event. */
+    prev = &cur->next;
+    cur = next;
+    next = atomic_load_explicit(&cur->next, memory_order_acquire);
+  }
+
+  return 0;
+}
+
 inline void
 ev_postpone(event *e)
 {
-  event_list *el = e->list;
-  if (!el)
+  /* Find the list to remove the event from */
+  event_list *sl = ev_get_list(e);
+  if (!sl)
     return;
 
-  ASSERT_DIE(birdloop_inside(el->loop));
+  /* Postponing allowed only from the target loop */
+  ASSERT_DIE(birdloop_inside(sl->loop));
 
-  LOCK_DOMAIN(event, el->lock);
-  if (ev_active(e))
-    rem_node(&e->n);
-  UNLOCK_DOMAIN(event, el->lock);
+  /* Remove from one of these lists. */
+  ASSERT(ev_remove_from(e, &sl->_executor) || ev_remove_from(e, &sl->receiver));
 }
 
 static void
@@ -54,7 +118,7 @@ ev_dump(resource *r)
   debug("(code %p, data %p, %s)\n",
 	e->hook,
 	e->data,
-	e->n.next ? "scheduled" : "inactive");
+	atomic_load_explicit(&e->next, memory_order_relaxed) ? "scheduled" : "inactive");
 }
 
 static struct resclass ev_class = {
@@ -108,23 +172,17 @@ ev_run(event *e)
 inline void
 ev_send(event_list *l, event *e)
 {
-  DBG("ev_send(%p, %p)\n", l, e);
-  ASSERT_DIE(e->hook);
-  ASSERT_DIE(!e->list || (e->list == l) || (e->list->loop == l->loop));
-
-  e->list = l;
-
-  LOCK_DOMAIN(event, l->lock);
-  if (enlisted(&e->n))
-  {
-    UNLOCK_DOMAIN(event, l->lock);
+  event_list *sl = ev_get_list(e);
+  if (sl == l)
     return;
-  }
+  if (sl)
+    bug("Queuing an already queued event to another queue is not supported.");
 
-  add_tail(&l->events, &e->n);
-  UNLOCK_DOMAIN(event, l->lock);
-
-  birdloop_ping(l->loop);
+  event *next = atomic_load_explicit(&l->receiver, memory_order_acquire);
+  do atomic_store_explicit(&e->next, next, memory_order_relaxed);
+  while (!atomic_compare_exchange_strong_explicit(
+	&l->receiver, &next, e,
+	memory_order_acq_rel, memory_order_acquire));
 }
 
 void io_log_event(void *hook, void *data);
@@ -135,94 +193,57 @@ void io_log_event(void *hook, void *data);
  *
  * This function calls ev_run() for all events enqueued in the list @l.
  */
-int
-ev_run_list(event_list *l)
-{
-  const _Bool legacy = LEGACY_EVENT_LIST(l);
-
-  if (legacy)
-    ASSERT_THE_BIRD_LOCKED;
-
-  node *n;
-
-  list tmp_list;
-  init_list(&tmp_list);
-
-  /* Move the event list contents to a local list to avoid executing repeatedly added events */
-  LOCK_DOMAIN(event, l->lock);
-  add_tail_list(&tmp_list, &l->events);
-  init_list(&l->events);
-  UNLOCK_DOMAIN(event, l->lock);
-
-  WALK_LIST_FIRST(n, tmp_list)
-    {
-      event *e = SKIP_BACK(event, n, n);
-
-      if (legacy)
-      {
-	/* The legacy way of event execution */
-	io_log_event(e->hook, e->data);
-	ev_postpone(e);
-	e->hook(e->data);
-      }
-      else
-      {
-	// io_log_event(e->hook, e->data); /* TODO: add support for event logging in other io loops */
-	ASSERT_DIE(e->list == l);
-	LOCK_DOMAIN(event, l->lock);
-	rem_node(&e->n);
-	UNLOCK_DOMAIN(event, l->lock);
-	e->hook(e->data);
-      }
-      tmp_flush();
-    }
-
-  LOCK_DOMAIN(event, l->lock);
-  int repeat = ! EMPTY_LIST(l->events);
-  UNLOCK_DOMAIN(event, l->lock);
-  return repeat;
-}
-
 int
 ev_run_list_limited(event_list *l, uint limit)
 {
-  ASSERT_DIE(LEGACY_EVENT_LIST(l));
-  ASSERT_THE_BIRD_LOCKED;
+  event * _Atomic *ep = &l->_executor;
 
-  node *n;
-  list tmp_list;
+  /* No pending events, refill the queue. */
+  if (atomic_load_explicit(ep, memory_order_relaxed) == &l->_sentinel)
+  {
+    /* Move the current event list aside and create a new one. */
+    event *received = atomic_exchange_explicit(
+	&l->receiver, &l->_sentinel, memory_order_acq_rel);
 
-  LOCK_DOMAIN(event, l->lock);
-  init_list(&tmp_list);
-  add_tail_list(&tmp_list, &l->events);
-  init_list(&l->events);
-  UNLOCK_DOMAIN(event, l->lock);
+    /* No event to run. */
+    if (received == &l->_sentinel)
+      return 0;
 
-  WALK_LIST_FIRST(n, tmp_list)
+    /* Setup the executor queue */
+    event *head = &l->_sentinel;
+
+    /* Flip the order of the events by relinking them one by one (push-pop) */
+    while (received != &l->_sentinel)
     {
-      event *e = SKIP_BACK(event, n, n);
-
-      if (!limit)
-	break;
-
-      io_log_event(e->hook, e->data);
-
-      ev_run(e);
-      tmp_flush();
-      limit--;
+      event *cur = received;
+      received = atomic_exchange_explicit(&cur->next, head, memory_order_relaxed);
+      head = cur;
     }
 
-  LOCK_DOMAIN(event, l->lock);
-  if (!EMPTY_LIST(tmp_list))
-  {
-    /* Attach new items after the unprocessed old items */
-    add_tail_list(&tmp_list, &l->events);
-    init_list(&l->events);
-    add_tail_list(&l->events, &tmp_list);
+    /* Store the executor queue to its designated place */
+    atomic_store_explicit(ep, head, memory_order_relaxed);
   }
 
-  int repeat = ! EMPTY_LIST(l->events);
-  UNLOCK_DOMAIN(event, l->lock);
+  /* Run the events in order. */
+  event *e;
+  while ((e = atomic_load_explicit(ep, memory_order_relaxed)) != &l->_sentinel)
+    {
+      /* Check limit */
+      if (!--limit)
+	return 1;
 
-  return repeat;
+      /* This is ugly hack, we want to log just events executed from the main I/O loop */
+      if ((l == &global_event_list) || (l == &global_work_list))
+	io_log_event(e->hook, e->data);
+
+      /* Inactivate the event */
+      atomic_store_explicit(ep, atomic_load_explicit(&e->next, memory_order_relaxed), memory_order_relaxed);
+      atomic_store_explicit(&e->next, NULL, memory_order_relaxed);
+
+      /* Run the event */
+      e->hook(e->data);
+      tmp_flush();
+    }
+
+  return atomic_load_explicit(&l->receiver, memory_order_relaxed) != &l->_sentinel;
 }
diff --git a/lib/event.h b/lib/event.h
index 6c358f84..9773c3a9 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -14,21 +14,24 @@
 
 #include <stdatomic.h>
 
-DEFINE_DOMAIN(event);
+struct birdloop;
 
 typedef struct event {
   resource r;
   void (*hook)(void *);
   void *data;
-  node n;				/* Internal link */
-  struct event_list *list;		/* List where this event is put in */
+  struct event * _Atomic next;
 } event;
 
-typedef struct event_list {
-  list events;
-  pool *pool;
-  struct birdloop *loop;
-  DOMAIN(event) lock;
+typedef union event_list {
+  struct {
+    event * _Atomic receiver;	/* Event receive list */
+    event * _Atomic _executor;	/* Event execute list */
+    const char *name;
+    struct birdloop *loop;	/* The executor loop */
+    char _end[0];
+  };
+  event _sentinel;	/* Sentinel node to actively detect list end */
 } event_list;
 
 extern event_list global_event_list;
@@ -36,36 +39,40 @@ extern event_list global_work_list;
 
 event *ev_new(pool *);
 void ev_run(event *);
-
-static inline void ev_init_list(event_list *el, struct birdloop *loop, const char *name)
-{
-  init_list(&el->events);
-  el->loop = loop;
-  el->lock = DOMAIN_NEW(event, name);
-}
-
-void ev_send(event_list *, event *);
+void ev_init_list(event_list *, struct birdloop *loop, const char *name);
+void ev_enqueue(event_list *, event *);
+#define ev_send ev_enqueue
 #define ev_send_loop(l, e) ev_send(birdloop_event_list((l)), (e))
 
 #define ev_schedule(e) ({ ASSERT_THE_BIRD_LOCKED; if (!ev_active((e))) ev_send(&global_event_list, (e)); })
 #define ev_schedule_work(e) ({ ASSERT_THE_BIRD_LOCKED; if (!ev_active((e))) ev_send(&global_work_list, (e)); })
 
 void ev_postpone(event *);
-int ev_run_list(event_list *);
 int ev_run_list_limited(event_list *, uint);
+#define ev_run_list(l)	ev_run_list_limited((l), ~0)
 
 #define LEGACY_EVENT_LIST(l)  (((l) == &global_event_list) || ((l) == &global_work_list))
 
-_Bool birdloop_inside(struct birdloop *loop);
-
 static inline int
 ev_active(event *e)
 {
-  if (e->list == NULL)
-    return 0;
+  return atomic_load_explicit(&e->next, memory_order_relaxed) != NULL;
+}
 
-  ASSERT_DIE(birdloop_inside(e->list->loop));
-  return enlisted(&e->n);
+static inline event_list *
+ev_get_list(event *e)
+{
+  /* We are looking for the sentinel node at the list end.
+   * After this, we have s->next == NULL */
+  event *s = e;
+  for (event *sn; sn = atomic_load_explicit(&s->next, memory_order_acquire); s = sn)
+    ;
+
+  /* No sentinel, no list. */
+  if (s == e)
+    return NULL;
+  else
+    return SKIP_BACK(event_list, _sentinel, s);
 }
 
 static inline event*
diff --git a/lib/io-loop.h b/lib/io-loop.h
index 25f1b2a3..dec7d040 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -14,12 +14,12 @@
 #include "lib/event.h"
 #include "lib/socket.h"
 
+extern struct birdloop main_birdloop;
+
 void sk_start(sock *s);
 void sk_stop(sock *s);
 void sk_reloop(sock *s, struct birdloop *loop);
 
-extern struct birdloop main_birdloop;
-
 /* Start a new birdloop owned by given pool and domain */
 struct birdloop *birdloop_new(pool *p, uint order, const char *name);
 
diff --git a/lib/locking.h b/lib/locking.h
index ab5c06af..8ea1c968 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,7 +16,6 @@ struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
   struct domain_generic *rtable;
-  struct domain_generic *event;
 };
 
 extern _Thread_local struct lock_order locking_stack;
diff --git a/nest/proto.c b/nest/proto.c
index e9bced3b..17cd08f7 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1072,7 +1072,6 @@ proto_loop_stopped(void *ptr)
   birdloop_enter(&main_birdloop);
 
   p->loop = &main_birdloop;
-  p->event->list = NULL;
   proto_cleanup(p);
 
   birdloop_leave(&main_birdloop);
@@ -1163,8 +1162,6 @@ proto_start(struct proto *p)
   if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
     p->loop = birdloop_new(p->pool, p->cf->loop_order, p->pool->name);
 
-  p->event->list = proto_event_list(p);
-
   PROTO_LOCKED_FROM_MAIN(p)
     proto_notify_state(p, (p->proto->start ? p->proto->start(p) : PS_UP));
 }

From 03bf6b90879bb6e5f0fab05a61a843bb437dd30a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Jul 2022 19:22:48 +0200
Subject: [PATCH 169/431] Revert "Adding a generic cork mechanism for events"

This reverts commit 6e841b3153565632b6753f6b1fe74850c37f2808.
---
 lib/event.c           | 76 ++++---------------------------------------
 lib/event.h           | 30 -----------------
 lib/locking.h         |  1 -
 lib/socket.h          |  1 -
 sysdep/unix/io-loop.c |  2 +-
 sysdep/unix/io.c      |  2 +-
 6 files changed, 9 insertions(+), 103 deletions(-)

diff --git a/lib/event.c b/lib/event.c
index 5031f314..6c5c8b14 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -114,42 +114,17 @@ ev_send(event_list *l, event *e)
 
   e->list = l;
 
-  struct event_cork *ec = e->cork;
-
-  uint ping = 0;
-
-  if (ec)
+  LOCK_DOMAIN(event, l->lock);
+  if (enlisted(&e->n))
   {
-    LOCK_DOMAIN(cork, ec->lock);
-    LOCK_DOMAIN(event, l->lock);
-
-    if (!enlisted(&e->n))
-      if (ec->count)
-	add_tail(&ec->events, &e->n);
-      else
-      {
-	add_tail(&l->events, &e->n);
-	ping = 1;
-      }
-
-    UNLOCK_DOMAIN(event, l->lock);
-    UNLOCK_DOMAIN(cork, ec->lock);
-  }
-  else
-  {
-    LOCK_DOMAIN(event, l->lock);
-
-    if (!enlisted(&e->n))
-    {
-      add_tail(&l->events, &e->n);
-      ping = 1;
-    }
-
     UNLOCK_DOMAIN(event, l->lock);
+    return;
   }
 
-  if (ping)
-    birdloop_ping(l->loop);
+  add_tail(&l->events, &e->n);
+  UNLOCK_DOMAIN(event, l->lock);
+
+  birdloop_ping(l->loop);
 }
 
 void io_log_event(void *hook, void *data);
@@ -249,40 +224,3 @@ ev_run_list_limited(event_list *l, uint limit)
 
   return repeat;
 }
-
-void ev_cork(struct event_cork *ec)
-{
-  LOCK_DOMAIN(cork, ec->lock);
-  ec->count++;
-  UNLOCK_DOMAIN(cork, ec->lock);
-}
-
-void ev_uncork(struct event_cork *ec)
-{
-  LOCK_DOMAIN(cork, ec->lock);
-
-  if (--ec->count)
-  {
-    UNLOCK_DOMAIN(cork, ec->lock);
-    return;
-  }
-
-  node *n;
-  WALK_LIST_FIRST(n, ec->events)
-    {
-      event *e = SKIP_BACK(event, n, n);
-      event_list *el = e->list;
-
-      rem_node(&e->n);
-
-      LOCK_DOMAIN(event, el->lock);
-      add_tail(&el->events, &e->n);
-      UNLOCK_DOMAIN(event, el->lock);
-
-      birdloop_ping(el->loop);
-    }
-
-  UNLOCK_DOMAIN(cork, ec->lock);
-
-  birdloop_ping(&main_birdloop);
-}
diff --git a/lib/event.h b/lib/event.h
index cd85bf78..6c358f84 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -15,7 +15,6 @@
 #include <stdatomic.h>
 
 DEFINE_DOMAIN(event);
-DEFINE_DOMAIN(cork);
 
 typedef struct event {
   resource r;
@@ -23,8 +22,6 @@ typedef struct event {
   void *data;
   node n;				/* Internal link */
   struct event_list *list;		/* List where this event is put in */
-  struct event_cork *cork;		/* Event execution limiter */
-  node cork_node;
 } event;
 
 typedef struct event_list {
@@ -34,12 +31,6 @@ typedef struct event_list {
   DOMAIN(event) lock;
 } event_list;
 
-struct event_cork {
-  DOMAIN(cork) lock;
-  u32 count;
-  list events;
-};
-
 extern event_list global_event_list;
 extern event_list global_work_list;
 
@@ -53,13 +44,6 @@ static inline void ev_init_list(event_list *el, struct birdloop *loop, const cha
   el->lock = DOMAIN_NEW(event, name);
 }
 
-static inline void ev_init_cork(struct event_cork *ec, const char *name)
-{
-  init_list(&ec->events);
-  ec->lock = DOMAIN_NEW(cork, name);
-  ec->count = 0;
-};
-
 void ev_send(event_list *, event *);
 #define ev_send_loop(l, e) ev_send(birdloop_event_list((l)), (e))
 
@@ -72,20 +56,6 @@ int ev_run_list_limited(event_list *, uint);
 
 #define LEGACY_EVENT_LIST(l)  (((l) == &global_event_list) || ((l) == &global_work_list))
 
-void ev_cork(struct event_cork *);
-void ev_uncork(struct event_cork *);
-
-static inline u32 ev_corked(struct event_cork *ec)
-{
-  if (!ec)
-    return 0;
-
-  LOCK_DOMAIN(cork, ec->lock);
-  u32 out = ec->count;
-  UNLOCK_DOMAIN(cork, ec->lock);
-  return out;
-}
-
 _Bool birdloop_inside(struct birdloop *loop);
 
 static inline int
diff --git a/lib/locking.h b/lib/locking.h
index 0cbdead8..ab5c06af 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,7 +16,6 @@ struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
   struct domain_generic *rtable;
-  struct domain_generic *cork;
   struct domain_generic *event;
 };
 
diff --git a/lib/socket.h b/lib/socket.h
index ff07660f..5bdab7f3 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -57,7 +57,6 @@ typedef struct birdsock {
   uint fast_rx;				/* RX has higher priority in event loop */
   uint rbsize;
   int (*rx_hook)(struct birdsock *, uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */
-  struct event_cork *cork;		/* Cork to temporarily stop receiving data */
 
   byte *tbuf, *tpos;			/* NULL=allocate automatically */
   byte *ttx;				/* Internal */
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index c7cf4ad2..275d38a0 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -205,7 +205,7 @@ sk_stop(sock *s)
 }
 
 static inline uint sk_want_events(sock *s)
-{ return ((s->rx_hook && !ev_corked(s->cork)) ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
+{ return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
 
 /*
 FIXME: this should be called from sock code
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index dd385c80..c91f2856 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2234,7 +2234,7 @@ io_loop(void)
 	{
 	  pfd[nfds] = (struct pollfd) { .fd = -1 }; /* everything other set to 0 by this */
 	  s = SKIP_BACK(sock, n, n);
-	  if (s->rx_hook && !ev_corked(s->cork))
+	  if (s->rx_hook)
 	    {
 	      pfd[nfds].fd = s->fd;
 	      pfd[nfds].events |= POLLIN;

From e858dce757f8766a29f2151ec3ffef3df85af66b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Jul 2022 19:49:03 +0200
Subject: [PATCH 170/431] Moved the thread starting code to IO loop code

---
 lib/coro.h                            | 29 ----------
 lib/timer.c                           |  3 +-
 lib/timer.h                           |  1 -
 nest/proto.c                          |  1 -
 nest/protocol.h                       |  4 +-
 nest/rt-table.c                       |  2 +-
 sysdep/unix/Makefile                  |  2 +-
 sysdep/unix/{coroutine.c => domain.c} | 78 +--------------------------
 sysdep/unix/io-loop.c                 | 50 ++++++++++++++---
 sysdep/unix/io-loop.h                 |  4 ++
 sysdep/unix/log.c                     | 10 ++--
 11 files changed, 57 insertions(+), 127 deletions(-)
 delete mode 100644 lib/coro.h
 rename sysdep/unix/{coroutine.c => domain.c} (64%)

diff --git a/lib/coro.h b/lib/coro.h
deleted file mode 100644
index 17ccff89..00000000
--- a/lib/coro.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *	BIRD Coroutines
- *
- *	(c) 2017 Martin Mares <mj@ucw.cz>
- *	(c) 2020-2021 Maria Matejka <mq@jmq.cz>
- *
- *	Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#ifndef _BIRD_CORO_H_
-#define _BIRD_CORO_H_
-
-#include "lib/resource.h"
-
-/* A completely opaque coroutine handle. */
-struct coroutine;
-
-/* Coroutines are independent threads bound to pools.
- * You request a coroutine by calling coro_run().
- * It is forbidden to free a running coroutine from outside.
- * The running coroutine must free itself by rfree() before returning.
- */
-struct coroutine *coro_run(pool *, void (*entry)(void *), void *data);
-
-/* Get self. */
-extern _Thread_local struct coroutine *this_coro;
-
-
-#endif
diff --git a/lib/timer.c b/lib/timer.c
index c1241ba7..ff6975a4 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -32,7 +32,6 @@
 
 #include "nest/bird.h"
 
-#include "lib/coro.h"
 #include "lib/heap.h"
 #include "lib/resource.h"
 #include "lib/timer.h"
@@ -117,7 +116,7 @@ tm_set_in_tl(timer *t, btime when, struct timeloop *local_timeloop)
 
   t->loop = local_timeloop;
 
-  if ((t->index == 1) && (local_timeloop->coro != this_coro))
+  if (t->index == 1)
     birdloop_ping(local_timeloop->loop);
 }
 
diff --git a/lib/timer.h b/lib/timer.h
index 04544ace..555fc96f 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -41,7 +41,6 @@ struct timeloop
   BUFFER_(timer *) timers;
   struct domain_generic *domain;
   struct birdloop *loop;
-  struct coroutine *coro;
 };
 
 #define TLOCK_TIMER_ASSERT(loop) ASSERT_DIE((loop)->domain && DG_IS_LOCKED((loop)->domain))
diff --git a/nest/proto.c b/nest/proto.c
index 17cd08f7..1d480ba2 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -15,7 +15,6 @@
 #include "lib/event.h"
 #include "lib/timer.h"
 #include "lib/string.h"
-#include "lib/coro.h"
 #include "conf/conf.h"
 #include "nest/rt.h"
 #include "nest/iface.h"
diff --git a/nest/protocol.h b/nest/protocol.h
index d6224015..3c823ae1 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -134,7 +134,7 @@ struct proto {
   u32 debug;				/* Debugging flags */
   u32 mrtdump;				/* MRTDump flags */
   uint active_channels;			/* Number of active channels */
-  uint active_coroutines;		/* Number of active coroutines */
+  uint active_loops;			/* Number of active IO loops */
   byte net_type;			/* Protocol network type (NET_*), 0 for undefined */
   byte disabled;			/* Manually disabled */
   byte vrf_set;				/* Related VRF instance (above) is defined */
@@ -342,7 +342,7 @@ void proto_notify_state(struct proto *p, unsigned state);
  */
 
 static inline int proto_is_inactive(struct proto *p)
-{ return (p->active_channels == 0) && (p->active_coroutines == 0); }
+{ return (p->active_channels == 0) && (p->active_loops == 0); }
 
 
 /*
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ca092678..65fc142a 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1984,7 +1984,7 @@ rt_export_stopped(void *data)
   /* Reporting the hook as finished. */
   CALL(tab->done, hook);
 
-  /* Free the hook together with its coroutine. */
+  /* Free the hook. */
   rfree(hook->pool);
 }
 
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index 9831dc96..3f1a8b3a 100644
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -1,4 +1,4 @@
-src := alloc.c io.c io-loop.c krt.c log.c main.c random.c coroutine.c
+src := alloc.c io.c io-loop.c krt.c log.c main.c random.c domain.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
diff --git a/sysdep/unix/coroutine.c b/sysdep/unix/domain.c
similarity index 64%
rename from sysdep/unix/coroutine.c
rename to sysdep/unix/domain.c
index 4758c056..0a5858a6 100644
--- a/sysdep/unix/coroutine.c
+++ b/sysdep/unix/domain.c
@@ -1,7 +1,6 @@
 /*
- *	BIRD Coroutines
+ *	BIRD Locking
  *
- *	(c) 2017 Martin Mares <mj@ucw.cz>
  *	(c) 2020 Maria Matejka <mq@jmq.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
@@ -17,18 +16,11 @@
 
 #include "lib/birdlib.h"
 #include "lib/locking.h"
-#include "lib/coro.h"
 #include "lib/resource.h"
 #include "lib/timer.h"
 
 #include "conf/conf.h"
 
-#define CORO_STACK_SIZE	65536
-
-/*
- *	Implementation of coroutines based on POSIX threads
- */
-
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
@@ -122,71 +114,3 @@ void do_unlock(struct domain_generic *dg, struct domain_generic **lsp)
   dg->prev = NULL;
   pthread_mutex_unlock(&dg->mutex);
 }
-
-/* Coroutines */
-struct coroutine {
-  resource r;
-  pthread_t id;
-  pthread_attr_t attr;
-  void (*entry)(void *);
-  void *data;
-};
-
-static _Thread_local _Bool coro_cleaned_up = 0;
-
-static void coro_free(resource *r)
-{
-  struct coroutine *c = (void *) r;
-  ASSERT_DIE(pthread_equal(pthread_self(), c->id));
-  pthread_attr_destroy(&c->attr);
-  coro_cleaned_up = 1;
-}
-
-static struct resclass coro_class = {
-  .name = "Coroutine",
-  .size = sizeof(struct coroutine),
-  .free = coro_free,
-};
-
-_Thread_local struct coroutine *this_coro = NULL;
-
-static void *coro_entry(void *p)
-{
-  struct coroutine *c = p;
-
-  ASSERT_DIE(c->entry);
-
-  this_coro = c;
-
-  c->entry(c->data);
-  ASSERT_DIE(coro_cleaned_up);
-
-  return NULL;
-}
-
-struct coroutine *coro_run(pool *p, void (*entry)(void *), void *data)
-{
-  ASSERT_DIE(entry);
-  ASSERT_DIE(p);
-
-  struct coroutine *c = ralloc(p, &coro_class);
-
-  c->entry = entry;
-  c->data = data;
-
-  int e = 0;
-
-  if (e = pthread_attr_init(&c->attr))
-    die("pthread_attr_init() failed: %M", e);
-
-  if (e = pthread_attr_setstacksize(&c->attr, CORO_STACK_SIZE))
-    die("pthread_attr_setstacksize(%u) failed: %M", CORO_STACK_SIZE, e);
-
-  if (e = pthread_attr_setdetachstate(&c->attr, PTHREAD_CREATE_DETACHED))
-    die("pthread_attr_setdetachstate(PTHREAD_CREATE_DETACHED) failed: %M", e);
-
-  if (e = pthread_create(&c->id, &c->attr, coro_entry, c))
-    die("pthread_create() failed: %M", e);
-
-  return c;
-}
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index dfb2ce49..3419d9d8 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -17,7 +17,6 @@
 #include "nest/bird.h"
 
 #include "lib/buffer.h"
-#include "lib/coro.h"
 #include "lib/lists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
@@ -28,6 +27,8 @@
 #include "sysdep/unix/io-loop.h"
 #include "conf/conf.h"
 
+#define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
+
 /*
  *	Current thread context
  */
@@ -132,11 +133,10 @@ wakeup_do_kick(struct birdloop *loop)
   pipe_kick(loop->wakeup_fds[1]);
 }
 
-void
-birdloop_ping(struct birdloop *loop)
+static inline void
+birdloop_do_ping(struct birdloop *loop)
 {
-  u32 ping_sent = atomic_fetch_add_explicit(&loop->ping_sent, 1, memory_order_acq_rel);
-  if (ping_sent)
+  if (atomic_fetch_add_explicit(&loop->ping_sent, 1, memory_order_acq_rel))
     return;
 
   if (loop == birdloop_wakeup_masked)
@@ -145,6 +145,15 @@ birdloop_ping(struct birdloop *loop)
     wakeup_do_kick(loop);
 }
 
+void
+birdloop_ping(struct birdloop *loop)
+{
+  if (birdloop_inside(loop) && !loop->ping_pending)
+    loop->ping_pending++;
+  else
+    birdloop_do_ping(loop);
+}
+
 
 /*
  *	Sockets
@@ -336,7 +345,7 @@ birdloop_init(void)
   birdloop_enter_locked(&main_birdloop);
 }
 
-static void birdloop_main(void *arg);
+static void *birdloop_main(void *arg);
 
 struct birdloop *
 birdloop_new(pool *pp, uint order, const char *name)
@@ -357,7 +366,19 @@ birdloop_new(pool *pp, uint order, const char *name)
   timers_init(&loop->time, p);
   sockets_init(loop);
 
-  loop->time.coro = coro_run(p, birdloop_main, loop);
+  int e = 0;
+
+  if (e = pthread_attr_init(&loop->thread_attr))
+    die("pthread_attr_init() failed: %M", e);
+
+  if (e = pthread_attr_setstacksize(&loop->thread_attr, THREAD_STACK_SIZE))
+    die("pthread_attr_setstacksize(%u) failed: %M", THREAD_STACK_SIZE, e);
+
+  if (e = pthread_attr_setdetachstate(&loop->thread_attr, PTHREAD_CREATE_DETACHED))
+    die("pthread_attr_setdetachstate(PTHREAD_CREATE_DETACHED) failed: %M", e);
+
+  if (e = pthread_create(&loop->thread_id, &loop->thread_attr, birdloop_main, loop))
+    die("pthread_create() failed: %M", e);
 
   birdloop_leave(loop);
 
@@ -393,6 +414,10 @@ void
 birdloop_free(struct birdloop *loop)
 {
   ASSERT_DIE(loop->links == 0);
+  ASSERT_DIE(pthread_equal(pthread_self(), loop->thread_id));
+
+  pthread_attr_destroy(&loop->thread_attr);
+
   domain_free(loop->time.domain);
   rfree(loop->pool);
 }
@@ -423,6 +448,13 @@ birdloop_leave_locked(struct birdloop *loop)
   /* Check the current context */
   ASSERT_DIE(birdloop_current == loop);
 
+  /* Send pending pings */
+  if (loop->ping_pending)
+  {
+    loop->ping_pending = 0;
+    birdloop_do_ping(loop);
+  }
+
   /* Restore the old context */
   birdloop_current = loop->prev_loop;
 }
@@ -466,7 +498,7 @@ birdloop_unlink(struct birdloop *loop)
   loop->links--;
 }
 
-static void
+static void *
 birdloop_main(void *arg)
 {
   struct birdloop *loop = arg;
@@ -532,6 +564,8 @@ birdloop_main(void *arg)
 
   birdloop_leave(loop);
   loop->stopped(loop->stop_data);
+
+  return NULL;
 }
 
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 4024b6c5..ca4322fc 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -21,9 +21,13 @@ struct birdloop
   u8 poll_changed;
   u8 close_scheduled;
 
+  uint ping_pending;
   _Atomic u32 ping_sent;
   int wakeup_fds[2];
 
+  pthread_t thread_id;
+  pthread_attr_t thread_attr;
+
   uint links;
 
   void (*stopped)(void *data);
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index f48588b6..185231e8 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -36,10 +36,10 @@ static FILE *dbgf;
 static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
-static _Atomic uint max_coro_id = ATOMIC_VAR_INIT(1);
-static _Thread_local uint this_coro_id;
+static _Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
+static _Thread_local uint this_thread_id;
 
-#define THIS_CORO_ID  (this_coro_id ?: (this_coro_id = atomic_fetch_add_explicit(&max_coro_id, 1, memory_order_acq_rel)))
+#define THIS_THREAD_ID  (this_thread_id ?: (this_thread_id = atomic_fetch_add_explicit(&max_thread_id, 1, memory_order_acq_rel)))
 
 #include <pthread.h>
 
@@ -183,7 +183,7 @@ log_commit(int class, buffer *buf)
 		l->pos += msg_len;
 	      }
 
-	      fprintf(l->fh, "%s [%04x] <%s> ", tbuf, THIS_CORO_ID, class_names[class]);
+	      fprintf(l->fh, "%s [%04x] <%s> ", tbuf, THIS_THREAD_ID, class_names[class]);
 	    }
 	  fputs(buf->start, l->fh);
 	  fputc('\n', l->fh);
@@ -329,7 +329,7 @@ debug(const char *msg, ...)
 	sec = dbg_time.tv_sec - dbg_time_start.tv_sec - 1;
       }
 
-      int n = bsnprintf(pos, max, "%u.%09u: [%04x] ", sec, nsec, THIS_CORO_ID);
+      int n = bsnprintf(pos, max, "%u.%09u: [%04x] ", sec, nsec, THIS_THREAD_ID);
       pos += n;
       max -= n;
 

From f60f7dfdee556a12c47940bc6ec3113fdae46a5c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Jul 2022 19:52:19 +0200
Subject: [PATCH 171/431] Sending an event must also ping the target IO loop

---
 lib/event.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/event.c b/lib/event.c
index 7effc315..07d7dc53 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -183,6 +183,8 @@ ev_send(event_list *l, event *e)
   while (!atomic_compare_exchange_strong_explicit(
 	&l->receiver, &next, e,
 	memory_order_acq_rel, memory_order_acquire));
+
+  birdloop_ping(l->loop);
 }
 
 void io_log_event(void *hook, void *data);

From f1d6c66a78758449f00ed709891e24ab3571cc9c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 1 Aug 2022 15:17:41 +0200
Subject: [PATCH 172/431] Fixed main birdloop init in unit tests

Some unit tests weren't initializing the birdloop, trying to write the
birdloop ping into stdin. Fixed this and also forced stdin close on
startup of every test just to be sure that CI and local build behave the
same in this. (CI was failing on this while local build not.)
---
 lib/event_test.c | 3 ---
 test/birdtest.c  | 5 +++++
 test/bt-utils.c  | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/event_test.c b/lib/event_test.c
index 5385011a..612deb25 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -54,7 +54,6 @@ t_ev_run_list(void)
   int i;
 
   olock_init();
-  birdloop_init();
   rt_init();
   io_init();
   if_init();
@@ -81,9 +80,7 @@ main(int argc, char *argv[])
 {
   bt_init(argc, argv);
 
-  the_bird_lock();
   bt_test_suite(t_ev_run_list, "Schedule and run 3 events in right order.");
-  the_bird_unlock();
 
   return bt_exit_value();
 }
diff --git a/test/birdtest.c b/test/birdtest.c
index 2ae7b51e..5e3de1c5 100644
--- a/test/birdtest.c
+++ b/test/birdtest.c
@@ -65,6 +65,9 @@ bt_init(int argc, char *argv[])
 {
   int c;
 
+  /* We have no interest in stdin */
+  close(0);
+
   initstate(BT_RANDOM_SEED, (char *) bt_random_state, sizeof(bt_random_state));
 
   bt_verbose = 0;
@@ -121,9 +124,11 @@ bt_init(int argc, char *argv[])
   clock_gettime(CLOCK_MONOTONIC, &bt_begin);
   bt_suite_case_begin = bt_suite_begin = bt_begin;
 
+  the_bird_lock();
   resource_init();
   ev_init_list(&global_event_list, &main_birdloop, "Global event list in unit tests");
   ev_init_list(&global_work_list, &main_birdloop, "Global work list in unit tests");
+  birdloop_init();
   return;
 
  usage:
diff --git a/test/bt-utils.c b/test/bt-utils.c
index 3d56292e..36e44da4 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -62,9 +62,7 @@ bt_bird_init(void)
     log_init_debug("");
   log_switch(bt_verbose != 0, NULL, NULL);
 
-  the_bird_lock();
   olock_init();
-  birdloop_init();
   rt_init();
   io_init();
   if_init();

From 058ed711397df75350d905fc135758a6470c0143 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 12 Nov 2021 22:58:40 +0100
Subject: [PATCH 173/431] Introducing basic RCU primitives for lock-less shared
 data structures

---
 lib/Makefile          |  2 +-
 lib/io-loop.h         |  4 +++
 lib/locking.h         |  1 +
 lib/rcu.c             | 79 +++++++++++++++++++++++++++++++++++++++++++
 lib/rcu.h             | 55 ++++++++++++++++++++++++++++++
 lib/resource.c        |  2 ++
 sysdep/unix/io-loop.c |  9 ++++-
 sysdep/unix/io-loop.h |  4 +++
 8 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 lib/rcu.c
 create mode 100644 lib/rcu.h

diff --git a/lib/Makefile b/lib/Makefile
index 15f757d9..f4ade9a6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
+src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c rcu.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
 obj := $(src-o-files)
 $(all-daemon)
 
diff --git a/lib/io-loop.h b/lib/io-loop.h
index dec7d040..2450a609 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -51,4 +51,8 @@ void birdloop_unlink(struct birdloop *loop);
 void birdloop_ping(struct birdloop *loop);
 
 void birdloop_init(void);
+
+/* Yield for a little while. Use only in special cases. */
+void birdloop_yield(void);
+
 #endif /* _BIRD_IO_LOOP_H_ */
diff --git a/lib/locking.h b/lib/locking.h
index 8ea1c968..a9a8aa9b 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -16,6 +16,7 @@ struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
   struct domain_generic *rtable;
+  struct domain_generic *resource;
 };
 
 extern _Thread_local struct lock_order locking_stack;
diff --git a/lib/rcu.c b/lib/rcu.c
new file mode 100644
index 00000000..83fdd022
--- /dev/null
+++ b/lib/rcu.c
@@ -0,0 +1,79 @@
+/*
+ *	BIRD Library -- Read-Copy-Update Basic Operations
+ *
+ *	(c) 2021 Maria Matejka <mq@jmq.cz>
+ *	(c) 2021 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Note: all the relevant patents shall be expired.
+ *
+ *	Using the Supplementary Material for User-Level Implementations of Read-Copy-Update
+ *	by Matthieu Desnoyers, Paul E. McKenney, Alan S. Stern, Michel R. Dagenais and Jonathan Walpole
+ *	obtained from https://www.efficios.com/pub/rcu/urcu-supp-accepted.pdf
+ */
+
+#include "lib/rcu.h"
+#include "lib/io-loop.h"
+#include "lib/locking.h"
+
+_Atomic uint rcu_gp_ctl = RCU_NEST_CNT;
+_Thread_local struct rcu_birdloop *this_rcu_birdloop = NULL;
+
+static list rcu_birdloop_list;
+
+static struct rcu_birdloop main_rcu_birdloop;
+
+DEFINE_DOMAIN(resource);
+static DOMAIN(resource) rcu_domain;
+
+static int
+rcu_gp_ongoing(_Atomic uint *ctl)
+{
+  uint val = atomic_load(ctl);
+  return (val & RCU_NEST_CNT) && ((val ^ rcu_gp_ctl) & RCU_GP_PHASE);
+}
+
+static void
+update_counter_and_wait(void)
+{
+  atomic_fetch_xor(&rcu_gp_ctl, RCU_GP_PHASE);
+  struct rcu_birdloop *rc;
+  WALK_LIST(rc, rcu_birdloop_list)
+    while (rcu_gp_ongoing(&rc->ctl))
+      birdloop_yield();
+}
+
+void
+synchronize_rcu(void)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  update_counter_and_wait();
+  update_counter_and_wait();
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_birdloop_start(struct rcu_birdloop *rc)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  add_tail(&rcu_birdloop_list, &rc->n);
+  this_rcu_birdloop = rc;
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_birdloop_stop(struct rcu_birdloop *rc)
+{
+  LOCK_DOMAIN(resource, rcu_domain);
+  this_rcu_birdloop = NULL;
+  rem_node(&rc->n);
+  UNLOCK_DOMAIN(resource, rcu_domain);
+}
+
+void
+rcu_init(void)
+{
+  rcu_domain = DOMAIN_NEW(resource, "Read-Copy-Update");
+  init_list(&rcu_birdloop_list);
+  rcu_birdloop_start(&main_rcu_birdloop);
+}
diff --git a/lib/rcu.h b/lib/rcu.h
new file mode 100644
index 00000000..c537a1ef
--- /dev/null
+++ b/lib/rcu.h
@@ -0,0 +1,55 @@
+/*
+ *	BIRD Library -- Read-Copy-Update Basic Operations
+ *
+ *	(c) 2021 Maria Matejka <mq@jmq.cz>
+ *	(c) 2021 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Note: all the relevant patents shall be expired.
+ */
+
+#ifndef _BIRD_RCU_H_
+#define _BIRD_RCU_H_
+
+#include "lib/birdlib.h"
+#include "lib/lists.h"
+#include <stdatomic.h>
+
+#define RCU_GP_PHASE  0x100000
+#define RCU_NEST_MASK 0x0fffff
+#define RCU_NEST_CNT  0x000001
+
+extern _Atomic uint rcu_gp_ctl;
+
+struct rcu_birdloop {
+  node n;
+  _Atomic uint ctl;
+};
+
+extern _Thread_local struct rcu_birdloop *this_rcu_birdloop;
+
+static inline void rcu_read_lock(void)
+{
+  uint cmp = atomic_load_explicit(&this_rcu_birdloop->ctl, memory_order_acquire);
+
+  if (cmp & RCU_NEST_MASK)
+    atomic_store_explicit(&this_rcu_birdloop->ctl, cmp + RCU_NEST_CNT, memory_order_relaxed);
+  else
+    atomic_store(&this_rcu_birdloop->ctl, atomic_load_explicit(&rcu_gp_ctl, memory_order_acquire));
+}
+
+static inline void rcu_read_unlock(void)
+{
+  atomic_fetch_sub(&this_rcu_birdloop->ctl, RCU_NEST_CNT);
+}
+
+void synchronize_rcu(void);
+
+/* Registering and unregistering a birdloop. To be called from birdloop implementation */
+void rcu_birdloop_start(struct rcu_birdloop *);
+void rcu_birdloop_stop(struct rcu_birdloop *);
+
+/* Run this from resource init */
+void rcu_init(void);
+
+#endif
diff --git a/lib/resource.c b/lib/resource.c
index a33fd214..898fb533 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -14,6 +14,7 @@
 #include "nest/bird.h"
 #include "lib/resource.h"
 #include "lib/string.h"
+#include "lib/rcu.h"
 
 /**
  * DOC: Resource pools
@@ -279,6 +280,7 @@ void
 resource_init(void)
 {
   resource_sys_init();
+  rcu_init();
 
   root_pool.r.class = &pool_class;
   root_pool.name = "Root";
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 3419d9d8..3e3fc31a 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -416,6 +416,7 @@ birdloop_free(struct birdloop *loop)
   ASSERT_DIE(loop->links == 0);
   ASSERT_DIE(pthread_equal(pthread_self(), loop->thread_id));
 
+  rcu_birdloop_stop(&loop->rcu);
   pthread_attr_destroy(&loop->thread_attr);
 
   domain_free(loop->time.domain);
@@ -505,6 +506,8 @@ birdloop_main(void *arg)
   timer *t;
   int rv, timeout;
 
+  rcu_birdloop_start(&loop->rcu);
+
   btime loop_begin = current_time();
 
   tmp_init(loop->pool);
@@ -568,4 +571,8 @@ birdloop_main(void *arg)
   return NULL;
 }
 
-
+void
+birdloop_yield(void)
+{
+  usleep(100);
+}
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index ca4322fc..31c40459 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -7,6 +7,8 @@
 #ifndef _BIRD_SYSDEP_UNIX_IO_LOOP_H_
 #define _BIRD_SYSDEP_UNIX_IO_LOOP_H_
 
+#include "lib/rcu.h"
+
 struct birdloop
 {
   pool *pool;
@@ -28,6 +30,8 @@ struct birdloop
   pthread_t thread_id;
   pthread_attr_t thread_attr;
 
+  struct rcu_birdloop rcu;
+
   uint links;
 
   void (*stopped)(void *data);

From f8500b5943490ca62a1538fead4d8a88ad189c5a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Jul 2022 13:50:59 +0200
Subject: [PATCH 174/431] Route table cork: Indicate whether the export queues
 are congested.

These routines detect the export congestion (as defined by configurable
thresholds) and propagate the state to readers. There are no readers for
now, they will be added in following commits.
---
 doc/bird.sgml   |  9 +++++++
 nest/config.Y   |  6 ++++-
 nest/rt-table.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++
 nest/rt.h       | 42 +++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index c48b064c..a4d7cb0c 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -699,6 +699,15 @@ to set options.
 	periods. Default: adaptive, based on number of routing tables in the
 	configuration. From 10 s (with <= 25 routing tables) up to 600 s (with
 	>= 1500 routing tables).
+
+	<tag><label id="rtable-cork-threshold">cork threshold <m/number/ <m/number/</tag>
+	Too many pending exports may lead to memory bloating. In such cases,
+        BIRD tries to relieve the memory pressure by pausing some routines until
+        the queue sizes get low enough. This option allows the user to set the
+        thresholds; first value is the low threshold (when to resume), the
+        second one is the high threshold (when to pause). The higher is the
+        threshold, the more memory can get used. In most cases, the defaults
+	should work for you. Default: 128, 512.
 </descrip>
 
 
diff --git a/nest/config.Y b/nest/config.Y
index 4c758ea3..91147a29 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -125,7 +125,7 @@ CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
 CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
 CF_KEYWORDS(CHECK, LINK)
-CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD)
+CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD)
 
 /* For r_args_channel */
 CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
@@ -231,6 +231,10 @@ table_opt:
  | MAX SETTLE TIME expr_us { this_table->max_settle_time = $4; }
  | GC THRESHOLD expr { this_table->gc_threshold = $3; }
  | GC PERIOD expr_us { this_table->gc_period = (uint) $3; if ($3 > 3600 S_) cf_error("GC period must be at most 3600 s"); }
+ | CORK THRESHOLD expr expr {
+     if ($3 > $4) cf_error("Cork low threshold must be lower than the high threshold.");
+     this_table->cork_threshold.low = $3;
+     this_table->cork_threshold.high = $4; }
  ;
 
 table_opts:
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 65fc142a..c1f3098b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -119,6 +119,8 @@ static linpool *rte_update_pool;
 list routing_tables;
 list deleted_routing_tables;
 
+struct rt_cork rt_cork;
+
 /* Data structures for export journal */
 #define RT_PENDING_EXPORT_ITEMS		(page_size - sizeof(struct rt_export_block)) / sizeof(struct rt_pending_export)
 
@@ -144,6 +146,9 @@ static void rt_feed_by_trie(void *);
 static void rt_feed_equal(void *);
 static void rt_feed_for(void *);
 static uint rt_feed_net(struct rt_export_hook *c, net *n);
+static void rt_check_cork_low(rtable *tab);
+static void rt_check_cork_high(rtable *tab);
+static void rt_cork_release_hook(void *);
 
 static inline void rt_export_used(struct rt_exporter *);
 static void rt_export_cleanup(rtable *tab);
@@ -1371,6 +1376,8 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if (tab->exporter.first == NULL)
     tab->exporter.first = rpe;
 
+  rt_check_cork_high(tab);
+
   if (!tm_active(tab->exporter.export_timer))
     tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
 }
@@ -2667,6 +2674,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->last_rt_change = t->gc_time = current_time();
   t->exporter.next_seq = 1;
 
+  t->cork_threshold = cf->cork_threshold;
+
   t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
   if (rt_is_flow(t))
@@ -2692,6 +2701,8 @@ rt_init(void)
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
   init_list(&deleted_routing_tables);
+  ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release");
+  rt_cork.run = (event) { .hook = rt_cork_release_hook };
 }
 
 
@@ -3000,6 +3011,8 @@ rt_export_cleanup(rtable *tab)
     first = next;
   }
 
+  rt_check_cork_low(tab);
+
 done:;
   struct rt_import_hook *ih; node *x;
   _Bool imports_stopped = 0;
@@ -3030,6 +3043,16 @@ done:;
     tm_stop(tab->exporter.export_timer);
 }
 
+static void
+rt_cork_release_hook(void *data UNUSED)
+{
+  do synchronize_rcu();
+  while (
+      !atomic_load_explicit(&rt_cork.active, memory_order_acquire) &&
+      ev_run_list(&rt_cork.queue)
+      );
+}
+
 /**
  * rt_lock_trie - lock a prefix trie of a routing table
  * @tab: routing table with prefix trie to be locked
@@ -3610,6 +3633,8 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_period = (uint) -1;	/* set in rt_postconfig() */
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
+  c->cork_threshold.low = 128;
+  c->cork_threshold.high = 512;
 
   add_tail(&new_config->tables, &c->n);
 
@@ -3655,6 +3680,36 @@ rt_unlock_table(rtable *r)
     }
 }
 
+static void
+rt_check_cork_low(rtable *tab)
+{
+  if (!tab->cork_active)
+    return;
+
+  if (!tab->exporter.first || (tab->exporter.first->seq + tab->cork_threshold.low > tab->exporter.next_seq))
+  {
+    tab->cork_active = 0;
+    rt_cork_release();
+
+    if (config->table_debug)
+      log(L_TRACE "%s: Uncorked", tab->name);
+  }
+}
+
+static void
+rt_check_cork_high(rtable *tab)
+{
+  if (!tab->cork_active && tab->exporter.first && (tab->exporter.first->seq + tab->cork_threshold.high <= tab->exporter.next_seq))
+  {
+    tab->cork_active = 1;
+    rt_cork_acquire();
+
+    if (config->table_debug)
+      log(L_TRACE "%s: Corked", tab->name);
+  }
+}
+
+
 static int
 rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old)
 {
@@ -3668,6 +3723,14 @@ rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old
   tab->name = new->name;
   tab->config = new;
 
+  tab->cork_threshold = new->cork_threshold;
+
+  if (new->cork_threshold.high != old->cork_threshold.high)
+    rt_check_cork_high(tab);
+
+  if (new->cork_threshold.low != old->cork_threshold.low)
+    rt_check_cork_low(tab);
+
   return 1;
 }
 
diff --git a/nest/rt.h b/nest/rt.h
index 5acbded6..58c6ec33 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -18,6 +18,7 @@
 #include "lib/fib.h"
 #include "lib/route.h"
 #include "lib/event.h"
+#include "lib/rcu.h"
 
 #include <stdatomic.h>
 
@@ -33,6 +34,10 @@ struct f_trie;
 struct f_trie_walk_state;
 struct cli;
 
+struct rt_cork_threshold {
+  u64 low, high;
+};
+
 /*
  *	Master Routing Tables. Generally speaking, each of them contains a FIB
  *	with each entry pointing to a list of route entries representing routes
@@ -57,6 +62,7 @@ struct rtable_config {
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
   btime export_settle_time;		/* Delay before exports are announced */
+  struct rt_cork_threshold cork_threshold;	/* Cork threshold values */
 };
 
 struct rt_export_hook;
@@ -111,6 +117,8 @@ typedef struct rtable {
   byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
   byte export_used;			/* Pending Export pruning is scheduled */
+  byte cork_active;			/* Cork has been activated */
+  struct rt_cork_threshold cork_threshold;	/* Threshold for table cork */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct f_trie *trie_new;		/* New prefix trie defined during pruning */
@@ -139,6 +147,40 @@ struct rt_flowspec_link {
   u32 uc;
 };
 
+extern struct rt_cork {
+  _Atomic uint active;
+  event_list queue;
+  event run;
+} rt_cork;
+
+static inline void rt_cork_acquire(void)
+{
+  atomic_fetch_add_explicit(&rt_cork.active, 1, memory_order_acq_rel);
+}
+
+static inline void rt_cork_release(void)
+{
+  if (atomic_fetch_sub_explicit(&rt_cork.active, 1, memory_order_acq_rel) == 1)
+  {
+    synchronize_rcu();
+    ev_schedule_work(&rt_cork.run);
+  }
+}
+
+static inline int rt_cork_check(event *e)
+{
+  rcu_read_lock();
+
+  int corked = (atomic_load_explicit(&rt_cork.active, memory_order_acquire) > 0);
+  if (corked)
+    ev_send(&rt_cork.queue, e);
+
+  rcu_read_unlock();
+
+  return corked;
+}
+
+
 #define NHU_CLEAN	0
 #define NHU_SCHEDULED	1
 #define NHU_RUNNING	2

From 449cd471adfc214c4ec0f0d574818d469b13deec Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 2 Aug 2022 12:54:11 +0200
Subject: [PATCH 175/431] BGP: respecting table cork

---
 proto/bgp/bgp.c     |  4 ++++
 proto/bgp/bgp.h     |  2 ++
 proto/bgp/packets.c | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 3b624a49..33849b0b 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -376,6 +376,7 @@ bgp_close_conn(struct bgp_conn *conn)
   conn->keepalive_timer = NULL;
   rfree(conn->hold_timer);
   conn->hold_timer = NULL;
+
   rfree(conn->tx_ev);
   conn->tx_ev = NULL;
   rfree(conn->sk);
@@ -514,6 +515,7 @@ void
 bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len)
 {
   proto_notify_state(&p->p, PS_STOP);
+  p->uncork_ev->data = NULL;
   bgp_graceful_close_conn(&p->outgoing_conn, subcode, data, len);
   bgp_graceful_close_conn(&p->incoming_conn, subcode, data, len);
   ev_schedule(p->event);
@@ -1576,6 +1578,8 @@ bgp_start(struct proto *P)
   p->last_rx_update = 0;
 
   p->event = ev_new_init(p->p.pool, bgp_decision, p);
+  p->uncork_ev = ev_new_init(p->p.pool, bgp_uncork, p);
+
   p->startup_timer = tm_new_init(p->p.pool, bgp_startup_timeout, p, 0, 0);
   p->gr_timer = tm_new_init(p->p.pool, bgp_graceful_restart_timeout, p, 0, 0);
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 2e7615ea..469f0cb9 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -319,6 +319,7 @@ struct bgp_proto {
   struct bgp_socket *sock;		/* Shared listening socket */
   struct bfd_request *bfd_req;		/* BFD request, if BFD is used */
   struct birdsock *postponed_sk;	/* Postponed incoming socket for dynamic BGP */
+  event *uncork_ev;			/* Uncork event in case of congestion */
   struct bgp_stats stats;		/* BGP statistics */
   btime last_established;		/* Last time of enter/leave of established state */
   btime last_rx_update;			/* Last time of RX update */
@@ -610,6 +611,7 @@ void bgp_schedule_packet(struct bgp_conn *conn, struct bgp_channel *c, int type)
 void bgp_kick_tx(void *vconn);
 void bgp_tx(struct birdsock *sk);
 int bgp_rx(struct birdsock *sk, uint size);
+void bgp_uncork(void *vp);
 const char * bgp_error_dsc(unsigned code, unsigned subcode);
 void bgp_log_error(struct bgp_proto *p, u8 class, char *msg, unsigned code, unsigned subcode, byte *data, unsigned len);
 
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 4d4ae3eb..de976588 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -3175,6 +3175,21 @@ bgp_rx_packet(struct bgp_conn *conn, byte *pkt, uint len)
   }
 }
 
+void
+bgp_uncork(void *vp)
+{
+  struct bgp_proto *p = vp;
+
+  if (p && p->conn && (p->conn->state == BS_ESTABLISHED) && !p->conn->sk->rx_hook)
+  {
+    struct birdsock *sk = p->conn->sk;
+    ASSERT_DIE(sk->rpos > sk->rbuf);
+    sk->rx_hook = bgp_rx;
+    bgp_rx(sk, sk->rpos - sk->rbuf);
+    BGP_TRACE(D_PACKETS, "Uncorked");
+  }
+}
+
 /**
  * bgp_rx - handle received data
  * @sk: socket
@@ -3189,6 +3204,7 @@ int
 bgp_rx(sock *sk, uint size)
 {
   struct bgp_conn *conn = sk->data;
+  struct bgp_proto *p = conn->bgp;
   byte *pkt_start = sk->rbuf;
   byte *end = pkt_start + size;
   uint i, len;
@@ -3198,6 +3214,12 @@ bgp_rx(sock *sk, uint size)
     {
       if ((conn->state == BS_CLOSE) || (conn->sk != sk))
 	return 0;
+      if ((conn->state == BS_ESTABLISHED) && rt_cork_check(conn->bgp->uncork_ev))
+      {
+	sk->rx_hook = NULL;
+	BGP_TRACE(D_PACKETS, "Corked");
+	return 0;
+      }
       for(i=0; i<16; i++)
 	if (pkt_start[i] != 0xff)
 	  {

From db9153e216b6f1847ac9cdf170b1d14c04552e41 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 2 Aug 2022 17:51:58 +0200
Subject: [PATCH 176/431] Also next hop update routines are corking themselves
 when congestion is detected

---
 nest/rt-table.c | 33 +++++++++++++++++++++++++++++++++
 nest/rt.h       |  3 +++
 2 files changed, 36 insertions(+)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index c1f3098b..15dbc371 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2392,6 +2392,22 @@ rt_event(void *ptr)
   if (tab->export_used)
     rt_export_cleanup(tab);
 
+  if (
+      tab->hcu_corked ||
+      tab->nhu_corked ||
+      (tab->hcu_scheduled || tab->nhu_state) && rt_cork_check(tab->uncork_event)
+      )
+  {
+    if (!tab->hcu_corked && !tab->nhu_corked && config->table_debug)
+      log(L_TRACE "%s: Auxiliary routines corked", tab->name);
+
+    tab->hcu_corked |= tab->hcu_scheduled;
+    tab->hcu_scheduled = 0;
+
+    tab->nhu_corked |= tab->nhu_state;
+    tab->nhu_state = 0;
+  }
+
   if (tab->hcu_scheduled)
     rt_update_hostcache(tab);
 
@@ -2404,6 +2420,22 @@ rt_event(void *ptr)
   rt_unlock_table(tab);
 }
 
+static void
+rt_uncork_event(void *ptr)
+{
+  rtable *tab = ptr;
+
+  tab->hcu_scheduled |= tab->hcu_corked;
+  tab->hcu_corked = 0;
+
+  tab->nhu_state |= tab->nhu_corked;
+  tab->nhu_corked = 0;
+
+  if (config->table_debug)
+    log(L_TRACE "%s: Auxiliary routines uncorked", tab->name);
+
+  ev_schedule(tab->rt_event);
+}
 
 static void
 rt_prune_timer(timer *t)
@@ -2669,6 +2701,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->subscribers);
 
   t->rt_event = ev_new_init(p, rt_event, t);
+  t->uncork_event = ev_new_init(p, rt_uncork_event, t);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
   t->exporter.export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
diff --git a/nest/rt.h b/nest/rt.h
index 58c6ec33..66111dde 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -107,6 +107,7 @@ typedef struct rtable {
 					 * obstacle from this routing table.
 					 */
   struct event *rt_event;		/* Routing table event */
+  struct event *uncork_event;		/* Called when uncork happens */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
@@ -115,7 +116,9 @@ typedef struct rtable {
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte prune_trie;			/* Prune prefix trie during next table prune */
   byte hcu_scheduled;			/* Hostcache update is scheduled */
+  byte hcu_corked;			/* Hostcache update is corked with this state */
   byte nhu_state;			/* Next Hop Update state */
+  byte nhu_corked;			/* Next Hop Update is corked with this state */
   byte export_used;			/* Pending Export pruning is scheduled */
   byte cork_active;			/* Cork has been activated */
   struct rt_cork_threshold cork_threshold;	/* Threshold for table cork */

From de5b884280fef52cf3307f336262a7c61f3acbfe Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 2 Aug 2022 17:55:47 +0200
Subject: [PATCH 177/431] Revert "Table cork: Stop creating updates when there
 are too many pending."

This reverts commit 3b20722a1fc777c27ab2e0451d0ea3fee7fa81a2.
---
 nest/route.h    |  6 ------
 nest/rt-table.c | 23 +----------------------
 proto/bgp/bgp.c |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index 310cea92..88a56073 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -157,7 +157,6 @@ struct rtable_config {
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
   btime export_settle_time;		/* Delay before exports are announced */
-  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
 };
 
 typedef struct rtable {
@@ -188,9 +187,6 @@ typedef struct rtable {
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte nhu_state;			/* Next Hop Update state */
-
-  byte cork_active;			/* Congestion control activated */
-
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -382,8 +378,6 @@ struct rt_export_hook {
   void (*stopped)(struct rt_export_request *);	/* Stored callback when export is stopped */
 };
 
-extern struct event_cork rt_cork;
-
 #define TIS_DOWN	0
 #define TIS_UP		1
 #define TIS_STOP	2
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b4cd0448..6dd6587e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -110,7 +110,6 @@ const char *rt_export_state_name(u8 state)
     return rt_export_state_name_array[state];
 }
 
-struct event_cork rt_cork;
 
 /* Like fib_route(), but skips empty net entries */
 static inline void *
@@ -1062,13 +1061,7 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if (tab->first_export == NULL)
     tab->first_export = rpe;
 
-  if ((tab->first_export->seq + tab->config->cork_limit <= tab->next_export_seq) && !tab->cork_active)
-  {
-    ev_cork(&rt_cork);
-    tab->cork_active = 1;
-    tm_start(tab->export_timer, 0);
-  }
-  else if (!tm_active(tab->export_timer))
+  if (!tm_active(tab->export_timer))
     tm_start(tab->export_timer, tab->config->export_settle_time);
 }
 
@@ -2049,7 +2042,6 @@ rt_free(resource *_r)
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
   ASSERT_DIE(r->rt_count == 0);
-  ASSERT_DIE(!r->cork_active);
   ASSERT_DIE(EMPTY_LIST(r->imports));
   ASSERT_DIE(EMPTY_LIST(r->exports));
 
@@ -2114,9 +2106,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
   t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
 
-  t->nhu_event->cork = &rt_cork;
-  t->prune_event->cork = &rt_cork;
-
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
   t->next_export_seq = 1;
@@ -2139,7 +2128,6 @@ rt_init(void)
   rt_table_pool = rp_new(&root_pool, "Routing tables");
   rte_update_pool = lp_new_default(rt_table_pool);
   init_list(&routing_tables);
-  ev_init_cork(&rt_cork, "Route Table Cork");
 }
 
 /**
@@ -2432,14 +2420,6 @@ done:;
 
   if (EMPTY_LIST(tab->pending_exports) && tm_active(tab->export_timer))
     tm_stop(tab->export_timer);
-
-  /* If reduced to at most one export block pending */
-  if (tab->cork_active &&
-      ((!tab->first_export) || (tab->first_export->seq + 128 > tab->next_export_seq)))
-  {
-    tab->cork_active = 0;
-    ev_uncork(&rt_cork);
-  }
 }
 
 void
@@ -2719,7 +2699,6 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_min_time = 5;
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
-  c->cork_limit = 4 * page_size / sizeof(struct rt_pending_export);
   c->config = new_config;
 
   add_tail(&new_config->tables, &c->n);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5f2e7dfd..96df671f 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -584,7 +584,6 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
     p->link_addr = p->neigh->iface->llv6->ip;
 
   conn->sk->fast_rx = 0;
-  conn->sk->cork = &rt_cork;
 
   p->conn = conn;
   p->last_error_class = 0;

From 2e95d269d6bd42372d3273264e14775242b0744d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 2 Aug 2022 17:55:50 +0200
Subject: [PATCH 178/431] Revert "Split route table event into separate events"

This reverts commit 445eeaf3df126af2c7b61e71c4f08a583eb4fa60.
---
 nest/proto.c    |  16 +++---
 nest/protocol.h |   2 +-
 nest/route.h    |  12 ++---
 nest/rt-table.c | 139 +++++++++++++++++++++++++++++-------------------
 4 files changed, 100 insertions(+), 69 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index f8e1ba31..ac0fb232 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -658,8 +658,6 @@ channel_aux_stopped(void *data)
   else
     c->in_table = NULL;
 
-  rfree(cat->tab->rp);
-
   mb_free(cat);
   return channel_check_stopped(c);
 }
@@ -668,7 +666,7 @@ static void
 channel_aux_import_stopped(struct rt_import_request *req)
 {
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
-  ASSERT_DIE(cat->tab->delete_event);
+  ASSERT_DIE(cat->stop);
 }
 
 static void
@@ -677,23 +675,25 @@ channel_aux_export_stopped(struct rt_export_request *req)
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
-  if (cat->refeed_pending && !cat->tab->delete_event)
+  if (cat->refeed_pending && !cat->stop)
   {
     cat->refeed_pending = 0;
     rt_request_export(cat->tab, req);
   }
   else
-    ASSERT_DIE(cat->tab->delete_event);
+    ASSERT_DIE(cat->stop);
 }
 
 static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
+  cat->stop = 1;
+
   rt_stop_import(&cat->push, channel_aux_import_stopped);
   rt_stop_export(&cat->get, channel_aux_export_stopped);
 
-  cat->tab->delete_event = ev_new_init(cat->tab->rp, channel_aux_stopped, cat);
-
+  cat->tab->deleted = channel_aux_stopped;
+  cat->tab->del_data = cat;
   rt_unlock_table(cat->tab);
 }
 
@@ -886,6 +886,7 @@ channel_setup_in_table(struct channel *c, int best)
 
   c->in_table->c = c;
   c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  self_link(&c->in_table->tab->n);
   rt_lock_table(c->in_table->tab);
 
   rt_request_import(c->in_table->tab, &c->in_table->push);
@@ -928,6 +929,7 @@ channel_setup_out_table(struct channel *c)
 
   c->out_table->c = c;
   c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  self_link(&c->out_table->tab->n);
   rt_lock_table(c->out_table->tab);
 
   rt_request_import(c->out_table->tab, &c->out_table->push);
diff --git a/nest/protocol.h b/nest/protocol.h
index 981ca96a..2fbd607c 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -568,7 +568,7 @@ struct channel_aux_table {
   struct rt_import_request push;
   struct rt_export_request get;
   rtable *tab;
-  event *stop;
+  u8 stop;
   u8 refeed_pending;
 };
 
diff --git a/nest/route.h b/nest/route.h
index 88a56073..7c5fd02f 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -147,7 +147,6 @@ void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src)
 struct rtable_config {
   node n;
   char *name;
-  struct config *config;
   struct rtable *table;
   struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
@@ -176,17 +175,17 @@ typedef struct rtable {
   struct hmap id_map;
   struct hostcache *hostcache;
   struct rtable_config *config;		/* Configuration of this table */
-  struct event *prune_event;		/* Event to prune abandoned routes */
-  struct event *ec_event;		/* Event to prune finished exports */
-  struct event *hcu_event;		/* Event to update host cache */
-  struct event *nhu_event;		/* Event to update next hops */
-  struct event *delete_event;		/* Event to delete the table */
+  void (*deleted)(void *);		/* Table should free itself. Call this when it is done. */
+  void *del_data;
+  struct event *rt_event;		/* Routing table event */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
+  byte hcu_scheduled;			/* Hostcache update is scheduled */
   byte nhu_state;			/* Next Hop Update state */
+  byte export_used;			/* Export journal setup scheduled */
   struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
   struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
@@ -476,6 +475,7 @@ void rt_unlock_table(rtable *);
 void rt_subscribe(rtable *tab, struct rt_subscription *s);
 void rt_unsubscribe(struct rt_subscription *s);
 rtable *rt_setup(pool *, struct rtable_config *);
+static inline void rt_shutdown(rtable *r) { rfree(r->rp); }
 
 static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
 static inline net *net_find_valid(rtable *tab, const net_addr *addr)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6dd6587e..9c12ef56 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -65,14 +65,14 @@ struct rt_export_block {
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_notify_hostcache(rtable *tab, net *net);
-static void rt_update_hostcache(void *tab);
-static void rt_next_hop_update(void *tab);
-static inline void rt_prune_table(void *tab);
+static void rt_update_hostcache(rtable *tab);
+static void rt_next_hop_update(rtable *tab);
+static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
 static void rt_feed_channel(void *);
 
 static inline void rt_export_used(rtable *tab);
-static void rt_export_cleanup(void *tab);
+static void rt_export_cleanup(rtable *tab);
 
 static inline void rte_update_lock(void);
 static inline void rte_update_unlock(void);
@@ -1860,7 +1860,7 @@ rte_dump(struct rte_storage *e)
 void
 rt_dump(rtable *t)
 {
-  debug("Dump of routing table <%s>%s\n", t->name, t->delete_event ? " (deleted)" : "");
+  debug("Dump of routing table <%s>%s\n", t->name, t->deleted ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
 #endif
@@ -1891,9 +1891,9 @@ rt_dump_all(void)
 void
 rt_dump_hooks(rtable *tab)
 {
-  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete_event ? " (deleted)" : "");
+  debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->deleted ? " (deleted)" : "");
   debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
-      tab->nhu_state, ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
+      tab->nhu_state, tab->hcu_scheduled, tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
       tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
 
@@ -1930,11 +1930,21 @@ rt_dump_hooks_all(void)
     rt_dump_hooks(t);
 }
 
+static inline void
+rt_schedule_hcu(rtable *tab)
+{
+  if (tab->hcu_scheduled)
+    return;
+
+  tab->hcu_scheduled = 1;
+  ev_schedule(tab->rt_event);
+}
+
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
   if (tab->nhu_state == NHU_CLEAN)
-    ev_schedule(tab->nhu_event);
+    ev_schedule(tab->rt_event);
 
   /* state change:
    *   NHU_CLEAN   -> NHU_SCHEDULED
@@ -1947,7 +1957,7 @@ void
 rt_schedule_prune(rtable *tab)
 {
   if (tab->prune_state == 0)
-    ev_schedule(tab->prune_event);
+    ev_schedule(tab->rt_event);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
@@ -1959,9 +1969,36 @@ rt_export_used(rtable *tab)
   if (config->table_debug)
     log(L_TRACE "%s: Export cleanup requested", tab->name);
 
-  ev_schedule(tab->ec_event);
+  if (tab->export_used)
+    return;
+
+  tab->export_used = 1;
+  ev_schedule(tab->rt_event);
 }
 
+static void
+rt_event(void *ptr)
+{
+  rtable *tab = ptr;
+
+  rt_lock_table(tab);
+
+  if (tab->export_used)
+    rt_export_cleanup(tab);
+
+  if (tab->hcu_scheduled)
+    rt_update_hostcache(tab);
+
+  if (tab->nhu_state)
+    rt_next_hop_update(tab);
+
+  if (tab->prune_state)
+    rt_prune_table(tab);
+
+  rt_unlock_table(tab);
+}
+
+
 static inline btime
 rt_settled_time(rtable *tab)
 {
@@ -2041,9 +2078,13 @@ rt_free(resource *_r)
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
-  ASSERT_DIE(r->rt_count == 0);
-  ASSERT_DIE(EMPTY_LIST(r->imports));
-  ASSERT_DIE(EMPTY_LIST(r->exports));
+  ASSERT_DIE(r->deleted);
+
+  r->config->table = NULL;
+  rem_node(&r->n);
+
+  if (r->hostcache)
+    rt_free_hostcache(r);
 
   /* Freed automagically by the resource pool
   fib_free(&r->fib);
@@ -2101,11 +2142,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
-  t->ec_event = ev_new_init(p, rt_export_cleanup, t);
-  t->prune_event = ev_new_init(p, rt_prune_table, t);
-  t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
-  t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
-
+  t->rt_event = ev_new_init(p, rt_event, t);
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
   t->next_export_seq = 1;
@@ -2130,6 +2167,7 @@ rt_init(void)
   init_list(&routing_tables);
 }
 
+
 /**
  * rt_prune_table - prune a routing table
  *
@@ -2145,9 +2183,8 @@ rt_init(void)
  * iteration.
  */
 static void
-rt_prune_table(void *data)
+rt_prune_table(rtable *tab)
 {
-  rtable *tab = data;
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 512;
 
@@ -2195,7 +2232,7 @@ again:
 	    if (limit <= 0)
 	      {
 		FIB_ITERATE_PUT(fit);
-		ev_schedule(tab->prune_event);
+		ev_schedule(tab->rt_event);
 		return;
 	      }
 
@@ -2251,9 +2288,9 @@ again:
 }
 
 static void
-rt_export_cleanup(void *data)
+rt_export_cleanup(rtable *tab)
 {
-  rtable *tab = data;
+  tab->export_used = 0;
 
   u64 min_seq = ~((u64) 0);
   struct rt_pending_export *last_export_to_free = NULL;
@@ -2410,6 +2447,9 @@ done:;
 	imports_stopped = 1;
       }
 
+  if (tab->export_used)
+    ev_schedule(tab->rt_event);
+
   if (imports_stopped)
   {
     if (config->table_debug)
@@ -2643,9 +2683,8 @@ rt_next_hop_update_net(rtable *tab, net *n)
 }
 
 static void
-rt_next_hop_update(void *data)
+rt_next_hop_update(rtable *tab)
 {
-  rtable *tab = data;
   struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
@@ -2663,7 +2702,7 @@ rt_next_hop_update(void *data)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule(tab->nhu_event);
+	  ev_schedule(tab->rt_event);
 	  return;
 	}
       max_feed -= rt_next_hop_update_net(tab, n);
@@ -2677,7 +2716,7 @@ rt_next_hop_update(void *data)
   tab->nhu_state &= 1;
 
   if (tab->nhu_state != NHU_CLEAN)
-    ev_schedule(tab->nhu_event);
+    ev_schedule(tab->rt_event);
 }
 
 
@@ -2699,7 +2738,6 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_min_time = 5;
   c->min_settle_time = 1 S;
   c->max_settle_time = 20 S;
-  c->config = new_config;
 
   add_tail(&new_config->tables, &c->n);
 
@@ -2735,11 +2773,16 @@ rt_lock_table(rtable *r)
 void
 rt_unlock_table(rtable *r)
 {
-  if (!--r->use_count && r->delete_event)
-    /* Delete the routing table by freeing its pool */
-    ev_schedule(r->delete_event);
-}
+  if (!--r->use_count && r->deleted)
+    {
+      void *del_data = r->del_data;
+      void (*deleted)(void *) = r->deleted;
 
+      /* Delete the routing table by freeing its pool */
+      rt_shutdown(r);
+      deleted(del_data);
+    }
+}
 
 static struct rtable_config *
 rt_find_table_config(struct config *cf, char *name)
@@ -2748,23 +2791,7 @@ rt_find_table_config(struct config *cf, char *name)
   return (sym && (sym->class == SYM_TABLE)) ? sym->table : NULL;
 }
 
-static void
-rt_done(void *data)
-{
-  rtable *t = data;
-  struct rtable_config *tc = t->config;
-  struct config *c = tc->config;
-
-  tc->table = NULL;
-  rem_node(&t->n);
-
-  if (t->hostcache)
-    rt_free_hostcache(t);
-
-  rfree(t->rp);
-
-  config_del_obstacle(c);
-}
+static void rt_config_del_obstacle(void *data) { config_del_obstacle(data); }
 
 /**
  * rt_commit - commit new routing table configuration
@@ -2789,7 +2816,7 @@ rt_commit(struct config *new, struct config *old)
       WALK_LIST(o, old->tables)
 	{
 	  rtable *ot = o->table;
-	  if (!ot->delete_event)
+	  if (!ot->deleted)
 	    {
 	      r = rt_find_table_config(new, o->name);
 	      if (r && (r->addr_type == o->addr_type) && !new->shutdown)
@@ -2805,7 +2832,8 @@ rt_commit(struct config *new, struct config *old)
 		{
 		  DBG("\t%s: deleted\n", o->name);
 		  rt_lock_table(ot);
-		  ot->delete_event = ev_new_init(ot->rp, rt_done, ot);
+		  ot->deleted = rt_config_del_obstacle;
+		  ot->del_data = old;
 		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
@@ -3032,11 +3060,11 @@ rt_free_hostcache(rtable *tab)
 static void
 rt_notify_hostcache(rtable *tab, net *net)
 {
-  if (ev_active(tab->hcu_event))
+  if (tab->hcu_scheduled)
     return;
 
   if (trie_match_net(tab->hostcache->trie, net->n.addr))
-    ev_schedule(tab->hcu_event);
+    rt_schedule_hcu(tab);
 }
 
 static int
@@ -3133,9 +3161,8 @@ done:
 }
 
 static void
-rt_update_hostcache(void *data)
+rt_update_hostcache(rtable *tab)
 {
-  rtable *tab = data;
   struct hostcache *hc = tab->hostcache;
   struct hostentry *he;
   node *n, *x;
@@ -3156,6 +3183,8 @@ rt_update_hostcache(void *data)
       if (rt_update_hostentry(tab, he))
 	rt_schedule_nhu(he->tab);
     }
+
+  tab->hcu_scheduled = 0;
 }
 
 struct hostentry *

From 97476e002d7dfb24a4613ac401b8f3192ca68d05 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 3 Aug 2022 11:57:29 +0200
Subject: [PATCH 179/431] BGP: The bucket/prefix hashes are now a resource to
 allow for proper cleanup

---
 proto/bgp/attrs.c   | 134 ++++++++++++++++++++++++++------------------
 proto/bgp/bgp.c     |   9 +--
 proto/bgp/bgp.h     |  29 ++++++----
 proto/bgp/packets.c |  10 ++--
 4 files changed, 103 insertions(+), 79 deletions(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index a7b1a7ed..2ff3f3f3 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1522,8 +1522,8 @@ bgp_finish_attrs(struct bgp_parse_state *s, ea_list **to)
 
 HASH_DEFINE_REHASH_FN(RBH, struct bgp_bucket)
 
-void
-bgp_init_bucket_table(struct bgp_channel *c)
+static void
+bgp_init_bucket_table(struct bgp_pending_tx *c)
 {
   HASH_INIT(c->bucket_hash, c->pool, 8);
 
@@ -1531,24 +1531,8 @@ bgp_init_bucket_table(struct bgp_channel *c)
   c->withdraw_bucket = NULL;
 }
 
-void
-bgp_free_bucket_table(struct bgp_channel *c)
-{
-  HASH_FREE(c->bucket_hash);
-
-  struct bgp_bucket *b;
-  WALK_LIST_FIRST(b, c->bucket_queue)
-  {
-    rem_node(&b->send_node);
-    mb_free(b);
-  }
-
-  mb_free(c->withdraw_bucket);
-  c->withdraw_bucket = NULL;
-}
-
 static struct bgp_bucket *
-bgp_get_bucket(struct bgp_channel *c, ea_list *new)
+bgp_get_bucket(struct bgp_pending_tx *c, ea_list *new)
 {
   /* Hash and lookup */
   u32 hash = ea_hash(new);
@@ -1577,7 +1561,7 @@ bgp_get_bucket(struct bgp_channel *c, ea_list *new)
 }
 
 static struct bgp_bucket *
-bgp_get_withdraw_bucket(struct bgp_channel *c)
+bgp_get_withdraw_bucket(struct bgp_pending_tx *c)
 {
   if (!c->withdraw_bucket)
   {
@@ -1589,15 +1573,17 @@ bgp_get_withdraw_bucket(struct bgp_channel *c)
 }
 
 static void
-bgp_free_bucket_xx(struct bgp_channel *c, struct bgp_bucket *b)
+bgp_free_bucket(struct bgp_pending_tx *c, struct bgp_bucket *b)
 {
   HASH_REMOVE2(c->bucket_hash, RBH, c->pool, b);
   mb_free(b);
 }
 
 int
-bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b)
+bgp_done_bucket(struct bgp_channel *bc, struct bgp_bucket *b)
 {
+  struct bgp_pending_tx *c = bc->ptx;
+
   /* Won't free the withdraw bucket */
   if (b == c->withdraw_bucket)
     return 0;
@@ -1608,21 +1594,23 @@ bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b)
   if (b->px_uc || !EMPTY_LIST(b->prefixes))
     return 0;
 
-  bgp_free_bucket_xx(c, b);
+  bgp_free_bucket(c, b);
   return 1;
 }
 
 void
-bgp_defer_bucket(struct bgp_channel *c, struct bgp_bucket *b)
+bgp_defer_bucket(struct bgp_channel *bc, struct bgp_bucket *b)
 {
+  struct bgp_pending_tx *c = bc->ptx;
   rem_node(&b->send_node);
   add_tail(&c->bucket_queue, &b->send_node);
 }
 
 void
-bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
+bgp_withdraw_bucket(struct bgp_channel *bc, struct bgp_bucket *b)
 {
-  struct bgp_proto *p = (void *) c->c.proto;
+  struct bgp_proto *p = (void *) bc->c.proto;
+  struct bgp_pending_tx *c = bc->ptx;
   struct bgp_bucket *wb = bgp_get_withdraw_bucket(c);
 
   log(L_ERR "%s: Attribute list too long", p->p.name);
@@ -1643,7 +1631,7 @@ bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 
 #define PXH_KEY(px)		px->net, px->path_id, px->hash
 #define PXH_NEXT(px)		px->next
-#define PXH_EQ(n1,i1,h1,n2,i2,h2) h1 == h2 && (c->add_path_tx ? (i1 == i2) : 1) && net_equal(n1, n2)
+#define PXH_EQ(n1,i1,h1,n2,i2,h2) h1 == h2 && (add_path_tx ? (i1 == i2) : 1) && net_equal(n1, n2)
 #define PXH_FN(n,i,h)		h
 
 #define PXH_REHASH		bgp_pxh_rehash
@@ -1652,28 +1640,20 @@ bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 
 HASH_DEFINE_REHASH_FN(PXH, struct bgp_prefix)
 
-void
-bgp_init_prefix_table(struct bgp_channel *c)
+static void
+bgp_init_prefix_table(struct bgp_channel *bc)
 {
+  struct bgp_pending_tx *c = bc->ptx;
   HASH_INIT(c->prefix_hash, c->pool, 8);
 
-  uint alen = net_addr_length[c->c.net_type];
+  uint alen = net_addr_length[bc->c.net_type];
   c->prefix_slab = alen ? sl_new(c->pool, sizeof(struct bgp_prefix) + alen) : NULL;
 }
 
-void
-bgp_free_prefix_table(struct bgp_channel *c)
-{
-  HASH_FREE(c->prefix_hash);
-
-  rfree(c->prefix_slab);
-  c->prefix_slab = NULL;
-}
-
 static struct bgp_prefix *
-bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
+bgp_get_prefix(struct bgp_pending_tx *c, const net_addr *net, u32 path_id, int add_path_tx)
 {
-  u32 path_id_hash = c->add_path_tx ? path_id : 0;
+  u32 path_id_hash = add_path_tx ? path_id : 0;
   /* We must use a different hash function than the rtable */
   u32 hash = u32_hash(net_hash(net) ^ u32_hash(path_id_hash));
   struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id_hash, hash);
@@ -1696,15 +1676,16 @@ bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
   return px;
 }
 
-static void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px);
+static void bgp_free_prefix(struct bgp_pending_tx *c, struct bgp_prefix *px);
 
 static inline int
 bgp_update_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *b)
 {
+#define IS_WITHDRAW_BUCKET(b)	((b) == c->ptx->withdraw_bucket)
 #define BPX_TRACE(what)	do { \
   if (c->c.debug & D_ROUTES) log(L_TRACE "%s.%s < %s %N %uG %s", \
       c->c.proto->name, c->c.name, what, \
-      px->net, px->path_id, (b == c->withdraw_bucket) ? "withdraw" : "update"); } while (0)
+      px->net, px->path_id, IS_WITHDRAW_BUCKET(b) ? "withdraw" : "update"); } while (0)
   px->lastmod = current_time();
 
   /* Already queued for the same bucket */
@@ -1722,7 +1703,7 @@ bgp_update_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucke
   }
 
   /* The new bucket is the same as we sent before */
-  if ((px->last == b) || c->c.out_table && !px->last && (b == c->withdraw_bucket))
+  if ((px->last == b) || c->c.out_table && !px->last && IS_WITHDRAW_BUCKET(b))
   {
     if (px->cur)
       BPX_TRACE("reverted");
@@ -1731,15 +1712,15 @@ bgp_update_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucke
 
     /* Well, we haven't sent anything yet */
     if (!px->last)
-      bgp_free_prefix(c, px);
+      bgp_free_prefix(c->ptx, px);
 
     px->cur = NULL;
     return 0;
   }
 
   /* Enqueue the bucket if it has been empty */
-  if ((b != c->withdraw_bucket) && EMPTY_LIST(b->prefixes))
-    add_tail(&c->bucket_queue, &b->send_node);
+  if (!IS_WITHDRAW_BUCKET(b) && EMPTY_LIST(b->prefixes))
+    add_tail(&c->ptx->bucket_queue, &b->send_node);
 
   /* Enqueue to the new bucket and indicate the change */
   add_tail(&b->prefixes, &px->buck_node_xx);
@@ -1752,7 +1733,7 @@ bgp_update_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucke
 }
 
 static void
-bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
+bgp_free_prefix(struct bgp_pending_tx *c, struct bgp_prefix *px)
 {
   HASH_REMOVE2(c->prefix_hash, PXH, c->pool, px);
 
@@ -1780,7 +1761,7 @@ bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket
       px->last->px_uc--;
 
     /* Ref the current sent version */
-    if (buck != c->withdraw_bucket)
+    if (!IS_WITHDRAW_BUCKET(buck))
     {
       px->last = buck;
       px->last->px_uc++;
@@ -1790,7 +1771,47 @@ bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket
     /* Prefixes belonging to the withdraw bucket are freed always */
   }
 
-  bgp_free_prefix(c, px);
+  bgp_free_prefix(c->ptx, px);
+}
+
+static void
+bgp_pending_tx_rfree(resource *r)
+{
+  UNUSED struct bgp_pending_tx *ptx = SKIP_BACK(struct bgp_pending_tx, r, r);
+
+  /* Do nothing for now. */
+}
+
+static void bgp_pending_tx_dump(resource *r UNUSED) { debug("\n"); }
+
+static struct resclass bgp_pending_tx_class = {
+  .name = "BGP Pending TX",
+  .size = sizeof(struct bgp_pending_tx),
+  .free = bgp_pending_tx_rfree,
+  .dump = bgp_pending_tx_dump,
+};
+
+void
+bgp_init_pending_tx(struct bgp_channel *c)
+{
+  ASSERT_DIE(!c->ptx);
+
+  pool *p = rp_new(c->pool, "BGP Pending TX");
+  c->ptx = ralloc(p, &bgp_pending_tx_class);
+  c->ptx->pool = p;
+
+  bgp_init_bucket_table(c->ptx);
+  bgp_init_prefix_table(c);
+}
+
+void
+bgp_free_pending_tx(struct bgp_channel *c)
+{
+  ASSERT_DIE(c->ptx);
+  ASSERT_DIE(c->ptx->pool);
+
+  rfree(c->ptx->pool);
+  c->ptx = NULL;
 }
 
 
@@ -1802,7 +1823,8 @@ static void
 bgp_out_table_feed(void *data)
 {
   struct rt_export_hook *hook = data;
-  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, prefix_exporter, hook->table);
+  struct bgp_channel *bc = SKIP_BACK(struct bgp_channel, prefix_exporter, hook->table);
+  struct bgp_pending_tx *c = bc->ptx;
 
   int max = 512;
 
@@ -1897,8 +1919,8 @@ bgp_out_table_feed(void *data)
 static struct rt_export_hook *
 bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req UNUSED)
 {
-  struct bgp_channel *c = SKIP_BACK(struct bgp_channel, prefix_exporter, re);
-  pool *p = rp_new(c->c.proto->pool, "Export hook");
+  struct bgp_channel *bc = SKIP_BACK(struct bgp_channel, prefix_exporter, re);
+  pool *p = rp_new(bc->c.proto->pool, "Export hook");
   struct rt_export_hook *hook = mb_allocz(p, sizeof(struct rt_export_hook));
   hook->pool = p;
   hook->event = ev_new_init(p, bgp_out_table_feed, hook);
@@ -2132,16 +2154,16 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
       log(L_ERR "%s: Invalid route %N withdrawn", p->p.name, n);
 
     /* If attributes are invalid, we fail back to withdraw */
-    buck = attrs ? bgp_get_bucket(c, attrs) : bgp_get_withdraw_bucket(c);
+    buck = attrs ? bgp_get_bucket(c->ptx, attrs) : bgp_get_withdraw_bucket(c->ptx);
     path = new->src->global_id;
   }
   else
   {
-    buck = bgp_get_withdraw_bucket(c);
+    buck = bgp_get_withdraw_bucket(c->ptx);
     path = old->src->global_id;
   }
 
-  if (bgp_update_prefix(c, bgp_get_prefix(c, n, path), buck))
+  if (bgp_update_prefix(c, bgp_get_prefix(c->ptx, n, path, c->add_path_tx), buck))
     bgp_schedule_packet(p->conn, c, PKT_UPDATE);
 }
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 33849b0b..e6d3f125 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -787,10 +787,8 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
     }
 
     /* Reset bucket and prefix tables */
-    bgp_free_bucket_table(c);
-    bgp_free_prefix_table(c);
-    bgp_init_bucket_table(c);
-    bgp_init_prefix_table(c);
+    bgp_free_pending_tx(c);
+    bgp_init_pending_tx(c);
     c->packets_to_send = 0;
   }
 
@@ -1800,8 +1798,7 @@ bgp_channel_start(struct channel *C)
   if (c->cf->export_table)
     bgp_setup_out_table(c);
 
-  bgp_init_bucket_table(c);
-  bgp_init_prefix_table(c);
+  bgp_init_pending_tx(c);
 
   c->stale_timer = tm_new_init(c->pool, bgp_long_lived_stale_timeout, c, 0, 0);
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 469f0cb9..def7b102 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -351,14 +351,8 @@ struct bgp_channel {
 
   /* Rest are zeroed when down */
   pool *pool;
-  HASH(struct bgp_bucket) bucket_hash;	/* Hash table of route buckets */
-  struct bgp_bucket *withdraw_bucket;	/* Withdrawn routes */
-  list bucket_queue;			/* Queue of buckets to send (struct bgp_bucket) */
-
-  HASH(struct bgp_prefix) prefix_hash;	/* Prefixes to be sent */
-  slab *prefix_slab;			/* Slab holding prefix nodes */
-
-  struct rt_exporter prefix_exporter;	/* Table-like exporter for prefix_hash */
+  struct bgp_pending_tx	*ptx;		/* Routes waiting to be sent */
+  struct rt_exporter prefix_exporter;	/* Table-like exporter for ptx */
 
   ip_addr next_hop_addr;		/* Local address for NEXT_HOP attribute */
   ip_addr link_addr;			/* Link-local version of next_hop_addr */
@@ -401,6 +395,18 @@ struct bgp_bucket {
   ea_list eattrs[0];			/* Per-bucket extended attributes */
 };
 
+struct bgp_pending_tx {
+  resource r;
+  pool *pool;
+
+  HASH(struct bgp_bucket) bucket_hash;	/* Hash table of route buckets */
+  struct bgp_bucket *withdraw_bucket;	/* Withdrawn routes */
+  list bucket_queue;			/* Queue of buckets to send (struct bgp_bucket) */
+
+  HASH(struct bgp_prefix) prefix_hash;	/* Prefixes to be sent */
+  slab *prefix_slab;			/* Slab holding prefix nodes */
+};
+
 struct bgp_export_state {
   struct bgp_proto *proto;
   struct bgp_channel *channel;
@@ -566,13 +572,12 @@ void bgp_finish_attrs(struct bgp_parse_state *s, ea_list **to);
 
 void bgp_setup_out_table(struct bgp_channel *c);
 
-void bgp_init_bucket_table(struct bgp_channel *c);
-void bgp_free_bucket_table(struct bgp_channel *c);
+void bgp_init_pending_tx(struct bgp_channel *c);
+void bgp_free_pending_tx(struct bgp_channel *c);
+
 void bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b);
 int bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b);
 
-void bgp_init_prefix_table(struct bgp_channel *c);
-void bgp_free_prefix_table(struct bgp_channel *c);
 void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *buck);
 
 int bgp_rte_better(struct rte *, struct rte *);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index de976588..57c00eb5 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2167,7 +2167,7 @@ bgp_create_ip_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
    *	var	IPv4 Network Layer Reachability Information
    */
 
-  ASSERT_DIE(s->channel->withdraw_bucket != buck);
+  ASSERT_DIE(s->channel->ptx->withdraw_bucket != buck);
 
   int lr, la;
 
@@ -2190,7 +2190,7 @@ bgp_create_ip_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
 static byte *
 bgp_create_mp_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *buf, byte *end)
 {
-  ASSERT_DIE(s->channel->withdraw_bucket != buck);
+  ASSERT_DIE(s->channel->ptx->withdraw_bucket != buck);
 
   /*
    *	2 B	IPv4 Withdrawn Routes Length (zero)
@@ -2330,7 +2330,7 @@ again: ;
   };
 
   /* Try unreachable bucket */
-  if ((buck = c->withdraw_bucket) && !EMPTY_LIST(buck->prefixes))
+  if ((buck = c->ptx->withdraw_bucket) && !EMPTY_LIST(buck->prefixes))
   {
     res = (c->afi == BGP_AF_IPV4) && !c->ext_next_hop ?
       bgp_create_ip_unreach(&s, buck, buf, end):
@@ -2340,9 +2340,9 @@ again: ;
   }
 
   /* Try reachable buckets */
-  if (!EMPTY_LIST(c->bucket_queue))
+  if (!EMPTY_LIST(c->ptx->bucket_queue))
   {
-    buck = HEAD(c->bucket_queue);
+    buck = HEAD(c->ptx->bucket_queue);
 
     /* Cleanup empty buckets */
     if (bgp_done_bucket(c, buck))

From 34912b029b161cbbed44057dfa913669ccb087eb Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Aug 2022 18:05:00 +0200
Subject: [PATCH 180/431] Tables: Requesting prune only after export cleanup

We can't free the network structures before the export has been cleaned
up, therefore it makes more sense to request prune only after export
cleanup. This change also reduces prune calls on table shutdown.
---
 nest/rt-table.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 3ade4237..8e1e03fb 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1748,10 +1748,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   rte_announce(table, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
-  if (!net->routes &&
-      (table->gc_counter++ >= table->config->gc_threshold))
-    rt_kick_prune_timer(table);
-
 #if 0
   /* Enable and reimplement these callbacks if anybody wants to use them */
   if (old_ok && p->rte_remove)
@@ -2852,6 +2848,7 @@ rt_export_cleanup(rtable *tab)
   u64 min_seq = ~((u64) 0);
   struct rt_pending_export *last_export_to_free = NULL;
   struct rt_pending_export *first = tab->exporter.first;
+  int want_prune = 0;
 
   struct rt_export_hook *eh;
   node *n;
@@ -2928,6 +2925,8 @@ rt_export_cleanup(rtable *tab)
       /* First is now the next one */
       net->first = atomic_load_explicit(&first->next, memory_order_relaxed);
 
+    want_prune += !net->routes && !net->first;
+
     /* For now, the old route may be finally freed */
     if (first->old)
     {
@@ -3003,6 +3002,9 @@ done:;
 	rt_unlock_table(tab);
       }
 
+  if ((tab->gc_counter += want_prune) >= tab->config->gc_threshold)
+    rt_kick_prune_timer(tab);
+
   if (tab->export_used)
     ev_schedule(tab->rt_event);
 

From 397fec4741b40f61d06a467b4110aad7e996485c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 1 Sep 2022 14:21:56 +0200
Subject: [PATCH 181/431] Default tables are not created unless actually used.

This allows for setting default table values at the beginning of config
file before "master4" and "master6" tables are initialized.
---
 conf/conf.h           |  2 +-
 nest/config.Y         |  7 +++++-
 nest/proto.c          |  2 +-
 nest/rt-show.c        |  4 ++--
 nest/rt-table.c       | 50 ++++++++++++++++++++++++++++++++++---------
 nest/rt.h             |  2 ++
 proto/bgp/bgp.c       |  4 ++--
 proto/static/static.c |  4 ++--
 8 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/conf/conf.h b/conf/conf.h
index 50e01bf5..ffefa519 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -27,7 +27,7 @@ struct config {
 
   int mrtdump_file;			/* Configured MRTDump file (sysdep, fd in unix) */
   const char *syslog_name;		/* Name used for syslog (NULL -> no syslog) */
-  struct rtable_config *def_tables[NET_MAX]; /* Default routing tables for each network */
+  struct symbol *def_tables[NET_MAX];	/* Default routing tables for each network */
   struct iface_patt *router_id_from;	/* Configured list of router ID iface patterns */
 
   u32 router_id;			/* Our Router ID */
diff --git a/nest/config.Y b/nest/config.Y
index 91147a29..4bf0fefe 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -361,7 +361,11 @@ channel_end:
 proto_channel: channel_start channel_opt_list channel_end;
 
 
-rtable: CF_SYM_KNOWN { cf_assert_symbol($1, SYM_TABLE); $$ = $1->table; } ;
+rtable: CF_SYM_KNOWN {
+  cf_assert_symbol($1, SYM_TABLE);
+  if (!$1->table) rt_new_default_table($1);
+  $$ = $1->table;
+} ;
 
 imexport:
    FILTER filter { $$ = $2; }
@@ -683,6 +687,7 @@ r_args:
    }
 | r_args TABLE symbol_known {
      cf_assert_symbol($3, SYM_TABLE);
+     if (!$3->table) cf_error("Table %s not configured", $3->name);
      $$ = $1;
      rt_show_add_table($$, $3->table->table);
      $$->tables_defined_by = RSD_TDB_DIRECT;
diff --git a/nest/proto.c b/nest/proto.c
index 853b1cf9..ef3e3f4d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -864,7 +864,7 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
     if (proto->net_type && (net_type != proto->net_type))
       cf_error("Different channel type");
 
-    tab = new_config->def_tables[net_type];
+    tab = rt_get_default_table(new_config, net_type);
   }
 
   if (!cc)
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 17400029..5d7723cf 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -400,8 +400,8 @@ rt_show_get_default_tables(struct rt_show_data *d)
   }
 
   for (int i=1; i<NET_MAX; i++)
-    if (config->def_tables[i] && config->def_tables[i]->table)
-      rt_show_add_table(d, config->def_tables[i]->table);
+    if (config->def_tables[i] && config->def_tables[i]->table && config->def_tables[i]->table->table)
+      rt_show_add_table(d, config->def_tables[i]->table->table);
 }
 
 static inline void
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8e1e03fb..f0552965 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3094,8 +3094,8 @@ rt_preconfig(struct config *c)
 {
   init_list(&c->tables);
 
-  rt_new_table(cf_get_symbol("master4"), NET_IP4);
-  rt_new_table(cf_get_symbol("master6"), NET_IP6);
+  c->def_tables[NET_IP4] = cf_define_symbol(cf_get_symbol("master4"), SYM_TABLE, table, NULL);
+  c->def_tables[NET_IP6] = cf_define_symbol(cf_get_symbol("master6"), SYM_TABLE, table, NULL);
 }
 
 void
@@ -3110,6 +3110,13 @@ rt_postconfig(struct config *c)
   WALK_LIST(rc, c->tables)
     if (rc->gc_period == (uint) -1)
       rc->gc_period = (uint) def_gc_period;
+
+  for (uint net_type = 0; net_type < NET_MAX; net_type++)
+    if (c->def_tables[net_type] && !c->def_tables[net_type]->table)
+    {
+      c->def_tables[net_type]->class = SYM_VOID;
+      c->def_tables[net_type] = NULL;
+    }
 }
 
 
@@ -3584,19 +3591,42 @@ rt_next_hop_update(rtable *tab)
     ev_schedule(tab->rt_event);
 }
 
+void
+rt_new_default_table(struct symbol *s)
+{
+  for (uint addr_type = 0; addr_type < NET_MAX; addr_type++)
+    if (s == new_config->def_tables[addr_type])
+    {
+      s->table = rt_new_table(s, addr_type);
+      return;
+    }
+
+  bug("Requested an unknown new default table: %s", s->name);
+}
+
+struct rtable_config *
+rt_get_default_table(struct config *cf, uint addr_type)
+{
+  struct symbol *ts = cf->def_tables[addr_type];
+  if (!ts)
+    return NULL;
+
+  if (!ts->table)
+    rt_new_default_table(ts);
+
+  return ts->table;
+}
 
 struct rtable_config *
 rt_new_table(struct symbol *s, uint addr_type)
 {
-  /* Hack that allows to 'redefine' the master table */
-  if ((s->class == SYM_TABLE) &&
-      (s->table == new_config->def_tables[addr_type]) &&
-      ((addr_type == NET_IP4) || (addr_type == NET_IP6)))
-    return s->table;
-
   struct rtable_config *c = cfg_allocz(sizeof(struct rtable_config));
 
-  cf_define_symbol(s, SYM_TABLE, table, c);
+  if (s == new_config->def_tables[addr_type])
+    s->table = c;
+  else
+    cf_define_symbol(s, SYM_TABLE, table, c);
+
   c->name = s->name;
   c->addr_type = addr_type;
   c->gc_threshold = 1000;
@@ -3610,7 +3640,7 @@ rt_new_table(struct symbol *s, uint addr_type)
 
   /* First table of each type is kept as default */
   if (! new_config->def_tables[addr_type])
-    new_config->def_tables[addr_type] = c;
+    new_config->def_tables[addr_type] = s;
 
   return c;
 }
diff --git a/nest/rt.h b/nest/rt.h
index 1a6b7a93..f5cf9457 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -481,6 +481,8 @@ void rt_reload_channel_abort(struct channel *c);
 void rt_refeed_channel(struct channel *c);
 void rt_prune_sync(rtable *t, int all);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
+void rt_new_default_table(struct symbol *s);
+struct rtable_config *rt_get_default_table(struct config *cf, uint addr_type);
 
 static inline int rt_is_ip(rtable *tab)
 { return (tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6); }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 68c788ea..97b18fcf 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1934,7 +1934,7 @@ bgp_default_igp_table(struct bgp_config *cf, struct bgp_channel_config *cc, u32
     return cc2->c.table;
 
   /* Last, try default table of given type */
-  if (tab = cf->c.global->def_tables[type])
+  if (tab = rt_get_default_table(cf->c.global, type))
     return tab;
 
   cf_error("Undefined IGP table");
@@ -1953,7 +1953,7 @@ bgp_default_base_table(struct bgp_config *cf, struct bgp_channel_config *cc)
     return cc2->c.table;
 
   /* Last, try default table of given type */
-  struct rtable_config *tab = cf->c.global->def_tables[type];
+  struct rtable_config *tab = rt_get_default_table(cf->c.global, type);
   if (tab)
     return tab;
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 65f3eccc..cb764a1c 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -436,11 +436,11 @@ static_postconfig(struct proto_config *CF)
 
   if (!cf->igp_table_ip4)
     cf->igp_table_ip4 = (cc->table->addr_type == NET_IP4) ?
-      cc->table : cf->c.global->def_tables[NET_IP4];
+      cc->table : rt_get_default_table(cf->c.global, NET_IP4);
 
   if (!cf->igp_table_ip6)
     cf->igp_table_ip6 = (cc->table->addr_type == NET_IP6) ?
-      cc->table : cf->c.global->def_tables[NET_IP6];
+      cc->table : rt_get_default_table(cf->c.global, NET_IP6);
 
   WALK_LIST(r, cf->routes)
     if (r->net && (r->net->type != CF->net_type))

From 83ceb91b50ae75ee5509faa74e2f6d4bdcf78505 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Aug 2022 19:40:58 +0200
Subject: [PATCH 182/431] Table debug is now a per-table setting and has
 categories.

---
 doc/bird.sgml   | 15 +++++++++++++++
 nest/config.Y   |  3 ++-
 nest/rt-table.c | 32 ++++++++++++++++----------------
 nest/rt.h       |  1 +
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index c29353fc..b12ac544 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -505,6 +505,11 @@ include "tablename.conf";;
 	See <ref id="channel-debug" name="debug"> in the channel section.
 	Default: off.
 
+	<tag><label id="opt-debug-tables">debug tables all|off|{ states|routes|filters|events [, <m/.../] }</tag>
+	Set global defaults of table debugging options.
+	See <ref id="rtable-debug" name="debug"> in the table section.
+	Default: off.
+
 	<tag><label id="opt-debug-commands">debug commands <m/number/</tag>
 	Control logging of client connections (0 for no logging, 1 for logging
 	of connects and disconnects, 2 and higher for logging of all client
@@ -708,6 +713,16 @@ to set options.
         second one is the high threshold (when to pause). The higher is the
         threshold, the more memory can get used. In most cases, the defaults
 	should work for you. Default: 128, 512.
+
+	<tag><label id="rtable-debug">debug all|off|{ states|routes|events [, <m/.../] }</tag>
+	Set table debugging options. Each table can write some trace messages
+	into log with category <cf/trace/. You can request <cf/all/ trace messages
+	or select some types: <cf/states/ for table state changes and auxiliary
+	processes, <cf/routes/ for auxiliary route notifications (next hop update,
+        flowspec revalidation) and <cf/events/ for more detailed auxiliary routine
+	debug. See also <ref id="channel-debug" name="channel debugging option">.
+	Default: off.
+
 </descrip>
 
 
diff --git a/nest/config.Y b/nest/config.Y
index 4bf0fefe..3ad6530d 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -235,6 +235,7 @@ table_opt:
      if ($3 > $4) cf_error("Cork low threshold must be lower than the high threshold.");
      this_table->cork_threshold.low = $3;
      this_table->cork_threshold.high = $4; }
+ | DEBUG bool { this_table->debug = $2; }
  ;
 
 table_opts:
@@ -394,7 +395,7 @@ debug_default:
    DEBUG PROTOCOLS debug_mask { new_config->proto_default_debug = $3; }
  | DEBUG CHANNELS debug_mask { new_config->channel_default_debug = $3; }
  | DEBUG COMMANDS expr { new_config->cli_debug = $3; }
- | DEBUG TABLES bool { new_config->table_debug = $3; }
+ | DEBUG TABLES debug_mask { new_config->table_debug = $3; }
  ;
 
 /* MRTDUMP PROTOCOLS is in systep/unix/config.Y */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f0552965..7fc0d280 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -188,6 +188,12 @@ const char *rt_export_state_name(u8 state)
 static inline struct rte_storage *rt_next_hop_update_rte(rtable *tab, net *n, rte *old);
 static struct hostentry *rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 
+#define rt_trace(tab, level, fmt, args...)  do {\
+  rtable *t = (tab);				\
+  if (t->config->debug & (level))		\
+    log(L_TRACE "%s: " fmt, t->name, ##args);	\
+} while (0)
+
 static void
 net_init_with_trie(struct fib *f, void *N)
 {
@@ -2315,8 +2321,7 @@ rt_export_used(struct rt_exporter *e)
 {
   rtable *tab = SKIP_BACK(rtable, exporter, e);
 
-  if (config->table_debug)
-    log(L_TRACE "%s: Export cleanup requested", tab->name);
+  rt_trace(tab, D_EVENTS, "Export cleanup requested");
 
   if (tab->export_used)
     return;
@@ -2341,8 +2346,8 @@ rt_event(void *ptr)
       (tab->hcu_scheduled || tab->nhu_state) && rt_cork_check(tab->uncork_event)
       )
   {
-    if (!tab->hcu_corked && !tab->nhu_corked && config->table_debug)
-      log(L_TRACE "%s: Auxiliary routines corked", tab->name);
+    if (!tab->hcu_corked && !tab->nhu_corked)
+      rt_trace(tab, D_STATES, "Next hop updater corked");
 
     tab->hcu_corked |= tab->hcu_scheduled;
     tab->hcu_scheduled = 0;
@@ -2374,8 +2379,7 @@ rt_uncork_event(void *ptr)
   tab->nhu_state |= tab->nhu_corked;
   tab->nhu_corked = 0;
 
-  if (config->table_debug)
-    log(L_TRACE "%s: Auxiliary routines uncorked", tab->name);
+  rt_trace(tab, D_STATES, "Next hop updater uncorked");
 
   ev_schedule(tab->rt_event);
 }
@@ -2704,7 +2708,7 @@ rt_prune_table(rtable *tab)
   struct rt_import_hook *ih;
   node *n, *x;
 
-  DBG("Pruning route table %s\n", tab->name);
+  rt_trace(tab, D_STATES, "Pruning");
 #ifdef DEBUGGING
   fib_check(&tab->fib);
 #endif
@@ -2882,9 +2886,7 @@ rt_export_cleanup(rtable *tab)
 
   tab->exporter.first = last_export_to_free ? rt_next_export_fast(last_export_to_free) : NULL;
 
-  if (config->table_debug)
-    log(L_TRACE "%s: Export cleanup, old exporter.first seq %lu, new %lu, min_seq %ld",
-      tab->name,
+  rt_trace(tab, D_STATES, "Export cleanup, old exporter.first seq %lu, new %lu, min_seq %ld",
       first ? first->seq : 0,
       tab->exporter.first ? tab->exporter.first->seq : 0,
       min_seq);
@@ -2962,8 +2964,7 @@ rt_export_cleanup(rtable *tab)
 
       if (EMPTY_LIST(tab->exporter.pending))
       {
-	if (config->table_debug)
-	  log(L_TRACE "%s: Resetting export seq", tab->name);
+	rt_trace(tab, D_EVENTS, "Resetting export seq");
 
 	node *n;
 	WALK_LIST2(eh, n, tab->exporter.hooks, n)
@@ -3635,6 +3636,7 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->max_settle_time = 20 S;
   c->cork_threshold.low = 128;
   c->cork_threshold.high = 512;
+  c->debug = new_config->table_debug;
 
   add_tail(&new_config->tables, &c->n);
 
@@ -3691,8 +3693,7 @@ rt_check_cork_low(rtable *tab)
     tab->cork_active = 0;
     rt_cork_release();
 
-    if (config->table_debug)
-      log(L_TRACE "%s: Uncorked", tab->name);
+    rt_trace(tab, D_STATES, "Uncorked");
   }
 }
 
@@ -3704,8 +3705,7 @@ rt_check_cork_high(rtable *tab)
     tab->cork_active = 1;
     rt_cork_acquire();
 
-    if (config->table_debug)
-      log(L_TRACE "%s: Corked", tab->name);
+    rt_trace(tab, D_STATES, "Corked");
   }
 }
 
diff --git a/nest/rt.h b/nest/rt.h
index f5cf9457..66edf227 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -59,6 +59,7 @@ struct rtable_config {
   uint gc_period;			/* Approximate time between two consecutive GC runs */
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   byte trie_used;			/* Rtable has attached trie */
+  byte debug;				/* Whether to log */
   btime min_settle_time;		/* Minimum settle time for notifications */
   btime max_settle_time;		/* Maximum settle time for notifications */
   btime export_settle_time;		/* Delay before exports are announced */

From 7450eea071941c683da158d6dfe8365288eed5b8 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 31 Aug 2022 11:58:27 +0200
Subject: [PATCH 183/431] Miscellaneous refactoring

---
 nest/proto.c      | 11 ++-------
 nest/rt-table.c   | 60 +++++++++++++++++++++--------------------------
 nest/rt.h         |  7 ++++++
 proto/bgp/attrs.c |  7 ++++++
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index ef3e3f4d..d2374792 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -450,12 +450,8 @@ channel_start_import(struct channel *c)
     return;
   }
 
-  int nlen = strlen(c->name) + strlen(c->proto->name) + 2;
-  char *rn = mb_allocz(c->proto->pool, nlen);
-  bsprintf(rn, "%s.%s", c->proto->name, c->name);
-
   c->in_req = (struct rt_import_request) {
-    .name = rn,
+    .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
@@ -483,12 +479,9 @@ channel_start_export(struct channel *c)
   }
 
   ASSERT(c->channel_state == CS_UP);
-  int nlen = strlen(c->name) + strlen(c->proto->name) + 2;
-  char *rn = mb_allocz(c->proto->pool, nlen);
-  bsprintf(rn, "%s.%s", c->proto->name, c->name);
 
   c->out_req = (struct rt_export_request) {
-    .name = rn,
+    .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
     .addr = c->out_subprefix,
     .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 7fc0d280..d4e0d63c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -908,7 +908,7 @@ channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *r
 }
 
 void
-rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe,
+rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
     struct rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
@@ -952,7 +952,7 @@ rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_p
 
 done:
   /* Check obsolete routes for previously exported */
-  while (rpe)
+  RPE_WALK(first, rpe, NULL)
   {
     channel_rpe_mark_seen(req, rpe);
     if (rpe->old)
@@ -963,7 +963,6 @@ done:
 	old_best = &rpe->old->rte;
       }
     }
-    rpe = rpe_next(rpe, NULL);
   }
 
   /* Nothing to export */
@@ -1036,7 +1035,7 @@ rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool
 }
 
 void
-rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe,
+rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
     struct rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
@@ -1062,7 +1061,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
     }
 
   /* Check obsolete routes for previously exported */
-  while (rpe)
+  RPE_WALK(first, rpe, NULL)
   {
     channel_rpe_mark_seen(req, rpe);
     if (rpe->old)
@@ -1073,7 +1072,6 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
 	old_best = &rpe->old->rte;
       }
     }
-    rpe = rpe_next(rpe, NULL);
   }
 
   /* Prepare new merged route */
@@ -1084,17 +1082,16 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
 }
 
 void
-rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  rte *o = RTE_VALID_OR_NULL(rpe->old_best);
-  struct rte_storage *new_best = rpe->new_best;
+  rte *o = RTE_VALID_OR_NULL(first->old_best);
+  struct rte_storage *new_best = first->new_best;
 
-  while (rpe)
+  RPE_WALK(first, rpe, NULL)
   {
     channel_rpe_mark_seen(req, rpe);
     new_best = rpe->new_best;
-    rpe = rpe_next(rpe, NULL);
   }
 
   rte n0 = RTE_COPY_VALID(new_best);
@@ -1103,27 +1100,26 @@ rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_
 }
 
 void
-rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe)
+rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
-  rte *n = RTE_VALID_OR_NULL(rpe->new);
-  rte *o = RTE_VALID_OR_NULL(rpe->old);
+  rte *n = RTE_VALID_OR_NULL(first->new);
+  rte *o = RTE_VALID_OR_NULL(first->old);
 
   if (!n && !o)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(req, first);
     return;
   }
 
   struct rte_src *src = n ? n->src : o->src;
-  struct rte_storage *new_latest = rpe->new;
+  struct rte_storage *new_latest = first->new;
 
-  while (rpe)
+  RPE_WALK(first, rpe, src)
   {
     channel_rpe_mark_seen(req, rpe);
     new_latest = rpe->new;
-    rpe = rpe_next(rpe, src);
   }
 
   rte n0 = RTE_COPY_VALID(new_latest);
@@ -1362,7 +1358,7 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
 	  &net->last->next, &rpenull, rpe,
 	  memory_order_relaxed,
 	  memory_order_relaxed));
-    
+
   }
 
   net->last = rpe;
@@ -1918,8 +1914,13 @@ rt_table_export_done(struct rt_export_hook *hook)
   struct rt_exporter *re = hook->table;
   struct rtable *tab = SKIP_BACK(struct rtable, exporter, re);
 
-  rt_unlock_table(tab);
   DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+
+  /* Free the hook before unlocking the table */
+  rfree(hook->pool);
+
+  /* Unlock the table; this may free it */
+  rt_unlock_table(tab);
 }
 
 static void
@@ -1935,13 +1936,10 @@ rt_export_stopped(void *data)
   rem_node(&hook->n);
 
   /* Report the channel as stopped. */
-  hook->stopped(hook->req);
+  CALL(hook->stopped, hook->req);
 
   /* Reporting the hook as finished. */
   CALL(tab->done, hook);
-
-  /* Free the hook. */
-  rfree(hook->pool);
 }
 
 static inline void
@@ -1950,8 +1948,7 @@ rt_set_import_state(struct rt_import_hook *hook, u8 state)
   hook->last_state_change = current_time();
   hook->import_state = state;
 
-  if (hook->req->log_state_change)
-    hook->req->log_state_change(hook->req, state);
+  CALL(hook->req->log_state_change, hook->req, state);
 }
 
 void
@@ -1960,8 +1957,7 @@ rt_set_export_state(struct rt_export_hook *hook, u8 state)
   hook->last_state_change = current_time();
   atomic_store_explicit(&hook->export_state, state, memory_order_release);
 
-  if (hook->req->log_state_change)
-    hook->req->log_state_change(hook->req, state);
+  CALL(hook->req->log_state_change, hook->req, state);
 }
 
 void
@@ -2919,7 +2915,7 @@ rt_export_cleanup(rtable *tab)
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
 
     ASSERT_DIE(net->first == first);
-    
+
     if (first == net->last)
       /* The only export here */
       net->last = net->first = NULL;
@@ -2949,7 +2945,7 @@ rt_export_cleanup(rtable *tab)
     ASSERT_DIE(pos < end);
 
     struct rt_pending_export *next = NULL;
-    
+
     if (++pos < end)
       next = &reb->export[pos];
     else
@@ -3931,9 +3927,7 @@ rt_feed_net(struct rt_export_hook *c, net *n)
     count = 1;
   }
 
-  for (struct rt_pending_export *rpe = n->first; rpe; rpe = rpe_next(rpe, NULL))
-    rpe_mark_seen(c, rpe);
-
+  rpe_mark_seen_all(c, n->first, NULL);
   return count;
 }
 
diff --git a/nest/rt.h b/nest/rt.h
index 66edf227..e7ba55f6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -386,9 +386,16 @@ void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, st
 /* Get next rpe. If src is given, it must match. */
 struct rt_pending_export *rpe_next(struct rt_pending_export *rpe, struct rte_src *src);
 
+/* Walk all rpe's */
+#define RPE_WALK(first, it, src) \
+  for (struct rt_pending_export *it = (first); it; it = rpe_next(it, (src)))
+
 /* Mark the pending export processed */
 void rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
+#define rpe_mark_seen_all(hook, first, src) \
+  RPE_WALK(first, rpe, src) rpe_mark_seen((hook), rpe)
+
 /* Get pending export seen status */
 int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 2543ee73..84a0b023 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1977,6 +1977,12 @@ bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req
   return hook;
 }
 
+static void
+bgp_out_table_export_done(struct rt_export_hook *hook)
+{
+  rfree(hook->pool);
+}
+
 void
 bgp_setup_out_table(struct bgp_channel *c)
 {
@@ -1985,6 +1991,7 @@ bgp_setup_out_table(struct bgp_channel *c)
   c->prefix_exporter = (struct rt_exporter) {
     .addr_type = c->c.table->addr_type,
     .start = bgp_out_table_export_start,
+    .done = bgp_out_table_export_done,
   };
 
   init_list(&c->prefix_exporter.hooks);

From ecdb1ec6eabbf0c47c410e9bb8551ab5d039a650 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 31 Aug 2022 14:01:59 +0200
Subject: [PATCH 184/431] Hostcache update notification converted to an export
 hook

Instead of synchronous notifications, we use the asynchronous export
framework to notify also hostcache updates. This allows us to do the
hostcache update and the subsequent next hop update notification without
locking collisions.
---
 nest/rt-table.c | 120 +++++++++++++++++++++++++++++-------------------
 nest/rt.h       |  73 +++++++++++++++--------------
 2 files changed, 112 insertions(+), 81 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index d4e0d63c..e23e766e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -43,10 +43,10 @@
  * all prefixes that may influence resolving of tracked next hops.
  *
  * When a best route changes in the src table, the hostcache is notified using
- * rt_notify_hostcache(), which immediately checks using the trie whether the
+ * an auxiliary export request, which checks using the trie whether the
  * change is relevant and if it is, then it schedules asynchronous hostcache
  * recomputation. The recomputation is done by rt_update_hostcache() (called
- * from rt_event() of src table), it walks through all hostentries and resolves
+ * as an event of src table), it walks through all hostentries and resolves
  * them (by rt_update_hostentry()). It also updates the trie. If a change in
  * hostentry resolution was found, then it schedules asynchronous nexthop
  * recomputation of associated dst table. That is done by rt_next_hop_update()
@@ -130,8 +130,7 @@ struct rt_export_block {
 };
 
 static void rt_free_hostcache(rtable *tab);
-static void rt_notify_hostcache(rtable *tab, net *net);
-static void rt_update_hostcache(rtable *tab);
+static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(rtable *tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
@@ -1280,9 +1279,6 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
     if (old_best_valid)
       old_best->rte.sender->stats.pref--;
 
-    if (tab->hostcache)
-      rt_notify_hostcache(tab, net);
-
     if (!EMPTY_LIST(tab->flowspec_links))
       rt_flowspec_notify(tab, net);
   }
@@ -2238,8 +2234,8 @@ void
 rt_dump_hooks(rtable *tab)
 {
   debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->deleted ? " (deleted)" : "");
-  debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
-      tab->nhu_state, tab->hcu_scheduled, tab->use_count, tab->rt_count);
+  debug("  nhu_state=%u use_count=%d rt_count=%u\n",
+      tab->nhu_state, tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
       tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
 
@@ -2279,16 +2275,6 @@ rt_dump_hooks_all(void)
     rt_dump_hooks(t);
 }
 
-static inline void
-rt_schedule_hcu(rtable *tab)
-{
-  if (tab->hcu_scheduled)
-    return;
-
-  tab->hcu_scheduled = 1;
-  ev_schedule(tab->rt_event);
-}
-
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
@@ -2336,25 +2322,15 @@ rt_event(void *ptr)
   if (tab->export_used)
     rt_export_cleanup(tab);
 
-  if (
-      tab->hcu_corked ||
-      tab->nhu_corked ||
-      (tab->hcu_scheduled || tab->nhu_state) && rt_cork_check(tab->uncork_event)
-      )
+  if (tab->nhu_corked || tab->nhu_state && rt_cork_check(tab->uncork_event))
   {
-    if (!tab->hcu_corked && !tab->nhu_corked)
+    if (!tab->nhu_corked)
       rt_trace(tab, D_STATES, "Next hop updater corked");
 
-    tab->hcu_corked |= tab->hcu_scheduled;
-    tab->hcu_scheduled = 0;
-
     tab->nhu_corked |= tab->nhu_state;
     tab->nhu_state = 0;
   }
 
-  if (tab->hcu_scheduled)
-    rt_update_hostcache(tab);
-
   if (tab->nhu_state)
     rt_next_hop_update(tab);
 
@@ -2369,9 +2345,6 @@ rt_uncork_event(void *ptr)
 {
   rtable *tab = ptr;
 
-  tab->hcu_scheduled |= tab->hcu_corked;
-  tab->hcu_corked = 0;
-
   tab->nhu_state |= tab->nhu_corked;
   tab->nhu_corked = 0;
 
@@ -3719,6 +3692,9 @@ rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old
   tab->name = new->name;
   tab->config = new;
 
+  if (tab->hostcache)
+    tab->hostcache->req.trace_routes = new->debug;
+
   tab->cork_threshold = new->cork_threshold;
 
   if (new->cork_threshold.high != old->cork_threshold.high)
@@ -3771,6 +3747,10 @@ rt_commit(struct config *new, struct config *old)
 	  tab->deleted = old;
 	  config_add_obstacle(old);
 	  rt_lock_table(tab);
+
+	  if (tab->hostcache)
+	    rt_stop_export(&tab->hostcache->req, NULL);
+
 	  rt_unlock_table(tab);
 	}
     }
@@ -4055,6 +4035,41 @@ hc_delete_hostentry(struct hostcache *hc, pool *p, struct hostentry *he)
     hc_resize(hc, p, hc->hash_order - HC_LO_STEP);
 }
 
+static void
+hc_notify_dump_req(struct rt_export_request *req)
+{
+  debug("  Table %s (%p)\n", req->name, req);
+}
+
+static void
+hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
+{
+  struct hostcache *hc = SKIP_BACK(struct hostcache, req, req);
+
+  /* No interest in this update, mark seen only */
+  if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
+  {
+    rpe_mark_seen_all(req->hook, first, NULL);
+    return;
+  }
+
+  /* This net may affect some hostentries, check the actual change */
+  rte *o = RTE_VALID_OR_NULL(first->old_best);
+  struct rte_storage *new_best = first->new_best;
+
+  RPE_WALK(first, rpe, NULL)
+  {
+    rpe_mark_seen(req->hook, rpe);
+    new_best = rpe->new_best;
+  }
+
+  /* Yes, something has actually changed. Do the hostcache update.
+   * We don't need any more updates until then. */
+  if (o != RTE_VALID_OR_NULL(new_best))
+    ev_schedule_work(&hc->update);
+}
+
+
 static void
 rt_init_hostcache(rtable *tab)
 {
@@ -4068,6 +4083,21 @@ rt_init_hostcache(rtable *tab)
   hc->lp = lp_new(tab->rp);
   hc->trie = f_new_trie(hc->lp, 0);
 
+  hc->update = (event) {
+    .hook = rt_update_hostcache,
+    .data = tab,
+  };
+
+  hc->req = (struct rt_export_request) {
+    .name = mb_sprintf(tab->rp, "%s.hcu.notifier", tab->name),
+    .list = &global_work_list,
+    .trace_routes = tab->config->debug,
+    .dump_req = hc_notify_dump_req,
+    .export_one = hc_notify_export_one,
+  };
+
+  rt_request_export(&tab->exporter, &hc->req);
+
   tab->hostcache = hc;
 }
 
@@ -4094,16 +4124,6 @@ rt_free_hostcache(rtable *tab)
   */
 }
 
-static void
-rt_notify_hostcache(rtable *tab, net *net)
-{
-  if (tab->hcu_scheduled)
-    return;
-
-  if (trie_match_net(tab->hostcache->trie, net->n.addr))
-    rt_schedule_hcu(tab);
-}
-
 static int
 if_local_addr(ip_addr a, struct iface *i)
 {
@@ -4200,9 +4220,17 @@ done:
 }
 
 static void
-rt_update_hostcache(rtable *tab)
+rt_update_hostcache(void *data)
 {
+  rtable *tab = data;
   struct hostcache *hc = tab->hostcache;
+
+  if (rt_cork_check(&hc->update))
+  {
+    rt_trace(tab, D_STATES, "Hostcache update corked");
+    return;
+  }
+
   struct hostentry *he;
   node *n, *x;
 
@@ -4222,8 +4250,6 @@ rt_update_hostcache(rtable *tab)
       if (rt_update_hostentry(tab, he))
 	rt_schedule_nhu(he->tab);
     }
-
-  tab->hcu_scheduled = 0;
 }
 
 static struct hostentry *
diff --git a/nest/rt.h b/nest/rt.h
index e7ba55f6..5839ba66 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -27,6 +27,7 @@ struct protocol;
 struct proto;
 struct channel;
 struct rte_src;
+struct hostcache;
 struct symbol;
 struct timer;
 struct filter;
@@ -116,8 +117,6 @@ typedef struct rtable {
   uint gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte prune_trie;			/* Prune prefix trie during next table prune */
-  byte hcu_scheduled;			/* Hostcache update is scheduled */
-  byte hcu_corked;			/* Hostcache update is corked with this state */
   byte nhu_state;			/* Next Hop Update state */
   byte nhu_corked;			/* Next Hop Update is corked with this state */
   byte export_used;			/* Pending Export pruning is scheduled */
@@ -185,43 +184,12 @@ static inline int rt_cork_check(event *e)
 }
 
 
-#define NHU_CLEAN	0
-#define NHU_SCHEDULED	1
-#define NHU_RUNNING	2
-#define NHU_DIRTY	3
-
 typedef struct network {
   struct rte_storage *routes;		/* Available routes for this network */
   struct rt_pending_export *first, *last;
   struct fib_node n;			/* FIB flags reserved for kernel syncer */
 } net;
 
-struct hostcache {
-  slab *slab;				/* Slab holding all hostentries */
-  struct hostentry **hash_table;	/* Hash table for hostentries */
-  unsigned hash_order, hash_shift;
-  unsigned hash_max, hash_min;
-  unsigned hash_items;
-  linpool *lp;				/* Linpool for trie */
-  struct f_trie *trie;			/* Trie of prefixes that might affect hostentries */
-  list hostentries;			/* List of all hostentries */
-  byte update_hostcache;
-};
-
-struct hostentry {
-  node ln;
-  ip_addr addr;				/* IP address of host, part of key */
-  ip_addr link;				/* (link-local) IP address of host, used as gw
-					   if host is directly attached */
-  struct rtable *tab;			/* Dependent table, part of key */
-  struct hostentry *next;		/* Next in hash chain */
-  unsigned hash_key;			/* Hash key */
-  unsigned uc;				/* Use count */
-  ea_list *src;				/* Source attributes */
-  byte nexthop_linkable;		/* Nexthop list is completely non-device */
-  u32 igp_metric;			/* Chosen route IGP metric */
-};
-
 struct rte_storage {
   struct rte_storage *next;		/* Next in chain */
   struct rte rte;			/* Route data */
@@ -394,7 +362,7 @@ struct rt_pending_export *rpe_next(struct rt_pending_export *rpe, struct rte_src
 void rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
 #define rpe_mark_seen_all(hook, first, src) \
-  RPE_WALK(first, rpe, src) rpe_mark_seen((hook), rpe)
+  RPE_WALK((first), _rpe, (src)) rpe_mark_seen((hook), _rpe)
 
 /* Get pending export seen status */
 int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
@@ -412,6 +380,43 @@ int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 #define RIC_REJECT	-1		/* Rejected by protocol */
 #define RIC_DROP	-2		/* Silently dropped by protocol */
 
+/*
+ * Next hop update data structures
+ */
+
+#define NHU_CLEAN	0
+#define NHU_SCHEDULED	1
+#define NHU_RUNNING	2
+#define NHU_DIRTY	3
+
+struct hostentry {
+  node ln;
+  ip_addr addr;				/* IP address of host, part of key */
+  ip_addr link;				/* (link-local) IP address of host, used as gw
+					   if host is directly attached */
+  struct rtable *tab;			/* Dependent table, part of key */
+  struct hostentry *next;		/* Next in hash chain */
+  unsigned hash_key;			/* Hash key */
+  unsigned uc;				/* Use count */
+  ea_list *src;				/* Source attributes */
+  byte nexthop_linkable;		/* Nexthop list is completely non-device */
+  u32 igp_metric;			/* Chosen route IGP metric */
+};
+
+struct hostcache {
+  slab *slab;				/* Slab holding all hostentries */
+  struct hostentry **hash_table;	/* Hash table for hostentries */
+  unsigned hash_order, hash_shift;
+  unsigned hash_max, hash_min;
+  unsigned hash_items;
+  linpool *lp;				/* Linpool for trie */
+  struct f_trie *trie;			/* Trie of prefixes that might affect hostentries */
+  list hostentries;			/* List of all hostentries */
+  event update;
+  struct rt_export_request req;		/* Notifier */
+};
+
+
 #define rte_update  channel_rte_import
 /**
  * rte_update - enter a new update to a routing table

From cd628d124dbdcfdbd870b3df5840cc6888d36f9d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 31 Aug 2022 16:04:36 +0200
Subject: [PATCH 185/431] Flowspec revalidate notification converted to an
 export hook

Instead of synchronous notifications, we use the asynchronous export
framework to notify flowspec src route updates. This allows us to
invoke flowspec revalidation without locking collisions.
---
 nest/rt-table.c | 140 +++++++++++++++++++++++++++++-------------------
 nest/rt.h       |  14 +++--
 2 files changed, 92 insertions(+), 62 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e23e766e..72f85370 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -60,15 +60,14 @@
  * routes depends of resolving their network prefixes in IP routing tables. This
  * is similar to the recursive next hop mechanism, but simpler as there are no
  * intermediate hostcache and hostentries (because flows are less likely to
- * share common net prefix than routes sharing a common next hop). In src table,
- * there is a list of dst tables (list flowspec_links), this list is updated by
- * flowpsec channels (by rt_flowspec_link() and rt_flowspec_unlink() during
- * channel start/stop). Each dst table has its own trie of prefixes that may
- * influence validation of flowspec routes in it (flowspec_trie).
+ * share common net prefix than routes sharing a common next hop). Every dst
+ * table has its own export request in every src table. Each dst table has its
+ * own trie of prefixes that may influence validation of flowspec routes in it
+ * (flowspec_trie).
  *
- * When a best route changes in the src table, rt_flowspec_notify() immediately
- * checks all dst tables from the list using their tries to see whether the
- * change is relevant for them. If it is, then an asynchronous re-validation of
+ * When a best route changes in the src table, the notification mechanism is
+ * invoked by the export request which checks its dst table's trie to see
+ * whether the change is relevant, and if so, an asynchronous re-validation of
  * flowspec routes in the dst table is scheduled. That is also done by function
  * rt_next_hop_update(), like nexthop recomputation above. It iterates over all
  * flowspec routes and re-validates them. It also recalculates the trie.
@@ -136,7 +135,6 @@ static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(rtable *tab);
 static inline void rt_schedule_notify(rtable *tab);
-static void rt_flowspec_notify(rtable *tab, net *net);
 static void rt_kick_prune_timer(rtable *tab);
 static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
@@ -1278,9 +1276,6 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
       new_best->rte.sender->stats.pref++;
     if (old_best_valid)
       old_best->rte.sender->stats.pref--;
-
-    if (!EMPTY_LIST(tab->flowspec_links))
-      rt_flowspec_notify(tab, net);
   }
 
   rt_schedule_notify(tab);
@@ -2448,13 +2443,59 @@ rt_unsubscribe(struct rt_subscription *s)
   rt_unlock_table(s->tab);
 }
 
+static void
+rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
+{
+  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
+  rtable *dst = ln->dst;
+  ASSUME(rt_is_flow(dst));
+
+  /* No need to inspect it further if recalculation is already active */
+  if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY)
+      || !trie_match_net(dst->flowspec_trie, net))
+  {
+    rpe_mark_seen_all(req->hook, first, NULL);
+    return;
+  }
+
+  /* This net may affect some flowspecs, check the actual change */
+  rte *o = RTE_VALID_OR_NULL(first->old_best);
+  struct rte_storage *new_best = first->new_best;
+
+  RPE_WALK(first, rpe, NULL)
+  {
+    rpe_mark_seen(req->hook, rpe);
+    new_best = rpe->new_best;
+  }
+
+  /* Yes, something has actually changed. Schedule the update. */
+  if (o != RTE_VALID_OR_NULL(new_best))
+    rt_schedule_nhu(dst);
+}
+
+static void
+rt_flowspec_dump_req(struct rt_export_request *req)
+{
+  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
+  debug("  Flowspec link for table %s (%p)\n", ln->dst->name, req);
+}
+
 static struct rt_flowspec_link *
 rt_flowspec_find_link(rtable *src, rtable *dst)
 {
-  struct rt_flowspec_link *ln;
-  WALK_LIST(ln, src->flowspec_links)
-    if ((ln->src == src) && (ln->dst == dst))
-      return ln;
+  struct rt_export_hook *hook; node *n;
+  WALK_LIST2(hook, n, src->exporter.hooks, n)
+    switch (atomic_load_explicit(&hook->export_state, memory_order_acquire))
+    {
+      case TES_FEEDING:
+      case TES_READY:
+	if (hook->req->export_one == rt_flowspec_export_one)
+	{
+	  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, hook->req);
+	  if (ln->dst == dst)
+	    return ln;
+	}
+    }
 
   return NULL;
 }
@@ -2469,18 +2510,36 @@ rt_flowspec_link(rtable *src, rtable *dst)
 
   if (!ln)
   {
-    rt_lock_table(src);
     rt_lock_table(dst);
 
-    ln = mb_allocz(src->rp, sizeof(struct rt_flowspec_link));
+    pool *p = src->rp;
+    ln = mb_allocz(p, sizeof(struct rt_flowspec_link));
     ln->src = src;
     ln->dst = dst;
-    add_tail(&src->flowspec_links, &ln->n);
+    ln->req = (struct rt_export_request) {
+      .name = mb_sprintf(p, "%s.flowspec.notifier", dst->name),
+      .list = &global_work_list,
+      .trace_routes = src->config->debug,
+      .dump_req = rt_flowspec_dump_req,
+      .export_one = rt_flowspec_export_one,
+    };
+
+    rt_request_export(&src->exporter, &ln->req);
   }
 
   ln->uc++;
 }
 
+static void
+rt_flowspec_link_stopped(struct rt_export_request *req)
+{
+  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
+  rtable *dst = ln->dst;
+
+  mb_free(ln);
+  rt_unlock_table(dst);
+}
+
 void
 rt_flowspec_unlink(rtable *src, rtable *dst)
 {
@@ -2488,37 +2547,8 @@ rt_flowspec_unlink(rtable *src, rtable *dst)
 
   ASSERT(ln && (ln->uc > 0));
 
-  ln->uc--;
-
-  if (!ln->uc)
-  {
-    rem_node(&ln->n);
-    mb_free(ln);
-
-    rt_unlock_table(src);
-    rt_unlock_table(dst);
-  }
-}
-
-static void
-rt_flowspec_notify(rtable *src, net *net)
-{
-  /* Only IP tables are src links */
-  ASSERT(rt_is_ip(src));
-
-  struct rt_flowspec_link *ln;
-  WALK_LIST(ln, src->flowspec_links)
-  {
-    rtable *dst = ln->dst;
-    ASSERT(rt_is_flow(dst));
-
-    /* No need to inspect it further if recalculation is already active */
-    if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY))
-      continue;
-
-    if (trie_match_net(dst->flowspec_trie, net->n.addr))
-      rt_schedule_nhu(dst);
-  }
+  if (!--ln->uc)
+    rt_stop_export(&ln->req, rt_flowspec_link_stopped);
 }
 
 static void
@@ -2596,8 +2626,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
     t->fib.init = net_init_with_trie;
   }
 
-  init_list(&t->flowspec_links);
-
   t->exporter = (struct rt_exporter) {
     .addr_type = t->addr_type,
     .start = rt_table_export_start,
@@ -3695,6 +3723,11 @@ rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old
   if (tab->hostcache)
     tab->hostcache->req.trace_routes = new->debug;
 
+  struct rt_export_hook *hook; node *n;
+  WALK_LIST2(hook, n, tab->exporter.hooks, n)
+    if (hook->req->export_one == rt_flowspec_export_one)
+      hook->req->trace_routes = new->debug;
+
   tab->cork_threshold = new->cork_threshold;
 
   if (new->cork_threshold.high != old->cork_threshold.high)
@@ -4063,8 +4096,7 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
     new_best = rpe->new_best;
   }
 
-  /* Yes, something has actually changed. Do the hostcache update.
-   * We don't need any more updates until then. */
+  /* Yes, something has actually changed. Do the hostcache update. */
   if (o != RTE_VALID_OR_NULL(new_best))
     ev_schedule_work(&hc->update);
 }
diff --git a/nest/rt.h b/nest/rt.h
index 5839ba66..01e444f6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -132,7 +132,6 @@ typedef struct rtable {
 
   list subscribers;			/* Subscribers for notifications */
   struct timer *settle_timer;		/* Settle time for notifications */
-  list flowspec_links;			/* List of flowspec links, src for NET_IPx and dst for NET_FLOWx */
   struct f_trie *flowspec_trie;		/* Trie for evaluation of flowspec notifications */
 } rtable;
 
@@ -143,13 +142,6 @@ struct rt_subscription {
   event_list *list;
 };
 
-struct rt_flowspec_link {
-  node n;
-  rtable *src;
-  rtable *dst;
-  u32 uc;
-};
-
 extern struct rt_cork {
   _Atomic uint active;
   event_list queue;
@@ -416,6 +408,12 @@ struct hostcache {
   struct rt_export_request req;		/* Notifier */
 };
 
+struct rt_flowspec_link {
+  rtable *src;
+  rtable *dst;
+  u32 uc;
+  struct rt_export_request req;
+};
 
 #define rte_update  channel_rte_import
 /**

From dd786e338c4adccee7077c8ecfaf56df2831ee4c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 1 Sep 2022 10:39:56 +0200
Subject: [PATCH 186/431] ROA subscriptions are also converted to export
 requests.

By this, the requesting channels do the timers in their own loops,
avoiding unnecessary synchronization when the central timer went off.

This is of course less effective for now, yet it allows to easily
implement selective reloads in future.
---
 doc/bird.sgml   |  24 ++++------
 nest/config.Y   |   4 +-
 nest/proto.c    | 119 +++++++++++++++++++++++++++++++++++++++---------
 nest/protocol.h |   8 +++-
 nest/rt-table.c |  96 +++-----------------------------------
 nest/rt.h       |  14 ------
 6 files changed, 122 insertions(+), 143 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index b12ac544..2bce3d57 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -675,21 +675,6 @@ to set options.
 	disadvantage is that trie-enabled routing tables require more memory,
 	which may be an issue especially in multi-table setups. Default: off.
 
-	<tag><label id="rtable-min-settle-time">min settle time <m/time/</tag>
-	Specify a minimum value of the settle time. When a ROA table changes,
-	automatic <ref id="proto-rpki-reload" name="RPKI reload"> may be
-	triggered, after a short settle time. Minimum settle time is a delay
-	from the last ROA table change to wait for more updates. Default: 1 s.
-
-
-	<tag><label id="rtable-max-settle-time">max settle time <m/time/</tag>
-	Specify a maximum value of the settle time. When a ROA table changes,
-	automatic <ref id="proto-rpki-reload" name="RPKI reload"> may be
-	triggered, after a short settle time. Maximum settle time is an upper
-	limit to the settle time from the initial ROA table change even if
-	there are consecutive updates gradually renewing the settle time.
-	Default: 20 s.
-
 	<tag><label id="rtable-gc-threshold">gc threshold <m/number/</tag>
 	Specify a minimum amount of removed networks that triggers a garbage
 	collection (GC) cycle. Default: 1000.
@@ -980,6 +965,15 @@ inherited from templates can be updated by new definitions.
 	<ref id="bgp-export-table" name="export table"> (for respective
 	direction). Default: on.
 
+	<tag><label id="rtable-min-settle-time">min settle time <m/time/</tag>
+	Minimum settle time is a delay from the last ROA table change to wait
+	for more updates before triggering automatic reload. Default: 1 s.
+
+	<tag><label id="rtable-min-settle-time">min settle time <m/time/</tag>
+        Maximum settle time is an upper limit to the settle time from the
+        initial ROA table change even if there are consecutive updates gradually
+        renewing the settle time.  Default: 20 s.
+
 	<tag><label id="proto-import-limit">import limit [<m/number/ | off ] [action warn | block | restart | disable]</tag>
 	Specify an import route limit (a maximum number of routes imported from
 	the protocol) and optionally the action to be taken when the limit is
diff --git a/nest/config.Y b/nest/config.Y
index 3ad6530d..ea7846e2 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -227,8 +227,6 @@ table_opt:
        cf_error("Trie option not supported for %s table", net_label[this_table->addr_type]);
      this_table->trie_used = $2;
    }
- | MIN SETTLE TIME expr_us { this_table->min_settle_time = $4; }
- | MAX SETTLE TIME expr_us { this_table->max_settle_time = $4; }
  | GC THRESHOLD expr { this_table->gc_threshold = $3; }
  | GC PERIOD expr_us { this_table->gc_period = (uint) $3; if ($3 > 3600 S_) cf_error("GC period must be at most 3600 s"); }
  | CORK THRESHOLD expr expr {
@@ -323,6 +321,8 @@ channel_item_:
  | RECEIVE LIMIT limit_spec { this_channel->rx_limit = $3; }
  | IMPORT LIMIT limit_spec { this_channel->in_limit = $3; }
  | EXPORT LIMIT limit_spec { this_channel->out_limit = $3; }
+ | MIN SETTLE TIME expr_us { this_channel->min_settle_time = $4; }
+ | MAX SETTLE TIME expr_us { this_channel->max_settle_time = $4; }
  | PREFERENCE expr { this_channel->preference = $2; check_u16($2); }
  | IMPORT KEEP FILTERED bool {
      if ($4)
diff --git a/nest/proto.c b/nest/proto.c
index d2374792..f4615c2f 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -55,6 +55,7 @@ static void channel_update_limit(struct channel *c, struct limit *l, int dir, st
 static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
 static void channel_feed_end(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
+static void channel_check_stopped(struct channel *c);
 
 static inline int proto_is_done(struct proto *p)
 { return (p->proto_state == PS_DOWN) && proto_is_inactive(p); }
@@ -312,10 +313,19 @@ proto_remove_channels(struct proto *p)
     proto_remove_channel(p, c);
 }
 
+struct roa_subscription {
+  node roa_node;
+  timer t;
+  btime base_settle_time;		/* Start of settling interval */
+  struct channel *c;
+  struct rt_export_request req;
+};
+
 static void
-channel_roa_in_changed(void *_data)
+channel_roa_in_changed(struct timer *t)
 {
-  struct channel *c = _data;
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, t, t);
+  struct channel *c = s->c;
   int active = !!c->reload_req.hook;
 
   CD(c, "Reload triggered by RPKI change%s", active ? " - already active" : "");
@@ -327,9 +337,11 @@ channel_roa_in_changed(void *_data)
 }
 
 static void
-channel_roa_out_changed(void *_data)
+channel_roa_out_changed(struct timer *t)
 {
-  struct channel *c = _data;
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, t, t);
+  struct channel *c = s->c;
+
   CD(c, "Feeding triggered by RPKI change");
 
   c->refeed_pending = 1;
@@ -338,29 +350,56 @@ channel_roa_out_changed(void *_data)
     rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
-/* Temporary code, subscriptions should be changed to resources */
-struct roa_subscription {
-  struct rt_subscription s;
-  node roa_node;
-};
+static void
+channel_export_one_roa(struct rt_export_request *req, const net_addr *net UNUSED, struct rt_pending_export *first)
+{
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
+
+  /* TODO: use the information about what roa has changed */
+
+  if (!tm_active(&s->t))
+  {
+    s->base_settle_time = current_time();
+    tm_start(&s->t, s->base_settle_time + s->c->min_settle_time);
+  }
+  else
+    tm_set(&s->t,
+	MIN(s->base_settle_time + s->c->max_settle_time,
+	    current_time() + s->c->min_settle_time));
+
+
+  rpe_mark_seen_all(req->hook, first, NULL);
+}
+
+static void
+channel_dump_roa_req(struct rt_export_request *req)
+{
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
+  struct channel *c = s->c;
+  rtable *tab = SKIP_BACK(rtable, exporter, req->hook->table);
+
+  debug("  Channel %s.%s ROA %s change notifier from table %s request %p\n",
+      c->proto->name, c->name,
+      (s->t.hook == channel_roa_in_changed) ? "import" : "export",
+      tab->name, req);
+}
 
 static int
 channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
 {
-  void (*hook)(void *) =
+  void (*hook)(struct timer *) =
     dir ? channel_roa_in_changed : channel_roa_out_changed;
 
   struct roa_subscription *s;
   node *n;
 
   WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
-    if ((s->s.tab == tab) && (s->s.event->hook == hook))
+    if ((s->req.hook->table == &tab->exporter) && (s->t.hook == hook))
       return 1;
 
   return 0;
 }
 
-
 static void
 channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
 {
@@ -368,21 +407,40 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
     return;
 
   struct roa_subscription *s = mb_allocz(c->proto->pool, sizeof(struct roa_subscription));
-  s->s.event = ev_new_init(c->proto->pool, dir ? channel_roa_in_changed : channel_roa_out_changed, c);
-  s->s.list = proto_work_list(c->proto);
 
-  rt_subscribe(tab, &s->s);
+  *s = (struct roa_subscription) {
+    .t = { .hook = dir ? channel_roa_in_changed : channel_roa_out_changed, },
+    .c = c,
+    .req = {
+      .name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s",
+	  c->proto->name, c->name, dir ? "in" : "out", tab->name),
+      .list = proto_work_list(c->proto),
+      .trace_routes = c->debug | c->proto->debug,
+      .dump_req = channel_dump_roa_req,
+      .export_one = channel_export_one_roa,
+    },
+  };
 
   add_tail(&c->roa_subscriptions, &s->roa_node);
+  rt_request_export(&tab->exporter, &s->req);
+}
+
+static void
+channel_roa_unsubscribed(struct rt_export_request *req)
+{
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
+  struct channel *c = s->c;
+
+  rem_node(&s->roa_node);
+  mb_free(s);
+  
+  channel_check_stopped(c);
 }
 
 static void
 channel_roa_unsubscribe(struct roa_subscription *s)
 {
-  rt_unsubscribe(&s->s);
-  rem_node(&s->roa_node);
-  rfree(s->s.event);
-  mb_free(s);
+  rt_stop_export(&s->req, channel_roa_unsubscribed);
 }
 
 static void
@@ -525,7 +583,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (c->out_req.hook || c->in_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->in_req.hook)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -533,7 +591,7 @@ channel_check_stopped(struct channel *c)
 
       break;
     case CS_PAUSE:
-      if (c->out_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook)
 	return;
 
       channel_set_state(c, CS_START);
@@ -876,6 +934,9 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
   cf->debug = new_config->channel_default_debug;
   cf->rpki_reload = 1;
 
+  cf->min_settle_time = 1 S;
+  cf->max_settle_time = 20 S;
+
   add_tail(&proto->channels, &cf->n);
 
   return cf;
@@ -956,6 +1017,22 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->rpki_reload = cf->rpki_reload;
 
+  if (	  (c->min_settle_time != cf->min_settle_time)
+       || (c->max_settle_time != cf->max_settle_time))
+  {
+    c->min_settle_time = cf->min_settle_time;
+    c->max_settle_time = cf->max_settle_time;
+
+    struct roa_subscription *s;
+    node *n;
+
+    WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
+      if (tm_active(&s->t))
+	tm_set(&s->t,
+	    MIN(s->base_settle_time + c->max_settle_time,
+	      current_time() + c->min_settle_time));
+  }
+
   /* Execute channel-specific reconfigure hook */
   if (c->channel->reconfigure && !c->channel->reconfigure(c, cf, &import_changed, &export_changed))
     return 0;
diff --git a/nest/protocol.h b/nest/protocol.h
index 709d6415..a3eeb198 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -463,6 +463,9 @@ struct channel_config {
   struct channel_limit in_limit;	/* Limit for importing routes from protocol */
   struct channel_limit out_limit;	/* Limit for exporting routes to protocol */
 
+  btime min_settle_time;		/* Minimum settle time for ROA-induced reload */
+  btime max_settle_time;		/* Maximum settle time for ROA-induced reload */
+
   u8 net_type;				/* Routing table network type (NET_*), 0 for undefined */
   u8 ra_mode;				/* Mode of received route advertisements (RA_*) */
   u16 preference;			/* Default route preference */
@@ -490,6 +493,9 @@ struct channel {
   struct limit in_limit;		/* Input limit */
   struct limit out_limit;		/* Output limit */
 
+  btime min_settle_time;		/* Minimum settle time for ROA-induced reload */
+  btime max_settle_time;		/* Maximum settle time for ROA-induced reload */
+
   u8 limit_actions[PLD_MAX];		/* Limit actions enum */
   u8 limit_active;			/* Flags for active limits */
 
@@ -543,7 +549,7 @@ struct channel {
 
   struct rt_exporter *out_table;	/* Internal table for exported routes */
 
-  list roa_subscriptions;		/* List of active ROA table subscriptions based on filters roa_check() */
+  list roa_subscriptions;		/* List of active ROA table subscriptions based on filters' roa_check() calls */
 };
 
 #define RIK_REJECTED	1			/* Routes rejected in import filter are kept */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 72f85370..2fa736e2 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -82,9 +82,8 @@
  * will be re-validated later in this round anyway.
  *
  * The third mechanism is used for RPKI re-validation of IP routes and it is the
- * simplest. It is just a list of subscribers in src table, who are notified
- * when any change happened, but only after a settle time. Also, in RPKI case
- * the dst is not a table, but a channel, who refeeds routes through a filter.
+ * simplest. It is also an auxiliary export request belonging to the
+ * appropriate channel, triggering its reload/refeed timer after a settle time.
  */
 
 #undef LOCAL_DEBUG
@@ -134,7 +133,6 @@ static void rt_next_hop_update(rtable *tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(rtable *tab);
-static inline void rt_schedule_notify(rtable *tab);
 static void rt_kick_prune_timer(rtable *tab);
 static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
@@ -1270,15 +1268,10 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if ((new == old) && (new_best == old_best))
     return;
 
-  if (new_best_valid || old_best_valid)
-  {
-    if (new_best_valid)
-      new_best->rte.sender->stats.pref++;
-    if (old_best_valid)
-      old_best->rte.sender->stats.pref--;
-  }
-
-  rt_schedule_notify(tab);
+  if (new_best_valid)
+    new_best->rte.sender->stats.pref++;
+  if (old_best_valid)
+    old_best->rte.sender->stats.pref--;
 
   if (EMPTY_LIST(tab->exporter.hooks) && EMPTY_LIST(tab->exporter.pending))
   {
@@ -2371,78 +2364,6 @@ rt_kick_prune_timer(rtable *tab)
 }
 
 
-static inline btime
-rt_settled_time(rtable *tab)
-{
-  ASSUME(tab->base_settle_time != 0);
-
-  return MIN(tab->last_rt_change + tab->config->min_settle_time,
-	     tab->base_settle_time + tab->config->max_settle_time);
-}
-
-static void
-rt_settle_timer(timer *t)
-{
-  rtable *tab = t->data;
-
-  if (!tab->base_settle_time)
-    return;
-
-  btime settled_time = rt_settled_time(tab);
-  if (current_time() < settled_time)
-  {
-    tm_set(tab->settle_timer, settled_time);
-    return;
-  }
-
-  /* Settled */
-  tab->base_settle_time = 0;
-
-  struct rt_subscription *s;
-  WALK_LIST(s, tab->subscribers)
-    ev_send(s->list, s->event);
-}
-
-static void
-rt_kick_settle_timer(rtable *tab)
-{
-  tab->base_settle_time = current_time();
-
-  if (!tab->settle_timer)
-    tab->settle_timer = tm_new_init(tab->rp, rt_settle_timer, tab, 0, 0);
-
-  if (!tm_active(tab->settle_timer))
-    tm_set(tab->settle_timer, rt_settled_time(tab));
-}
-
-static inline void
-rt_schedule_notify(rtable *tab)
-{
-  if (EMPTY_LIST(tab->subscribers))
-    return;
-
-  if (tab->base_settle_time)
-    return;
-
-  rt_kick_settle_timer(tab);
-}
-
-void
-rt_subscribe(rtable *tab, struct rt_subscription *s)
-{
-  s->tab = tab;
-  rt_lock_table(tab);
-  DBG("rt_subscribe(%s)\n", tab->name);
-  add_tail(&tab->subscribers, &s->n);
-}
-
-void
-rt_unsubscribe(struct rt_subscription *s)
-{
-  rem_node(&s->n);
-  rt_unlock_table(s->tab);
-}
-
 static void
 rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
@@ -2580,7 +2501,6 @@ rt_free(resource *_r)
   fib_free(&r->fib);
   hmap_free(&r->id_map);
   rfree(r->rt_event);
-  rfree(r->settle_timer);
   mb_free(r);
   */
 }
@@ -2642,8 +2562,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   hmap_init(&t->id_map, p, 1024);
   hmap_set(&t->id_map, 0);
 
-  init_list(&t->subscribers);
-
   t->rt_event = ev_new_init(p, rt_event, t);
   t->uncork_event = ev_new_init(p, rt_uncork_event, t);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
@@ -3629,8 +3547,6 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->addr_type = addr_type;
   c->gc_threshold = 1000;
   c->gc_period = (uint) -1;	/* set in rt_postconfig() */
-  c->min_settle_time = 1 S;
-  c->max_settle_time = 20 S;
   c->cork_threshold.low = 128;
   c->cork_threshold.high = 512;
   c->debug = new_config->table_debug;
diff --git a/nest/rt.h b/nest/rt.h
index 01e444f6..c5948512 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -61,8 +61,6 @@ struct rtable_config {
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   byte trie_used;			/* Rtable has attached trie */
   byte debug;				/* Whether to log */
-  btime min_settle_time;		/* Minimum settle time for notifications */
-  btime max_settle_time;		/* Maximum settle time for notifications */
   btime export_settle_time;		/* Delay before exports are announced */
   struct rt_cork_threshold cork_threshold;	/* Cork threshold values */
 };
@@ -112,7 +110,6 @@ typedef struct rtable {
   struct event *uncork_event;		/* Called when uncork happens */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
   btime last_rt_change;			/* Last time when route changed */
-  btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
   uint gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
@@ -130,18 +127,9 @@ typedef struct rtable {
   u32 trie_old_lock_count;		/* Old prefix trie locked by walks */
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
 
-  list subscribers;			/* Subscribers for notifications */
-  struct timer *settle_timer;		/* Settle time for notifications */
   struct f_trie *flowspec_trie;		/* Trie for evaluation of flowspec notifications */
 } rtable;
 
-struct rt_subscription {
-  node n;
-  rtable *tab;
-  event *event;
-  event_list *list;
-};
-
 extern struct rt_cork {
   _Atomic uint active;
   event_list queue;
@@ -461,8 +449,6 @@ void rt_lock_table(rtable *);
 void rt_unlock_table(rtable *);
 struct f_trie * rt_lock_trie(rtable *tab);
 void rt_unlock_trie(rtable *tab, struct f_trie *trie);
-void rt_subscribe(rtable *tab, struct rt_subscription *s);
-void rt_unsubscribe(struct rt_subscription *s);
 void rt_flowspec_link(rtable *src, rtable *dst);
 void rt_flowspec_unlink(rtable *src, rtable *dst);
 rtable *rt_setup(pool *, struct rtable_config *);

From 66ccdc2a0c8f10263679e7fac37c1db1adf64b4f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 1 Sep 2022 11:17:35 +0200
Subject: [PATCH 187/431] Added an indirection to the export announcement
 routine

There are performance reasons for this, mostly that we don't want to
ping the table service routine with every import.
---
 nest/proto.c    |  1 +
 nest/rt-table.c | 72 ++++++++++++++++++++++++++++++++++---------------
 nest/rt.h       |  3 +++
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index f4615c2f..783672ec 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -511,6 +511,7 @@ channel_start_import(struct channel *c)
   c->in_req = (struct rt_import_request) {
     .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
     .trace_routes = c->debug | c->proto->debug,
+    .list = proto_work_list(c->proto),
     .dump_req = channel_dump_import_req,
     .log_state_change = channel_import_log_state_change,
     .preimport = channel_preimport,
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 2fa736e2..3188ddf8 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1354,9 +1354,6 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
     tab->exporter.first = rpe;
 
   rt_check_cork_high(tab);
-
-  if (!tm_active(tab->exporter.export_timer))
-    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
 }
 
 static struct rt_pending_export *
@@ -1410,6 +1407,9 @@ rt_announce_exports(timer *tm)
 {
   rtable *tab = tm->data;
 
+  if (EMPTY_LIST(tab->exporter.pending))
+    return;
+
   struct rt_export_hook *c; node *n;
   WALK_LIST2(c, n, tab->exporter.hooks, n)
   {
@@ -1420,6 +1420,28 @@ rt_announce_exports(timer *tm)
   }
 }
 
+static void
+rt_import_announce_exports(void *_hook)
+{
+  struct rt_import_hook *hook = _hook;
+  rtable *tab = hook->table;
+
+
+  if (hook->import_state == TIS_CLEARED)
+  {
+    rt_trace(tab, D_EVENTS, "Hook %s stopped", hook->req->name);
+    hook->stopped(hook->req);
+    rem_node(&hook->n);
+    mb_free(hook);
+    rt_unlock_table(tab);
+  }
+
+  rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
+
+  if (!tm_active(tab->exporter.export_timer))
+    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+}
+
 static struct rt_pending_export *
 rt_last_export(struct rt_exporter *tab)
 {
@@ -1535,7 +1557,7 @@ rte_same(rte *x, rte *y)
 
 static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
 
-static void
+static int
 rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
 {
   struct rt_import_request *req = c->req;
@@ -1588,7 +1610,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
 
 	      /* We need to free the already stored route here before returning */
 	      rte_free(new_stored);
-	      return;
+	      return 0;
 	  }
 
 	*before_old = (*before_old)->next;
@@ -1598,7 +1620,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   if (!old && !new)
     {
       stats->withdraws_ignored++;
-      return;
+      return 0;
     }
 
   /* If rejected by import limit, we need to pretend there is no route */
@@ -1734,14 +1756,7 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
   rte_announce(table, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
-#if 0
-  /* Enable and reimplement these callbacks if anybody wants to use them */
-  if (old_ok && p->rte_remove)
-    p->rte_remove(net, old);
-  if (new_ok && p->rte_insert)
-    p->rte_insert(net, &new_stored->rte);
-#endif
-
+  return 1;
 }
 
 int
@@ -1869,8 +1884,9 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
       return;
     }
 
-  /* And recalculate the best route */
-  rte_recalculate(hook, nn, new, src);
+  /* Recalculate the best route */
+  if (rte_recalculate(hook, nn, new, src))
+    ev_send(req->list, &hook->announce_event);
 }
 
 /* Check rtable for best route to given net whether it would be exported do p */
@@ -1951,14 +1967,14 @@ rt_request_import(rtable *tab, struct rt_import_request *req)
 
   struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
 
+  hook->announce_event = (event) { .hook = rt_import_announce_exports, .data = hook };
+
   DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
 
   hook->req = req;
   hook->table = tab;
 
   rt_set_import_state(hook, TIS_UP);
-
-  hook->n = (node) {};
   add_tail(&tab->imports, &hook->n);
 }
 
@@ -2313,7 +2329,13 @@ rt_event(void *ptr)
   if (tab->nhu_corked || tab->nhu_state && rt_cork_check(tab->uncork_event))
   {
     if (!tab->nhu_corked)
+    {
       rt_trace(tab, D_STATES, "Next hop updater corked");
+      if ((tab->nhu_state & NHU_RUNNING)
+	  && !EMPTY_LIST(tab->exporter.pending)
+	  && !tm_active(tab->exporter.export_timer))
+	tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+    }
 
     tab->nhu_corked |= tab->nhu_state;
     tab->nhu_state = 0;
@@ -2699,6 +2721,10 @@ again:
     }
   FIB_ITERATE_END;
 
+  rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
+  if (!tm_active(tab->exporter.export_timer))
+    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+
 #ifdef DEBUGGING
   fib_check(&tab->fib);
 #endif
@@ -2912,10 +2938,7 @@ done:;
       if (!first || (first->seq >= ih->flush_seq))
       {
 	ih->import_state = TIS_CLEARED;
-	ih->stopped(ih->req);
-	rem_node(&ih->n);
-	mb_free(ih);
-	rt_unlock_table(tab);
+	ev_send(ih->req->list, &ih->announce_event);
       }
 
   if ((tab->gc_counter += want_prune) >= tab->config->gc_threshold)
@@ -3497,6 +3520,11 @@ rt_next_hop_update(rtable *tab)
     }
   FIB_ITERATE_END;
 
+  rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
+
+  if (!tm_active(tab->exporter.export_timer))
+    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+
   /* State change:
    *   NHU_DIRTY   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_CLEAN
diff --git a/nest/rt.h b/nest/rt.h
index c5948512..78585c79 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -187,6 +187,8 @@ struct rt_import_request {
   char *name;
   u8 trace_routes;
 
+  event_list *list;			/* Where to schedule announce events */
+
   void (*dump_req)(struct rt_import_request *req);
   void (*log_state_change)(struct rt_import_request *req, u8 state);
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
@@ -218,6 +220,7 @@ struct rt_import_hook {
   u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
   void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
+  event announce_event;			/* This event announces table updates */
 };
 
 struct rt_pending_export {

From 636bc44e61b5361b675ddd1ad7edb0b5ff2c2f2f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 5 Sep 2022 06:58:42 +0200
Subject: [PATCH 188/431] Exporter routine refactoring to allow for nicer table
 locking

---
 nest/config.Y     |   2 +-
 nest/proto.c      |  12 +-
 nest/rt-show.c    |   8 +-
 nest/rt-table.c   | 286 ++++++++++++++++++++++++++--------------------
 nest/rt.h         |  65 ++++++++---
 proto/bgp/attrs.c |  64 ++++++-----
 proto/bgp/bgp.c   |   2 +-
 7 files changed, 256 insertions(+), 183 deletions(-)

diff --git a/nest/config.Y b/nest/config.Y
index ea7846e2..e8c4aa9a 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -702,7 +702,7 @@ r_args:
    }
  | r_args IMPORT TABLE channel_arg {
      if (!($4->in_keep & RIK_PREFILTER)) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_exporter($$, &$4->table->exporter, "import")->prefilter = $4;
+     rt_show_add_exporter($$, &$4->table->exporter.e, "import")->prefilter = $4;
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
diff --git a/nest/proto.c b/nest/proto.c
index 783672ec..5f4b7b2d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -376,7 +376,7 @@ channel_dump_roa_req(struct rt_export_request *req)
 {
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
   struct channel *c = s->c;
-  rtable *tab = SKIP_BACK(rtable, exporter, req->hook->table);
+  rtable *tab = SKIP_BACK(rtable, exporter.e, req->hook->table);
 
   debug("  Channel %s.%s ROA %s change notifier from table %s request %p\n",
       c->proto->name, c->name,
@@ -394,7 +394,7 @@ channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
   node *n;
 
   WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
-    if ((s->req.hook->table == &tab->exporter) && (s->t.hook == hook))
+    if ((s->req.hook->table == &tab->exporter.e) && (s->t.hook == hook))
       return 1;
 
   return 0;
@@ -422,7 +422,7 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
   };
 
   add_tail(&c->roa_subscriptions, &s->roa_node);
-  rt_request_export(&tab->exporter, &s->req);
+  rt_request_export(tab, &s->req);
 }
 
 static void
@@ -575,7 +575,7 @@ channel_start_export(struct channel *c)
   }
 
   DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
-  rt_request_export(&c->table->exporter, &c->out_req);
+  rt_request_export(c->table, &c->out_req);
 }
 
 static void
@@ -629,7 +629,7 @@ channel_export_stopped(struct rt_export_request *req)
   {
     c->refeeding = 1;
     c->refeed_pending = 0;
-    rt_request_export(&c->table->exporter, req);
+    rt_request_export(c->table, req);
     return;
   }
 
@@ -673,7 +673,7 @@ channel_schedule_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
 
-  rt_request_export(&c->table->exporter, &c->reload_req);
+  rt_request_export(c->table, &c->reload_req);
 }
 
 static void
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 5d7723cf..d17818db 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -301,7 +301,7 @@ rt_show_cont(struct rt_show_data *d)
   if (d->tables_defined_by & RSD_TDB_SET)
     rt_show_table(d);
 
-  rt_request_export(d->tab->table, &d->req);
+  rt_request_export_other(d->tab->table, &d->req);
 }
 
 static void
@@ -356,7 +356,7 @@ rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *
 struct rt_show_data_rtable *
 rt_show_add_table(struct rt_show_data *d, struct rtable *t)
 {
-  struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter, t->name);
+  struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter.e, t->name);
 
   struct proto_config *krt = t->config->krt_attached;
   if (krt)
@@ -419,11 +419,11 @@ rt_show_prepare_tables(struct rt_show_data *d)
     if (d->export_mode)
     {
       if (!tab->export_channel && d->export_channel &&
-	  (tab->table == &d->export_channel->table->exporter))
+	  (tab->table == &d->export_channel->table->exporter.e))
 	tab->export_channel = d->export_channel;
 
       if (!tab->export_channel && d->export_protocol)
-	tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter, tab->table));
+	tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter.e, tab->table));
 
       if (!tab->export_channel)
       {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 3188ddf8..de955ebb 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -138,13 +138,13 @@ static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
 static void rt_feed_equal(void *);
 static void rt_feed_for(void *);
-static uint rt_feed_net(struct rt_export_hook *c, net *n);
+static uint rt_feed_net(struct rt_table_export_hook *c, net *n);
 static void rt_check_cork_low(rtable *tab);
 static void rt_check_cork_high(rtable *tab);
 static void rt_cork_release_hook(void *);
 
-static inline void rt_export_used(struct rt_exporter *);
-static void rt_export_cleanup(rtable *tab);
+static void rt_export_used(struct rt_table_exporter *);
+static void rt_export_cleanup(rtable *);
 
 static int rte_same(rte *x, rte *y);
 
@@ -1162,9 +1162,10 @@ rpe_next(struct rt_pending_export *rpe, struct rte_src *src)
 }
 
 static struct rt_pending_export * rt_next_export_fast(struct rt_pending_export *last);
-static void
-rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
+static int
+rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
 {
+  struct rt_export_hook *hook = &th->h;
   if (bmap_test(&hook->seq_map, rpe->seq))
     goto ignore;	/* Seen already */
 
@@ -1216,15 +1217,16 @@ rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
 
 ignore:
   /* Get the next export if exists */
-  hook->rpe_next = rt_next_export_fast(rpe);
+  th->rpe_next = rt_next_export_fast(rpe);
 
   /* The last block may be available to free */
-  if (PAGE_HEAD(hook->rpe_next) != PAGE_HEAD(rpe))
-    CALL(hook->table->used, hook->table);
+  int used = (PAGE_HEAD(th->rpe_next) != PAGE_HEAD(rpe));
 
   /* Releasing this export for cleanup routine */
   DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe->seq);
-  atomic_store_explicit(&hook->last_export, rpe, memory_order_release);
+  atomic_store_explicit(&th->last_export, rpe, memory_order_release);
+
+  return used;
 }
 
 /**
@@ -1273,7 +1275,7 @@ rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage
   if (old_best_valid)
     old_best->rte.sender->stats.pref--;
 
-  if (EMPTY_LIST(tab->exporter.hooks) && EMPTY_LIST(tab->exporter.pending))
+  if (EMPTY_LIST(tab->exporter.e.hooks) && EMPTY_LIST(tab->exporter.pending))
   {
     /* No export hook and no pending exports to cleanup. We may free the route immediately. */
     if (!old)
@@ -1382,7 +1384,7 @@ rt_next_export_fast(struct rt_pending_export *last)
 }
 
 static struct rt_pending_export *
-rt_next_export(struct rt_export_hook *hook, struct rt_exporter *tab)
+rt_next_export(struct rt_table_export_hook *hook, struct rt_table_exporter *tab)
 {
   /* As the table is locked, it is safe to reload the last export pointer */
   struct rt_pending_export *last = atomic_load_explicit(&hook->last_export, memory_order_acquire);
@@ -1399,7 +1401,7 @@ rt_next_export(struct rt_export_hook *hook, struct rt_exporter *tab)
 static inline void
 rt_send_export_event(struct rt_export_hook *hook)
 {
-  ev_send(hook->req->list, hook->event);
+  ev_send(hook->req->list, &hook->event);
 }
 
 static void
@@ -1411,7 +1413,7 @@ rt_announce_exports(timer *tm)
     return;
 
   struct rt_export_hook *c; node *n;
-  WALK_LIST2(c, n, tab->exporter.hooks, n)
+  WALK_LIST2(c, n, tab->exporter.e.hooks, n)
   {
     if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_READY)
       continue;
@@ -1443,7 +1445,7 @@ rt_import_announce_exports(void *_hook)
 }
 
 static struct rt_pending_export *
-rt_last_export(struct rt_exporter *tab)
+rt_last_export(struct rt_table_exporter *tab)
 {
   struct rt_pending_export *rpe = NULL;
 
@@ -1463,31 +1465,33 @@ rt_last_export(struct rt_exporter *tab)
 static void
 rt_export_hook(void *_data)
 {
-  struct rt_export_hook *c = _data;
+  struct rt_table_export_hook *c = _data;
 
-  ASSERT_DIE(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_READY);
+  ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_READY);
 
   if (!c->rpe_next)
   {
     c->rpe_next = rt_next_export(c, c->table);
 
     if (!c->rpe_next)
-    {
-      CALL(c->table->used, c->table);
-      return;
-    }
+      return rt_export_used(c->table);
   }
 
+  int used = 0;
+
   /* Process the export */
   for (uint i=0; i<RT_EXPORT_BULK; i++)
   {
-    rte_export(c, c->rpe_next);
+    used += rte_export(c, c->rpe_next);
 
     if (!c->rpe_next)
       break;
   }
 
-  rt_send_export_event(c);
+  if (used)
+    rt_export_used(c->table);
+
+  rt_send_export_event(&c->h);
 }
 
 
@@ -1909,28 +1913,27 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
 }
 
 static void
-rt_table_export_done(struct rt_export_hook *hook)
+rt_table_export_done(void *hh)
 {
-  struct rt_exporter *re = hook->table;
-  struct rtable *tab = SKIP_BACK(struct rtable, exporter, re);
+  struct rt_table_export_hook *hook = hh;
+  struct rtable *tab = SKIP_BACK(struct rtable, exporter, hook->table);
 
   DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
 
-  /* Free the hook before unlocking the table */
-  rfree(hook->pool);
+  /* Drop pending exports */
+  rt_export_used(&tab->exporter);
+
+  /* Do the common code */
+  rt_export_stopped(&hook->h);
 
   /* Unlock the table; this may free it */
   rt_unlock_table(tab);
 }
 
-static void
+void
 rt_export_stopped(void *data)
 {
   struct rt_export_hook *hook = data;
-  struct rt_exporter *tab = hook->table;
-
-  /* Drop pending exports */
-  CALL(tab->used, tab);
 
   /* Unlist */
   rem_node(&hook->n);
@@ -1938,8 +1941,8 @@ rt_export_stopped(void *data)
   /* Report the channel as stopped. */
   CALL(hook->stopped, hook->req);
 
-  /* Reporting the hook as finished. */
-  CALL(tab->done, hook);
+  /* Free the hook itself together with its pool */
+  rfree(hook->pool);
 }
 
 static inline void
@@ -1991,15 +1994,16 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
   hook->stopped = stopped;
 }
 
-static struct rt_export_hook *
+static void
 rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 {
-  rtable *tab = SKIP_BACK(rtable, exporter, re);
+  rtable *tab = SKIP_BACK(rtable, exporter.e, re);
   rt_lock_table(tab);
 
-  pool *p = rp_new(tab->rp, "Export hook");
-  struct rt_export_hook *hook = mb_allocz(p, sizeof(struct rt_export_hook));
-  hook->pool = p;
+  req->hook = rt_alloc_export(re, sizeof(struct rt_table_export_hook));
+  req->hook->req = req;
+
+  struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, req->hook);
 
   /* stats zeroed by mb_allocz */
   switch (req->addr_mode)
@@ -2007,24 +2011,24 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
     case TE_ADDR_IN:
       if (tab->trie && net_val_match(tab->addr_type, NB_IP))
       {
-	hook->walk_state = mb_allocz(p, sizeof (struct f_trie_walk_state));
+	hook->walk_state = mb_allocz(hook->h.pool, sizeof (struct f_trie_walk_state));
 	hook->walk_lock = rt_lock_trie(tab);
 	trie_walk_init(hook->walk_state, tab->trie, req->addr);
-	hook->event = ev_new_init(p, rt_feed_by_trie, hook);
+	hook->h.event.hook = rt_feed_by_trie;
 	break;
       }
       /* fall through */
     case TE_ADDR_NONE:
       FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
-      hook->event = ev_new_init(p, rt_feed_by_fib, hook);
+      hook->h.event.hook = rt_feed_by_fib;
       break;
 
     case TE_ADDR_EQUAL:
-      hook->event = ev_new_init(p, rt_feed_equal, hook);
+      hook->h.event.hook = rt_feed_equal;
       break;
 
     case TE_ADDR_FOR:
-      hook->event = ev_new_init(p, rt_feed_for, hook);
+      hook->h.event.hook = rt_feed_for;
       break;
 
     default:
@@ -2033,23 +2037,43 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
+  struct rt_pending_export *rpe = rt_last_export(hook->table);
+  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
+  atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
+
+  rt_init_export(re, req->hook);
+}
+
+void rt_request_export(rtable *tab, struct rt_export_request *req)
+{
+  rt_table_export_start(&tab->exporter.e, req);
+}
+
+void
+rt_request_export_other(struct rt_exporter *re, struct rt_export_request *req)
+{
+  return re->class->start(re, req);
+}
+
+struct rt_export_hook *
+rt_alloc_export(struct rt_exporter *re, uint size)
+{
+  pool *p = rp_new(re->rp, "Export hook");
+  struct rt_export_hook *hook = mb_allocz(p, size);
+
+  hook->pool = p;
+  hook->table = re;
+
   return hook;
 }
 
 void
-rt_request_export(struct rt_exporter *re, struct rt_export_request *req)
+rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook)
 {
-  struct rt_export_hook *hook = req->hook = re->start(re, req);
-
-  hook->req = req;
-  hook->table = re;
+  hook->event.data = hook;
 
   bmap_init(&hook->seq_map, hook->pool, 1024);
 
-  struct rt_pending_export *rpe = rt_last_export(hook->table);
-  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
-  atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
-
   hook->n = (node) {};
   add_tail(&re->hooks, &hook->n);
 
@@ -2059,14 +2083,15 @@ rt_request_export(struct rt_exporter *re, struct rt_export_request *req)
 }
 
 static void
-rt_table_export_stop(struct rt_export_hook *hook)
+rt_table_export_stop(struct rt_export_hook *hh)
 {
+  struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
   rtable *tab = SKIP_BACK(rtable, exporter, hook->table);
 
-  if (atomic_load_explicit(&hook->export_state, memory_order_relaxed) != TES_FEEDING)
+  if (atomic_load_explicit(&hh->export_state, memory_order_relaxed) != TES_FEEDING)
     return;
 
-  switch (hook->req->addr_mode)
+  switch (hh->req->addr_mode)
   {
     case TE_ADDR_IN:
       if (hook->walk_lock)
@@ -2087,17 +2112,18 @@ rt_table_export_stop(struct rt_export_hook *hook)
 void
 rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_request *))
 {
+  ASSERT_DIE(birdloop_inside(req->list->loop));
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
   /* Cancel the feeder event */
-  ev_postpone(hook->event);
+  ev_postpone(&hook->event);
 
   /* Stop feeding from the exporter */
-  CALL(hook->table->stop, hook);
+  CALL(hook->table->class->stop, hook);
 
   /* Reset the event as the stopped event */
-  hook->event->hook = rt_export_stopped;
+  hook->event.hook = hook->table->class->done;
   hook->stopped = stopped;
 
   /* Update export state */
@@ -2253,13 +2279,14 @@ rt_dump_hooks(rtable *tab)
        ih->last_state_change, ih->import_state, ih->stopped);
   }
 
-  struct rt_export_hook *eh;
-  WALK_LIST(eh, tab->exporter.hooks)
+  struct rt_table_export_hook *eh;
+  WALK_LIST(eh, tab->exporter.e.hooks)
   {
-    eh->req->dump_req(eh->req);
+    eh->h.req->dump_req(eh->h.req);
     debug("  Export hook %p requested by %p:"
        " refeed_pending=%u last_state_change=%t export_state=%u\n",
-       eh, eh->req, eh->refeed_pending, eh->last_state_change, atomic_load_explicit(&eh->export_state, memory_order_relaxed));
+       eh, eh->h.req, eh->refeed_pending, eh->h.last_state_change,
+       atomic_load_explicit(&eh->h.export_state, memory_order_relaxed));
   }
   debug("\n");
 }
@@ -2303,7 +2330,7 @@ rt_schedule_prune(rtable *tab)
 }
 
 static void
-rt_export_used(struct rt_exporter *e)
+rt_export_used(struct rt_table_exporter *e)
 {
   rtable *tab = SKIP_BACK(rtable, exporter, e);
 
@@ -2426,15 +2453,15 @@ rt_flowspec_dump_req(struct rt_export_request *req)
 static struct rt_flowspec_link *
 rt_flowspec_find_link(rtable *src, rtable *dst)
 {
-  struct rt_export_hook *hook; node *n;
-  WALK_LIST2(hook, n, src->exporter.hooks, n)
-    switch (atomic_load_explicit(&hook->export_state, memory_order_acquire))
+  struct rt_table_export_hook *hook; node *n;
+  WALK_LIST2(hook, n, src->exporter.e.hooks, h.n)
+    switch (atomic_load_explicit(&hook->h.export_state, memory_order_acquire))
     {
       case TES_FEEDING:
       case TES_READY:
-	if (hook->req->export_one == rt_flowspec_export_one)
+	if (hook->h.req->export_one == rt_flowspec_export_one)
 	{
-	  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, hook->req);
+	  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, hook->h.req);
 	  if (ln->dst == dst)
 	    return ln;
 	}
@@ -2467,7 +2494,7 @@ rt_flowspec_link(rtable *src, rtable *dst)
       .export_one = rt_flowspec_export_one,
     };
 
-    rt_request_export(&src->exporter, &ln->req);
+    rt_request_export(src, &ln->req);
   }
 
   ln->uc++;
@@ -2544,6 +2571,18 @@ static struct resclass rt_class = {
   .memsize = NULL,
 };
 
+static const struct rt_exporter_class rt_table_exporter_class = {
+  .start = rt_table_export_start,
+  .stop = rt_table_export_stop,
+  .done = rt_table_export_done,
+};
+
+void
+rt_exporter_init(struct rt_exporter *e)
+{
+  init_list(&e->hooks);
+}
+
 rtable *
 rt_setup(pool *pp, struct rtable_config *cf)
 {
@@ -2568,17 +2607,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
     t->fib.init = net_init_with_trie;
   }
 
-  t->exporter = (struct rt_exporter) {
-    .addr_type = t->addr_type,
-    .start = rt_table_export_start,
-    .stop = rt_table_export_stop,
-    .done = rt_table_export_done,
-    .used = rt_export_used,
-  };
-
-  init_list(&t->exporter.hooks);
-  init_list(&t->exporter.pending);
-
   init_list(&t->imports);
 
   hmap_init(&t->id_map, p, 1024);
@@ -2587,9 +2615,21 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->rt_event = ev_new_init(p, rt_event, t);
   t->uncork_event = ev_new_init(p, rt_uncork_event, t);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
-  t->exporter.export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
-  t->exporter.next_seq = 1;
+
+  t->exporter = (struct rt_table_exporter) {
+    .e = {
+      .class = &rt_table_exporter_class,
+      .addr_type = t->addr_type,
+      .rp = t->rp,
+    },
+    .export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0),
+    .next_seq = 1,
+  };
+
+  rt_exporter_init(&t->exporter.e);
+
+  init_list(&t->exporter.pending);
 
   t->cork_threshold = cf->cork_threshold;
 
@@ -2781,7 +2821,7 @@ again:
     }
 
   /* In some cases, we may want to directly proceed to export cleanup */
-  if (EMPTY_LIST(tab->exporter.hooks) && flushed_channels)
+  if (EMPTY_LIST(tab->exporter.e.hooks) && flushed_channels)
     rt_export_cleanup(tab);
 }
 
@@ -2795,11 +2835,11 @@ rt_export_cleanup(rtable *tab)
   struct rt_pending_export *first = tab->exporter.first;
   int want_prune = 0;
 
-  struct rt_export_hook *eh;
+  struct rt_table_export_hook *eh;
   node *n;
-  WALK_LIST2(eh, n, tab->exporter.hooks, n)
+  WALK_LIST2(eh, n, tab->exporter.e.hooks, h.n)
   {
-    switch (atomic_load_explicit(&eh->export_state, memory_order_acquire))
+    switch (atomic_load_explicit(&eh->h.export_state, memory_order_acquire))
     {
       case TES_DOWN:
 	continue;
@@ -2832,9 +2872,9 @@ rt_export_cleanup(rtable *tab)
       tab->exporter.first ? tab->exporter.first->seq : 0,
       min_seq);
 
-  WALK_LIST2(eh, n, tab->exporter.hooks, n)
+  WALK_LIST2(eh, n, tab->exporter.e.hooks, h.n)
   {
-    if (atomic_load_explicit(&eh->export_state, memory_order_acquire) != TES_READY)
+    if (atomic_load_explicit(&eh->h.export_state, memory_order_acquire) != TES_READY)
       continue;
 
     struct rt_pending_export *last = atomic_load_explicit(&eh->last_export, memory_order_acquire);
@@ -2908,13 +2948,13 @@ rt_export_cleanup(rtable *tab)
 	rt_trace(tab, D_EVENTS, "Resetting export seq");
 
 	node *n;
-	WALK_LIST2(eh, n, tab->exporter.hooks, n)
+	WALK_LIST2(eh, n, tab->exporter.e.hooks, h.n)
 	{
-	  if (atomic_load_explicit(&eh->export_state, memory_order_acquire) != TES_READY)
+	  if (atomic_load_explicit(&eh->h.export_state, memory_order_acquire) != TES_READY)
 	    continue;
 
 	  ASSERT_DIE(atomic_load_explicit(&eh->last_export, memory_order_acquire) == NULL);
-	  bmap_reset(&eh->seq_map, 1024);
+	  bmap_reset(&eh->h.seq_map, 1024);
 	}
 
 	tab->exporter.next_seq = 1;
@@ -3667,10 +3707,10 @@ rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old
   if (tab->hostcache)
     tab->hostcache->req.trace_routes = new->debug;
 
-  struct rt_export_hook *hook; node *n;
-  WALK_LIST2(hook, n, tab->exporter.hooks, n)
-    if (hook->req->export_one == rt_flowspec_export_one)
-      hook->req->trace_routes = new->debug;
+  struct rt_table_export_hook *hook; node *n;
+  WALK_LIST2(hook, n, tab->exporter.e.hooks, h.n)
+    if (hook->h.req->export_one == rt_flowspec_export_one)
+      hook->h.req->trace_routes = new->debug;
 
   tab->cork_threshold = new->cork_threshold;
 
@@ -3745,7 +3785,7 @@ rt_commit(struct config *new, struct config *old)
 static void
 rt_feed_done(struct rt_export_hook *c)
 {
-  c->event->hook = rt_export_hook;
+  c->event.hook = rt_export_hook;
 
   rt_set_export_state(c, TES_READY);
 
@@ -3764,12 +3804,12 @@ rt_feed_done(struct rt_export_hook *c)
 static void
 rt_feed_by_fib(void *data)
 {
-  struct rt_export_hook *c = data;
+  struct rt_table_export_hook *c = data;
 
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
-  ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
+  ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
   rtable *tab = SKIP_BACK(rtable, exporter, c->table);
 
@@ -3778,25 +3818,25 @@ rt_feed_by_fib(void *data)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  rt_send_export_event(c);
+	  rt_send_export_event(&c->h);
 	  return;
 	}
 
-      if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_FEEDING)
+      if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
 	return;
 
-      if ((c->req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->req->addr))
+      if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
 	max_feed -= rt_feed_net(c, n);
     }
   FIB_ITERATE_END;
 
-  rt_feed_done(c);
+  rt_feed_done(&c->h);
 }
 
 static void
 rt_feed_by_trie(void *data)
 {
-  struct rt_export_hook *c = data;
+  struct rt_table_export_hook *c = data;
   rtable *tab = SKIP_BACK(rtable, exporter, c->table);
 
   ASSERT_DIE(c->walk_state);
@@ -3804,7 +3844,7 @@ rt_feed_by_trie(void *data)
 
   int max_feed = 256;
 
-  ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
+  ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
   net_addr addr;
   while (trie_walk_next(ws, &addr))
@@ -3816,7 +3856,7 @@ rt_feed_by_trie(void *data)
     if ((max_feed -= rt_feed_net(c, n)) <= 0)
       return;
 
-    if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_FEEDING)
+    if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
       return;
   }
 
@@ -3826,65 +3866,65 @@ rt_feed_by_trie(void *data)
   mb_free(c->walk_state);
   c->walk_state = NULL;
 
-  rt_feed_done(c);
+  rt_feed_done(&c->h);
 }
 
 static void
 rt_feed_equal(void *data)
 {
-  struct rt_export_hook *c = data;
+  struct rt_table_export_hook *c = data;
   rtable *tab = SKIP_BACK(rtable, exporter, c->table);
 
-  ASSERT_DIE(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
-  ASSERT_DIE(c->req->addr_mode == TE_ADDR_EQUAL);
+  ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
+  ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
 
-  net *n = net_find(tab, c->req->addr);
+  net *n = net_find(tab, c->h.req->addr);
   if (n)
     rt_feed_net(c, n);
 
-  rt_feed_done(c);
+  rt_feed_done(&c->h);
 }
 
 static void
 rt_feed_for(void *data)
 {
-  struct rt_export_hook *c = data;
+  struct rt_table_export_hook *c = data;
   rtable *tab = SKIP_BACK(rtable, exporter, c->table);
 
-  ASSERT_DIE(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
-  ASSERT_DIE(c->req->addr_mode == TE_ADDR_FOR);
+  ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
+  ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
 
-  net *n = net_route(tab, c->req->addr);
+  net *n = net_route(tab, c->h.req->addr);
   if (n)
     rt_feed_net(c, n);
 
-  rt_feed_done(c);
+  rt_feed_done(&c->h);
 }
 
 static uint
-rt_feed_net(struct rt_export_hook *c, net *n)
+rt_feed_net(struct rt_table_export_hook *c, net *n)
 {
   uint count = 0;
 
-  if (c->req->export_bulk)
+  if (c->h.req->export_bulk)
   {
     count = rte_feed_count(n);
     if (count)
     {
       rte **feed = alloca(count * sizeof(rte *));
       rte_feed_obtain(n, feed, count);
-      c->req->export_bulk(c->req, n->n.addr, NULL, feed, count);
+      c->h.req->export_bulk(c->h.req, n->n.addr, NULL, feed, count);
     }
   }
 
   else if (n->routes)
   {
     struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
-    c->req->export_one(c->req, n->n.addr, &rpe);
+    c->h.req->export_one(c->h.req, n->n.addr, &rpe);
     count = 1;
   }
 
-  rpe_mark_seen_all(c, n->first, NULL);
+  rpe_mark_seen_all(&c->h, n->first, NULL);
   return count;
 }
 
@@ -4072,7 +4112,7 @@ rt_init_hostcache(rtable *tab)
     .export_one = hc_notify_export_one,
   };
 
-  rt_request_export(&tab->exporter, &hc->req);
+  rt_request_export(tab, &hc->req);
 
   tab->hostcache = hc;
 }
diff --git a/nest/rt.h b/nest/rt.h
index 78585c79..a14c23e7 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -67,16 +67,23 @@ struct rtable_config {
 
 struct rt_export_hook;
 struct rt_export_request;
+struct rt_exporter;
+
+struct rt_exporter_class {
+  void (*start)(struct rt_exporter *, struct rt_export_request *);
+  void (*stop)(struct rt_export_hook *);
+  void (*done)(void *_rt_export_hook);
+};
 
 struct rt_exporter {
+  const struct rt_exporter_class *class;
+  pool *rp;
   list hooks;				/* Registered route export hooks */
   uint addr_type;			/* Type of address data exported (NET_*) */
+};
 
-  struct rt_export_hook *(*start)(struct rt_exporter *, struct rt_export_request *);
-  void (*stop)(struct rt_export_hook *);
-  void (*done)(struct rt_export_hook *);
-  void (*used)(struct rt_exporter *);
-
+struct rt_table_exporter {
+  struct rt_exporter e;
   list pending;				/* List of packed struct rt_pending_export */
   struct timer *export_timer;
 
@@ -97,7 +104,7 @@ typedef struct rtable {
   u32 rt_count;				/* Number of routes in the table */
 
   list imports;				/* Registered route importers */
-  struct rt_exporter exporter;		/* Exporter API structure */
+  struct rt_table_exporter exporter;	/* Exporter API structure */
 
   struct hmap id_map;
   struct hostcache *hostcache;
@@ -266,29 +273,39 @@ struct rt_export_hook {
     u32 withdraws_received;		/* Number of route withdraws received */
   } stats;
 
+  btime last_state_change;		/* Time of last state transition */
+
+  _Atomic u8 export_state;		/* Route export state (TES_*, see below) */
+  struct event event;			/* Event running all the export operations */
+
+  struct bmap seq_map;			/* Keep track which exports were already procesed */
+
+  void (*stopped)(struct rt_export_request *);	/* Stored callback when export is stopped */
+};
+
+struct rt_table_export_hook {
+  union {
+    struct rt_export_hook h;
+    struct {				/* Overriding the parent structure beginning */
+      node _n;
+      struct rt_table_exporter *table;
+    };
+  };
+  
   union {
     struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
     struct {
       struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
       struct f_trie *walk_lock;			/* Locked trie for walking */
     };
-    u32 hash_iter;				/* Iterator over hash */
   };
 
-  struct bmap seq_map;			/* Keep track which exports were already procesed */
-
-  struct rt_pending_export * _Atomic last_export;/* Last export processed */
+  struct rt_pending_export *_Atomic last_export;/* Last export processed */
   struct rt_pending_export *rpe_next;	/* Next pending export to process */
 
-  btime last_state_change;		/* Time of last state transition */
-
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
-  _Atomic u8 export_state;		/* Route export state (TES_*, see below) */
   u8 feed_type;				/* Which feeding method is used (TFT_*, see below) */
 
-  struct event *event;			/* Event running all the export operations */
-
-  void (*stopped)(struct rt_export_request *);	/* Stored callback when export is stopped */
 };
 
 #define TIS_DOWN	0
@@ -317,7 +334,8 @@ struct rt_export_hook {
 #define TFT_HASH	3
 
 void rt_request_import(rtable *tab, struct rt_import_request *req);
-void rt_request_export(struct rt_exporter *tab, struct rt_export_request *req);
+void rt_request_export(rtable *tab, struct rt_export_request *req);
+void rt_request_export_other(struct rt_exporter *tab, struct rt_export_request *req);
 
 void rt_export_once(struct rt_exporter *tab, struct rt_export_request *req);
 
@@ -334,6 +352,10 @@ void rt_set_export_state(struct rt_export_hook *hook, u8 state);
 
 void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, struct rte_src *src);
 
+/*
+ * For table export processing
+ */
+
 /* Get next rpe. If src is given, it must match. */
 struct rt_pending_export *rpe_next(struct rt_pending_export *rpe, struct rte_src *src);
 
@@ -350,6 +372,15 @@ void rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 /* Get pending export seen status */
 int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
+/*
+ * For rt_export_hook and rt_exporter inheritance
+ */
+
+void rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook);
+struct rt_export_hook *rt_alloc_export(struct rt_exporter *re, uint size);
+void rt_export_stopped(void *data);
+void rt_exporter_init(struct rt_exporter *re);
+
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
 #define RA_OPTIMAL	1		/* Announcement of optimal route change */
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 84a0b023..dcced164 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1867,25 +1867,30 @@ bgp_free_pending_tx(struct bgp_channel *c)
  *	Prefix hash table exporter
  */
 
+struct bgp_out_export_hook {
+  struct rt_export_hook h;
+  u32 hash_iter;				/* Iterator over hash */
+};
+
 static void
 bgp_out_table_feed(void *data)
 {
-  struct rt_export_hook *hook = data;
-  struct bgp_channel *bc = SKIP_BACK(struct bgp_channel, prefix_exporter, hook->table);
+  struct bgp_out_export_hook *hook = data;
+  struct bgp_channel *bc = SKIP_BACK(struct bgp_channel, prefix_exporter, hook->h.table);
   struct bgp_pending_tx *c = bc->ptx;
 
   int max = 512;
 
-  const net_addr *neq = (hook->req->addr_mode == TE_ADDR_EQUAL) ? hook->req->addr : NULL;
+  const net_addr *neq = (hook->h.req->addr_mode == TE_ADDR_EQUAL) ? hook->h.req->addr : NULL;
   const net_addr *cand = NULL;
 
   do {
     HASH_WALK_ITER(c->prefix_hash, PXH, n, hook->hash_iter)
     {
-      switch (hook->req->addr_mode)
+      switch (hook->h.req->addr_mode)
       {
 	case TE_ADDR_IN:
-	  if (!net_in_netX(n->net, hook->req->addr))
+	  if (!net_in_netX(n->net, hook->h.req->addr))
 	    continue;
 	  /* fall through */
 	case TE_ADDR_NONE:
@@ -1897,7 +1902,7 @@ bgp_out_table_feed(void *data)
 	case TE_ADDR_FOR:
 	  if (!neq)
 	  {
-	    if (net_in_netX(hook->req->addr, n->net) && (!cand || (n->net->length > cand->length)))
+	    if (net_in_netX(hook->h.req->addr, n->net) && (!cand || (n->net->length > cand->length)))
 	      cand = n->net;
 	    continue;
 	  }
@@ -1942,13 +1947,13 @@ bgp_out_table_feed(void *data)
 	.new = &es, .new_best = &es,
       };
 
-      if (hook->req->export_bulk)
+      if (hook->h.req->export_bulk)
       {
 	rte *feed = &es.rte;
-	hook->req->export_bulk(hook->req, n->net, &rpe, &feed, 1);
+	hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &feed, 1);
       }
-      else if (hook->req->export_one)
-	hook->req->export_one(hook->req, n->net, &rpe);
+      else if (hook->h.req->export_one)
+	hook->h.req->export_one(hook->h.req, n->net, &rpe);
       else
 	bug("No export method in export request");
     }
@@ -1959,43 +1964,40 @@ bgp_out_table_feed(void *data)
   } while (neq);
 
   if (hook->hash_iter)
-    ev_schedule_work(hook->event);
+    ev_schedule_work(&hook->h.event);
   else
-    rt_set_export_state(hook, TES_READY);
-}
-
-static struct rt_export_hook *
-bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req UNUSED)
-{
-  struct bgp_channel *bc = SKIP_BACK(struct bgp_channel, prefix_exporter, re);
-  pool *p = rp_new(bc->c.proto->pool, "Export hook");
-  struct rt_export_hook *hook = mb_allocz(p, sizeof(struct rt_export_hook));
-  hook->pool = p;
-  hook->event = ev_new_init(p, bgp_out_table_feed, hook);
-  hook->feed_type = TFT_HASH;
-
-  return hook;
+    rt_set_export_state(&hook->h, TES_READY);
 }
 
 static void
-bgp_out_table_export_done(struct rt_export_hook *hook)
+bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 {
-  rfree(hook->pool);
+  req->hook = rt_alloc_export(re, sizeof(struct bgp_out_export_hook));
+  req->hook->req = req;
+
+  struct bgp_out_export_hook *hook = SKIP_BACK(struct bgp_out_export_hook, h, req->hook);
+
+  hook->h.event.hook = bgp_out_table_feed;
+  rt_init_export(re, req->hook);
 }
 
+static const struct rt_exporter_class bgp_out_table_export_class = {
+  .start = bgp_out_table_export_start,
+  .done = rt_export_stopped,
+};
+
 void
 bgp_setup_out_table(struct bgp_channel *c)
 {
   ASSERT_DIE(c->c.out_table == NULL);
 
   c->prefix_exporter = (struct rt_exporter) {
+    .class = &bgp_out_table_export_class,
     .addr_type = c->c.table->addr_type,
-    .start = bgp_out_table_export_start,
-    .done = bgp_out_table_export_done,
+    .rp = c->c.proto->pool,
   };
 
-  init_list(&c->prefix_exporter.hooks);
-  init_list(&c->prefix_exporter.pending);
+  rt_exporter_init(&c->prefix_exporter);
 
   c->c.out_table = &c->prefix_exporter;
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 97b18fcf..573e3d25 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -847,7 +847,7 @@ bgp_graceful_restart_feed(struct bgp_channel *c)
     .export_one = bgp_graceful_restart_drop_export,
   };
 
-  rt_request_export(&c->c.table->exporter, &c->stale_feed);
+  rt_request_export(c->c.table, &c->stale_feed);
 }
 
 

From 28accd4f05e9c153d702736f3e08fa66e81a5536 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 5 Sep 2022 12:55:36 +0200
Subject: [PATCH 189/431] Next hop update triggered at the very end of
 hostcache update

---
 nest/rt-table.c | 19 +++++++++++++++++--
 nest/rt.h       |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index de955ebb..0cca6142 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -103,6 +103,7 @@
 #include "lib/string.h"
 #include "lib/alloca.h"
 #include "lib/flowspec.h"
+#include "lib/idm.h"
 
 #ifdef CONFIG_BGP
 #include "proto/bgp/bgp.h"
@@ -2420,7 +2421,7 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
   rtable *dst = ln->dst;
   ASSUME(rt_is_flow(dst));
 
-  /* No need to inspect it further if recalculation is already active */
+  /* No need to inspect it further if recalculation is already scheduled */
   if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY)
       || !trie_match_net(dst->flowspec_trie, net))
   {
@@ -2583,6 +2584,9 @@ rt_exporter_init(struct rt_exporter *e)
   init_list(&e->hooks);
 }
 
+static struct idm rtable_idm;
+uint rtable_max_id = 0;
+
 rtable *
 rt_setup(pool *pp, struct rtable_config *cf)
 {
@@ -2596,6 +2600,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
   t->name = cf->name;
   t->config = cf;
   t->addr_type = cf->addr_type;
+  t->id = idm_alloc(&rtable_idm);
+  if (t->id >= rtable_max_id)
+    rtable_max_id = t->id + 1;
 
   fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
 
@@ -2659,6 +2666,7 @@ rt_init(void)
   init_list(&deleted_routing_tables);
   ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release");
   rt_cork.run = (event) { .hook = rt_cork_release_hook };
+  idm_init(&rtable_idm, rt_table_pool, 256);
 }
 
 
@@ -4247,6 +4255,9 @@ rt_update_hostcache(void *data)
     return;
   }
 
+  /* Destination schedule map */
+  rtable **nhu_pending = tmp_allocz(sizeof(rtable *) * rtable_max_id);
+
   struct hostentry *he;
   node *n, *x;
 
@@ -4264,8 +4275,12 @@ rt_update_hostcache(void *data)
 	}
 
       if (rt_update_hostentry(tab, he))
-	rt_schedule_nhu(he->tab);
+	nhu_pending[he->tab->id] = he->tab;
     }
+
+  for (uint i=0; i<rtable_max_id; i++)
+    if (nhu_pending[i])
+      rt_schedule_nhu(nhu_pending[i]);
 }
 
 static struct hostentry *
diff --git a/nest/rt.h b/nest/rt.h
index a14c23e7..b94024fd 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -91,6 +91,8 @@ struct rt_table_exporter {
   u64 next_seq;				/* The next export will have this ID */
 };
 
+extern uint rtable_max_id;
+
 typedef struct rtable {
   resource r;
   node n;				/* Node in list of all tables */
@@ -100,6 +102,7 @@ typedef struct rtable {
   struct f_trie *trie;			/* Trie of prefixes defined in fib */
   char *name;				/* Name of this table */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
+  uint id;				/* Integer table ID for fast lookup */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 

From a61a04b5c8fcfccf491f7f9baebab352c3692f54 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 6 Sep 2022 19:38:40 +0200
Subject: [PATCH 190/431] Next hop refactoring to allow for table locking

---
 nest/rt-table.c | 139 +++++++++++++++++++++++++++++-------------------
 1 file changed, 83 insertions(+), 56 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 0cca6142..07933332 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -181,7 +181,6 @@ const char *rt_export_state_name(u8 state)
     return rt_export_state_name_array[state];
 }
 
-static inline struct rte_storage *rt_next_hop_update_rte(rtable *tab, net *n, rte *old);
 static struct hostentry *rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 
 #define rt_trace(tab, level, fmt, args...)  do {\
@@ -3250,17 +3249,16 @@ rta_next_hop_outdated(ea_list *a)
     ? head : NULL;
 }
 
-static inline struct rte_storage *
-rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
+static inline int
+rt_next_hop_update_rte(rte *old, rte *new)
 {
   struct hostentry_adata *head = rta_next_hop_outdated(old->attrs);
   if (!head)
-    return NULL;
+    return 0;
 
-  rte e0 = *old;
-  rta_apply_hostentry(&e0.attrs, head);
-
-  return rte_store(&e0, n, tab);
+  *new = *old;
+  rta_apply_hostentry(&new->attrs, head);
+  return 1;
 }
 
 static inline void
@@ -3392,31 +3390,30 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
 
 #endif /* CONFIG_BGP */
 
-static struct rte_storage *
-rt_flowspec_update_rte(rtable *tab, net *n, rte *r)
+static int
+rt_flowspec_update_rte(rtable *tab, rte *r, rte *new)
 {
 #ifdef CONFIG_BGP
   if (r->generation || (rt_get_source_attr(r) != RTS_BGP))
-    return NULL;
+    return 0;
 
   struct bgp_channel *bc = (struct bgp_channel *) SKIP_BACK(struct channel, in_req, r->sender->req);
   if (!bc->base_table)
-    return NULL;
+    return 0;
 
   struct bgp_proto *p = SKIP_BACK(struct bgp_proto, p, bc->c.proto);
 
   enum flowspec_valid old = rt_get_flowspec_valid(r),
-		      valid = rt_flowspec_check(bc->base_table, tab, n->n.addr, r->attrs, p->is_interior);
+		      valid = rt_flowspec_check(bc->base_table, tab, r->net, r->attrs, p->is_interior);
 
   if (old == valid)
-    return NULL;
+    return 0;
 
-  rte new = *r;
-  ea_set_attr_u32(&new.attrs, &ea_gen_flowspec_valid, 0, valid);
-
-  return rte_store(&new, n, tab);
+  *new = *r;
+  ea_set_attr_u32(&new->attrs, &ea_gen_flowspec_valid, 0, valid);
+  return 1;
 #else
-  return NULL;
+  return 0;
 #endif
 }
 
@@ -3453,8 +3450,7 @@ rt_flowspec_resolve_rte(rte *r, struct channel *c)
 static inline int
 rt_next_hop_update_net(rtable *tab, net *n)
 {
-  struct rte_storage *new;
-  int count = 0;
+  uint count = 0;
   int is_flow = net_is_flow(n->n.addr);
 
   struct rte_storage *old_best = n->routes;
@@ -3462,49 +3458,71 @@ rt_next_hop_update_net(rtable *tab, net *n)
     return 0;
 
   for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
-    if (is_flow || rta_next_hop_outdated(e->rte.attrs))
-      count++;
+    count++;
 
   if (!count)
     return 0;
 
   struct rte_multiupdate {
-    struct rte_storage *old, *new;
-  } *updates = alloca(sizeof(struct rte_multiupdate) * count);
+    struct rte_storage *old, *new_stored;
+    rte new;
+  } *updates = tmp_allocz(sizeof(struct rte_multiupdate) * (count+1));
 
-  int pos = 0;
+  //struct rt_pending_export *last_pending = n->last;
+
+  uint pos = 0;
   for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
-    if (is_flow || rta_next_hop_outdated(e->rte.attrs))
+    updates[pos++].old = e;
+
+  uint mod = 0;
+  if (is_flow)
+    for (uint i = 0; i < pos; i++)
+      mod += rt_flowspec_update_rte(tab, &updates[i].old->rte, &updates[i].new);
+
+  else
+    for (uint i = 0; i < pos; i++)
+      mod += rt_next_hop_update_rte(&updates[i].old->rte, &updates[i].new);
+
+  if (!mod)
+    return 0;
+
+  /* Next commit: Here check whether the network hasn't changed while generating updates */
+
+  for (uint i = 0; i < pos; i++)
+    if (updates[i].new.attrs)
       {
-	struct rte_storage *new = is_flow
-	  ? rt_flowspec_update_rte(tab, n, &e->rte)
-	  : rt_next_hop_update_rte(tab, n, &e->rte);
-
-	if (!new)
-	  continue;
-
 	/* Call a pre-comparison hook */
 	/* Not really an efficient way to compute this */
-	if (e->rte.src->owner->rte_recalculate)
-	  e->rte.src->owner->rte_recalculate(tab, n, &new->rte, &e->rte, &old_best->rte);
-
-	updates[pos++] = (struct rte_multiupdate) {
-	  .old = e,
-	  .new = new,
-	};
-
-	/* Replace the route in the list */
-	new->next = e->next;
-	*k = e = new;
+	if (updates[i].old->rte.src->owner->rte_recalculate)
+	  updates[i].old->rte.src->owner->rte_recalculate(tab, n, &updates[i].new, &updates[i].old->rte, &old_best->rte);
+	/* And store the route */
+	struct rte_storage *ns = updates[i].new_stored = rte_store(&updates[i].new, n, tab);
 
 	/* Get a new ID for the route */
-	new->rte.lastmod = current_time();
-	new->rte.id = hmap_first_zero(&tab->id_map);
-	hmap_set(&tab->id_map, new->rte.id);
+	ns->rte.lastmod = current_time();
+	ns->rte.id = hmap_first_zero(&tab->id_map);
+	hmap_set(&tab->id_map, ns->rte.id);
       }
 
-  ASSERT_DIE(pos <= count);
-  count = pos;
+  /* Now we reconstruct the original linked list */
+  struct rte_storage **nptr = &n->routes;
+  for (uint i = 0; i < pos; i++)
+  {
+    updates[i].old->next = NULL;
+
+    struct rte_storage *put = updates[i].new_stored ?: updates[i].old;
+    *nptr = put;
+    nptr = &put->next;
+  }
+  *nptr = NULL;
+
+  {
+    uint t = 0;
+    for (struct rte_storage *e = n->routes; e; e = e->next)
+      t++;
+    ASSERT_DIE(t == pos);
+    ASSERT_DIE(pos == count);
+  }
 
   /* Find the new best route */
   struct rte_storage **new_best = NULL;
@@ -3515,7 +3533,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
     }
 
   /* Relink the new best route to the first position */
-  new = *new_best;
+  struct rte_storage *new = *new_best;
   if (new != n->routes)
     {
       *new_best = new->next;
@@ -3523,19 +3541,25 @@ rt_next_hop_update_net(rtable *tab, net *n)
       n->routes = new;
     }
 
+  uint total = 0;
   /* Announce the changes */
-  for (int i=0; i<count; i++)
+  for (uint i=0; i<count; i++)
   {
-    _Bool nb = (new == updates[i].new), ob = (old_best == updates[i].old);
+    if (!updates[i].new_stored)
+      continue;
+
+    _Bool nb = (new->rte.src == updates[i].new.src), ob = (i == 0);
     const char *best_indicator[2][2] = {
       { "autoupdated", "autoupdated [-best]" },
       { "autoupdated [+best]", "autoupdated [best]" }
     };
-    rt_rte_trace_in(D_ROUTES, updates[i].new->rte.sender->req, &updates[i].new->rte, best_indicator[nb][ob]);
-    rte_announce(tab, n, updates[i].new, updates[i].old, new, old_best);
+    rt_rte_trace_in(D_ROUTES, updates[i].new.sender->req, &updates[i].new, best_indicator[nb][ob]);
+    rte_announce(tab, n, updates[i].new_stored, updates[i].old, new, old_best);
+
+    total++;
   }
 
-  return count;
+  return total;
 }
 
 static void
@@ -3564,7 +3588,10 @@ rt_next_hop_update(rtable *tab)
 	  ev_schedule(tab->rt_event);
 	  return;
 	}
+      lp_state lps;
+      lp_save(tmp_linpool, &lps);
       max_feed -= rt_next_hop_update_net(tab, n);
+      lp_restore(tmp_linpool, &lps);
     }
   FIB_ITERATE_END;
 

From e2c612063649cb5134459ab0a2c7377f00d6e9c0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 7 Sep 2022 13:12:44 +0200
Subject: [PATCH 191/431] Next hop updater has its own event

---
 nest/rt-table.c | 117 ++++++++++++++++++++++++++----------------------
 nest/rt.h       |   2 +-
 2 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 07933332..eb53eff7 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -130,7 +130,7 @@ struct rt_export_block {
 
 static void rt_free_hostcache(rtable *tab);
 static void rt_update_hostcache(void *tab);
-static void rt_next_hop_update(rtable *tab);
+static void rt_next_hop_update(void *tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(rtable *tab);
@@ -2309,14 +2309,26 @@ rt_dump_hooks_all(void)
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
-  if (tab->nhu_state == NHU_CLEAN)
-    ev_schedule(tab->rt_event);
+  if (tab->nhu_corked)
+  {
+    if (!(tab->nhu_corked & NHU_SCHEDULED))
+    {
+      tab->nhu_corked |= NHU_SCHEDULED;
+      rt_lock_table(tab);
+    }
+  }
+  else if (!(tab->nhu_state & NHU_SCHEDULED))
+  {
+    rt_trace(tab, D_EVENTS, "Scheduling NHU");
+    rt_lock_table(tab);
 
-  /* state change:
-   *   NHU_CLEAN   -> NHU_SCHEDULED
-   *   NHU_RUNNING -> NHU_DIRTY
-   */
-  tab->nhu_state |= NHU_SCHEDULED;
+    /* state change:
+     *   NHU_CLEAN   -> NHU_SCHEDULED
+     *   NHU_RUNNING -> NHU_DIRTY
+     */
+    if ((tab->nhu_state |= NHU_SCHEDULED) == NHU_SCHEDULED)
+      ev_schedule(tab->nhu_event);
+  }
 }
 
 void
@@ -2353,43 +2365,12 @@ rt_event(void *ptr)
   if (tab->export_used)
     rt_export_cleanup(tab);
 
-  if (tab->nhu_corked || tab->nhu_state && rt_cork_check(tab->uncork_event))
-  {
-    if (!tab->nhu_corked)
-    {
-      rt_trace(tab, D_STATES, "Next hop updater corked");
-      if ((tab->nhu_state & NHU_RUNNING)
-	  && !EMPTY_LIST(tab->exporter.pending)
-	  && !tm_active(tab->exporter.export_timer))
-	tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
-    }
-
-    tab->nhu_corked |= tab->nhu_state;
-    tab->nhu_state = 0;
-  }
-
-  if (tab->nhu_state)
-    rt_next_hop_update(tab);
-
   if (tab->prune_state)
     rt_prune_table(tab);
 
   rt_unlock_table(tab);
 }
 
-static void
-rt_uncork_event(void *ptr)
-{
-  rtable *tab = ptr;
-
-  tab->nhu_state |= tab->nhu_corked;
-  tab->nhu_corked = 0;
-
-  rt_trace(tab, D_STATES, "Next hop updater uncorked");
-
-  ev_schedule(tab->rt_event);
-}
-
 static void
 rt_prune_timer(timer *t)
 {
@@ -2619,7 +2600,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   hmap_set(&t->id_map, 0);
 
   t->rt_event = ev_new_init(p, rt_event, t);
-  t->uncork_event = ev_new_init(p, rt_uncork_event, t);
+  t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
 
@@ -3563,29 +3544,56 @@ rt_next_hop_update_net(rtable *tab, net *n)
 }
 
 static void
-rt_next_hop_update(rtable *tab)
+rt_next_hop_update(void *_tab)
 {
+  rtable *tab = _tab;
+
+  /* If called from an uncork hook, reset the state */
+  if (tab->nhu_corked)
+  {
+    ASSERT_DIE(tab->nhu_state == 0);
+    tab->nhu_state = tab->nhu_corked;
+    tab->nhu_corked = 0;
+    rt_trace(tab, D_STATES, "Next hop updater uncorked");
+  }
+
+  if (!tab->nhu_state)
+    bug("Called NHU event for no reason in table %s", tab->name);
+
+  /* Check corkedness */
+  if (rt_cork_check(tab->nhu_event))
+  {
+    rt_trace(tab, D_STATES, "Next hop updater corked");
+    if ((tab->nhu_state & NHU_RUNNING)
+	&& !EMPTY_LIST(tab->exporter.pending)
+	&& !tm_active(tab->exporter.export_timer))
+      tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+
+    tab->nhu_corked = tab->nhu_state;
+    tab->nhu_state = 0;
+    return;
+  }
+
   struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
-  if (tab->nhu_state == NHU_CLEAN)
-    return;
-
+  /* Initialize a new run */
   if (tab->nhu_state == NHU_SCHEDULED)
-    {
-      FIB_ITERATE_INIT(fit, &tab->fib);
-      tab->nhu_state = NHU_RUNNING;
+  {
+    FIB_ITERATE_INIT(fit, &tab->fib);
+    tab->nhu_state = NHU_RUNNING;
 
-      if (tab->flowspec_trie)
-	rt_flowspec_reset_trie(tab);
-    }
+    if (tab->flowspec_trie)
+      rt_flowspec_reset_trie(tab);
+  }
 
+  /* Walk the fib one net after another */
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule(tab->rt_event);
+	  ev_schedule(tab->nhu_event);
 	  return;
 	}
       lp_state lps;
@@ -3595,6 +3603,7 @@ rt_next_hop_update(rtable *tab)
     }
   FIB_ITERATE_END;
 
+  /* Finished NHU, cleanup */
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
 
   if (!tm_active(tab->exporter.export_timer))
@@ -3604,10 +3613,10 @@ rt_next_hop_update(rtable *tab)
    *   NHU_DIRTY   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_CLEAN
    */
-  tab->nhu_state &= 1;
+  if ((tab->nhu_state &= NHU_SCHEDULED) == NHU_SCHEDULED)
+    ev_schedule(tab->nhu_event);
 
-  if (tab->nhu_state != NHU_CLEAN)
-    ev_schedule(tab->rt_event);
+  rt_unlock_table(tab);
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index b94024fd..987a9ff8 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -117,7 +117,7 @@ typedef struct rtable {
 					 * obstacle from this routing table.
 					 */
   struct event *rt_event;		/* Routing table event */
-  struct event *uncork_event;		/* Called when uncork happens */
+  struct event *nhu_event;		/* Specific event for next hop update */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
   btime last_rt_change;			/* Last time when route changed */
   btime gc_time;			/* Time of last GC */

From 5103de4e8ed7f4744326129a4296cf3511b1e1f9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 7 Sep 2022 15:06:22 +0200
Subject: [PATCH 192/431] Table long-locking debug code

---
 nest/rt-table.c | 10 +++++-----
 nest/rt.h       |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index eb53eff7..cdf0fd3e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3680,10 +3680,10 @@ rt_new_table(struct symbol *s, uint addr_type)
  * preventing it from being freed when it gets undefined in a new
  * configuration.
  */
-void
-rt_lock_table(rtable *r)
+void rt_lock_table_debug(rtable *tab, const char *file, uint line)
 {
-  r->use_count++;
+  rt_trace(tab, D_STATES, "Locked at %s:%d", file, line);
+  tab->use_count++;
 }
 
 /**
@@ -3694,9 +3694,9 @@ rt_lock_table(rtable *r)
  * that is decrease its use count and delete it if it's scheduled
  * for deletion by configuration changes.
  */
-void
-rt_unlock_table(rtable *r)
+void rt_unlock_table_debug(rtable *r, const char *file, uint line)
 {
+  rt_trace(r, D_STATES, "Unlocked at %s:%d", file, line);
   if (!--r->use_count && r->deleted)
     {
       struct config *conf = r->deleted;
diff --git a/nest/rt.h b/nest/rt.h
index 987a9ff8..82d74296 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -482,8 +482,12 @@ void rt_init(void);
 void rt_preconfig(struct config *);
 void rt_postconfig(struct config *);
 void rt_commit(struct config *new, struct config *old);
-void rt_lock_table(rtable *);
-void rt_unlock_table(rtable *);
+
+void rt_lock_table_debug(rtable *, const char *file, uint line);
+void rt_unlock_table_debug(rtable *, const char *file, uint line);
+#define rt_lock_table(tab)	rt_lock_table_debug(tab, __FILE__, __LINE__)
+#define rt_unlock_table(tab)	rt_unlock_table_debug(tab, __FILE__, __LINE__)
+
 struct f_trie * rt_lock_trie(rtable *tab);
 void rt_unlock_trie(rtable *tab, struct f_trie *trie);
 void rt_flowspec_link(rtable *src, rtable *dst);

From a42877b9bf09c4c042bced3910ade9b71ce3724c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 7 Sep 2022 20:26:20 +0200
Subject: [PATCH 193/431] Table feed refactoring to allow for locking and
 unlocking

---
 nest/rt-table.c | 153 ++++++++++++++++++++++++++++++++++--------------
 nest/rt.h       |   5 ++
 2 files changed, 113 insertions(+), 45 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index cdf0fd3e..ef06dd7c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -139,7 +139,6 @@ static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
 static void rt_feed_equal(void *);
 static void rt_feed_for(void *);
-static uint rt_feed_net(struct rt_table_export_hook *c, net *n);
 static void rt_check_cork_low(rtable *tab);
 static void rt_check_cork_high(rtable *tab);
 static void rt_cork_release_hook(void *);
@@ -2015,6 +2014,7 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 	hook->walk_lock = rt_lock_trie(tab);
 	trie_walk_init(hook->walk_state, tab->trie, req->addr);
 	hook->h.event.hook = rt_feed_by_trie;
+	hook->walk_last.type = 0;
 	break;
       }
       /* fall through */
@@ -3836,6 +3836,74 @@ rt_feed_done(struct rt_export_hook *c)
   rt_send_export_event(c);
 }
 
+#define MAX_FEED_BLOCK	1024
+typedef struct {
+  uint cnt, pos;
+  union {
+    struct rt_pending_export *rpe;
+    struct {
+      rte **feed;
+      uint *start;
+    };
+  };
+} rt_feed_block;
+
+static int
+rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
+{
+  if (n->routes)
+  {
+    if (c->h.req->export_bulk)
+    {
+      uint cnt = rte_feed_count(n);
+      if (b->cnt && (b->cnt + cnt > MAX_FEED_BLOCK))
+	return 0;
+
+      if (!b->cnt)
+      {
+	b->feed = tmp_alloc(sizeof(rte *) * MAX(MAX_FEED_BLOCK, cnt));
+	b->start = tmp_alloc(sizeof(uint) * ((cnt >= MAX_FEED_BLOCK) ? 2 : (MAX_FEED_BLOCK + 2 - cnt)));
+      }
+
+      rte_feed_obtain(n, &b->feed[b->cnt], cnt);
+      b->start[b->pos++] = b->cnt;
+      b->cnt += cnt;
+    }
+    else if (b->pos == MAX_FEED_BLOCK)
+      return 0;
+    else
+    {
+      if (!b->pos)
+	b->rpe = tmp_alloc(sizeof(struct rt_pending_export) * MAX_FEED_BLOCK);
+
+      b->rpe[b->pos++] = (struct rt_pending_export) { .new = n->routes, .new_best = n->routes };
+    }
+  }
+
+  rpe_mark_seen_all(&c->h, n->first, NULL);
+  return 1;
+}
+
+static void
+rt_process_feed(struct rt_table_export_hook *c, rt_feed_block *b)
+{
+  if (!b->pos)
+    return;
+
+  if (c->h.req->export_bulk)
+  {
+    b->start[b->pos] = b->cnt;
+    for (uint p = 0; p < b->pos; p++)
+    {
+      rte **feed = &b->feed[b->start[p]];
+      c->h.req->export_bulk(c->h.req, feed[0]->net, NULL, feed, b->start[p+1] - b->start[p]);
+    }
+  }
+  else
+    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]);
+}
+
 /**
  * rt_feed_by_fib - advertise all routes to a channel by walking a fib
  * @c: channel to be fed
@@ -3851,7 +3919,8 @@ rt_feed_by_fib(void *data)
   struct rt_table_export_hook *c = data;
 
   struct fib_iterator *fit = &c->feed_fit;
-  int max_feed = 256;
+
+  rt_feed_block block = {};
 
   ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
@@ -3859,21 +3928,23 @@ rt_feed_by_fib(void *data)
 
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
-      if (max_feed <= 0)
+      if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
+      {
+	if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
+	  return;
+
+	if (!rt_prepare_feed(c, n, &block))
 	{
 	  FIB_ITERATE_PUT(fit);
+	  rt_process_feed(c, &block);
 	  rt_send_export_event(&c->h);
 	  return;
 	}
-
-      if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
-	return;
-
-      if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
-	max_feed -= rt_feed_net(c, n);
+      }
     }
   FIB_ITERATE_END;
 
+  rt_process_feed(c, &block);
   rt_feed_done(&c->h);
 }
 
@@ -3886,23 +3957,29 @@ rt_feed_by_trie(void *data)
   ASSERT_DIE(c->walk_state);
   struct f_trie_walk_state *ws = c->walk_state;
 
-  int max_feed = 256;
+  rt_feed_block block = {};
 
   ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
-  net_addr addr;
-  while (trie_walk_next(ws, &addr))
-  {
-    net *n = net_find(tab, &addr);
+  do {
+    if (!c->walk_last.type)
+      continue;
+
+    net *n = net_find(tab, &c->walk_last);
     if (!n)
       continue;
 
-    if ((max_feed -= rt_feed_net(c, n)) <= 0)
-      return;
-
     if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
       return;
+
+    if (!rt_prepare_feed(c, n, &block))
+    {
+      rt_process_feed(c, &block);
+      rt_send_export_event(&c->h);
+      return;
+    }
   }
+  while (trie_walk_next(ws, &c->walk_last));
 
   rt_unlock_trie(tab, c->walk_lock);
   c->walk_lock = NULL;
@@ -3910,6 +3987,8 @@ rt_feed_by_trie(void *data)
   mb_free(c->walk_state);
   c->walk_state = NULL;
 
+  c->walk_last.type = 0;
+
   rt_feed_done(&c->h);
 }
 
@@ -3922,9 +4001,14 @@ rt_feed_equal(void *data)
   ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
   ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
 
+  rt_feed_block block = {};
+
   net *n = net_find(tab, c->h.req->addr);
   if (n)
-    rt_feed_net(c, n);
+  {
+    ASSERT_DIE(rt_prepare_feed(c, n, &block));
+    rt_process_feed(c, &block);
+  }
 
   rt_feed_done(&c->h);
 }
@@ -3938,39 +4022,18 @@ rt_feed_for(void *data)
   ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
   ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
 
+  rt_feed_block block = {};
+
   net *n = net_route(tab, c->h.req->addr);
   if (n)
-    rt_feed_net(c, n);
+  {
+    ASSERT_DIE(rt_prepare_feed(c, n, &block));
+    rt_process_feed(c, &block);
+  }
 
   rt_feed_done(&c->h);
 }
 
-static uint
-rt_feed_net(struct rt_table_export_hook *c, net *n)
-{
-  uint count = 0;
-
-  if (c->h.req->export_bulk)
-  {
-    count = rte_feed_count(n);
-    if (count)
-    {
-      rte **feed = alloca(count * sizeof(rte *));
-      rte_feed_obtain(n, feed, count);
-      c->h.req->export_bulk(c->h.req, n->n.addr, NULL, feed, count);
-    }
-  }
-
-  else if (n->routes)
-  {
-    struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
-    c->h.req->export_one(c->h.req, n->n.addr, &rpe);
-    count = 1;
-  }
-
-  rpe_mark_seen_all(&c->h, n->first, NULL);
-  return count;
-}
 
 /*
  *	Import table
diff --git a/nest/rt.h b/nest/rt.h
index 82d74296..7cf8a91f 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -300,6 +300,11 @@ struct rt_table_export_hook {
     struct {
       struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
       struct f_trie *walk_lock;			/* Locked trie for walking */
+      union {					/* Last net visited but not processed */
+	net_addr walk_last;
+	net_addr_ip4 walk_last_ip4;
+	net_addr_ip6 walk_last_ip6;
+      };
     };
   };
 

From fb7fb6744582b2bb74b3b1e32696bd5534e93054 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 7 Sep 2022 13:54:20 +0200
Subject: [PATCH 194/431] Table access is now locked.

---
 filter/f-inst.c   |   2 +-
 lib/birdlib.h     |   3 +-
 lib/route.h       |   4 +-
 nest/config.Y     |   3 +-
 nest/proto.c      |  11 +-
 nest/protocol.h   |   7 +-
 nest/rt-show.c    |  11 +-
 nest/rt-table.c   | 746 ++++++++++++++++++++++++++++------------------
 nest/rt.h         |  87 ++++--
 proto/bfd/bfd.c   |   1 -
 proto/bgp/attrs.c |  15 +-
 proto/bgp/bgp.h   |   2 +-
 proto/mrt/mrt.c   |  39 ++-
 proto/mrt/mrt.h   |   6 +-
 proto/perf/perf.c |   4 +-
 sysdep/unix/krt.c |  21 +-
 16 files changed, 607 insertions(+), 355 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 60042476..426b598f 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -1467,7 +1467,7 @@
     ARG(1, T_NET);
     ARG(2, T_INT);
     RTC(3);
-    struct rtable *table = rtc->table;
+    rtable *table = rtc->table;
 
     u32 as = v2.val.i;
 
diff --git a/lib/birdlib.h b/lib/birdlib.h
index d55b1a44..d743ecdf 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -14,8 +14,9 @@
 
 /* Ugly structure offset handling macros */
 
+#define SAME_TYPE(a, b)	({ int _ = ((a) != (b)); !_; })
 #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
-#define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); ASSERT_DIE(&_ptr->i == p); _ptr; })
+#define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); SAME_TYPE(&_ptr->i, p); _ptr; })
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define CPU_STRUCT_ALIGN  (MAX_(_Alignof(void*), _Alignof(u64)))
 #define BIRD_CPU_ALIGN(s) BIRD_ALIGN((s), CPU_STRUCT_ALIGN)
diff --git a/lib/route.h b/lib/route.h
index f5456396..eae251e7 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -20,7 +20,7 @@
 struct network;
 struct proto;
 struct cli;
-struct rtable;
+struct rtable_private;
 
 typedef struct rte {
   struct ea_list *attrs;		/* Attributes of this route */
@@ -63,7 +63,7 @@ struct rte_owner_class {
 
 struct rte_owner {
   struct rte_owner_class *class;
-  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(struct rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
   HASH(struct rte_src) hash;
   const char *name;
   u32 hash_key;
diff --git a/nest/config.Y b/nest/config.Y
index e8c4aa9a..84c76ae9 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -702,7 +702,8 @@ r_args:
    }
  | r_args IMPORT TABLE channel_arg {
      if (!($4->in_keep & RIK_PREFILTER)) cf_error("No import table in channel %s.%s", $4->proto->name, $4->name);
-     rt_show_add_exporter($$, &$4->table->exporter.e, "import")->prefilter = $4;
+     RT_LOCKED($4->table, tab)
+       rt_show_add_exporter($$, &tab->exporter.e, "import")->prefilter = $4;
      $$->tables_defined_by = RSD_TDB_DIRECT;
    }
  | r_args EXPORT TABLE channel_arg {
diff --git a/nest/proto.c b/nest/proto.c
index 5f4b7b2d..783a936c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -169,7 +169,7 @@ proto_cf_find_channel(struct proto_config *pc, uint net_type)
  * Returns pointer to channel or NULL
  */
 struct channel *
-proto_find_channel_by_table(struct proto *p, struct rtable *t)
+proto_find_channel_by_table(struct proto *p, rtable *t)
 {
   struct channel *c;
 
@@ -376,7 +376,7 @@ channel_dump_roa_req(struct rt_export_request *req)
 {
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
   struct channel *c = s->c;
-  rtable *tab = SKIP_BACK(rtable, exporter.e, req->hook->table);
+  struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter.e, req->hook->table);
 
   debug("  Channel %s.%s ROA %s change notifier from table %s request %p\n",
       c->proto->name, c->name,
@@ -394,7 +394,8 @@ channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
   node *n;
 
   WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
-    if ((s->req.hook->table == &tab->exporter.e) && (s->t.hook == hook))
+    if ((tab == SKIP_BACK(rtable, priv.exporter.e, s->req.hook->table))
+	  && (s->t.hook == hook))
       return 1;
 
   return 0;
@@ -447,7 +448,7 @@ static void
 channel_roa_subscribe_filter(struct channel *c, int dir)
 {
   const struct filter *f = dir ? c->in_filter : c->out_filter;
-  struct rtable *tab;
+  rtable *tab;
   int valid = 1, found = 0;
 
   if ((f == FILTER_ACCEPT) || (f == FILTER_REJECT))
@@ -609,8 +610,6 @@ channel_import_stopped(struct rt_import_request *req)
 {
   struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
-  req->hook = NULL;
-
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
 
diff --git a/nest/protocol.h b/nest/protocol.h
index a3eeb198..e9461d41 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -18,7 +18,6 @@
 
 struct iface;
 struct ifa;
-struct rtable;
 struct rte;
 struct neighbor;
 struct rta;
@@ -189,7 +188,7 @@ struct proto {
    *	   rte_remove	Called whenever a rte is removed from the routing table.
    */
 
-  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(struct rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
   void (*rte_insert)(struct network *, struct rte *);
@@ -482,7 +481,7 @@ struct channel {
   const struct channel_class *channel;
   struct proto *proto;
 
-  struct rtable *table;
+  rtable *table;
   const struct filter *in_filter;	/* Input filter */
   const struct filter *out_filter;	/* Output filter */
   const net_addr *out_subprefix;	/* Export only subprefixes of this net */
@@ -613,7 +612,7 @@ struct channel_config *proto_cf_find_channel(struct proto_config *p, uint net_ty
 static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc)
 { return proto_cf_find_channel(pc, pc->net_type); }
 
-struct channel *proto_find_channel_by_table(struct proto *p, struct rtable *t);
+struct channel *proto_find_channel_by_table(struct proto *p, rtable *t);
 struct channel *proto_find_channel_by_name(struct proto *p, const char *n);
 struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index d17818db..dc88047a 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -354,9 +354,11 @@ rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *
 }
 
 struct rt_show_data_rtable *
-rt_show_add_table(struct rt_show_data *d, struct rtable *t)
+rt_show_add_table(struct rt_show_data *d, rtable *t)
 {
-  struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter.e, t->name);
+  struct rt_show_data_rtable *rsdr;
+  RT_LOCKED(t, tp)
+    rsdr = rt_show_add_exporter(d, &tp->exporter.e, t->name);
 
   struct proto_config *krt = t->config->krt_attached;
   if (krt)
@@ -418,12 +420,13 @@ rt_show_prepare_tables(struct rt_show_data *d)
     /* Ensure there is defined export_channel for each table */
     if (d->export_mode)
     {
+      rtable *rt = SKIP_BACK(rtable, priv.exporter.e, tab->table);
       if (!tab->export_channel && d->export_channel &&
-	  (tab->table == &d->export_channel->table->exporter.e))
+	  (rt == d->export_channel->table))
 	tab->export_channel = d->export_channel;
 
       if (!tab->export_channel && d->export_protocol)
-	tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter.e, tab->table));
+	tab->export_channel = proto_find_channel_by_table(d->export_protocol, rt);
 
       if (!tab->export_channel)
       {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ef06dd7c..95248635 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -128,23 +128,24 @@ struct rt_export_block {
   struct rt_pending_export export[];
 };
 
-static void rt_free_hostcache(rtable *tab);
+static void rt_free_hostcache(struct rtable_private *tab);
 static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(void *tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
-static inline void rt_prune_table(rtable *tab);
-static void rt_kick_prune_timer(rtable *tab);
+static inline void rt_prune_table(struct rtable_private *tab);
+static void rt_kick_prune_timer(struct rtable_private *tab);
 static void rt_feed_by_fib(void *);
 static void rt_feed_by_trie(void *);
 static void rt_feed_equal(void *);
 static void rt_feed_for(void *);
-static void rt_check_cork_low(rtable *tab);
-static void rt_check_cork_high(rtable *tab);
+static void rt_check_cork_low(struct rtable_private *tab);
+static void rt_check_cork_high(struct rtable_private *tab);
 static void rt_cork_release_hook(void *);
+static void rt_delete(void *);
 
 static void rt_export_used(struct rt_table_exporter *);
-static void rt_export_cleanup(rtable *);
+static void rt_export_cleanup(struct rtable_private *tab);
 
 static int rte_same(rte *x, rte *y);
 
@@ -180,10 +181,10 @@ const char *rt_export_state_name(u8 state)
     return rt_export_state_name_array[state];
 }
 
-static struct hostentry *rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
+static struct hostentry *rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep);
 
 #define rt_trace(tab, level, fmt, args...)  do {\
-  rtable *t = (tab);				\
+  struct rtable_private *t = (tab);		\
   if (t->config->debug & (level))		\
     log(L_TRACE "%s: " fmt, t->name, ##args);	\
 } while (0)
@@ -191,7 +192,7 @@ static struct hostentry *rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rt
 static void
 net_init_with_trie(struct fib *f, void *N)
 {
-  rtable *tab = SKIP_BACK(rtable, fib, f);
+  struct rtable_private *tab = SKIP_BACK(struct rtable_private, fib, f);
   net *n = N;
 
   if (tab->trie)
@@ -202,7 +203,7 @@ net_init_with_trie(struct fib *f, void *N)
 }
 
 static inline net *
-net_route_ip4_trie(rtable *t, const net_addr_ip4 *n0)
+net_route_ip4_trie(struct rtable_private *t, const net_addr_ip4 *n0)
 {
   TRIE_WALK_TO_ROOT_IP4(t->trie, n0, n)
   {
@@ -216,7 +217,7 @@ net_route_ip4_trie(rtable *t, const net_addr_ip4 *n0)
 }
 
 static inline net *
-net_route_vpn4_trie(rtable *t, const net_addr_vpn4 *n0)
+net_route_vpn4_trie(struct rtable_private *t, const net_addr_vpn4 *n0)
 {
   TRIE_WALK_TO_ROOT_IP4(t->trie, (const net_addr_ip4 *) n0, px)
   {
@@ -232,7 +233,7 @@ net_route_vpn4_trie(rtable *t, const net_addr_vpn4 *n0)
 }
 
 static inline net *
-net_route_ip6_trie(rtable *t, const net_addr_ip6 *n0)
+net_route_ip6_trie(struct rtable_private *t, const net_addr_ip6 *n0)
 {
   TRIE_WALK_TO_ROOT_IP6(t->trie, n0, n)
   {
@@ -246,7 +247,7 @@ net_route_ip6_trie(rtable *t, const net_addr_ip6 *n0)
 }
 
 static inline net *
-net_route_vpn6_trie(rtable *t, const net_addr_vpn6 *n0)
+net_route_vpn6_trie(struct rtable_private *t, const net_addr_vpn6 *n0)
 {
   TRIE_WALK_TO_ROOT_IP6(t->trie, (const net_addr_ip6 *) n0, px)
   {
@@ -262,7 +263,7 @@ net_route_vpn6_trie(rtable *t, const net_addr_vpn6 *n0)
 }
 
 static inline void *
-net_route_ip6_sadr_trie(rtable *t, const net_addr_ip6_sadr *n0)
+net_route_ip6_sadr_trie(struct rtable_private *t, const net_addr_ip6_sadr *n0)
 {
   TRIE_WALK_TO_ROOT_IP6(t->trie, (const net_addr_ip6 *) n0, px)
   {
@@ -295,7 +296,7 @@ net_route_ip6_sadr_trie(rtable *t, const net_addr_ip6_sadr *n0)
 }
 
 static inline net *
-net_route_ip4_fib(rtable *t, const net_addr_ip4 *n0)
+net_route_ip4_fib(struct rtable_private *t, const net_addr_ip4 *n0)
 {
   net_addr_ip4 n;
   net_copy_ip4(&n, n0);
@@ -311,7 +312,7 @@ net_route_ip4_fib(rtable *t, const net_addr_ip4 *n0)
 }
 
 static inline net *
-net_route_vpn4_fib(rtable *t, const net_addr_vpn4 *n0)
+net_route_vpn4_fib(struct rtable_private *t, const net_addr_vpn4 *n0)
 {
   net_addr_vpn4 n;
   net_copy_vpn4(&n, n0);
@@ -327,7 +328,7 @@ net_route_vpn4_fib(rtable *t, const net_addr_vpn4 *n0)
 }
 
 static inline net *
-net_route_ip6_fib(rtable *t, const net_addr_ip6 *n0)
+net_route_ip6_fib(struct rtable_private *t, const net_addr_ip6 *n0)
 {
   net_addr_ip6 n;
   net_copy_ip6(&n, n0);
@@ -343,7 +344,7 @@ net_route_ip6_fib(rtable *t, const net_addr_ip6 *n0)
 }
 
 static inline net *
-net_route_vpn6_fib(rtable *t, const net_addr_vpn6 *n0)
+net_route_vpn6_fib(struct rtable_private *t, const net_addr_vpn6 *n0)
 {
   net_addr_vpn6 n;
   net_copy_vpn6(&n, n0);
@@ -359,7 +360,7 @@ net_route_vpn6_fib(rtable *t, const net_addr_vpn6 *n0)
 }
 
 static inline void *
-net_route_ip6_sadr_fib(rtable *t, const net_addr_ip6_sadr *n0)
+net_route_ip6_sadr_fib(struct rtable_private *t, const net_addr_ip6_sadr *n0)
 {
   net_addr_ip6_sadr n;
   net_copy_ip6_sadr(&n, n0);
@@ -399,7 +400,7 @@ net_route_ip6_sadr_fib(rtable *t, const net_addr_ip6_sadr *n0)
 }
 
 net *
-net_route(rtable *tab, const net_addr *n)
+net_route(struct rtable_private *tab, const net_addr *n)
 {
   ASSERT(tab->addr_type == n->type);
 
@@ -442,7 +443,7 @@ net_route(rtable *tab, const net_addr *n)
 
 
 static int
-net_roa_check_ip4_trie(rtable *tab, const net_addr_ip4 *px, u32 asn)
+net_roa_check_ip4_trie(struct rtable_private *tab, const net_addr_ip4 *px, u32 asn)
 {
   int anything = 0;
 
@@ -470,7 +471,7 @@ net_roa_check_ip4_trie(rtable *tab, const net_addr_ip4 *px, u32 asn)
 }
 
 static int
-net_roa_check_ip4_fib(rtable *tab, const net_addr_ip4 *px, u32 asn)
+net_roa_check_ip4_fib(struct rtable_private *tab, const net_addr_ip4 *px, u32 asn)
 {
   struct net_addr_roa4 n = NET_ADDR_ROA4(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
@@ -502,7 +503,7 @@ net_roa_check_ip4_fib(rtable *tab, const net_addr_ip4 *px, u32 asn)
 }
 
 static int
-net_roa_check_ip6_trie(rtable *tab, const net_addr_ip6 *px, u32 asn)
+net_roa_check_ip6_trie(struct rtable_private *tab, const net_addr_ip6 *px, u32 asn)
 {
   int anything = 0;
 
@@ -530,7 +531,7 @@ net_roa_check_ip6_trie(rtable *tab, const net_addr_ip6 *px, u32 asn)
 }
 
 static int
-net_roa_check_ip6_fib(rtable *tab, const net_addr_ip6 *px, u32 asn)
+net_roa_check_ip6_fib(struct rtable_private *tab, const net_addr_ip6 *px, u32 asn)
 {
   struct net_addr_roa6 n = NET_ADDR_ROA6(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
@@ -577,24 +578,30 @@ net_roa_check_ip6_fib(rtable *tab, const net_addr_ip6 *px, u32 asn)
  * must have type NET_IP4 or NET_IP6, respectively.
  */
 int
-net_roa_check(rtable *tab, const net_addr *n, u32 asn)
+net_roa_check(rtable *tp, const net_addr *n, u32 asn)
 {
-  if ((tab->addr_type == NET_ROA4) && (n->type == NET_IP4))
+  int out = ROA_UNKNOWN;
+
+  RT_LOCKED(tp, tab)
   {
-    if (tab->trie)
-      return net_roa_check_ip4_trie(tab, (const net_addr_ip4 *) n, asn);
+    if ((tab->addr_type == NET_ROA4) && (n->type == NET_IP4))
+    {
+      if (tab->trie)
+	out = net_roa_check_ip4_trie(tab, (const net_addr_ip4 *) n, asn);
+      else
+	out = net_roa_check_ip4_fib (tab, (const net_addr_ip4 *) n, asn);
+    }
+    else if ((tab->addr_type == NET_ROA6) && (n->type == NET_IP6))
+    {
+      if (tab->trie)
+	out = net_roa_check_ip6_trie(tab, (const net_addr_ip6 *) n, asn);
+      else
+	out = net_roa_check_ip6_fib (tab, (const net_addr_ip6 *) n, asn);
+    }
     else
-      return net_roa_check_ip4_fib (tab, (const net_addr_ip4 *) n, asn);
+      out = ROA_UNKNOWN;	/* Should not happen */
   }
-  else if ((tab->addr_type == NET_ROA6) && (n->type == NET_IP6))
-  {
-    if (tab->trie)
-      return net_roa_check_ip6_trie(tab, (const net_addr_ip6 *) n, asn);
-    else
-      return net_roa_check_ip6_fib (tab, (const net_addr_ip6 *) n, asn);
-  }
-  else
-    return ROA_UNKNOWN;	/* Should not happen */
+  return out;
 }
 
 /**
@@ -618,7 +625,7 @@ rte_find(net *net, struct rte_src *src)
 
 
 struct rte_storage *
-rte_store(const rte *r, net *net, rtable *tab)
+rte_store(const rte *r, net *net, struct rtable_private *tab)
 {
   struct rte_storage *e = sl_alloc(tab->rte_slab);
 
@@ -1164,6 +1171,7 @@ static struct rt_pending_export * rt_next_export_fast(struct rt_pending_export *
 static int
 rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
 {
+  rtable *tab = RT_PUB(SKIP_BACK(struct rtable_private, exporter, th->table));
   struct rt_export_hook *hook = &th->h;
   if (bmap_test(&hook->seq_map, rpe->seq))
     goto ignore;	/* Seen already */
@@ -1202,6 +1210,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
   else if (hook->req->export_bulk)
   {
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+    RT_LOCK(tab);
     uint count = rte_feed_count(net);
     rte **feed = NULL;
     if (count)
@@ -1209,6 +1218,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
       feed = alloca(count * sizeof(rte *));
       rte_feed_obtain(net, feed, count);
     }
+    RT_UNLOCK(tab);
     hook->req->export_bulk(hook->req, n, rpe, feed, count);
   }
   else
@@ -1260,7 +1270,7 @@ ignore:
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce(struct rtable_private *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
   int new_best_valid = rte_is_valid(RTE_OR_NULL(new_best));
@@ -1385,6 +1395,8 @@ rt_next_export_fast(struct rt_pending_export *last)
 static struct rt_pending_export *
 rt_next_export(struct rt_table_export_hook *hook, struct rt_table_exporter *tab)
 {
+  ASSERT_DIE(RT_IS_LOCKED(SKIP_BACK(struct rtable_private, exporter, tab)));
+
   /* As the table is locked, it is safe to reload the last export pointer */
   struct rt_pending_export *last = atomic_load_explicit(&hook->last_export, memory_order_acquire);
 
@@ -1406,41 +1418,47 @@ rt_send_export_event(struct rt_export_hook *hook)
 static void
 rt_announce_exports(timer *tm)
 {
-  rtable *tab = tm->data;
+  RT_LOCKED((rtable *) tm->data, tab)
+    if (!EMPTY_LIST(tab->exporter.pending))
+    {
+      struct rt_export_hook *c; node *n;
+      WALK_LIST2(c, n, tab->exporter.e.hooks, n)
+      {
+	if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_READY)
+	  continue;
 
-  if (EMPTY_LIST(tab->exporter.pending))
-    return;
-
-  struct rt_export_hook *c; node *n;
-  WALK_LIST2(c, n, tab->exporter.e.hooks, n)
-  {
-    if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_READY)
-      continue;
-
-    rt_send_export_event(c);
-  }
+	rt_send_export_event(c);
+      }
+    }
 }
 
 static void
 rt_import_announce_exports(void *_hook)
 {
   struct rt_import_hook *hook = _hook;
-  rtable *tab = hook->table;
-
-
-  if (hook->import_state == TIS_CLEARED)
+  RT_LOCKED(hook->table, tab)
   {
-    rt_trace(tab, D_EVENTS, "Hook %s stopped", hook->req->name);
-    hook->stopped(hook->req);
-    rem_node(&hook->n);
-    mb_free(hook);
-    rt_unlock_table(tab);
+    if (hook->import_state == TIS_CLEARED)
+    {
+      void (*stopped)(struct rt_import_request *) = hook->stopped;
+      struct rt_import_request *req = hook->req;
+      req->hook = NULL;
+
+      rt_trace(tab, D_EVENTS, "Hook %s stopped", req->name);
+      rem_node(&hook->n);
+      mb_free(hook);
+      rt_unlock_table(tab);
+      RT_UNLOCK(tab);
+
+      stopped(req);
+      return;
+    }
+
+    rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
+
+    if (!tm_active(tab->exporter.export_timer))
+      tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
   }
-
-  rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
-
-  if (!tm_active(tab->exporter.export_timer))
-    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
 }
 
 static struct rt_pending_export *
@@ -1465,15 +1483,23 @@ static void
 rt_export_hook(void *_data)
 {
   struct rt_table_export_hook *c = _data;
+  rtable *tab = SKIP_BACK(rtable, priv.exporter, c->table);
 
   ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_READY);
 
   if (!c->rpe_next)
   {
+    RT_LOCK(tab);
     c->rpe_next = rt_next_export(c, c->table);
 
     if (!c->rpe_next)
-      return rt_export_used(c->table);
+    {
+      rt_export_used(c->table);
+      RT_UNLOCK(tab);
+      return;
+    }
+
+    RT_UNLOCK(tab);
   }
 
   int used = 0;
@@ -1488,7 +1514,8 @@ rt_export_hook(void *_data)
   }
 
   if (used)
-    rt_export_used(c->table);
+    RT_LOCKED(tab, _)
+      rt_export_used(c->table);
 
   rt_send_export_event(&c->h);
 }
@@ -1561,10 +1588,9 @@ rte_same(rte *x, rte *y)
 static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
 
 static int
-rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
+rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
 {
   struct rt_import_request *req = c->req;
-  struct rtable *table = c->table;
   struct rt_import_stats *stats = &c->stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
@@ -1870,40 +1896,47 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
   if (!hook)
     return;
 
-  net *nn;
-  if (new)
+  RT_LOCKED(hook->table, tab)
+  {
+    net *nn;
+    if (new)
     {
       /* Use the actual struct network, not the dummy one */
-      nn = net_get(hook->table, n);
+      nn = net_get(tab, n);
       new->net = nn->n.addr;
       new->sender = hook;
 
       /* Set the stale cycle */
       new->stale_cycle = hook->stale_set;
     }
-  else if (!(nn = net_find(hook->table, n)))
+    else if (!(nn = net_find(tab, n)))
     {
       req->hook->stats.withdraws_ignored++;
-      return;
+      RT_RETURN(tab);
     }
 
-  /* Recalculate the best route */
-  if (rte_recalculate(hook, nn, new, src))
-    ev_send(req->list, &hook->announce_event);
+    /* Recalculate the best route */
+    if (rte_recalculate(tab, hook, nn, new, src))
+      ev_send(req->list, &hook->announce_event);
+  }
 }
 
 /* Check rtable for best route to given net whether it would be exported do p */
 int
-rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
+rt_examine(rtable *tp, net_addr *a, struct channel *c, const struct filter *filter)
 {
-  net *n = net_find(t, a);
+  rte rt = {};
 
-  if (!n || !rte_is_valid(RTE_OR_NULL(n->routes)))
+  RT_LOCKED(tp, t)
+  {
+    net *n = net_find(t, a);
+    if (n)
+      rt = RTE_COPY_VALID(n->routes);
+  }
+
+  if (!rt.src)
     return 0;
 
-  rte rt = n->routes->rte;
-
-  /* Rest is stripped down export_filter() */
   int v = c->proto->preexport ? c->proto->preexport(c, &rt) : 0;
   if (v == RIC_PROCESS)
     v = (f_run(filter, &rt, FF_SILENT) <= F_ACCEPT);
@@ -1915,31 +1948,37 @@ static void
 rt_table_export_done(void *hh)
 {
   struct rt_table_export_hook *hook = hh;
-  struct rtable *tab = SKIP_BACK(struct rtable, exporter, hook->table);
+  struct rt_export_request *req = hook->h.req;
+  void (*stopped)(struct rt_export_request *) = hook->h.stopped;
+  rtable *t = SKIP_BACK(rtable, priv.exporter, hook->table);
 
-  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
+  RT_LOCKED(t, tab)
+  {
+    DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
 
-  /* Drop pending exports */
-  rt_export_used(&tab->exporter);
+    /* Drop pending exports */
+    rt_export_used(&tab->exporter);
 
-  /* Do the common code */
-  rt_export_stopped(&hook->h);
+    /* Do the common code; this frees the hook */
+    rt_export_stopped(&hook->h);
+  }
+
+  /* Report the channel as stopped. */
+  CALL(stopped, req);
 
   /* Unlock the table; this may free it */
-  rt_unlock_table(tab);
+  rt_unlock_table(t);
 }
 
 void
-rt_export_stopped(void *data)
+rt_export_stopped(struct rt_export_hook *hook)
 {
-  struct rt_export_hook *hook = data;
+  /* Unlink from the request */
+  hook->req->hook = NULL;
 
   /* Unlist */
   rem_node(&hook->n);
 
-  /* Report the channel as stopped. */
-  CALL(hook->stopped, hook->req);
-
   /* Free the hook itself together with its pool */
   rfree(hook->pool);
 }
@@ -1963,21 +2002,24 @@ rt_set_export_state(struct rt_export_hook *hook, u8 state)
 }
 
 void
-rt_request_import(rtable *tab, struct rt_import_request *req)
+rt_request_import(rtable *t, struct rt_import_request *req)
 {
-  rt_lock_table(tab);
+  RT_LOCKED(t, tab)
+  {
+    rt_lock_table(tab);
 
-  struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
+    struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
 
-  hook->announce_event = (event) { .hook = rt_import_announce_exports, .data = hook };
+    hook->announce_event = (event) { .hook = rt_import_announce_exports, .data = hook };
 
-  DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
+    DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
 
-  hook->req = req;
-  hook->table = tab;
+    hook->req = req;
+    hook->table = t;
 
-  rt_set_import_state(hook, TIS_UP);
-  add_tail(&tab->imports, &hook->n);
+    rt_set_import_state(hook, TIS_UP);
+    add_tail(&tab->imports, &hook->n);
+  }
 }
 
 void
@@ -1986,17 +2028,18 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
   ASSERT_DIE(req->hook);
   struct rt_import_hook *hook = req->hook;
 
-  rt_schedule_prune(hook->table);
-
-  rt_set_import_state(hook, TIS_STOP);
-
-  hook->stopped = stopped;
+  RT_LOCKED(hook->table, tab)
+  {
+    rt_schedule_prune(tab);
+    rt_set_import_state(hook, TIS_STOP);
+    hook->stopped = stopped;
+  }
 }
 
 static void
-rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
+rt_table_export_start_locked(struct rtable_private *tab, struct rt_export_request *req)
 {
-  rtable *tab = SKIP_BACK(rtable, exporter.e, re);
+  struct rt_exporter *re = &tab->exporter.e;
   rt_lock_table(tab);
 
   req->hook = rt_alloc_export(re, sizeof(struct rt_table_export_hook));
@@ -2044,9 +2087,17 @@ rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
   rt_init_export(re, req->hook);
 }
 
-void rt_request_export(rtable *tab, struct rt_export_request *req)
+static void
+rt_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 {
-  rt_table_export_start(&tab->exporter.e, req);
+  RT_LOCKED(SKIP_BACK(rtable, priv.exporter.e, re), tab)
+    rt_table_export_start_locked(tab, req);
+}
+ 
+void rt_request_export(rtable *t, struct rt_export_request *req)
+{
+  RT_LOCKED(t, tab)
+    rt_table_export_start_locked(tab, req);  /* Is locked inside */
 }
 
 void
@@ -2082,31 +2133,41 @@ rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook)
   rt_send_export_event(hook);
 }
 
+static void
+rt_table_export_stop_locked(struct rt_export_hook *hh)
+{
+  struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
+  struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter, hook->table);
+
+  if (atomic_load_explicit(&hh->export_state, memory_order_relaxed) == TES_FEEDING)
+    switch (hh->req->addr_mode)
+    {
+      case TE_ADDR_IN:
+	if (hook->walk_lock)
+	{
+	  rt_unlock_trie(tab, hook->walk_lock);
+	  hook->walk_lock = NULL;
+	  mb_free(hook->walk_state);
+	  hook->walk_state = NULL;
+	  break;
+	}
+	/* fall through */
+      case TE_ADDR_NONE:
+	fit_get(&tab->fib, &hook->feed_fit);
+	break;
+    }
+}
+
 static void
 rt_table_export_stop(struct rt_export_hook *hh)
 {
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
-  rtable *tab = SKIP_BACK(rtable, exporter, hook->table);
-
-  if (atomic_load_explicit(&hh->export_state, memory_order_relaxed) != TES_FEEDING)
-    return;
-
-  switch (hh->req->addr_mode)
-  {
-    case TE_ADDR_IN:
-      if (hook->walk_lock)
-      {
-	rt_unlock_trie(tab, hook->walk_lock);
-	hook->walk_lock = NULL;
-	mb_free(hook->walk_state);
-	hook->walk_state = NULL;
-	break;
-      }
-      /* fall through */
-    case TE_ADDR_NONE:
-      fit_get(&tab->fib, &hook->feed_fit);
-      break;
-  }
+  rtable *t = SKIP_BACK(rtable, priv.exporter, hook->table);
+  if (RT_IS_LOCKED(t))
+    rt_table_export_stop_locked(hh);
+  else
+    RT_LOCKED(t, tab)
+      rt_table_export_stop_locked(hh);
 }
 
 void
@@ -2154,12 +2215,15 @@ rt_refresh_begin(struct rt_import_request *req)
   ASSERT_DIE(hook);
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
+  RT_LOCKED(hook->table, tab)
+  {
+
   /* If the pruning routine is too slow */
   if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
       || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
   {
     log(L_WARN "Route refresh flood in table %s", hook->table->name);
-    FIB_WALK(&hook->table->fib, net, n)
+    FIB_WALK(&tab->fib, net, n)
       {
        for (struct rte_storage *e = n->routes; e; e = e->next)
          if (e->rte.sender == req->hook)
@@ -2180,6 +2244,8 @@ rt_refresh_begin(struct rt_import_request *req)
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
+
+  }
 }
 
 /**
@@ -2196,13 +2262,16 @@ rt_refresh_end(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
-  hook->stale_valid++;
-  ASSERT_DIE(hook->stale_set == hook->stale_valid);
+  RT_LOCKED(hook->table, tab)
+  {
+    hook->stale_valid++;
+    ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  rt_schedule_prune(hook->table);
+    rt_schedule_prune(tab);
 
-  if (req->trace_routes & D_STATES)
-    log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+    if (req->trace_routes & D_STATES)
+      log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+  }
 }
 
 /**
@@ -2227,8 +2296,11 @@ rte_dump(struct rte_storage *e)
  * This function dumps contents of a given routing table to debug output.
  */
 void
-rt_dump(rtable *t)
+rt_dump(rtable *tp)
 {
+  RT_LOCKED(tp, t)
+  {
+
   debug("Dump of routing table <%s>%s\n", t->name, t->deleted ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
@@ -2240,6 +2312,8 @@ rt_dump(rtable *t)
     }
   FIB_WALK_END;
   debug("\n");
+
+  }
 }
 
 /**
@@ -2261,8 +2335,11 @@ rt_dump_all(void)
 }
 
 void
-rt_dump_hooks(rtable *tab)
+rt_dump_hooks(rtable *tp)
 {
+  RT_LOCKED(tp, tab)
+  {
+
   debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->deleted ? " (deleted)" : "");
   debug("  nhu_state=%u use_count=%d rt_count=%u\n",
       tab->nhu_state, tab->use_count, tab->rt_count);
@@ -2289,6 +2366,8 @@ rt_dump_hooks(rtable *tab)
        atomic_load_explicit(&eh->h.export_state, memory_order_relaxed));
   }
   debug("\n");
+
+  }
 }
 
 void
@@ -2307,7 +2386,7 @@ rt_dump_hooks_all(void)
 }
 
 static inline void
-rt_schedule_nhu(rtable *tab)
+rt_schedule_nhu(struct rtable_private *tab)
 {
   if (tab->nhu_corked)
   {
@@ -2332,7 +2411,7 @@ rt_schedule_nhu(rtable *tab)
 }
 
 void
-rt_schedule_prune(rtable *tab)
+rt_schedule_prune(struct rtable_private *tab)
 {
   if (tab->prune_state == 0)
     ev_schedule(tab->rt_event);
@@ -2344,7 +2423,8 @@ rt_schedule_prune(rtable *tab)
 static void
 rt_export_used(struct rt_table_exporter *e)
 {
-  rtable *tab = SKIP_BACK(rtable, exporter, e);
+  struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter, e);
+  ASSERT_DIE(RT_IS_LOCKED(tab));
 
   rt_trace(tab, D_EVENTS, "Export cleanup requested");
 
@@ -2358,7 +2438,8 @@ rt_export_used(struct rt_table_exporter *e)
 static void
 rt_event(void *ptr)
 {
-  rtable *tab = ptr;
+  RT_LOCKED((rtable *) ptr, tab)
+  {
 
   rt_lock_table(tab);
 
@@ -2369,19 +2450,19 @@ rt_event(void *ptr)
     rt_prune_table(tab);
 
   rt_unlock_table(tab);
+  }
 }
 
 static void
 rt_prune_timer(timer *t)
 {
-  rtable *tab = t->data;
-
-  if (tab->gc_counter >= tab->config->gc_threshold)
-    rt_schedule_prune(tab);
+  RT_LOCKED((rtable *) t->data, tab)
+    if (tab->gc_counter >= tab->config->gc_threshold)
+      rt_schedule_prune(tab);
 }
 
 static void
-rt_kick_prune_timer(rtable *tab)
+rt_kick_prune_timer(struct rtable_private *tab)
 {
   /* Return if prune is already scheduled */
   if (tm_active(tab->prune_timer) || (tab->prune_state & 1))
@@ -2398,13 +2479,15 @@ static void
 rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
   struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
-  rtable *dst = ln->dst;
-  ASSUME(rt_is_flow(dst));
+  rtable *dst_pub = ln->dst;
+  ASSUME(rt_is_flow(dst_pub));
+  struct rtable_private *dst = RT_LOCK(dst_pub);
 
   /* No need to inspect it further if recalculation is already scheduled */
   if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY)
       || !trie_match_net(dst->flowspec_trie, net))
   {
+    RT_UNLOCK(dst_pub);
     rpe_mark_seen_all(req->hook, first, NULL);
     return;
   }
@@ -2422,6 +2505,8 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
   /* Yes, something has actually changed. Schedule the update. */
   if (o != RTE_VALID_OR_NULL(new_best))
     rt_schedule_nhu(dst);
+
+  RT_UNLOCK(dst_pub);
 }
 
 static void
@@ -2432,7 +2517,7 @@ rt_flowspec_dump_req(struct rt_export_request *req)
 }
 
 static struct rt_flowspec_link *
-rt_flowspec_find_link(rtable *src, rtable *dst)
+rt_flowspec_find_link(struct rtable_private *src, rtable *dst)
 {
   struct rt_table_export_hook *hook; node *n;
   WALK_LIST2(hook, n, src->exporter.e.hooks, h.n)
@@ -2452,33 +2537,41 @@ rt_flowspec_find_link(rtable *src, rtable *dst)
 }
 
 void
-rt_flowspec_link(rtable *src, rtable *dst)
+rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
 {
-  ASSERT(rt_is_ip(src));
-  ASSERT(rt_is_flow(dst));
+  ASSERT(rt_is_ip(src_pub));
+  ASSERT(rt_is_flow(dst_pub));
 
-  struct rt_flowspec_link *ln = rt_flowspec_find_link(src, dst);
+  int lock_dst = 0;
 
-  if (!ln)
+  RT_LOCKED(src_pub, src)
   {
-    rt_lock_table(dst);
+    struct rt_flowspec_link *ln = rt_flowspec_find_link(src, dst_pub);
 
-    pool *p = src->rp;
-    ln = mb_allocz(p, sizeof(struct rt_flowspec_link));
-    ln->src = src;
-    ln->dst = dst;
-    ln->req = (struct rt_export_request) {
-      .name = mb_sprintf(p, "%s.flowspec.notifier", dst->name),
-      .list = &global_work_list,
-      .trace_routes = src->config->debug,
-      .dump_req = rt_flowspec_dump_req,
-      .export_one = rt_flowspec_export_one,
-    };
+    if (!ln)
+    {
+      pool *p = src->rp;
+      ln = mb_allocz(p, sizeof(struct rt_flowspec_link));
+      ln->src = src_pub;
+      ln->dst = dst_pub;
+      ln->req = (struct rt_export_request) {
+	.name = mb_sprintf(p, "%s.flowspec.notifier", dst_pub->name),
+	.list = &global_work_list,
+	.trace_routes = src->config->debug,
+	.dump_req = rt_flowspec_dump_req,
+	.export_one = rt_flowspec_export_one,
+      };
 
-    rt_request_export(src, &ln->req);
+      rt_table_export_start_locked(src, &ln->req);
+
+      lock_dst = 1;
+    }
+
+    ln->uc++;
   }
 
-  ln->uc++;
+  if (lock_dst)
+    rt_lock_table(dst_pub);
 }
 
 static void
@@ -2494,16 +2587,20 @@ rt_flowspec_link_stopped(struct rt_export_request *req)
 void
 rt_flowspec_unlink(rtable *src, rtable *dst)
 {
-  struct rt_flowspec_link *ln = rt_flowspec_find_link(src, dst);
+  struct rt_flowspec_link *ln;
+  RT_LOCKED(src, t)
+  {
+    ln = rt_flowspec_find_link(t, dst);
 
-  ASSERT(ln && (ln->uc > 0));
+    ASSERT(ln && (ln->uc > 0));
 
-  if (!--ln->uc)
-    rt_stop_export(&ln->req, rt_flowspec_link_stopped);
+    if (!--ln->uc)
+      rt_stop_export(&ln->req, rt_flowspec_link_stopped);
+  }
 }
 
 static void
-rt_flowspec_reset_trie(rtable *tab)
+rt_flowspec_reset_trie(struct rtable_private *tab)
 {
   linpool *lp = tab->flowspec_trie->lp;
   int ipv4 = tab->flowspec_trie->ipv4;
@@ -2516,7 +2613,9 @@ rt_flowspec_reset_trie(rtable *tab)
 static void
 rt_free(resource *_r)
 {
-  rtable *r = (rtable *) _r;
+  struct rtable_private *r = SKIP_BACK(struct rtable_private, r, _r);
+
+  DOMAIN_FREE(rtable, r->lock);
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
@@ -2538,14 +2637,15 @@ rt_free(resource *_r)
 static void
 rt_res_dump(resource *_r)
 {
-  rtable *r = (rtable *) _r;
+  struct rtable_private *r = SKIP_BACK(struct rtable_private, r, _r);
+
   debug("name \"%s\", addr_type=%s, rt_count=%u, use_count=%d\n",
       r->name, net_label[r->addr_type], r->rt_count, r->use_count);
 }
 
 static struct resclass rt_class = {
   .name = "Routing table",
-  .size = sizeof(struct rtable),
+  .size = sizeof(rtable),
   .free = rt_free,
   .dump = rt_res_dump,
   .lookup = NULL,
@@ -2572,7 +2672,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
 {
   pool *p = rp_newf(pp, "Routing table %s", cf->name);
 
-  rtable *t = ralloc(p, &rt_class);
+  struct rtable_private *t = ralloc(p, &rt_class);
   t->rp = p;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
@@ -2584,6 +2684,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   if (t->id >= rtable_max_id)
     rtable_max_id = t->id + 1;
 
+  t->lock = DOMAIN_NEW(rtable, t->name);
+
   fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
 
   if (cf->trie_used)
@@ -2622,13 +2724,13 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->rl_pipe = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
-  if (rt_is_flow(t))
+  if (rt_is_flow(RT_PUB(t)))
   {
     t->flowspec_trie = f_new_trie(lp_new_default(p), 0);
     t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
   }
 
-  return t;
+  return RT_PUB(t);
 }
 
 /**
@@ -2665,7 +2767,7 @@ rt_init(void)
  * iteration.
  */
 static void
-rt_prune_table(rtable *tab)
+rt_prune_table(struct rtable_private *tab)
 {
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 2000;
@@ -2727,7 +2829,7 @@ again:
 	    (e->rte.stale_cycle < s->stale_valid) ||
 	    (e->rte.stale_cycle > s->stale_set))
 	  {
-	    rte_recalculate(e->rte.sender, n, NULL, e->rte.src);
+	    rte_recalculate(tab, e->rte.sender, n, NULL, e->rte.src);
 	    limit--;
 
 	    goto rescan;
@@ -2814,7 +2916,7 @@ again:
 }
 
 static void
-rt_export_cleanup(rtable *tab)
+rt_export_cleanup(struct rtable_private *tab)
 {
   tab->export_used = 0;
 
@@ -3004,7 +3106,7 @@ rt_cork_release_hook(void *data UNUSED)
  *
  */
 struct f_trie *
-rt_lock_trie(rtable *tab)
+rt_lock_trie(struct rtable_private *tab)
 {
   ASSERT(tab->trie);
 
@@ -3021,7 +3123,7 @@ rt_lock_trie(rtable *tab)
  * It may free the trie and schedule next trie pruning.
  */
 void
-rt_unlock_trie(rtable *tab, struct f_trie *trie)
+rt_unlock_trie(struct rtable_private *tab, struct f_trie *trie)
 {
   ASSERT(trie);
 
@@ -3093,7 +3195,7 @@ rt_postconfig(struct config *c)
  */
 
 void
-ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
+ea_set_hostentry(ea_list **to, rtable *dep, rtable *src, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
 {
   struct {
     struct adata ad;
@@ -3101,7 +3203,8 @@ ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr g
     u32 labels[lnum];
   } *head = (void *) tmp_alloc_adata(sizeof *head - sizeof(struct adata));
 
-  head->he = rt_get_hostentry(tab, gw, ll, dep);
+  RT_LOCKED(src, tab)
+    head->he = rt_get_hostentry(tab, gw, ll, dep);
   memcpy(head->labels, labels, lnum * sizeof(u32));
 
   ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
@@ -3297,7 +3400,6 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
 {
   ASSERT(rt_is_ip(tab_ip));
   ASSERT(rt_is_flow(tab_flow));
-  ASSERT(tab_ip->trie);
 
   /* RFC 8955 6. a) Flowspec has defined dst prefix */
   if (!net_flow_has_dst_prefix(n))
@@ -3317,32 +3419,45 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
   else
     net_fill_ip6(&dst, net6_prefix(n), net6_pxlen(n));
 
-  /* Find best-match BGP unicast route for flowspec dst prefix */
-  net *nb = net_route(tab_ip, &dst);
-  const rte *rb = nb ? &nb->routes->rte : NULL;
+  rte rb = {};
+  net_addr_union nau;
+  RT_LOCKED(tab_ip, tip)
+  {
+    ASSERT(tip->trie);
+    /* Find best-match BGP unicast route for flowspec dst prefix */
+    net *nb = net_route(tip, &dst);
+    if (nb)
+    {
+      rb = RTE_COPY_VALID(nb->routes);
+      rta_clone(rb.attrs);
+      net_copy(&nau.n, nb->n.addr);
+      rb.net = &nau.n;
+    }
+  }
 
   /* Register prefix to trie for tracking further changes */
   int max_pxlen = (n->type == NET_FLOW4) ? IP4_MAX_PREFIX_LENGTH : IP6_MAX_PREFIX_LENGTH;
-  trie_add_prefix(tab_flow->flowspec_trie, &dst, (nb ? nb->n.addr->pxlen : 0), max_pxlen);
+  RT_LOCKED(tab_flow, tfl)
+    trie_add_prefix(tfl->flowspec_trie, &dst, (rb.net ? rb.net->pxlen : 0), max_pxlen);
 
   /* No best-match BGP route -> no flowspec */
-  if (!rb || (rt_get_source_attr(rb) != RTS_BGP))
+  if (!rb.attrs || (rt_get_source_attr(&rb) != RTS_BGP))
     return FLOWSPEC_INVALID;
 
   /* Find ORIGINATOR_ID values */
   u32 orig_a = ea_get_int(a, "bgp_originator_id", 0);
-  u32 orig_b = ea_get_int(rb->attrs, "bgp_originator_id", 0);
+  u32 orig_b = ea_get_int(rb.attrs, "bgp_originator_id", 0);
 
   /* Originator is either ORIGINATOR_ID (if present), or BGP neighbor address (if not) */
   if ((orig_a != orig_b) || (!orig_a && !orig_b && !ipa_equal(
 	  ea_get_ip(a, &ea_gen_from, IPA_NONE),
-	  ea_get_ip(rb->attrs, &ea_gen_from, IPA_NONE)
+	  ea_get_ip(rb.attrs, &ea_gen_from, IPA_NONE)
 	  )))
     return FLOWSPEC_INVALID;
 
 
   /* Find ASN of the best-match route, for use in next checks */
-  u32 asn_b = rta_get_first_asn(rb->attrs);
+  u32 asn_b = rta_get_first_asn(rb.attrs);
   if (!asn_b)
     return FLOWSPEC_INVALID;
 
@@ -3351,20 +3466,23 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
     return FLOWSPEC_INVALID;
 
   /* RFC 8955 6. c) More-specific routes are from the same AS as the best-match route */
-  TRIE_WALK(tab_ip->trie, subnet, &dst)
+  RT_LOCKED(tab_ip, tip)
   {
-    net *nc = net_find_valid(tab_ip, &subnet);
-    if (!nc)
-      continue;
+    TRIE_WALK(tip->trie, subnet, &dst)
+    {
+      net *nc = net_find_valid(tip, &subnet);
+      if (!nc)
+	continue;
 
-    const rte *rc = &nc->routes->rte;
-    if (rt_get_source_attr(rc) != RTS_BGP)
-      return FLOWSPEC_INVALID;
+      const rte *rc = &nc->routes->rte;
+      if (rt_get_source_attr(rc) != RTS_BGP)
+	RT_RETURN(tip, FLOWSPEC_INVALID);
 
-    if (rta_get_first_asn(rc->attrs) != asn_b)
-      return FLOWSPEC_INVALID;
+      if (rta_get_first_asn(rc->attrs) != asn_b)
+	RT_RETURN(tip, FLOWSPEC_INVALID);
+    }
+    TRIE_WALK_END;
   }
-  TRIE_WALK_END;
 
   return FLOWSPEC_VALID;
 }
@@ -3429,7 +3547,7 @@ rt_flowspec_resolve_rte(rte *r, struct channel *c)
 }
 
 static inline int
-rt_next_hop_update_net(rtable *tab, net *n)
+rt_next_hop_update_net(struct rtable_private *tab, net *n)
 {
   uint count = 0;
   int is_flow = net_is_flow(n->n.addr);
@@ -3449,41 +3567,38 @@ rt_next_hop_update_net(rtable *tab, net *n)
     rte new;
   } *updates = tmp_allocz(sizeof(struct rte_multiupdate) * (count+1));
 
-  //struct rt_pending_export *last_pending = n->last;
+  struct rt_pending_export *last_pending = n->last;
 
   uint pos = 0;
   for (struct rte_storage *e, **k = &n->routes; e = *k; k = &e->next)
     updates[pos++].old = e;
 
+  /* This is an exceptional place where table can be unlocked while keeping its data:
+   * the reason why this is safe is that NHU must be always run from the same
+   * thread as cleanup routines, therefore the only real problem may arise when
+   * some importer does a change on this particular net (destination) while NHU
+   * is being computed. Statistically, this should almost never happen. In such
+   * case, we just drop all the computed changes and do it once again.
+   * */
+  RT_UNLOCK(tab);
+
   uint mod = 0;
   if (is_flow)
     for (uint i = 0; i < pos; i++)
-      mod += rt_flowspec_update_rte(tab, &updates[i].old->rte, &updates[i].new);
+      mod += rt_flowspec_update_rte(RT_PUB(tab), &updates[i].old->rte, &updates[i].new);
 
   else
     for (uint i = 0; i < pos; i++)
       mod += rt_next_hop_update_rte(&updates[i].old->rte, &updates[i].new);
 
+  RT_LOCK(RT_PUB(tab));
+
   if (!mod)
     return 0;
 
-  /* Next commit: Here check whether the network hasn't changed while generating updates */
-
-  for (uint i = 0; i < pos; i++)
-    if (updates[i].new.attrs)
-      {
-	/* Call a pre-comparison hook */
-	/* Not really an efficient way to compute this */
-	if (updates[i].old->rte.src->owner->rte_recalculate)
-	  updates[i].old->rte.src->owner->rte_recalculate(tab, n, &updates[i].new, &updates[i].old->rte, &old_best->rte);
-	/* And store the route */
-	struct rte_storage *ns = updates[i].new_stored = rte_store(&updates[i].new, n, tab);
-
-	/* Get a new ID for the route */
-	ns->rte.lastmod = current_time();
-	ns->rte.id = hmap_first_zero(&tab->id_map);
-	hmap_set(&tab->id_map, ns->rte.id);
-      }
+  /* Something has changed inbetween, retry NHU. */
+  if (last_pending != n->last)
+    return rt_next_hop_update_net(tab, n);
 
   /* Now we reconstruct the original linked list */
   struct rte_storage **nptr = &n->routes;
@@ -3491,12 +3606,33 @@ rt_next_hop_update_net(rtable *tab, net *n)
   {
     updates[i].old->next = NULL;
 
-    struct rte_storage *put = updates[i].new_stored ?: updates[i].old;
+    struct rte_storage *put;
+    if (updates[i].new.attrs)
+      put = updates[i].new_stored = rte_store(&updates[i].new, n, tab);
+    else
+      put = updates[i].old;
+
     *nptr = put;
     nptr = &put->next;
   }
   *nptr = NULL;
 
+  /* Call the pre-comparison hooks */
+  for (uint i = 0; i < pos; i++)
+    if (updates[i].new_stored)
+      {
+	/* Get a new ID for the route */
+	updates[i].new_stored->rte.lastmod = current_time();
+	updates[i].new_stored->rte.id = hmap_first_zero(&tab->id_map);
+	hmap_set(&tab->id_map, updates[i].new_stored->rte.id);
+
+	/* Call a pre-comparison hook */
+	/* Not really an efficient way to compute this */
+	if (updates[i].old->rte.src->owner->rte_recalculate)
+	  updates[i].old->rte.src->owner->rte_recalculate(tab, n, &updates[i].new_stored->rte, &updates[i].old->rte, &old_best->rte);
+      }
+
+#if DEBUGGING
   {
     uint t = 0;
     for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -3504,6 +3640,7 @@ rt_next_hop_update_net(rtable *tab, net *n)
     ASSERT_DIE(t == pos);
     ASSERT_DIE(pos == count);
   }
+#endif
 
   /* Find the new best route */
   struct rte_storage **new_best = NULL;
@@ -3546,7 +3683,8 @@ rt_next_hop_update_net(rtable *tab, net *n)
 static void
 rt_next_hop_update(void *_tab)
 {
-  rtable *tab = _tab;
+  RT_LOCKED((rtable *) _tab, tab)
+  {
 
   /* If called from an uncork hook, reset the state */
   if (tab->nhu_corked)
@@ -3571,7 +3709,7 @@ rt_next_hop_update(void *_tab)
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
-    return;
+    RT_RETURN(tab);
   }
 
   struct fib_iterator *fit = &tab->nhu_fit;
@@ -3594,7 +3732,7 @@ rt_next_hop_update(void *_tab)
 	{
 	  FIB_ITERATE_PUT(fit);
 	  ev_schedule(tab->nhu_event);
-	  return;
+	  RT_RETURN(tab);
 	}
       lp_state lps;
       lp_save(tmp_linpool, &lps);
@@ -3617,6 +3755,8 @@ rt_next_hop_update(void *_tab)
     ev_schedule(tab->nhu_event);
 
   rt_unlock_table(tab);
+
+  }
 }
 
 void
@@ -3680,10 +3820,11 @@ rt_new_table(struct symbol *s, uint addr_type)
  * preventing it from being freed when it gets undefined in a new
  * configuration.
  */
-void rt_lock_table_debug(rtable *tab, const char *file, uint line)
+void
+rt_lock_table_priv(struct rtable_private *r, const char *file, uint line)
 {
-  rt_trace(tab, D_STATES, "Locked at %s:%d", file, line);
-  tab->use_count++;
+  rt_trace(r, D_STATES, "Locked at %s:%d", file, line);
+  r->use_count++;
 }
 
 /**
@@ -3694,21 +3835,33 @@ void rt_lock_table_debug(rtable *tab, const char *file, uint line)
  * that is decrease its use count and delete it if it's scheduled
  * for deletion by configuration changes.
  */
-void rt_unlock_table_debug(rtable *r, const char *file, uint line)
+void
+rt_unlock_table_priv(struct rtable_private *r, const char *file, uint line)
 {
   rt_trace(r, D_STATES, "Unlocked at %s:%d", file, line);
   if (!--r->use_count && r->deleted)
-    {
-      struct config *conf = r->deleted;
-
-      /* Delete the routing table by freeing its pool */
-      rt_shutdown(r);
-      config_del_obstacle(conf);
-    }
+    /* Schedule the delete event to finish this up */
+    ev_send(&global_event_list, ev_new_init(r->rp, rt_delete, r));
 }
 
 static void
-rt_check_cork_low(rtable *tab)
+rt_delete(void *tab_)
+{
+  /* We assume that nobody holds the table reference now as use_count is zero.
+   * Anyway the last holder may still hold the lock. Therefore we lock and
+   * unlock it the last time to be sure that nobody is there. */
+  struct rtable_private *tab = RT_LOCK((rtable *) tab_);
+  struct config *conf = tab->deleted;
+
+  RT_UNLOCK(RT_PUB(tab));
+
+  rfree(tab->rp);
+  config_del_obstacle(conf);
+}
+
+
+static void
+rt_check_cork_low(struct rtable_private *tab)
 {
   if (!tab->cork_active)
     return;
@@ -3723,7 +3876,7 @@ rt_check_cork_low(rtable *tab)
 }
 
 static void
-rt_check_cork_high(rtable *tab)
+rt_check_cork_high(struct rtable_private *tab)
 {
   if (!tab->cork_active && tab->exporter.first && (tab->exporter.first->seq + tab->cork_threshold.high <= tab->exporter.next_seq))
   {
@@ -3736,7 +3889,7 @@ rt_check_cork_high(rtable *tab)
 
 
 static int
-rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old)
+rt_reconfigure(struct rtable_private *tab, struct rtable_config *new, struct rtable_config *old)
 {
   if ((new->addr_type != old->addr_type) ||
       (new->sorted != old->sorted) ||
@@ -3744,7 +3897,7 @@ rt_reconfigure(rtable *tab, struct rtable_config *new, struct rtable_config *old
     return 0;
 
   DBG("\t%s: same\n", new->name);
-  new->table = tab;
+  new->table = RT_PUB(tab);
   tab->name = new->name;
   tab->config = new;
 
@@ -3796,13 +3949,20 @@ rt_commit(struct config *new, struct config *old)
     {
       WALK_LIST(o, old->tables)
 	{
-	  rtable *tab = o->table;
+	  struct rtable_private *tab = RT_LOCK(o->table);
+
 	  if (tab->deleted)
+	  {
+	    RT_UNLOCK(tab);
 	    continue;
+	  }
 
 	  r = rt_find_table_config(new, o->name);
 	  if (r && !new->shutdown && rt_reconfigure(tab, r, o))
+	  {
+	    RT_UNLOCK(tab);
 	    continue;
+	  }
 
 	  DBG("\t%s: deleted\n", o->name);
 	  tab->deleted = old;
@@ -3813,6 +3973,8 @@ rt_commit(struct config *new, struct config *old)
 	    rt_stop_export(&tab->hostcache->req, NULL);
 
 	  rt_unlock_table(tab);
+
+	  RT_UNLOCK(tab);
 	}
     }
 
@@ -3917,14 +4079,13 @@ static void
 rt_feed_by_fib(void *data)
 {
   struct rt_table_export_hook *c = data;
-
   struct fib_iterator *fit = &c->feed_fit;
-
   rt_feed_block block = {};
 
   ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
-  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
+  {
 
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
@@ -3936,6 +4097,7 @@ rt_feed_by_fib(void *data)
 	if (!rt_prepare_feed(c, n, &block))
 	{
 	  FIB_ITERATE_PUT(fit);
+	  RT_UNLOCK(tab);
 	  rt_process_feed(c, &block);
 	  rt_send_export_event(&c->h);
 	  return;
@@ -3943,6 +4105,7 @@ rt_feed_by_fib(void *data)
       }
     }
   FIB_ITERATE_END;
+  }
 
   rt_process_feed(c, &block);
   rt_feed_done(&c->h);
@@ -3952,13 +4115,14 @@ static void
 rt_feed_by_trie(void *data)
 {
   struct rt_table_export_hook *c = data;
-  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
+  rt_feed_block block = {};
+
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
+  {
 
   ASSERT_DIE(c->walk_state);
   struct f_trie_walk_state *ws = c->walk_state;
 
-  rt_feed_block block = {};
-
   ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
   do {
@@ -3970,10 +4134,11 @@ rt_feed_by_trie(void *data)
       continue;
 
     if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
-      return;
+      RT_RETURN(tab);
 
     if (!rt_prepare_feed(c, n, &block))
     {
+      RT_UNLOCK(tab);
       rt_process_feed(c, &block);
       rt_send_export_event(&c->h);
       return;
@@ -3989,6 +4154,9 @@ rt_feed_by_trie(void *data)
 
   c->walk_last.type = 0;
 
+  }
+
+  rt_process_feed(c, &block);
   rt_feed_done(&c->h);
 }
 
@@ -3996,20 +4164,21 @@ static void
 rt_feed_equal(void *data)
 {
   struct rt_table_export_hook *c = data;
-  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
-
-  ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
-  ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
-
   rt_feed_block block = {};
+  net *n;
 
-  net *n = net_find(tab, c->h.req->addr);
-  if (n)
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
   {
-    ASSERT_DIE(rt_prepare_feed(c, n, &block));
-    rt_process_feed(c, &block);
+    ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
+    ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
+
+    if (n = net_find(tab, c->h.req->addr))
+      ASSERT_DIE(rt_prepare_feed(c, n, &block));
   }
 
+  if (n)
+    rt_process_feed(c, &block);
+
   rt_feed_done(&c->h);
 }
 
@@ -4017,20 +4186,21 @@ static void
 rt_feed_for(void *data)
 {
   struct rt_table_export_hook *c = data;
-  rtable *tab = SKIP_BACK(rtable, exporter, c->table);
-
-  ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
-  ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
-
   rt_feed_block block = {};
+  net *n;
 
-  net *n = net_route(tab, c->h.req->addr);
-  if (n)
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
   {
-    ASSERT_DIE(rt_prepare_feed(c, n, &block));
-    rt_process_feed(c, &block);
+    ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
+    ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
+
+    if (n = net_route(tab, c->h.req->addr))
+      ASSERT_DIE(rt_prepare_feed(c, n, &block));
   }
 
+  if (n)
+    rt_process_feed(c, &block);
+
   rt_feed_done(&c->h);
 }
 
@@ -4194,7 +4364,7 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
 
 
 static void
-rt_init_hostcache(rtable *tab)
+rt_init_hostcache(struct rtable_private *tab)
 {
   struct hostcache *hc = mb_allocz(tab->rp, sizeof(struct hostcache));
   init_list(&hc->hostentries);
@@ -4219,13 +4389,13 @@ rt_init_hostcache(rtable *tab)
     .export_one = hc_notify_export_one,
   };
 
-  rt_request_export(tab, &hc->req);
+  rt_table_export_start_locked(tab, &hc->req);
 
   tab->hostcache = hc;
 }
 
 static void
-rt_free_hostcache(rtable *tab)
+rt_free_hostcache(struct rtable_private *tab)
 {
   struct hostcache *hc = tab->hostcache;
 
@@ -4277,7 +4447,7 @@ rt_get_igp_metric(const rte *rt)
 }
 
 static int
-rt_update_hostentry(rtable *tab, struct hostentry *he)
+rt_update_hostentry(struct rtable_private *tab, struct hostentry *he)
 {
   ea_list *old_src = he->src;
   int direct = 0;
@@ -4345,17 +4515,21 @@ done:
 static void
 rt_update_hostcache(void *data)
 {
-  rtable *tab = data;
+  rtable **nhu_pending;
+
+  RT_LOCKED((rtable *) data, tab)
+  {
+
   struct hostcache *hc = tab->hostcache;
 
   if (rt_cork_check(&hc->update))
   {
     rt_trace(tab, D_STATES, "Hostcache update corked");
-    return;
+    RT_RETURN(tab);
   }
 
   /* Destination schedule map */
-  rtable **nhu_pending = tmp_allocz(sizeof(rtable *) * rtable_max_id);
+  nhu_pending = tmp_allocz(sizeof(rtable *) * rtable_max_id);
 
   struct hostentry *he;
   node *n, *x;
@@ -4376,14 +4550,16 @@ rt_update_hostcache(void *data)
       if (rt_update_hostentry(tab, he))
 	nhu_pending[he->tab->id] = he->tab;
     }
+  }
 
   for (uint i=0; i<rtable_max_id; i++)
     if (nhu_pending[i])
-      rt_schedule_nhu(nhu_pending[i]);
+      RT_LOCKED(nhu_pending[i], dst)
+	rt_schedule_nhu(dst);
 }
 
 static struct hostentry *
-rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
+rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep)
 {
   struct hostentry *he;
 
diff --git a/nest/rt.h b/nest/rt.h
index 7cf8a91f..3a8489e8 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -53,7 +53,7 @@ struct rt_cork_threshold {
 struct rtable_config {
   node n;
   char *name;
-  struct rtable *table;
+  union rtable *table;
   struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
   uint addr_type;			/* Type of address data stored in table (NET_*) */
   uint gc_threshold;			/* Maximum number of operations before GC is run */
@@ -93,16 +93,28 @@ struct rt_table_exporter {
 
 extern uint rtable_max_id;
 
-typedef struct rtable {
-  resource r;
-  node n;				/* Node in list of all tables */
+DEFINE_DOMAIN(rtable);
+
+/* The public part of rtable structure */
+#define RTABLE_PUBLIC \
+    resource r;											\
+    node n;				/* Node in list of all tables */			\
+    char *name;				/* Name of this table */				\
+    uint addr_type;			/* Type of address data stored in table (NET_*) */	\
+    uint id;				/* Integer table ID for fast lookup */			\
+    DOMAIN(rtable) lock;		/* Lock to take to access the private parts */		\
+    struct rtable_config *config;	/* Configuration of this table */			\
+
+/* The complete rtable structure */
+struct rtable_private {
+  /* Once more the public part */
+  RTABLE_PUBLIC;
+
+  /* Here the private items not to be accessed without locking */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
   struct f_trie *trie;			/* Trie of prefixes defined in fib */
-  char *name;				/* Name of this table */
-  uint addr_type;			/* Type of address data stored in table (NET_*) */
-  uint id;				/* Integer table ID for fast lookup */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 
@@ -111,7 +123,6 @@ typedef struct rtable {
 
   struct hmap id_map;
   struct hostcache *hostcache;
-  struct rtable_config *config;		/* Configuration of this table */
   struct config *deleted;		/* Table doesn't exist in current configuration,
 					 * delete as soon as use_count becomes 0 and remove
 					 * obstacle from this routing table.
@@ -138,8 +149,28 @@ typedef struct rtable {
   struct tbf rl_pipe;			/* Rate limiting token buffer for pipe collisions */
 
   struct f_trie *flowspec_trie;		/* Trie for evaluation of flowspec notifications */
+};
+
+/* The final union private-public rtable structure */
+typedef union rtable {
+  struct {
+    RTABLE_PUBLIC;
+  };
+  struct rtable_private priv;
 } rtable;
 
+#define RT_IS_LOCKED(tab)	DOMAIN_IS_LOCKED(rtable, (tab)->lock)
+
+#define RT_LOCK(tab)	({ LOCK_DOMAIN(rtable, (tab)->lock); &(tab)->priv; })
+#define RT_UNLOCK(tab)	UNLOCK_DOMAIN(rtable, (tab)->lock)
+#define RT_PRIV(tab)	({ ASSERT_DIE(RT_IS_LOCKED((tab))); &(tab)->priv; })
+#define RT_PUB(tab)	SKIP_BACK(rtable, priv, tab)
+
+#define RT_LOCKED(tpub, tpriv) for (struct rtable_private *tpriv = RT_LOCK(tpub); tpriv; RT_UNLOCK(tpriv), (tpriv = NULL))
+#define RT_RETURN(tpriv, ...) do { RT_UNLOCK(tpriv); return __VA_ARGS__; } while (0)
+
+#define RT_PRIV_SAME(tpriv, tpub)	(&(tpub)->priv == (tpriv))
+
 extern struct rt_cork {
   _Atomic uint active;
   event_list queue;
@@ -386,7 +417,7 @@ int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
 void rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook);
 struct rt_export_hook *rt_alloc_export(struct rt_exporter *re, uint size);
-void rt_export_stopped(void *data);
+void rt_export_stopped(struct rt_export_hook *hook);
 void rt_exporter_init(struct rt_exporter *re);
 
 /* Types of route announcement, also used as flags */
@@ -416,7 +447,7 @@ struct hostentry {
   ip_addr addr;				/* IP address of host, part of key */
   ip_addr link;				/* (link-local) IP address of host, used as gw
 					   if host is directly attached */
-  struct rtable *tab;			/* Dependent table, part of key */
+  rtable *tab;				/* Dependent table, part of key */
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
@@ -487,34 +518,36 @@ void rt_init(void);
 void rt_preconfig(struct config *);
 void rt_postconfig(struct config *);
 void rt_commit(struct config *new, struct config *old);
+void rt_lock_table_priv(struct rtable_private *, const char *file, uint line);
+void rt_unlock_table_priv(struct rtable_private *, const char *file, uint line);
+static inline void rt_lock_table_pub(rtable *t, const char *file, uint line)
+{ RT_LOCKED(t, tt) rt_lock_table_priv(tt, file, line); }
+static inline void rt_unlock_table_pub(rtable *t, const char *file, uint line)
+{ RT_LOCKED(t, tt) rt_unlock_table_priv(tt, file, line); }
 
-void rt_lock_table_debug(rtable *, const char *file, uint line);
-void rt_unlock_table_debug(rtable *, const char *file, uint line);
-#define rt_lock_table(tab)	rt_lock_table_debug(tab, __FILE__, __LINE__)
-#define rt_unlock_table(tab)	rt_unlock_table_debug(tab, __FILE__, __LINE__)
+#define rt_lock_table(t)	_Generic((t),  rtable *: rt_lock_table_pub, \
+				struct rtable_private *: rt_lock_table_priv)((t), __FILE__, __LINE__)
+#define rt_unlock_table(t)	_Generic((t),  rtable *: rt_unlock_table_pub, \
+				struct rtable_private *: rt_unlock_table_priv)((t), __FILE__, __LINE__)
 
-struct f_trie * rt_lock_trie(rtable *tab);
-void rt_unlock_trie(rtable *tab, struct f_trie *trie);
+struct f_trie * rt_lock_trie(struct rtable_private *tab);
+void rt_unlock_trie(struct rtable_private *tab, struct f_trie *trie);
 void rt_flowspec_link(rtable *src, rtable *dst);
 void rt_flowspec_unlink(rtable *src, rtable *dst);
 rtable *rt_setup(pool *, struct rtable_config *);
-static inline void rt_shutdown(rtable *r) { rfree(r->rp); }
 
-static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
-static inline net *net_find_valid(rtable *tab, const net_addr *addr)
+static inline net *net_find(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
+static inline net *net_find_valid(struct rtable_private *tab, const net_addr *addr)
 { net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
-static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
-net *net_get(rtable *tab, const net_addr *addr);
-net *net_route(rtable *tab, const net_addr *n);
+static inline net *net_get(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
+net *net_route(struct rtable_private *tab, const net_addr *n);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
 void rt_modify_stale(rtable *t, struct rt_import_request *);
-void rt_schedule_prune(rtable *t);
+void rt_schedule_prune(struct rtable_private *t);
 void rte_dump(struct rte_storage *);
-void rte_free(struct rte_storage *);
-struct rte_storage *rte_store(const rte *, net *net, rtable *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
@@ -575,7 +608,7 @@ struct rt_show_data {
 
 void rt_show(struct rt_show_data *);
 struct rt_show_data_rtable * rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *name);
-struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, struct rtable *t);
+struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t);
 
 /* Value of table definition mode in struct rt_show_data */
 #define RSD_TDB_DEFAULT	  0		/* no table specified */
@@ -602,7 +635,7 @@ struct hostentry_adata {
 };
 
 void
-ea_set_hostentry(ea_list **to, struct rtable *dep, struct rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum]);
+ea_set_hostentry(ea_list **to, rtable *dep, rtable *tab, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum]);
 
 void ea_show_hostentry(const struct adata *ad, byte *buf, uint size);
 void ea_show_nexthop_list(struct cli *c, struct nexthop_adata *nhad);
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index e7d27f74..331ba730 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -113,7 +113,6 @@
 #define HASH_IP_EQ(a1,n1,a2,n2)	ipa_equal(a1, a2) && n1 == n2
 #define HASH_IP_FN(a,n)		ipa_hash(a) ^ u32_hash(n)
 
-DEFINE_DOMAIN(rtable);
 #define BFD_LOCK	LOCK_DOMAIN(rtable, bfd_global.lock)
 #define BFD_UNLOCK	UNLOCK_DOMAIN(rtable, bfd_global.lock)
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index dcced164..bfdd9ac5 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1981,9 +1981,20 @@ bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req
   rt_init_export(re, req->hook);
 }
 
+static void
+bgp_out_table_export_done(void *data)
+{
+  struct bgp_out_export_hook *hook = data;
+  struct rt_export_request *req = hook->h.req;
+  void (*stopped)(struct rt_export_request *) = hook->h.stopped;
+
+  rt_export_stopped(&hook->h);
+  CALL(stopped, req);
+}
+
 static const struct rt_exporter_class bgp_out_table_export_class = {
   .start = bgp_out_table_export_start,
-  .done = rt_export_stopped,
+  .done = bgp_out_table_export_done,
 };
 
 void
@@ -2519,7 +2530,7 @@ use_deterministic_med(struct rte_storage *r)
 }
 
 int
-bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
+bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best)
 {
   rte *key = new ? new : old;
   u32 lpref = rt_get_preference(key);
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 0cd327a2..1bcfb915 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -599,7 +599,7 @@ void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bu
 
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
-int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
+int bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
 void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count);
 u32 bgp_rte_igp_metric(const rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index f4c09ab1..f07f9ca2 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -228,7 +228,7 @@ mrt_next_table_(rtable *tab, rtable *tab_ptr, const char *pattern)
        NODE_VALID(tn);
        tn = tn->next)
   {
-    tab = SKIP_BACK(struct rtable, n, tn);
+    tab = SKIP_BACK(rtable, n, tn);
     if (patmatch(pattern, tab->name) &&
 	((tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6)))
       return tab;
@@ -243,13 +243,15 @@ mrt_next_table(struct mrt_table_dump_state *s)
   rtable *tab = mrt_next_table_(s->table, s->table_ptr, s->table_expr);
 
   if (s->table)
-    rt_unlock_table(s->table);
+    RT_LOCKED(s->table, tab)
+      rt_unlock_table(tab);
 
   s->table = tab;
   s->ipv4 = tab ? (tab->addr_type == NET_IP4) : 0;
 
   if (s->table)
-    rt_lock_table(s->table);
+    RT_LOCKED(s->table, tab)
+      rt_lock_table(tab);
 
   return s->table;
 }
@@ -573,14 +575,18 @@ mrt_table_dump_init(pool *pp)
 static void
 mrt_table_dump_free(struct mrt_table_dump_state *s)
 {
-  if (s->table_open)
-    FIB_ITERATE_UNLINK(&s->fit, &s->table->fib);
-
   if (s->table)
-    rt_unlock_table(s->table);
+    RT_LOCKED(s->table, tab)
+    {
+      if (s->table_open)
+	FIB_ITERATE_UNLINK(&s->fit, &tab->fib);
+
+      rt_unlock_table(tab);
+    }
 
   if (s->table_ptr)
-    rt_unlock_table(s->table_ptr);
+    RT_LOCKED(s->table_ptr, tab)
+      rt_unlock_table(tab);
 
   config_del_obstacle(s->config);
 
@@ -606,16 +612,19 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
 
     mrt_peer_table_dump(s);
 
-    FIB_ITERATE_INIT(&s->fit, &s->table->fib);
+    RT_LOCKED(s->table, tab)
+    {
+
+    FIB_ITERATE_INIT(&s->fit, &tab->fib);
     s->table_open = 1;
 
   step:
-    FIB_ITERATE_START(&s->table->fib, &s->fit, net, n)
+    FIB_ITERATE_START(&tab->fib, &s->fit, net, n)
     {
       if (s->max < 0)
       {
 	FIB_ITERATE_PUT(&s->fit);
-	return 0;
+	RT_RETURN(tab, 0);
       }
 
       /* With Always ADD_PATH option, we jump directly to second phase */
@@ -630,6 +639,8 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
     FIB_ITERATE_END;
     s->table_open = 0;
 
+    }
+
     mrt_close_file(s);
     mrt_peer_table_flush(s);
   }
@@ -661,7 +672,8 @@ mrt_timer(timer *t)
   s->always_add_path = cf->always_add_path;
 
   if (s->table_ptr)
-    rt_lock_table(s->table_ptr);
+    RT_LOCKED(s->table_ptr, tab)
+      rt_lock_table(tab);
 
   p->table_dump = s;
   ev_schedule(p->event);
@@ -737,7 +749,8 @@ mrt_dump_cmd(struct mrt_dump_data *d)
   s->filename = d->filename;
 
   if (s->table_ptr)
-    rt_lock_table(s->table_ptr);
+    RT_LOCKED(s->table_ptr, tab)
+      rt_lock_table(tab);
 
   this_cli->cont = mrt_dump_cont;
   this_cli->cleanup = mrt_dump_cleanup;
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index 3b83aa39..f535a391 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -40,7 +40,7 @@ struct mrt_proto {
 
 struct mrt_dump_data {
   const char *table_expr;
-  struct rtable *table_ptr;
+  rtable *table_ptr;
   const struct filter *filter;
   const char *filename;
 };
@@ -60,7 +60,7 @@ struct mrt_table_dump_state {
 
 					/* Configuration information */
   const char *table_expr;		/* Wildcard for table name (or NULL) */
-  struct rtable *table_ptr;		/* Explicit table (or NULL) */
+  rtable *table_ptr;			/* Explicit table (or NULL) */
   const struct filter *filter;		/* Optional filter */
   const char *filename;			/* Filename pattern */
   int always_add_path;			/* Always use *_ADDPATH message subtypes */
@@ -73,7 +73,7 @@ struct mrt_table_dump_state {
 
   HASH(struct mrt_peer_entry) peer_hash; /* Hash for peers to find the index */
 
-  struct rtable *table;			/* Processed table, NULL initially */
+  rtable *table;			/* Processed table, NULL initially */
   struct fib_iterator fit;		/* Iterator in processed table */
   int table_open;			/* Whether iterator is linked */
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index d82ac8aa..9adafe5a 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -202,7 +202,9 @@ perf_loop(void *data)
     p->exp++;
   }
 
-  rt_schedule_prune(P->main_channel->table);
+  RT_LOCKED(P->main_channel->table, tab)
+    rt_schedule_prune(tab);
+
   ev_schedule(p->loop);
 }
 
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index cfa9b1ee..d507c133 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -366,6 +366,13 @@ rte_feed_obtain(net *n, rte **feed, uint count)
 static struct rte *
 krt_export_net(struct krt_proto *p, net *net)
 {
+  /* FIXME: Here we are calling filters in table-locked context when exporting
+   * to kernel. Here BIRD can crash if the user requested ROA check in kernel
+   * export filter. It doesn't make much sense to write the filters like this,
+   * therefore we may keep this unfinished piece of work here for later as it
+   * won't really affect anybody. */
+  ASSERT_DIE(RT_IS_LOCKED(p->p.main_channel->table));
+
   struct channel *c = p->p.main_channel;
   const struct filter *filter = c->out_filter;
 
@@ -446,6 +453,9 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 #endif
   /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
 
+  RT_LOCKED(p->p.main_channel->table, tab)
+  {
+
   /* Deleting all routes if flush is requested */
   if (p->flush_routes)
     goto delete;
@@ -454,7 +464,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   if (!p->ready)
     goto ignore;
 
-  net *net = net_find(p->p.main_channel->table, e->net);
+  net *net = net_find(tab, e->net);
   if (!net || !krt_is_installed(p, net))
     goto delete;
 
@@ -499,7 +509,9 @@ delete:
   krt_replace_rte(p, e->net, NULL, e);
   goto done;
 
-done:
+done:;
+  }
+
   lp_flush(krt_filter_lp);
 }
 
@@ -512,7 +524,8 @@ krt_init_scan(struct krt_proto *p)
 static void
 krt_prune(struct krt_proto *p)
 {
-  struct rtable *t = p->p.main_channel->table;
+  RT_LOCKED(p->p.main_channel->table, t)
+  {
 
   KRT_TRACE(p, D_EVENTS, "Pruning table %s", t->name);
   FIB_WALK(&t->fib, net, n)
@@ -534,6 +547,8 @@ krt_prune(struct krt_proto *p)
 
   if (p->ready)
     p->initialized = 1;
+
+  }
 }
 
 static void

From 974f16b1f70ae8b7fa4efa6a217988e1811069e7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 9 Sep 2022 15:04:36 +0200
Subject: [PATCH 195/431] Created a dedicated settle timer structure

---
 conf/confbase.Y | 10 ++++++++
 doc/bird.sgml   | 17 ++++++-------
 lib/settle.h    | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 nest/config.Y   |  6 ++---
 nest/proto.c    | 53 +++++++++++++++++-----------------------
 nest/protocol.h |  7 +++---
 6 files changed, 110 insertions(+), 47 deletions(-)
 create mode 100644 lib/settle.h

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 241c332d..8e5da9e3 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -14,6 +14,7 @@ CF_HDR
 #include "conf/conf.h"
 #include "lib/resource.h"
 #include "lib/socket.h"
+#include "lib/settle.h"
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "nest/protocol.h"
@@ -93,6 +94,7 @@ CF_DECLS
   struct proto_spec ps;
   struct channel_limit cl;
   struct timeformat *tf;
+  struct settle_config settle;
   struct adata *ad;
   struct bytestring *bs;
 }
@@ -111,6 +113,7 @@ CF_DECLS
 
 %type <i> expr bool pxlen4
 %type <time> expr_us time
+%type <settle> settle
 %type <a> ipa
 %type <net> net_ip4_ net_ip4 net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
 %type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_ net_ip6_sadr_ net_mpls_
@@ -386,6 +389,13 @@ time:
    }
  ;
 
+/* Settle timer configuration */
+settle: expr_us expr_us {
+  if ($1 > $2) cf_error("Minimum settle time %t is bigger than maximum settle time %t", $1, $2);
+  $$.min = $1;
+  $$.max = $2;
+};
+
 text:
    TEXT
  | CF_SYM_KNOWN {
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 2bce3d57..54d67e89 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -965,14 +965,15 @@ inherited from templates can be updated by new definitions.
 	<ref id="bgp-export-table" name="export table"> (for respective
 	direction). Default: on.
 
-	<tag><label id="rtable-min-settle-time">min settle time <m/time/</tag>
-	Minimum settle time is a delay from the last ROA table change to wait
-	for more updates before triggering automatic reload. Default: 1 s.
-
-	<tag><label id="rtable-min-settle-time">min settle time <m/time/</tag>
-        Maximum settle time is an upper limit to the settle time from the
-        initial ROA table change even if there are consecutive updates gradually
-        renewing the settle time.  Default: 20 s.
+	<tag><label id="rtable-min-settle-time">roa settle time <m/time/ <m/time/</tag>
+	Minimum and maximum settle times, respectively, for ROA table changes.
+        The automatic reload is triggered after the minimum time after the last
+        ROA table change has been received but not later than the maximum time after
+        first unprocessed ROA table change. Therefore with default values, the
+        automatic reload happens 1 second after the ROA table stops updating, yet if it
+	were to be later than 20 seconds after the ROA table starts updating,
+	the automatic reload is triggered anyway. Default values: <cf/1 s 20 s/.
+	You have to always provide both values.
 
 	<tag><label id="proto-import-limit">import limit [<m/number/ | off ] [action warn | block | restart | disable]</tag>
 	Specify an import route limit (a maximum number of routes imported from
diff --git a/lib/settle.h b/lib/settle.h
new file mode 100644
index 00000000..d274599d
--- /dev/null
+++ b/lib/settle.h
@@ -0,0 +1,64 @@
+/*
+ *	BIRD -- Settle timer
+ *
+ *	(c) 2022 Maria Matejka <mq@jmq.cz>
+ *	(c) 2022 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_SETTLE_H_
+#define _BIRD_SETTLE_H_
+
+#include "lib/birdlib.h"
+#include "lib/timer.h"
+
+struct settle_config {
+  btime min, max;
+};
+
+struct settle {
+  union {
+    /* Timer hook polymorphism. */
+    struct {
+      resource _r;
+      void (*hook)(struct settle *);
+    };
+    timer tm;
+  };
+  struct settle_config cf;
+  btime started;
+};
+
+STATIC_ASSERT(OFFSETOF(struct settle, hook) == OFFSETOF(struct settle, tm) + OFFSETOF(timer, hook));
+
+#define SETTLE_INIT(_cfp, _hook, _data) (struct settle) { .tm = { .data = (_data), }, .hook = (_hook), .cf = ({ASSERT_DIE((_cfp)->min <= (_cfp)->max); *(_cfp); }), }
+
+
+static inline void settle_init(struct settle *s, struct settle_config *cf, void (*hook)(struct settle *), void *data)
+{
+  *s = SETTLE_INIT(cf, hook, data);
+}
+
+#define settle_active(s) tm_active(&(s)->tm)
+
+static inline void settle_kick(struct settle *s, struct birdloop *loop)
+{
+  if (!tm_active(&s->tm))
+  {
+    s->started = current_time();
+    tm_set_in(&s->tm, s->started + s->cf.min, loop);
+  }
+  else
+  {
+    btime now = current_time();
+    tm_set_in(&s->tm, MIN_(now + s->cf.min, s->started + s->cf.max), loop);
+  }
+}
+
+static inline void settle_cancel(struct settle *s)
+{
+  tm_stop(&s->tm);
+}
+
+#endif
diff --git a/nest/config.Y b/nest/config.Y
index 84c76ae9..52f5aedb 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -125,7 +125,7 @@ CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
 CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
 CF_KEYWORDS(CHECK, LINK)
-CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD)
+CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, ROA, SETTLE, TIME, GC, THRESHOLD, PERIOD)
 
 /* For r_args_channel */
 CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
@@ -321,8 +321,7 @@ channel_item_:
  | RECEIVE LIMIT limit_spec { this_channel->rx_limit = $3; }
  | IMPORT LIMIT limit_spec { this_channel->in_limit = $3; }
  | EXPORT LIMIT limit_spec { this_channel->out_limit = $3; }
- | MIN SETTLE TIME expr_us { this_channel->min_settle_time = $4; }
- | MAX SETTLE TIME expr_us { this_channel->max_settle_time = $4; }
+ | ROA SETTLE TIME settle { this_channel->roa_settle = $4; }
  | PREFERENCE expr { this_channel->preference = $2; check_u16($2); }
  | IMPORT KEEP FILTERED bool {
      if ($4)
@@ -424,7 +423,6 @@ timeformat_base:
    TIMEFORMAT timeformat_spec ';'
  ;
 
-
 /* Interface patterns */
 
 iface_patt_node_init:
diff --git a/nest/proto.c b/nest/proto.c
index 783a936c..8c8daa0a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -315,16 +315,15 @@ proto_remove_channels(struct proto *p)
 
 struct roa_subscription {
   node roa_node;
-  timer t;
-  btime base_settle_time;		/* Start of settling interval */
+  struct settle settle;
   struct channel *c;
   struct rt_export_request req;
 };
 
 static void
-channel_roa_in_changed(struct timer *t)
+channel_roa_in_changed(struct settle *se)
 {
-  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, t, t);
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se);
   struct channel *c = s->c;
   int active = !!c->reload_req.hook;
 
@@ -337,9 +336,9 @@ channel_roa_in_changed(struct timer *t)
 }
 
 static void
-channel_roa_out_changed(struct timer *t)
+channel_roa_out_changed(struct settle *se)
 {
-  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, t, t);
+  struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se);
   struct channel *c = s->c;
 
   CD(c, "Feeding triggered by RPKI change");
@@ -356,17 +355,7 @@ channel_export_one_roa(struct rt_export_request *req, const net_addr *net UNUSED
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
 
   /* TODO: use the information about what roa has changed */
-
-  if (!tm_active(&s->t))
-  {
-    s->base_settle_time = current_time();
-    tm_start(&s->t, s->base_settle_time + s->c->min_settle_time);
-  }
-  else
-    tm_set(&s->t,
-	MIN(s->base_settle_time + s->c->max_settle_time,
-	    current_time() + s->c->min_settle_time));
-
+  settle_kick(&s->settle, &main_birdloop);
 
   rpe_mark_seen_all(req->hook, first, NULL);
 }
@@ -380,14 +369,14 @@ channel_dump_roa_req(struct rt_export_request *req)
 
   debug("  Channel %s.%s ROA %s change notifier from table %s request %p\n",
       c->proto->name, c->name,
-      (s->t.hook == channel_roa_in_changed) ? "import" : "export",
+      (s->settle.hook == channel_roa_in_changed) ? "import" : "export",
       tab->name, req);
 }
 
 static int
 channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
 {
-  void (*hook)(struct timer *) =
+  void (*hook)(struct settle *) =
     dir ? channel_roa_in_changed : channel_roa_out_changed;
 
   struct roa_subscription *s;
@@ -395,7 +384,7 @@ channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
 
   WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
     if ((tab == SKIP_BACK(rtable, priv.exporter.e, s->req.hook->table))
-	  && (s->t.hook == hook))
+	  && (s->settle.hook == hook))
       return 1;
 
   return 0;
@@ -410,7 +399,7 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
   struct roa_subscription *s = mb_allocz(c->proto->pool, sizeof(struct roa_subscription));
 
   *s = (struct roa_subscription) {
-    .t = { .hook = dir ? channel_roa_in_changed : channel_roa_out_changed, },
+    .settle = SETTLE_INIT(&c->roa_settle, dir ? channel_roa_in_changed : channel_roa_out_changed, NULL),
     .c = c,
     .req = {
       .name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s",
@@ -934,8 +923,10 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
   cf->debug = new_config->channel_default_debug;
   cf->rpki_reload = 1;
 
-  cf->min_settle_time = 1 S;
-  cf->max_settle_time = 20 S;
+  cf->roa_settle = (struct settle_config) {
+    .min = 1 S,
+    .max = 20 S,
+  };
 
   add_tail(&proto->channels, &cf->n);
 
@@ -1017,20 +1008,20 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->rpki_reload = cf->rpki_reload;
 
-  if (	  (c->min_settle_time != cf->min_settle_time)
-       || (c->max_settle_time != cf->max_settle_time))
+  if (	  (c->roa_settle.min != cf->roa_settle.min)
+       || (c->roa_settle.max != cf->roa_settle.max))
   {
-    c->min_settle_time = cf->min_settle_time;
-    c->max_settle_time = cf->max_settle_time;
+    c->roa_settle = cf->roa_settle;
 
     struct roa_subscription *s;
     node *n;
 
     WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
-      if (tm_active(&s->t))
-	tm_set(&s->t,
-	    MIN(s->base_settle_time + c->max_settle_time,
-	      current_time() + c->min_settle_time));
+    {
+      s->settle.cf = cf->roa_settle;
+      if (settle_active(&s->settle))
+	settle_kick(&s->settle, &main_birdloop);
+    }
   }
 
   /* Execute channel-specific reconfigure hook */
diff --git a/nest/protocol.h b/nest/protocol.h
index e9461d41..0bf894f8 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -12,6 +12,7 @@
 #include "lib/lists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
+#include "lib/settle.h"
 #include "nest/rt.h"
 #include "nest/limit.h"
 #include "conf/conf.h"
@@ -462,8 +463,7 @@ struct channel_config {
   struct channel_limit in_limit;	/* Limit for importing routes from protocol */
   struct channel_limit out_limit;	/* Limit for exporting routes to protocol */
 
-  btime min_settle_time;		/* Minimum settle time for ROA-induced reload */
-  btime max_settle_time;		/* Maximum settle time for ROA-induced reload */
+  struct settle_config roa_settle;	/* Settle times for ROA-induced reload */
 
   u8 net_type;				/* Routing table network type (NET_*), 0 for undefined */
   u8 ra_mode;				/* Mode of received route advertisements (RA_*) */
@@ -492,8 +492,7 @@ struct channel {
   struct limit in_limit;		/* Input limit */
   struct limit out_limit;		/* Output limit */
 
-  btime min_settle_time;		/* Minimum settle time for ROA-induced reload */
-  btime max_settle_time;		/* Maximum settle time for ROA-induced reload */
+  struct settle_config roa_settle;	/* Settle times for ROA-induced reload */
 
   u8 limit_actions[PLD_MAX];		/* Limit actions enum */
   u8 limit_active;			/* Flags for active limits */

From 3d627d09d4da3bdc1712bde67ba62c9cfbfcedc9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 9 Sep 2022 19:09:31 +0200
Subject: [PATCH 196/431] Table export announcer needs both an event and a
 timer to do export bundling the right way

---
 nest/rt-table.c | 31 +++++++++++++++++++------------
 nest/rt.h       |  3 ++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 95248635..08d67331 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1432,6 +1432,14 @@ rt_announce_exports(timer *tm)
     }
 }
 
+static void
+rt_kick_announce_exports(void *_tab)
+{
+  RT_LOCKED((rtable *) _tab, tab)
+    if (!tm_active(tab->export_timer))
+      tm_start(tab->export_timer, tab->config->export_settle_time);
+}
+
 static void
 rt_import_announce_exports(void *_hook)
 {
@@ -1455,9 +1463,7 @@ rt_import_announce_exports(void *_hook)
     }
 
     rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
-
-    if (!tm_active(tab->exporter.export_timer))
-      tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+    ev_schedule(tab->export_event);
   }
 }
 
@@ -2703,6 +2709,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->rt_event = ev_new_init(p, rt_event, t);
   t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
+  t->export_event = ev_new_init(p, rt_kick_announce_exports, t);
+  t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
 
@@ -2712,7 +2720,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
       .addr_type = t->addr_type,
       .rp = t->rp,
     },
-    .export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0),
     .next_seq = 1,
   };
 
@@ -2852,8 +2859,8 @@ again:
   FIB_ITERATE_END;
 
   rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
-  if (!tm_active(tab->exporter.export_timer))
-    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+  if (!tm_active(tab->export_timer))
+    tm_start(tab->export_timer, tab->config->export_settle_time);
 
 #ifdef DEBUGGING
   fib_check(&tab->fib);
@@ -3078,8 +3085,8 @@ done:;
     ev_schedule(tab->rt_event);
 
 
-  if (EMPTY_LIST(tab->exporter.pending) && tm_active(tab->exporter.export_timer))
-    tm_stop(tab->exporter.export_timer);
+  if (EMPTY_LIST(tab->exporter.pending) && tm_active(tab->export_timer))
+    tm_stop(tab->export_timer);
 }
 
 static void
@@ -3704,8 +3711,8 @@ rt_next_hop_update(void *_tab)
     rt_trace(tab, D_STATES, "Next hop updater corked");
     if ((tab->nhu_state & NHU_RUNNING)
 	&& !EMPTY_LIST(tab->exporter.pending)
-	&& !tm_active(tab->exporter.export_timer))
-      tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+	&& !tm_active(tab->export_timer))
+      tm_start(tab->export_timer, tab->config->export_settle_time);
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
@@ -3744,8 +3751,8 @@ rt_next_hop_update(void *_tab)
   /* Finished NHU, cleanup */
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
 
-  if (!tm_active(tab->exporter.export_timer))
-    tm_start(tab->exporter.export_timer, tab->config->export_settle_time);
+  if (!tm_active(tab->export_timer))
+    tm_start(tab->export_timer, tab->config->export_settle_time);
 
   /* State change:
    *   NHU_DIRTY   -> NHU_SCHEDULED
diff --git a/nest/rt.h b/nest/rt.h
index 3a8489e8..23231c0b 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -85,7 +85,6 @@ struct rt_exporter {
 struct rt_table_exporter {
   struct rt_exporter e;
   list pending;				/* List of packed struct rt_pending_export */
-  struct timer *export_timer;
 
   struct rt_pending_export *first;	/* First export to announce */
   u64 next_seq;				/* The next export will have this ID */
@@ -129,6 +128,8 @@ struct rtable_private {
 					 */
   struct event *rt_event;		/* Routing table event */
   struct event *nhu_event;		/* Specific event for next hop update */
+  struct event *export_event;		/* Event for export batching */
+  struct timer *export_timer;		/* Timer for export batching */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
   btime last_rt_change;			/* Last time when route changed */
   btime gc_time;			/* Time of last GC */

From 1518970c128e6ab68884a7f49e09e2dc2a5d9fe3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 14 Sep 2022 09:59:45 +0200
Subject: [PATCH 197/431] Revert "Routing tables now have their own loops."

This reverts commit 878eeec12bf020c9e7460040d225a929bbbd2bd2.

These changes have been done in a different way in the other branch of
the future merge.
---
 filter/f-inst.c       |   4 +-
 nest/proto.c          |  77 ++++----
 nest/protocol.h       |   9 +-
 nest/route.h          | 106 +++++-------
 nest/rt-attr.c        |  11 +-
 nest/rt-show.c        |  29 +---
 nest/rt-table.c       | 395 +++++++++++++-----------------------------
 proto/bgp/attrs.c     |   2 +-
 proto/bgp/bgp.c       |  12 +-
 proto/bgp/bgp.h       |   2 +-
 proto/mrt/mrt.c       |  59 ++-----
 proto/mrt/mrt.h       |   6 +-
 proto/perf/perf.c     |   4 +-
 proto/radv/radv.c     |   5 +-
 proto/static/static.c |  12 +-
 sysdep/unix/krt.c     |   9 +-
 16 files changed, 240 insertions(+), 502 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 0341a2f1..706eb684 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -1212,7 +1212,7 @@
   INST(FI_ROA_CHECK_IMPLICIT, 0, 1) {	/* ROA Check */
     NEVER_CONSTANT;
     RTC(1);
-    rtable *table = rtc->table;
+    struct rtable *table = rtc->table;
     ACCESS_RTE;
     ACCESS_EATTRS;
     const net_addr *net = fs->rte->net;
@@ -1244,7 +1244,7 @@
     ARG(1, T_NET);
     ARG(2, T_INT);
     RTC(3);
-    rtable *table = rtc->table;
+    struct rtable *table = rtc->table;
 
     u32 as = v2.val.i;
 
diff --git a/nest/proto.c b/nest/proto.c
index 4ae0cbfd..35af3c6c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -172,7 +172,7 @@ proto_cf_find_channel(struct proto_config *pc, uint net_type)
  * Returns pointer to channel or NULL
  */
 struct channel *
-proto_find_channel_by_table(struct proto *p, rtable *t)
+proto_find_channel_by_table(struct proto *p, struct rtable *t)
 {
   struct channel *c;
 
@@ -236,9 +236,7 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->channel = cf->channel;
   c->proto = p;
   c->table = cf->table->table;
-
-  RT_LOCKED(c->table, t)
-    rt_lock_table(t);
+  rt_lock_table(c->table);
 
   c->in_filter = cf->in_filter;
   c->out_filter = cf->out_filter;
@@ -279,9 +277,7 @@ proto_remove_channel(struct proto *p UNUSED, struct channel *c)
 
   CD(c, "Removed", c->name);
 
-  RT_LOCKED(c->table, t)
-    rt_unlock_table(t);
-
+  rt_unlock_table(c->table);
   rem_node(&c->n);
   mb_free(c);
 }
@@ -395,7 +391,7 @@ static void
 channel_roa_subscribe_filter(struct channel *c, int dir)
 {
   const struct filter *f = dir ? c->in_filter : c->out_filter;
-  rtable *tab;
+  struct rtable *tab;
   int valid = 1, found = 0;
 
   if ((f == FILTER_ACCEPT) || (f == FILTER_REJECT))
@@ -564,11 +560,11 @@ channel_check_stopped(struct channel *c)
 }
 
 void
-channel_import_stopped(void *_c)
+channel_import_stopped(struct rt_import_request *req)
 {
-  struct channel *c = _c;
+  struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
-  c->in_req.hook = NULL;
+  req->hook = NULL;
 
   mb_free(c->in_req.name);
   c->in_req.name = NULL;
@@ -665,16 +661,17 @@ channel_aux_stopped(void *data)
   else
     c->in_table = NULL;
 
-  rfree(cat->tab->priv.rp);
+  rfree(cat->tab->rp);
+
   mb_free(cat);
-  channel_check_stopped(c);
+  return channel_check_stopped(c);
 }
 
 static void
-channel_aux_import_stopped(void *_cat)
+channel_aux_import_stopped(struct rt_import_request *req)
 {
-  struct channel_aux_table *cat = _cat;
-  cat->push.hook = NULL;
+  struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, push, req);
+  ASSERT_DIE(cat->tab->delete_event);
 }
 
 static void
@@ -683,35 +680,24 @@ channel_aux_export_stopped(struct rt_export_request *req)
   struct channel_aux_table *cat = SKIP_BACK(struct channel_aux_table, get, req);
   req->hook = NULL;
 
-  int del;
-  RT_LOCKED(cat->tab, t)
-    del = !!t->delete_event;
-
-  if (del)
-    return;
-
-  ASSERT_DIE(cat->refeed_pending);
-  cat->refeed_pending = 0;
-  rt_request_export(cat->tab, req);
+  if (cat->refeed_pending && !cat->tab->delete_event)
+  {
+    cat->refeed_pending = 0;
+    rt_request_export(cat->tab, req);
+  }
+  else
+    ASSERT_DIE(cat->tab->delete_event);
 }
 
 static void
 channel_aux_stop(struct channel_aux_table *cat)
 {
-  RT_LOCKED(cat->tab, t)
-  {
-    t->delete_event = ev_new_init(t->rp, channel_aux_stopped, cat);
-    t->delete_event->list = proto_event_list(cat->c->proto);
-  }
-
-  cat->push_stopped = (event) {
-    .hook = channel_aux_import_stopped,
-    .data = cat,
-    .list = proto_event_list(cat->c->proto),
-  };
-
-  rt_stop_import(&cat->push, &cat->push_stopped);
+  rt_stop_import(&cat->push, channel_aux_import_stopped);
   rt_stop_export(&cat->get, channel_aux_export_stopped);
+
+  cat->tab->delete_event = ev_new_init(cat->tab->rp, channel_aux_stopped, cat);
+
+  rt_unlock_table(cat->tab);
 }
 
 static void
@@ -903,6 +889,7 @@ channel_setup_in_table(struct channel *c, int best)
 
   c->in_table->c = c;
   c->in_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  rt_lock_table(c->in_table->tab);
 
   rt_request_import(c->in_table->tab, &c->in_table->push);
   rt_request_export(c->in_table->tab, &c->in_table->get);
@@ -944,6 +931,7 @@ channel_setup_out_table(struct channel *c)
 
   c->out_table->c = c;
   c->out_table->tab = rt_setup(c->proto->pool, &cat->tab_cf);
+  rt_lock_table(c->out_table->tab);
 
   rt_request_import(c->out_table->tab, &c->out_table->push);
   rt_request_export(c->out_table->tab, &c->out_table->get);
@@ -1005,14 +993,7 @@ channel_do_stop(struct channel *c)
 
   /* Stop import */
   if (c->in_req.hook)
-  {
-    c->in_stopped = (event) {
-      .hook = channel_import_stopped,
-      .data = c,
-      .list = proto_event_list(c->proto),
-    };
-    rt_stop_import(&c->in_req, &c->in_stopped);
-  }
+    rt_stop_import(&c->in_req, channel_import_stopped);
 
   c->gr_wait = 0;
   if (c->gr_lock)
@@ -2358,7 +2339,7 @@ proto_do_start(struct proto *p)
 {
   p->active = 1;
 
-  rt_init_sources(&p->sources, p->name, proto_work_list(p));
+  rt_init_sources(&p->sources, p->name, proto_event_list(p));
   if (!p->sources.class)
     p->sources.class = &default_rte_owner_class;
 
diff --git a/nest/protocol.h b/nest/protocol.h
index 8d077e44..1647fbba 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -18,6 +18,7 @@
 
 struct iface;
 struct ifa;
+struct rtable;
 struct rte;
 struct neighbor;
 struct rta;
@@ -206,7 +207,7 @@ struct proto {
    *	   rte_remove	Called whenever a rte is removed from the routing table.
    */
 
-  int (*rte_recalculate)(rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   int (*rte_better)(struct rte *, struct rte *);
   int (*rte_mergable)(struct rte *, struct rte *);
   void (*rte_insert)(struct network *, struct rte *);
@@ -495,7 +496,7 @@ struct channel {
   const struct channel_class *channel;
   struct proto *proto;
 
-  rtable *table;
+  struct rtable *table;
   const struct filter *in_filter;	/* Input filter */
   const struct filter *out_filter;	/* Output filter */
   struct bmap export_map;		/* Keeps track which routes were really exported */
@@ -555,7 +556,6 @@ struct channel {
   btime last_state_change;		/* Time of last state transition */
 
   struct channel_aux_table *in_table;	/* Internal table for received routes */
-  struct event in_stopped;		/* Import stop callback */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
   u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
@@ -570,7 +570,6 @@ struct channel_aux_table {
   struct channel *c;
   struct rt_import_request push;
   struct rt_export_request get;
-  event push_stopped;
   rtable *tab;
   event *stop;
   u8 refeed_pending;
@@ -634,7 +633,7 @@ struct channel_config *proto_cf_find_channel(struct proto_config *p, uint net_ty
 static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc)
 { return proto_cf_find_channel(pc, pc->net_type); }
 
-struct channel *proto_find_channel_by_table(struct proto *p, rtable *t);
+struct channel *proto_find_channel_by_table(struct proto *p, struct rtable *t);
 struct channel *proto_find_channel_by_name(struct proto *p, const char *n);
 struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
diff --git a/nest/route.h b/nest/route.h
index 9417d97d..683c966e 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -146,21 +146,30 @@ void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src)
  *	It's guaranteed that there is at most one RTE for every (prefix,proto) pair.
  */
 
-typedef struct rtable_private {
-#define RTABLE_PUBLIC \
-  resource r; \
-  node n;				/* Node in list of all tables */ \
-  struct birdloop *loop;		/* This loop runs the table */ \
-  char *name;				/* Name of this table */ \
-  uint addr_type;			/* Type of address data stored in table (NET_*) */ \
-  struct rtable_config *config;		/* Configuration of this table */ \
-  struct event *nhu_event;		/* Event to update next hops */ \
-  _Atomic byte nhu_state;		/* Next Hop Update state */ \
+struct rtable_config {
+  node n;
+  char *name;
+  struct config *config;
+  struct rtable *table;
+  struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
+  uint addr_type;			/* Type of address data stored in table (NET_*) */
+  int gc_max_ops;			/* Maximum number of operations before GC is run */
+  int gc_min_time;			/* Minimum time between two consecutive GC runs */
+  byte sorted;				/* Routes of network are sorted according to rte_better() */
+  btime min_settle_time;		/* Minimum settle time for notifications */
+  btime max_settle_time;		/* Maximum settle time for notifications */
+  btime export_settle_time;		/* Delay before exports are announced */
+  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
+};
 
-  RTABLE_PUBLIC;
+typedef struct rtable {
+  resource r;
+  node n;				/* Node in list of all tables */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
+  char *name;				/* Name of this table */
+  uint addr_type;			/* Type of address data stored in table (NET_*) */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
 
@@ -169,15 +178,18 @@ typedef struct rtable_private {
 
   struct hmap id_map;
   struct hostcache *hostcache;
+  struct rtable_config *config;		/* Configuration of this table */
   struct event *prune_event;		/* Event to prune abandoned routes */
   struct event *ec_event;		/* Event to prune finished exports */
   struct event *hcu_event;		/* Event to update host cache */
+  struct event *nhu_event;		/* Event to update next hops */
   struct event *delete_event;		/* Event to delete the table */
   btime last_rt_change;			/* Last time when route changed */
   btime base_settle_time;		/* Start time of rtable settling interval */
   btime gc_time;			/* Time of last GC */
   int gc_counter;			/* Number of operations since last GC */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
+  byte nhu_state;			/* Next Hop Update state */
 
   byte cork_active;			/* Congestion control activated */
 
@@ -196,35 +208,8 @@ typedef struct rtable_private {
 
   struct rt_pending_export *first_export;	/* First export to announce */
   u64 next_export_seq;			/* The next export will have this ID */
-} rtable_private;
-
-typedef union {
-  struct { RTABLE_PUBLIC };
-  rtable_private priv;
 } rtable;
 
-#define RT_LOCK(tab)	({ birdloop_enter((tab)->loop); &(tab)->priv; })
-#define RT_UNLOCK(tab)	birdloop_leave((tab)->loop)
-#define RT_PRIV(tab)	({ ASSERT_DIE(birdloop_inside((tab)->loop)); &(tab)->priv; })
-
-#define RT_LOCKED(tpub, tpriv)	for (rtable_private *tpriv = RT_LOCK(tpub); tpriv; RT_UNLOCK(tpriv), (tpriv = NULL))
-
-struct rtable_config {
-  node n;
-  char *name;
-  struct config *config;
-  rtable *table;
-  struct proto_config *krt_attached;	/* Kernel syncer attached to this table */
-  uint addr_type;			/* Type of address data stored in table (NET_*) */
-  int gc_max_ops;			/* Maximum number of operations before GC is run */
-  int gc_min_time;			/* Minimum time between two consecutive GC runs */
-  byte sorted;				/* Routes of network are sorted according to rte_better() */
-  btime min_settle_time;		/* Minimum settle time for notifications */
-  btime max_settle_time;		/* Maximum settle time for notifications */
-  btime export_settle_time;		/* Delay before exports are announced */
-  uint cork_limit;			/* Amount of routes to be pending on export to cork imports */
-};
-
 struct rt_subscription {
   node n;
   rtable *tab;
@@ -259,7 +244,7 @@ struct hostentry {
   ip_addr addr;				/* IP address of host, part of key */
   ip_addr link;				/* (link-local) IP address of host, used as gw
 					   if host is directly attached */
-  rtable *tab;				/* Dependent table, part of key */
+  struct rtable *tab;			/* Dependent table, part of key */
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
@@ -339,7 +324,7 @@ struct rt_import_hook {
   u8 stale_pruned;			/* Last prune finished when this value was set at stale_valid */
   u8 stale_pruning;			/* Last prune started when this value was set at stale_valid */
 
-  struct event *stopped;		/* Event to run when import is stopped */
+  void (*stopped)(struct rt_import_request *);	/* Stored callback when import is stopped */
 };
 
 struct rt_pending_export {
@@ -420,7 +405,7 @@ extern struct event_cork rt_cork;
 void rt_request_import(rtable *tab, struct rt_import_request *req);
 void rt_request_export(rtable *tab, struct rt_export_request *req);
 
-void rt_stop_import(struct rt_import_request *, struct event *stopped);
+void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
 void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));
 
 const char *rt_import_state_name(u8 state);
@@ -495,27 +480,27 @@ struct config;
 void rt_init(void);
 void rt_preconfig(struct config *);
 void rt_commit(struct config *new, struct config *old);
-void rt_lock_table(rtable_private *);
-void rt_unlock_table(rtable_private *);
+void rt_lock_table(rtable *);
+void rt_unlock_table(rtable *);
 void rt_subscribe(rtable *tab, struct rt_subscription *s);
 void rt_unsubscribe(struct rt_subscription *s);
 rtable *rt_setup(pool *, struct rtable_config *);
 
-static inline net *net_find(rtable_private *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
-static inline net *net_find_valid(rtable_private *tab, const net_addr *addr)
+static inline net *net_find(rtable *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
+static inline net *net_find_valid(rtable *tab, const net_addr *addr)
 { net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
-static inline net *net_get(rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
-void *net_route(rtable_private *tab, const net_addr *n);
+static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
+void *net_route(rtable *tab, const net_addr *n);
 int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
-int rt_examine(rtable_private *t, net_addr *a, struct channel *c, const struct filter *filter);
+int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
 
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
-void rt_schedule_prune(rtable_private *t);
+void rt_schedule_prune(rtable *t);
 void rte_dump(struct rte_storage *);
-void rte_free(struct rte_storage *, rtable_private *);
-struct rte_storage *rte_store(const rte *, net *net, rtable_private *);
+void rte_free(struct rte_storage *, rtable *);
+struct rte_storage *rte_store(const rte *, net *net, rtable *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_dump_hooks(rtable *);
@@ -606,7 +591,7 @@ struct rte_src {
 
 typedef struct rta {
   struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
+  _Atomic u32 uc;			/* Use count */
   u32 hash_key;				/* Hash over important fields */
   struct ea_list *eattrs;		/* Extended Attribute chain */
   struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
@@ -747,7 +732,7 @@ struct rte_owner_class {
 
 struct rte_owner {
   struct rte_owner_class *class;
-  int (*rte_recalculate)(rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
   HASH(struct rte_src) hash;
   const char *name;
   u32 hash_key;
@@ -878,20 +863,9 @@ static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a
 #define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
 rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
 static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) {
-  RTA_LOCK;
-  r->uc++;
-  RTA_UNLOCK;
-  return r;
-}
-
+static inline rta *rta_clone(rta *r) { ASSERT_DIE(0 < atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel)); return r; }
 void rta__free(rta *r);
-static inline void rta_free(rta *r) {
-  RTA_LOCK;
-  if (r && !--r->uc)
-    rta__free(r);
-  RTA_UNLOCK;
-}
+static inline void rta_free(rta *r) { if (r && (1 == atomic_fetch_sub_explicit(&r->uc, 1, memory_order_acq_rel))) rta__free(r); }
 rta *rta_do_cow(rta *o, linpool *lp);
 static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
 static inline void rta_uncache(rta *r) { r->cached = 0; r->uc = 0; }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index cd4c6892..20f9835d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1287,7 +1287,7 @@ rta_lookup(rta *o)
   for(r=rta_hash_table[h & rta_cache_mask]; r; r=r->next)
     if (r->hash_key == h && rta_same(r, o))
     {
-      r->uc++;
+      atomic_fetch_add_explicit(&r->uc, 1, memory_order_acq_rel);
       RTA_UNLOCK;
       return r;
     }
@@ -1308,6 +1308,14 @@ rta_lookup(rta *o)
 void
 rta__free(rta *a)
 {
+  RTA_LOCK;
+  if (atomic_load_explicit(&a->uc, memory_order_acquire))
+  {
+    /* Somebody has cloned this rta inbetween. This sometimes happens. */
+    RTA_UNLOCK;
+    return;
+  }
+
   ASSERT(rta_cache_count && a->cached);
   rta_cache_count--;
   *a->pprev = a->next;
@@ -1319,6 +1327,7 @@ rta__free(rta *a)
   ea_free(a->eattrs);
   a->cached = 0;
   sl_free(rta_slab(a), a);
+  RTA_UNLOCK;
 }
 
 rta *
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 65b59af4..8196903d 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -239,13 +239,11 @@ rt_show_cleanup(struct cli *c)
 
   /* Unlink the iterator */
   if (d->table_open)
-    RT_LOCKED(d->tab->table, t)
-      fit_get(&t->fib, &d->fit);
+    fit_get(&d->tab->table->fib, &d->fit);
 
   /* Unlock referenced tables */
   WALK_LIST(tab, d->tables)
-    RT_LOCKED(tab->table, t)
-      rt_unlock_table(t);
+    rt_unlock_table(tab->table);
 }
 
 static void
@@ -257,6 +255,8 @@ rt_show_cont(struct cli *c)
 #else
   unsigned max = 64;
 #endif
+  struct fib *fib = &d->tab->table->fib;
+  struct fib_iterator *it = &d->fit;
 
   if (d->running_on_config && (d->running_on_config != config))
   {
@@ -264,14 +264,9 @@ rt_show_cont(struct cli *c)
     goto done;
   }
 
-  rtable_private *t = RT_LOCK(d->tab->table);
-
-  struct fib *fib = &t->fib;
-  struct fib_iterator *it = &d->fit;
-
   if (!d->table_open)
   {
-    FIB_ITERATE_INIT(&d->fit, fib);
+    FIB_ITERATE_INIT(&d->fit, &d->tab->table->fib);
     d->table_open = 1;
     d->table_counter++;
     d->kernel = rt_show_get_kernel(d);
@@ -289,7 +284,6 @@ rt_show_cont(struct cli *c)
     if (!max--)
     {
       FIB_ITERATE_PUT(it);
-      RT_UNLOCK(d->tab->table);
       return;
     }
     rt_show_net(c, n, d);
@@ -306,8 +300,6 @@ rt_show_cont(struct cli *c)
 	       d->net_counter - d->net_counter_last, d->tab->table->name);
   }
 
-  RT_UNLOCK(d->tab->table);
-
   d->kernel = NULL;
   d->table_open = 0;
   d->tab = NODE_NEXT(d->tab);
@@ -439,8 +431,7 @@ rt_show(struct rt_show_data *d)
   if (!d->addr)
   {
     WALK_LIST(tab, d->tables)
-      RT_LOCKED(tab->table, t)
-	rt_lock_table(t);
+      rt_lock_table(tab->table);
 
     /* There is at least one table */
     d->tab = HEAD(d->tables);
@@ -455,17 +446,13 @@ rt_show(struct rt_show_data *d)
       d->tab = tab;
       d->kernel = rt_show_get_kernel(d);
 
-      RT_LOCK(tab->table);
-
       if (d->show_for)
-	n = net_route(RT_PRIV(tab->table), d->addr);
+	n = net_route(tab->table, d->addr);
       else
-	n = net_find(RT_PRIV(tab->table), d->addr);
+	n = net_find(tab->table, d->addr);
 
       if (n)
 	rt_show_net(this_cli, n, d);
-
-      RT_UNLOCK(tab->table);
     }
 
     if (d->rt_counter)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f304372f..fb0496bd 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -61,15 +61,15 @@ struct rt_export_block {
   struct rt_pending_export export[];
 };
 
-static void rt_free_hostcache(rtable_private *tab);
-static void rt_notify_hostcache(rtable_private *tab, net *net);
+static void rt_free_hostcache(rtable *tab);
+static void rt_notify_hostcache(rtable *tab, net *net);
 static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(void *tab);
 static inline void rt_prune_table(void *tab);
-static inline void rt_schedule_notify(rtable_private *tab);
+static inline void rt_schedule_notify(rtable *tab);
 static void rt_feed_channel(void *);
 
-static inline void rt_export_used(rtable_private *tab);
+static inline void rt_export_used(rtable *tab);
 static void rt_export_cleanup(void *tab);
 
 const char *rt_import_state_name_array[TIS_MAX] = {
@@ -122,7 +122,7 @@ rte_update_unlock(struct channel *c)
 
 /* Like fib_route(), but skips empty net entries */
 static inline void *
-net_route_ip4(rtable_private *t, net_addr_ip4 *n)
+net_route_ip4(rtable *t, net_addr_ip4 *n)
 {
   net *r;
 
@@ -136,7 +136,7 @@ net_route_ip4(rtable_private *t, net_addr_ip4 *n)
 }
 
 static inline void *
-net_route_ip6(rtable_private *t, net_addr_ip6 *n)
+net_route_ip6(rtable *t, net_addr_ip6 *n)
 {
   net *r;
 
@@ -150,7 +150,7 @@ net_route_ip6(rtable_private *t, net_addr_ip6 *n)
 }
 
 static inline void *
-net_route_ip6_sadr(rtable_private *t, net_addr_ip6_sadr *n)
+net_route_ip6_sadr(rtable *t, net_addr_ip6_sadr *n)
 {
   struct fib_node *fn;
 
@@ -189,7 +189,7 @@ net_route_ip6_sadr(rtable_private *t, net_addr_ip6_sadr *n)
 }
 
 void *
-net_route(rtable_private *tab, const net_addr *n)
+net_route(rtable *tab, const net_addr *n)
 {
   ASSERT(tab->addr_type == n->type);
 
@@ -218,15 +218,12 @@ net_route(rtable_private *tab, const net_addr *n)
 
 
 static int
-net_roa_check_ip4(rtable *t, const net_addr_ip4 *px, u32 asn)
+net_roa_check_ip4(rtable *tab, const net_addr_ip4 *px, u32 asn)
 {
   struct net_addr_roa4 n = NET_ADDR_ROA4(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
   int anything = 0;
 
-  RT_LOCK(t);
-  rtable_private *tab = RT_PRIV(t);
-
   while (1)
   {
     for (fn = fib_get_chain(&tab->fib, (net_addr *) &n); fn; fn = fn->next)
@@ -238,10 +235,7 @@ net_roa_check_ip4(rtable *t, const net_addr_ip4 *px, u32 asn)
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
-	{
-	  RT_UNLOCK(tab);
 	  return ROA_VALID;
-	}
       }
     }
 
@@ -252,20 +246,16 @@ net_roa_check_ip4(rtable *t, const net_addr_ip4 *px, u32 asn)
     ip4_clrbit(&n.prefix, n.pxlen);
   }
 
-  RT_UNLOCK(tab);
   return anything ? ROA_INVALID : ROA_UNKNOWN;
 }
 
 static int
-net_roa_check_ip6(rtable *t, const net_addr_ip6 *px, u32 asn)
+net_roa_check_ip6(rtable *tab, const net_addr_ip6 *px, u32 asn)
 {
   struct net_addr_roa6 n = NET_ADDR_ROA6(px->prefix, px->pxlen, 0, 0);
   struct fib_node *fn;
   int anything = 0;
 
-  RT_LOCK(t);
-  rtable_private *tab = RT_PRIV(t);
-
   while (1)
   {
     for (fn = fib_get_chain(&tab->fib, (net_addr *) &n); fn; fn = fn->next)
@@ -277,10 +267,7 @@ net_roa_check_ip6(rtable *t, const net_addr_ip6 *px, u32 asn)
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
-	{
-	  RT_UNLOCK(tab);
 	  return ROA_VALID;
-	}
       }
     }
 
@@ -291,7 +278,6 @@ net_roa_check_ip6(rtable *t, const net_addr_ip6 *px, u32 asn)
     ip6_clrbit(&n.prefix, n.pxlen);
   }
 
-  RT_UNLOCK(tab);
   return anything ? ROA_INVALID : ROA_UNKNOWN;
 }
 
@@ -342,7 +328,7 @@ rte_find(net *net, struct rte_src *src)
 
 
 struct rte_storage *
-rte_store(const rte *r, net *net, rtable_private *tab)
+rte_store(const rte *r, net *net, rtable *tab)
 {
   struct rte_storage *e = sl_alloc(tab->rte_slab);
 
@@ -368,7 +354,7 @@ rte_store(const rte *r, net *net, rtable_private *tab)
  */
 
 void
-rte_free(struct rte_storage *e, rtable_private *tab)
+rte_free(struct rte_storage *e, rtable *tab)
 {
   rt_unlock_source(e->rte.src);
   rta_free(e->rte.attrs);
@@ -926,7 +912,6 @@ rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
     hook->req->export_one(hook->req, n, rpe);
   else if (hook->req->export_bulk)
   {
-    RT_LOCK(hook->table);
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
     uint count = rte_feed_count(net);
     rte **feed = NULL;
@@ -935,7 +920,6 @@ rte_export(struct rt_export_hook *hook, struct rt_pending_export *rpe)
       feed = alloca(count * sizeof(rte *));
       rte_feed_obtain(net, feed, count);
     }
-    RT_UNLOCK(hook->table);
     hook->req->export_bulk(hook->req, n, rpe, feed, count);
   }
   else
@@ -947,11 +931,7 @@ seen:
 
   /* The last block may be available to free */
   if (PAGE_HEAD(hook->rpe_next) != PAGE_HEAD(rpe))
-  {
-    RT_LOCK(hook->table);
-    rt_export_used(RT_PRIV(hook->table));
-    RT_UNLOCK(hook->table);
-  }
+    rt_export_used(hook->table);
 
   /* Releasing this export for cleanup routine */
   DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe->seq);
@@ -990,7 +970,7 @@ seen:
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
   if (!new_best || !rte_is_valid(&new_best->rte))
@@ -1105,10 +1085,10 @@ rte_announce(rtable_private *tab, net *net, struct rte_storage *new, struct rte_
   {
     ev_cork(&rt_cork);
     tab->cork_active = 1;
-    tm_start_in(tab->export_timer, 0, tab->loop);
+    tm_start(tab->export_timer, 0);
   }
   else if (!tm_active(tab->export_timer))
-    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
+    tm_start(tab->export_timer, tab->config->export_settle_time);
 }
 
 static struct rt_pending_export *
@@ -1137,7 +1117,7 @@ rt_next_export_fast(struct rt_pending_export *last)
 }
 
 static struct rt_pending_export *
-rt_next_export(struct rt_export_hook *hook, rtable_private *tab)
+rt_next_export(struct rt_export_hook *hook, rtable *tab)
 {
   /* As the table is locked, it is safe to reload the last export pointer */
   struct rt_pending_export *last = atomic_load_explicit(&hook->last_export, memory_order_acquire);
@@ -1160,8 +1140,7 @@ rt_send_export_event(struct rt_export_hook *hook)
 static void
 rt_announce_exports(timer *tm)
 {
-  rtable_private *tab = tm->data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
+  rtable *tab = tm->data;
 
   struct rt_export_hook *c; node *n;
   WALK_LIST2(c, n, tab->exports, n)
@@ -1174,7 +1153,7 @@ rt_announce_exports(timer *tm)
 }
 
 static struct rt_pending_export *
-rt_last_export(rtable_private *tab)
+rt_last_export(rtable *tab)
 {
   struct rt_pending_export *rpe = NULL;
 
@@ -1200,17 +1179,13 @@ rt_export_hook(void *_data)
 
   if (!c->rpe_next)
   {
-    RT_LOCK(c->table);
-    c->rpe_next = rt_next_export(c, RT_PRIV(c->table));
+    c->rpe_next = rt_next_export(c, c->table);
 
     if (!c->rpe_next)
     {
-      rt_export_used(RT_PRIV(c->table));
-      RT_UNLOCK(c->table);
+      rt_export_used(c->table);
       return;
     }
-
-    RT_UNLOCK(c->table);
   }
 
   /* Process the export */
@@ -1280,9 +1255,10 @@ rte_same(rte *x, rte *y)
 static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
 
 static void
-rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
+rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
 {
   struct rt_import_request *req = c->req;
+  struct rtable *table = c->table;
   struct rt_import_stats *stats = &c->stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
   rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
@@ -1545,6 +1521,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
+
   if (c->in_table)
     rte_import(&c->in_table->push, n, new, src);
   else
@@ -1598,32 +1575,27 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
   if (!hook)
     return;
 
-  RT_LOCK(hook->table);
-  rtable_private *tab = RT_PRIV(hook->table);
-
   net *nn;
   if (new)
     {
       /* Use the actual struct network, not the dummy one */
-      nn = net_get(tab, n);
+      nn = net_get(hook->table, n);
       new->net = nn->n.addr;
       new->sender = hook;
     }
-  else if (!(nn = net_find(tab, n)))
+  else if (!(nn = net_find(hook->table, n)))
     {
       req->hook->stats.withdraws_ignored++;
-      RT_UNLOCK(tab);
       return;
     }
 
   /* And recalculate the best route */
-  rte_recalculate(tab, hook, nn, new, src);
-  RT_UNLOCK(tab);
+  rte_recalculate(hook, nn, new, src);
 }
 
 /* Check rtable for best route to given net whether it would be exported do p */
 int
-rt_examine(rtable_private *t, net_addr *a, struct channel *c, const struct filter *filter)
+rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
 {
   net *n = net_find(t, a);
 
@@ -1651,27 +1623,22 @@ static void
 rt_export_stopped(void *data)
 {
   struct rt_export_hook *hook = data;
+  rtable *tab = hook->table;
 
-  RT_LOCKED(hook->table, tab)
-  {
-    /* Drop pending exports */
-    rt_export_used(tab);
+  /* Drop pending exports */
+  rt_export_used(tab);
 
-    /* Unlist */
-    rem_node(&hook->n);
-  }
+  /* Unlist */
+  rem_node(&hook->n);
 
   /* Report the channel as stopped. */
   hook->stopped(hook->req);
 
-  RT_LOCKED(hook->table, tab)
-  {
-    /* Free the hook together with its coroutine. */
-    rfree(hook->pool);
-    rt_unlock_table(tab);
+  /* Free the hook together with its coroutine. */
+  rfree(hook->pool);
+  rt_unlock_table(tab);
 
-    DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
-  }
+  DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
 }
 
 
@@ -1696,10 +1663,8 @@ rt_set_export_state(struct rt_export_hook *hook, u8 state)
 }
 
 void
-rt_request_import(rtable *t, struct rt_import_request *req)
+rt_request_import(rtable *tab, struct rt_import_request *req)
 {
-  RT_LOCK(t);
-  rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
   struct rt_import_hook *hook = req->hook = mb_allocz(tab->rp, sizeof(struct rt_import_hook));
@@ -1707,7 +1672,7 @@ rt_request_import(rtable *t, struct rt_import_request *req)
   DBG("Lock table %s for import %p req=%p uc=%u\n", tab->name, hook, req, tab->use_count);
 
   hook->req = req;
-  hook->table = t;
+  hook->table = tab;
 
   if (!hook->stale_set)
     hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 1;
@@ -1716,30 +1681,24 @@ rt_request_import(rtable *t, struct rt_import_request *req)
 
   hook->n = (node) {};
   add_tail(&tab->imports, &hook->n);
-
-  RT_UNLOCK(t);
 }
 
 void
-rt_stop_import(struct rt_import_request *req, event *stopped)
+rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_request *))
 {
   ASSERT_DIE(req->hook);
   struct rt_import_hook *hook = req->hook;
 
-  RT_LOCK(hook->table);
-  rt_schedule_prune(RT_PRIV(hook->table));
+  rt_schedule_prune(hook->table);
 
   rt_set_import_state(hook, TIS_STOP);
 
   hook->stopped = stopped;
-  RT_UNLOCK(hook->table);
 }
 
 void
-rt_request_export(rtable *t, struct rt_export_request *req)
+rt_request_export(rtable *tab, struct rt_export_request *req)
 {
-  RT_LOCK(t);
-  rtable_private *tab = RT_PRIV(t);
   rt_lock_table(tab);
 
   pool *p = rp_new(tab->rp, "Export hook");
@@ -1747,7 +1706,7 @@ rt_request_export(rtable *t, struct rt_export_request *req)
   hook->pool = p;
   
   hook->req = req;
-  hook->table = t;
+  hook->table = tab;
 
   /* stats zeroed by mb_allocz */
 
@@ -1755,7 +1714,7 @@ rt_request_export(rtable *t, struct rt_export_request *req)
 
   rt_set_export_state(hook, TES_HUNGRY);
 
-  struct rt_pending_export *rpe = rt_last_export(tab);
+  struct rt_pending_export *rpe = rt_last_export(hook->table);
   DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
   atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
 
@@ -1767,11 +1726,9 @@ rt_request_export(rtable *t, struct rt_export_request *req)
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
   hook->event = ev_new_init(p, rt_feed_channel, hook);
-  RT_UNLOCK(t);
+  rt_send_export_event(hook);
 
   rt_set_export_state(hook, TES_FEEDING);
-  ASSERT_DIE(hook->export_state == TES_FEEDING);
-  rt_send_export_event(hook);
 }
 
 void
@@ -1780,8 +1737,7 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
-  RT_LOCK(hook->table);
-  rtable_private *tab = RT_PRIV(hook->table);
+  rtable *tab = hook->table;
 
   /* Stop feeding */
   ev_postpone(hook->event);
@@ -1794,11 +1750,10 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
 
   rt_send_export_event(hook);
 
-  RT_UNLOCK(hook->table);
-
   rt_set_export_state(hook, TES_STOP);
 }
 
+
 /**
  * rt_refresh_begin - start a refresh cycle
  * @t: related routing table
@@ -1817,17 +1772,14 @@ rt_refresh_begin(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
-  RT_LOCK(hook->table);
-  rtable_private *tab = RT_PRIV(hook->table);
-
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
   /* If the pruning routine is too slow */
   if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
       || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
   {
-    log(L_WARN "Route refresh flood in table %s", tab->name);
-    FIB_WALK(&tab->fib, net, n)
+    log(L_WARN "Route refresh flood in table %s", hook->table->name);
+    FIB_WALK(&hook->table->fib, net, n)
       {
 	for (struct rte_storage *e = n->routes; e; e = e->next)
 	  if (e->rte.sender == req->hook)
@@ -1847,8 +1799,6 @@ rt_refresh_begin(struct rt_import_request *req)
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
-
-  RT_UNLOCK(tab);
 }
 
 /**
@@ -1865,16 +1815,13 @@ rt_refresh_end(struct rt_import_request *req)
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
 
-  RT_LOCK(hook->table);
   hook->stale_valid++;
   ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
-  rt_schedule_prune(RT_PRIV(hook->table));
+  rt_schedule_prune(hook->table);
 
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
-
-  RT_UNLOCK(hook->table);
 }
 
 /**
@@ -1899,10 +1846,8 @@ rte_dump(struct rte_storage *e)
  * This function dumps contents of a given routing table to debug output.
  */
 void
-rt_dump(rtable *tab)
+rt_dump(rtable *t)
 {
-  RT_LOCK(tab);
-  rtable_private *t = RT_PRIV(tab);
   debug("Dump of routing table <%s>%s\n", t->name, t->delete_event ? " (deleted)" : "");
 #ifdef DEBUGGING
   fib_check(&t->fib);
@@ -1914,7 +1859,6 @@ rt_dump(rtable *tab)
     }
   FIB_WALK_END;
   debug("\n");
-  RT_UNLOCK(tab);
 }
 
 /**
@@ -1933,13 +1877,11 @@ rt_dump_all(void)
 }
 
 void
-rt_dump_hooks(rtable *t)
+rt_dump_hooks(rtable *tab)
 {
-  RT_LOCK(t);
-  rtable_private *tab = RT_PRIV(t);
   debug("Dump of hooks in routing table <%s>%s\n", tab->name, tab->delete_event ? " (deleted)" : "");
   debug("  nhu_state=%u hcu_scheduled=%u use_count=%d rt_count=%u\n",
-      atomic_load(&tab->nhu_state), ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
+      tab->nhu_state, ev_active(tab->hcu_event), tab->use_count, tab->rt_count);
   debug("  last_rt_change=%t gc_time=%t gc_counter=%d prune_state=%u\n",
       tab->last_rt_change, tab->gc_time, tab->gc_counter, tab->prune_state);
 
@@ -1962,7 +1904,6 @@ rt_dump_hooks(rtable *t)
        eh, eh->req, eh->refeed_pending, eh->last_state_change, atomic_load_explicit(&eh->export_state, memory_order_relaxed));
   }
   debug("\n");
-  RT_UNLOCK(t);
 }
 
 void
@@ -1980,36 +1921,37 @@ rt_dump_hooks_all(void)
 static inline void
 rt_schedule_nhu(rtable *tab)
 {
-  atomic_fetch_or_explicit(&tab->nhu_state, NHU_SCHEDULED, memory_order_acq_rel);
-  ev_send_loop(tab->loop, tab->nhu_event);
+  if (tab->nhu_state == NHU_CLEAN)
+    ev_schedule(tab->nhu_event);
 
   /* state change:
    *   NHU_CLEAN   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_DIRTY
    */
+  tab->nhu_state |= NHU_SCHEDULED;
 }
 
 void
-rt_schedule_prune(rtable_private *tab)
+rt_schedule_prune(rtable *tab)
 {
   if (tab->prune_state == 0)
-    ev_send_loop(tab->loop, tab->prune_event);
+    ev_schedule(tab->prune_event);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
 }
 
 void
-rt_export_used(rtable_private *tab)
+rt_export_used(rtable *tab)
 {
   if (config->table_debug)
     log(L_TRACE "%s: Export cleanup requested", tab->name);
 
-  ev_send_loop(tab->loop, tab->ec_event);
+  ev_schedule(tab->ec_event);
 }
 
 static inline btime
-rt_settled_time(rtable_private *tab)
+rt_settled_time(rtable *tab)
 {
   ASSUME(tab->base_settle_time != 0);
 
@@ -2020,8 +1962,7 @@ rt_settled_time(rtable_private *tab)
 static void
 rt_settle_timer(timer *t)
 {
-  rtable_private *tab = t->data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
+  rtable *tab = t->data;
 
   if (!tab->base_settle_time)
     return;
@@ -2029,7 +1970,7 @@ rt_settle_timer(timer *t)
   btime settled_time = rt_settled_time(tab);
   if (current_time() < settled_time)
   {
-    tm_set_in(tab->settle_timer, settled_time, tab->loop);
+    tm_set(tab->settle_timer, settled_time);
     return;
   }
 
@@ -2042,7 +1983,7 @@ rt_settle_timer(timer *t)
 }
 
 static void
-rt_kick_settle_timer(rtable_private *tab)
+rt_kick_settle_timer(rtable *tab)
 {
   tab->base_settle_time = current_time();
 
@@ -2050,11 +1991,11 @@ rt_kick_settle_timer(rtable_private *tab)
     tab->settle_timer = tm_new_init(tab->rp, rt_settle_timer, tab, 0, 0);
 
   if (!tm_active(tab->settle_timer))
-    tm_set_in(tab->settle_timer, rt_settled_time(tab), tab->loop);
+    tm_set(tab->settle_timer, rt_settled_time(tab));
 }
 
 static inline void
-rt_schedule_notify(rtable_private *tab)
+rt_schedule_notify(rtable *tab)
 {
   if (EMPTY_LIST(tab->subscribers))
     return;
@@ -2066,33 +2007,25 @@ rt_schedule_notify(rtable_private *tab)
 }
 
 void
-rt_subscribe(rtable *t, struct rt_subscription *s)
+rt_subscribe(rtable *tab, struct rt_subscription *s)
 {
-  s->tab = t;
-  RT_LOCKED(t, tab)
-  {
-    rt_lock_table(tab);
-    DBG("rt_subscribe(%s)\n", tab->name);
-    add_tail(&tab->subscribers, &s->n);
-  }
+  s->tab = tab;
+  rt_lock_table(tab);
+  DBG("rt_subscribe(%s)\n", tab->name);
+  add_tail(&tab->subscribers, &s->n);
 }
 
 void
 rt_unsubscribe(struct rt_subscription *s)
 {
-  RT_LOCKED(s->tab, tab)
-  {
-    rem_node(&s->n);
-    if (EMPTY_LIST(tab->subscribers) && tm_active(tab->settle_timer))
-      tm_stop(tab->settle_timer);
-    rt_unlock_table(tab);
-  }
+  rem_node(&s->n);
+  rt_unlock_table(s->tab);
 }
 
 static void
 rt_free(resource *_r)
 {
-  rtable_private *r = (rtable_private *) _r;
+  rtable *r = (rtable *) _r;
 
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
@@ -2113,14 +2046,14 @@ rt_free(resource *_r)
 static void
 rt_res_dump(resource *_r)
 {
-  RT_LOCKED((rtable *) _r, r)
+  rtable *r = (rtable *) _r;
   debug("name \"%s\", addr_type=%s, rt_count=%u, use_count=%d\n",
       r->name, net_label[r->addr_type], r->rt_count, r->use_count);
 }
 
 static struct resclass rt_class = {
   .name = "Routing table",
-  .size = sizeof(rtable_private),
+  .size = sizeof(struct rtable),
   .free = rt_free,
   .dump = rt_res_dump,
   .lookup = NULL,
@@ -2135,8 +2068,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
   ASSERT_DIE(ns - 1 == bsnprintf(nb, ns, "Routing table %s", cf->name));
 
   pool *p = rp_new(pp, nb);
+  mb_move(nb, p);
 
-  rtable_private *t = ralloc(p, &rt_class);
+  rtable *t = ralloc(p, &rt_class);
   t->rp = p;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
@@ -2156,8 +2090,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->pending_exports);
   init_list(&t->subscribers);
 
-  t->loop = birdloop_new(p, DOMAIN_ORDER(rtable), nb);
-
   t->ec_event = ev_new_init(p, rt_export_cleanup, t);
   t->prune_event = ev_new_init(p, rt_prune_table, t);
   t->hcu_event = ev_new_init(p, rt_update_hostcache, t);
@@ -2174,8 +2106,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->nhu_lp = lp_new_default(p);
 
-  mb_move(nb, p);
-  return (rtable *) t;
+  return t;
 }
 
 /**
@@ -2210,9 +2141,7 @@ rt_init(void)
 static void
 rt_prune_table(void *data)
 {
-  rtable_private *tab = data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
-
+  rtable *tab = data;
   struct fib_iterator *fit = &tab->prune_fit;
   int limit = 512;
 
@@ -2227,8 +2156,6 @@ rt_prune_table(void *data)
   if (tab->prune_state == 0)
     return;
 
-  rt_lock_table(tab);
-
   if (tab->prune_state == 1)
   {
     /* Mark channels to flush */
@@ -2262,12 +2189,11 @@ again:
 	    if (limit <= 0)
 	      {
 		FIB_ITERATE_PUT(fit);
-		ev_send_loop(tab->loop, tab->prune_event);
-		rt_unlock_table(tab);
+		ev_schedule(tab->prune_event);
 		return;
 	      }
 
-	    rte_recalculate(tab, e->rte.sender, n, NULL, e->rte.src);
+	    rte_recalculate(e->rte.sender, n, NULL, e->rte.src);
 	    limit--;
 
 	    goto rescan;
@@ -2291,8 +2217,7 @@ again:
   tab->gc_time = current_time();
 
   /* state change 2->0, 3->1 */
-  if (tab->prune_state &= 1)
-    ev_send_loop(tab->loop, tab->prune_event);
+  tab->prune_state &= 1;
 
   uint flushed_channels = 0;
 
@@ -2315,15 +2240,12 @@ again:
   /* In some cases, we may want to directly proceed to export cleanup */
   if (EMPTY_LIST(tab->exports) && flushed_channels)
     rt_export_cleanup(tab);
-
-  rt_unlock_table(tab);
 }
 
 static void
 rt_export_cleanup(void *data)
 {
-  rtable_private *tab = data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
+  rtable *tab = data;
 
   u64 min_seq = ~((u64) 0);
   struct rt_pending_export *last_export_to_free = NULL;
@@ -2472,7 +2394,7 @@ done:;
       if (!first_export || (first_export->seq >= ih->flush_seq))
       {
 	ih->import_state = TIS_CLEARED;
-	ev_send(ih->stopped->list, ih->stopped);
+	ih->stopped(ih->req);
 	rem_node(&ih->n);
 	mb_free(ih);
 	rt_unlock_table(tab);
@@ -2613,7 +2535,7 @@ no_nexthop:
 }
 
 static inline struct rte_storage *
-rt_next_hop_update_rte(rtable_private *tab, net *n, rte *old)
+rt_next_hop_update_rte(rtable *tab, net *n, rte *old)
 {
   rta *a = alloca(RTA_MAX_SIZE);
   memcpy(a, old->attrs, rta_size(old->attrs));
@@ -2631,7 +2553,7 @@ rt_next_hop_update_rte(rtable_private *tab, net *n, rte *old)
 }
 
 static inline int
-rt_next_hop_update_net(rtable_private *tab, net *n)
+rt_next_hop_update_net(rtable *tab, net *n)
 {
   struct rte_storage *new;
   int count = 0;
@@ -2716,21 +2638,17 @@ rt_next_hop_update_net(rtable_private *tab, net *n)
 static void
 rt_next_hop_update(void *data)
 {
-  rtable_private *tab = data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
-
+  rtable *tab = data;
   struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
-  if (atomic_load_explicit(&tab->nhu_state, memory_order_acquire) == NHU_CLEAN)
+  if (tab->nhu_state == NHU_CLEAN)
     return;
 
-  rt_lock_table(tab);
-
-  if (atomic_load_explicit(&tab->nhu_state, memory_order_acquire) == NHU_SCHEDULED)
+  if (tab->nhu_state == NHU_SCHEDULED)
     {
       FIB_ITERATE_INIT(fit, &tab->fib);
-      ASSERT_DIE(atomic_exchange_explicit(&tab->nhu_state, NHU_RUNNING, memory_order_acq_rel) == NHU_SCHEDULED);
+      tab->nhu_state = NHU_RUNNING;
     }
 
   FIB_ITERATE_START(&tab->fib, fit, net, n)
@@ -2738,8 +2656,7 @@ rt_next_hop_update(void *data)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_send_loop(tab->loop, tab->nhu_event);
-	  rt_unlock_table(tab);
+	  ev_schedule(tab->nhu_event);
 	  return;
 	}
       max_feed -= rt_next_hop_update_net(tab, n);
@@ -2750,10 +2667,10 @@ rt_next_hop_update(void *data)
    *   NHU_DIRTY   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_CLEAN
    */
-  if (atomic_fetch_and_explicit(&tab->nhu_state, NHU_SCHEDULED, memory_order_acq_rel) != NHU_RUNNING)
-    ev_send_loop(tab->loop, tab->nhu_event);
+  tab->nhu_state &= 1;
 
-  rt_unlock_table(tab);
+  if (tab->nhu_state != NHU_CLEAN)
+    ev_schedule(tab->nhu_event);
 }
 
 
@@ -2796,22 +2713,11 @@ rt_new_table(struct symbol *s, uint addr_type)
  * configuration.
  */
 void
-rt_lock_table(rtable_private *r)
+rt_lock_table(rtable *r)
 {
   r->use_count++;
 }
 
-static void
-rt_loop_stopped(void *data)
-{
-  rtable_private *r = data;
-  birdloop_free(r->loop);
-  r->loop = NULL;
-  r->prune_event->list = r->ec_event->list = NULL;
-  r->nhu_event->list = r->hcu_event->list = NULL;
-  ev_send(r->delete_event->list, r->delete_event);
-}
-
 /**
  * rt_unlock_table - unlock a routing table
  * @r: routing table to be unlocked
@@ -2821,14 +2727,14 @@ rt_loop_stopped(void *data)
  * for deletion by configuration changes.
  */
 void
-rt_unlock_table(rtable_private *r)
+rt_unlock_table(rtable *r)
 {
-  if (!--r->use_count && r->delete_event &&
-      !r->prune_state && !atomic_load_explicit(&r->nhu_state, memory_order_acquire))
+  if (!--r->use_count && r->delete_event)
     /* Delete the routing table by freeing its pool */
-    birdloop_stop_self(r->loop, rt_loop_stopped, r);
+    ev_schedule(r->delete_event);
 }
 
+
 static struct rtable_config *
 rt_find_table_config(struct config *cf, char *name)
 {
@@ -2839,9 +2745,7 @@ rt_find_table_config(struct config *cf, char *name)
 static void
 rt_done(void *data)
 {
-  rtable_private *t = data;
-  ASSERT_DIE(t->loop == NULL);
-
+  rtable *t = data;
   struct rtable_config *tc = t->config;
   struct config *c = tc->config;
 
@@ -2851,7 +2755,6 @@ rt_done(void *data)
   if (t->hostcache)
     rt_free_hostcache(t);
 
-  rfree(t->delete_event);
   rfree(t->rp);
 
   config_del_obstacle(c);
@@ -2879,15 +2782,14 @@ rt_commit(struct config *new, struct config *old)
     {
       WALK_LIST(o, old->tables)
 	{
-	  RT_LOCK(o->table);
-	  rtable_private *ot = RT_PRIV(o->table);
+	  rtable *ot = o->table;
 	  if (!ot->delete_event)
 	    {
 	      r = rt_find_table_config(new, o->name);
 	      if (r && (r->addr_type == o->addr_type) && !new->shutdown)
 		{
 		  DBG("\t%s: same\n", o->name);
-		  r->table = (rtable *) ot;
+		  r->table = ot;
 		  ot->name = r->name;
 		  ot->config = r;
 		  if (o->sorted != r->sorted)
@@ -2897,13 +2799,11 @@ rt_commit(struct config *new, struct config *old)
 		{
 		  DBG("\t%s: deleted\n", o->name);
 		  rt_lock_table(ot);
-		  ot->delete_event = ev_new_init(&root_pool, rt_done, ot);
-		  ot->delete_event->list = &global_event_list;
+		  ot->delete_event = ev_new_init(ot->rp, rt_done, ot);
 		  config_add_obstacle(old);
 		  rt_unlock_table(ot);
 		}
 	    }
-	  RT_UNLOCK(o->table);
 	}
     }
 
@@ -2934,98 +2834,46 @@ rt_feed_channel(void *data)
   struct fib_iterator *fit = &c->feed_fit;
   int max_feed = 256;
 
-  RT_LOCK(c->table);
-  rtable_private *tab = RT_PRIV(c->table);
-
   ASSERT(atomic_load_explicit(&c->export_state, memory_order_relaxed) == TES_FEEDING);
 
-redo:
-  FIB_ITERATE_START(&tab->fib, fit, net, n)
+  FIB_ITERATE_START(&c->table->fib, fit, net, n)
     {
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
 	  rt_send_export_event(c);
-
-	  RT_UNLOCK(c->table);
 	  return;
 	}
 
       if (atomic_load_explicit(&c->export_state, memory_order_acquire) != TES_FEEDING)
-      {
-	RT_UNLOCK(c->table);
 	return;
-      }
 
-      if (!n->routes || !rte_is_valid(&n->routes->rte))
-	; /* if no route, do nothing */
-      else if (c->req->export_bulk)
+      if (c->req->export_bulk)
       {
 	uint count = rte_feed_count(n);
 	if (count)
 	{
 	  rte **feed = alloca(count * sizeof(rte *));
 	  rte_feed_obtain(n, feed, count);
-
-	  struct rt_pending_export *rpe_last, *rpe_first = n->first;
-	  for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
-	    rpe_last = rpe;
-
-	  FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
-	  RT_UNLOCK(c->table);
-
 	  c->req->export_bulk(c->req, n->n.addr, NULL, feed, count);
-
-	  RT_LOCK(c->table);
-
-	  for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
-	  {
-	    rpe_mark_seen(c, rpe);
-	    if (rpe == rpe_last)
-	      break;
-	    ASSERT_DIE(rpe->seq < rpe_last->seq);
-	  }
-
 	  max_feed -= count;
-
-	  goto redo;
 	}
       }
-      else if (c->req->export_one)
+      else if (n->routes && rte_is_valid(&n->routes->rte))
       {
 	struct rt_pending_export rpe = { .new = n->routes, .new_best = n->routes };
-
-	struct rt_pending_export *rpe_last, *rpe_first = n->first;
-	for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
-	  rpe_last = rpe;
-
-	FIB_ITERATE_PUT_NEXT(fit, &tab->fib);
-	RT_UNLOCK(c->table);
-
 	c->req->export_one(c->req, n->n.addr, &rpe);
-
-	RT_LOCK(c->table);
-	for (struct rt_pending_export *rpe = rpe_first; rpe; rpe = rpe_next(rpe, NULL))
-	{
-	  rpe_mark_seen(c, rpe);
-	  if (rpe == rpe_last)
-	    break;
-	  ASSERT_DIE(rpe->seq < rpe_last->seq);
-	}
-
 	max_feed--;
-	goto redo;
       }
-      else
-	bug("Export request must always provide an export method");
+
+      for (struct rt_pending_export *rpe = n->first; rpe; rpe = rpe_next(rpe, NULL))
+	rpe_mark_seen(c, rpe);
     }
   FIB_ITERATE_END;
 
   c->event->hook = rt_export_hook;
   rt_send_export_event(c);
 
-  RT_UNLOCK(c->table);
-
   rt_set_export_state(c, TES_READY);
 }
 
@@ -3133,7 +2981,7 @@ hc_delete_hostentry(struct hostcache *hc, pool *p, struct hostentry *he)
 }
 
 static void
-rt_init_hostcache(rtable_private *tab)
+rt_init_hostcache(rtable *tab)
 {
   struct hostcache *hc = mb_allocz(tab->rp, sizeof(struct hostcache));
   init_list(&hc->hostentries);
@@ -3149,7 +2997,7 @@ rt_init_hostcache(rtable_private *tab)
 }
 
 static void
-rt_free_hostcache(rtable_private *tab)
+rt_free_hostcache(rtable *tab)
 {
   struct hostcache *hc = tab->hostcache;
 
@@ -3172,13 +3020,13 @@ rt_free_hostcache(rtable_private *tab)
 }
 
 static void
-rt_notify_hostcache(rtable_private *tab, net *net)
+rt_notify_hostcache(rtable *tab, net *net)
 {
   if (ev_active(tab->hcu_event))
     return;
 
   if (trie_match_net(tab->hostcache->trie, net->n.addr))
-    ev_send_loop(tab->loop, tab->hcu_event);
+    ev_schedule(tab->hcu_event);
 }
 
 static int
@@ -3211,7 +3059,7 @@ rt_get_igp_metric(rte *rt)
 }
 
 static int
-rt_update_hostentry(rtable_private *tab, struct hostentry *he)
+rt_update_hostentry(rtable *tab, struct hostentry *he)
 {
   rta *old_src = he->src;
   int direct = 0;
@@ -3277,9 +3125,7 @@ done:
 static void
 rt_update_hostcache(void *data)
 {
-  rtable_private *tab = data;
-  ASSERT_DIE(birdloop_inside(tab->loop));
-
+  rtable *tab = data;
   struct hostcache *hc = tab->hostcache;
   struct hostentry *he;
   node *n, *x;
@@ -3303,12 +3149,10 @@ rt_update_hostcache(void *data)
 }
 
 struct hostentry *
-rt_get_hostentry(rtable *t, ip_addr a, ip_addr ll, rtable *dep)
+rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
 {
   struct hostentry *he;
 
-  rtable_private *tab = RT_LOCK(t);
-
   if (!tab->hostcache)
     rt_init_hostcache(tab);
 
@@ -3316,13 +3160,10 @@ rt_get_hostentry(rtable *t, ip_addr a, ip_addr ll, rtable *dep)
   struct hostcache *hc = tab->hostcache;
   for (he = hc->hash_table[k >> hc->hash_shift]; he != NULL; he = he->next)
     if (ipa_equal(he->addr, a) && (he->tab == dep))
-      goto done;
+      return he;
 
   he = hc_new_hostentry(hc, tab->rp, a, ipa_zero(ll) ? a : ll, dep, k);
   rt_update_hostentry(tab, he);
-
-done:
-  RT_UNLOCK(t);
   return he;
 }
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1080db77..9b9013f9 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2140,7 +2140,7 @@ use_deterministic_med(struct rte_storage *r)
 }
 
 int
-bgp_rte_recalculate(rtable_private *table, net *net, rte *new, rte *old, rte *old_best)
+bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
 {
   rte *key = new ? new : old;
   u32 lpref = key->attrs->pref;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index aac1f45c..dc845550 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1800,12 +1800,10 @@ bgp_channel_start(struct channel *C)
   ip_addr src = p->local_ip;
 
   if (c->igp_table_ip4)
-    RT_LOCKED(c->igp_table_ip4, t)
-      rt_lock_table(t);
+    rt_lock_table(c->igp_table_ip4);
 
   if (c->igp_table_ip6)
-    RT_LOCKED(c->igp_table_ip6, t)
-      rt_lock_table(t);
+    rt_lock_table(c->igp_table_ip6);
 
   c->pool = p->p.pool; // XXXX
   bgp_init_bucket_table(c);
@@ -1886,12 +1884,10 @@ bgp_channel_cleanup(struct channel *C)
   struct bgp_channel *c = (void *) C;
 
   if (c->igp_table_ip4)
-    RT_LOCKED(c->igp_table_ip4, t)
-      rt_unlock_table(t);
+    rt_unlock_table(c->igp_table_ip4);
 
   if (c->igp_table_ip6)
-    RT_LOCKED(c->igp_table_ip6, t)
-      rt_unlock_table(t);
+    rt_unlock_table(c->igp_table_ip6);
 
   c->index = 0;
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 60f93bce..7cb4df1f 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -586,7 +586,7 @@ void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
 
 int bgp_rte_better(struct rte *, struct rte *);
 int bgp_rte_mergable(rte *pri, rte *sec);
-int bgp_rte_recalculate(rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
+int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
 void bgp_rte_modify_stale(struct rt_export_request *, const net_addr *, struct rt_pending_export *, rte **, uint);
 u32 bgp_rte_igp_metric(struct rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index b40592d2..9d78438d 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -228,7 +228,7 @@ mrt_next_table_(rtable *tab, rtable *tab_ptr, const char *pattern)
        NODE_VALID(tn);
        tn = tn->next)
   {
-    tab = SKIP_BACK(rtable, n, tn);
+    tab = SKIP_BACK(struct rtable, n, tn);
     if (patmatch(pattern, tab->name) &&
 	((tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6)))
       return tab;
@@ -243,21 +243,13 @@ mrt_next_table(struct mrt_table_dump_state *s)
   rtable *tab = mrt_next_table_(s->table, s->table_ptr, s->table_expr);
 
   if (s->table)
-  {
-    RT_LOCK(s->table);
-    rt_unlock_table(RT_PRIV(s->table));
-    RT_UNLOCK(s->table);
-  }
+    rt_unlock_table(s->table);
 
   s->table = tab;
   s->ipv4 = tab ? (tab->addr_type == NET_IP4) : 0;
 
   if (s->table)
-  {
-    RT_LOCK(s->table);
-    rt_lock_table(RT_PRIV(s->table));
-    RT_UNLOCK(s->table);
-  }
+    rt_lock_table(s->table);
 
   return s->table;
 }
@@ -581,23 +573,14 @@ mrt_table_dump_init(pool *pp)
 static void
 mrt_table_dump_free(struct mrt_table_dump_state *s)
 {
+  if (s->table_open)
+    FIB_ITERATE_UNLINK(&s->fit, &s->table->fib);
+
   if (s->table)
-  {
-    RT_LOCK(s->table);
-
-    if (s->table_open)
-      FIB_ITERATE_UNLINK(&s->fit, &RT_PRIV(s->table)->fib);
-
-    rt_unlock_table(RT_PRIV(s->table));
-    RT_UNLOCK(s->table);
-  }
+    rt_unlock_table(s->table);
 
   if (s->table_ptr)
-  {
-    RT_LOCK(s->table_ptr);
-    rt_unlock_table(RT_PRIV(s->table_ptr));
-    RT_UNLOCK(s->table_ptr);
-  }
+    rt_unlock_table(s->table_ptr);
 
   config_del_obstacle(s->config);
 
@@ -613,14 +596,8 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
   s->max = 2048;
   s->bws = &bws;
 
-  rtable_private *tab;
-
   if (s->table_open)
-  {
-    RT_LOCK(s->table);
-    tab = RT_PRIV(s->table);
     goto step;
-  }
 
   while (mrt_next_table(s))
   {
@@ -629,18 +606,15 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
 
     mrt_peer_table_dump(s);
 
-    RT_LOCK(s->table);
-    tab = RT_PRIV(s->table);
-    FIB_ITERATE_INIT(&s->fit, &tab->fib);
+    FIB_ITERATE_INIT(&s->fit, &s->table->fib);
     s->table_open = 1;
 
   step:
-    FIB_ITERATE_START(&tab->fib, &s->fit, net, n)
+    FIB_ITERATE_START(&s->table->fib, &s->fit, net, n)
     {
       if (s->max < 0)
       {
 	FIB_ITERATE_PUT(&s->fit);
-	RT_UNLOCK(s->table);
 	return 0;
       }
 
@@ -660,7 +634,6 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
     mrt_peer_table_flush(s);
   }
 
-  RT_UNLOCK(s->table);
   return 1;
 }
 
@@ -688,11 +661,7 @@ mrt_timer(timer *t)
   s->always_add_path = cf->always_add_path;
 
   if (s->table_ptr)
-  {
-    RT_LOCK(s->table_ptr);
-    rt_lock_table(RT_PRIV(s->table_ptr));
-    RT_UNLOCK(s->table_ptr);
-  }
+    rt_lock_table(s->table_ptr);
 
   p->table_dump = s;
   ev_schedule(p->event);
@@ -765,11 +734,7 @@ mrt_dump_cmd(struct mrt_dump_data *d)
   s->filename = d->filename;
 
   if (s->table_ptr)
-  {
-    RT_LOCK(s->table_ptr);
-    rt_lock_table(RT_PRIV(s->table_ptr));
-    RT_UNLOCK(s->table_ptr);
-  }
+    rt_lock_table(s->table_ptr);
 
   this_cli->cont = mrt_dump_cont;
   this_cli->cleanup = mrt_dump_cleanup;
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index 04865089..4ff94c12 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -40,7 +40,7 @@ struct mrt_proto {
 
 struct mrt_dump_data {
   const char *table_expr;
-  rtable *table_ptr;
+  struct rtable *table_ptr;
   const struct filter *filter;
   const char *filename;
 };
@@ -60,7 +60,7 @@ struct mrt_table_dump_state {
 
 					/* Configuration information */
   const char *table_expr;		/* Wildcard for table name (or NULL) */
-  rtable *table_ptr;			/* Explicit table (or NULL) */
+  struct rtable *table_ptr;		/* Explicit table (or NULL) */
   const struct filter *filter;		/* Optional filter */
   const char *filename;			/* Filename pattern */
   int always_add_path;			/* Always use *_ADDPATH message subtypes */
@@ -73,7 +73,7 @@ struct mrt_table_dump_state {
 
   HASH(struct mrt_peer_entry) peer_hash; /* Hash for peers to find the index */
 
-  rtable *table;			/* Processed table, NULL initially */
+  struct rtable *table;			/* Processed table, NULL initially */
   struct fib_iterator fit;		/* Iterator in processed table */
   int table_open;			/* Whether iterator is linked */
 
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index aa688d88..8b2cb69f 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -198,9 +198,7 @@ perf_loop(void *data)
     p->exp++;
   }
 
-  RT_LOCK(P->main_channel->table);
-  rt_schedule_prune(RT_PRIV(P->main_channel->table));
-  RT_UNLOCK(P->main_channel->table);
+  rt_schedule_prune(P->main_channel->table);
   ev_schedule(p->loop);
 }
 
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index d572c1b7..fa228c69 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -555,10 +555,7 @@ radv_check_active(struct radv_proto *p)
     return 1;
 
   struct channel *c = p->p.main_channel;
-  RT_LOCK(c->table);
-  int active = rt_examine(RT_PRIV(c->table), &cf->trigger, c, c->out_filter);
-  RT_UNLOCK(c->table);
-  return active;
+  return rt_examine(c->table, &cf->trigger, c, c->out_filter);
 }
 
 static void
diff --git a/proto/static/static.c b/proto/static/static.c
index bd7f3f5b..45791e8e 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -491,12 +491,10 @@ static_start(struct proto *P)
     static_lp = lp_new(&root_pool, LP_GOOD_SIZE(1024));
 
   if (p->igp_table_ip4)
-    RT_LOCKED(p->igp_table_ip4, t)
-      rt_lock_table(t);
+    rt_lock_table(p->igp_table_ip4);
 
   if (p->igp_table_ip6)
-    RT_LOCKED(p->igp_table_ip6, t)
-      rt_lock_table(t);
+    rt_lock_table(p->igp_table_ip6);
 
   p->event = ev_new_init(p->p.pool, static_announce_marked, p);
 
@@ -523,12 +521,10 @@ static_shutdown(struct proto *P)
     static_reset_rte(p, r);
 
   if (p->igp_table_ip4)
-    RT_LOCKED(p->igp_table_ip4, t)
-      rt_unlock_table(t);
+    rt_unlock_table(p->igp_table_ip4);
 
   if (p->igp_table_ip6)
-    RT_LOCKED(p->igp_table_ip6, t)
-      rt_unlock_table(t);
+    rt_unlock_table(p->igp_table_ip6);
 
   return PS_DOWN;
 }
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 98c56391..5431bebe 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -427,7 +427,6 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
 #endif
   /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
 
-  RT_LOCK(p->p.main_channel->table);
   /* Deleting all routes if flush is requested */
   if (p->flush_routes)
     goto delete;
@@ -436,7 +435,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   if (!p->ready)
     goto ignore;
 
-  net *net = net_find(RT_PRIV(p->p.main_channel->table), e->net);
+  net *net = net_find(p->p.main_channel->table, e->net);
   if (!net || !krt_is_installed(p, net))
     goto delete;
 
@@ -482,7 +481,6 @@ delete:
   goto done;
 
 done:
-  RT_UNLOCK(p->p.main_channel->table);
   lp_flush(krt_filter_lp);
 }
 
@@ -500,8 +498,7 @@ krt_init_scan(struct krt_proto *p)
 static void
 krt_prune(struct krt_proto *p)
 {
-  RT_LOCK(p->p.main_channel->table);
-  rtable_private *t = RT_PRIV(p->p.main_channel->table);
+  struct rtable *t = p->p.main_channel->table;
 
   KRT_TRACE(p, D_EVENTS, "Pruning table %s", t->name);
   FIB_WALK(&t->fib, net, n)
@@ -521,8 +518,6 @@ krt_prune(struct krt_proto *p)
   }
   FIB_WALK_END;
 
-  RT_UNLOCK(p->p.main_channel->table);
-
 #ifdef KRT_ALLOW_LEARN
   if (KRT_CF->learn)
     channel_refresh_end(p->p.main_channel);

From b80823fe828a0687d4baae3c34c737d46fbf439c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 9 Sep 2022 20:57:59 +0200
Subject: [PATCH 198/431] Memory pages allocator is now a global simple
 lockless structure

---
 lib/resource.c      |   2 +-
 lib/resource.h      |   1 +
 nest/cmds.c         |   6 +--
 sysdep/unix/alloc.c | 122 ++++++++++++++++++++++----------------------
 4 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/lib/resource.c b/lib/resource.c
index 898fb533..2e367132 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -279,8 +279,8 @@ rlookup(unsigned long a)
 void
 resource_init(void)
 {
-  resource_sys_init();
   rcu_init();
+  resource_sys_init();
 
   root_pool.r.class = &pool_class;
   root_pool.name = "Root";
diff --git a/lib/resource.h b/lib/resource.h
index 5ad011ec..56a746bb 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -122,6 +122,7 @@ void buffer_realloc(void **buf, unsigned *size, unsigned need, unsigned item_siz
 /* Allocator of whole pages; for use in slabs and other high-level allocators. */
 #define PAGE_HEAD(x)	((void *) (((uintptr_t) (x)) & ~(page_size-1)))
 extern long page_size;
+extern _Atomic int pages_kept;
 void *alloc_page(void);
 void free_page(void *);
 
diff --git a/nest/cmds.c b/nest/cmds.c
index 092be48a..96a3ec91 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -109,7 +109,6 @@ print_size(char *dsc, struct resmem vals)
 
 extern pool *rt_table_pool;
 extern pool *rta_pool;
-extern uint *pages_kept;
 
 void
 cmd_show_memory(void)
@@ -121,8 +120,9 @@ cmd_show_memory(void)
   print_size("Protocols:", rmemsize(proto_pool));
   struct resmem total = rmemsize(&root_pool);
 #ifdef HAVE_MMAP
-  print_size("Standby memory:", (struct resmem) { .overhead = page_size * *pages_kept });
-  total.overhead += page_size * *pages_kept;
+  int pages_kept = atomic_load_explicit(&pages_kept, memory_order_relaxed);
+  print_size("Standby memory:", (struct resmem) { .overhead = page_size * pages_kept });
+  total.overhead += page_size * pages_kept;
 #endif
   print_size("Total:", total);
   cli_msg(0, "");
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index a2384ca8..47cd4624 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -10,6 +10,7 @@
 #include "lib/resource.h"
 #include "lib/lists.h"
 #include "lib/event.h"
+#include "lib/rcu.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -22,41 +23,32 @@
 long page_size = 0;
 
 #ifdef HAVE_MMAP
-#define KEEP_PAGES_MAIN_MAX	256
-#define KEEP_PAGES_MAIN_MIN	8
-#define CLEANUP_PAGES_BULK	256
+#define KEEP_PAGES_MAX	256
+#define KEEP_PAGES_MIN	8
 
-STATIC_ASSERT(KEEP_PAGES_MAIN_MIN * 4 < KEEP_PAGES_MAIN_MAX);
+STATIC_ASSERT(KEEP_PAGES_MIN * 4 < KEEP_PAGES_MAX);
 
 static _Bool use_fake = 0;
+static _Bool initialized = 0;
 
 #if DEBUGGING
 struct free_page {
   node unused[42];
-  node n;
+  struct free_page * _Atomic next;
 };
 #else
 struct free_page {
-  node n;
+  struct free_page * _Atomic next;
 };
 #endif
 
-struct free_pages {
-  list pages;
-  u16 min, max;		/* Minimal and maximal number of free pages kept */
-  uint cnt;		/* Number of empty pages */
-  event cleanup;
-};
+static struct free_page * _Atomic page_stack = NULL;
 
-static void global_free_pages_cleanup_event(void *);
+static void page_cleanup(void *);
+static event page_cleanup_event = { .hook = page_cleanup, };
+#define SCHEDULE_CLEANUP  do if (initialized && !shutting_down) ev_send(&global_event_list, &page_cleanup_event); while (0)
 
-static struct free_pages global_free_pages = {
-  .min = KEEP_PAGES_MAIN_MIN,
-  .max = KEEP_PAGES_MAIN_MAX,
-  .cleanup = { .hook = global_free_pages_cleanup_event },
-};
-
-uint *pages_kept = &global_free_pages.cnt;
+_Atomic int pages_kept = 0;
 
 static void *
 alloc_sys_page(void)
@@ -90,20 +82,21 @@ alloc_page(void)
   }
 
 #ifdef HAVE_MMAP
-  struct free_pages *fps = &global_free_pages;
+  rcu_read_lock();
+  struct free_page *fp = atomic_load_explicit(&page_stack, memory_order_acquire);
+  while (fp && !atomic_compare_exchange_strong_explicit(
+	&page_stack, &fp, atomic_load_explicit(&fp->next, memory_order_acquire),
+	memory_order_acq_rel, memory_order_acquire))
+    ;
+  rcu_read_unlock();
 
-  if (fps->cnt)
-  {
-    struct free_page *fp = SKIP_BACK(struct free_page, n, HEAD(fps->pages));
-    rem_node(&fp->n);
-    if ((--fps->cnt < fps->min) && !shutting_down)
-      ev_send(&global_work_list, &fps->cleanup);
+  if (!fp)
+    return alloc_sys_page();
 
-    bzero(fp, page_size);
-    return fp;
-  }
+  if (atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed) <= KEEP_PAGES_MIN)
+    SCHEDULE_CLEANUP;
 
-  return alloc_sys_page();
+  return fp;
 #endif
 }
 
@@ -117,45 +110,51 @@ free_page(void *ptr)
   }
 
 #ifdef HAVE_MMAP
-  struct free_pages *fps = &global_free_pages;
+  rcu_read_lock();
   struct free_page *fp = ptr;
+  struct free_page *next = atomic_load_explicit(&page_stack, memory_order_acquire);
 
-  fp->n = (node) {};
-  add_tail(&fps->pages, &fp->n);
+  do atomic_store_explicit(&fp->next, next, memory_order_release);
+  while (!atomic_compare_exchange_strong_explicit(
+	&page_stack, &next, fp,
+	memory_order_acq_rel, memory_order_acquire));
+  rcu_read_unlock();
 
-  if ((++fps->cnt > fps->max) && !shutting_down)
-    ev_send(&global_work_list, &fps->cleanup);
+  if (atomic_fetch_add_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX)
+    SCHEDULE_CLEANUP;
 #endif
 }
 
 #ifdef HAVE_MMAP
 static void
-global_free_pages_cleanup_event(void *data UNUSED)
+page_cleanup(void *_ UNUSED)
 {
-  if (shutting_down)
+  struct free_page *stack = atomic_exchange_explicit(&page_stack, NULL, memory_order_acq_rel);
+  if (!stack)
     return;
 
-  struct free_pages *fps = &global_free_pages;
+  synchronize_rcu();
 
-  while (fps->cnt / 2 < fps->min)
-  {
-    struct free_page *fp = alloc_sys_page();
-    fp->n = (node) {};
-    add_tail(&fps->pages, &fp->n);
-    fps->cnt++;
-  }
+  do {
+    struct free_page *f = stack;
+    stack = atomic_load_explicit(&f->next, memory_order_acquire);
 
-  for (uint seen = 0; (seen < CLEANUP_PAGES_BULK) && (fps->cnt > fps->max / 2); seen++)
-  {
-    struct free_page *fp = SKIP_BACK(struct free_page, n, TAIL(fps->pages));
-    rem_node(&fp->n);
-
-    if (munmap(fp, page_size) == 0)
-      fps->cnt--;
-    else if (errno == ENOMEM)
-      add_head(&fps->pages, &fp->n);
+    if (munmap(f, page_size) == 0)
+      continue;
+    else if (errno != ENOMEM)
+      bug("munmap(%p) failed: %m", f);
     else
-      bug("munmap(%p) failed: %m", fp);
+      free_page(f);
+  }
+  while (stack && (atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX / 2));
+
+  while (stack)
+  {
+    atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
+
+    struct free_page *f = stack;
+    stack = atomic_load_explicit(&f->next, memory_order_acquire);
+    free_page(f);
   }
 }
 #endif
@@ -164,17 +163,17 @@ void
 resource_sys_init(void)
 {
 #ifdef HAVE_MMAP
-  ASSERT_DIE(global_free_pages.cnt == 0);
-
   if (!(page_size = sysconf(_SC_PAGESIZE)))
     die("System page size must be non-zero");
 
   if (u64_popcount(page_size) == 1)
   {
-    struct free_pages *fps = &global_free_pages;
 
-    init_list(&fps->pages);
-    global_free_pages_cleanup_event(NULL);
+    for (int i = 0; i < (KEEP_PAGES_MIN * 2); i++)
+      free_page(alloc_page());
+
+    page_cleanup(NULL);
+    initialized = 1;
     return;
   }
 
@@ -184,4 +183,5 @@ resource_sys_init(void)
 #endif
 
   page_size = 4096;
+  initialized = 1;
 }

From c49ee6e1a673fc1dc396857dbf8a73fa5d9d6b74 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 9 Sep 2022 13:52:37 +0200
Subject: [PATCH 199/431] Routing tables have their own service loops.

---
 lib/locking.h   |  1 +
 nest/rt-table.c | 84 ++++++++++++++++++++++++++++++++++---------------
 nest/rt.h       |  4 ++-
 3 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index 1df30063..498afdc8 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -15,6 +15,7 @@ struct domain_generic;
 struct lock_order {
   struct domain_generic *the_bird;
   struct domain_generic *proto;
+  struct domain_generic *service;
   struct domain_generic *rtable;
   struct domain_generic *attrs;
   struct domain_generic *resource;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 08d67331..f596e808 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -131,6 +131,7 @@ struct rt_export_block {
 static void rt_free_hostcache(struct rtable_private *tab);
 static void rt_update_hostcache(void *tab);
 static void rt_next_hop_update(void *tab);
+static void rt_nhu_uncork(void *_tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
 static inline void rt_prune_table(struct rtable_private *tab);
@@ -142,6 +143,7 @@ static void rt_feed_for(void *);
 static void rt_check_cork_low(struct rtable_private *tab);
 static void rt_check_cork_high(struct rtable_private *tab);
 static void rt_cork_release_hook(void *);
+static void rt_shutdown(void *);
 static void rt_delete(void *);
 
 static void rt_export_used(struct rt_table_exporter *);
@@ -1437,7 +1439,7 @@ rt_kick_announce_exports(void *_tab)
 {
   RT_LOCKED((rtable *) _tab, tab)
     if (!tm_active(tab->export_timer))
-      tm_start(tab->export_timer, tab->config->export_settle_time);
+      tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 }
 
 static void
@@ -1463,7 +1465,7 @@ rt_import_announce_exports(void *_hook)
     }
 
     rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
-    ev_schedule(tab->export_event);
+    ev_send_loop(tab->loop, tab->export_event);
   }
 }
 
@@ -2412,7 +2414,7 @@ rt_schedule_nhu(struct rtable_private *tab)
      *   NHU_RUNNING -> NHU_DIRTY
      */
     if ((tab->nhu_state |= NHU_SCHEDULED) == NHU_SCHEDULED)
-      ev_schedule(tab->nhu_event);
+      ev_send_loop(tab->loop, tab->nhu_event);
   }
 }
 
@@ -2420,7 +2422,7 @@ void
 rt_schedule_prune(struct rtable_private *tab)
 {
   if (tab->prune_state == 0)
-    ev_schedule(tab->rt_event);
+    ev_send_loop(tab->loop, tab->rt_event);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
@@ -2438,7 +2440,7 @@ rt_export_used(struct rt_table_exporter *e)
     return;
 
   tab->export_used = 1;
-  ev_schedule(tab->rt_event);
+  ev_send_loop(tab->loop, tab->rt_event);
 }
 
 static void
@@ -2447,6 +2449,7 @@ rt_event(void *ptr)
   RT_LOCKED((rtable *) ptr, tab)
   {
 
+  ASSERT_DIE(birdloop_inside(tab->loop));
   rt_lock_table(tab);
 
   if (tab->export_used)
@@ -2477,7 +2480,7 @@ rt_kick_prune_timer(struct rtable_private *tab)
   /* Randomize GC period to +/- 50% */
   btime gc_period = tab->config->gc_period;
   gc_period = (gc_period / 2) + (random_u32() % (uint) gc_period);
-  tm_start(tab->prune_timer, gc_period);
+  tm_start_in(tab->prune_timer, gc_period, tab->loop);
 }
 
 
@@ -2676,6 +2679,8 @@ uint rtable_max_id = 0;
 rtable *
 rt_setup(pool *pp, struct rtable_config *cf)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
   pool *p = rp_newf(pp, "Routing table %s", cf->name);
 
   struct rtable_private *t = ralloc(p, &rt_class);
@@ -2709,6 +2714,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->rt_event = ev_new_init(p, rt_event, t);
   t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
+  t->nhu_uncork_event = ev_new_init(p, rt_nhu_uncork, t);
   t->export_event = ev_new_init(p, rt_kick_announce_exports, t);
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
@@ -2737,6 +2743,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
     t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
   }
 
+  /* Start the service thread */
+  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing tahle %s", t->name));
+
   return RT_PUB(t);
 }
 
@@ -2825,7 +2834,7 @@ again:
       if (limit <= 0)
       {
 	FIB_ITERATE_PUT(fit);
-	ev_schedule(tab->rt_event);
+	ev_send_loop(tab->loop, tab->rt_event);
 	return;
       }
 
@@ -2860,7 +2869,7 @@ again:
 
   rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
   if (!tm_active(tab->export_timer))
-    tm_start(tab->export_timer, tab->config->export_settle_time);
+    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 
 #ifdef DEBUGGING
   fib_check(&tab->fib);
@@ -3082,7 +3091,7 @@ done:;
     rt_kick_prune_timer(tab);
 
   if (tab->export_used)
-    ev_schedule(tab->rt_event);
+    ev_send_loop(tab->loop, tab->rt_event);
 
 
   if (EMPTY_LIST(tab->exporter.pending) && tm_active(tab->export_timer))
@@ -3687,32 +3696,45 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
   return total;
 }
 
+static void
+rt_nhu_uncork(void *_tab)
+{
+  RT_LOCKED((rtable *) _tab, tab)
+  {
+    ASSERT_DIE(tab->nhu_corked);
+    ASSERT_DIE(tab->nhu_state == 0);
+
+    /* Reset the state */
+    tab->nhu_state = tab->nhu_corked;
+    tab->nhu_corked = 0;
+    rt_trace(tab, D_STATES, "Next hop updater uncorked");
+
+    ev_send_loop(tab->loop, tab->nhu_event);
+  }
+}
+
 static void
 rt_next_hop_update(void *_tab)
 {
   RT_LOCKED((rtable *) _tab, tab)
   {
 
-  /* If called from an uncork hook, reset the state */
+  ASSERT_DIE(birdloop_inside(tab->loop));
+
   if (tab->nhu_corked)
-  {
-    ASSERT_DIE(tab->nhu_state == 0);
-    tab->nhu_state = tab->nhu_corked;
-    tab->nhu_corked = 0;
-    rt_trace(tab, D_STATES, "Next hop updater uncorked");
-  }
+    return;
 
   if (!tab->nhu_state)
-    bug("Called NHU event for no reason in table %s", tab->name);
+    return;
 
   /* Check corkedness */
-  if (rt_cork_check(tab->nhu_event))
+  if (rt_cork_check(tab->nhu_uncork_event))
   {
     rt_trace(tab, D_STATES, "Next hop updater corked");
     if ((tab->nhu_state & NHU_RUNNING)
 	&& !EMPTY_LIST(tab->exporter.pending)
 	&& !tm_active(tab->export_timer))
-      tm_start(tab->export_timer, tab->config->export_settle_time);
+      tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
@@ -3738,7 +3760,7 @@ rt_next_hop_update(void *_tab)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_schedule(tab->nhu_event);
+	  ev_send_loop(tab->loop, tab->nhu_event);
 	  RT_RETURN(tab);
 	}
       lp_state lps;
@@ -3752,14 +3774,14 @@ rt_next_hop_update(void *_tab)
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
 
   if (!tm_active(tab->export_timer))
-    tm_start(tab->export_timer, tab->config->export_settle_time);
+    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 
   /* State change:
    *   NHU_DIRTY   -> NHU_SCHEDULED
    *   NHU_RUNNING -> NHU_CLEAN
    */
   if ((tab->nhu_state &= NHU_SCHEDULED) == NHU_SCHEDULED)
-    ev_schedule(tab->nhu_event);
+    ev_send_loop(tab->loop, tab->nhu_event);
 
   rt_unlock_table(tab);
 
@@ -3847,13 +3869,22 @@ rt_unlock_table_priv(struct rtable_private *r, const char *file, uint line)
 {
   rt_trace(r, D_STATES, "Unlocked at %s:%d", file, line);
   if (!--r->use_count && r->deleted)
-    /* Schedule the delete event to finish this up */
-    ev_send(&global_event_list, ev_new_init(r->rp, rt_delete, r));
+    /* Stop the service thread to finish this up */
+    ev_send(&global_event_list, ev_new_init(r->rp, rt_shutdown, r));
+}
+
+static void
+rt_shutdown(void *tab_)
+{
+  struct rtable_private *r = tab_;
+  birdloop_stop(r->loop, rt_delete, r);
 }
 
 static void
 rt_delete(void *tab_)
 {
+  birdloop_enter(&main_birdloop);
+
   /* We assume that nobody holds the table reference now as use_count is zero.
    * Anyway the last holder may still hold the lock. Therefore we lock and
    * unlock it the last time to be sure that nobody is there. */
@@ -3864,6 +3895,8 @@ rt_delete(void *tab_)
 
   rfree(tab->rp);
   config_del_obstacle(conf);
+
+  birdloop_leave(&main_birdloop);
 }
 
 
@@ -4366,7 +4399,8 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
 
   /* Yes, something has actually changed. Do the hostcache update. */
   if (o != RTE_VALID_OR_NULL(new_best))
-    ev_schedule_work(&hc->update);
+    RT_LOCKED((rtable *) hc->update.data, tab)
+      ev_send_loop(tab->loop, &hc->update);
 }
 
 
diff --git a/nest/rt.h b/nest/rt.h
index 23231c0b..cd3745d6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -111,6 +111,7 @@ struct rtable_private {
 
   /* Here the private items not to be accessed without locking */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
+  struct birdloop *loop;		/* Service thread */
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
   struct f_trie *trie;			/* Trie of prefixes defined in fib */
@@ -128,6 +129,7 @@ struct rtable_private {
 					 */
   struct event *rt_event;		/* Routing table event */
   struct event *nhu_event;		/* Specific event for next hop update */
+  struct event *nhu_uncork_event;	/* Helper event to schedule NHU on uncork */
   struct event *export_event;		/* Event for export batching */
   struct timer *export_timer;		/* Timer for export batching */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
@@ -188,7 +190,7 @@ static inline void rt_cork_release(void)
   if (atomic_fetch_sub_explicit(&rt_cork.active, 1, memory_order_acq_rel) == 1)
   {
     synchronize_rcu();
-    ev_schedule_work(&rt_cork.run);
+    ev_send(&global_work_list, &rt_cork.run);
   }
 }
 

From 66f27005ec1a3e1fa78733aad56dcd976fbb2744 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 11 Sep 2022 22:26:24 +0200
Subject: [PATCH 200/431] Cancelling all timers when loop stops

---
 sysdep/unix/io-loop.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 3e3fc31a..b7c858c6 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -560,8 +560,11 @@ birdloop_main(void *arg)
   /* Flush remaining events */
   ASSERT_DIE(!ev_run_list(&loop->event_list));
 
-  /* No timers allowed */
-  ASSERT_DIE(timers_count(&loop->time) == 0);
+  /* Drop timers */
+  while (t = timers_first(&loop->time))
+    tm_stop(t);
+
+  /* No sockets allowed */
   ASSERT_DIE(EMPTY_LIST(loop->sock_list));
   ASSERT_DIE(loop->sock_num == 0);
 

From eac634575959a3d32007ebed9921897976c9a82d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 12 Sep 2022 10:24:55 +0200
Subject: [PATCH 201/431] Loop flags: a simple idempotent event announcement
 mechanism

---
 lib/io-loop.h         |  8 ++++++++
 sysdep/unix/io-loop.c | 27 ++++++++++++++++++++++++++-
 sysdep/unix/io-loop.h |  3 +++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lib/io-loop.h b/lib/io-loop.h
index 2450a609..ae58bbee 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -50,6 +50,14 @@ void birdloop_unlink(struct birdloop *loop);
 
 void birdloop_ping(struct birdloop *loop);
 
+struct birdloop_flag_handler {
+  void (*hook)(struct birdloop_flag_handler *, u32 flags);
+  void *data;
+};
+
+void birdloop_flag(struct birdloop *loop, u32 flag);
+void birdloop_flag_set_handler(struct birdloop *, struct birdloop_flag_handler *);
+
 void birdloop_init(void);
 
 /* Yield for a little while. Use only in special cases. */
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index b7c858c6..575e5403 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -59,6 +59,31 @@ birdloop_inside(struct birdloop *loop)
   return 0;
 }
 
+void
+birdloop_flag(struct birdloop *loop, u32 flag)
+{
+  atomic_fetch_or_explicit(&loop->flags, flag, memory_order_acq_rel);
+  birdloop_ping(loop);
+}
+
+void
+birdloop_flag_set_handler(struct birdloop *loop, struct birdloop_flag_handler *fh)
+{
+  ASSERT_DIE(birdloop_inside(loop));
+  loop->flag_handler = fh;
+}
+
+static int
+birdloop_process_flags(struct birdloop *loop)
+{
+  if (!loop->flag_handler)
+    return 0;
+
+  u32 flags = atomic_exchange_explicit(&loop->flags, 0, memory_order_acq_rel);
+  loop->flag_handler->hook(loop->flag_handler, flags);
+  return !!flags;
+}
+
 /*
  *	Wakeup code for birdloop
  */
@@ -516,7 +541,7 @@ birdloop_main(void *arg)
   while (1)
   {
     timers_fire(&loop->time, 0);
-    if (ev_run_list(&loop->event_list))
+    if (birdloop_process_flags(loop) + ev_run_list(&loop->event_list))
       timeout = 0;
     else if (t = timers_first(&loop->time))
       timeout = (tm_remains(t) TO_MS) + 1;
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 31c40459..aec7a409 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -34,6 +34,9 @@ struct birdloop
 
   uint links;
 
+  _Atomic u32 flags;
+  struct birdloop_flag_handler *flag_handler;
+
   void (*stopped)(void *data);
   void *stop_data;
 

From 769224d79c3a25057932dda1d5d3ea9b583db1e5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 12 Sep 2022 10:25:14 +0200
Subject: [PATCH 202/431] Converted simple table events to loop flags

---
 nest/rt-table.c | 104 ++++++++++++++++++++++++------------------------
 nest/rt.h       |  12 ++++--
 2 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index f596e808..fbc41453 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -130,7 +130,7 @@ struct rt_export_block {
 
 static void rt_free_hostcache(struct rtable_private *tab);
 static void rt_update_hostcache(void *tab);
-static void rt_next_hop_update(void *tab);
+static void rt_next_hop_update(struct rtable_private *tab);
 static void rt_nhu_uncork(void *_tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
@@ -185,8 +185,12 @@ const char *rt_export_state_name(u8 state)
 
 static struct hostentry *rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep);
 
+static inline rtable *rt_priv_to_pub(struct rtable_private *tab) { return RT_PUB(tab); }
+static inline rtable *rt_pub_to_pub(rtable *tab) { return tab; }
+#define RT_ANY_TO_PUB(tab)	_Generic((tab),rtable*:rt_pub_to_pub,struct rtable_private*:rt_priv_to_pub)((tab))
+
 #define rt_trace(tab, level, fmt, args...)  do {\
-  struct rtable_private *t = (tab);		\
+  rtable *t = RT_ANY_TO_PUB((tab));		\
   if (t->config->debug & (level))		\
     log(L_TRACE "%s: " fmt, t->name, ##args);	\
 } while (0)
@@ -1435,38 +1439,37 @@ rt_announce_exports(timer *tm)
 }
 
 static void
-rt_kick_announce_exports(void *_tab)
+rt_kick_announce_exports(struct rtable_private *tab)
 {
-  RT_LOCKED((rtable *) _tab, tab)
-    if (!tm_active(tab->export_timer))
-      tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
+  if (!tm_active(tab->export_timer))
+    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
 }
 
 static void
 rt_import_announce_exports(void *_hook)
 {
   struct rt_import_hook *hook = _hook;
-  RT_LOCKED(hook->table, tab)
+  if (hook->import_state == TIS_CLEARED)
   {
-    if (hook->import_state == TIS_CLEARED)
+    void (*stopped)(struct rt_import_request *) = hook->stopped;
+    struct rt_import_request *req = hook->req;
+
+    RT_LOCKED(hook->table, tab)
     {
-      void (*stopped)(struct rt_import_request *) = hook->stopped;
-      struct rt_import_request *req = hook->req;
       req->hook = NULL;
 
       rt_trace(tab, D_EVENTS, "Hook %s stopped", req->name);
       rem_node(&hook->n);
       mb_free(hook);
       rt_unlock_table(tab);
-      RT_UNLOCK(tab);
-
-      stopped(req);
-      return;
     }
 
-    rt_trace(tab, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
-    ev_send_loop(tab->loop, tab->export_event);
+    stopped(req);
+    return;
   }
+
+  rt_trace(hook->table, D_EVENTS, "Announcing exports after imports from %s", hook->req->name);
+  birdloop_flag(hook->table->loop, RTF_EXPORT);
 }
 
 static struct rt_pending_export *
@@ -2399,22 +2402,18 @@ rt_schedule_nhu(struct rtable_private *tab)
   if (tab->nhu_corked)
   {
     if (!(tab->nhu_corked & NHU_SCHEDULED))
-    {
       tab->nhu_corked |= NHU_SCHEDULED;
-      rt_lock_table(tab);
-    }
   }
   else if (!(tab->nhu_state & NHU_SCHEDULED))
   {
     rt_trace(tab, D_EVENTS, "Scheduling NHU");
-    rt_lock_table(tab);
 
     /* state change:
      *   NHU_CLEAN   -> NHU_SCHEDULED
      *   NHU_RUNNING -> NHU_DIRTY
      */
     if ((tab->nhu_state |= NHU_SCHEDULED) == NHU_SCHEDULED)
-      ev_send_loop(tab->loop, tab->nhu_event);
+      birdloop_flag(tab->loop, RTF_NHU);
   }
 }
 
@@ -2422,7 +2421,7 @@ void
 rt_schedule_prune(struct rtable_private *tab)
 {
   if (tab->prune_state == 0)
-    ev_send_loop(tab->loop, tab->rt_event);
+    birdloop_flag(tab->loop, RTF_CLEANUP);
 
   /* state change 0->1, 2->3 */
   tab->prune_state |= 1;
@@ -2440,25 +2439,33 @@ rt_export_used(struct rt_table_exporter *e)
     return;
 
   tab->export_used = 1;
-  ev_send_loop(tab->loop, tab->rt_event);
+  birdloop_flag(tab->loop, RTF_CLEANUP);
 }
 
 static void
-rt_event(void *ptr)
+rt_flag_handler(struct birdloop_flag_handler *fh, u32 flags)
 {
-  RT_LOCKED((rtable *) ptr, tab)
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, fh, fh)), tab)
   {
+    ASSERT_DIE(birdloop_inside(tab->loop));
+    rt_lock_table(tab);
 
-  ASSERT_DIE(birdloop_inside(tab->loop));
-  rt_lock_table(tab);
+    if (flags & RTF_NHU)
+      rt_next_hop_update(tab);
 
-  if (tab->export_used)
-    rt_export_cleanup(tab);
+    if (flags & RTF_EXPORT)
+      rt_kick_announce_exports(tab);
 
-  if (tab->prune_state)
-    rt_prune_table(tab);
+    if (flags & RTF_CLEANUP)
+    {
+      if (tab->export_used)
+	rt_export_cleanup(tab);
 
-  rt_unlock_table(tab);
+      if (tab->prune_state)
+	rt_prune_table(tab);
+    }
+
+    rt_unlock_table(tab);
   }
 }
 
@@ -2712,10 +2719,8 @@ rt_setup(pool *pp, struct rtable_config *cf)
   hmap_init(&t->id_map, p, 1024);
   hmap_set(&t->id_map, 0);
 
-  t->rt_event = ev_new_init(p, rt_event, t);
-  t->nhu_event = ev_new_init(p, rt_next_hop_update, t);
+  t->fh = (struct birdloop_flag_handler) { .hook = rt_flag_handler, };
   t->nhu_uncork_event = ev_new_init(p, rt_nhu_uncork, t);
-  t->export_event = ev_new_init(p, rt_kick_announce_exports, t);
   t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
@@ -2745,6 +2750,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   /* Start the service thread */
   t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing tahle %s", t->name));
+  birdloop_enter(t->loop);
+  birdloop_flag_set_handler(t->loop, &t->fh);
+  birdloop_leave(t->loop);
 
   return RT_PUB(t);
 }
@@ -2834,7 +2842,7 @@ again:
       if (limit <= 0)
       {
 	FIB_ITERATE_PUT(fit);
-	ev_send_loop(tab->loop, tab->rt_event);
+	birdloop_flag(tab->loop, RTF_CLEANUP);
 	return;
       }
 
@@ -3091,10 +3099,9 @@ done:;
     rt_kick_prune_timer(tab);
 
   if (tab->export_used)
-    ev_send_loop(tab->loop, tab->rt_event);
+    birdloop_flag(tab->loop, RTF_CLEANUP);
 
-
-  if (EMPTY_LIST(tab->exporter.pending) && tm_active(tab->export_timer))
+  if (EMPTY_LIST(tab->exporter.pending))
     tm_stop(tab->export_timer);
 }
 
@@ -3709,16 +3716,13 @@ rt_nhu_uncork(void *_tab)
     tab->nhu_corked = 0;
     rt_trace(tab, D_STATES, "Next hop updater uncorked");
 
-    ev_send_loop(tab->loop, tab->nhu_event);
+    birdloop_flag(tab->loop, RTF_NHU);
   }
 }
 
 static void
-rt_next_hop_update(void *_tab)
+rt_next_hop_update(struct rtable_private *tab)
 {
-  RT_LOCKED((rtable *) _tab, tab)
-  {
-
   ASSERT_DIE(birdloop_inside(tab->loop));
 
   if (tab->nhu_corked)
@@ -3738,7 +3742,7 @@ rt_next_hop_update(void *_tab)
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
-    RT_RETURN(tab);
+    return;
   }
 
   struct fib_iterator *fit = &tab->nhu_fit;
@@ -3760,8 +3764,8 @@ rt_next_hop_update(void *_tab)
       if (max_feed <= 0)
 	{
 	  FIB_ITERATE_PUT(fit);
-	  ev_send_loop(tab->loop, tab->nhu_event);
-	  RT_RETURN(tab);
+	  birdloop_flag(tab->loop, RTF_NHU);
+	  return;
 	}
       lp_state lps;
       lp_save(tmp_linpool, &lps);
@@ -3781,11 +3785,7 @@ rt_next_hop_update(void *_tab)
    *   NHU_RUNNING -> NHU_CLEAN
    */
   if ((tab->nhu_state &= NHU_SCHEDULED) == NHU_SCHEDULED)
-    ev_send_loop(tab->loop, tab->nhu_event);
-
-  rt_unlock_table(tab);
-
-  }
+    birdloop_flag(tab->loop, RTF_NHU);
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index cd3745d6..649392b9 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -19,6 +19,7 @@
 #include "lib/route.h"
 #include "lib/event.h"
 #include "lib/rcu.h"
+#include "lib/io-loop.h"
 
 #include <stdatomic.h>
 
@@ -103,6 +104,7 @@ DEFINE_DOMAIN(rtable);
     uint id;				/* Integer table ID for fast lookup */			\
     DOMAIN(rtable) lock;		/* Lock to take to access the private parts */		\
     struct rtable_config *config;	/* Configuration of this table */			\
+    struct birdloop *loop;		/* Service thread */					\
 
 /* The complete rtable structure */
 struct rtable_private {
@@ -111,7 +113,6 @@ struct rtable_private {
 
   /* Here the private items not to be accessed without locking */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
-  struct birdloop *loop;		/* Service thread */
   struct slab *rte_slab;		/* Slab to allocate route objects */
   struct fib fib;
   struct f_trie *trie;			/* Trie of prefixes defined in fib */
@@ -127,12 +128,10 @@ struct rtable_private {
 					 * delete as soon as use_count becomes 0 and remove
 					 * obstacle from this routing table.
 					 */
-  struct event *rt_event;		/* Routing table event */
-  struct event *nhu_event;		/* Specific event for next hop update */
   struct event *nhu_uncork_event;	/* Helper event to schedule NHU on uncork */
-  struct event *export_event;		/* Event for export batching */
   struct timer *export_timer;		/* Timer for export batching */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
+  struct birdloop_flag_handler fh;	/* Handler for simple events */
   btime last_rt_change;			/* Last time when route changed */
   btime gc_time;			/* Time of last GC */
   uint gc_counter;			/* Number of operations since last GC */
@@ -174,6 +173,11 @@ typedef union rtable {
 
 #define RT_PRIV_SAME(tpriv, tpub)	(&(tpub)->priv == (tpriv))
 
+/* Flags for birdloop_flag() */
+#define RTF_CLEANUP	1
+#define RTF_NHU		2
+#define RTF_EXPORT	4
+
 extern struct rt_cork {
   _Atomic uint active;
   event_list queue;

From ff86f23dc71e75f3761042f750044645ab4e2ea1 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 12 Sep 2022 12:28:05 +0200
Subject: [PATCH 203/431] Export event doesn't have to be postponed before
 requeuing as an export-stop event

---
 nest/rt-table.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index fbc41453..f5750cac 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2188,19 +2188,16 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
-  /* Cancel the feeder event */
-  ev_postpone(&hook->event);
-
   /* Stop feeding from the exporter */
   CALL(hook->table->class->stop, hook);
 
+  /* Update export state */
+  rt_set_export_state(hook, TES_STOP);
+
   /* Reset the event as the stopped event */
   hook->event.hook = hook->table->class->done;
   hook->stopped = stopped;
 
-  /* Update export state */
-  rt_set_export_state(hook, TES_STOP);
-
   /* Run the stopped event */
   rt_send_export_event(hook);
 }
@@ -4131,9 +4128,6 @@ rt_feed_by_fib(void *data)
     {
       if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
       {
-	if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
-	  return;
-
 	if (!rt_prepare_feed(c, n, &block))
 	{
 	  FIB_ITERATE_PUT(fit);
@@ -4173,9 +4167,6 @@ rt_feed_by_trie(void *data)
     if (!n)
       continue;
 
-    if (atomic_load_explicit(&c->h.export_state, memory_order_acquire) != TES_FEEDING)
-      RT_RETURN(tab);
-
     if (!rt_prepare_feed(c, n, &block))
     {
       RT_UNLOCK(tab);

From c9d18e5ec57d0cb641ba8aee6d71476c4f5d2a73 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 12 Sep 2022 18:27:01 +0200
Subject: [PATCH 204/431] Table: Re-scheduling prune event when another prune
 loop is pending

---
 nest/rt-table.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index f5750cac..35da182c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2881,7 +2881,8 @@ again:
 #endif
 
   /* state change 2->0, 3->1 */
-  tab->prune_state &= 1;
+  if (tab->prune_state &= 1)
+    birdloop_flag(tab->loop, RTF_CLEANUP);
 
   if (tab->trie_new)
   {

From e3e15f36fa54414e497fab1a054c89c6b1cdd1df Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 13 Sep 2022 11:39:35 +0200
Subject: [PATCH 205/431] Longer unit test default timeout to prevent spurious
 build failures on slow virtuals

---
 test/birdtest.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/birdtest.h b/test/birdtest.h
index ad5f8f9c..b8978b3e 100644
--- a/test/birdtest.h
+++ b/test/birdtest.h
@@ -40,7 +40,7 @@ static inline u64 bt_random(void)
 void bt_log_suite_result(int result, const char *fmt, ...);
 void bt_log_suite_case_result(int result, const char *fmt, ...);
 
-#define BT_TIMEOUT 			5	/* Default timeout in seconds */
+#define BT_TIMEOUT 			20	/* Default timeout in seconds */
 #define BT_FORKING 			1	/* Forking is enabled in default */
 
 #define BT_RANDOM_SEED 			0x5097d2bb

From 0861d3a8a3af3935d474a12c6227ea2403375b4c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 12 Sep 2022 11:09:43 +0200
Subject: [PATCH 206/431] Fixing several race-conditions in event code.

After a suggestion by Santiago, I added the direct list pointer into
events and the events are now using this value to check whether the
route is active or not. Also the whole trick with sentinel node unioned
with event list is now gone.

For debugging, there is also an internal circular buffer to store what
has been recently happening in event code before e.g. a crash happened.
By default, this debug is off and must be manually enabled in
lib/event.c as it eats quite some time and space.
---
 lib/event.c | 139 ++++++++++++++++++++++++++++++++++++++++++----------
 lib/event.h |  30 ++++--------
 2 files changed, 122 insertions(+), 47 deletions(-)

diff --git a/lib/event.c b/lib/event.c
index 07d7dc53..68ee4c06 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -28,7 +28,50 @@
 event_list global_event_list;
 event_list global_work_list;
 
-STATIC_ASSERT(OFFSETOF(event_list, _sentinel.next) >= OFFSETOF(event_list, _end[0]));
+//#ifdef DEBUGGING
+#if 0
+#define EDL_MAX		16384
+enum edl_caller {
+  EDL_REMOVE_FROM = 1,
+  EDL_POSTPONE = 2,
+  EDL_RUN = 3,
+  EDL_SEND = 4, 
+  EDL_RUN_LIST = 5,
+} caller;
+static struct event_debug_log {
+  event_list *target_list;
+  event *event;
+  event *receiver;
+  uint pos;
+  uint prev_edl_pos;
+  uint thread;
+  enum edl_caller caller;
+} edl[EDL_MAX];
+static _Atomic uint edl_cnt;
+_Thread_local static uint edl_thread;
+_Thread_local static uint prev_edl_pos = ~0;
+static inline void edlog(event_list *list, event *e, event *receiver, uint pos, enum edl_caller caller)
+{
+  uint edl_pos = atomic_fetch_add_explicit(&edl_cnt, 1, memory_order_acq_rel);
+  if (!edl_thread)
+    edl_thread = edl_pos;
+
+  edl[edl_pos % EDL_MAX] = (struct event_debug_log) {
+    .target_list = list,
+    .event = e,
+    .receiver = receiver,
+    .pos = pos,
+    .prev_edl_pos = prev_edl_pos,
+    .thread = edl_thread,
+    .caller = caller,
+  };
+
+  prev_edl_pos = edl_pos;
+}
+#else
+#define edlog(...)
+#endif
+
 
 void
 ev_init_list(event_list *el, struct birdloop *loop, const char *name)
@@ -36,9 +79,8 @@ ev_init_list(event_list *el, struct birdloop *loop, const char *name)
   el->name = name;
   el->loop = loop;
 
-  atomic_store_explicit(&el->receiver, &el->_sentinel, memory_order_relaxed);
-  atomic_store_explicit(&el->_executor, &el->_sentinel, memory_order_relaxed);
-  atomic_store_explicit(&el->_sentinel.next, NULL, memory_order_relaxed);
+  atomic_store_explicit(&el->receiver, NULL, memory_order_release);
+  atomic_store_explicit(&el->_executor, NULL, memory_order_release);
 }
 
 /*
@@ -61,13 +103,20 @@ ev_remove_from(event *e, event * _Atomic * head)
   /* The current event in queue to check */
   event *cur = atomic_load_explicit(prev, memory_order_acquire);
 
-  /* Pre-loaded next pointer; if NULL, this is sentinel */
-  event *next = atomic_load_explicit(&cur->next, memory_order_acquire);
+  /* This part of queue is empty! */
+  if (!cur)
+    return 0;
 
-  while (next)
+  edlog(NULL, e, cur, 1, EDL_REMOVE_FROM);
+  while (cur)
   {
+    /* Pre-loaded next pointer */
+    event *next = atomic_load_explicit(&cur->next, memory_order_acquire);
+
     if (e == cur)
     {
+      edlog(NULL, e, next, 3, EDL_REMOVE_FROM);
+
       /* Check whether we have collided with somebody else
        * adding an item to the queue. */
       if (!atomic_compare_exchange_strong_explicit(
@@ -86,12 +135,15 @@ ev_remove_from(event *e, event * _Atomic * head)
       return 1;
     }
 
+    edlog(NULL, e, next, 2, EDL_REMOVE_FROM);
+
     /* Go to the next event. */
     prev = &cur->next;
     cur = next;
-    next = atomic_load_explicit(&cur->next, memory_order_acquire);
   }
 
+  edlog(NULL, e, cur, 4, EDL_REMOVE_FROM);
+
   return 0;
 }
 
@@ -100,6 +152,7 @@ ev_postpone(event *e)
 {
   /* Find the list to remove the event from */
   event_list *sl = ev_get_list(e);
+  edlog(sl, e, NULL, 1, EDL_POSTPONE);
   if (!sl)
     return;
 
@@ -108,6 +161,10 @@ ev_postpone(event *e)
 
   /* Remove from one of these lists. */
   ASSERT(ev_remove_from(e, &sl->_executor) || ev_remove_from(e, &sl->receiver));
+
+  /* Mark as inactive */
+  ASSERT_DIE(sl == atomic_exchange_explicit(&e->list, NULL, memory_order_acq_rel));
+  edlog(sl, e, NULL, 2, EDL_POSTPONE);
 }
 
 static void
@@ -157,8 +214,10 @@ ev_new(pool *p)
 inline void
 ev_run(event *e)
 {
+  edlog(NULL, e, NULL, 1, EDL_RUN);
   ev_postpone(e);
   e->hook(e->data);
+  edlog(NULL, e, NULL, 2, EDL_RUN);
 }
 
 /**
@@ -172,18 +231,36 @@ ev_run(event *e)
 inline void
 ev_send(event_list *l, event *e)
 {
-  event_list *sl = ev_get_list(e);
-  if (sl == l)
-    return;
-  if (sl)
-    bug("Queuing an already queued event to another queue is not supported.");
+  edlog(l, e, NULL, 1, EDL_SEND);
+  /* Set the target list */
+  event_list *ol = NULL;
+  if (!atomic_compare_exchange_strong_explicit(
+	&e->list, &ol, l,
+	memory_order_acq_rel, memory_order_acquire))
+    if (ol == l)
+      return;
+    else
+      bug("Queuing an already queued event to another queue is not supported.");
 
+  /* Here should be no concurrent senders */
   event *next = atomic_load_explicit(&l->receiver, memory_order_acquire);
-  do atomic_store_explicit(&e->next, next, memory_order_relaxed);
+  edlog(l, e, next, 2, EDL_SEND);
+  event *old_next = NULL;
+  do
+    if (!atomic_compare_exchange_strong_explicit(
+	  &e->next, &old_next, next,
+	  memory_order_acq_rel, memory_order_acquire))
+      bug("Event %p in inconsistent state");
+    else
+    {
+      old_next = next;
+      edlog(l, old_next, next, 3, EDL_SEND);
+    }
   while (!atomic_compare_exchange_strong_explicit(
 	&l->receiver, &next, e,
 	memory_order_acq_rel, memory_order_acquire));
 
+  edlog(l, e, next, 4, EDL_SEND);
   birdloop_ping(l->loop);
 }
 
@@ -199,37 +276,41 @@ int
 ev_run_list_limited(event_list *l, uint limit)
 {
   event * _Atomic *ep = &l->_executor;
+  edlog(l, NULL, NULL, 1, EDL_RUN_LIST);
 
   /* No pending events, refill the queue. */
-  if (atomic_load_explicit(ep, memory_order_relaxed) == &l->_sentinel)
+  if (!atomic_load_explicit(ep, memory_order_acquire))
   {
     /* Move the current event list aside and create a new one. */
-    event *received = atomic_exchange_explicit(
-	&l->receiver, &l->_sentinel, memory_order_acq_rel);
+    event *received = atomic_exchange_explicit(&l->receiver, NULL, memory_order_acq_rel);
+    edlog(l, NULL, received, 2, EDL_RUN_LIST);
 
     /* No event to run. */
-    if (received == &l->_sentinel)
+    if (!received)
       return 0;
 
     /* Setup the executor queue */
-    event *head = &l->_sentinel;
+    event *head = NULL;
 
     /* Flip the order of the events by relinking them one by one (push-pop) */
-    while (received != &l->_sentinel)
+    while (received)
     {
       event *cur = received;
-      received = atomic_exchange_explicit(&cur->next, head, memory_order_relaxed);
+      received = atomic_exchange_explicit(&cur->next, head, memory_order_acq_rel);
+      edlog(l, head, received, 3, EDL_RUN_LIST);
       head = cur;
     }
 
     /* Store the executor queue to its designated place */
-    atomic_store_explicit(ep, head, memory_order_relaxed);
+    ASSERT_DIE(atomic_exchange_explicit(ep, head, memory_order_acq_rel) == NULL);
+    edlog(l, NULL, head, 4, EDL_RUN_LIST);
   }
 
   /* Run the events in order. */
   event *e;
-  while ((e = atomic_load_explicit(ep, memory_order_relaxed)) != &l->_sentinel)
+  while (e = atomic_load_explicit(ep, memory_order_acquire))
     {
+      edlog(l, e, NULL, 5, EDL_RUN_LIST);
       /* Check limit */
       if (!--limit)
 	return 1;
@@ -238,14 +319,20 @@ ev_run_list_limited(event_list *l, uint limit)
       if ((l == &global_event_list) || (l == &global_work_list))
 	io_log_event(e->hook, e->data);
 
+      edlog(l, e, NULL, 6, EDL_RUN_LIST);
       /* Inactivate the event */
-      atomic_store_explicit(ep, atomic_load_explicit(&e->next, memory_order_relaxed), memory_order_relaxed);
-      atomic_store_explicit(&e->next, NULL, memory_order_relaxed);
+      event *next = atomic_load_explicit(&e->next, memory_order_relaxed);
+      ASSERT_DIE(e == atomic_exchange_explicit(ep, next, memory_order_acq_rel));
+      ASSERT_DIE(next == atomic_exchange_explicit(&e->next, NULL, memory_order_acq_rel));
+      ASSERT_DIE(l == atomic_exchange_explicit(&e->list, NULL, memory_order_acq_rel));
+      edlog(l, e, next, 7, EDL_RUN_LIST);
 
       /* Run the event */
       e->hook(e->data);
       tmp_flush();
+
+      edlog(l, e, next, 8, EDL_RUN_LIST);
     }
 
-  return atomic_load_explicit(&l->receiver, memory_order_relaxed) != &l->_sentinel;
+  return !!atomic_load_explicit(&l->receiver, memory_order_acquire);
 }
diff --git a/lib/event.h b/lib/event.h
index 9773c3a9..0bef737a 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -11,6 +11,7 @@
 
 #include "lib/resource.h"
 #include "lib/locking.h"
+#include "lib/rcu.h"
 
 #include <stdatomic.h>
 
@@ -21,17 +22,14 @@ typedef struct event {
   void (*hook)(void *);
   void *data;
   struct event * _Atomic next;
+  struct event_list * _Atomic list;
 } event;
 
-typedef union event_list {
-  struct {
-    event * _Atomic receiver;	/* Event receive list */
-    event * _Atomic _executor;	/* Event execute list */
-    const char *name;
-    struct birdloop *loop;	/* The executor loop */
-    char _end[0];
-  };
-  event _sentinel;	/* Sentinel node to actively detect list end */
+typedef struct event_list {
+  event * _Atomic receiver;	/* Event receive list */
+  event * _Atomic _executor;	/* Event execute list */
+  const char *name;
+  struct birdloop *loop;	/* The executor loop */
 } event_list;
 
 extern event_list global_event_list;
@@ -56,23 +54,13 @@ int ev_run_list_limited(event_list *, uint);
 static inline int
 ev_active(event *e)
 {
-  return atomic_load_explicit(&e->next, memory_order_relaxed) != NULL;
+  return atomic_load_explicit(&e->list, memory_order_acquire) != NULL;
 }
 
 static inline event_list *
 ev_get_list(event *e)
 {
-  /* We are looking for the sentinel node at the list end.
-   * After this, we have s->next == NULL */
-  event *s = e;
-  for (event *sn; sn = atomic_load_explicit(&s->next, memory_order_acquire); s = sn)
-    ;
-
-  /* No sentinel, no list. */
-  if (s == e)
-    return NULL;
-  else
-    return SKIP_BACK(event_list, _sentinel, s);
+  return atomic_load_explicit(&e->list, memory_order_acquire);
 }
 
 static inline event*

From cf38092b2ddf7c3bc8d2ec25e57c2621462c02c2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 14 Sep 2022 10:25:09 +0200
Subject: [PATCH 207/431] Fix for table hostcache corking and shutdown race
 conditions

---
 nest/rt-table.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 35da182c..4b9d83c5 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4008,7 +4008,11 @@ rt_commit(struct config *new, struct config *old)
 	  rt_lock_table(tab);
 
 	  if (tab->hostcache)
+	  {
 	    rt_stop_export(&tab->hostcache->req, NULL);
+	    if (ev_get_list(&tab->hostcache->update) == &rt_cork.queue)
+	      ev_postpone(&tab->hostcache->update);
+	  }
 
 	  rt_unlock_table(tab);
 
@@ -4392,7 +4396,9 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
   /* Yes, something has actually changed. Do the hostcache update. */
   if (o != RTE_VALID_OR_NULL(new_best))
     RT_LOCKED((rtable *) hc->update.data, tab)
-      ev_send_loop(tab->loop, &hc->update);
+      if ((atomic_load_explicit(&req->hook->export_state, memory_order_acquire) == TES_READY)
+	  && !ev_active(&hc->update))
+	ev_send_loop(tab->loop, &hc->update);
 }
 
 
@@ -4555,6 +4561,10 @@ rt_update_hostcache(void *data)
 
   struct hostcache *hc = tab->hostcache;
 
+  /* Shutdown shortcut */
+  if (!hc->req.hook)
+    RT_RETURN(tab);
+
   if (rt_cork_check(&hc->update))
   {
     rt_trace(tab, D_STATES, "Hostcache update corked");

From c179d4d644cfa835f53c2fc4aeb83728f5b3b76d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 14 Sep 2022 14:45:21 +0200
Subject: [PATCH 208/431] Switched off forking for filter test.

You don't want to fork with threads running.
---
 filter/filter_test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filter/filter_test.c b/filter/filter_test.c
index 5b24a765..671dba94 100644
--- a/filter/filter_test.c
+++ b/filter/filter_test.c
@@ -79,11 +79,11 @@ main(int argc, char *argv[])
   if (!bt_config_file_parse(BT_CONFIG_FILE))
     abort();
 
-  bt_test_suite(t_reconfig, "Testing reconfiguration");
+  bt_test_suite_extra(t_reconfig, 0, BT_TIMEOUT, "Testing reconfiguration");
 
   struct f_bt_test_suite *t;
   WALK_LIST(t, config->tests)
-    bt_test_suite_base(run_function, t->fn_name, t, BT_FORKING, BT_TIMEOUT, "%s", t->dsc);
+    bt_test_suite_base(run_function, t->fn_name, t, 0, BT_TIMEOUT, "%s", t->dsc);
 
   bt_bird_cleanup();
   return bt_exit_value();

From 4ba52a26877f0f9ac91ace02b99624b7d8152d22 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 20 Sep 2022 12:40:23 +0200
Subject: [PATCH 209/431] Route export may get corked on refeed startup

---
 nest/rt-table.c | 120 ++++++++++++++++++++++++++++++++++++++----------
 nest/rt.h       |   2 +
 2 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 4b9d83c5..b8dc6866 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -162,6 +162,7 @@ const char *rt_import_state_name_array[TIS_MAX] = {
 
 const char *rt_export_state_name_array[TES_MAX] = {
   [TES_DOWN] = "DOWN",
+  [TES_HUNGRY] = "HUNGRY",
   [TES_FEEDING] = "FEEDING",
   [TES_READY] = "READY",
   [TES_STOP] = "STOP"
@@ -2007,9 +2008,10 @@ void
 rt_set_export_state(struct rt_export_hook *hook, u8 state)
 {
   hook->last_state_change = current_time();
-  atomic_store_explicit(&hook->export_state, state, memory_order_release);
+  u8 old = atomic_exchange_explicit(&hook->export_state, state, memory_order_release);
 
-  CALL(hook->req->log_state_change, hook->req, state);
+  if (old != state)
+    CALL(hook->req->log_state_change, hook->req, state);
 }
 
 void
@@ -2047,6 +2049,36 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
   }
 }
 
+static void rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_hook *hook);
+static void
+rt_table_export_uncork(void *_hook)
+{
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
+  struct rt_table_export_hook *hook = _hook;
+  struct birdloop *loop = hook->h.req->list->loop;
+
+  if (loop != &main_birdloop)
+    birdloop_enter(loop);
+
+  u8 state;
+  switch (state = atomic_load_explicit(&hook->h.export_state, memory_order_relaxed))
+  {
+    case TES_HUNGRY:
+      RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, hook->table)), tab)
+	rt_table_export_start_feed(tab, hook);
+      break;
+    case TES_STOP:
+      rt_stop_export_common(&hook->h);
+      break;
+    default:
+      bug("Uncorking a table export in a strange state: %u", state);
+  }
+
+  if (loop != &main_birdloop)
+    birdloop_leave(loop);
+}
+
 static void
 rt_table_export_start_locked(struct rtable_private *tab, struct rt_export_request *req)
 {
@@ -2057,6 +2089,22 @@ rt_table_export_start_locked(struct rtable_private *tab, struct rt_export_reques
   req->hook->req = req;
 
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, req->hook);
+  hook->h.event = (event) {
+    .hook = rt_table_export_uncork,
+    .data = hook,
+  };
+
+  if (rt_cork_check(&hook->h.event))
+    rt_set_export_state(&hook->h, TES_HUNGRY);
+  else
+    rt_table_export_start_feed(tab, hook);
+}
+
+static void
+rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_hook *hook)
+{
+  struct rt_exporter *re = &tab->exporter.e;
+  struct rt_export_request *req = hook->h.req;
 
   /* stats zeroed by mb_allocz */
   switch (req->addr_mode)
@@ -2144,41 +2192,54 @@ rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook)
   rt_send_export_event(hook);
 }
 
-static void
+static int
 rt_table_export_stop_locked(struct rt_export_hook *hh)
 {
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
   struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter, hook->table);
 
-  if (atomic_load_explicit(&hh->export_state, memory_order_relaxed) == TES_FEEDING)
-    switch (hh->req->addr_mode)
-    {
-      case TE_ADDR_IN:
-	if (hook->walk_lock)
-	{
-	  rt_unlock_trie(tab, hook->walk_lock);
-	  hook->walk_lock = NULL;
-	  mb_free(hook->walk_state);
-	  hook->walk_state = NULL;
+  switch (atomic_load_explicit(&hh->export_state, memory_order_relaxed))
+  {
+    case TES_HUNGRY:
+      return 0;
+    case TES_FEEDING:
+      switch (hh->req->addr_mode)
+      {
+	case TE_ADDR_IN:
+	  if (hook->walk_lock)
+	  {
+	    rt_unlock_trie(tab, hook->walk_lock);
+	    hook->walk_lock = NULL;
+	    mb_free(hook->walk_state);
+	    hook->walk_state = NULL;
+	    break;
+	  }
+	  /* fall through */
+	case TE_ADDR_NONE:
+	  fit_get(&tab->fib, &hook->feed_fit);
 	  break;
-	}
-	/* fall through */
-      case TE_ADDR_NONE:
-	fit_get(&tab->fib, &hook->feed_fit);
-	break;
-    }
+      }
+
+  }
+  return 1;
 }
 
 static void
 rt_table_export_stop(struct rt_export_hook *hh)
 {
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
+  int ok = 0;
   rtable *t = SKIP_BACK(rtable, priv.exporter, hook->table);
   if (RT_IS_LOCKED(t))
-    rt_table_export_stop_locked(hh);
+    ok = rt_table_export_stop_locked(hh);
   else
     RT_LOCKED(t, tab)
-      rt_table_export_stop_locked(hh);
+      ok = rt_table_export_stop_locked(hh);
+
+  if (ok)
+    rt_stop_export_common(hh);
+  else
+    rt_set_export_state(&hook->h, TES_STOP);
 }
 
 void
@@ -2188,15 +2249,24 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   ASSERT_DIE(req->hook);
   struct rt_export_hook *hook = req->hook;
 
-  /* Stop feeding from the exporter */
-  CALL(hook->table->class->stop, hook);
+  /* Set the stopped callback */
+  hook->stopped = stopped;
 
+  /* Run the stop code */
+  if (hook->table->class->stop)
+    hook->table->class->stop(hook);
+  else
+    rt_stop_export_common(hook);
+}
+
+void
+rt_stop_export_common(struct rt_export_hook *hook)
+{
   /* Update export state */
   rt_set_export_state(hook, TES_STOP);
 
   /* Reset the event as the stopped event */
   hook->event.hook = hook->table->class->done;
-  hook->stopped = stopped;
 
   /* Run the stopped event */
   rt_send_export_event(hook);
@@ -2536,6 +2606,7 @@ rt_flowspec_find_link(struct rtable_private *src, rtable *dst)
   WALK_LIST2(hook, n, src->exporter.e.hooks, h.n)
     switch (atomic_load_explicit(&hook->h.export_state, memory_order_acquire))
     {
+      case TES_HUNGRY:
       case TES_FEEDING:
       case TES_READY:
 	if (hook->h.req->export_one == rt_flowspec_export_one)
@@ -2954,6 +3025,7 @@ rt_export_cleanup(struct rtable_private *tab)
     switch (atomic_load_explicit(&eh->h.export_state, memory_order_acquire))
     {
       case TES_DOWN:
+      case TES_HUNGRY:
 	continue;
 
       case TES_READY:
diff --git a/nest/rt.h b/nest/rt.h
index 649392b9..c80b1b33 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -363,6 +363,7 @@ struct rt_table_export_hook {
 #define TIS_MAX		6
 
 #define TES_DOWN	0
+#define TES_HUNGRY	1
 #define TES_FEEDING	2
 #define TES_READY	3
 #define TES_STOP	4
@@ -424,6 +425,7 @@ int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
 void rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook);
 struct rt_export_hook *rt_alloc_export(struct rt_exporter *re, uint size);
+void rt_stop_export_common(struct rt_export_hook *hook);
 void rt_export_stopped(struct rt_export_hook *hook);
 void rt_exporter_init(struct rt_exporter *re);
 

From 28d4ac6c97fd8021083a523fc713fc6d9322f181 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 20 Sep 2022 14:57:43 +0200
Subject: [PATCH 210/431] Fixed display of standby memory

---
 nest/cmds.c         |  6 +++---
 sysdep/unix/alloc.c | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nest/cmds.c b/nest/cmds.c
index 96a3ec91..0748c74f 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -120,9 +120,9 @@ cmd_show_memory(void)
   print_size("Protocols:", rmemsize(proto_pool));
   struct resmem total = rmemsize(&root_pool);
 #ifdef HAVE_MMAP
-  int pages_kept = atomic_load_explicit(&pages_kept, memory_order_relaxed);
-  print_size("Standby memory:", (struct resmem) { .overhead = page_size * pages_kept });
-  total.overhead += page_size * pages_kept;
+  int pk = atomic_load_explicit(&pages_kept, memory_order_relaxed);
+  print_size("Standby memory:", (struct resmem) { .overhead = page_size * pk });
+  total.overhead += page_size * pk;
 #endif
   print_size("Total:", total);
   cli_msg(0, "");
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 47cd4624..1559fe97 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -93,9 +93,7 @@ alloc_page(void)
   if (!fp)
     return alloc_sys_page();
 
-  if (atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed) <= KEEP_PAGES_MIN)
-    SCHEDULE_CLEANUP;
-
+  atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
   return fp;
 #endif
 }
@@ -146,15 +144,15 @@ page_cleanup(void *_ UNUSED)
     else
       free_page(f);
   }
-  while (stack && (atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX / 2));
+  while ((atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX / 2) && stack);
 
   while (stack)
   {
-    atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
-
     struct free_page *f = stack;
     stack = atomic_load_explicit(&f->next, memory_order_acquire);
     free_page(f);
+
+    atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
   }
 }
 #endif

From 4b4fe1bd65f0dcebe3ff51a395acf0fd21c46a5d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 20 Sep 2022 17:14:31 +0200
Subject: [PATCH 211/431] BFD: The old pipe notification mechanism replaced by
 events

---
 proto/bfd/bfd.c | 65 +++++++------------------------------------------
 proto/bfd/bfd.h |  3 +--
 2 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index cad70b41..0ecace0e 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -82,7 +82,7 @@
  * BFD thread to the main thread. This is done in an asynchronous way, sesions
  * with pending notifications are linked (in the BFD thread) to @notify_list in
  * &bfd_proto, and then bfd_notify_hook() in the main thread is activated using
- * bfd_notify_kick() and a pipe. The hook then processes scheduled sessions and
+ * a standard event sending code. The hook then processes scheduled sessions and
  * calls hooks from associated BFD requests. This @notify_list (and state fields
  * in structure &bfd_session) is protected by a spinlock in &bfd_proto and
  * functions bfd_lock_sessions() / bfd_unlock_sessions().
@@ -128,7 +128,6 @@ const char *bfd_state_names[] = { "AdminDown", "Down", "Init", "Up" };
 static void bfd_session_set_min_tx(struct bfd_session *s, u32 val);
 static struct bfd_iface *bfd_get_iface(struct bfd_proto *p, ip_addr local, struct iface *iface);
 static void bfd_free_iface(struct bfd_iface *ifa);
-static inline void bfd_notify_kick(struct bfd_proto *p);
 
 
 /*
@@ -177,7 +176,7 @@ bfd_session_update_state(struct bfd_session *s, uint state, uint diag)
     bfd_session_set_min_tx(s, s->cf.idle_tx_int);
 
   if (notify)
-    bfd_notify_kick(p);
+    ev_send(&global_event_list, &p->notify_event);
 }
 
 static void
@@ -956,17 +955,15 @@ int pipe(int pipefd[2]);
 void pipe_drain(int fd);
 void pipe_kick(int fd);
 
-static int
-bfd_notify_hook(sock *sk, uint len UNUSED)
+static void
+bfd_notify_hook(void *data)
 {
-  struct bfd_proto *p = sk->data;
+  struct bfd_proto *p = data;
   struct bfd_session *s;
   list tmp_list;
   u8 state, diag;
   node *n, *nn;
 
-  pipe_drain(sk->fd);
-
   bfd_lock_sessions(p);
   init_list(&tmp_list);
   add_tail_list(&tmp_list, &p->notify_list);
@@ -990,55 +987,8 @@ bfd_notify_hook(sock *sk, uint len UNUSED)
     if (EMPTY_LIST(s->request_list))
       bfd_remove_session(p, s);
   }
-
-  return 0;
 }
 
-static inline void
-bfd_notify_kick(struct bfd_proto *p)
-{
-  pipe_kick(p->notify_ws->fd);
-}
-
-static void
-bfd_noterr_hook(sock *sk, int err)
-{
-  struct bfd_proto *p = sk->data;
-  log(L_ERR "%s: Notify socket error: %m", p->p.name, err);
-}
-
-static void
-bfd_notify_init(struct bfd_proto *p)
-{
-  int pfds[2];
-  sock *sk;
-
-  int rv = pipe(pfds);
-  if (rv < 0)
-    die("pipe: %m");
-
-  sk = sk_new(p->p.pool);
-  sk->type = SK_MAGIC;
-  sk->rx_hook = bfd_notify_hook;
-  sk->err_hook = bfd_noterr_hook;
-  sk->fd = pfds[0];
-  sk->data = p;
-  if (sk_open(sk) < 0)
-    die("bfd: sk_open failed");
-  p->notify_rs = sk;
-
-  /* The write sock is not added to any event loop */
-  sk = sk_new(p->p.pool);
-  sk->type = SK_MAGIC;
-  sk->fd = pfds[1];
-  sk->data = p;
-  sk->flags = SKF_THREAD;
-  if (sk_open(sk) < 0)
-    die("bfd: sk_open failed");
-  p->notify_ws = sk;
-}
-
-
 /*
  *	BFD protocol glue
  */
@@ -1070,7 +1020,10 @@ bfd_start(struct proto *P)
   init_list(&p->iface_list);
 
   init_list(&p->notify_list);
-  bfd_notify_init(p);
+  p->notify_event = (event) {
+    .hook = bfd_notify_hook,
+    .data = p,
+  };
 
   add_tail(&bfd_global.proto_list, &p->bfd_node);
 
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index b9afaf92..9a8e20c6 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -99,8 +99,7 @@ struct bfd_proto
   HASH(struct bfd_session) session_hash_id;
   HASH(struct bfd_session) session_hash_ip;
 
-  sock *notify_rs;
-  sock *notify_ws;
+  event notify_event;
   list notify_list;
 
   sock *rx4_1;

From 6768e0cf9e4b7befbc29f2d40a6b15e1198908f5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 20 Sep 2022 17:01:50 +0200
Subject: [PATCH 212/431] Pipe kick-and-drain packed into a neat structure and
 functions.

---
 proto/bfd/bfd.c       |  4 --
 sysdep/unix/io-loop.c | 88 ++++++++++++++++++++++++++-----------------
 sysdep/unix/io-loop.h | 12 +++++-
 sysdep/unix/io.c      |  7 +---
 4 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 0ecace0e..25ff19ac 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -951,10 +951,6 @@ bfd_reconfigure_neighbors(struct bfd_proto *p, struct bfd_config *new)
 
 /* This core notify code should be replaced after main loop transition to birdloop */
 
-int pipe(int pipefd[2]);
-void pipe_drain(int fd);
-void pipe_kick(int fd);
-
 static void
 bfd_notify_hook(void *data)
 {
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 575e5403..2e2bb86e 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -88,74 +88,94 @@ birdloop_process_flags(struct birdloop *loop)
  *	Wakeup code for birdloop
  */
 
-static void
-pipe_new(int *pfds)
+void
+pipe_new(struct pipe *p)
 {
-  int rv = pipe(pfds);
+  int rv = pipe(p->fd);
   if (rv < 0)
     die("pipe: %m");
 
-  if (fcntl(pfds[0], F_SETFL, O_NONBLOCK) < 0)
+  if (fcntl(p->fd[0], F_SETFL, O_NONBLOCK) < 0)
     die("fcntl(O_NONBLOCK): %m");
 
-  if (fcntl(pfds[1], F_SETFL, O_NONBLOCK) < 0)
+  if (fcntl(p->fd[1], F_SETFL, O_NONBLOCK) < 0)
     die("fcntl(O_NONBLOCK): %m");
 }
 
 void
-pipe_drain(int fd)
+pipe_drain(struct pipe *p)
 {
-  char buf[64];
-  int rv;
-  
- try:
-  rv = read(fd, buf, 64);
-  if (rv < 0)
-  {
-    if (errno == EINTR)
-      goto try;
-    if (errno == EAGAIN)
+  while (1) {
+    char buf[64];
+    int rv = read(p->fd[0], buf, sizeof(buf));
+    if ((rv < 0) && (errno == EAGAIN))
       return;
-    die("wakeup read: %m");
+
+    if (rv == 0)
+      bug("wakeup read eof");
+    if ((rv < 0) && (errno != EINTR))
+      bug("wakeup read: %m");
+  }
+}
+
+int
+pipe_read_one(struct pipe *p)
+{
+  while (1) {
+    char v;
+    int rv = read(p->fd[0], &v, sizeof(v));
+    if (rv == 1)
+      return 1;
+    if ((rv < 0) && (errno == EAGAIN))
+      return 0;
+    if (rv > 1)
+      bug("wakeup read more bytes than expected: %d", rv);
+    if (rv == 0)
+      bug("wakeup read eof");
+    if (errno != EINTR)
+      bug("wakeup read: %m");
   }
-  if (rv == 64)
-    goto try;
 }
 
 void
-pipe_kick(int fd)
+pipe_kick(struct pipe *p)
 {
-  u64 v = 1;
+  char v = 1;
   int rv;
 
- try:
-  rv = write(fd, &v, sizeof(u64));
-  if (rv < 0)
-  {
-    if (errno == EINTR)
-      goto try;
-    if (errno == EAGAIN)
+  while (1) {
+    rv = write(p->fd[1], &v, sizeof(v));
+    if ((rv >= 0) || (errno == EAGAIN)) 
       return;
-    die("wakeup write: %m");
+    if (errno != EINTR)
+      bug("wakeup write: %m");
   }
 }
 
+void
+pipe_pollin(struct pipe *p, struct pollfd *pfd)
+{
+  pfd->fd = p->fd[0];
+  pfd->events = POLLIN;
+  pfd->revents = 0;
+}
+
 static inline void
 wakeup_init(struct birdloop *loop)
 {
-  pipe_new(loop->wakeup_fds);
+  pipe_new(&loop->wakeup);
 }
 
 static inline void
 wakeup_drain(struct birdloop *loop)
 {
-  pipe_drain(loop->wakeup_fds[0]);
+  pipe_drain(&loop->wakeup);
 }
 
 static inline void
 wakeup_do_kick(struct birdloop *loop)
 {
-  pipe_kick(loop->wakeup_fds[1]);
+  pipe_kick(&loop->wakeup);
 }
 
 static inline void
@@ -284,9 +304,7 @@ sockets_prepare(struct birdloop *loop)
 
   /* Add internal wakeup fd */
   *psk = NULL;
-  pfd->fd = loop->wakeup_fds[0];
-  pfd->events = POLLIN;
-  pfd->revents = 0;
+  pipe_pollin(&loop->wakeup, pfd);
 
   loop->poll_changed = 0;
 }
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index aec7a409..29ca96d6 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -9,6 +9,16 @@
 
 #include "lib/rcu.h"
 
+struct pipe
+{
+  int fd[2];
+};
+
+void pipe_new(struct pipe *);
+void pipe_pollin(struct pipe *, struct pollfd *);
+void pipe_drain(struct pipe *);
+void pipe_kick(struct pipe *);
+
 struct birdloop
 {
   pool *pool;
@@ -25,7 +35,7 @@ struct birdloop
 
   uint ping_pending;
   _Atomic u32 ping_sent;
-  int wakeup_fds[2];
+  struct pipe wakeup;
 
   pthread_t thread_id;
   pthread_attr_t thread_attr;
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 23baffb2..6454f15f 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2213,8 +2213,6 @@ static int short_loops = 0;
 #define SHORT_LOOP_MAX 10
 #define WORK_EVENTS_MAX 10
 
-void pipe_drain(int fd);
-
 void
 io_loop(void)
 {
@@ -2246,8 +2244,7 @@ io_loop(void)
       }
 
       /* A hack to reload main io_loop() when something has changed asynchronously. */
-      pfd[0].fd = main_birdloop.wakeup_fds[0];
-      pfd[0].events = POLLIN;
+      pipe_pollin(&main_birdloop.wakeup, &pfd[0]);
 
       nfds = 1;
 
@@ -2325,7 +2322,7 @@ io_loop(void)
 	  if (pfd[0].revents & POLLIN)
 	  {
 	    /* IO loop reload requested */
-	    pipe_drain(main_birdloop.wakeup_fds[0]);
+	    pipe_drain(&main_birdloop.wakeup);
 	    atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
 	    continue;
 	  }

From 896dbbfe4a6fec663b1fa3bb3c529b7c4fb2f625 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 21 Sep 2022 11:49:35 +0200
Subject: [PATCH 213/431] Local page allocation

---
 lib/resource.h        |  2 ++
 nest/cmds.c           |  3 +-
 sysdep/unix/alloc.c   | 76 +++++++++++++++++++++++++++++++++++++++----
 sysdep/unix/io-loop.c | 21 +++++++++++-
 4 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/lib/resource.h b/lib/resource.h
index 56a746bb..5d9e2165 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -123,8 +123,10 @@ void buffer_realloc(void **buf, unsigned *size, unsigned need, unsigned item_siz
 #define PAGE_HEAD(x)	((void *) (((uintptr_t) (x)) & ~(page_size-1)))
 extern long page_size;
 extern _Atomic int pages_kept;
+extern _Atomic int pages_kept_locally;
 void *alloc_page(void);
 void free_page(void *);
+void flush_local_pages(void);
 
 void resource_sys_init(void);
 
diff --git a/nest/cmds.c b/nest/cmds.c
index 0748c74f..8a5bbdd4 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -120,7 +120,8 @@ cmd_show_memory(void)
   print_size("Protocols:", rmemsize(proto_pool));
   struct resmem total = rmemsize(&root_pool);
 #ifdef HAVE_MMAP
-  int pk = atomic_load_explicit(&pages_kept, memory_order_relaxed);
+  int pk  = atomic_load_explicit(&pages_kept, memory_order_relaxed)
+	  + atomic_load_explicit(&pages_kept_locally, memory_order_relaxed);
   print_size("Standby memory:", (struct resmem) { .overhead = page_size * pk });
   total.overhead += page_size * pk;
 #endif
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 1559fe97..847def30 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -23,10 +23,13 @@
 long page_size = 0;
 
 #ifdef HAVE_MMAP
-#define KEEP_PAGES_MAX	256
-#define KEEP_PAGES_MIN	8
+#define KEEP_PAGES_MAX	512
+#define KEEP_PAGES_MIN	32
+#define KEEP_PAGES_MAX_LOCAL	16
+#define ALLOC_PAGES_AT_ONCE	8
 
 STATIC_ASSERT(KEEP_PAGES_MIN * 4 < KEEP_PAGES_MAX);
+STATIC_ASSERT(ALLOC_PAGES_AT_ONCE < KEEP_PAGES_MAX_LOCAL);
 
 static _Bool use_fake = 0;
 static _Bool initialized = 0;
@@ -43,17 +46,20 @@ struct free_page {
 #endif
 
 static struct free_page * _Atomic page_stack = NULL;
+static _Thread_local struct free_page * local_page_stack = NULL;
 
 static void page_cleanup(void *);
 static event page_cleanup_event = { .hook = page_cleanup, };
 #define SCHEDULE_CLEANUP  do if (initialized && !shutting_down) ev_send(&global_event_list, &page_cleanup_event); while (0)
 
 _Atomic int pages_kept = 0;
+_Atomic int pages_kept_locally = 0;
+static int pages_kept_here = 0;
 
 static void *
 alloc_sys_page(void)
 {
-  void *ptr = mmap(NULL, page_size, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  void *ptr = mmap(NULL, page_size * ALLOC_PAGES_AT_ONCE, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
   if (ptr == MAP_FAILED)
     bug("mmap(%lu) failed: %m", page_size);
@@ -82,8 +88,17 @@ alloc_page(void)
   }
 
 #ifdef HAVE_MMAP
+  struct free_page *fp = local_page_stack;
+  if (fp)
+  {
+    local_page_stack = atomic_load_explicit(&fp->next, memory_order_acquire);
+    atomic_fetch_sub_explicit(&pages_kept_locally, 1, memory_order_relaxed);
+    pages_kept_here--;
+    return fp;
+  }
+
   rcu_read_lock();
-  struct free_page *fp = atomic_load_explicit(&page_stack, memory_order_acquire);
+  fp = atomic_load_explicit(&page_stack, memory_order_acquire);
   while (fp && !atomic_compare_exchange_strong_explicit(
 	&page_stack, &fp, atomic_load_explicit(&fp->next, memory_order_acquire),
 	memory_order_acq_rel, memory_order_acquire))
@@ -91,7 +106,12 @@ alloc_page(void)
   rcu_read_unlock();
 
   if (!fp)
-    return alloc_sys_page();
+  {
+    void *ptr = alloc_sys_page();
+    for (int i=1; i<ALLOC_PAGES_AT_ONCE; i++)
+      free_page(ptr + page_size * i);
+    return ptr;
+  }
 
   atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
   return fp;
@@ -108,8 +128,16 @@ free_page(void *ptr)
   }
 
 #ifdef HAVE_MMAP
-  rcu_read_lock();
   struct free_page *fp = ptr;
+  if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
+  {
+    atomic_store_explicit(&fp->next, local_page_stack, memory_order_relaxed);
+    atomic_fetch_add_explicit(&pages_kept_locally, 1, memory_order_relaxed);
+    pages_kept_here++;
+    return;
+  }
+
+  rcu_read_lock();
   struct free_page *next = atomic_load_explicit(&page_stack, memory_order_acquire);
 
   do atomic_store_explicit(&fp->next, next, memory_order_release);
@@ -123,10 +151,46 @@ free_page(void *ptr)
 #endif
 }
 
+void
+flush_local_pages(void)
+{
+  if (use_fake || !local_page_stack || shutting_down)
+    return;
+
+  struct free_page *last = local_page_stack, *next;
+  int check_count = 1;
+  while (next = atomic_load_explicit(&last->next, memory_order_acquire))
+  {
+    check_count++;
+    last = next;
+  }
+
+  ASSERT_DIE(check_count == pages_kept_here);
+
+  rcu_read_lock();
+  next = atomic_load_explicit(&page_stack, memory_order_acquire);
+
+  do atomic_store_explicit(&last->next, next, memory_order_release);
+  while (!atomic_compare_exchange_strong_explicit(
+	&page_stack, &next, local_page_stack,
+	memory_order_acq_rel, memory_order_acquire));
+  rcu_read_unlock();
+
+  local_page_stack = NULL;
+  pages_kept_here = 0;
+
+  atomic_fetch_sub_explicit(&pages_kept_locally, check_count, memory_order_relaxed);
+  if (atomic_fetch_add_explicit(&pages_kept, check_count, memory_order_relaxed) >= KEEP_PAGES_MAX)
+    SCHEDULE_CLEANUP;
+}
+
 #ifdef HAVE_MMAP
 static void
 page_cleanup(void *_ UNUSED)
 {
+  if (shutting_down)
+    return;
+
   struct free_page *stack = atomic_exchange_explicit(&page_stack, NULL, memory_order_acq_rel);
   if (!stack)
     return;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 2e2bb86e..dbca36e9 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -84,6 +84,21 @@ birdloop_process_flags(struct birdloop *loop)
   return !!flags;
 }
 
+static int
+birdloop_run_events(struct birdloop *loop)
+{
+  btime begin = current_time();
+  while (current_time() - begin < 5 MS)
+  {
+    if (!ev_run_list(&loop->event_list))
+      return 0;
+
+    times_update();
+  }
+
+  return 1;
+}
+
 /*
  *	Wakeup code for birdloop
  */
@@ -559,7 +574,7 @@ birdloop_main(void *arg)
   while (1)
   {
     timers_fire(&loop->time, 0);
-    if (birdloop_process_flags(loop) + ev_run_list(&loop->event_list))
+    if (birdloop_process_flags(loop) + birdloop_run_events(loop))
       timeout = 0;
     else if (t = timers_first(&loop->time))
       timeout = (tm_remains(t) TO_MS) + 1;
@@ -568,6 +583,9 @@ birdloop_main(void *arg)
 
     if (loop->poll_changed)
       sockets_prepare(loop);
+    else
+      if ((timeout < 0) || (timeout > 5000))
+	flush_local_pages();
 
     btime duration = current_time() - loop_begin;
     if (duration > config->watchdog_warning)
@@ -614,6 +632,7 @@ birdloop_main(void *arg)
   birdloop_leave(loop);
   loop->stopped(loop->stop_data);
 
+  flush_local_pages();
   return NULL;
 }
 

From 30a909f9bc3b18182070f7385342f7fbcb41dbdd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 21 Sep 2022 12:08:52 +0200
Subject: [PATCH 214/431] Trie test uses direct tmp_allocz() instead of
 lp_allocz(tmp_linpool)

---
 filter/trie_test.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filter/trie_test.c b/filter/trie_test.c
index dc791280..ddce2daa 100644
--- a/filter/trie_test.c
+++ b/filter/trie_test.c
@@ -251,12 +251,12 @@ get_outer_net(net_addr *net, const struct f_prefix *src)
 static list *
 make_random_prefix_list(int num, int v6, int tight)
 {
-  list *prefixes = lp_allocz(tmp_linpool, sizeof(struct f_prefix_node));
+  list *prefixes = tmp_allocz(sizeof(struct f_prefix_node));
   init_list(prefixes);
 
   for (int i = 0; i < num; i++)
   {
-    struct f_prefix_node *px = lp_allocz(tmp_linpool, sizeof(struct f_prefix_node));
+    struct f_prefix_node *px = tmp_allocz(sizeof(struct f_prefix_node));
     get_random_prefix(&px->prefix, v6, tight);
     add_tail(prefixes, &px->n);
 
@@ -294,7 +294,7 @@ read_prefix_list(FILE *f, int v6, int plus)
   char s[32];
   int n;
 
-  list *pxlist = lp_allocz(tmp_linpool, sizeof(struct f_prefix_node));
+  list *pxlist = tmp_allocz(sizeof(struct f_prefix_node));
   init_list(pxlist);
 
   errno = 0;
@@ -308,7 +308,7 @@ read_prefix_list(FILE *f, int v6, int plus)
     if (n != 5)
       bt_abort_msg("Invalid content of trie_data");
 
-    struct f_prefix_node *px = lp_allocz(tmp_linpool, sizeof(struct f_prefix_node));
+    struct f_prefix_node *px = tmp_allocz(sizeof(struct f_prefix_node));
     net_fill_ip4(&px->prefix.net, ip4_build(a0, a1, a2, a3), pl);
     px->prefix.lo = pl;
     px->prefix.hi = plus ? IP4_MAX_PREFIX_LENGTH : pl;

From 05c63ae734f4dcfeb479e4bd69550f6ce4fef1d7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 21 Sep 2022 13:39:13 +0200
Subject: [PATCH 215/431] Flushing tmp_linpool in tree test and in static
 protocol

---
 filter/tree_test.c    | 13 +++++++++++++
 proto/static/static.c |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/filter/tree_test.c b/filter/tree_test.c
index 05702f81..d180efbc 100644
--- a/filter/tree_test.c
+++ b/filter/tree_test.c
@@ -170,6 +170,8 @@ t_balancing(void)
     show_tree(balanced_tree_from_simple);
 
     bt_assert(same_tree(balanced_tree_from_simple, expected_balanced_tree));
+
+    tmp_flush();
   }
 
   return 1;
@@ -191,6 +193,9 @@ t_balancing_random(void)
     uint i;
     for(i = 0; i < 10; i++)
     {
+      struct lp_state lps;
+      lp_save(tmp_linpool, &lps);
+
       struct f_tree *random_degenerated_tree = get_random_degenerated_left_tree(nodes_count);
       show_tree(random_degenerated_tree);
 
@@ -200,7 +205,11 @@ t_balancing_random(void)
       show_tree(balanced_tree_from_random);
 
       bt_assert(same_tree(balanced_tree_from_random, expected_balanced_tree));
+
+      lp_restore(tmp_linpool, &lps);
     }
+
+    tmp_flush();
   }
 
   return 1;
@@ -227,6 +236,8 @@ t_find(void)
       const struct f_tree *found_tree = find_tree(tree, &looking_up_value);
       bt_assert((val_compare(&looking_up_value, &(found_tree->from)) == 0) && (val_compare(&looking_up_value, &(found_tree->to)) == 0));
     }
+
+    tmp_flush();
   }
 
   return 1;
@@ -283,6 +294,8 @@ t_find_ranges(void)
 	 ((val_compare(&needle, &(found_tree->from)) == 1) && (val_compare(&needle, &(found_tree->to)) == -1))
       );
     }
+
+    tmp_flush();
   }
 
   return 1;
diff --git a/proto/static/static.c b/proto/static/static.c
index cb764a1c..42fd20b7 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -494,7 +494,12 @@ static_start(struct proto *P)
   proto_notify_state(P, PS_UP);
 
   WALK_LIST(r, cf->routes)
+  {
+    struct lp_state lps;
+    lp_save(tmp_linpool, &lps);
     static_add_rte(p, r);
+    lp_restore(tmp_linpool, &lps);
+  }
 
   return PS_UP;
 }

From f51837ace6bfa357f45c6bb5f573fd61a3f1f039 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 21 Sep 2022 16:53:17 +0200
Subject: [PATCH 216/431] Caching eattrs in filters is not needed anymore.

After flattening the route attribute structure, the ea_list ** is derivable
from rte * by arithmetics. Caching the derived value doesn't help performance
and therefore is removed as unnecessary.
---
 filter/f-inst.c | 27 ++++++++++-----------------
 filter/filter.c | 11 -----------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 426b598f..801eceec 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -70,7 +70,6 @@
  *	m4_dnl	  DYNAMIC_ATTR;				dynamic attribute definition
  *	m4_dnl	  RTC;					route table config
  *	m4_dnl	  ACCESS_RTE;				this instruction needs route
- *	m4_dnl	  ACCESS_EATTRS;			this instruction needs extended attributes
  *
  *	m4_dnl	  FID_MEMBER(				custom instruction member
  *	m4_dnl	    C type,				for storage in structs
@@ -237,7 +236,6 @@
  *	m4_dnl	  fpool		-> the current linpool
  *	m4_dnl	  NEVER_CONSTANT-> don't generate pre-interpretation code at all
  *	m4_dnl	  ACCESS_RTE	-> check that route is available, also NEVER_CONSTANT
- *	m4_dnl	  ACCESS_EATTRS	-> pre-cache the eattrs; use only with ACCESS_RTE
  *
  *	m4_dnl	If you are stymied, see FI_CALL or FI_CONSTANT or just search for
  *	m4_dnl	the mentioned macros in this file to see what is happening there in wild.
@@ -687,7 +685,6 @@
     {
       STATIC_ATTR;
       ACCESS_RTE;
-      ACCESS_EATTRS;
 
       switch (sa.sa_code)
       {
@@ -695,7 +692,7 @@
       case SA_PROTO:	RESULT(sa.type, s, fs->rte->src->owner->name); break;
       default:
 	{
-	  struct eattr *nhea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct eattr *nhea = ea_find(fs->rte->attrs, &ea_gen_nexthop);
 	  struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
 	  struct nexthop *nh = nhad ? &nhad->nh : NULL;
 
@@ -731,7 +728,6 @@
 
   INST(FI_RTA_SET, 1, 0) {
     ACCESS_RTE;
-    ACCESS_EATTRS;
     ARG_ANY(1);
     STATIC_ATTR;
     ARG_TYPE(1, sa.type);
@@ -765,7 +761,7 @@
 	}
       case SA_GW:
 	{
-	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct eattr *nh_ea = ea_find(fs->rte->attrs, &ea_gen_nexthop);
 
 	  ip_addr ip = v1.val.ip;
 	  struct iface *ifa = (ipa_is_link_local(ip) && nh_ea) ?
@@ -800,7 +796,7 @@
 	  if (v1.val.i >= 0x100000)
 	    runtime( "Invalid MPLS label" );
 
-	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct eattr *nh_ea = ea_find(fs->rte->attrs, &ea_gen_nexthop);
 	  if (!nh_ea)
 	    runtime( "No nexthop to add a MPLS label to" );
 
@@ -823,7 +819,7 @@
 	  if (i < 1 || i > 256)
 	    runtime( "Setting weight value out of bounds" );
 
-	  struct eattr *nh_ea = ea_find(*fs->eattrs, &ea_gen_nexthop);
+	  struct eattr *nh_ea = ea_find(fs->rte->attrs, &ea_gen_nexthop);
 	  if (!nh_ea)
 	    runtime( "No nexthop to set weight on" );
 
@@ -837,7 +833,7 @@
 	  NEXTHOP_WALK(nh, nhax)
 	    nh->weight = i - 1;
 
-	  a = ea_set_attr(fs->eattrs,
+	  a = ea_set_attr(&fs->rte->attrs,
 	      EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhax->ad));
         }
 	break;
@@ -847,7 +843,7 @@
       }
 
       if (!a)
-	a = ea_set_attr(fs->eattrs,
+	a = ea_set_attr(&fs->rte->attrs,
 	    EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, tmp_copy_adata(&nha.ad)));
 
       a->originated = 1;
@@ -858,11 +854,10 @@
   INST(FI_EA_GET, 0, 1) {	/* Access to extended attributes */
     DYNAMIC_ATTR;
     ACCESS_RTE;
-    ACCESS_EATTRS;
     RESULT_TYPE(da->type);
     {
       const struct f_val *empty;
-      const eattr *e = ea_find(*fs->eattrs, da->id);
+      const eattr *e = ea_find(fs->rte->attrs, da->id);
 
       if (e)
       {
@@ -888,7 +883,6 @@
 
   INST(FI_EA_SET, 1, 0) {
     ACCESS_RTE;
-    ACCESS_EATTRS;
     ARG_ANY(1);
     DYNAMIC_ATTR;
     ARG_TYPE(1, da->type);
@@ -905,12 +899,12 @@
 	break;
 
       case T_IP:
-	a = ea_set_attr(fs->eattrs,
+	a = ea_set_attr(&fs->rte->attrs,
 	    EA_LITERAL_STORE_ADATA(da, 0, &v1.val.ip, sizeof(ip_addr)));
 	break;
 
       default:
-	a = ea_set_attr(fs->eattrs,
+	a = ea_set_attr(&fs->rte->attrs,
 	    EA_LITERAL_GENERIC(da->id, da->type, 0, .u = v1.val.bval));
 	break;
       }
@@ -923,9 +917,8 @@
   INST(FI_EA_UNSET, 0, 0) {
     DYNAMIC_ATTR;
     ACCESS_RTE;
-    ACCESS_EATTRS;
 
-    ea_unset_attr(fs->eattrs, 1, da);
+    ea_unset_attr(&fs->rte->attrs, 1, da);
   }
 
   INST(FI_DEFAULT, 2, 1) {
diff --git a/filter/filter.c b/filter/filter.c
index 9a94545c..0aff4d30 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -76,9 +76,6 @@ struct filter_state {
   /* The route we are processing. This may be NULL to indicate no route available. */
   struct rte *rte;
 
-  /* Cached pointer to ea_list */
-  struct ea_list **eattrs;
-
   /* Buffer for log output */
   struct buffer buf;
 
@@ -94,11 +91,6 @@ void (*bt_assert_hook)(int result, const struct f_line_item *assert);
 
 #define f_stack_init(fs) ( _f_stack_init(fs, v, 128), _f_stack_init(fs, e, 128) )
 
-static inline void f_cache_eattrs(struct filter_state *fs)
-{
-  fs->eattrs = &(fs->rte->attrs);
-}
-
 static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
 
 /**
@@ -164,8 +156,6 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
 #define falloc(size)	tmp_alloc(size)
 #define fpool		tmp_linpool
 
-#define ACCESS_EATTRS do { if (!fs->eattrs) f_cache_eattrs(fs); } while (0)
-
 #include "filter/inst-interpret.c"
 #undef res
 #undef v1
@@ -174,7 +164,6 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
 #undef runtime
 #undef falloc
 #undef fpool
-#undef ACCESS_EATTRS
       }
     }
 

From b1ade5efa1164e42ff62cb0f242774cc9b47886d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 21 Sep 2022 18:43:44 +0200
Subject: [PATCH 217/431] Fixed the export settle timer to be actually a settle
 timer

---
 doc/bird.sgml   |  7 +++++++
 nest/rt-table.c | 36 ++++++++++++++++--------------------
 nest/rt.h       |  5 +++--
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 54d67e89..9399137c 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -699,6 +699,13 @@ to set options.
         threshold, the more memory can get used. In most cases, the defaults
 	should work for you. Default: 128, 512.
 
+	<tag><label id="rtable-export-settle-time">export settle time <m/time/ <m/time/</tag>
+	Minimum and maximum settle times, respectively, for export announcements.
+	When multiple routes are changing, this mechanism waits for the changes
+	to settle before waking up sleeping export threads but if the changes are coming
+	steadily, BIRD isn't waiting forever; at most the maximum time.
+	Default values: <cf/1 ms 100 ms/. You have to always provide both values.
+
 	<tag><label id="rtable-debug">debug all|off|{ states|routes|events [, <m/.../] }</tag>
 	Set table debugging options. Each table can write some trace messages
 	into log with category <cf/trace/. You can request <cf/all/ trace messages
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b8dc6866..051bc949 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1423,9 +1423,9 @@ rt_send_export_event(struct rt_export_hook *hook)
 }
 
 static void
-rt_announce_exports(timer *tm)
+rt_announce_exports(struct settle *s)
 {
-  RT_LOCKED((rtable *) tm->data, tab)
+  RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, export_settle, s)), tab)
     if (!EMPTY_LIST(tab->exporter.pending))
     {
       struct rt_export_hook *c; node *n;
@@ -1439,13 +1439,6 @@ rt_announce_exports(timer *tm)
     }
 }
 
-static void
-rt_kick_announce_exports(struct rtable_private *tab)
-{
-  if (!tm_active(tab->export_timer))
-    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
-}
-
 static void
 rt_import_announce_exports(void *_hook)
 {
@@ -2521,7 +2514,7 @@ rt_flag_handler(struct birdloop_flag_handler *fh, u32 flags)
       rt_next_hop_update(tab);
 
     if (flags & RTF_EXPORT)
-      rt_kick_announce_exports(tab);
+      settle_kick(&tab->export_settle, tab->loop);
 
     if (flags & RTF_CLEANUP)
     {
@@ -2789,10 +2782,11 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   t->fh = (struct birdloop_flag_handler) { .hook = rt_flag_handler, };
   t->nhu_uncork_event = ev_new_init(p, rt_nhu_uncork, t);
-  t->export_timer = tm_new_init(p, rt_announce_exports, t, 0, 0);
   t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
   t->last_rt_change = t->gc_time = current_time();
 
+  t->export_settle = SETTLE_INIT(&cf->export_settle, rt_announce_exports, NULL);
+
   t->exporter = (struct rt_table_exporter) {
     .e = {
       .class = &rt_table_exporter_class,
@@ -2944,8 +2938,7 @@ again:
   FIB_ITERATE_END;
 
   rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
-  if (!tm_active(tab->export_timer))
-    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
+  settle_kick(&tab->export_settle, tab->loop);
 
 #ifdef DEBUGGING
   fib_check(&tab->fib);
@@ -3172,7 +3165,7 @@ done:;
     birdloop_flag(tab->loop, RTF_CLEANUP);
 
   if (EMPTY_LIST(tab->exporter.pending))
-    tm_stop(tab->export_timer);
+    settle_cancel(&tab->export_settle);
 }
 
 static void
@@ -3806,9 +3799,8 @@ rt_next_hop_update(struct rtable_private *tab)
   {
     rt_trace(tab, D_STATES, "Next hop updater corked");
     if ((tab->nhu_state & NHU_RUNNING)
-	&& !EMPTY_LIST(tab->exporter.pending)
-	&& !tm_active(tab->export_timer))
-      tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
+	&& !EMPTY_LIST(tab->exporter.pending))
+      settle_kick(&tab->export_settle, tab->loop);
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
@@ -3846,9 +3838,7 @@ rt_next_hop_update(struct rtable_private *tab)
 
   /* Finished NHU, cleanup */
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
-
-  if (!tm_active(tab->export_timer))
-    tm_start_in(tab->export_timer, tab->config->export_settle_time, tab->loop);
+  settle_kick(&tab->export_settle, tab->loop);
 
   /* State change:
    *   NHU_DIRTY   -> NHU_SCHEDULED
@@ -3900,6 +3890,10 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->gc_period = (uint) -1;	/* set in rt_postconfig() */
   c->cork_threshold.low = 128;
   c->cork_threshold.high = 512;
+  c->export_settle = (struct settle_config) {
+    .min = 1 MS,
+    .max = 100 MS,
+  };
   c->debug = new_config->table_debug;
 
   add_tail(&new_config->tables, &c->n);
@@ -4011,6 +4005,8 @@ rt_reconfigure(struct rtable_private *tab, struct rtable_config *new, struct rta
   tab->name = new->name;
   tab->config = new;
 
+  tab->export_settle.cf = new->export_settle;
+
   if (tab->hostcache)
     tab->hostcache->req.trace_routes = new->debug;
 
diff --git a/nest/rt.h b/nest/rt.h
index c80b1b33..d53f54e1 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -20,6 +20,7 @@
 #include "lib/event.h"
 #include "lib/rcu.h"
 #include "lib/io-loop.h"
+#include "lib/settle.h"
 
 #include <stdatomic.h>
 
@@ -62,8 +63,8 @@ struct rtable_config {
   byte sorted;				/* Routes of network are sorted according to rte_better() */
   byte trie_used;			/* Rtable has attached trie */
   byte debug;				/* Whether to log */
-  btime export_settle_time;		/* Delay before exports are announced */
   struct rt_cork_threshold cork_threshold;	/* Cork threshold values */
+  struct settle_config export_settle;	/* Export announcement settler */
 };
 
 struct rt_export_hook;
@@ -129,7 +130,7 @@ struct rtable_private {
 					 * obstacle from this routing table.
 					 */
   struct event *nhu_uncork_event;	/* Helper event to schedule NHU on uncork */
-  struct timer *export_timer;		/* Timer for export batching */
+  struct settle export_settle;		/* Export batching settle timer */
   struct timer *prune_timer;		/* Timer for periodic pruning / GC */
   struct birdloop_flag_handler fh;	/* Handler for simple events */
   btime last_rt_change;			/* Last time when route changed */

From 5338a779c975c12074e9dd7ba10ba49fb7ed4bda Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 23 Sep 2022 09:57:40 +0200
Subject: [PATCH 218/431] Fixed possible race condition in hostcache trie
 matching code not triggering HCU

---
 nest/rt-table.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 051bc949..5db5755f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4445,11 +4445,16 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
   struct hostcache *hc = SKIP_BACK(struct hostcache, req, req);
 
   /* No interest in this update, mark seen only */
-  if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
-  {
-    rpe_mark_seen_all(req->hook, first, NULL);
+  int interested = 1;
+  RT_LOCKED((rtable *) hc->update.data, tab)
+    if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
+    {
+      rpe_mark_seen_all(req->hook, first, NULL);
+      interested = 0;
+    }
+
+  if (!interested)
     return;
-  }
 
   /* This net may affect some hostentries, check the actual change */
   rte *o = RTE_VALID_OR_NULL(first->old_best);

From ecaa3df3c4b090cceac4494658f80eb0a0b1e8b6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 23 Sep 2022 09:58:00 +0200
Subject: [PATCH 219/431] More verbose logging of table auxiliary export states

---
 nest/rt-table.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 5db5755f..7a21dc39 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -146,7 +146,7 @@ static void rt_cork_release_hook(void *);
 static void rt_shutdown(void *);
 static void rt_delete(void *);
 
-static void rt_export_used(struct rt_table_exporter *);
+static void rt_export_used(struct rt_table_exporter *, const char *, const char *);
 static void rt_export_cleanup(struct rtable_private *tab);
 
 static int rte_same(rte *x, rte *y);
@@ -1499,7 +1499,7 @@ rt_export_hook(void *_data)
 
     if (!c->rpe_next)
     {
-      rt_export_used(c->table);
+      rt_export_used(c->table, c->h.req->name, "done exporting");
       RT_UNLOCK(tab);
       return;
     }
@@ -1520,7 +1520,7 @@ rt_export_hook(void *_data)
 
   if (used)
     RT_LOCKED(tab, _)
-      rt_export_used(c->table);
+      rt_export_used(c->table, c->h.req->name, "finished export bulk");
 
   rt_send_export_event(&c->h);
 }
@@ -1962,7 +1962,7 @@ rt_table_export_done(void *hh)
     DBG("Export hook %p in table %s finished uc=%u\n", hook, tab->name, tab->use_count);
 
     /* Drop pending exports */
-    rt_export_used(&tab->exporter);
+    rt_export_used(&tab->exporter, hook->h.req->name, "stopped");
 
     /* Do the common code; this frees the hook */
     rt_export_stopped(&hook->h);
@@ -2488,12 +2488,12 @@ rt_schedule_prune(struct rtable_private *tab)
 }
 
 static void
-rt_export_used(struct rt_table_exporter *e)
+rt_export_used(struct rt_table_exporter *e, const char *who, const char *why)
 {
   struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter, e);
   ASSERT_DIE(RT_IS_LOCKED(tab));
 
-  rt_trace(tab, D_EVENTS, "Export cleanup requested");
+  rt_trace(tab, D_EVENTS, "Export cleanup requested by %s %s", who, why);
 
   if (tab->export_used)
     return;
@@ -2592,6 +2592,14 @@ rt_flowspec_dump_req(struct rt_export_request *req)
   debug("  Flowspec link for table %s (%p)\n", ln->dst->name, req);
 }
 
+static void
+rt_flowspec_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
+  rt_trace(ln->dst, D_STATES, "Flowspec link from %s export state changed to %s",
+      ln->src->name, rt_export_state_name(state));
+}
+
 static struct rt_flowspec_link *
 rt_flowspec_find_link(struct rtable_private *src, rtable *dst)
 {
@@ -2636,6 +2644,7 @@ rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
 	.list = &global_work_list,
 	.trace_routes = src->config->debug,
 	.dump_req = rt_flowspec_dump_req,
+	.log_state_change = rt_flowspec_log_state_change,
 	.export_one = rt_flowspec_export_one,
       };
 
@@ -4439,6 +4448,13 @@ hc_notify_dump_req(struct rt_export_request *req)
   debug("  Table %s (%p)\n", req->name, req);
 }
 
+static void
+hc_notify_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct hostcache *hc = SKIP_BACK(struct hostcache, req, req);
+  rt_trace((rtable *) hc->update.data, D_STATES, "HCU Export state changed to %s", rt_export_state_name(state));
+}
+
 static void
 hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
@@ -4498,6 +4514,7 @@ rt_init_hostcache(struct rtable_private *tab)
     .list = &global_work_list,
     .trace_routes = tab->config->debug,
     .dump_req = hc_notify_dump_req,
+    .log_state_change = hc_notify_log_state_change,
     .export_one = hc_notify_export_one,
   };
 

From 6cfe2066ab024251936b119ab5c39a3892d8342a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 26 Sep 2022 12:09:14 +0200
Subject: [PATCH 220/431] Higher export settle times when route refresh is
 running.

This helps the route refresh procedures to finish or at least
do more work before the exporters jump in and steal all the CPU time
for themselves.
---
 doc/bird.sgml   |  8 ++++++++
 nest/config.Y   |  4 +++-
 nest/rt-table.c | 32 ++++++++++++++++++++++++++------
 nest/rt.h       |  5 +++++
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 9399137c..0cfe19c4 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -706,6 +706,14 @@ to set options.
 	steadily, BIRD isn't waiting forever; at most the maximum time.
 	Default values: <cf/1 ms 100 ms/. You have to always provide both values.
 
+	<tag><label id="rtable-route-refresh-export-settle-time">route refresh export settle time <m/time/ <m/time/</tag>
+	Minimum and maximum settle times, respectively, for export announcements
+	(the same as above), valid when any channel is currently doing a route refresh.
+	This serves a purpose of even more aggresive change bundling, knowing that there
+	is some active process generating changes in a fast pace. If you don't want
+	this feature, set this to the same values as <ref id="rtable-export-settle-time" name="export settle time">.
+	Default values: <cf/100 ms 3 s/.
+
 	<tag><label id="rtable-debug">debug all|off|{ states|routes|events [, <m/.../] }</tag>
 	Set table debugging options. Each table can write some trace messages
 	into log with category <cf/trace/. You can request <cf/all/ trace messages
diff --git a/nest/config.Y b/nest/config.Y
index a8e48cfe..f2904882 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -125,7 +125,7 @@ CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
 CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
 CF_KEYWORDS(CHECK, LINK)
-CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, ROA, SETTLE, TIME, GC, THRESHOLD, PERIOD)
+CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, ROA, ROUTE, REFRESH, SETTLE, TIME, GC, THRESHOLD, PERIOD)
 
 /* For r_args_channel */
 CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
@@ -233,6 +233,8 @@ table_opt:
      if ($3 > $4) cf_error("Cork low threshold must be lower than the high threshold.");
      this_table->cork_threshold.low = $3;
      this_table->cork_threshold.high = $4; }
+ | EXPORT SETTLE TIME settle { this_table->export_settle = $4; }
+ | ROUTE REFRESH EXPORT SETTLE TIME settle { this_table->export_rr_settle = $6; }
  | DEBUG bool { this_table->debug = $2; }
  ;
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 7a21dc39..36d69d92 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1439,6 +1439,13 @@ rt_announce_exports(struct settle *s)
     }
 }
 
+static void
+rt_kick_export_settle(struct rtable_private *tab)
+{
+  tab->export_settle.cf = tab->rr_counter ? tab->config->export_rr_settle : tab->config->export_settle;
+  settle_kick(&tab->export_settle, tab->loop);
+}
+
 static void
 rt_import_announce_exports(void *_hook)
 {
@@ -2039,6 +2046,13 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
     rt_schedule_prune(tab);
     rt_set_import_state(hook, TIS_STOP);
     hook->stopped = stopped;
+
+    if (hook->stale_set != hook->stale_pruned)
+      tab->rr_counter -= (hook->stale_set - hook->stale_pruned - 1);
+    else
+      tab->rr_counter++;
+
+    hook->stale_set = hook->stale_pruned = hook->stale_pruning = hook->stale_valid = 0;
   }
 }
 
@@ -2301,6 +2315,7 @@ rt_refresh_begin(struct rt_import_request *req)
            e->rte.stale_cycle = 0;
       }
     FIB_WALK_END;
+    tab->rr_counter -= (hook->stale_set - hook->stale_pruned - 1);
     hook->stale_set = 1;
     hook->stale_valid = 0;
     hook->stale_pruned = 0;
@@ -2311,6 +2326,7 @@ rt_refresh_begin(struct rt_import_request *req)
     /* Let's reserve the stale_cycle zero value for always-invalid routes */
     hook->stale_set = 1;
     hook->stale_valid = 0;
+    tab->rr_counter++;
   }
 
   if (req->trace_routes & D_STATES)
@@ -2514,7 +2530,7 @@ rt_flag_handler(struct birdloop_flag_handler *fh, u32 flags)
       rt_next_hop_update(tab);
 
     if (flags & RTF_EXPORT)
-      settle_kick(&tab->export_settle, tab->loop);
+      rt_kick_export_settle(tab);
 
     if (flags & RTF_CLEANUP)
     {
@@ -2947,7 +2963,7 @@ again:
   FIB_ITERATE_END;
 
   rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
-  settle_kick(&tab->export_settle, tab->loop);
+  rt_kick_export_settle(tab);
 
 #ifdef DEBUGGING
   fib_check(&tab->fib);
@@ -2997,9 +3013,11 @@ again:
       ih->flush_seq = tab->exporter.next_seq;
       rt_set_import_state(ih, TIS_WAITING);
       flushed_channels++;
+      tab->rr_counter--;
     }
     else if (ih->stale_pruning != ih->stale_pruned)
     {
+      tab->rr_counter -= (ih->stale_pruned - ih->stale_pruning);
       ih->stale_pruned = ih->stale_pruning;
       if (ih->req->trace_routes & D_STATES)
 	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
@@ -3809,7 +3827,7 @@ rt_next_hop_update(struct rtable_private *tab)
     rt_trace(tab, D_STATES, "Next hop updater corked");
     if ((tab->nhu_state & NHU_RUNNING)
 	&& !EMPTY_LIST(tab->exporter.pending))
-      settle_kick(&tab->export_settle, tab->loop);
+      rt_kick_export_settle(tab);
 
     tab->nhu_corked = tab->nhu_state;
     tab->nhu_state = 0;
@@ -3847,7 +3865,7 @@ rt_next_hop_update(struct rtable_private *tab)
 
   /* Finished NHU, cleanup */
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
-  settle_kick(&tab->export_settle, tab->loop);
+  rt_kick_export_settle(tab);
 
   /* State change:
    *   NHU_DIRTY   -> NHU_SCHEDULED
@@ -3903,6 +3921,10 @@ rt_new_table(struct symbol *s, uint addr_type)
     .min = 1 MS,
     .max = 100 MS,
   };
+  c->export_rr_settle = (struct settle_config) {
+    .min = 100 MS,
+    .max = 3 S,
+  };
   c->debug = new_config->table_debug;
 
   add_tail(&new_config->tables, &c->n);
@@ -4014,8 +4036,6 @@ rt_reconfigure(struct rtable_private *tab, struct rtable_config *new, struct rta
   tab->name = new->name;
   tab->config = new;
 
-  tab->export_settle.cf = new->export_settle;
-
   if (tab->hostcache)
     tab->hostcache->req.trace_routes = new->debug;
 
diff --git a/nest/rt.h b/nest/rt.h
index d53f54e1..6ee2ce9b 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -65,6 +65,8 @@ struct rtable_config {
   byte debug;				/* Whether to log */
   struct rt_cork_threshold cork_threshold;	/* Cork threshold values */
   struct settle_config export_settle;	/* Export announcement settler */
+  struct settle_config export_rr_settle;/* Export announcement settler config valid when any
+					   route refresh is running */
 };
 
 struct rt_export_hook;
@@ -136,6 +138,9 @@ struct rtable_private {
   btime last_rt_change;			/* Last time when route changed */
   btime gc_time;			/* Time of last GC */
   uint gc_counter;			/* Number of operations since last GC */
+  uint rr_counter;			/* Number of currently running route refreshes,
+					   in fact sum of (stale_set - stale_pruned) over all importers
+					   + one for each TIS_FLUSHING importer */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte prune_trie;			/* Prune prefix trie during next table prune */
   byte nhu_state;			/* Next Hop Update state */

From 57a34d466e85bedbf40a0f7cbde23b843a303c8d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 27 Sep 2022 12:17:05 +0200
Subject: [PATCH 221/431] KRT: Fix route learning

This is a reimplementation of commit 0f2be469f897b6d9f925563bbf522438c83522ea
by Alexander Zubkov. In the master branch, changes in commit eb937358
broke setting of channel preference for alien routes learned during
scan. The preference was set only for async routes.

The original solution is extended here to accomodate for v3 specifics.
---
 sysdep/unix/krt.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0a746631..360a2888 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -313,14 +313,22 @@ krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
   rte_update(p->p.main_channel, n, NULL, p->p.main_source);
 }
 
+static struct rte_storage *
+krt_store_async(struct krt_proto *p, net *n, rte *e)
+{
+  ASSERT(!e->attrs->cached);
+  e->attrs->pref = p->p.main_channel->preference;
+  e->src = p->p.main_source;
+  return rte_store(e, n, p->krt_table);
+}
+
 /* Called when alien route is discovered during scan */
 static void
 krt_learn_scan(struct krt_proto *p, rte *e)
 {
   net *n = net_get(p->krt_table, e->net);
   struct rte_storage *m, **mm;
-
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
+  struct rte_storage *ee = krt_store_async(p, n, e);
 
   for(mm = &n->routes; m = *mm; mm = &m->next)
     if (krt_same_key(&m->rte, e))
@@ -431,11 +439,7 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
 {
   net *n = net_get(p->krt_table, e->net);
   struct rte_storage *g, **gg, *best, **bestp, *old_best;
-
-  ASSERT(!e->attrs->cached);
-  e->attrs->pref = p->p.main_channel->preference;
-
-  struct rte_storage *ee = rte_store(e, n, p->krt_table);
+  struct rte_storage *ee = krt_store_async(p, n, e);
 
   old_best = n->routes;
   for(gg=&n->routes; g = *gg; gg = &g->next)

From 7911148b22a9efb1fd200b23e3c71cb1df3a0620 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 5 Oct 2022 15:17:38 +0200
Subject: [PATCH 222/431] Fixed pipe reload/refeed to properly propagate as
 route refresh to the other table

---
 proto/pipe/pipe.c | 36 ++++++++++++++++++++++++++++++++++++
 proto/pipe/pipe.h |  4 ++++
 2 files changed, 40 insertions(+)

diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index b3b50a0d..0b0d9151 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -52,10 +52,18 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *
 {
   struct pipe_proto *p = (void *) P;
   struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri;
+  uint *flags = (src_ch == p->pri) ? &p->sec_flags : &p->pri_flags;
 
   if (!new && !old)
     return;
 
+  /* Start the route refresh if requested to */
+  if (*flags & PIPE_FL_RR_BEGIN_PENDING)
+  {
+    *flags &= ~PIPE_FL_RR_BEGIN_PENDING;
+    rt_refresh_begin(&dst->in_req);
+  }
+
   if (new)
     {
       rte e0 = {
@@ -104,6 +112,32 @@ pipe_reload_routes(struct channel *C)
   channel_request_feeding((C == p->pri) ? p->sec : p->pri);
 }
 
+static void
+pipe_feed_begin(struct channel *C, int initial UNUSED)
+{
+  struct pipe_proto *p = (void *) C->proto;
+  uint *flags = (C == p->pri) ? &p->sec_flags : &p->pri_flags;
+
+  *flags |= PIPE_FL_RR_BEGIN_PENDING;
+}
+
+static void
+pipe_feed_end(struct channel *C)
+{
+  struct pipe_proto *p = (void *) C->proto;
+  struct channel *dst = (C == p->pri) ? p->sec : p->pri;
+  uint *flags = (C == p->pri) ? &p->sec_flags : &p->pri_flags;
+
+  /* If not even started, start the RR now */
+  if (*flags & PIPE_FL_RR_BEGIN_PENDING)
+  {
+    *flags &= ~PIPE_FL_RR_BEGIN_PENDING;
+    rt_refresh_begin(&dst->in_req);
+  }
+
+  /* Finish RR always */
+  rt_refresh_end(&dst->in_req);
+}
 
 static void
 pipe_postconfig(struct proto_config *CF)
@@ -182,6 +216,8 @@ pipe_init(struct proto_config *CF)
   P->rt_notify = pipe_rt_notify;
   P->preexport = pipe_preexport;
   P->reload_routes = pipe_reload_routes;
+  P->feed_begin = pipe_feed_begin;
+  P->feed_end = pipe_feed_end;
 
   p->rl_gen = (struct tbf) TBF_DEFAULT_LOG_LIMITS;
 
diff --git a/proto/pipe/pipe.h b/proto/pipe/pipe.h
index a6534e1c..501b8565 100644
--- a/proto/pipe/pipe.h
+++ b/proto/pipe/pipe.h
@@ -20,7 +20,11 @@ struct pipe_proto {
   struct proto p;
   struct channel *pri;
   struct channel *sec;
+  uint pri_flags;
+  uint sec_flags;
   struct tbf rl_gen;
 };
 
+#define PIPE_FL_RR_BEGIN_PENDING	1	/* Route refresh should start with the first route notified */
+
 #endif

From 4d687d7aecb2bc4b695d26418bc761acb1d15c76 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 4 Oct 2022 13:20:04 +0200
Subject: [PATCH 223/431] Fixed previously untested paths in RPKI

---
 nest/proto.c          |  2 +-
 sysdep/unix/io-loop.c |  3 +++
 sysdep/unix/io.c      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 319b35dd..2f3515b9 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -355,7 +355,7 @@ channel_export_one_roa(struct rt_export_request *req, const net_addr *net UNUSED
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
 
   /* TODO: use the information about what roa has changed */
-  settle_kick(&s->settle, &main_birdloop);
+  settle_kick(&s->settle, s->c->proto->loop);
 
   rpe_mark_seen_all(req->hook, first, NULL);
 }
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index dbca36e9..b588b736 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -252,6 +252,9 @@ sk_start(sock *s)
 static void
 sockets_remove(struct birdloop *loop, sock *s)
 {
+  if (!enlisted(&s->n))
+    return;
+
   rem_node(&s->n);
   loop->sock_num--;
 
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 6454f15f..d4a3d798 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -774,8 +774,7 @@ sk_ssh_free(sock *s)
 
   if (ssh->channel)
   {
-    if (ssh_channel_is_open(ssh->channel))
-      ssh_channel_close(ssh->channel);
+    ssh_channel_close(ssh->channel);
     ssh_channel_free(ssh->channel);
     ssh->channel = NULL;
   }
@@ -1153,33 +1152,34 @@ sk_ssh_connect(sock *s)
       int server_identity_is_ok = 1;
 
       /* Check server identity */
-      switch (ssh_is_server_known(s->ssh->session))
+      switch (ssh_session_is_known_server(s->ssh->session))
       {
 #define LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s,msg,args...) log(L_WARN "SSH Identity %s@%s:%u: " msg, (s)->ssh->username, (s)->host, (s)->dport, ## args);
-      case SSH_SERVER_KNOWN_OK:
+      case SSH_KNOWN_HOSTS_OK:
 	/* The server is known and has not changed. */
 	break;
 
-      case SSH_SERVER_NOT_KNOWN:
+      case SSH_KNOWN_HOSTS_UNKNOWN:
 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server is unknown, its public key was not found in the known host file %s", s->ssh->server_hostkey_path);
+	server_identity_is_ok = 0;
 	break;
 
-      case SSH_SERVER_KNOWN_CHANGED:
+      case SSH_KNOWN_HOSTS_CHANGED:
 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server key has changed. Either you are under attack or the administrator changed the key.");
 	server_identity_is_ok = 0;
 	break;
 
-      case SSH_SERVER_FILE_NOT_FOUND:
+      case SSH_KNOWN_HOSTS_NOT_FOUND:
 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The known host file %s does not exist", s->ssh->server_hostkey_path);
 	server_identity_is_ok = 0;
 	break;
 
-      case SSH_SERVER_ERROR:
+      case SSH_KNOWN_HOSTS_ERROR:
 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "Some error happened");
 	server_identity_is_ok = 0;
 	break;
 
-      case SSH_SERVER_FOUND_OTHER:
+      case SSH_KNOWN_HOSTS_OTHER:
 	LOG_WARN_ABOUT_SSH_SERVER_VALIDATION(s, "The server gave use a key of a type while we had an other type recorded. " \
 					     "It is a possible attack.");
 	server_identity_is_ok = 0;

From e1701128bfdc737e04fe4bd4609020d5f93853c6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 5 Oct 2022 16:26:13 +0200
Subject: [PATCH 224/431] Poll errors must also drop a corefile. And we
 shouldn't run sockets when sockets have changed

---
 sysdep/unix/io-loop.c | 6 +++---
 sysdep/unix/io.c      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index b588b736..5ce2d350 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -367,7 +367,7 @@ sockets_fire(struct birdloop *loop)
       continue;
 
     if (pfd->revents & POLLNVAL)
-      die("poll: invalid fd %d", pfd->fd);
+      bug("poll: invalid fd %d", pfd->fd);
 
     if (pfd->revents & POLLIN)
       while (e && *psk && (*psk)->rx_hook)
@@ -602,7 +602,7 @@ birdloop_main(void *arg)
     {
       if (errno == EINTR || errno == EAGAIN)
 	goto try;
-      die("poll: %m");
+      bug("poll: %m");
     }
 
     birdloop_enter(loop);
@@ -615,7 +615,7 @@ birdloop_main(void *arg)
 
     loop_begin = current_time();
 
-    if (rv)
+    if (rv && !loop->poll_changed)
       sockets_fire(loop);
 
     atomic_exchange_explicit(&loop->ping_sent, 0, memory_order_acq_rel);
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index d4a3d798..fb25d5d8 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2315,7 +2315,7 @@ io_loop(void)
 	{
 	  if (errno == EINTR || errno == EAGAIN)
 	    continue;
-	  die("poll: %m");
+	  bug("poll: %m");
 	}
       if (pout)
 	{

From 6abef2b20b88ec2aa747ff3885d7fd1c7d147cef Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 21 Nov 2021 12:06:19 +0100
Subject: [PATCH 225/431] BGP: End route refresh before another starts

---
 proto/bgp/bgp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 573e3d25..36179eb8 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -955,6 +955,9 @@ bgp_refresh_begin(struct bgp_channel *c)
   if (c->load_state == BFS_LOADING)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
+  if (c->load_state == BFS_REFRESHING)
+    rt_refresh_end(&c->c.in_req);
+
   c->load_state = BFS_REFRESHING;
   rt_refresh_begin(&c->c.in_req);
 }

From 2ae32374dd17cb3b22d9ee35265ed27490643924 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 6 Oct 2022 17:51:32 +0200
Subject: [PATCH 226/431] Fixed export hook stopping in some corner cases.

Notably, it's in a corked state and also when refeed is pending.
---
 nest/proto.c    |  7 ++++++-
 nest/rt-table.c | 23 +++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 2f3515b9..fcdedda5 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -739,7 +739,9 @@ channel_do_pause(struct channel *c)
   }
 
   /* Stop export */
-  if (c->out_req.hook)
+  if (c->refeed_pending)
+    c->refeed_pending = 0;
+  else if (c->out_req.hook)
     rt_stop_export(&c->out_req, channel_export_stopped);
 
   channel_roa_unsubscribe_all(c);
@@ -863,6 +865,9 @@ channel_request_feeding(struct channel *c)
 {
   ASSERT(c->out_req.hook);
 
+  if (c->refeed_pending)
+    return;
+
   c->refeed_pending = 1;
   rt_stop_export(&c->out_req, channel_export_stopped);
 }
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 36d69d92..71b258f9 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2073,8 +2073,11 @@ rt_table_export_uncork(void *_hook)
   {
     case TES_HUNGRY:
       RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, hook->table)), tab)
-	rt_table_export_start_feed(tab, hook);
-      break;
+	if ((state = atomic_load_explicit(&hook->h.export_state, memory_order_relaxed)) == TES_HUNGRY)
+	  rt_table_export_start_feed(tab, hook);
+      if (state != TES_STOP)
+	break;
+      /* fall through */
     case TES_STOP:
       rt_stop_export_common(&hook->h);
       break;
@@ -2181,19 +2184,19 @@ rt_alloc_export(struct rt_exporter *re, uint size)
   hook->pool = p;
   hook->table = re;
 
+  hook->n = (node) {};
+  add_tail(&re->hooks, &hook->n);
+
   return hook;
 }
 
 void
-rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook)
+rt_init_export(struct rt_exporter *re UNUSED, struct rt_export_hook *hook)
 {
   hook->event.data = hook;
 
   bmap_init(&hook->seq_map, hook->pool, 1024);
 
-  hook->n = (node) {};
-  add_tail(&re->hooks, &hook->n);
-
   /* Regular export */
   rt_set_export_state(hook, TES_FEEDING);
   rt_send_export_event(hook);
@@ -2208,6 +2211,7 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
   switch (atomic_load_explicit(&hh->export_state, memory_order_relaxed))
   {
     case TES_HUNGRY:
+      rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking; %p", hook->h.req->name, hook->h.n.next);
       return 0;
     case TES_FEEDING:
       switch (hh->req->addr_mode)
@@ -2228,6 +2232,8 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
       }
 
   }
+
+  rt_trace(tab, D_EVENTS, "Stopping export hook %s right now", hook->h.req->name);
   return 1;
 }
 
@@ -4001,7 +4007,7 @@ rt_check_cork_low(struct rtable_private *tab)
   if (!tab->cork_active)
     return;
 
-  if (!tab->exporter.first || (tab->exporter.first->seq + tab->cork_threshold.low > tab->exporter.next_seq))
+  if (tab->deleted || !tab->exporter.first || (tab->exporter.first->seq + tab->cork_threshold.low > tab->exporter.next_seq))
   {
     tab->cork_active = 0;
     rt_cork_release();
@@ -4013,7 +4019,7 @@ rt_check_cork_low(struct rtable_private *tab)
 static void
 rt_check_cork_high(struct rtable_private *tab)
 {
-  if (!tab->cork_active && tab->exporter.first && (tab->exporter.first->seq + tab->cork_threshold.high <= tab->exporter.next_seq))
+  if (!tab->deleted && !tab->cork_active && tab->exporter.first && (tab->exporter.first->seq + tab->cork_threshold.high <= tab->exporter.next_seq))
   {
     tab->cork_active = 1;
     rt_cork_acquire();
@@ -4111,6 +4117,7 @@ rt_commit(struct config *new, struct config *old)
 	      ev_postpone(&tab->hostcache->update);
 	  }
 
+	  rt_check_cork_low(tab);
 	  rt_unlock_table(tab);
 
 	  RT_UNLOCK(tab);

From 02dc89555032c2e045e6910fbc6ee2c45d03a41a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 11:06:32 +0200
Subject: [PATCH 227/431] CLI fix to break busy-loop waiting for corked
 show-route exports

---
 nest/cli.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nest/cli.c b/nest/cli.c
index 31deef03..469d45b6 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -302,7 +302,8 @@ cli_event(void *data)
 	cli_command(c);
     }
 
-  cli_write_trigger(c);
+  if (c->tx_pos)
+    cli_write_trigger(c);
 }
 
 cli *

From b83a9d5f9a93d6b01d4b06429195e4508377504c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 11:06:58 +0200
Subject: [PATCH 228/431] Limited value must never go under zero

---
 nest/limit.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nest/limit.h b/nest/limit.h
index 5838ad3b..f8d4b212 100644
--- a/nest/limit.h
+++ b/nest/limit.h
@@ -32,6 +32,7 @@ static inline int limit_push(struct limit *l, void *data)
 
 static inline void limit_pop(struct limit *l)
 {
+  ASSERT_DIE(l->count > 0);
   --l->count;
 }
 

From 26552a7ec85e0f8845a2672a797c5cb2c9bf47d5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 11:07:38 +0200
Subject: [PATCH 229/431] Fixed BGP reload limits

---
 nest/proto.c    | 12 ++++--------
 proto/bgp/bgp.c |  8 ++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index fcdedda5..0898dc36 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -880,14 +880,10 @@ channel_request_reload(struct channel *c)
 
   CD(c, "Reload requested");
 
-  c->proto->reload_routes(c);
-
-  /*
-   * Should this be done before reload_routes() hook?
-   * Perhaps, but routes are updated asynchronously.
-   */
-  channel_reset_limit(c, &c->rx_limit, PLD_RX);
-  channel_reset_limit(c, &c->in_limit, PLD_IN);
+  if (c->in_keep & RIK_PREFILTER)
+    channel_schedule_reload(c);
+  else
+    c->proto->reload_routes(c);
 }
 
 const struct channel_class channel_basic = {
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 36179eb8..1755c5e4 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1447,12 +1447,8 @@ bgp_reload_routes(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
-  ASSERT(p->conn && (p->route_refresh || (C->in_keep & RIK_PREFILTER)));
-
-  if (C->in_keep & RIK_PREFILTER)
-    channel_schedule_reload(C);
-  else
-    bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
+  ASSERT(p->conn && p->route_refresh);
+  bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
 }
 
 static void

From 6d5929be24ec0e7846b83fab7b4ea910accbcc80 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 11:08:15 +0200
Subject: [PATCH 230/431] More thorough logging of route update corner cases

---
 nest/rt-table.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 71b258f9..37d0307b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1792,6 +1792,9 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
       else
 	rt_rte_trace_in(D_ROUTES, req, old, "removed [sole]");
     }
+  else
+    if (req->trace_routes & D_ROUTES)
+      log(L_TRACE "%s > ignored %N %s->%s", req->name, net->n.addr, old ? "filtered" : "none", new ? "filtered" : "none");
 
   /* Propagate the route change */
   rte_announce(table, net, new_stored, old_stored,
@@ -1835,7 +1838,10 @@ void
 rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   if (!c->in_req.hook)
+  {
+    log(L_WARN "%s.%s: Called rte_update without import hook", c->proto->name, c->name);
     return;
+  }
 
   ASSERT(c->channel_state == CS_UP);
 
@@ -1906,7 +1912,10 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
 {
   struct rt_import_hook *hook = req->hook;
   if (!hook)
+  {
+    log(L_WARN "%s: Called rte_import without import hook", req->name);
     return;
+  }
 
   RT_LOCKED(hook->table, tab)
   {
@@ -1924,6 +1933,8 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
     else if (!(nn = net_find(tab, n)))
     {
       req->hook->stats.withdraws_ignored++;
+      if (req->trace_routes & D_ROUTES)
+	log(L_TRACE "%s > ignored %N withdraw", req->name, n);
       RT_RETURN(tab);
     }
 

From c1cb2dc31c26154fc616607b767f3f20c6efe25b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 11:08:49 +0200
Subject: [PATCH 231/431] TES_HUNGRY doesn't inhibit export cleanup any more

---
 nest/rt-table.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 37d0307b..dad5d0cc 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3061,10 +3061,19 @@ rt_export_cleanup(struct rtable_private *tab)
   {
     switch (atomic_load_explicit(&eh->h.export_state, memory_order_acquire))
     {
-      case TES_DOWN:
-      case TES_HUNGRY:
+      /* Export cleanup while feeding isn't implemented */
+      case TES_FEEDING:
+	goto done;
+
+      /* States not interfering with export cleanup */
+      case TES_DOWN:	/* This should not happen at all */
+	log(L_WARN "%s: Export cleanup found hook %s in explicit state TES_DOWN", tab->name, eh->h.req->name);
+	/* fall through */
+      case TES_HUNGRY:	/* Feeding waiting for uncork */
+      case TES_STOP:	/* No more export will happen on this hook */
 	continue;
 
+      /* Regular export */
       case TES_READY:
 	{
 	  struct rt_pending_export *last = atomic_load_explicit(&eh->last_export, memory_order_acquire);
@@ -3081,8 +3090,7 @@ rt_export_cleanup(struct rtable_private *tab)
 	}
 
       default:
-	/* It's only safe to cleanup when the export state is idle or regular. No feeding or stopping allowed. */
-	goto done;
+	bug("%s: Strange export state of hook %s: %d", tab->name, eh->h.req->name, atomic_load_explicit(&eh->h.export_state, memory_order_relaxed));
     }
   }
 

From fdacb89a536b1be2fc01904a73e1bee48a49e0d3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 11 Oct 2022 19:26:31 +0200
Subject: [PATCH 232/431] BGP refeed and reload with Adj-RIB-In/Out is done
 without route refresh

---
 nest/proto.c    |  6 ++++++
 proto/bgp/bgp.c | 12 ++++++++++++
 proto/bgp/bgp.h |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/nest/proto.c b/nest/proto.c
index 0898dc36..e39fbdfe 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -661,6 +661,7 @@ channel_schedule_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
 
+  rt_refresh_begin(&c->in_req);
   rt_request_export(c->table, &c->reload_req);
 }
 
@@ -677,8 +678,13 @@ channel_reload_stopped(struct rt_export_request *req)
 static void
 channel_reload_log_state_change(struct rt_export_request *req, u8 state)
 {
+  struct channel *c = SKIP_BACK(struct channel, reload_req, req);
+
   if (state == TES_READY)
+  {
+    rt_refresh_end(&c->in_req);
     rt_stop_export(req, channel_reload_stopped);
+  }
 }
 
 static void
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 1755c5e4..8bacebfc 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1464,6 +1464,12 @@ bgp_feed_begin(struct channel *C, int initial)
   if (initial && p->cf->gr_mode)
     c->feed_state = BFS_LOADING;
 
+  if (!initial && C->out_table)
+  {
+    c->feed_out_table = 1;
+    return;
+  }
+
   /* It is refeed and both sides support enhanced route refresh */
   if (!initial && p->enhanced_refresh)
   {
@@ -1482,6 +1488,12 @@ bgp_feed_end(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
+  if (c->feed_out_table)
+  {
+    c->feed_out_table = 0;
+    return;
+  }
+
   /* This should not happen */
   if (!p->conn)
     return;
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 1bcfb915..b76ffe99 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -383,6 +383,8 @@ struct bgp_channel {
 
   u8 feed_state;			/* Feed state (TX) for EoR, RR packets, see BFS_* */
   u8 load_state;			/* Load state (RX) for EoR, RR packets, see BFS_* */
+
+  u8 feed_out_table;			/* Refeed into out_table */
 };
 
 struct bgp_prefix {

From 2d99f1277317040d05cca7b8f04b43a66f6fe643 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Oct 2022 10:44:18 +0200
Subject: [PATCH 233/431] Tamed slab signedness warning on 32-bit architectures

---
 lib/slab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/slab.c b/lib/slab.c
index 054daea1..cf2ecc70 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -236,7 +236,7 @@ sl_new(pool *p, uint size)
       + sizeof(u32) * s->head_bitfield_len
       + align - 1)
     / align * align;
-  } while (s->objs_per_slab * size + s->head_size > page_size);
+  } while (s->objs_per_slab * size + s->head_size > (size_t) page_size);
 
   if (!s->objs_per_slab)
     bug("Slab: object too large");

From f182771f96280115e839315d9d3e5aa7c9343d54 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Oct 2022 10:52:53 +0200
Subject: [PATCH 234/431] Fixed SSH known hosts checking with older versions of
 libssh

---
 configure.ac     |  6 ++++++
 sysdep/unix/io.c | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/configure.ac b/configure.ac
index 330add87..f942ec1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,12 @@ if test "$enable_libssh" != no ; then
       enable_libssh=no
     fi
   fi
+
+  AC_CHECK_LIB([ssh], [ssh_session_is_known_server], [ssh_old_server_validation_api=no], [ssh_old_server_validation_api=yes])
+
+  if test "$ssh_old_server_validation_api" = yes; then
+    AC_DEFINE([HAVE_SSH_OLD_SERVER_VALIDATION_API], [1], [Define to 1 if ssh_session_is_known_server isn't defined])
+  fi
 fi
 
 if test "$enable_mpls_kernel" != no ; then
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index fb25d5d8..c91bd597 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1151,6 +1151,16 @@ sk_ssh_connect(sock *s)
     {
       int server_identity_is_ok = 1;
 
+#ifdef HAVE_SSH_OLD_SERVER_VALIDATION_API
+#define ssh_session_is_known_server	ssh_is_server_known
+#define SSH_KNOWN_HOSTS_OK		SSH_SERVER_KNOWN_OK
+#define SSH_KNOWN_HOSTS_UNKNOWN		SSH_SERVER_NOT_KNOWN
+#define SSH_KNOWN_HOSTS_CHANGED		SSH_SERVER_KNOWN_CHANGED
+#define SSH_KNOWN_HOSTS_NOT_FOUND	SSH_SERVER_FILE_NOT_FOUND
+#define SSH_KNOWN_HOSTS_ERROR		SSH_SERVER_ERROR
+#define SSH_KNOWN_HOSTS_OTHER		SSH_SERVER_FOUND_OTHER
+#endif
+
       /* Check server identity */
       switch (ssh_session_is_known_server(s->ssh->session))
       {

From a9fe913a41a9eff33ce9d39a7e3a80c8498bae0e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Oct 2022 14:23:50 +0200
Subject: [PATCH 235/431] GDB connection: resource pools don't keep free pages

---
 bird-gdb.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/bird-gdb.py b/bird-gdb.py
index dc1e54b2..c53a3b55 100644
--- a/bird-gdb.py
+++ b/bird-gdb.py
@@ -396,17 +396,11 @@ class BIRDPoolResource(BIRDResource):
         self.items = []
         BIRDList(self.val["inside"]).walk(self.parse_inside)
 
-    def free_pages(self):
-        if str(self.val['pages']) == '0x0':
-            return 0
-        else:
-            return self.val['pages'].dereference()['free']
-
     def memsize(self):
         if self.items is None:
             self.parse()
 
-        sum = BIRDResourceSize(0, self.pooltype.sizeof, self.free_pages() * self.page_size)
+        sum = BIRDResourceSize(0, self.pooltype.sizeof, 0)
 #        for i in self.items:
 #            sum += i.memsize()
 
@@ -419,7 +413,7 @@ class BIRDPoolResource(BIRDResource):
 #        for i in self.items:
 #            print(i)
 
-        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self.items)} items and {self.free_pages()} free pages"
+        return f"Resource pool {self.val.address} \"{self.val['name'].string()}\" containing {len(self.items)} items"
 
 BIRDResourceMap = {
         "mbl_memsize": BIRDMBResource,

From d3af586da442b531ff83a341d1e992113c1b2ee0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Oct 2022 18:02:34 +0200
Subject: [PATCH 236/431] Removed an accidentally merged debug call introduced
 in 5395880908fdb264b5b78ccc455dced49eb29915

---
 nest/rt-table.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8e4a9e00..8980f147 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -899,9 +899,6 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
   if (old && !bmap_test(&c->export_map, old->id))
     old = NULL;
 
-  if (old && (old->sender == c->in_req.hook))
-    bug("bad-behaved pipe");
-
   if (!new && !old)
     return;
 

From 8d7f516b2a255a40659ce7857fe30937a6ecf7f2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Oct 2022 18:04:39 +0200
Subject: [PATCH 237/431] Attribute blocks are now allocated from slabs instead
 of malloc()

---
 lib/route.h    |  1 +
 nest/rt-attr.c | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index eae251e7..50e62440 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -265,6 +265,7 @@ struct ea_storage {
 #define EALF_SORTED 1			/* Attributes are sorted by code */
 #define EALF_BISECT 2			/* Use interval bisection for searching */
 #define EALF_CACHED 4			/* List is cached */
+#define EALF_HUGE   8			/* List is too big to fit into slab */
 
 struct ea_class {
 #define EA_CLASS_INSIDE \
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 471209ee..b41e56c2 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -182,6 +182,10 @@ DOMAIN(attrs) attrs_domain;
 
 pool *rta_pool;
 
+/* Assuming page size of 4096, these are magic values for slab allocation */
+static const uint ea_slab_sizes[] = { 56, 112, 168, 288, 448, 800, 1344 };
+static slab *ea_slab[ARRAY_SIZE(ea_slab_sizes)];
+
 static slab *rte_src_slab;
 
 static struct idm src_ids;
@@ -1485,11 +1489,22 @@ ea_lookup(ea_list *o, int overlay)
     }
 
   uint elen = ea_list_size(o);
-  r = mb_alloc(rta_pool, elen + sizeof(struct ea_storage));
+  uint sz = elen + sizeof(struct ea_storage);
+  for (uint i=0; i<ARRAY_SIZE(ea_slab_sizes); i++)
+    if (sz <= ea_slab_sizes[i])
+    {
+      r = sl_alloc(ea_slab[i]);
+      break;
+    }
+
+  int huge = r ? 0 : EALF_HUGE;;
+  if (huge)
+    r = mb_alloc(rta_pool, sz);
+
   ea_list_copy(r->l, o, elen);
   ea_list_ref(r->l);
 
-  r->l->flags |= EALF_CACHED;
+  r->l->flags |= EALF_CACHED | huge;
   r->hash_key = h;
   r->uc = 1;
 
@@ -1516,7 +1531,10 @@ ea_free_locked(struct ea_storage *a)
     a->next_hash->pprev_hash = a->pprev_hash;
 
   ea_list_unref(a->l);
-  mb_free(a);
+  if (a->l->flags & EALF_HUGE)
+    mb_free(a);
+  else
+    sl_free(a);
 }
 
 static void
@@ -1580,6 +1598,9 @@ rta_init(void)
 
   rta_pool = rp_new(&root_pool, "Attributes");
 
+  for (uint i=0; i<ARRAY_SIZE(ea_slab_sizes); i++)
+    ea_slab[i] = sl_new(rta_pool, ea_slab_sizes[i]);
+
   rta_alloc_hash();
   rte_src_init();
   ea_class_init();

From 34aeafbf9ea98c8644f6403b3810ff0490350465 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 18 Jan 2023 14:31:11 +0100
Subject: [PATCH 238/431] Removed config reparsing from unrelated tests

---
 filter/filter_test.c |  1 -
 filter/tree_test.c   | 17 ++---------------
 filter/trie_test.c   | 36 ++----------------------------------
 lib/a-path_test.c    |  8 ++++----
 lib/a-set_test.c     | 24 ++++++++++++------------
 test/bt-utils.c      |  6 ------
 6 files changed, 20 insertions(+), 72 deletions(-)

diff --git a/filter/filter_test.c b/filter/filter_test.c
index 671dba94..aa325aef 100644
--- a/filter/filter_test.c
+++ b/filter/filter_test.c
@@ -85,6 +85,5 @@ main(int argc, char *argv[])
   WALK_LIST(t, config->tests)
     bt_test_suite_base(run_function, t->fn_name, t, 0, BT_TIMEOUT, "%s", t->dsc);
 
-  bt_bird_cleanup();
   return bt_exit_value();
 }
diff --git a/filter/tree_test.c b/filter/tree_test.c
index d180efbc..655205c2 100644
--- a/filter/tree_test.c
+++ b/filter/tree_test.c
@@ -15,13 +15,6 @@
 
 #define MAX_TREE_HEIGHT 13
 
-static void
-start_conf_env(void)
-{
-  bt_bird_init();
-  cfg_mem = tmp_linpool;
-}
-
 static struct f_tree *
 new_tree(uint id)
 {
@@ -153,8 +146,6 @@ get_balanced_tree_with_ranged_values(uint nodes_count)
 static int
 t_balancing(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -181,8 +172,6 @@ t_balancing(void)
 static int
 t_balancing_random(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -218,8 +207,6 @@ t_balancing_random(void)
 static int
 t_find(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -266,8 +253,6 @@ get_max_value_in_unbalanced_tree(struct f_tree *node, uint max)
 static int
 t_find_ranges(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -305,6 +290,8 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  bt_bird_init();
+  cfg_mem = tmp_linpool;
 
   bt_test_suite(t_balancing, "Balancing strong unbalanced trees");
   bt_test_suite(t_balancing_random, "Balancing random unbalanced trees");
diff --git a/filter/trie_test.c b/filter/trie_test.c
index ddce2daa..81f38db9 100644
--- a/filter/trie_test.c
+++ b/filter/trie_test.c
@@ -432,9 +432,6 @@ test_match_net(list *prefixes, struct f_trie *trie, const net_addr *net)
 static int
 t_match_random_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -452,16 +449,12 @@ t_match_random_net(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
 static int
 t_match_inner_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -482,16 +475,12 @@ t_match_inner_net(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
 static int
 t_match_outer_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -513,7 +502,6 @@ t_match_outer_net(void)
   }
 
   v6 = !v6;
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -574,34 +562,24 @@ benchmark_trie_dataset(const char *filename, int plus)
 static int UNUSED
 t_bench_trie_datasets_subset(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   /* Specific datasets, not included */
   benchmark_trie_dataset("trie-data-bgp-1", 0);
   benchmark_trie_dataset("trie-data-bgp-10", 0);
   benchmark_trie_dataset("trie-data-bgp-100", 0);
   benchmark_trie_dataset("trie-data-bgp-1000", 0);
 
-  bt_bird_cleanup();
-
   return 1;
 }
 
 static int UNUSED
 t_bench_trie_datasets_random(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   /* Specific datasets, not included */
   benchmark_trie_dataset("trie-data-bgp-1", 1);
   benchmark_trie_dataset("trie-data-bgp-10", 1);
   benchmark_trie_dataset("trie-data-bgp-100", 1);
   benchmark_trie_dataset("trie-data-bgp-1000", 1);
 
-  bt_bird_cleanup();
-
   return 1;
 }
 
@@ -609,9 +587,6 @@ t_bench_trie_datasets_random(void)
 static int
 t_trie_same(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM*4; round++)
   {
@@ -632,7 +607,6 @@ t_trie_same(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -652,9 +626,6 @@ log_networks(const net_addr *a, const net_addr *b)
 static int
 t_trie_walk(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   for (int round = 0; round < TESTS_NUM*8; round++)
   {
     int level = round / TESTS_NUM;
@@ -763,7 +734,6 @@ t_trie_walk(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -802,9 +772,6 @@ find_covering_nets(struct f_prefix *prefixes, int num, const net_addr *net, net_
 static int
 t_trie_walk_to_root(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   for (int round = 0; round < TESTS_NUM * 4; round++)
   {
     int level = round / TESTS_NUM;
@@ -876,7 +843,6 @@ t_trie_walk_to_root(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -884,6 +850,8 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  bt_bird_init();
+  bt_config_parse(BT_CONFIG_SIMPLE);
 
   bt_test_suite(t_match_random_net, "Testing random prefix matching");
   bt_test_suite(t_match_inner_net, "Testing random inner prefix matching");
diff --git a/lib/a-path_test.c b/lib/a-path_test.c
index c6f8ce8b..08c6c96c 100644
--- a/lib/a-path_test.c
+++ b/lib/a-path_test.c
@@ -78,13 +78,13 @@ t_path_format(void)
     bt_debug("Prepending ASN: %10u \n", i);
   }
 
-#define BUFFER_SIZE 120
-  byte buf[BUFFER_SIZE] = {};
+#define T_BUFFER_SIZE 120
+  byte buf[T_BUFFER_SIZE] = {};
 
-  as_path_format(&empty_as_path, buf, BUFFER_SIZE);
+  as_path_format(&empty_as_path, buf, T_BUFFER_SIZE);
   bt_assert_msg(strcmp(buf, "") == 0, "Buffer(%zu): '%s'", strlen(buf), buf);
 
-  as_path_format(as_path, buf, BUFFER_SIZE);
+  as_path_format(as_path, buf, T_BUFFER_SIZE);
   bt_assert_msg(strcmp(buf, "4294967294 4294967293 4294967292 4294967291 4294967290 4294967289 4294967288 4294967287 4294967286 4294967285") == 0, "Buffer(%zu): '%s'", strlen(buf), buf);
 
 #define SMALL_BUFFER_SIZE 25
diff --git a/lib/a-set_test.c b/lib/a-set_test.c
index 693b8f08..79b5cf9a 100644
--- a/lib/a-set_test.c
+++ b/lib/a-set_test.c
@@ -20,8 +20,8 @@ static const struct adata *set_sequence_same;		/* <0; SET_SIZE) */
 static const struct adata *set_sequence_higher;	/* <SET_SIZE; 2*SET_SIZE) */
 static const struct adata *set_random;
 
-#define BUFFER_SIZE 1000
-static byte buf[BUFFER_SIZE] = {};
+#define T_BUFFER_SIZE 1000
+static byte buf[T_BUFFER_SIZE] = {};
 
 #define SET_SIZE_FOR_FORMAT_OUTPUT 10
 
@@ -92,11 +92,11 @@ t_set_int_union(void)
   const struct adata *set_union;
   set_union = int_set_union(tmp_linpool, set_sequence, set_sequence_same);
   bt_assert(int_set_get_size(set_union) == SET_SIZE);
-  bt_assert(int_set_format(set_union, 0, 2, buf, BUFFER_SIZE) == 0);
+  bt_assert(int_set_format(set_union, 0, 2, buf, T_BUFFER_SIZE) == 0);
 
   set_union = int_set_union(tmp_linpool, set_sequence, set_sequence_higher);
   bt_assert_msg(int_set_get_size(set_union) == SET_SIZE*2, "int_set_get_size(set_union) %d, SET_SIZE*2 %d", int_set_get_size(set_union), SET_SIZE*2);
-  bt_assert(int_set_format(set_union, 0, 2, buf, BUFFER_SIZE) == 0);
+  bt_assert(int_set_format(set_union, 0, 2, buf, T_BUFFER_SIZE) == 0);
 
   return 1;
 }
@@ -106,15 +106,15 @@ t_set_int_format(void)
 {
   generate_set_sequence(SET_TYPE_INT, SET_SIZE_FOR_FORMAT_OUTPUT);
 
-  bt_assert(int_set_format(set_sequence, 0, 0, buf, BUFFER_SIZE) == 0);
+  bt_assert(int_set_format(set_sequence, 0, 0, buf, T_BUFFER_SIZE) == 0);
   bt_assert(strcmp(buf, "0.0.0.0 0.0.0.1 0.0.0.2 0.0.0.3 0.0.0.4 0.0.0.5 0.0.0.6 0.0.0.7 0.0.0.8 0.0.0.9") == 0);
 
-  bzero(buf, BUFFER_SIZE);
-  bt_assert(int_set_format(set_sequence, 0, 2, buf, BUFFER_SIZE) == 0);
+  bzero(buf, T_BUFFER_SIZE);
+  bt_assert(int_set_format(set_sequence, 0, 2, buf, T_BUFFER_SIZE) == 0);
   bt_assert(strcmp(buf, "0.0.0.2 0.0.0.3 0.0.0.4 0.0.0.5 0.0.0.6 0.0.0.7 0.0.0.8 0.0.0.9") == 0);
 
-  bzero(buf, BUFFER_SIZE);
-  bt_assert(int_set_format(set_sequence, 1, 0, buf, BUFFER_SIZE) == 0);
+  bzero(buf, T_BUFFER_SIZE);
+  bt_assert(int_set_format(set_sequence, 1, 0, buf, T_BUFFER_SIZE) == 0);
   bt_assert(strcmp(buf, "(0,0) (0,1) (0,2) (0,3) (0,4) (0,5) (0,6) (0,7) (0,8) (0,9)") == 0);
 
   return 1;
@@ -174,11 +174,11 @@ t_set_ec_union(void)
   const struct adata *set_union;
   set_union = ec_set_union(tmp_linpool, set_sequence, set_sequence_same);
   bt_assert(ec_set_get_size(set_union) == SET_SIZE);
-  bt_assert(ec_set_format(set_union, 0, buf, BUFFER_SIZE) == 0);
+  bt_assert(ec_set_format(set_union, 0, buf, T_BUFFER_SIZE) == 0);
 
   set_union = ec_set_union(tmp_linpool, set_sequence, set_sequence_higher);
   bt_assert_msg(ec_set_get_size(set_union) == SET_SIZE*2, "ec_set_get_size(set_union) %d, SET_SIZE*2 %d", ec_set_get_size(set_union), SET_SIZE*2);
-  bt_assert(ec_set_format(set_union, 0, buf, BUFFER_SIZE) == 0);
+  bt_assert(ec_set_format(set_union, 0, buf, T_BUFFER_SIZE) == 0);
 
   return 1;
 }
@@ -194,7 +194,7 @@ t_set_ec_format(void)
   for (i = 1; i < SET_SIZE_FOR_FORMAT_OUTPUT; i++)
     set_sequence = ec_set_add(tmp_linpool, set_sequence, i + ((i%2) ? ((u64)EC_RO << 48) : ((u64)EC_RT << 48)));
 
-  bt_assert(ec_set_format(set_sequence, 0, buf, BUFFER_SIZE) == 0);
+  bt_assert(ec_set_format(set_sequence, 0, buf, T_BUFFER_SIZE) == 0);
   bt_assert_msg(strcmp(buf, "(unknown 0x0, 0, 0) (ro, 0, 1) (rt, 0, 2) (ro, 0, 3) (rt, 0, 4) (ro, 0, 5) (rt, 0, 6) (ro, 0, 7) (rt, 0, 8) (ro, 0, 9)") == 0,
 		"ec_set_format() returns '%s'", buf);
 
diff --git a/test/bt-utils.c b/test/bt-utils.c
index 36e44da4..d497840f 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -71,12 +71,6 @@ bt_bird_init(void)
   protos_build();
 }
 
-void bt_bird_cleanup(void)
-{
-  config = new_config = NULL;
-  the_bird_unlock();
-}
-
 static char *
 bt_load_file(const char *filename, int quiet)
 {

From 59a5bf18f997e11a3e3ddd70d59f597f77fa2b6c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 19 Jan 2023 10:53:09 +0100
Subject: [PATCH 239/431] CLI closing fix when its action is run
 asynchronously.

Some CLI actions, notably "show route", are run by queuing an event
somewhere else. If the user closes the socket, in case such an action is
being executed, the CLI must free the socket immediately from the error
hook but the pool must remain until the asynchronous event finishes and
cleans everything up.
---
 nest/cli.c         | 11 ++++++++---
 nest/cli.h         |  4 ++--
 nest/rt-show.c     |  1 +
 sysdep/unix/main.c | 11 ++++++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/nest/cli.c b/nest/cli.c
index 469d45b6..1debfccf 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -307,14 +307,14 @@ cli_event(void *data)
 }
 
 cli *
-cli_new(void *priv)
+cli_new(struct birdsock *sock)
 {
   pool *p = rp_new(cli_pool, "CLI");
   cli *c = mb_alloc(p, sizeof(cli));
 
   bzero(c, sizeof(cli));
   c->pool = p;
-  c->priv = priv;
+  c->sock = sock;
   c->event = ev_new(p);
   c->event->hook = cli_event;
   c->event->data = c;
@@ -415,7 +415,12 @@ cli_free(cli *c)
   if (c == cmd_reconfig_stored_cli)
     cmd_reconfig_stored_cli = NULL;
 
-  if (!defer)
+  if (defer)
+  {
+    rfree(c->sock);
+    c->sock = NULL;
+  }
+  else
     rfree(c->pool);
 }
 
diff --git a/nest/cli.h b/nest/cli.h
index 92572968..2b96da5b 100644
--- a/nest/cli.h
+++ b/nest/cli.h
@@ -28,7 +28,7 @@ struct cli_out {
 typedef struct cli {
   node n;				/* Node in list of all log hooks */
   pool *pool;
-  void *priv;				/* Private to sysdep layer */
+  struct birdsock *sock;		/* Underlying socket */
   byte *rx_buf, *rx_pos, *rx_aux;	/* sysdep */
   struct cli_out *tx_buf, *tx_pos, *tx_write;
   event *event;
@@ -63,7 +63,7 @@ static inline void cli_separator(cli *c)
 
 /* Functions provided to sysdep layer */
 
-cli *cli_new(void *);
+cli *cli_new(struct birdsock *);
 void cli_init(void);
 void cli_free(cli *);
 void cli_kick(cli *);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index dc88047a..d8eb2174 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -233,6 +233,7 @@ static int
 rt_show_cleanup(struct cli *c)
 {
   struct rt_show_data *d = c->rover;
+  c->cleanup = NULL;
 
   /* Cancel the feed */
   if (d->req.hook)
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index bf9f2be0..74827d98 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -395,7 +395,8 @@ static char *path_control_socket = PATH_CONTROL_SOCKET;
 static void
 cli_write(cli *c)
 {
-  sock *s = c->priv;
+  sock *s = c->sock;
+  ASSERT_DIE(c->sock);
 
   while (c->tx_pos)
     {
@@ -419,7 +420,9 @@ cli_write(cli *c)
 void
 cli_write_trigger(cli *c)
 {
-  sock *s = c->priv;
+  sock *s = c->sock;
+  if (!s)
+    return;
 
   if (s->tbuf == NULL)
     cli_write(c);
@@ -434,7 +437,8 @@ cli_tx(sock *s)
 int
 cli_get_command(cli *c)
 {
-  sock *s = c->priv;
+  sock *s = c->sock;
+  ASSERT_DIE(c->sock);
   byte *t = c->rx_aux ? : s->rbuf;
   byte *tend = s->rpos;
   byte *d = c->rx_pos;
@@ -477,6 +481,7 @@ cli_err(sock *s, int err)
       else
 	log(L_INFO "CLI connection closed");
     }
+
   cli_free(s->data);
 }
 

From 4d8d81f144e72fe2e182d7569087f2a8c8c5b938 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 19 Jan 2023 10:56:16 +0100
Subject: [PATCH 240/431] Table prune routine doesn't walk over lists unless
 needed.

If no channel is flushing, table prune doesn't walk over routes in nets
and also doesn't walk over importing channel lists. This helps to
alleviate the memory caching burdens a lot.
---
 doc/bird.sgml   |  2 +-
 nest/rt-attr.c  |  2 ++
 nest/rt-table.c | 63 ++++++++++++++++++++++++++++++-------------------
 nest/rt.h       |  2 ++
 4 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index f8be53f6..3675d2e8 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -697,7 +697,7 @@ to set options.
         thresholds; first value is the low threshold (when to resume), the
         second one is the high threshold (when to pause). The higher is the
         threshold, the more memory can get used. In most cases, the defaults
-	should work for you. Default: 128, 512.
+	should work for you. Default: 1024 8192.
 
 	<tag><label id="rtable-export-settle-time">export settle time <m/time/ <m/time/</tag>
 	Minimum and maximum settle times, respectively, for export announcements.
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index b41e56c2..761ec0d9 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -568,6 +568,8 @@ static struct resclass ea_class_ref_class = {
 static void
 ea_class_init(void)
 {
+  ASSERT_DIE(ea_class_global == NULL);
+
   idm_init(&ea_class_idm, rta_pool, EA_CLASS_INITIAL_MAX);
   ea_class_global = mb_allocz(rta_pool,
       sizeof(*ea_class_global) * (ea_class_max = EA_CLASS_INITIAL_MAX));
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f4ca9170..e712796b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1515,6 +1515,7 @@ rt_export_hook(void *_data)
   }
 
   int used = 0;
+  int no_next = 0;
 
   /* Process the export */
   for (uint i=0; i<RT_EXPORT_BULK; i++)
@@ -1522,12 +1523,16 @@ rt_export_hook(void *_data)
     used += rte_export(c, c->rpe_next);
 
     if (!c->rpe_next)
+    {
+      no_next = 1;
       break;
+    }
   }
 
   if (used)
-    RT_LOCKED(tab, _)
-      rt_export_used(c->table, c->h.req->name, "finished export bulk");
+    RT_LOCKED(tab, t)
+      if (no_next || t->cork_active)
+	rt_export_used(c->table, c->h.req->name, no_next ? "finished export bulk" : "cork active");
 
   rt_send_export_event(&c->h);
 }
@@ -2058,10 +2063,11 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
     rt_set_import_state(hook, TIS_STOP);
     hook->stopped = stopped;
 
+    /* Cancel table rr_counter */
     if (hook->stale_set != hook->stale_pruned)
-      tab->rr_counter -= (hook->stale_set - hook->stale_pruned - 1);
-    else
-      tab->rr_counter++;
+      tab->rr_counter -= (hook->stale_set - hook->stale_pruned);
+
+    tab->rr_counter++;
 
     hook->stale_set = hook->stale_pruned = hook->stale_pruning = hook->stale_valid = 0;
   }
@@ -2222,7 +2228,7 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
   switch (atomic_load_explicit(&hh->export_state, memory_order_relaxed))
   {
     case TES_HUNGRY:
-      rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking; %p", hook->h.req->name, hook->h.n.next);
+      rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking", hook->h.req->name);
       return 0;
     case TES_FEEDING:
       switch (hh->req->addr_mode)
@@ -2241,7 +2247,10 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
 	  fit_get(&tab->fib, &hook->feed_fit);
 	  break;
       }
+      break;
 
+    case TES_STOP:
+      bug("Tried to repeatedly stop the same export hook %s", hook->h.req->name);
   }
 
   rt_trace(tab, D_EVENTS, "Stopping export hook %s right now", hook->h.req->name);
@@ -2332,7 +2341,7 @@ rt_refresh_begin(struct rt_import_request *req)
            e->rte.stale_cycle = 0;
       }
     FIB_WALK_END;
-    tab->rr_counter -= (hook->stale_set - hook->stale_pruned - 1);
+    tab->rr_counter -= hook->stale_set - hook->stale_pruned;
     hook->stale_set = 1;
     hook->stale_valid = 0;
     hook->stale_pruned = 0;
@@ -2343,9 +2352,11 @@ rt_refresh_begin(struct rt_import_request *req)
     /* Let's reserve the stale_cycle zero value for always-invalid routes */
     hook->stale_set = 1;
     hook->stale_valid = 0;
-    tab->rr_counter++;
   }
 
+  /* The table must know that we're route-refreshing */
+  tab->rr_counter++;
+
   if (req->trace_routes & D_STATES)
     log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
 
@@ -2371,6 +2382,7 @@ rt_refresh_end(struct rt_import_request *req)
     hook->stale_valid++;
     ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
+    /* Here we can't kick the timer as we aren't in the table service loop */
     rt_schedule_prune(tab);
 
     if (req->trace_routes & D_STATES)
@@ -2853,7 +2865,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   }
 
   /* Start the service thread */
-  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing tahle %s", t->name));
+  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing table %s", t->name));
   birdloop_enter(t->loop);
   birdloop_flag_set_handler(t->loop, &t->fh);
   birdloop_leave(t->loop);
@@ -3021,27 +3033,27 @@ again:
     }
   }
 
-  uint flushed_channels = 0;
-
   /* Close flushed channels */
   WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
     if (ih->import_state == TIS_FLUSHING)
     {
+      DBG("flushing %s %s rr %u", ih->req->name, tab->name, tab->rr_counter);
       ih->flush_seq = tab->exporter.next_seq;
       rt_set_import_state(ih, TIS_WAITING);
-      flushed_channels++;
       tab->rr_counter--;
+      tab->wait_counter++;
     }
     else if (ih->stale_pruning != ih->stale_pruned)
     {
-      tab->rr_counter -= (ih->stale_pruned - ih->stale_pruning);
+      DBG("pruning %s %s rr %u set %u valid %u pruning %u pruned %u", ih->req->name, tab->name, tab->rr_counter, ih->stale_set, ih->stale_valid, ih->stale_pruning, ih->stale_pruned);
+      tab->rr_counter -= (ih->stale_pruning - ih->stale_pruned);
       ih->stale_pruned = ih->stale_pruning;
       if (ih->req->trace_routes & D_STATES)
 	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
     }
 
   /* In some cases, we may want to directly proceed to export cleanup */
-  if (EMPTY_LIST(tab->exporter.e.hooks) && flushed_channels)
+  if (EMPTY_LIST(tab->exporter.e.hooks) && tab->wait_counter)
     rt_export_cleanup(tab);
 }
 
@@ -3202,13 +3214,15 @@ rt_export_cleanup(struct rtable_private *tab)
 
 done:;
   struct rt_import_hook *ih; node *x;
-  WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
-    if (ih->import_state == TIS_WAITING)
-      if (!first || (first->seq >= ih->flush_seq))
-      {
-	ih->import_state = TIS_CLEARED;
-	ev_send(ih->req->list, &ih->announce_event);
-      }
+  if (tab->wait_counter)
+    WALK_LIST2_DELSAFE(ih, n, x, tab->imports, n)
+      if (ih->import_state == TIS_WAITING)
+	if (!first || (first->seq >= ih->flush_seq))
+	{
+	  ih->import_state = TIS_CLEARED;
+	  tab->wait_counter--;
+	  ev_send(ih->req->list, &ih->announce_event);
+	}
 
   if ((tab->gc_counter += want_prune) >= tab->config->gc_threshold)
     rt_kick_prune_timer(tab);
@@ -3287,7 +3301,7 @@ rt_unlock_trie(struct rtable_private *tab, struct f_trie *trie)
       if (tab->trie && (tab->trie->prefix_count > (2 * tab->fib.entries)))
       {
 	tab->prune_trie = 1;
-	rt_schedule_prune(tab);
+	rt_kick_prune_timer(tab);
       }
     }
   }
@@ -3940,8 +3954,8 @@ rt_new_table(struct symbol *s, uint addr_type)
   c->addr_type = addr_type;
   c->gc_threshold = 1000;
   c->gc_period = (uint) -1;	/* set in rt_postconfig() */
-  c->cork_threshold.low = 128;
-  c->cork_threshold.high = 512;
+  c->cork_threshold.low = 1024;
+  c->cork_threshold.high = 8192;
   c->export_settle = (struct settle_config) {
     .min = 1 MS,
     .max = 100 MS,
@@ -4042,6 +4056,7 @@ rt_check_cork_high(struct rtable_private *tab)
   {
     tab->cork_active = 1;
     rt_cork_acquire();
+    rt_export_used(&tab->exporter, tab->name, "corked");
 
     rt_trace(tab, D_STATES, "Corked");
   }
diff --git a/nest/rt.h b/nest/rt.h
index 6ee2ce9b..cceb5edf 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -141,8 +141,10 @@ struct rtable_private {
   uint rr_counter;			/* Number of currently running route refreshes,
 					   in fact sum of (stale_set - stale_pruned) over all importers
 					   + one for each TIS_FLUSHING importer */
+  uint wait_counter;			/* Number of imports in TIS_WAITING state */
   byte prune_state;			/* Table prune state, 1 -> scheduled, 2-> running */
   byte prune_trie;			/* Prune prefix trie during next table prune */
+  byte imports_flushing;		/* Some imports are being flushed right now */
   byte nhu_state;			/* Next Hop Update state */
   byte nhu_corked;			/* Next Hop Update is corked with this state */
   byte export_used;			/* Pending Export pruning is scheduled */

From 84c298465f6360a8694d4837f3420961ea321fa5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 19 Jan 2023 10:49:47 +0100
Subject: [PATCH 241/431] Decoupling loops from threads to allow fixed thread
 count

On large configurations, too many threads would spawn with one thread
per loop. Therefore, threads may now run multiple loops at once. The
thread count is configurable and may be changed during run. All threads
are spawned on startup.

This change helps with memory bloating. BIRD filters need large
temporary memory blocks to store their stack and also memory management
keeps its hot page storage per-thread.

Known bugs:
* Thread autobalancing is not yet implemented.
* Low latency loops are executed together with standard loops.
---
 conf/conf.h           |   1 +
 doc/bird.sgml         |   6 +
 doc/reply_codes       |   1 +
 lib/event.c           |   2 +-
 lib/event.h           |   1 -
 lib/locking.h         |   4 +
 lib/rcu.c             |  24 +-
 lib/rcu.h             |  16 +-
 sysdep/unix/config.Y  |  11 +
 sysdep/unix/domain.c  |   6 +
 sysdep/unix/io-loop.c | 783 +++++++++++++++++++++++++++++++-----------
 sysdep/unix/io-loop.h |  46 ++-
 sysdep/unix/io.c      |   6 +-
 sysdep/unix/main.c    |   4 +-
 sysdep/unix/unix.h    |   3 +
 test/birdtest.c       |   9 +-
 test/bt-utils.h       |   1 -
 17 files changed, 676 insertions(+), 248 deletions(-)

diff --git a/conf/conf.h b/conf/conf.h
index ce4a3c5a..9f011ef7 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -54,6 +54,7 @@ struct config {
   char *err_file_name;			/* File name containing error */
   char *file_name;			/* Name of main configuration file */
   int file_fd;				/* File descriptor of main configuration file */
+  int thread_count;			/* How many worker threads to prefork */
 
   struct sym_scope *root_scope;		/* Scope for root symbols */
   int obstacle_count;			/* Number of items blocking freeing of this config */
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 3675d2e8..37028a3b 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -532,6 +532,12 @@ include "tablename.conf";;
 	killed by abort signal. The timeout has effective granularity of
 	seconds, zero means disabled. Default: disabled (0).
 
+	<tag><label id="opt-threads">threads <m/number/</tag>
+	Set how many worker threads should BIRD spawn. Tests show that every
+        thread can utilize one complete CPU core, therefore you probably want to
+        keep at least one free core. The maximum feasible thread count heavily
+        depends on the actual workload and must be determined by testing or estimation. Default: 1
+
 	<tag><label id="opt-mrtdump">mrtdump "<m/filename/"</tag>
 	Set MRTdump file name. This option must be specified to allow MRTdump
 	feature. Default: no dump file.
diff --git a/doc/reply_codes b/doc/reply_codes
index 02f4e656..bcbbbb03 100644
--- a/doc/reply_codes
+++ b/doc/reply_codes
@@ -61,6 +61,7 @@ Reply codes of BIRD command-line interface
 1023	Show Babel interfaces
 1024	Show Babel neighbors
 1025	Show Babel entries
+1026	Show threads
 
 8000	Reply too long
 8001	Route not found
diff --git a/lib/event.c b/lib/event.c
index 68ee4c06..55e7f446 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -261,7 +261,7 @@ ev_send(event_list *l, event *e)
 	memory_order_acq_rel, memory_order_acquire));
 
   edlog(l, e, next, 4, EDL_SEND);
-  birdloop_ping(l->loop);
+  if (l->loop) birdloop_ping(l->loop);
 }
 
 void io_log_event(void *hook, void *data);
diff --git a/lib/event.h b/lib/event.h
index 0bef737a..6fd9f31c 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -11,7 +11,6 @@
 
 #include "lib/resource.h"
 #include "lib/locking.h"
-#include "lib/rcu.h"
 
 #include <stdatomic.h>
 
diff --git a/lib/locking.h b/lib/locking.h
index 498afdc8..7e014bd0 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -14,6 +14,7 @@ struct domain_generic;
 /* Here define the global lock order; first to last. */
 struct lock_order {
   struct domain_generic *the_bird;
+  struct domain_generic *control;
   struct domain_generic *proto;
   struct domain_generic *service;
   struct domain_generic *rtable;
@@ -34,6 +35,9 @@ struct domain_generic *domain_new(const char *name, uint order);
 #define DOMAIN_FREE(type, d)	domain_free((d).type)
 void domain_free(struct domain_generic *);
 
+#define DOMAIN_NAME(type, d)	domain_name((d).type)
+const char *domain_name(struct domain_generic *);
+
 #define DOMAIN_NULL(type)   (DOMAIN(type)) {}
 
 #define LOCK_DOMAIN(type, d)	do_lock(((d).type), &(locking_stack.type))
diff --git a/lib/rcu.c b/lib/rcu.c
index 83fdd022..8ae4f2ab 100644
--- a/lib/rcu.c
+++ b/lib/rcu.c
@@ -17,11 +17,11 @@
 #include "lib/locking.h"
 
 _Atomic uint rcu_gp_ctl = RCU_NEST_CNT;
-_Thread_local struct rcu_birdloop *this_rcu_birdloop = NULL;
+_Thread_local struct rcu_thread *this_rcu_thread = NULL;
 
-static list rcu_birdloop_list;
+static list rcu_thread_list;
 
-static struct rcu_birdloop main_rcu_birdloop;
+static struct rcu_thread main_rcu_thread;
 
 DEFINE_DOMAIN(resource);
 static DOMAIN(resource) rcu_domain;
@@ -37,8 +37,8 @@ static void
 update_counter_and_wait(void)
 {
   atomic_fetch_xor(&rcu_gp_ctl, RCU_GP_PHASE);
-  struct rcu_birdloop *rc;
-  WALK_LIST(rc, rcu_birdloop_list)
+  struct rcu_thread *rc;
+  WALK_LIST(rc, rcu_thread_list)
     while (rcu_gp_ongoing(&rc->ctl))
       birdloop_yield();
 }
@@ -53,19 +53,19 @@ synchronize_rcu(void)
 }
 
 void
-rcu_birdloop_start(struct rcu_birdloop *rc)
+rcu_thread_start(struct rcu_thread *rc)
 {
   LOCK_DOMAIN(resource, rcu_domain);
-  add_tail(&rcu_birdloop_list, &rc->n);
-  this_rcu_birdloop = rc;
+  add_tail(&rcu_thread_list, &rc->n);
+  this_rcu_thread = rc;
   UNLOCK_DOMAIN(resource, rcu_domain);
 }
 
 void
-rcu_birdloop_stop(struct rcu_birdloop *rc)
+rcu_thread_stop(struct rcu_thread *rc)
 {
   LOCK_DOMAIN(resource, rcu_domain);
-  this_rcu_birdloop = NULL;
+  this_rcu_thread = NULL;
   rem_node(&rc->n);
   UNLOCK_DOMAIN(resource, rcu_domain);
 }
@@ -74,6 +74,6 @@ void
 rcu_init(void)
 {
   rcu_domain = DOMAIN_NEW(resource, "Read-Copy-Update");
-  init_list(&rcu_birdloop_list);
-  rcu_birdloop_start(&main_rcu_birdloop);
+  init_list(&rcu_thread_list);
+  rcu_thread_start(&main_rcu_thread);
 }
diff --git a/lib/rcu.h b/lib/rcu.h
index c537a1ef..30eacc5b 100644
--- a/lib/rcu.h
+++ b/lib/rcu.h
@@ -21,33 +21,33 @@
 
 extern _Atomic uint rcu_gp_ctl;
 
-struct rcu_birdloop {
+struct rcu_thread {
   node n;
   _Atomic uint ctl;
 };
 
-extern _Thread_local struct rcu_birdloop *this_rcu_birdloop;
+extern _Thread_local struct rcu_thread *this_rcu_thread;
 
 static inline void rcu_read_lock(void)
 {
-  uint cmp = atomic_load_explicit(&this_rcu_birdloop->ctl, memory_order_acquire);
+  uint cmp = atomic_load_explicit(&this_rcu_thread->ctl, memory_order_acquire);
 
   if (cmp & RCU_NEST_MASK)
-    atomic_store_explicit(&this_rcu_birdloop->ctl, cmp + RCU_NEST_CNT, memory_order_relaxed);
+    atomic_store_explicit(&this_rcu_thread->ctl, cmp + RCU_NEST_CNT, memory_order_relaxed);
   else
-    atomic_store(&this_rcu_birdloop->ctl, atomic_load_explicit(&rcu_gp_ctl, memory_order_acquire));
+    atomic_store(&this_rcu_thread->ctl, atomic_load_explicit(&rcu_gp_ctl, memory_order_acquire));
 }
 
 static inline void rcu_read_unlock(void)
 {
-  atomic_fetch_sub(&this_rcu_birdloop->ctl, RCU_NEST_CNT);
+  atomic_fetch_sub(&this_rcu_thread->ctl, RCU_NEST_CNT);
 }
 
 void synchronize_rcu(void);
 
 /* Registering and unregistering a birdloop. To be called from birdloop implementation */
-void rcu_birdloop_start(struct rcu_birdloop *);
-void rcu_birdloop_stop(struct rcu_birdloop *);
+void rcu_thread_start(struct rcu_thread *);
+void rcu_thread_stop(struct rcu_thread *);
 
 /* Run this from resource init */
 void rcu_init(void);
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index 5c4b5bef..a50ec757 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -101,6 +101,12 @@ mrtdump_base:
  ;
 
 
+conf: THREADS expr {
+    if ($2 < 1) cf_error("Number of threads must be at least one.");
+    new_config->thread_count = $2;
+}
+
+
 conf: debug_unix ;
 
 debug_unix:
@@ -145,6 +151,11 @@ CF_CLI_HELP(GRACEFUL, restart, [[Shut the daemon down for graceful restart]])
 CF_CLI(GRACEFUL RESTART,,, [[Shut the daemon down for graceful restart]])
 { cmd_graceful_restart(); } ;
 
+CF_CLI(SHOW THREADS,,, [[Write out thread information]])
+{ cmd_show_threads(0); } ;
+
+CF_CLI(SHOW THREADS ALL,,, [[Write out thread and IO loop information]])
+{ cmd_show_threads(1); } ;
 
 cfg_name:
    /* empty */ { $$ = NULL; }
diff --git a/sysdep/unix/domain.c b/sysdep/unix/domain.c
index 0a5858a6..1cba540b 100644
--- a/sysdep/unix/domain.c
+++ b/sysdep/unix/domain.c
@@ -70,6 +70,12 @@ domain_free(struct domain_generic *dg)
   xfree(dg);
 }
 
+const char *
+domain_name(struct domain_generic *dg)
+{
+  return dg->name;
+}
+
 uint dg_order(struct domain_generic *dg)
 {
   return dg->order;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 5ce2d350..cc2e0523 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -18,6 +18,7 @@
 
 #include "lib/buffer.h"
 #include "lib/lists.h"
+#include "lib/locking.h"
 #include "lib/resource.h"
 #include "lib/event.h"
 #include "lib/timer.h"
@@ -26,9 +27,36 @@
 #include "lib/io-loop.h"
 #include "sysdep/unix/io-loop.h"
 #include "conf/conf.h"
+#include "nest/cli.h"
 
 #define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
 
+/*
+ *	Nanosecond time for accounting purposes
+ *
+ *	A fixed point on startup is set as zero, all other values are relative to that.
+ *	Caution: this overflows after like 500 years or so. If you plan to run
+ *	BIRD for such a long time, please implement some means of overflow prevention.
+ */
+
+static struct timespec ns_begin;
+
+static void ns_init(void)
+{
+  if (clock_gettime(CLOCK_MONOTONIC, &ns_begin))
+    bug("clock_gettime: %m");
+}
+
+static u64 ns_now(void)
+{
+  struct timespec ts;
+  if (clock_gettime(CLOCK_MONOTONIC, &ts))
+    bug("clock_gettime: %m");
+
+  return (u64) (ts.tv_sec - ns_begin.tv_sec) * 1000000000 + ts.tv_nsec - ns_begin.tv_nsec;
+}
+
+
 /*
  *	Current thread context
  */
@@ -59,6 +87,12 @@ birdloop_inside(struct birdloop *loop)
   return 0;
 }
 
+_Bool
+birdloop_in_this_thread(struct birdloop *loop)
+{
+  return pthread_equal(pthread_self(), loop->thread->thread_id);
+}
+
 void
 birdloop_flag(struct birdloop *loop, u32 flag)
 {
@@ -80,22 +114,10 @@ birdloop_process_flags(struct birdloop *loop)
     return 0;
 
   u32 flags = atomic_exchange_explicit(&loop->flags, 0, memory_order_acq_rel);
+  if (!flags)
+    return 0;
+
   loop->flag_handler->hook(loop->flag_handler, flags);
-  return !!flags;
-}
-
-static int
-birdloop_run_events(struct birdloop *loop)
-{
-  btime begin = current_time();
-  while (current_time() - begin < 5 MS)
-  {
-    if (!ev_run_list(&loop->event_list))
-      return 0;
-
-    times_update();
-  }
-
   return 1;
 }
 
@@ -160,7 +182,7 @@ pipe_kick(struct pipe *p)
 
   while (1) {
     rv = write(p->fd[1], &v, sizeof(v));
-    if ((rv >= 0) || (errno == EAGAIN)) 
+    if ((rv >= 0) || (errno == EAGAIN))
       return;
     if (errno != EINTR)
       bug("wakeup write: %m");
@@ -176,19 +198,19 @@ pipe_pollin(struct pipe *p, struct pollfd *pfd)
 }
 
 static inline void
-wakeup_init(struct birdloop *loop)
+wakeup_init(struct bird_thread *loop)
 {
   pipe_new(&loop->wakeup);
 }
 
 static inline void
-wakeup_drain(struct birdloop *loop)
+wakeup_drain(struct bird_thread *loop)
 {
   pipe_drain(&loop->wakeup);
 }
 
 static inline void
-wakeup_do_kick(struct birdloop *loop)
+wakeup_do_kick(struct bird_thread *loop)
 {
   pipe_kick(&loop->wakeup);
 }
@@ -196,13 +218,16 @@ wakeup_do_kick(struct birdloop *loop)
 static inline void
 birdloop_do_ping(struct birdloop *loop)
 {
-  if (atomic_fetch_add_explicit(&loop->ping_sent, 1, memory_order_acq_rel))
+  if (!loop->thread)
+    return;
+
+  if (atomic_fetch_add_explicit(&loop->thread->ping_sent, 1, memory_order_acq_rel))
     return;
 
   if (loop == birdloop_wakeup_masked)
     birdloop_wakeup_masked_count++;
   else
-    wakeup_do_kick(loop);
+    wakeup_do_kick(loop->thread);
 }
 
 void
@@ -224,10 +249,6 @@ sockets_init(struct birdloop *loop)
 {
   init_list(&loop->sock_list);
   loop->sock_num = 0;
-
-  BUFFER_INIT(loop->poll_sk, loop->pool, 4);
-  BUFFER_INIT(loop->poll_fd, loop->pool, 4);
-  loop->poll_changed = 1;	/* add wakeup fd */
 }
 
 static void
@@ -237,7 +258,8 @@ sockets_add(struct birdloop *loop, sock *s)
   loop->sock_num++;
 
   s->index = -1;
-  loop->poll_changed = 1;
+  if (loop->thread)
+    atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
 
   birdloop_ping(loop);
 }
@@ -255,19 +277,20 @@ sockets_remove(struct birdloop *loop, sock *s)
   if (!enlisted(&s->n))
     return;
 
+  /* Decouple the socket from the loop at all. */
   rem_node(&s->n);
   loop->sock_num--;
+  if (loop->thread)
+    atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
 
-  if (s->index >= 0)
-  {
-    loop->poll_sk.data[s->index] = NULL;
-    s->index = -1;
-    loop->poll_changed = 1;
-    loop->close_scheduled = 1;
-    birdloop_ping(loop);
-  }
-  else
-    close(s->fd);
+  s->index = -1;
+
+  /* Close the filedescriptor. If it ever gets into the poll(), it just returns
+   * POLLNVAL for this fd which then is ignored because nobody checks for
+   * that result. Or some other routine opens another fd, getting this number,
+   * yet also in this case poll() at worst spuriously returns and nobody checks
+   * for the result in this fd. No further precaution is needed. */
+  close(s->fd);
 }
 
 void
@@ -279,67 +302,30 @@ sk_stop(sock *s)
 static inline uint sk_want_events(sock *s)
 { return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
 
-/*
-FIXME: this should be called from sock code
-
-static void
-sockets_update(struct birdloop *loop, sock *s)
+static struct pollfd *
+sockets_prepare(struct birdloop *loop, struct pollfd *pfd, struct pollfd *end)
 {
-  if (s->index >= 0)
-    loop->poll_fd.data[s->index].events = sk_want_events(s);
-}
-*/
-
-static void
-sockets_prepare(struct birdloop *loop)
-{
-  BUFFER_SET(loop->poll_sk, loop->sock_num + 1);
-  BUFFER_SET(loop->poll_fd, loop->sock_num + 1);
-
-  struct pollfd *pfd = loop->poll_fd.data;
-  sock **psk = loop->poll_sk.data;
-  uint i = 0;
   node *n;
+  loop->pfd = pfd;
 
   WALK_LIST(n, loop->sock_list)
   {
     sock *s = SKIP_BACK(sock, n, n);
 
-    ASSERT(i < loop->sock_num);
+    /* Out of space for pfds. Force reallocation. */
+    if (pfd >= end)
+      return NULL;
+
+    s->index = pfd - loop->pfd;
 
-    s->index = i;
-    *psk = s;
     pfd->fd = s->fd;
     pfd->events = sk_want_events(s);
     pfd->revents = 0;
 
     pfd++;
-    psk++;
-    i++;
   }
 
-  ASSERT(i == loop->sock_num);
-
-  /* Add internal wakeup fd */
-  *psk = NULL;
-  pipe_pollin(&loop->wakeup, pfd);
-
-  loop->poll_changed = 0;
-}
-
-static void
-sockets_close_fds(struct birdloop *loop)
-{
-  struct pollfd *pfd = loop->poll_fd.data;
-  sock **psk = loop->poll_sk.data;
-  int poll_num = loop->poll_fd.used - 1;
-
-  int i;
-  for (i = 0; i < poll_num; i++)
-    if (psk[i] == NULL)
-      close(pfd[i].fd);
-
-  loop->close_scheduled = 0;
+  return pfd;
 }
 
 int sk_read(sock *s, int revents);
@@ -348,54 +334,527 @@ int sk_write(sock *s);
 static void
 sockets_fire(struct birdloop *loop)
 {
-  struct pollfd *pfd = loop->poll_fd.data;
-  sock **psk = loop->poll_sk.data;
-  int poll_num = loop->poll_fd.used - 1;
+  struct pollfd *pfd = loop->pfd;
 
   times_update();
 
-  /* Last fd is internal wakeup fd */
-  if (pfd[poll_num].revents & POLLIN)
-    wakeup_drain(loop);
-
-  int i;
-  for (i = 0; i < poll_num; pfd++, psk++, i++)
+  sock *s; node *n, *nxt;
+  WALK_LIST2_DELSAFE(s, n, nxt, loop->sock_list, n)
   {
-    int e = 1;
-
-    if (! pfd->revents)
+    if (s->index < 0)
       continue;
 
-    if (pfd->revents & POLLNVAL)
-      bug("poll: invalid fd %d", pfd->fd);
+    int rev = pfd[s->index].revents;
 
-    if (pfd->revents & POLLIN)
-      while (e && *psk && (*psk)->rx_hook)
-	e = sk_read(*psk, pfd->revents);
+    if (!rev)
+      continue;
 
-    e = 1;
-    if (pfd->revents & POLLOUT)
+    if (rev & POLLNVAL)
+      bug("poll: invalid fd %d", s->fd);
+
+    int e = 1;
+
+    if (rev & POLLIN)
+      while (e && s->rx_hook)
+	e = sk_read(s, rev);
+
+    if (rev & POLLOUT)
     {
-      loop->poll_changed = 1;
-      while (e && *psk)
-	e = sk_write(*psk);
+      atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
+      while (e = sk_write(s))
+	;
     }
   }
 }
 
+/*
+ *	Threads
+ */
+
+DEFINE_DOMAIN(resource);
+static DOMAIN(resource) birdloop_domain;
+static list birdloop_pickup;
+static list bird_thread_pickup;
+
+static _Thread_local struct bird_thread *this_thread;
+
+static void *
+bird_thread_main(void *arg)
+{
+  struct bird_thread *thr = this_thread = arg;
+
+  rcu_thread_start(&thr->rcu);
+  synchronize_rcu();
+
+  tmp_init(thr->pool);
+  init_list(&thr->loops);
+
+  u32 refresh_sockets = 1;
+
+  struct pollfd *pfd, *end;
+
+  while (1)
+  {
+    /* Wakeup at least once a minute. */
+    int timeout = 60000;
+
+    /* Pickup new loops */
+    LOCK_DOMAIN(resource, birdloop_domain);
+    if (!EMPTY_LIST(birdloop_pickup))
+    {
+      struct birdloop *loop = SKIP_BACK(struct birdloop, n, HEAD(birdloop_pickup));
+      rem_node(&loop->n);
+      UNLOCK_DOMAIN(resource, birdloop_domain);
+
+      add_tail(&thr->loops, &loop->n);
+
+      birdloop_enter(loop);
+      loop->thread = thr;
+      if (!EMPTY_LIST(loop->sock_list))
+	refresh_sockets = 1;
+      birdloop_leave(loop);
+
+      /* If there are more loops to be picked up, wakeup the next thread */
+      LOCK_DOMAIN(resource, birdloop_domain);
+      rem_node(&thr->n);
+      add_tail(&bird_thread_pickup, &thr->n);
+
+      if (!EMPTY_LIST(birdloop_pickup))
+	wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+    }
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+
+    struct birdloop *loop; node *nn;
+    WALK_LIST2(loop, nn, thr->loops, n)
+    {
+      birdloop_enter(loop);
+      u64 after_enter = ns_now();
+
+      timer *t;
+
+      times_update();
+      timers_fire(&loop->time, 0);
+      int again = birdloop_process_flags(loop) + ev_run_list(&loop->event_list);
+
+#if 0
+      if (loop->n.next->next)
+	__builtin_prefetch(SKIP_BACK(struct birdloop, n, loop->n.next)->time.domain);
+#endif
+
+      if (again)
+	timeout = MIN(0, timeout);
+      else if (t = timers_first(&loop->time))
+	timeout = MIN(((tm_remains(t) TO_MS) + 1), timeout);
+
+      u64 before_leave = ns_now();
+      loop->total_time_spent_ns += (before_leave - after_enter);
+      birdloop_leave(loop);
+
+      ev_run_list(&thr->priority_events);
+    }
+
+    refresh_sockets += atomic_exchange_explicit(&thr->poll_changed, 0, memory_order_acq_rel);
+
+    if (!refresh_sockets && ((timeout < 0) || (timeout > 5000)))
+      flush_local_pages();
+
+    while (refresh_sockets)
+    {
+sock_retry:;
+      end = (pfd = thr->pfd) + thr->pfd_max;
+
+      /* Add internal wakeup fd */
+      pipe_pollin(&thr->wakeup, pfd);
+      pfd++;
+
+      WALK_LIST2(loop, nn, thr->loops, n)
+      {
+	birdloop_enter(loop);
+	pfd = sockets_prepare(loop, pfd, end);
+	birdloop_leave(loop);
+
+	if (!pfd)
+	{
+	  mb_free(thr->pfd);
+	  thr->pfd = mb_alloc(thr->pool, sizeof(struct pollfd) * (thr->pfd_max *= 2));
+	  goto sock_retry;
+	}
+      }
+
+      refresh_sockets = 0;
+    }
+
+poll_retry:;
+    int rv = poll(thr->pfd, pfd - thr->pfd, timeout);
+    if (rv < 0)
+    {
+      if (errno == EINTR || errno == EAGAIN)
+	goto poll_retry;
+      bug("poll in %p: %m", thr);
+    }
+
+    /* Drain wakeup fd */
+    if (thr->pfd[0].revents & POLLIN)
+    {
+      ASSERT_DIE(rv > 0);
+      rv--;
+      wakeup_drain(thr);
+    }
+
+    atomic_exchange_explicit(&thr->ping_sent, 0, memory_order_acq_rel);
+
+    if (!rv && !atomic_exchange_explicit(&thr->run_cleanup, 0, memory_order_acq_rel))
+      continue;
+
+    /* Process stops and regular sockets */
+    node *nxt;
+    WALK_LIST2_DELSAFE(loop, nn, nxt, thr->loops, n)
+    {
+      birdloop_enter(loop);
+
+      if (loop->stopped)
+      {
+	/* Flush remaining events */
+	ASSERT_DIE(!ev_run_list(&loop->event_list));
+
+	/* Drop timers */
+	timer *t;
+	while (t = timers_first(&loop->time))
+	  tm_stop(t);
+
+	/* No sockets allowed */
+	ASSERT_DIE(EMPTY_LIST(loop->sock_list));
+	
+	/* Declare loop stopped */
+	rem_node(&loop->n);
+	birdloop_leave(loop);
+	loop->stopped(loop->stop_data);
+
+	/* Birdloop already left */
+	continue;
+      }
+      else if (rv)
+	sockets_fire(loop);
+
+      birdloop_leave(loop);
+    }
+  }
+}
+
+static void
+bird_thread_cleanup(void *_thr)
+{
+  struct bird_thread *thr = _thr;
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
+  /* Thread attributes no longer needed */
+  pthread_attr_destroy(&thr->thread_attr);
+
+  /* Free all remaining memory */
+  rfree(thr->pool);
+}
+
+static struct bird_thread *
+bird_thread_start(void)
+{
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
+  pool *p = rp_new(&root_pool, "Thread");
+
+  struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
+  thr->pool = p;
+  thr->pfd = mb_alloc(p, sizeof(struct pollfd) * (thr->pfd_max = 16));
+  thr->cleanup_event = (event) { .hook = bird_thread_cleanup, .data = thr, };
+
+  atomic_store_explicit(&thr->ping_sent, 0, memory_order_relaxed);
+
+  wakeup_init(thr);
+  ev_init_list(&thr->priority_events, NULL, "Thread direct event list");
+
+  LOCK_DOMAIN(resource, birdloop_domain);
+  add_tail(&bird_thread_pickup, &thr->n);
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+
+  int e = 0;
+
+  if (e = pthread_attr_init(&thr->thread_attr))
+    die("pthread_attr_init() failed: %M", e);
+
+  /* We don't have to worry about thread stack size so much.
+  if (e = pthread_attr_setstacksize(&thr->thread_attr, THREAD_STACK_SIZE))
+    die("pthread_attr_setstacksize(%u) failed: %M", THREAD_STACK_SIZE, e);
+    */
+
+  if (e = pthread_attr_setdetachstate(&thr->thread_attr, PTHREAD_CREATE_DETACHED))
+    die("pthread_attr_setdetachstate(PTHREAD_CREATE_DETACHED) failed: %M", e);
+
+  if (e = pthread_create(&thr->thread_id, &thr->thread_attr, bird_thread_main, thr))
+    die("pthread_create() failed: %M", e);
+
+  return thr;
+}
+
+static struct birdloop *thread_dropper;
+static event *thread_dropper_event;
+static uint thread_dropper_goal;
+
+static void
+bird_thread_shutdown(void * _ UNUSED)
+{
+  LOCK_DOMAIN(resource, birdloop_domain);
+  int dif = list_length(&bird_thread_pickup) - thread_dropper_goal;
+  struct birdloop *tdl_stop = NULL;
+
+  if (dif > 0)
+    ev_send_loop(thread_dropper, thread_dropper_event);
+  else
+  {
+    tdl_stop = thread_dropper;
+    thread_dropper = NULL;
+  }
+
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+
+  log(L_INFO "Thread pickup size differs from dropper goal by %d%s", dif, tdl_stop ? ", stopping" : "");
+
+  if (tdl_stop)
+  {
+    birdloop_stop_self(tdl_stop, NULL, NULL);
+    return;
+  }
+
+  struct bird_thread *thr = this_thread;
+
+  /* Leave the thread-picker list to get no more loops */
+  LOCK_DOMAIN(resource, birdloop_domain);
+  rem_node(&thr->n);
+
+  /* Drop loops including the thread dropper itself */
+  while (!EMPTY_LIST(thr->loops))
+  {
+    /* Remove loop from this thread's list */
+    struct birdloop *loop = HEAD(thr->loops);
+    rem_node(&loop->n);
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+
+    /* Unset loop's thread */
+    if (birdloop_inside(loop))
+      loop->thread = NULL;
+    else
+    {
+      birdloop_enter(loop);
+      loop->thread = NULL;
+      birdloop_leave(loop);
+    }
+
+    /* Put loop into pickup list */
+    LOCK_DOMAIN(resource, birdloop_domain);
+    add_tail(&birdloop_pickup, &loop->n);
+  }
+
+  /* Let others know about new loops */
+  if (!EMPTY_LIST(birdloop_pickup))
+    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+
+  /* Leave the thread-dropper loop as we aren't going to return. */
+  birdloop_leave(thread_dropper);
+
+  /* Local pages not needed anymore */
+  flush_local_pages();
+
+  /* Unregister from RCU */
+  rcu_thread_stop(&thr->rcu);
+
+  /* Request thread cleanup from main loop */
+  ev_send_loop(&main_birdloop, &thr->cleanup_event);
+
+  /* Exit! */
+  pthread_exit(NULL);
+}
+
+
+void
+bird_thread_commit(struct config *new, struct config *old UNUSED)
+{
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
+  if (new->shutdown)
+    return;
+
+  if (!new->thread_count)
+    new->thread_count = 1;
+
+  while (1)
+  {
+    LOCK_DOMAIN(resource, birdloop_domain);
+    int dif = list_length(&bird_thread_pickup) - (thread_dropper_goal = new->thread_count);
+    _Bool thread_dropper_running = !!thread_dropper;
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+
+    if (dif < 0)
+    {
+      bird_thread_start();
+      continue;
+    }
+
+    if ((dif > 0) && !thread_dropper_running)
+    {
+      struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), "Thread dropper");
+      event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
+
+      LOCK_DOMAIN(resource, birdloop_domain);
+      thread_dropper = tdl;
+      thread_dropper_event = tde;
+      UNLOCK_DOMAIN(resource, birdloop_domain);
+
+      ev_send_loop(thread_dropper, thread_dropper_event);
+    }
+
+    return;
+  }
+}
+
+
+DEFINE_DOMAIN(control);
+
+struct bird_thread_show_data {
+  cli *cli;
+  pool *pool;
+  DOMAIN(control) lock;
+  uint total;
+  uint done;
+  u8 show_loops;
+};
+
+static void
+bird_thread_show_cli_cont(struct cli *c UNUSED)
+{
+  /* Explicitly do nothing to prevent CLI from trying to parse another command. */
+}
+
+static int
+bird_thread_show_cli_cleanup(struct cli *c UNUSED)
+{
+  return 1; /* Defer the cleanup until the writeout is finished. */
+}
+
+static void
+bird_thread_show(void *data)
+{
+  struct bird_thread_show_data *tsd = data;
+
+  LOCK_DOMAIN(control, tsd->lock);
+  if (tsd->show_loops)
+    cli_printf(tsd->cli, -1026, "Thread %p", this_thread);
+
+  u64 total_time_ns = 0;
+  struct birdloop *loop;
+  WALK_LIST(loop, this_thread->loops)
+  {
+    if (tsd->show_loops)
+      cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
+    total_time_ns += loop->total_time_spent_ns;
+  }
+
+  tsd->done++;
+  int last = (tsd->done == tsd->total);
+
+  if (last)
+  {
+    tsd->cli->cont = NULL;
+    tsd->cli->cleanup = NULL;
+  }
+
+  if (tsd->show_loops)
+    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "  Total time: %t", total_time_ns NS);
+  else
+    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "Thread %p time %t", this_thread, total_time_ns NS);
+
+  UNLOCK_DOMAIN(control, tsd->lock);
+
+  if (last)
+  {
+    the_bird_lock();
+
+    LOCK_DOMAIN(resource, birdloop_domain);
+    if (!EMPTY_LIST(birdloop_pickup))
+      if (tsd->show_loops)
+      {
+	cli_printf(tsd->cli, -1026, "Unassigned loops");
+	WALK_LIST(loop, birdloop_pickup)
+	  cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
+      }
+      else
+      {
+	uint count = 0;
+	u64 total_time_ns = 0;
+	WALK_LIST(loop, birdloop_pickup)
+	{
+	  count++;
+	  total_time_ns += loop->total_time_spent_ns;
+	}
+	cli_printf(tsd->cli, -1026, "Unassigned loops: %d, total time %t", count, total_time_ns NS);
+      }
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+
+    cli_write_trigger(tsd->cli);
+    DOMAIN_FREE(control, tsd->lock);
+    rfree(tsd->pool);
+
+    the_bird_unlock();
+  }
+}
+
+
+void
+cmd_show_threads(int show_loops)
+{
+  pool *p = rp_new(&root_pool, "Show Threads");
+
+  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
+  tsd->lock = DOMAIN_NEW(control, "Show Threads");
+  tsd->cli = this_cli;
+  tsd->pool = p;
+  tsd->show_loops = show_loops;
+
+  this_cli->cont = bird_thread_show_cli_cont;
+  this_cli->cleanup = bird_thread_show_cli_cleanup;
+
+  LOCK_DOMAIN(control, tsd->lock);
+  LOCK_DOMAIN(resource, birdloop_domain);
+
+  struct bird_thread *thr;
+  WALK_LIST(thr, bird_thread_pickup)
+  {
+    tsd->total++;
+    ev_send(&thr->priority_events, ev_new_init(p, bird_thread_show, tsd));
+    wakeup_do_kick(thr);
+  }
+
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+  UNLOCK_DOMAIN(control, tsd->lock);
+}
 
 /*
  *	Birdloop
  */
 
-struct birdloop main_birdloop;
+static struct bird_thread main_thread;
+struct birdloop main_birdloop = { .thread = &main_thread, };
 
 static void birdloop_enter_locked(struct birdloop *loop);
 
 void
 birdloop_init(void)
 {
-  wakeup_init(&main_birdloop);
+  ns_init();
+
+  birdloop_domain = DOMAIN_NEW(resource, "Loop Pickup");
+  init_list(&birdloop_pickup);
+  init_list(&bird_thread_pickup);
+
+  wakeup_init(main_birdloop.thread);
 
   main_birdloop.time.domain = the_bird_domain.the_bird;
   main_birdloop.time.loop = &main_birdloop;
@@ -406,8 +865,6 @@ birdloop_init(void)
   birdloop_enter_locked(&main_birdloop);
 }
 
-static void *birdloop_main(void *arg);
-
 struct birdloop *
 birdloop_new(pool *pp, uint order, const char *name)
 {
@@ -422,24 +879,14 @@ birdloop_new(pool *pp, uint order, const char *name)
 
   birdloop_enter(loop);
 
-  wakeup_init(loop);
   ev_init_list(&loop->event_list, loop, name);
   timers_init(&loop->time, p);
   sockets_init(loop);
 
-  int e = 0;
-
-  if (e = pthread_attr_init(&loop->thread_attr))
-    die("pthread_attr_init() failed: %M", e);
-
-  if (e = pthread_attr_setstacksize(&loop->thread_attr, THREAD_STACK_SIZE))
-    die("pthread_attr_setstacksize(%u) failed: %M", THREAD_STACK_SIZE, e);
-
-  if (e = pthread_attr_setdetachstate(&loop->thread_attr, PTHREAD_CREATE_DETACHED))
-    die("pthread_attr_setdetachstate(PTHREAD_CREATE_DETACHED) failed: %M", e);
-
-  if (e = pthread_create(&loop->thread_id, &loop->thread_attr, birdloop_main, loop))
-    die("pthread_create() failed: %M", e);
+  LOCK_DOMAIN(resource, birdloop_domain);
+  add_tail(&birdloop_pickup, &loop->n);
+  wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+  UNLOCK_DOMAIN(resource, birdloop_domain);
 
   birdloop_leave(loop);
 
@@ -451,7 +898,11 @@ birdloop_do_stop(struct birdloop *loop, void (*stopped)(void *data), void *data)
 {
   loop->stopped = stopped;
   loop->stop_data = data;
-  wakeup_do_kick(loop);
+  if (loop->thread)
+  {
+    atomic_store_explicit(&loop->thread->run_cleanup, 1, memory_order_release);
+    wakeup_do_kick(loop->thread);
+  }
 }
 
 void
@@ -475,10 +926,7 @@ void
 birdloop_free(struct birdloop *loop)
 {
   ASSERT_DIE(loop->links == 0);
-  ASSERT_DIE(pthread_equal(pthread_self(), loop->thread_id));
-
-  rcu_birdloop_stop(&loop->rcu);
-  pthread_attr_destroy(&loop->thread_attr);
+  ASSERT_DIE(birdloop_in_this_thread(loop));
 
   domain_free(loop->time.domain);
   rfree(loop->pool);
@@ -541,7 +989,7 @@ birdloop_unmask_wakeups(struct birdloop *loop)
   ASSERT_DIE(birdloop_wakeup_masked == loop);
   birdloop_wakeup_masked = NULL;
   if (birdloop_wakeup_masked_count)
-    wakeup_do_kick(loop);
+    wakeup_do_kick(loop->thread);
 
   birdloop_wakeup_masked_count = 0;
 }
@@ -560,85 +1008,6 @@ birdloop_unlink(struct birdloop *loop)
   loop->links--;
 }
 
-static void *
-birdloop_main(void *arg)
-{
-  struct birdloop *loop = arg;
-  timer *t;
-  int rv, timeout;
-
-  rcu_birdloop_start(&loop->rcu);
-
-  btime loop_begin = current_time();
-
-  tmp_init(loop->pool);
-
-  birdloop_enter(loop);
-  while (1)
-  {
-    timers_fire(&loop->time, 0);
-    if (birdloop_process_flags(loop) + birdloop_run_events(loop))
-      timeout = 0;
-    else if (t = timers_first(&loop->time))
-      timeout = (tm_remains(t) TO_MS) + 1;
-    else
-      timeout = -1;
-
-    if (loop->poll_changed)
-      sockets_prepare(loop);
-    else
-      if ((timeout < 0) || (timeout > 5000))
-	flush_local_pages();
-
-    btime duration = current_time() - loop_begin;
-    if (duration > config->watchdog_warning)
-      log(L_WARN "I/O loop cycle took %d ms", (int) (duration TO_MS));
-
-    birdloop_leave(loop);
-
-  try:
-    rv = poll(loop->poll_fd.data, loop->poll_fd.used, timeout);
-    if (rv < 0)
-    {
-      if (errno == EINTR || errno == EAGAIN)
-	goto try;
-      bug("poll: %m");
-    }
-
-    birdloop_enter(loop);
-
-    if (loop->close_scheduled)
-      sockets_close_fds(loop);
-
-    if (loop->stopped)
-      break;
-
-    loop_begin = current_time();
-
-    if (rv && !loop->poll_changed)
-      sockets_fire(loop);
-
-    atomic_exchange_explicit(&loop->ping_sent, 0, memory_order_acq_rel);
-  }
-
-  /* Flush remaining events */
-  ASSERT_DIE(!ev_run_list(&loop->event_list));
-
-  /* Drop timers */
-  while (t = timers_first(&loop->time))
-    tm_stop(t);
-
-  /* No sockets allowed */
-  ASSERT_DIE(EMPTY_LIST(loop->sock_list));
-  ASSERT_DIE(loop->sock_num == 0);
-
-  birdloop_leave(loop);
-  loop->stopped(loop->stop_data);
-
-  flush_local_pages();
-  return NULL;
-}
-
 void
 birdloop_yield(void)
 {
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 29ca96d6..33d529da 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -21,26 +21,16 @@ void pipe_kick(struct pipe *);
 
 struct birdloop
 {
+  node n;
+
   pool *pool;
 
   struct timeloop time;
   event_list event_list;
   list sock_list;
-  uint sock_num;
-
-  BUFFER(sock *) poll_sk;
-  BUFFER(struct pollfd) poll_fd;
-  u8 poll_changed;
-  u8 close_scheduled;
+  int sock_num;
 
   uint ping_pending;
-  _Atomic u32 ping_sent;
-  struct pipe wakeup;
-
-  pthread_t thread_id;
-  pthread_attr_t thread_attr;
-
-  struct rcu_birdloop rcu;
 
   uint links;
 
@@ -51,6 +41,36 @@ struct birdloop
   void *stop_data;
 
   struct birdloop *prev_loop;
+
+  struct bird_thread *thread;
+  struct pollfd *pfd;
+
+  u64 total_time_spent_ns;
+};
+
+struct bird_thread
+{
+  node n;
+
+  struct pollfd *pfd;
+  uint pfd_max;
+
+  _Atomic u32 ping_sent;
+  _Atomic u32 run_cleanup;
+  _Atomic u32 poll_changed;
+
+  struct pipe wakeup;
+  event_list priority_events;
+
+  pthread_t thread_id;
+  pthread_attr_t thread_attr;
+
+  struct rcu_thread rcu;
+
+  list loops;
+  pool *pool;
+
+  event cleanup_event;
 };
 
 #endif
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index c91bd597..c1466b56 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2254,7 +2254,7 @@ io_loop(void)
       }
 
       /* A hack to reload main io_loop() when something has changed asynchronously. */
-      pipe_pollin(&main_birdloop.wakeup, &pfd[0]);
+      pipe_pollin(&main_birdloop.thread->wakeup, &pfd[0]);
 
       nfds = 1;
 
@@ -2332,8 +2332,8 @@ io_loop(void)
 	  if (pfd[0].revents & POLLIN)
 	  {
 	    /* IO loop reload requested */
-	    pipe_drain(&main_birdloop.wakeup);
-	    atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
+	    pipe_drain(&main_birdloop.thread->wakeup);
+	    atomic_exchange_explicit(&main_birdloop.thread->ping_sent, 0, memory_order_acq_rel);
 	    continue;
 	  }
 
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 74827d98..01cc0c93 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -200,9 +200,11 @@ sysdep_preconfig(struct config *c)
 }
 
 int
-sysdep_commit(struct config *new, struct config *old UNUSED)
+sysdep_commit(struct config *new, struct config *old)
 {
   log_switch(0, &new->logfiles, new->syslog_name);
+  bird_thread_commit(new, old);
+
   return 0;
 }
 
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index ad85d1ea..e26afe41 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -16,6 +16,7 @@ struct pool;
 struct iface;
 struct birdsock;
 struct rfile;
+struct config;
 
 /* main.c */
 
@@ -32,6 +33,8 @@ void cmd_reconfig_undo(void);
 void cmd_reconfig_status(void);
 void cmd_shutdown(void);
 void cmd_graceful_restart(void);
+void cmd_show_threads(int);
+void bird_thread_commit(struct config *new, struct config *old);
 
 #define UNIX_DEFAULT_CONFIGURE_TIMEOUT	300
 
diff --git a/test/birdtest.c b/test/birdtest.c
index 5e3de1c5..cdca3829 100644
--- a/test/birdtest.c
+++ b/test/birdtest.c
@@ -557,7 +557,14 @@ void cmd_reconfig_undo_notify(void) {}
 #include "lib/net.h"
 #include "conf/conf.h"
 void sysdep_preconfig(struct config *c UNUSED) {}
-int sysdep_commit(struct config *new UNUSED, struct config *old UNUSED) { return 0; }
+
+void bird_thread_commit(struct config *new, struct config *old);
+int sysdep_commit(struct config *new, struct config *old)
+{
+  bird_thread_commit(new, old);
+  return 0;
+}
+
 void sysdep_shutdown_done(void) {}
 
 #include "nest/cli.h"
diff --git a/test/bt-utils.h b/test/bt-utils.h
index 13d267cc..758dbf48 100644
--- a/test/bt-utils.h
+++ b/test/bt-utils.h
@@ -28,7 +28,6 @@ uint bt_naive_pow(uint base, uint power);
 void bt_bytes_to_hex(char *buf, const byte *in_data, size_t size);
 
 void bt_bird_init(void);
-void bt_bird_cleanup(void);
 struct config *bt_config_parse(const char *cfg);
 struct config *bt_config_file_parse(const char *filepath);
 

From 343628d8c0f1848b968930f6dbabdd1174404b14 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 20 Jan 2023 14:07:38 +0100
Subject: [PATCH 242/431] Fixed various build problems on FreeBSD and/or CLang

---
 filter/config.Y        |  13 -----
 lib/birdlib.h          |   9 ++++
 lib/settle.h           |   2 +-
 nest/rt-table.c        |   4 +-
 sysdep/bsd/krt-sock.c  | 111 ++++++++++++++++++++++++-----------------
 sysdep/linux/netlink.Y |  21 ++++++++
 sysdep/unix/domain.c   |   6 ++-
 sysdep/unix/krt.c      |  34 +++++--------
 8 files changed, 114 insertions(+), 86 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index d20e4a04..7f152659 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -338,7 +338,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 %type <xp> cmds_int cmd_prep
 %type <x> term cmd cmd_var cmds cmds_scoped constant constructor print_list var var_init var_list function_call symbol_value bgp_path_expr bgp_path bgp_path_tail
 %type <fsa> static_attr
-%type <fab> attr_bit
 %type <f> filter where_filter
 %type <fl> filter_body function_body
 %type <flv> lvalue
@@ -846,10 +845,6 @@ term:
  | constructor { $$ = $1; }
 
  | static_attr { $$ = f_new_inst(FI_RTA_GET, $1); }
- | attr_bit {
-    struct f_inst *c = f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)});
-    $$ = f_new_inst(FI_EQ, c, f_new_inst(FI_BITAND, f_new_inst(FI_EA_GET, $1.class), c));
-  }
 
  | term '.' IS_V4 { $$ = f_new_inst(FI_IS_V4, $1); }
  | term '.' TYPE { $$ = f_new_inst(FI_TYPE, $1); }
@@ -979,14 +974,6 @@ cmd:
        cf_error("Attribute %s is read-only", $3->attribute->name);
      $$ = f_new_inst(FI_EA_UNSET, $3->attribute);
    }
- | attr_bit '=' term ';' {
-     $$ = f_new_inst(FI_CONDITION, $3,
-	f_generate_complex_default(FI_BITOR, $1.class,
-	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)}), 0),
-	f_generate_complex_default(FI_BITAND, $1.class,
-	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}), 0)
-     );
-   }
  | break_command print_list ';' {
     struct f_inst *breaker = f_new_inst(FI_DIE, $1);
     if ($2) {
diff --git a/lib/birdlib.h b/lib/birdlib.h
index d743ecdf..5ecd19ca 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -9,13 +9,22 @@
 #ifndef _BIRD_BIRDLIB_H_
 #define _BIRD_BIRDLIB_H_
 
+#include <stddef.h>
+
 #include "sysdep/config.h"
 #include "lib/alloca.h"
 
 /* Ugly structure offset handling macros */
 
 #define SAME_TYPE(a, b)	({ int _ = ((a) != (b)); !_; })
+#define TYPE_CAST(from, to, what) ( SAME_TYPE(((from) NULL), (what)), ((to) (what)))
+
+#ifdef offsetof
+#define OFFSETOF offsetof
+#else
 #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
+#endif
+
 #define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); SAME_TYPE(&_ptr->i, p); _ptr; })
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define CPU_STRUCT_ALIGN  (MAX_(_Alignof(void*), _Alignof(u64)))
diff --git a/lib/settle.h b/lib/settle.h
index d274599d..e721f21f 100644
--- a/lib/settle.h
+++ b/lib/settle.h
@@ -32,7 +32,7 @@ struct settle {
 
 STATIC_ASSERT(OFFSETOF(struct settle, hook) == OFFSETOF(struct settle, tm) + OFFSETOF(timer, hook));
 
-#define SETTLE_INIT(_cfp, _hook, _data) (struct settle) { .tm = { .data = (_data), }, .hook = (_hook), .cf = ({ASSERT_DIE((_cfp)->min <= (_cfp)->max); *(_cfp); }), }
+#define SETTLE_INIT(_cfp, _hook, _data) (struct settle) { .tm = { .data = (_data), .hook = TYPE_CAST(void (*)(struct settle *), void (*)(struct timer *), (_hook)), }, .cf = ({ASSERT_DIE((_cfp)->min <= (_cfp)->max); *(_cfp); }), }
 
 
 static inline void settle_init(struct settle *s, struct settle_config *cf, void (*hook)(struct settle *), void *data)
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e712796b..48f5587b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3352,8 +3352,8 @@ ea_set_hostentry(ea_list **to, rtable *dep, rtable *src, ip_addr gw, ip_addr ll,
   struct {
     struct adata ad;
     struct hostentry *he;
-    u32 labels[lnum];
-  } *head = (void *) tmp_alloc_adata(sizeof *head - sizeof(struct adata));
+    u32 labels[0];
+  } *head = (void *) tmp_alloc_adata(sizeof *head + sizeof(u32) * lnum - sizeof(struct adata));
 
   RT_LOCKED(src, tab)
     head->he = rt_get_hostentry(tab, gw, ll, dep);
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 1c1bd50c..0706f546 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -148,15 +148,18 @@ static struct krt_proto *krt_table_map[KRT_MAX_TABLES][2];
 int
 krt_capable(rte *e)
 {
-  rta *a = e->attrs;
+  ea_list *eattrs = e->attrs;
+  eattr *nhea = ea_find(eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nh = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+  int dest = nhea_dest(nhea);
 
   return
-    ((a->dest == RTD_UNICAST && !a->nh.next) /* No multipath support */
+    ((dest == RTD_UNICAST && !NEXTHOP_ONE(nh)) /* No multipath support */
 #ifdef RTF_REJECT
-     || a->dest == RTD_UNREACHABLE
+     || dest == RTD_UNREACHABLE
 #endif
 #ifdef RTF_BLACKHOLE
-     || a->dest == RTD_BLACKHOLE
+     || dest == RTD_BLACKHOLE
 #endif
      );
 }
@@ -197,18 +200,22 @@ sockaddr_fill_dl(struct sockaddr_dl *sa, struct iface *ifa)
 }
 
 static int
-krt_send_route(struct krt_proto *p, int cmd, rte *e)
+krt_send_route(struct krt_proto *p, int cmd, const rte *e)
 {
-  net *net = e->net;
-  rta *a = e->attrs;
+  const net_addr *net = e->net;
+  ea_list *eattrs = e->attrs;
+  eattr *nhea = ea_find(eattrs, &ea_gen_nexthop);
+  struct nexthop_adata *nh = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
+  int dest = nhea_dest(nhea);
+
   static int msg_seq;
-  struct iface *j, *i = a->nh.iface;
+  struct iface *j, *i = (dest == RTD_UNICAST) ? nh->nh.iface : NULL;
   int l;
   struct ks_msg msg;
   char *body = (char *)msg.buf;
   sockaddr gate, mask, dst;
 
-  DBG("krt-sock: send %I/%d via %I\n", net->n.prefix, net->n.pxlen, a->gw);
+  DBG("krt-sock: send %N via %I\n", net, nh->nh.gw);
 
   bzero(&msg,sizeof (struct rt_msghdr));
   msg.rtm.rtm_version = RTM_VERSION;
@@ -218,7 +225,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
   msg.rtm.rtm_flags = RTF_UP | RTF_PROTO1;
 
   /* XXXX */
-  if (net_pxlen(net->n.addr) == net_max_prefix_length[net->n.addr->type])
+  if (net_pxlen(e->net) == net_max_prefix_length[net->type])
     msg.rtm.rtm_flags |= RTF_HOST;
   else
     msg.rtm.rtm_addrs |= RTA_NETMASK;
@@ -228,11 +235,11 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 #endif
 
 #ifdef RTF_REJECT
-  if(a->dest == RTD_UNREACHABLE)
+  if(dest == RTD_UNREACHABLE)
     msg.rtm.rtm_flags |= RTF_REJECT;
 #endif
 #ifdef RTF_BLACKHOLE
-  if(a->dest == RTD_BLACKHOLE)
+  if(dest == RTD_BLACKHOLE)
     msg.rtm.rtm_flags |= RTF_BLACKHOLE;
 #endif
 
@@ -260,7 +267,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 
   int af = AF_UNSPEC;
 
-  switch (net->n.addr->type) {
+  switch (net->type) {
     case NET_IP4:
       af = AF_INET;
       break;
@@ -268,19 +275,19 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
       af = AF_INET6;
       break;
     default:
-      log(L_ERR "KRT: Not sending route %N to kernel", net->n.addr);
+      log(L_ERR "KRT: Not sending route %N to kernel", net);
       return -1;
   }
 
-  sockaddr_fill(&dst,  af, net_prefix(net->n.addr), NULL, 0);
-  sockaddr_fill(&mask, af, net_pxmask(net->n.addr), NULL, 0);
+  sockaddr_fill(&dst,  af, net_prefix(net), NULL, 0);
+  sockaddr_fill(&mask, af, net_pxmask(net), NULL, 0);
 
-  switch (a->dest)
+  switch (dest)
   {
   case RTD_UNICAST:
-    if (ipa_nonzero(a->nh.gw))
+    if (ipa_nonzero(nh->nh.gw))
     {
-      ip_addr gw = a->nh.gw;
+      ip_addr gw = nh->nh.gw;
 
       /* Embed interface ID to link-local address */
       if (ipa_is_link_local(gw))
@@ -292,6 +299,8 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
       break;
     }
 
+    /* Fall through */
+
 #ifdef RTF_REJECT
   case RTD_UNREACHABLE:
 #endif
@@ -303,7 +312,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 
 #if __OpenBSD__
     /* Keeping temporarily old code for OpenBSD */
-    struct ifa *addr = (net->n.addr->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
+    struct ifa *addr = (net->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
 
     if (!addr)
     {
@@ -339,7 +348,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
   msg.rtm.rtm_msglen = l;
 
   if ((l = write(p->sys.sk->fd, (char *)&msg, l)) < 0) {
-    log(L_ERR "KRT: Error sending route %N to kernel: %m", net->n.addr);
+    log(L_ERR "KRT: Error sending route %N to kernel: %m", net);
     return -1;
   }
 
@@ -347,7 +356,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
 }
 
 void
-krt_replace_rte(struct krt_proto *p, net *n, rte *new, rte *old)
+krt_replace_rte(struct krt_proto *p, const net_addr *n UNUSED, rte *new, const rte *old)
 {
   int err = 0;
 
@@ -398,7 +407,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
   /* p is NULL iff KRT_SHARED_SOCKET and !scan */
 
   int ipv6;
-  net *net;
   sockaddr dst, gate, mask;
   ip_addr idst, igate, imask;
   net_addr ndst;
@@ -514,74 +522,82 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
     src = KRT_SRC_ALIEN;
   else
     src = KRT_SRC_KERNEL;
+  
+  union {
+    struct {
+      struct adata ad;
+      struct nexthop nh;
+      u32 labels[MPLS_MAX_LABEL_STACK];
+    };
+    struct nexthop_adata nhad;
+  } nhad = {};
 
-  net = net_get(p->p.main_channel->table, &ndst);
+  ea_list *eattrs = NULL;
 
-  rta a = {
-  };
-
-  ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_INHERIT);
+  ea_set_attr_u32(&eattrs, &ea_gen_source, 0, RTS_INHERIT);
 
   /* reject/blackhole routes have also set RTF_GATEWAY,
      we wil check them first. */
 
 #ifdef RTF_REJECT
   if(flags & RTF_REJECT) {
-    a.dest = RTD_UNREACHABLE;
+    nhad.nhad = NEXTHOP_DEST_LITERAL(RTD_UNREACHABLE);
     goto done;
   }
 #endif
 
 #ifdef RTF_BLACKHOLE
   if(flags & RTF_BLACKHOLE) {
-    a.dest = RTD_BLACKHOLE;
+    nhad.nhad = NEXTHOP_DEST_LITERAL(RTD_BLACKHOLE);
     goto done;
   }
 #endif
 
-  a.nh.iface = if_find_by_index(msg->rtm.rtm_index);
-  if (!a.nh.iface)
+  nhad.nh.iface = if_find_by_index(msg->rtm.rtm_index);
+  if (!nhad.nh.iface)
     {
       log(L_ERR "KRT: Received route %N with unknown ifindex %u",
-	  net->n.addr, msg->rtm.rtm_index);
+	  &ndst, msg->rtm.rtm_index);
       return;
     }
 
-  a.dest = RTD_UNICAST;
   if (flags & RTF_GATEWAY)
   {
-    a.nh.gw = igate;
+    nhad.nh.gw = igate;
 
     /* Clean up embedded interface ID returned in link-local address */
-    if (ipa_is_link_local(a.nh.gw))
-      _I0(a.nh.gw) = 0xfe800000;
+    if (ipa_is_link_local(nhad.nh.gw))
+      _I0(nhad.nh.gw) = 0xfe800000;
 
     /* The BSD kernel does not support an onlink flag. We heuristically
        set the onlink flag, if the iface has only host addresses. */
-    if (krt_assume_onlink(a.nh.iface, ipv6))
-      a.nh.flags |= RNF_ONLINK;
+    if (krt_assume_onlink(nhad.nh.iface, ipv6))
+      nhad.nh.flags |= RNF_ONLINK;
 
     neighbor *nbr;
-    nbr = neigh_find(&p->p, a.nh.gw, a.nh.iface,
-		    (a.nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
+    nbr = neigh_find(&p->p, nhad.nh.gw, nhad.nh.iface,
+		    (nhad.nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
     if (!nbr || (nbr->scope == SCOPE_HOST))
       {
 	/* Ignore routes with next-hop 127.0.0.1, host routes with such
 	   next-hop appear on OpenBSD for address aliases. */
-        if (ipa_classify(a.nh.gw) == (IADDR_HOST | SCOPE_HOST))
+        if (ipa_classify(nhad.nh.gw) == (IADDR_HOST | SCOPE_HOST))
           return;
 
 	log(L_ERR "KRT: Received route %N with strange next-hop %I",
-	    net->n.addr, a.nh.gw);
+	    &ndst, nhad.nh.gw);
 	return;
       }
   }
 
- done:;
-  rte e0 = { .attrs = &a, .net = net, };
+  nhad.ad.length = (void *) NEXTHOP_NEXT(&nhad.nh) - (void *) nhad.ad.data;
 
-  ea_set_attr(e0.attrs->eattrs,
-      EA_LITERAL_EMBEDDED(EA_KRT_SOURCE, T_INT, 0, src2));
+ done:
+  ea_set_attr(&eattrs, EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhad.ad));
+  rte e0 = { .attrs = eattrs, .net = &ndst, };
+
+  ea_set_attr(&e0.attrs,
+      EA_LITERAL_EMBEDDED(&ea_krt_source, 0, src2));
 
   if (scan)
     krt_got_route(p, &e0, src);
@@ -822,6 +838,7 @@ krt_read_msg(struct proto *p, struct ks_msg *msg, int scan)
   {
     case RTM_GET:
       if(!scan) return;
+      /* Fall through */
     case RTM_ADD:
     case RTM_DELETE:
     case RTM_CHANGE:
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 7ba8c7c9..9b07e9bb 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -15,6 +15,8 @@ CF_KEYWORDS(KERNEL, TABLE, METRIC, NETLINK, RX, BUFFER,
 	    KRT_LOCK_SSTRESH, KRT_LOCK_CWND, KRT_LOCK_ADVMSS, KRT_LOCK_REORDERING,
 	    KRT_LOCK_HOPLIMIT, KRT_LOCK_RTO_MIN, KRT_FEATURE_ECN, KRT_FEATURE_ALLFRAG)
 
+%type <fab> attr_bit
+
 CF_GRAMMAR
 
 kern_proto: kern_proto kern_sys_item ';' ;
@@ -42,6 +44,25 @@ attr_bit: KRT_LOCK_RTO_MIN { $$ = f_new_dynamic_attr_bit(13, "krt_lock"); } ;
 attr_bit: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, "krt_features"); } ;
 attr_bit: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr_bit(3, "krt_features"); } ;
 
+/* Getting attribute bits (moved here to not confuse Bison on *BSD) */
+term:
+   attr_bit {
+    struct f_inst *c = f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)});
+    $$ = f_new_inst(FI_EQ, c, f_new_inst(FI_BITAND, f_new_inst(FI_EA_GET, $1.class), c));
+  }
+ ;
+
+/* Setting attribute bits (moved here to not confuse Bison on *BSD) */
+cmd:
+   attr_bit '=' term ';' {
+     $$ = f_new_inst(FI_CONDITION, $3,
+	f_generate_complex_default(FI_BITOR, $1.class,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)}), 0),
+	f_generate_complex_default(FI_BITAND, $1.class,
+	      f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}), 0)
+     );
+   }
+ ;
 
 CF_CODE
 
diff --git a/sysdep/unix/domain.c b/sysdep/unix/domain.c
index 1cba540b..f4ee595d 100644
--- a/sysdep/unix/domain.c
+++ b/sysdep/unix/domain.c
@@ -83,11 +83,15 @@ uint dg_order(struct domain_generic *dg)
 
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 {
+  struct lock_order stack_copy;
+  memcpy(&stack_copy, &locking_stack, sizeof(stack_copy));
+  struct domain_generic **lll = last_locked;
+
   if ((char *) lsp - (char *) &locking_stack != dg->order)
     bug("Trying to lock on bad position: order=%u, lsp=%p, base=%p", dg->order, lsp, &locking_stack);
 
   if (lsp <= last_locked)
-    bug("Trying to lock in a bad order");
+    bug("Trying to lock in a bad order: %p %p", &stack_copy, lll);
   if (*lsp)
     bug("Inconsistent locking stack state on lock");
 
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 3b6c91cc..b3681c9c 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -290,18 +290,6 @@ krt_metric(rte *a)
   return ea ? ea->u.data : 0;
 }
 
-static inline int
-krt_same_key(rte *a, rte *b)
-{
-  return (krt_metric(a) == krt_metric(b));
-}
-
-static inline int
-krt_uptodate(rte *a, rte *b)
-{
-  return (a->attrs == b->attrs);
-}
-
 static void
 krt_learn_alien_attr(struct channel *c, rte *e)
 {
@@ -444,10 +432,13 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   switch (src)
     {
     case KRT_SRC_KERNEL:
-      goto ignore;
+      krt_trace_in(p, e, "ignored");
+      return;
 
     case KRT_SRC_REDIRECT:
-      goto delete;
+      krt_trace_in(p, e, "deleting");
+      krt_replace_rte(p, e->net, NULL, e);
+      return;
 
     case  KRT_SRC_ALIEN:
       if (KRT_CF->learn)
@@ -457,6 +448,7 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
       return;
     }
 #endif
+
   /* The rest is for KRT_SRC_BIRD (or KRT_SRC_UNKNOWN) */
 
   RT_LOCKED(p->p.main_channel->table, tab)
@@ -719,7 +711,11 @@ static int
 krt_preexport(struct channel *C, rte *e)
 {
   if (e->src->owner == &C->proto->sources)
+#ifdef CONFIG_SINGLE_ROUTE
+    return 1;
+#else
     return -1;
+#endif
 
   if (!krt_capable(e))
     return -1;
@@ -737,14 +733,8 @@ krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
     return;
 
 #ifdef CONFIG_SINGLE_ROUTE
-  /*
-   * Implicit withdraw - when the imported kernel route becomes the best one,
-   * we know that the previous one exported to the kernel was already removed,
-   * but if we processed the update as usual, we would send withdraw to the
-   * kernel, which would remove the new imported route instead.
-   */
-  rte *best = net->routes;
-  if (!new && best && (best->attrs->src->proto == P))
+  /* Got the same route as we imported. Keep it, do nothing. */
+  if (new && new->src->owner == &P->sources)
     return;
 #endif
 

From 7a262bc9994c7a545d355046c16f4203b19db05d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 21 Jan 2023 23:42:02 +0100
Subject: [PATCH 243/431] Adding forgotten pthread.h #include in io-loop.h
 (breaks at openbsd 7.1)

---
 sysdep/unix/io-loop.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 33d529da..e23a9be0 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -9,6 +9,8 @@
 
 #include "lib/rcu.h"
 
+#include <pthread.h>
+
 struct pipe
 {
   int fd[2];

From 9dc9124cec3b576b16fc484ee3cd207a9b74ebdf Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 24 Jan 2023 09:20:36 +0100
Subject: [PATCH 244/431] Revert "Filter: Allow setting the 'onlink' route
 attribute in filters"

This reverts commit 7144c9ca46f092da33a4e051bbce8f973a3bd8c4.

The onlink attribute implementation collides with the nexthop attribute
behavior in v3; keeping it aside until finding out how to reimplement it
correctly.
---
 doc/bird.sgml   |  8 --------
 filter/config.Y |  3 +--
 filter/data.h   |  1 -
 filter/f-inst.c | 14 ++------------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 001fcbd4..50657ebf 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1816,14 +1816,6 @@ Common route attributes are:
 	creation/removal. Zero is returned for routes with undefined outgoing
 	interfaces. Read-only.
 
-	<tag><label id="rta-onlink"><m/bool/ onlink</tag>
-	Onlink flag means that the specified nexthop is accessible on the
-	interface regardless of IP prefixes configured on the interface.
-	The attribute can be used to configure such next hops by first setting
-	<cf/onlink = true/ and <cf/ifname/, and then setting <cf/gw/. Possible
-	use case for setting this flag is to automatically build overlay IP-IP
-	networks on linux.
-
 	<tag><label id="rta-weight"><m/int/ weight</tag>
 	Multipath weight of route next hops. Valid values are 1-256. Reading
 	returns the weight of the first next hop, setting it sets weights of all
diff --git a/filter/config.Y b/filter/config.Y
index a1e5e9f1..1d9d9aa9 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -305,7 +305,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 	IF, THEN, ELSE, CASE,
 	FOR, IN, DO,
 	TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,
-	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS, ONLINK,
+	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX, WEIGHT, GW_MPLS,
 	PREFERENCE,
 	ROA_CHECK, ASN, SRC, DST,
 	IS_V4, IS_V6,
@@ -795,7 +795,6 @@ static_attr:
  | WEIGHT  { $$ = f_new_static_attr(T_INT,        SA_WEIGHT,	0); }
  | PREFERENCE { $$ = f_new_static_attr(T_INT,	  SA_PREF,	0); }
  | GW_MPLS { $$ = f_new_static_attr(T_INT,        SA_GW_MPLS,	0); }
- | ONLINK  { $$ = f_new_static_attr(T_BOOL,       SA_ONLINK,	0); }
  ;
 
 term:
diff --git a/filter/data.h b/filter/data.h
index b3767f7b..700609e9 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -102,7 +102,6 @@ enum f_sa_code {
   SA_WEIGHT,
   SA_PREF,
   SA_GW_MPLS,
-  SA_ONLINK,
 } PACKED;
 
 /* Static attribute definition (members of struct rta) */
diff --git a/filter/f-inst.c b/filter/f-inst.c
index e4b47ff4..2d2a30e4 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -694,7 +694,6 @@
       case SA_WEIGHT:	RESULT(sa.f_type, i, rta->nh.weight + 1); break;
       case SA_PREF:	RESULT(sa.f_type, i, rta->pref); break;
       case SA_GW_MPLS:	RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
-      case SA_ONLINK:	RESULT(sa.f_type, i, rta->nh.flags & RNF_ONLINK ? 1 : 0); break;
 
       default:
 	bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
@@ -721,8 +720,8 @@
       case SA_GW:
 	{
 	  ip_addr ip = v1.val.ip;
-	  struct iface *ifa = ipa_is_link_local(ip) || (rta->nh.flags & RNF_ONLINK) ? rta->nh.iface : NULL;
-	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, (rta->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
+	  struct iface *ifa = ipa_is_link_local(ip) ? rta->nh.iface : NULL;
+	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, 0);
 	  if (!n || (n->scope == SCOPE_HOST))
 	    runtime( "Invalid gw address" );
 
@@ -802,15 +801,6 @@
 	rta->pref = v1.val.i;
 	break;
 
-      case SA_ONLINK:
-	{
-	  if (v1.val.i)
-	    rta->nh.flags |= RNF_ONLINK;
-	  else
-	    rta->nh.flags &= ~RNF_ONLINK;
-	}
-	break;
-
       default:
 	bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
       }

From f7c2a886c9fb73b2749d5e270f15b79c44e72a62 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 24 Jan 2023 11:01:34 +0100
Subject: [PATCH 245/431] Object locks use events

Instead of calling custom hooks from object locks, we use standard event
sending mechanism to inform protocols about object lock changes. As
event sending is lockless, the unlocking protocol simply enqueues the
appropriate event to the given loop when the locking is done.
---
 nest/locks.c        | 70 ++++++++++++++++++++++++---------------------
 nest/locks.h        |  5 ++--
 proto/babel/babel.c | 11 ++++---
 proto/bgp/bgp.c     | 11 ++++---
 proto/ospf/iface.c  | 11 ++++---
 proto/radv/radv.c   | 11 ++++---
 proto/rip/rip.c     | 11 ++++---
 7 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/nest/locks.c b/nest/locks.c
index 812a6534..fb245cdc 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -37,7 +37,11 @@
 #include "nest/iface.h"
 
 static list olock_list;
-static event *olock_event;
+
+DEFINE_DOMAIN(attrs);
+static DOMAIN(attrs) olock_domain;
+#define OBJ_LOCK	LOCK_DOMAIN(attrs, olock_domain)
+#define OBJ_UNLOCK	UNLOCK_DOMAIN(attrs, olock_domain)
 
 static inline int
 olock_same(struct object_lock *x, struct object_lock *y)
@@ -54,35 +58,52 @@ olock_same(struct object_lock *x, struct object_lock *y)
 static void
 olock_free(resource *r)
 {
-  struct object_lock *q, *l = (struct object_lock *) r;
+  /* Called externally from rfree() */
+  struct object_lock *l = SKIP_BACK(struct object_lock, r, r);
   node *n;
 
+  OBJ_LOCK;
   DBG("olock: Freeing %p\n", l);
   switch (l->state)
     {
     case OLOCK_STATE_FREE:
       break;
     case OLOCK_STATE_LOCKED:
-    case OLOCK_STATE_EVENT:
+      /* Remove myself from the olock_list */
       rem_node(&l->n);
+
+      /* Maybe the notification is still pending. */
+      ev_postpone(&l->event);
+
+      /* Get new lock candidate */
       n = HEAD(l->waiters);
-      if (n->next)
+      if (NODE_VALID(n))
 	{
-	  DBG("olock: -> %p becomes locked\n", n);
-	  q = SKIP_BACK(struct object_lock, n, n);
+	  struct object_lock *q = SKIP_BACK(struct object_lock, n, n);
+
+	  /* Remove this candidate from waiters list */
 	  rem_node(n);
+
+	  /* Move waiter lists */
+	  DBG("olock: -> %p becomes locked\n", n);
 	  add_tail_list(&q->waiters, &l->waiters);
-	  q->state = OLOCK_STATE_EVENT;
+
+	  /* Add the new olock to olock_list */
 	  add_head(&olock_list, n);
-	  ev_schedule(olock_event);
+
+	  /* Inform */
+	  q->state = OLOCK_STATE_LOCKED;
+	  ev_send(q->target, &q->event);
 	}
       break;
     case OLOCK_STATE_WAITING:
+      /* Remove from the waiters list */
       rem_node(&l->n);
       break;
     default:
       ASSERT(0);
     }
+  OBJ_UNLOCK;
 }
 
 static void
@@ -140,6 +161,8 @@ olock_acquire(struct object_lock *l)
   node *n;
   struct object_lock *q;
 
+  OBJ_LOCK;
+
   WALK_LIST(n, olock_list)
     {
       q = SKIP_BACK(struct object_lock, n, n);
@@ -148,36 +171,19 @@ olock_acquire(struct object_lock *l)
 	  l->state = OLOCK_STATE_WAITING;
 	  add_tail(&q->waiters, &l->n);
 	  DBG("olock: %p waits\n", l);
+
+	  OBJ_UNLOCK;
 	  return;
 	}
     }
+
   DBG("olock: %p acquired immediately\n", l);
-  l->state = OLOCK_STATE_EVENT;
   add_head(&olock_list, &l->n);
-  ev_schedule(olock_event);
-}
 
-static void
-olock_run_event(void *unused UNUSED)
-{
-  node *n;
-  struct object_lock *q;
+  l->state = OLOCK_STATE_LOCKED;
+  ev_send(l->target, &l->event);
 
-  DBG("olock: Processing events\n");
-  for(;;)
-    {
-      n = HEAD(olock_list);
-      if (!n->next)
-	break;
-      q = SKIP_BACK(struct object_lock, n, n);
-      if (q->state != OLOCK_STATE_EVENT)
-	break;
-      DBG("olock: %p locked\n", q);
-      q->state = OLOCK_STATE_LOCKED;
-      rem_node(&q->n);
-      add_tail(&olock_list, &q->n);
-      q->hook(q);
-    }
+  OBJ_UNLOCK;
 }
 
 /**
@@ -191,5 +197,5 @@ olock_init(void)
 {
   DBG("olock: init\n");
   init_list(&olock_list);
-  olock_event = ev_new_init(&root_pool, olock_run_event, NULL);
+  olock_domain = DOMAIN_NEW(attrs, "Object lock");
 }
diff --git a/nest/locks.h b/nest/locks.h
index 37026c68..04571e69 100644
--- a/nest/locks.h
+++ b/nest/locks.h
@@ -31,8 +31,8 @@ struct object_lock {
   uint inst;		/* ... instance ID */
   struct iface *iface;	/* ... interface */
   struct iface *vrf;	/* ... or VRF (if iface is unknown) */
-  void (*hook)(struct object_lock *);	/* Called when the lock succeeds */
-  void *data;		/* User data */
+  event event;		/* Enqueued when the lock succeeds */
+  event_list *target;	/* Where to put the event */
   /* ... internal to lock manager, don't touch ... */
   node n;		/* Node in list of olocks */
   int state;		/* OLOCK_STATE_xxx */
@@ -50,6 +50,5 @@ void olock_init(void);
 #define OLOCK_STATE_FREE 0
 #define OLOCK_STATE_LOCKED 1
 #define OLOCK_STATE_WAITING 2
-#define OLOCK_STATE_EVENT 3		/* waiting for unlock processing */
 
 #endif
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index a3a52f73..4db7c66f 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1761,9 +1761,9 @@ babel_find_iface(struct babel_proto *p, struct iface *what)
 }
 
 static void
-babel_iface_locked(struct object_lock *lock)
+babel_iface_locked(void *_ifa)
 {
-  struct babel_iface *ifa = lock->data;
+  struct babel_iface *ifa = _ifa;
   struct babel_proto *p = ifa->proto;
 
   if (!babel_open_socket(ifa))
@@ -1818,8 +1818,11 @@ babel_add_iface(struct babel_proto *p, struct iface *new, struct babel_iface_con
   lock->addr = IP6_BABEL_ROUTERS;
   lock->port = ifa->cf->port;
   lock->iface = ifa->iface;
-  lock->hook = babel_iface_locked;
-  lock->data = ifa;
+  lock->event = (event) {
+    .hook = babel_iface_locked,
+    .data = ifa,
+  };
+  lock->target = &global_event_list;
 
   olock_acquire(lock);
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 48e98bdf..c74b8273 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1528,9 +1528,9 @@ bgp_feed_end(struct channel *C)
 
 
 static void
-bgp_start_locked(struct object_lock *lock)
+bgp_start_locked(void *_p)
 {
-  struct bgp_proto *p = lock->data;
+  struct bgp_proto *p = _p;
   const struct bgp_config *cf = p->cf;
 
   if (p->p.proto_state != PS_START)
@@ -1637,8 +1637,11 @@ bgp_start(struct proto *P)
   lock->iface = p->cf->iface;
   lock->vrf = p->cf->iface ? NULL : p->p.vrf;
   lock->type = OBJLOCK_TCP;
-  lock->hook = bgp_start_locked;
-  lock->data = p;
+  lock->event = (event) {
+    .hook = bgp_start_locked,
+    .data = p,
+  };
+  lock->target = &global_event_list;
 
   /* For dynamic BGP, we use inst 1 to avoid collisions with regular BGP */
   if (bgp_is_dynamic(p))
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 84c53aa1..59255350 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -484,9 +484,9 @@ ospf_iface_find(struct ospf_proto *p, struct iface *what)
 }
 
 static void
-ospf_iface_add(struct object_lock *lock)
+ospf_iface_add(void *_ifa)
 {
-  struct ospf_iface *ifa = lock->data;
+  struct ospf_iface *ifa = _ifa;
   struct ospf_proto *p = ifa->oa->po;
 
   /* Open socket if interface is not stub */
@@ -668,8 +668,11 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
   lock->port = OSPF_PROTO;
   lock->inst = ifa->instance_id;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = ospf_iface_add;
+  lock->event = (event) {
+    .hook = ospf_iface_add,
+    .data = ifa,
+  };
+  lock->target = &global_event_list;
 
   olock_acquire(lock);
 }
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 8929e8ef..b7c8d7be 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -266,9 +266,9 @@ radv_iface_find(struct radv_proto *p, struct iface *what)
 }
 
 static void
-radv_iface_add(struct object_lock *lock)
+radv_iface_add(void *_ifa)
 {
-  struct radv_iface *ifa = lock->data;
+  struct radv_iface *ifa = _ifa;
   struct radv_proto *p = ifa->ra;
 
   if (! radv_sk_open(ifa))
@@ -305,8 +305,11 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
   lock->type = OBJLOCK_IP;
   lock->port = ICMPV6_PROTO;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = radv_iface_add;
+  lock->event = (event) {
+    .hook = radv_iface_add,
+    .data = ifa,
+  };
+  lock->target = &global_event_list;
   ifa->lock = lock;
 
   olock_acquire(lock);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index bd087246..b3a4e81e 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -667,9 +667,9 @@ rip_iface_update_bfd(struct rip_iface *ifa)
 
 
 static void
-rip_iface_locked(struct object_lock *lock)
+rip_iface_locked(void *_ifa)
 {
-  struct rip_iface *ifa = lock->data;
+  struct rip_iface *ifa = _ifa;
   struct rip_proto *p = ifa->rip;
 
   if (!rip_open_socket(ifa))
@@ -731,8 +731,11 @@ rip_add_iface(struct rip_proto *p, struct iface *iface, struct rip_iface_config
   lock->type = OBJLOCK_UDP;
   lock->port = ic->port;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = rip_iface_locked;
+  lock->event = (event) {
+    .hook = rip_iface_locked,
+    .data = ifa,
+  };
+  lock->target = &global_event_list;
   ifa->lock = lock;
 
   olock_acquire(lock);

From 4334f86251429eb39bfe81ff19496d141fccef84 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 15 Nov 2021 10:53:58 +0100
Subject: [PATCH 246/431] VRF setting reduced to one argument, using default
 dummy iface for default vrf

---
 nest/config.Y       |  4 ++--
 nest/iface.c        | 13 +++++++++----
 nest/iface.h        |  2 ++
 nest/neighbor.c     | 10 +++++-----
 nest/proto.c        |  8 +++-----
 nest/protocol.h     |  2 --
 proto/babel/babel.c |  2 +-
 proto/bfd/bfd.c     |  2 +-
 proto/bgp/packets.c |  4 ++--
 proto/ospf/iface.c  |  4 ++--
 proto/radv/radv.c   |  2 +-
 proto/rip/rip.c     |  2 +-
 12 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/nest/config.Y b/nest/config.Y
index b2aa0906..558d7e85 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -291,8 +291,8 @@ proto_item:
  | MRTDUMP mrtdump_mask { this_proto->mrtdump = $2; }
  | ROUTER ID idval { this_proto->router_id = $3; }
  | DESCRIPTION text { this_proto->dsc = $2; }
- | VRF text { this_proto->vrf = if_get_by_name($2); this_proto->vrf_set = 1; }
- | VRF DEFAULT { this_proto->vrf = NULL; this_proto->vrf_set = 1; }
+ | VRF text { this_proto->vrf = if_get_by_name($2); }
+ | VRF DEFAULT { this_proto->vrf = &default_vrf; }
  ;
 
 
diff --git a/nest/iface.c b/nest/iface.c
index 682340c5..fc896e26 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -37,6 +37,7 @@
 static pool *if_pool;
 
 list iface_list;
+struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
 
@@ -147,7 +148,7 @@ ifa_send_notify(struct proto *p, unsigned c, struct ifa *a)
 {
   if (p->ifa_notify &&
       (p->proto_state != PS_DOWN) &&
-      (!p->vrf_set || p->vrf == a->iface->master))
+      (!p->vrf || p->vrf == a->iface->master))
     {
       if (p->debug & D_IFACES)
 	log(L_TRACE "%s < address %N on interface %s %s",
@@ -185,7 +186,7 @@ if_send_notify(struct proto *p, unsigned c, struct iface *i)
 {
   if (p->if_notify &&
       (p->proto_state != PS_DOWN) &&
-      (!p->vrf_set || p->vrf == i->master))
+      (!p->vrf || p->vrf == i->master))
     {
       if (p->debug & D_IFACES)
 	log(L_TRACE "%s < interface %s %s", p->name, i->name,
@@ -243,7 +244,7 @@ if_recalc_flags(struct iface *i UNUSED, uint flags)
 {
   if ((flags & IF_ADMIN_UP) &&
       !(flags & (IF_SHUTDOWN | IF_TMP_DOWN)) &&
-      !(i->master_index && !i->master))
+      !(i->master_index && i->master == &default_vrf))
     flags |= IF_UP;
   else
     flags &= ~IF_UP;
@@ -301,6 +302,9 @@ if_update(struct iface *new)
   struct iface *i;
   unsigned c;
 
+  if (!new->master)
+    new->master = &default_vrf;
+
   WALK_LIST(i, iface_list)
     if (!strcmp(new->name, i->name))
       {
@@ -711,6 +715,7 @@ if_init(void)
 {
   if_pool = rp_new(&root_pool, "Interfaces");
   init_list(&iface_list);
+  strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
 }
 
@@ -843,7 +848,7 @@ if_show(void)
 	continue;
 
       char mbuf[16 + sizeof(i->name)] = {};
-      if (i->master)
+      if (i->master != &default_vrf)
 	bsprintf(mbuf, " master=%s", i->master->name);
       else if (i->master_index)
 	bsprintf(mbuf, " master=#%u", i->master_index);
diff --git a/nest/iface.h b/nest/iface.h
index 1189cdd4..13f3bd12 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -28,6 +28,8 @@ struct ifa {				/* Interface address */
   unsigned flags;			/* Analogous to iface->flags */
 };
 
+extern struct iface default_vrf;
+
 struct iface {
   node n;
   char name[16];
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 7cf9c85d..81da24d5 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -142,7 +142,7 @@ if_connected(ip_addr a, struct iface *i, struct ifa **ap, uint flags)
 }
 
 static inline int
-if_connected_any(ip_addr a, struct iface *vrf, uint vrf_set, struct iface **iface, struct ifa **addr, uint flags)
+if_connected_any(ip_addr a, struct iface *vrf, struct iface **iface, struct ifa **addr, uint flags)
 {
   struct iface *i;
   struct ifa *b;
@@ -153,7 +153,7 @@ if_connected_any(ip_addr a, struct iface *vrf, uint vrf_set, struct iface **ifac
 
   /* Prefer SCOPE_HOST or longer prefix */
   WALK_LIST(i, iface_list)
-    if ((!vrf_set || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
+    if ((!vrf || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
       if (scope_better(s, scope) || (scope_remote(s, scope) && ifa_better(b, *addr)))
       {
 	*iface = i;
@@ -245,7 +245,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
     iface = (scope < 0) ? NULL : iface;
   }
   else
-    scope = if_connected_any(a, p->vrf, p->vrf_set, &iface, &addr, flags);
+    scope = if_connected_any(a, p->vrf, &iface, &addr, flags);
 
   /* scope < 0 means i don't know neighbor */
   /* scope >= 0  <=>  iface != NULL */
@@ -369,7 +369,7 @@ neigh_update(neighbor *n, struct iface *iface)
     return;
 
   /* VRF-bound neighbors ignore changes in other VRFs */
-  if (p->vrf_set && (p->vrf != iface->master))
+  if (p->vrf && (p->vrf != iface->master))
     return;
 
   scope = if_connected(n->addr, iface, &ifa, n->flags);
@@ -379,7 +379,7 @@ neigh_update(neighbor *n, struct iface *iface)
   {
     /* When neighbor is going down, try to respawn it on other ifaces */
     if ((scope < 0) && (n->scope >= 0) && !n->ifreq && (n->flags & NEF_STICKY))
-      scope = if_connected_any(n->addr, p->vrf, p->vrf_set, &iface, &ifa, n->flags);
+      scope = if_connected_any(n->addr, p->vrf, &iface, &ifa, n->flags);
   }
   else
   {
diff --git a/nest/proto.c b/nest/proto.c
index 885a0b75..26d648f3 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1025,7 +1025,6 @@ proto_init(struct proto_config *c, node *n)
   p->proto_state = PS_DOWN;
   p->last_state_change = current_time();
   p->vrf = c->vrf;
-  p->vrf_set = c->vrf_set;
   insert_node(&p->n, n);
 
   p->event = ev_new_init(proto_pool, proto_event, p);
@@ -1193,8 +1192,7 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
   if ((nc->protocol != oc->protocol) ||
       (nc->net_type != oc->net_type) ||
       (nc->disabled != p->disabled) ||
-      (nc->vrf != oc->vrf) ||
-      (nc->vrf_set != oc->vrf_set))
+      (nc->vrf != oc->vrf))
     return 0;
 
   p->name = nc->name;
@@ -2075,8 +2073,8 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
       cli_msg(-1006, "  Message:        %s", p->message);
     if (p->cf->router_id)
       cli_msg(-1006, "  Router ID:      %R", p->cf->router_id);
-    if (p->vrf_set)
-      cli_msg(-1006, "  VRF:            %s", p->vrf ? p->vrf->name : "default");
+    if (p->vrf)
+      cli_msg(-1006, "  VRF:            %s", p->vrf->name);
 
     if (p->proto->show_proto_info)
       p->proto->show_proto_info(p);
diff --git a/nest/protocol.h b/nest/protocol.h
index fcbf0539..fef2cb91 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -120,7 +120,6 @@ struct proto_config {
   int class;				/* SYM_PROTO or SYM_TEMPLATE */
   u8 net_type;				/* Protocol network type (NET_*), 0 for undefined */
   u8 disabled;				/* Protocol enabled/disabled by default */
-  u8 vrf_set;				/* Related VRF instance (below) is defined */
   u32 debug, mrtdump;			/* Debugging bitfields, both use D_* constants */
   u32 router_id;			/* Protocol specific router ID */
 
@@ -177,7 +176,6 @@ struct proto {
   uint active_channels;			/* Number of active channels */
   byte net_type;			/* Protocol network type (NET_*), 0 for undefined */
   byte disabled;			/* Manually disabled */
-  byte vrf_set;				/* Related VRF instance (above) is defined */
   byte proto_state;			/* Protocol state machine (PS_*, see below) */
   byte active;				/* From PS_START to cleanup after PS_STOP */
   byte do_start;			/* Start actions are scheduled */
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index ff8b6b52..ad7981f6 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1946,7 +1946,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
 
   WALK_LIST(iface, iface_list)
   {
-    if (p->p.vrf_set && p->p.vrf != iface->master)
+    if (p->p.vrf && p->p.vrf != iface->master)
       continue;
 
     if (!(iface->flags & IF_UP))
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 873e2ed5..69e42f3d 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -659,7 +659,7 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 {
   struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
 
-  if (p->p.vrf_set && (p->p.vrf != req->vrf))
+  if (p->p.vrf && (p->p.vrf != req->vrf))
     return 0;
 
   if (ipa_is_ip4(req->addr) ? !cf->accept_ipv4 : !cf->accept_ipv6)
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 16818cf3..6244b62f 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1130,7 +1130,7 @@ bgp_use_next_hop(struct bgp_export_state *s, eattr *a)
     return 0;
 
   /* Do not pass NEXT_HOP between different VRFs */
-  if (p->p.vrf_set && s->src && s->src->p.vrf_set && (p->p.vrf != s->src->p.vrf))
+  if (p->p.vrf && s->src && s->src->p.vrf && (p->p.vrf != s->src->p.vrf))
     return 0;
 
   /* Keep it when exported to internal peers */
@@ -1163,7 +1163,7 @@ bgp_use_gateway(struct bgp_export_state *s)
     return 0;
 
   /* Do not use gateway from different VRF */
-  if (p->p.vrf_set && ra->nh.iface && (p->p.vrf != ra->nh.iface->master))
+  if (p->p.vrf && ra->nh.iface && (p->p.vrf != ra->nh.iface->master))
     return 0;
 
   /* Use it when exported to internal peers */
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 87e3d95e..84c53aa1 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -1227,7 +1227,7 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p)
 
   WALK_LIST(iface, iface_list)
   {
-    if (p->p.vrf_set && p->p.vrf != iface->master)
+    if (p->p.vrf && p->p.vrf != iface->master)
       continue;
 
     if (! (iface->flags & IF_UP))
@@ -1276,7 +1276,7 @@ ospf_reconfigure_ifaces3(struct ospf_proto *p)
 
   WALK_LIST(iface, iface_list)
   {
-    if (p->p.vrf_set && p->p.vrf != iface->master)
+    if (p->p.vrf && p->p.vrf != iface->master)
       continue;
 
     if (! (iface->flags & IF_UP))
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 119a8dc4..8b547f6d 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -663,7 +663,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
   struct iface *iface;
   WALK_LIST(iface, iface_list)
   {
-    if (p->p.vrf_set && p->p.vrf != iface->master)
+    if (p->p.vrf && p->p.vrf != iface->master)
       continue;
 
     if (!(iface->flags & IF_UP))
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 8c2d5aeb..ca218846 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -797,7 +797,7 @@ rip_reconfigure_ifaces(struct rip_proto *p, struct rip_config *cf)
 
   WALK_LIST(iface, iface_list)
   {
-    if (p->p.vrf_set && p->p.vrf != iface->master)
+    if (p->p.vrf && p->p.vrf != iface->master)
       continue;
 
     if (!(iface->flags & IF_UP))

From 05d8c3699d51866c68747167556e7c1f06390afe Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 24 Jan 2023 11:01:34 +0100
Subject: [PATCH 247/431] Object locks use events

Instead of calling custom hooks from object locks, we use standard event
sending mechanism to inform protocols about object lock changes. This is
a backport from version 3 where these events are passed across threads.

This implementation of object locks doesn't use mutexes to lock the
whole data structure. In version 3, this data structure may get accessed
from multiple threads and must be protected by mutex.
---
 nest/locks.c        | 59 ++++++++++++++++++++-------------------------
 nest/locks.h        |  4 +--
 proto/babel/babel.c | 10 +++++---
 proto/bgp/bgp.c     | 10 +++++---
 proto/ospf/iface.c  | 10 +++++---
 proto/radv/radv.c   | 10 +++++---
 proto/rip/rip.c     | 10 +++++---
 7 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/nest/locks.c b/nest/locks.c
index 812a6534..e378fb1f 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -37,7 +37,6 @@
 #include "nest/iface.h"
 
 static list olock_list;
-static event *olock_event;
 
 static inline int
 olock_same(struct object_lock *x, struct object_lock *y)
@@ -54,7 +53,8 @@ olock_same(struct object_lock *x, struct object_lock *y)
 static void
 olock_free(resource *r)
 {
-  struct object_lock *q, *l = (struct object_lock *) r;
+  /* Called externally from rfree() */
+  struct object_lock *l = SKIP_BACK(struct object_lock, r, r);
   node *n;
 
   DBG("olock: Freeing %p\n", l);
@@ -63,21 +63,35 @@ olock_free(resource *r)
     case OLOCK_STATE_FREE:
       break;
     case OLOCK_STATE_LOCKED:
-    case OLOCK_STATE_EVENT:
+      /* Remove myself from the olock_list */
       rem_node(&l->n);
+
+      /* Maybe the notification is still pending. */
+      ev_postpone(&l->event);
+
+      /* Get new lock candidate */
       n = HEAD(l->waiters);
-      if (n->next)
+      if (NODE_VALID(n))
 	{
-	  DBG("olock: -> %p becomes locked\n", n);
-	  q = SKIP_BACK(struct object_lock, n, n);
+	  struct object_lock *q = SKIP_BACK(struct object_lock, n, n);
+
+	  /* Remove this candidate from waiters list */
 	  rem_node(n);
+
+	  /* Move waiter lists */
+	  DBG("olock: -> %p becomes locked\n", n);
 	  add_tail_list(&q->waiters, &l->waiters);
-	  q->state = OLOCK_STATE_EVENT;
+
+	  /* Add the new olock to olock_list */
 	  add_head(&olock_list, n);
-	  ev_schedule(olock_event);
+
+	  /* Inform */
+	  q->state = OLOCK_STATE_LOCKED;
+	  ev_schedule(&q->event);
 	}
       break;
     case OLOCK_STATE_WAITING:
+      /* Remove from the waiters list */
       rem_node(&l->n);
       break;
     default:
@@ -148,36 +162,16 @@ olock_acquire(struct object_lock *l)
 	  l->state = OLOCK_STATE_WAITING;
 	  add_tail(&q->waiters, &l->n);
 	  DBG("olock: %p waits\n", l);
+
 	  return;
 	}
     }
+
   DBG("olock: %p acquired immediately\n", l);
-  l->state = OLOCK_STATE_EVENT;
   add_head(&olock_list, &l->n);
-  ev_schedule(olock_event);
-}
 
-static void
-olock_run_event(void *unused UNUSED)
-{
-  node *n;
-  struct object_lock *q;
-
-  DBG("olock: Processing events\n");
-  for(;;)
-    {
-      n = HEAD(olock_list);
-      if (!n->next)
-	break;
-      q = SKIP_BACK(struct object_lock, n, n);
-      if (q->state != OLOCK_STATE_EVENT)
-	break;
-      DBG("olock: %p locked\n", q);
-      q->state = OLOCK_STATE_LOCKED;
-      rem_node(&q->n);
-      add_tail(&olock_list, &q->n);
-      q->hook(q);
-    }
+  l->state = OLOCK_STATE_LOCKED;
+  ev_schedule(&l->event);
 }
 
 /**
@@ -191,5 +185,4 @@ olock_init(void)
 {
   DBG("olock: init\n");
   init_list(&olock_list);
-  olock_event = ev_new_init(&root_pool, olock_run_event, NULL);
 }
diff --git a/nest/locks.h b/nest/locks.h
index 37026c68..0cb33db9 100644
--- a/nest/locks.h
+++ b/nest/locks.h
@@ -31,8 +31,7 @@ struct object_lock {
   uint inst;		/* ... instance ID */
   struct iface *iface;	/* ... interface */
   struct iface *vrf;	/* ... or VRF (if iface is unknown) */
-  void (*hook)(struct object_lock *);	/* Called when the lock succeeds */
-  void *data;		/* User data */
+  event event;		/* Enqueued when the lock succeeds */
   /* ... internal to lock manager, don't touch ... */
   node n;		/* Node in list of olocks */
   int state;		/* OLOCK_STATE_xxx */
@@ -50,6 +49,5 @@ void olock_init(void);
 #define OLOCK_STATE_FREE 0
 #define OLOCK_STATE_LOCKED 1
 #define OLOCK_STATE_WAITING 2
-#define OLOCK_STATE_EVENT 3		/* waiting for unlock processing */
 
 #endif
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index ad7981f6..e1b31e86 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1762,9 +1762,9 @@ babel_find_iface(struct babel_proto *p, struct iface *what)
 }
 
 static void
-babel_iface_locked(struct object_lock *lock)
+babel_iface_locked(void *_ifa)
 {
-  struct babel_iface *ifa = lock->data;
+  struct babel_iface *ifa = _ifa;
   struct babel_proto *p = ifa->proto;
 
   if (!babel_open_socket(ifa))
@@ -1819,8 +1819,10 @@ babel_add_iface(struct babel_proto *p, struct iface *new, struct babel_iface_con
   lock->addr = IP6_BABEL_ROUTERS;
   lock->port = ifa->cf->port;
   lock->iface = ifa->iface;
-  lock->hook = babel_iface_locked;
-  lock->data = ifa;
+  lock->event = (event) {
+    .hook = babel_iface_locked,
+    .data = ifa,
+  };
 
   olock_acquire(lock);
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 2e442e16..5b0569ae 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1467,9 +1467,9 @@ bgp_feed_end(struct channel *C)
 
 
 static void
-bgp_start_locked(struct object_lock *lock)
+bgp_start_locked(void *_p)
 {
-  struct bgp_proto *p = lock->data;
+  struct bgp_proto *p = _p;
   const struct bgp_config *cf = p->cf;
 
   if (p->p.proto_state != PS_START)
@@ -1574,8 +1574,10 @@ bgp_start(struct proto *P)
   lock->iface = p->cf->iface;
   lock->vrf = p->cf->iface ? NULL : p->p.vrf;
   lock->type = OBJLOCK_TCP;
-  lock->hook = bgp_start_locked;
-  lock->data = p;
+  lock->event = (event) {
+    .hook = bgp_start_locked,
+    .data = p,
+  };
 
   /* For dynamic BGP, we use inst 1 to avoid collisions with regular BGP */
   if (bgp_is_dynamic(p))
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 84c53aa1..c7a6d3d4 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -484,9 +484,9 @@ ospf_iface_find(struct ospf_proto *p, struct iface *what)
 }
 
 static void
-ospf_iface_add(struct object_lock *lock)
+ospf_iface_add(void *_ifa)
 {
-  struct ospf_iface *ifa = lock->data;
+  struct ospf_iface *ifa = _ifa;
   struct ospf_proto *p = ifa->oa->po;
 
   /* Open socket if interface is not stub */
@@ -668,8 +668,10 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
   lock->port = OSPF_PROTO;
   lock->inst = ifa->instance_id;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = ospf_iface_add;
+  lock->event = (event) {
+    .hook = ospf_iface_add,
+    .data = ifa,
+  };
 
   olock_acquire(lock);
 }
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 8b547f6d..ee1da36c 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -263,9 +263,9 @@ radv_iface_find(struct radv_proto *p, struct iface *what)
 }
 
 static void
-radv_iface_add(struct object_lock *lock)
+radv_iface_add(void *_ifa)
 {
-  struct radv_iface *ifa = lock->data;
+  struct radv_iface *ifa = _ifa;
   struct radv_proto *p = ifa->ra;
 
   if (! radv_sk_open(ifa))
@@ -302,8 +302,10 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
   lock->type = OBJLOCK_IP;
   lock->port = ICMPV6_PROTO;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = radv_iface_add;
+  lock->event = (event) {
+    .hook = radv_iface_add,
+    .data = ifa,
+  };
   ifa->lock = lock;
 
   olock_acquire(lock);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index ca218846..93b0d528 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -656,9 +656,9 @@ rip_iface_update_bfd(struct rip_iface *ifa)
 
 
 static void
-rip_iface_locked(struct object_lock *lock)
+rip_iface_locked(void *_ifa)
 {
-  struct rip_iface *ifa = lock->data;
+  struct rip_iface *ifa = _ifa;
   struct rip_proto *p = ifa->rip;
 
   if (!rip_open_socket(ifa))
@@ -720,8 +720,10 @@ rip_add_iface(struct rip_proto *p, struct iface *iface, struct rip_iface_config
   lock->type = OBJLOCK_UDP;
   lock->port = ic->port;
   lock->iface = iface;
-  lock->data = ifa;
-  lock->hook = rip_iface_locked;
+  lock->event = (event) {
+    .hook = rip_iface_locked,
+    .data = ifa,
+  };
   ifa->lock = lock;
 
   olock_acquire(lock);

From e077d0e770f00c98f26ee6b3cdb7905bf9bea4c1 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Jan 2023 13:11:55 +0100
Subject: [PATCH 248/431] Moved interface list flush to device protocol cleanup
 hook.

The interface list must be flushed when device protocol is stopped. This
was done in a hardcoded specific hook inside generic protocol routines.
The cleanup hook was originally used for table reference counting late
cleanup, yet it can be also simply used for prettier interface list flush.
---
 nest/iface.c      |  9 ---------
 nest/iface.h      |  1 -
 nest/proto.c      |  8 +++-----
 sysdep/unix/krt.c | 10 ++++++++++
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index fc896e26..fc63dc75 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -386,15 +386,6 @@ if_end_update(void)
     }
 }
 
-void
-if_flush_ifaces(struct proto *p)
-{
-  if (p->debug & D_EVENTS)
-    log(L_TRACE "%s: Flushing interfaces", p->name);
-  if_start_update();
-  if_end_update();
-}
-
 /**
  * if_feed_baby - advertise interfaces to a new protocol
  * @p: protocol to feed
diff --git a/nest/iface.h b/nest/iface.h
index 13f3bd12..287f3d96 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -114,7 +114,6 @@ void ifa_delete(struct ifa *);
 void if_start_update(void);
 void if_end_partial_update(struct iface *);
 void if_end_update(void);
-void if_flush_ifaces(struct proto *p);
 void if_feed_baby(struct proto *);
 struct iface *if_find_by_index(unsigned);
 struct iface *if_find_by_name(const char *);
diff --git a/nest/proto.c b/nest/proto.c
index 26d648f3..0ca72ead 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -968,11 +968,8 @@ proto_event(void *ptr)
 
   if (p->do_stop)
   {
-    if (p->proto == &proto_unix_iface)
-      if_flush_ifaces(p);
     p->do_stop = 0;
   }
-
   if (proto_is_done(p))
   {
     if (p->proto->cleanup)
@@ -1863,8 +1860,6 @@ proto_do_stop(struct proto *p)
   p->down_sched = 0;
   p->gr_recovery = 0;
 
-  p->do_stop = 1;
-  ev_schedule(p->event);
 
   if (p->main_source)
   {
@@ -1873,6 +1868,9 @@ proto_do_stop(struct proto *p)
   }
 
   proto_stop_channels(p);
+
+  p->do_stop = 1;
+  ev_schedule(p->event);
 }
 
 static void
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 9f95247f..7ec30eb0 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -163,6 +163,15 @@ kif_shutdown(struct proto *P)
   return PS_DOWN;
 }
 
+static void
+kif_cleanup(struct proto *p)
+{
+  if (p->debug & D_EVENTS)
+    log(L_TRACE "%s: Flushing interfaces", p->name);
+  if_start_update();
+  if_end_update();
+}
+
 static int
 kif_reconfigure(struct proto *p, struct proto_config *new)
 {
@@ -239,6 +248,7 @@ struct protocol proto_unix_iface = {
   .init =		kif_init,
   .start =		kif_start,
   .shutdown =		kif_shutdown,
+  .cleanup =		kif_cleanup,
   .reconfigure =	kif_reconfigure,
   .copy_config =	kif_copy_config
 };

From 6e035a9a8c7c943ea5b58932a2bd4c9b733d91ff Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Jan 2023 14:30:35 +0100
Subject: [PATCH 249/431] Typed lists: shortcut for simple nodes

---
 lib/tlists.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/tlists.h b/lib/tlists.h
index e1ed79ea..1437e17e 100644
--- a/lib/tlists.h
+++ b/lib/tlists.h
@@ -147,9 +147,14 @@ static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
 #error "You should first include lib/tlists.h without requesting a TLIST"
 #endif
 
-#define TLIST_NODE(_name, _type)	struct _name##_node { _type *next; _type *prev; }
+#define TLIST_NODE_CONTENTS(_type)	{ _type *next; _type *prev; }
+#define TLIST_NODE(_name, _type)	struct _name##_node TLIST_NODE_CONTENTS(_type) 
+#define TLIST_DEFAULT_NODE		struct MACRO_CONCAT_AFTER(TLIST_PREFIX,_node) \
+					TLIST_NODE_CONTENTS(TLIST_TYPE) TLIST_ITEM
+
 #define TLIST_LIST(_name)		struct _name##_list 
 
+
 /* Use ->first and ->last to access HEAD and TAIL */
 #define THEAD(_name, _list)  (_list)->first
 #define TTAIL(_name, _list)  (_list)->last

From 64e08775251960a2b009fc35a084610c9c4c4909 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Feb 2023 12:10:34 +0100
Subject: [PATCH 250/431] Proto: Adding a list of associated neighbors

This makes for safer and faster pruning and notifying as protocol now on
its shutdown prunes only its neighbors and nothing else.
---
 nest/iface.h    | 11 ++++++++++-
 nest/neighbor.c | 28 +++++++++-------------------
 nest/proto.c    |  2 +-
 nest/protocol.h |  6 ++++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/nest/iface.h b/nest/iface.h
index 287f3d96..fb27f99e 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -10,6 +10,7 @@
 #define _BIRD_IFACE_H_
 
 #include "lib/lists.h"
+#include "lib/tlists.h"
 #include "lib/ip.h"
 
 extern list iface_list;
@@ -126,6 +127,7 @@ void if_recalc_all_preferred_addresses(void);
 typedef struct neighbor {
   node n;				/* Node in neighbor hash table chain */
   node if_n;				/* Node in per-interface neighbor list */
+  TLIST_NODE(proto_neigh, struct neighbor) proto_n;
   ip_addr addr;				/* Address of the neighbor */
   struct ifa *ifa;			/* Ifa on related iface */
   struct iface *iface;			/* Interface it's connected to */
@@ -138,6 +140,13 @@ typedef struct neighbor {
 					   SCOPE_HOST when it's our own address */
 } neighbor;
 
+#define TLIST_PREFIX proto_neigh
+#define TLIST_TYPE struct neighbor
+#define TLIST_ITEM proto_n
+#define TLIST_WANT_WALK
+#define TLIST_WANT_ADD_TAIL
+#include "lib/tlists.h"
+
 #define NEF_STICKY	1
 #define NEF_ONLINK	2
 #define NEF_IFACE	4		/* Entry for whole iface */
@@ -147,7 +156,7 @@ neighbor *neigh_find(struct proto *p, ip_addr a, struct iface *ifa, uint flags);
 
 void neigh_dump(neighbor *);
 void neigh_dump_all(void);
-void neigh_prune(void);
+void neigh_prune(struct proto *);
 void neigh_if_up(struct iface *);
 void neigh_if_down(struct iface *);
 void neigh_if_link(struct iface *);
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 81da24d5..c27db989 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -256,6 +256,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   n = sl_allocz(neigh_slab);
   add_tail(&neigh_hash_table[h], &n->n);
   add_tail((scope >= 0) ? &iface->neighbors : &sticky_neigh_list, &n->if_n);
+  proto_neigh_add_tail(&p->neighbors, n);
   n->addr = a;
   n->ifa = addr;
   n->iface = iface;
@@ -308,7 +309,7 @@ neigh_dump_all(void)
 static inline void
 neigh_notify(neighbor *n)
 {
-  if (n->proto->neigh_notify && (n->proto->proto_state != PS_STOP))
+  if (n->proto && n->proto->neigh_notify && (n->proto->proto_state != PS_STOP))
     n->proto->neigh_notify(n);
 }
 
@@ -343,8 +344,12 @@ neigh_down(neighbor *n)
 static inline void
 neigh_free(neighbor *n)
 {
+  proto_neigh_rem_node(&n->proto->neighbors, n);
+  n->proto = NULL;
+
   rem_node(&n->n);
   rem_node(&n->if_n);
+
   sl_free(n);
 }
 
@@ -519,15 +524,6 @@ neigh_ifa_down(struct ifa *a)
       neigh_update(n, i);
 }
 
-static inline void
-neigh_prune_one(neighbor *n)
-{
-  if (n->proto->proto_state != PS_DOWN)
-    return;
-
-  neigh_free(n);
-}
-
 /**
  * neigh_prune - prune neighbor cache
  *
@@ -536,16 +532,10 @@ neigh_prune_one(neighbor *n)
  * is shut down to get rid of all its heritage.
  */
 void
-neigh_prune(void)
+neigh_prune(struct proto *p)
 {
-  neighbor *n;
-  node *m;
-  int i;
-
-  DBG("Pruning neighbors\n");
-  for(i=0; i<NEIGH_HASH_SIZE; i++)
-    WALK_LIST_DELSAFE(n, m, neigh_hash_table[i])
-      neigh_prune_one(n);
+  while (!EMPTY_TLIST(proto_neigh, &p->neighbors))
+    neigh_free(THEAD(proto_neigh, &p->neighbors));
 }
 
 /**
diff --git a/nest/proto.c b/nest/proto.c
index 0ca72ead..2614943c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1877,7 +1877,7 @@ static void
 proto_do_down(struct proto *p)
 {
   p->down_code = 0;
-  neigh_prune();
+  neigh_prune(p);
   rfree(p->pool);
   p->pool = NULL;
 
diff --git a/nest/protocol.h b/nest/protocol.h
index fef2cb91..9fbe9158 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -9,9 +9,10 @@
 #ifndef _BIRD_PROTOCOL_H_
 #define _BIRD_PROTOCOL_H_
 
-#include "lib/lists.h"
+#include "lib/tlists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
+#include "nest/iface.h"
 #include "nest/route.h"
 #include "conf/conf.h"
 
@@ -169,8 +170,9 @@ struct proto {
   struct channel *main_channel;		/* Primary channel */
   struct rte_src *main_source;		/* Primary route source */
   struct iface *vrf;			/* Related VRF instance, NULL if global */
+  TLIST_LIST(proto_neigh) neighbors;	/* List of neighbor structures */
 
-  const char *name;				/* Name of this instance (== cf->name) */
+  const char *name;			/* Name of this instance (== cf->name) */
   u32 debug;				/* Debugging flags */
   u32 mrtdump;				/* MRTDump flags */
   uint active_channels;			/* Number of active channels */

From c354e8f4c199ca7dec441394156d18badac71b81 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Jan 2023 13:07:46 +0100
Subject: [PATCH 251/431] Interface updates are asynchronous

Instead of propagating interface updates as they are loaded from kernel,
they are enqueued and all the notifications are called from a
protocol-specific event. This change allows to break the locking loop
between protocols and interfaces.

Anyway, this change is based on v2 branch to keep the changes between v2
and v3 smaller.
---
 nest/iface.c          | 203 +++++++++++++++++++++++++++++++++++++-----
 nest/iface.h          |  66 +++++++++++++-
 nest/neighbor.c       |  63 +++++++++----
 nest/proto.c          |  14 ++-
 nest/protocol.h       |   4 +-
 nest/rt-dev.c         |   4 +-
 proto/babel/babel.c   |   2 +-
 proto/bfd/bfd.c       |   2 +-
 proto/bgp/bgp.c       |   2 +-
 proto/ospf/ospf.c     |   4 +-
 proto/perf/perf.c     |   2 +-
 proto/radv/radv.c     |   4 +-
 proto/rip/rip.c       |   4 +-
 proto/static/static.c |   2 +-
 sysdep/unix/krt.c     |   2 +-
 15 files changed, 315 insertions(+), 63 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index fc63dc75..740c1878 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -34,6 +34,9 @@
 #include "conf/conf.h"
 #include "sysdep/unix/krt.h"
 
+
+static TLIST_LIST(ifsub) iface_sub_list;
+static slab *iface_sub_slab;
 static pool *if_pool;
 
 list iface_list;
@@ -140,13 +143,51 @@ if_copy(struct iface *to, struct iface *from)
   to->flags = from->flags | (to->flags & IF_TMP_DOWN);
   to->mtu = from->mtu;
   to->master_index = from->master_index;
-  to->master = from->master;
+
+  if_unlink(to->master);
+  if_link(to->master = from->master);
+}
+
+void
+if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s)
+{
+  switch (x.type) {
+    case IFNOT_ADDRESS:
+      if (!s->ifa_notify) return;
+      ifa_link(x.a);
+      break;
+    case IFNOT_INTERFACE:
+      if (!s->if_notify) return;
+      if_link(x.i);
+      break;
+    case IFNOT_NEIGHBOR:
+      if (!s->neigh_notify) return;
+      neigh_link(x.n);
+      break;
+    default:
+      bug("Unknown interface notification type: %d", x.type);
+  }
+
+  struct iface_notification *in = sl_alloc(iface_sub_slab);
+  *in = x;
+
+  ifnot_add_tail(&s->queue, in);
+  ev_schedule(&s->event);
+}
+
+void
+if_enqueue_notify(struct iface_notification x)
+{
+  WALK_TLIST(ifsub, s, &iface_sub_list)
+    if_enqueue_notify_to(x, s);
 }
 
 static inline void
-ifa_send_notify(struct proto *p, unsigned c, struct ifa *a)
+ifa_send_notify(struct iface_subscription *s, unsigned c, struct ifa *a)
 {
-  if (p->ifa_notify &&
+  struct proto *p = SKIP_BACK(struct proto, iface_sub, s);
+
+  if (s->ifa_notify &&
       (p->proto_state != PS_DOWN) &&
       (!p->vrf || p->vrf == a->iface->master))
     {
@@ -154,19 +195,21 @@ ifa_send_notify(struct proto *p, unsigned c, struct ifa *a)
 	log(L_TRACE "%s < address %N on interface %s %s",
 	    p->name, &a->prefix, a->iface->name,
 	    (c & IF_CHANGE_UP) ? "added" : "removed");
-      p->ifa_notify(p, c, a);
+      s->ifa_notify(p, c, a);
     }
 }
 
 static void
 ifa_notify_change_(unsigned c, struct ifa *a)
 {
-  struct proto *p;
-
   DBG("IFA change notification (%x) for %s:%I\n", c, a->iface->name, a->ip);
 
-  WALK_LIST(p, proto_list)
-    ifa_send_notify(p, c, a);
+  if_enqueue_notify((struct iface_notification) {
+	.type = IFNOT_ADDRESS,
+	.a = a,
+	.flags = c,
+      });
+
 }
 
 static inline void
@@ -182,9 +225,11 @@ ifa_notify_change(unsigned c, struct ifa *a)
 }
 
 static inline void
-if_send_notify(struct proto *p, unsigned c, struct iface *i)
+if_send_notify(struct iface_subscription *s, unsigned c, struct iface *i)
 {
-  if (p->if_notify &&
+  struct proto *p = SKIP_BACK(struct proto, iface_sub, s);
+
+  if (s->if_notify &&
       (p->proto_state != PS_DOWN) &&
       (!p->vrf || p->vrf == i->master))
     {
@@ -197,14 +242,13 @@ if_send_notify(struct proto *p, unsigned c, struct iface *i)
 	    (c & IF_CHANGE_PREFERRED) ? "changes preferred address" :
 	    (c & IF_CHANGE_CREATE) ? "created" :
 	    "sends unknown event");
-      p->if_notify(p, c, i);
+      s->if_notify(p, c, i);
     }
 }
 
 static void
 if_notify_change(unsigned c, struct iface *i)
 {
-  struct proto *p;
   struct ifa *a;
 
   if (i->flags & IF_JUST_CREATED)
@@ -225,8 +269,11 @@ if_notify_change(unsigned c, struct iface *i)
     WALK_LIST(a, i->addrs)
       ifa_notify_change_(IF_CHANGE_DOWN, a);
 
-  WALK_LIST(p, proto_list)
-    if_send_notify(p, c, i);
+  if_enqueue_notify((struct iface_notification) {
+	.type = IFNOT_INTERFACE,
+	.i = i,
+	.flags = c,
+      });
 
   if (c & IF_CHANGE_UP)
     WALK_LIST(a, i->addrs)
@@ -320,6 +367,7 @@ if_update(struct iface *new)
 	    new->llv6 = i->llv6;
 	    new->sysdep = i->sysdep;
 	    memcpy(&new->addrs, &i->addrs, sizeof(i->addrs));
+	    memcpy(&new->neighbors, &i->neighbors, sizeof(i->neighbors));
 	    memcpy(i, new, sizeof(*i));
 	    i->flags &= ~IF_UP;		/* IF_TMP_DOWN will be added later */
 	    goto newif;
@@ -334,9 +382,10 @@ if_update(struct iface *new)
       }
   i = mb_alloc(if_pool, sizeof(struct iface));
   memcpy(i, new, sizeof(*i));
+  if_link(i->master);
   init_list(&i->addrs);
-newif:
   init_list(&i->neighbors);
+newif:
   i->flags |= IF_UPDATED | IF_TMP_DOWN;		/* Tmp down as we don't have addresses yet */
   add_tail(&iface_list, &i->n);
   return i;
@@ -386,31 +435,116 @@ if_end_update(void)
     }
 }
 
+void
+if_link(struct iface *i)
+{
+  if (i)
+    i->uc++;
+}
+
+void
+if_unlink(struct iface *i)
+{
+  if (i)
+    i->uc--;
+  /* TODO: Do some interface object cleanup */
+}
+
+static void
+iface_notify_hook(void *_s)
+{
+  struct iface_subscription *s = _s;
+
+  while (!EMPTY_TLIST(ifnot, &s->queue))
+  {
+    struct iface_notification *n = THEAD(ifnot, &s->queue);
+    switch (n->type) {
+      case IFNOT_ADDRESS:
+	ifa_send_notify(s, n->flags, n->a);
+	ifa_unlink(n->a);
+	break;
+      case IFNOT_INTERFACE:
+	if_send_notify(s, n->flags, n->i);
+	if_unlink(n->i);
+	break;
+      case IFNOT_NEIGHBOR:
+	s->neigh_notify(n->n);
+	neigh_unlink(n->n);
+	break;
+      default:
+	bug("Bad interface notification type: %d", n->type);
+    }
+
+    ifnot_rem_node(&s->queue, n);
+    sl_free(n);
+  }
+}
+
+
 /**
- * if_feed_baby - advertise interfaces to a new protocol
- * @p: protocol to feed
+ * iface_subscribe - request interface updates
+ * @s: subscription structure
  *
  * When a new protocol starts, this function sends it a series
  * of notifications about all existing interfaces.
  */
 void
-if_feed_baby(struct proto *p)
+iface_subscribe(struct iface_subscription *s)
 {
-  struct iface *i;
-  struct ifa *a;
+  ifsub_add_tail(&iface_sub_list, s);
+  s->event = (event) {
+    .hook = iface_notify_hook,
+    .data = s,
+  };
 
-  if (!p->if_notify && !p->ifa_notify)	/* shortcut */
+  if (!s->if_notify && !s->ifa_notify)	/* shortcut */
     return;
+
+  struct iface *i;
   DBG("Announcing interfaces to new protocol %s\n", p->name);
   WALK_LIST(i, iface_list)
     {
-      if_send_notify(p, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), i);
+      if_send_notify(s, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), i);
+
+      struct ifa *a;
       if (i->flags & IF_UP)
 	WALK_LIST(a, i->addrs)
-	  ifa_send_notify(p, IF_CHANGE_CREATE | IF_CHANGE_UP, a);
+	  ifa_send_notify(s, IF_CHANGE_CREATE | IF_CHANGE_UP, a);
     }
 }
 
+/**
+ * iface_unsubscribe - unsubscribe from interface updates
+ * @s: subscription structure
+ */
+void
+iface_unsubscribe(struct iface_subscription *s)
+{
+  ifsub_rem_node(&iface_sub_list, s);
+  ev_postpone(&s->event);
+
+  WALK_TLIST_DELSAFE(ifnot, n, &s->queue)
+  {
+    switch (n->type)
+    {
+      case IFNOT_ADDRESS:
+	ifa_unlink(n->a);
+	break;
+      case IFNOT_INTERFACE:
+	if_unlink(n->i);
+	break;
+      case IFNOT_NEIGHBOR:
+	neigh_unlink(n->n);
+	break;
+      default:
+	bug("Bad interface notification type: %d", n->type);
+    }
+
+    ifnot_rem_node(&s->queue, n);
+    sl_free(n);
+  }
+}
+
 /**
  * if_find_by_index - find interface by ifindex
  * @idx: ifindex
@@ -600,6 +734,8 @@ ifa_update(struct ifa *a)
 
   b = mb_alloc(if_pool, sizeof(struct ifa));
   memcpy(b, a, sizeof(struct ifa));
+  ifa_link(b);
+  if_link(i);
   add_tail(&i->addrs, &b->n);
   b->flags |= IA_UPDATED;
 
@@ -646,11 +782,29 @@ ifa_delete(struct ifa *a)
 	if (i->flags & IF_UP)
 	  ifa_notify_change(IF_CHANGE_DOWN, b);
 
-	mb_free(b);
+	ifa_unlink(b);
 	return;
       }
 }
 
+void ifa_link(struct ifa *a)
+{
+  if (a)
+    a->uc++;
+}
+
+void ifa_unlink(struct ifa *a)
+{
+  if (!a)
+    return;
+
+  if (--a->uc)
+    return;
+
+  if_unlink(a->iface);
+  mb_free(a);
+}
+
 u32
 if_choose_router_id(struct iface_patt *mask, u32 old_id)
 {
@@ -706,6 +860,7 @@ if_init(void)
 {
   if_pool = rp_new(&root_pool, "Interfaces");
   init_list(&iface_list);
+  iface_sub_slab = sl_new(if_pool, sizeof(struct iface_notification));
   strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
 }
diff --git a/nest/iface.h b/nest/iface.h
index fb27f99e..a3f4f30a 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -9,6 +9,7 @@
 #ifndef _BIRD_IFACE_H_
 #define _BIRD_IFACE_H_
 
+#include "lib/event.h"
 #include "lib/lists.h"
 #include "lib/tlists.h"
 #include "lib/ip.h"
@@ -27,6 +28,7 @@ struct ifa {				/* Interface address */
   ip_addr opposite;			/* Opposite end of a point-to-point link */
   unsigned scope;			/* Interface address scope */
   unsigned flags;			/* Analogous to iface->flags */
+  unsigned uc;				/* Use (link) count */
 };
 
 extern struct iface default_vrf;
@@ -45,6 +47,7 @@ struct iface {
   struct ifa *llv6;			/* Primary link-local address for IPv6 */
   ip4_addr sysdep;			/* Arbitrary IPv4 address for internal sysdep use */
   list neighbors;			/* All neighbors on this interface */
+  unsigned uc;				/* Use (link) count */
 };
 
 #define IF_UP 1				/* Currently just IF_ADMIN_UP */
@@ -115,12 +118,15 @@ void ifa_delete(struct ifa *);
 void if_start_update(void);
 void if_end_partial_update(struct iface *);
 void if_end_update(void);
-void if_feed_baby(struct proto *);
 struct iface *if_find_by_index(unsigned);
 struct iface *if_find_by_name(const char *);
 struct iface *if_get_by_name(const char *);
 void if_recalc_all_preferred_addresses(void);
 
+void if_link(struct iface *);
+void if_unlink(struct iface *);
+void ifa_link(struct ifa *);
+void ifa_unlink(struct ifa *);
 
 /* The Neighbor Cache */
 
@@ -138,6 +144,7 @@ typedef struct neighbor {
   u16 flags;				/* NEF_* flags */
   s16 scope;				/* Address scope, -1 for unreachable neighbors,
 					   SCOPE_HOST when it's our own address */
+  uint uc;				/* Use (link) count */
 } neighbor;
 
 #define TLIST_PREFIX proto_neigh
@@ -164,6 +171,63 @@ void neigh_ifa_up(struct ifa *a);
 void neigh_ifa_down(struct ifa *a);
 void neigh_init(struct pool *);
 
+void neigh_link(neighbor *);
+void neigh_unlink(neighbor *);
+
+/*
+ *	Notification mechanism
+ */
+
+#define TLIST_PREFIX ifnot
+#define TLIST_TYPE struct iface_notification
+#define TLIST_ITEM nn
+#define TLIST_WANT_WALK
+#define TLIST_WANT_ADD_TAIL
+
+struct iface_notification {
+  TLIST_DEFAULT_NODE;
+  enum {
+    IFNOT_INVALID,
+    IFNOT_ADDRESS,
+    IFNOT_INTERFACE,
+    IFNOT_NEIGHBOR,
+  } type;
+  unsigned flags;
+  union {
+    struct ifa *a;
+    struct iface *i;
+    neighbor *n;
+  };
+};
+
+#include "lib/tlists.h"
+
+#define TLIST_PREFIX ifsub
+#define TLIST_TYPE struct iface_subscription
+#define TLIST_ITEM n
+#define TLIST_WANT_WALK
+#define TLIST_WANT_ADD_TAIL
+
+struct iface_subscription {
+  TLIST_DEFAULT_NODE;
+
+  event event;
+  TLIST_LIST(ifnot) queue;
+
+  void (*if_notify)(struct proto *, unsigned flags, struct iface *i);
+  void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
+  void (*neigh_notify)(struct neighbor *neigh);
+};
+
+#include "lib/tlists.h"
+
+void if_enqueue_notify(struct iface_notification);
+void if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s);
+
+void iface_flush_notifications(struct iface_subscription *);
+void iface_subscribe(struct iface_subscription *);
+void iface_unsubscribe(struct iface_subscription *);
+
 /*
  *	Interface Pattern Lists
  */
diff --git a/nest/neighbor.c b/nest/neighbor.c
index c27db989..88ac2860 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -258,13 +258,15 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   add_tail((scope >= 0) ? &iface->neighbors : &sticky_neigh_list, &n->if_n);
   proto_neigh_add_tail(&p->neighbors, n);
   n->addr = a;
-  n->ifa = addr;
-  n->iface = iface;
-  n->ifreq = ifreq;
+  ifa_link(n->ifa = addr);
+  if_link(n->iface = iface);
+  if_link(n->ifreq = ifreq);
   n->proto = p;
   n->flags = flags;
   n->scope = scope;
 
+  neigh_link(n);
+
   return n;
 }
 
@@ -309,19 +311,20 @@ neigh_dump_all(void)
 static inline void
 neigh_notify(neighbor *n)
 {
-  if (n->proto && n->proto->neigh_notify && (n->proto->proto_state != PS_STOP))
-    n->proto->neigh_notify(n);
+  if_enqueue_notify_to((struct iface_notification) { .type = IFNOT_NEIGHBOR, .n = n, }, &n->proto->iface_sub);
 }
 
 static void
 neigh_up(neighbor *n, struct iface *i, struct ifa *a, int scope)
 {
   DBG("Waking up sticky neighbor %I\n", n->addr);
-  n->iface = i;
-  n->ifa = a;
+  if_link(n->iface = i);
+  ifa_link(n->ifa = a);
+
   n->scope = scope;
 
-  rem_node(&n->if_n);
+  rem_node(&n->if_n); /* HACK: Here the neighbor is always in the sticky list,
+			 regardless whether it is sticky or not */
   add_tail(&i->neighbors, &n->if_n);
 
   neigh_notify(n);
@@ -331,25 +334,48 @@ static void
 neigh_down(neighbor *n)
 {
   DBG("Flushing neighbor %I on %s\n", n->addr, n->iface->name);
-  n->iface = NULL;
-  n->ifa = NULL;
+
   n->scope = -1;
 
   rem_node(&n->if_n);
   add_tail(&sticky_neigh_list, &n->if_n);
 
+  ifa_unlink(n->ifa);
+  n->ifa = NULL;
+
+  if_unlink(n->iface);
+  n->iface = NULL;
+
   neigh_notify(n);
 }
 
-static inline void
-neigh_free(neighbor *n)
+void
+neigh_link(neighbor *n)
 {
-  proto_neigh_rem_node(&n->proto->neighbors, n);
+  n->uc++;
+}
+
+void
+neigh_unlink(neighbor *n)
+{
+  if (--n->uc)
+    return;
+
+  struct proto *p = n->proto;
+  proto_neigh_rem_node(&p->neighbors, n);
+
+  if ((p->proto_state == PS_DOWN) && EMPTY_TLIST(proto_neigh, &p->neighbors))
+    ev_schedule(p->event);
+
   n->proto = NULL;
 
   rem_node(&n->n);
   rem_node(&n->if_n);
 
+  ifa_unlink(n->ifa);
+  if_unlink(n->iface);
+  if_unlink(n->ifreq);
+
   sl_free(n);
 }
 
@@ -399,7 +425,8 @@ neigh_update(neighbor *n, struct iface *iface)
   {
     if (ifa != n->ifa)
     {
-      n->ifa = ifa;
+      ifa_unlink(n->ifa);
+      ifa_link(n->ifa = ifa);
       neigh_notify(n);
     }
 
@@ -413,7 +440,7 @@ neigh_update(neighbor *n, struct iface *iface)
 
   if ((n->scope < 0) && !(n->flags & NEF_STICKY))
   {
-    neigh_free(n);
+    neigh_unlink(n);
     return;
   }
 
@@ -534,8 +561,10 @@ neigh_ifa_down(struct ifa *a)
 void
 neigh_prune(struct proto *p)
 {
-  while (!EMPTY_TLIST(proto_neigh, &p->neighbors))
-    neigh_free(THEAD(proto_neigh, &p->neighbors));
+  WALK_TLIST_DELSAFE(proto_neigh, n, &p->neighbors)
+    neigh_unlink(n);
+
+  ASSERT_DIE(EMPTY_TLIST(proto_neigh, &p->neighbors));
 }
 
 /**
diff --git a/nest/proto.c b/nest/proto.c
index 2614943c..39e8b999 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -57,7 +57,11 @@ static inline void channel_reset_limit(struct channel_limit *l);
 
 
 static inline int proto_is_done(struct proto *p)
-{ return (p->proto_state == PS_DOWN) && (p->active_channels == 0); }
+{
+  return (p->proto_state == PS_DOWN)
+    && (p->active_channels == 0)
+    && EMPTY_TLIST(proto_neigh, &p->neighbors);
+}
 
 static inline int channel_is_active(struct channel *c)
 { return (c->channel_state == CS_START) || (c->channel_state == CS_UP); }
@@ -962,14 +966,18 @@ proto_event(void *ptr)
 
   if (p->do_start)
   {
-    if_feed_baby(p);
+    iface_subscribe(&p->iface_sub);
     p->do_start = 0;
   }
 
   if (p->do_stop)
   {
+    iface_unsubscribe(&p->iface_sub);
+    neigh_prune(p);
+
     p->do_stop = 0;
   }
+
   if (proto_is_done(p))
   {
     if (p->proto->cleanup)
@@ -1860,7 +1868,6 @@ proto_do_stop(struct proto *p)
   p->down_sched = 0;
   p->gr_recovery = 0;
 
-
   if (p->main_source)
   {
     rt_unlock_source(p->main_source);
@@ -1877,7 +1884,6 @@ static void
 proto_do_down(struct proto *p)
 {
   p->down_code = 0;
-  neigh_prune(p);
   rfree(p->pool);
   p->pool = NULL;
 
diff --git a/nest/protocol.h b/nest/protocol.h
index 9fbe9158..6d5714a7 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -171,6 +171,7 @@ struct proto {
   struct rte_src *main_source;		/* Primary route source */
   struct iface *vrf;			/* Related VRF instance, NULL if global */
   TLIST_LIST(proto_neigh) neighbors;	/* List of neighbor structures */
+  struct iface_subscription iface_sub;	/* Interface notification subscription */
 
   const char *name;			/* Name of this instance (== cf->name) */
   u32 debug;				/* Debugging flags */
@@ -210,10 +211,7 @@ struct proto {
    *	   feed_end	Notify channel about finish of route feeding.
    */
 
-  void (*if_notify)(struct proto *, unsigned flags, struct iface *i);
-  void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
   void (*rt_notify)(struct proto *, struct channel *, struct network *net, struct rte *new, struct rte *old);
-  void (*neigh_notify)(struct neighbor *neigh);
   int (*preexport)(struct channel *, struct rte *rt);
   void (*reload_routes)(struct channel *);
   void (*feed_begin)(struct channel *, int initial);
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 7932b8b7..42b6b499 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -141,8 +141,8 @@ dev_init(struct proto_config *CF)
   proto_configure_channel(P, &p->ip4_channel, cf->ip4_channel);
   proto_configure_channel(P, &p->ip6_channel, cf->ip6_channel);
 
-  P->if_notify = dev_if_notify;
-  P->ifa_notify = dev_ifa_notify;
+  P->iface_sub.if_notify = dev_if_notify;
+  P->iface_sub.ifa_notify = dev_ifa_notify;
 
   return P;
 }
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index e1b31e86..15135922 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2424,7 +2424,7 @@ babel_init(struct proto_config *CF)
   proto_configure_channel(P, &p->ip4_channel, cf->ip4_channel);
   proto_configure_channel(P, &p->ip6_channel, cf->ip6_channel);
 
-  P->if_notify = babel_if_notify;
+  P->iface_sub.if_notify = babel_if_notify;
   P->rt_notify = babel_rt_notify;
   P->preexport = babel_preexport;
   P->rte_better = babel_rte_better;
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 69e42f3d..b2655952 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -1012,7 +1012,7 @@ bfd_init(struct proto_config *c)
 {
   struct proto *p = proto_new(c);
 
-  p->neigh_notify = bfd_neigh_notify;
+  p->iface_sub.neigh_notify = bfd_neigh_notify;
 
   return p;
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 5b0569ae..3531ce51 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1686,7 +1686,7 @@ bgp_init(struct proto_config *CF)
 
   P->rt_notify = bgp_rt_notify;
   P->preexport = bgp_preexport;
-  P->neigh_notify = bgp_neigh_notify;
+  P->iface_sub.neigh_notify = bgp_neigh_notify;
   P->reload_routes = bgp_reload_routes;
   P->feed_begin = bgp_feed_begin;
   P->feed_end = bgp_feed_end;
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index ad4b2d14..77a14b7a 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -370,8 +370,8 @@ ospf_init(struct proto_config *CF)
   P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF));
 
   P->rt_notify = ospf_rt_notify;
-  P->if_notify = ospf_if_notify;
-  P->ifa_notify = cf->ospf2 ? ospf_ifa_notify2 : ospf_ifa_notify3;
+  P->iface_sub.if_notify = ospf_if_notify;
+  P->iface_sub.ifa_notify = cf->ospf2 ? ospf_ifa_notify2 : ospf_ifa_notify3;
   P->preexport = ospf_preexport;
   P->reload_routes = ospf_reload_routes;
   P->feed_begin = ospf_feed_begin;
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 75e405f0..8941d582 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -266,7 +266,7 @@ perf_init(struct proto_config *CF)
 
   switch (p->mode) {
     case PERF_MODE_IMPORT:
-      P->ifa_notify = perf_ifa_notify;
+      P->iface_sub.ifa_notify = perf_ifa_notify;
       break;
     case PERF_MODE_EXPORT:
       P->rt_notify = perf_rt_notify;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index ee1da36c..8a7440e6 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -579,8 +579,8 @@ radv_init(struct proto_config *CF)
 
   P->preexport = radv_preexport;
   P->rt_notify = radv_rt_notify;
-  P->if_notify = radv_if_notify;
-  P->ifa_notify = radv_ifa_notify;
+  P->iface_sub.if_notify = radv_if_notify;
+  P->iface_sub.ifa_notify = radv_ifa_notify;
 
   return P;
 }
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 93b0d528..abbd83f2 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -1135,9 +1135,9 @@ rip_init(struct proto_config *CF)
 
   P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF));
 
-  P->if_notify = rip_if_notify;
+  P->iface_sub.if_notify = rip_if_notify;
   P->rt_notify = rip_rt_notify;
-  P->neigh_notify = rip_neigh_notify;
+  P->iface_sub.neigh_notify = rip_neigh_notify;
   P->reload_routes = rip_reload_routes;
   P->rte_better = rip_rte_better;
   P->rte_igp_metric = rip_rte_igp_metric;
diff --git a/proto/static/static.c b/proto/static/static.c
index bb93305e..ba0984b5 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -463,7 +463,7 @@ static_init(struct proto_config *CF)
 
   P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF));
 
-  P->neigh_notify = static_neigh_notify;
+  P->iface_sub.neigh_notify = static_neigh_notify;
   P->reload_routes = static_reload_routes;
   P->rte_better = static_rte_better;
   P->rte_mergable = static_rte_mergable;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 7ec30eb0..52822c3d 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -1046,7 +1046,7 @@ krt_init(struct proto_config *CF)
 
   p->p.preexport = krt_preexport;
   p->p.rt_notify = krt_rt_notify;
-  p->p.if_notify = krt_if_notify;
+  p->p.iface_sub.if_notify = krt_if_notify;
   p->p.reload_routes = krt_reload_routes;
   p->p.feed_end = krt_feed_end;
 

From 226839c97731394b98cc8c7421a152964061c1aa Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 2 Feb 2023 13:26:49 +0100
Subject: [PATCH 252/431] Lists: fixed bugs in expensive checks in quirky
 usecases

---
 lib/lists.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/lists.c b/lib/lists.c
index 200576cf..2f32a5e1 100644
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -37,9 +37,10 @@ check_list(list *l, node *n)
     ASSERT_DIE(n);
     ASSERT_DIE(n->prev);
 
-    do { n = n->prev; } while (n->prev);
+    node *nn = n;
+    do { nn = nn->prev; } while (nn->prev);
 
-    l = SKIP_BACK(list, head_node, n);
+    l = SKIP_BACK(list, head_node, nn);
   }
 
   int seen = 0;
@@ -120,7 +121,7 @@ add_head(list *l, node *n)
 LIST_INLINE void
 insert_node(node *n, node *after)
 {
-  EXPENSIVE_CHECK(check_list(l, after));
+  EXPENSIVE_CHECK((after->prev == NULL) || check_list(NULL, after));
   ASSUME(n->prev == NULL);
   ASSUME(n->next == NULL);
 
@@ -141,7 +142,7 @@ insert_node(node *n, node *after)
 LIST_INLINE void
 rem_node(node *n)
 {
-  EXPENSIVE_CHECK(check_list(NULL, n));
+  EXPENSIVE_CHECK((n->prev == n) && (n->next == n) || check_list(NULL, n));
 
   node *z = n->prev;
   node *x = n->next;

From 597a4b33a700773032038051abc4f9f5e92942bd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 2 Feb 2023 13:27:10 +0100
Subject: [PATCH 253/431] Macro: stringify

---
 lib/macro.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/macro.h b/lib/macro.h
index 24fc3393..8f5d4b0e 100644
--- a/lib/macro.h
+++ b/lib/macro.h
@@ -26,6 +26,8 @@
 #define MACRO_DROP(...)
 #define MACRO_UNPAREN(...) __VA_ARGS__
 #define MACRO_SEP(a, b, sep)  a sep b
+#define MACRO_STR(a)  #a
+#define MACRO_STR_AFTER(a) MACRO_STR(a)
 
 /* Aliases for some special chars */
 #define MACRO_COMMA ,

From 0bb04d5390f21b0c96fc4894ba5d5510c541f0ef Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 5 Feb 2023 19:54:06 +0100
Subject: [PATCH 254/431] BGP: opening and closing listening socket
 asynchronously

---
 proto/bgp/bgp.c | 233 ++++++++++++++++++++++++++++--------------------
 proto/bgp/bgp.h |  14 ++-
 2 files changed, 147 insertions(+), 100 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 3531ce51..9c5d483a 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -127,7 +127,11 @@
 #include "bgp.h"
 
 
+static void bgp_listen_create(void *);
+
 static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets */
+static list STATIC_LIST_INIT(bgp_listen_pending);	/* Global list of listening socket open requests */
+static event bgp_listen_event = { .hook = bgp_listen_create };
 
 
 static void bgp_connect(struct bgp_proto *p);
@@ -139,73 +143,33 @@ static void bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd);
 
 static int bgp_incoming_connection(sock *sk, uint dummy UNUSED);
 static void bgp_listen_sock_err(sock *sk UNUSED, int err);
+static void bgp_initiate_disable(struct bgp_proto *p, int err_val);
 
-/**
- * bgp_open - open a BGP instance
- * @p: BGP instance
- *
- * This function allocates and configures shared BGP resources, mainly listening
- * sockets. Should be called as the last step during initialization (when lock
- * is acquired and neighbor is ready). When error, caller should change state to
- * PS_DOWN and return immediately.
- */
-static int
-bgp_open(struct bgp_proto *p)
+static inline int
+bgp_setup_auth(struct bgp_proto *p, int enable)
 {
-  struct bgp_socket *bs = NULL;
-  struct iface *ifa = p->cf->strict_bind ? p->cf->iface : NULL;
-  ip_addr addr = p->cf->strict_bind ? p->cf->local_ip :
-    (p->ipv4 ? IPA_NONE4 : IPA_NONE6);
-  uint port = p->cf->local_port;
-  uint flags = p->cf->free_bind ? SKF_FREEBIND : 0;
-  uint flag_mask = SKF_FREEBIND;
+  if (p->cf->password && p->listen.sock)
+  {
+    ip_addr prefix = p->cf->remote_ip;
+    int pxlen = -1;
 
-  /* We assume that cf->iface is defined iff cf->local_ip is link-local */
-
-  WALK_LIST(bs, bgp_sockets)
-    if (ipa_equal(bs->sk->saddr, addr) &&
-	(bs->sk->sport == port) &&
-	(bs->sk->iface == ifa) &&
-	(bs->sk->vrf == p->p.vrf) &&
-	((bs->sk->flags & flag_mask) == flags))
+    if (p->cf->remote_range)
     {
-      bs->uc++;
-      p->sock = bs;
-      return 0;
+      prefix = net_prefix(p->cf->remote_range);
+      pxlen = net_pxlen(p->cf->remote_range);
     }
 
-  sock *sk = sk_new(proto_pool);
-  sk->type = SK_TCP_PASSIVE;
-  sk->ttl = 255;
-  sk->saddr = addr;
-  sk->sport = port;
-  sk->iface = ifa;
-  sk->vrf = p->p.vrf;
-  sk->flags = flags;
-  sk->tos = IP_PREC_INTERNET_CONTROL;
-  sk->rbsize = BGP_RX_BUFFER_SIZE;
-  sk->tbsize = BGP_TX_BUFFER_SIZE;
-  sk->rx_hook = bgp_incoming_connection;
-  sk->err_hook = bgp_listen_sock_err;
+    int rv = sk_set_md5_auth(p->listen.sock->sk,
+			     p->cf->local_ip, prefix, pxlen, p->cf->iface,
+			     enable ? p->cf->password : NULL, p->cf->setkey);
 
-  if (sk_open(sk) < 0)
-    goto err;
+    if (rv < 0)
+      sk_log_error(p->listen.sock->sk, p->p.name);
 
-  bs = mb_allocz(proto_pool, sizeof(struct bgp_socket));
-  bs->sk = sk;
-  bs->uc = 1;
-  p->sock = bs;
-  sk->data = bs;
-
-  add_tail(&bgp_sockets, &bs->n);
-
-  return 0;
-
-err:
-  sk_log_error(sk, p->p.name);
-  log(L_ERR "%s: Cannot open listening socket", p->p.name);
-  rfree(sk);
-  return -1;
+    return rv;
+  }
+  else
+    return 0;
 }
 
 /**
@@ -217,43 +181,119 @@ err:
 static void
 bgp_close(struct bgp_proto *p)
 {
-  struct bgp_socket *bs = p->sock;
+  struct bgp_listen_request *req = &p->listen;
+  struct bgp_socket *bs = req->sock;
 
-  ASSERT(bs && bs->uc);
+  ASSERT(bs);
 
-  if (--bs->uc)
-    return;
+  req->sock = NULL;
+  rem_node(&req->n);
 
-  rfree(bs->sk);
-  rem_node(&bs->n);
-  mb_free(bs);
+  if (EMPTY_LIST(bs->requests))
+    ev_schedule(&bgp_listen_event);
 }
 
-static inline int
-bgp_setup_auth(struct bgp_proto *p, int enable)
+/**
+ * bgp_open - open a BGP instance
+ * @p: BGP instance
+ *
+ * This function allocates and configures shared BGP resources, mainly listening
+ * sockets. Should be called as the last step during initialization (when lock
+ * is acquired and neighbor is ready). When error, caller should change state to
+ * PS_DOWN and return immediately.
+ */
+static void
+bgp_open(struct bgp_proto *p)
 {
-  if (p->cf->password)
-  {
-    ip_addr prefix = p->cf->remote_ip;
-    int pxlen = -1;
+  struct bgp_listen_request *req = &p->listen;
+  /* We assume that cf->iface is defined iff cf->local_ip is link-local */
+  req->iface = p->cf->strict_bind ? p->cf->iface : NULL;
+  req->vrf = p->p.vrf;
+  req->addr = p->cf->strict_bind ? p->cf->local_ip :
+    (p->ipv4 ? IPA_NONE4 : IPA_NONE6);
+  req->port = p->cf->local_port;
+  req->flags = p->cf->free_bind ? SKF_FREEBIND : 0;
 
-    if (p->cf->remote_range)
+  add_tail(&bgp_listen_pending, &req->n);
+  ev_schedule(&bgp_listen_event);
+}
+
+static void
+bgp_listen_create(void *_ UNUSED)
+{
+  uint flag_mask = SKF_FREEBIND;
+
+  struct bgp_listen_request *req;
+  WALK_LIST_FIRST(req, bgp_listen_pending)
+  {
+    struct bgp_proto *p = SKIP_BACK(struct bgp_proto, listen, req);
+    rem_node(&req->n);
+
+    /* First try to find existing socket */
+    struct bgp_socket *bs;
+    WALK_LIST(bs, bgp_sockets)
+      if (ipa_equal(bs->sk->saddr, req->addr) &&
+	  (bs->sk->sport == req->port) &&
+	  (bs->sk->iface == req->iface) &&
+	  (bs->sk->vrf == req->vrf) &&
+	  ((bs->sk->flags & flag_mask) == req->flags))
+	break;
+
+    /* Not found any */
+    if (!NODE_VALID(bs))
     {
-      prefix = net_prefix(p->cf->remote_range);
-      pxlen = net_pxlen(p->cf->remote_range);
+      sock *sk = sk_new(proto_pool);
+      sk->type = SK_TCP_PASSIVE;
+      sk->ttl = 255;
+      sk->saddr = req->addr;
+      sk->sport = req->port;
+      sk->iface = req->iface;
+      sk->vrf = req->vrf;
+      sk->flags = req->flags;
+      sk->tos = IP_PREC_INTERNET_CONTROL;
+      sk->rbsize = BGP_RX_BUFFER_SIZE;
+      sk->tbsize = BGP_TX_BUFFER_SIZE;
+      sk->rx_hook = bgp_incoming_connection;
+      sk->err_hook = bgp_listen_sock_err;
+
+      if (sk_open(sk) < 0)
+      {
+	sk_log_error(sk, p->p.name);
+	log(L_ERR "%s: Cannot open listening socket", p->p.name);
+	rfree(sk);
+	bgp_initiate_disable(p, BEM_NO_SOCKET);
+
+	continue;
+      }
+
+      bs = mb_allocz(proto_pool, sizeof(struct bgp_socket));
+      bs->sk = sk;
+      sk->data = bs;
+
+      init_list(&bs->requests);
+      add_tail(&bgp_sockets, &bs->n);
     }
 
-    int rv = sk_set_md5_auth(p->sock->sk,
-			     p->cf->local_ip, prefix, pxlen, p->cf->iface,
-			     enable ? p->cf->password : NULL, p->cf->setkey);
+    add_tail(&bs->requests, &req->n);
+    req->sock = bs;
 
-    if (rv < 0)
-      sk_log_error(p->sock->sk, p->p.name);
-
-    return rv;
+    if (bgp_setup_auth(p, 1) < 0)
+    {
+      bgp_close(p);
+      bgp_initiate_disable(p, BEM_INVALID_MD5);
+    }
   }
-  else
-    return 0;
+
+  /* Cleanup leftover listening sockets */
+  struct bgp_socket *bs;
+  node *nxt;
+  WALK_LIST_DELSAFE(bs, nxt, bgp_sockets)
+    if (EMPTY_LIST(bs->requests))
+    {
+      rfree(bs->sk);
+      rem_node(&bs->n);
+      mb_free(bs);
+    }
 }
 
 static inline struct bgp_channel *
@@ -296,13 +336,7 @@ bgp_startup_timeout(timer *t)
 static void
 bgp_initiate(struct bgp_proto *p)
 {
-  int err_val;
-
-  if (bgp_open(p) < 0)
-  { err_val = BEM_NO_SOCKET; goto err1; }
-
-  if (bgp_setup_auth(p, 1) < 0)
-  { err_val = BEM_INVALID_MD5; goto err2; }
+  bgp_open(p);
 
   if (p->cf->bfd)
     bgp_update_bfd(p, p->cf->bfd);
@@ -315,12 +349,11 @@ bgp_initiate(struct bgp_proto *p)
   }
   else
     bgp_startup(p);
+}
 
-  return;
-
-err2:
-  bgp_close(p);
-err1:
+static void
+bgp_initiate_disable(struct bgp_proto *p, int err_val)
+{
   p->p.disabled = 1;
   bgp_store_error(p, NULL, BE_MISC, err_val);
 
@@ -1146,12 +1179,15 @@ static struct bgp_proto *
 bgp_find_proto(sock *sk)
 {
   struct bgp_proto *best = NULL;
-  struct bgp_proto *p;
+  struct bgp_socket *bs = sk->data;
+  struct bgp_listen_request *req;
 
   /* sk->iface is valid only if src or dst address is link-local */
   int link = ipa_is_link_local(sk->saddr) || ipa_is_link_local(sk->daddr);
 
-  WALK_LIST(p, proto_list)
+  WALK_LIST(req, bs->requests)
+  {
+    struct bgp_proto *p = SKIP_BACK(struct bgp_proto, listen, req);
     if ((p->p.proto == &proto_bgp) &&
 	(ipa_equal(p->remote_ip, sk->daddr) || bgp_is_dynamic(p)) &&
 	(!p->cf->remote_range || ipa_in_netX(sk->daddr, p->cf->remote_range)) &&
@@ -1165,6 +1201,7 @@ bgp_find_proto(sock *sk)
       if (!bgp_is_dynamic(p))
 	break;
     }
+  }
 
   return best;
 }
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 2808d479..5f1a35ce 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -266,8 +266,8 @@ struct bgp_caps {
 
 struct bgp_socket {
   node n;				/* Node in global bgp_sockets */
+  list requests;			/* Listen requests */
   sock *sk;				/* Real listening socket */
-  u32 uc;				/* Use count */
 };
 
 struct bgp_stats {
@@ -302,6 +302,16 @@ struct bgp_conn {
   uint hold_time, keepalive_time;	/* Times calculated from my and neighbor's requirements */
 };
 
+struct bgp_listen_request {
+  node n;				/* Node in bgp_socket / pending list */
+  struct bgp_socket *sock;		/* Assigned socket */
+  ip_addr addr;
+  struct iface *iface;
+  struct iface *vrf;
+  uint port;
+  uint flags;
+};
+
 struct bgp_proto {
   struct proto p;
   const struct bgp_config *cf;		/* Shortcut to BGP configuration */
@@ -333,7 +343,7 @@ struct bgp_proto {
   struct bgp_conn incoming_conn;	/* Incoming connection we have neither accepted nor rejected yet */
   struct object_lock *lock;		/* Lock for neighbor connection */
   struct neighbor *neigh;		/* Neighbor entry corresponding to remote ip, NULL if multihop */
-  struct bgp_socket *sock;		/* Shared listening socket */
+  struct bgp_listen_request listen;	/* Shared listening socket */
   struct bfd_request *bfd_req;		/* BFD request, if BFD is used */
   struct birdsock *postponed_sk;	/* Postponed incoming socket for dynamic BGP */
   struct bgp_stats stats;		/* BGP statistics */

From 9508cd85ce21a476ba47417999d2157594c73c85 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 6 Feb 2023 15:06:12 +0100
Subject: [PATCH 255/431] Protocol shutdown/restart from limits is respecting
 the loops

---
 lib/timer.h     |  6 +++--
 nest/proto.c    | 64 ++++++++++++++++++++++++++++++++++---------------
 nest/protocol.h |  2 ++
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/lib/timer.h b/lib/timer.h
index 555fc96f..4a3a2108 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -99,12 +99,14 @@ tm_set_max(timer *t, btime when)
 }
 
 static inline void
-tm_start_max(timer *t, btime after)
+tm_start_max_in(timer *t, btime after, struct birdloop *loop)
 {
   btime rem = tm_remains(t);
-  tm_start(t, MAX_(rem, after));
+  tm_start_in(t, MAX_(rem, after), loop);
 }
 
+#define tm_start_max(t, after)	tm_start_max_in(t, after, &main_birdloop)
+
 /* In sysdep code */
 void times_update(void);
 
diff --git a/nest/proto.c b/nest/proto.c
index 6e4b7d29..94ca188d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -30,7 +30,6 @@ static list STATIC_LIST_INIT(protocol_list);
 #define CD(c, msg, args...) ({ if (c->debug & D_STATES) log(L_TRACE "%s.%s: " msg, c->proto->name, c->name ?: "?", ## args); })
 #define PD(p, msg, args...) ({ if (p->debug & D_STATES) log(L_TRACE "%s: " msg, p->name, ## args); })
 
-static timer *proto_shutdown_timer;
 static timer *gr_wait_timer;
 
 #define GRS_NONE	0
@@ -47,7 +46,6 @@ static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
 extern struct protocol proto_unix_iface;
 
 static void channel_request_reload(struct channel *c);
-static void proto_shutdown_loop(timer *);
 static void proto_rethink_goal(struct proto *p);
 static char *proto_state_name(struct proto *p);
 static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
@@ -1866,8 +1864,6 @@ protos_build(void)
   protos_build_gen();
 
   proto_pool = rp_new(&root_pool, "Protocols");
-  proto_shutdown_timer = tm_new(proto_pool);
-  proto_shutdown_timer->hook = proto_shutdown_loop;
 }
 
 
@@ -1875,23 +1871,39 @@ protos_build(void)
 int proto_restart;
 
 static void
-proto_shutdown_loop(timer *t UNUSED)
+proto_restart_event_hook(void *_p)
 {
-  struct proto *p, *p_next;
+  struct proto *p = _p;
+  if (!p->down_sched)
+    return;
 
-  WALK_LIST_DELSAFE(p, p_next, proto_list)
-    if (p->down_sched)
-    {
-      proto_restart = (p->down_sched == PDS_RESTART);
+  proto_restart = (p->down_sched == PDS_RESTART);
+  p->disabled = 1;
+  proto_rethink_goal(p);
 
-      p->disabled = 1;
-      proto_rethink_goal(p);
-      if (proto_restart)
-      {
-	p->disabled = 0;
-	proto_rethink_goal(p);
-      }
-    }
+  p->restart_event = NULL;
+  p->restart_timer = NULL;
+
+  if (proto_restart)
+    /* No need to call proto_rethink_goal() here again as the proto_cleanup() routine will
+     * call it after the protocol stops ... and both these routines are fixed to main_birdloop.
+     */
+    p->disabled = 0;
+}
+
+static void
+proto_send_restart_event(struct proto *p)
+{
+  if (!p->restart_event)
+    p->restart_event = ev_new_init(p->pool, proto_restart_event_hook, p);
+
+  ev_send(&global_event_list, p->restart_event);
+}
+
+static void
+proto_send_restart_event_from_timer(struct timer *t)
+{
+  proto_send_restart_event((struct proto *) t->data);
 }
 
 static inline void
@@ -1906,7 +1918,21 @@ proto_schedule_down(struct proto *p, byte restart, byte code)
 
   p->down_sched = restart ? PDS_RESTART : PDS_DISABLE;
   p->down_code = code;
-  tm_start_max(proto_shutdown_timer, restart ? 250 MS : 0);
+
+  if (!restart)
+  {
+    if (p->restart_timer && tm_active(p->restart_timer))
+      tm_stop(p->restart_timer);
+
+    proto_send_restart_event(p);
+  }
+  else
+  {
+    if (!p->restart_timer)
+      p->restart_timer = tm_new_init(p->pool, proto_send_restart_event_from_timer, p, 0, 0);
+
+    tm_start_max_in(p->restart_timer, 250 MS, p->loop);
+  }
 }
 
 /**
diff --git a/nest/protocol.h b/nest/protocol.h
index fdd0373a..dfbfff46 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -123,6 +123,8 @@ struct proto {
   struct proto_config *cf_new;		/* Configuration we want to switch to after shutdown (NULL=delete) */
   pool *pool;				/* Pool containing local objects */
   event *event;				/* Protocol event */
+  timer *restart_timer;			/* Timer to restart the protocol from limits */
+  event *restart_event;			/* Event to restart/shutdown the protocol from limits */
   struct birdloop *loop;		/* BIRDloop running this protocol */
 
   list channels;			/* List of channels to rtables (struct channel) */

From a26d307eabc9d670c8a39ade3b540cabde5851a3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 2 Apr 2023 19:34:22 +0200
Subject: [PATCH 256/431] Proto: published protocol-loop connections

---
 nest/proto.c    | 29 ++++-------------------------
 nest/protocol.h | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 94ca188d..877c8ab2 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -58,27 +58,6 @@ static void channel_check_stopped(struct channel *c);
 static inline int proto_is_done(struct proto *p)
 { return (p->proto_state == PS_DOWN) && proto_is_inactive(p); }
 
-static inline event_list *proto_event_list(struct proto *p)
-{ return p->loop == &main_birdloop ? &global_event_list : birdloop_event_list(p->loop); }
-
-static inline event_list *proto_work_list(struct proto *p)
-{ return p->loop == &main_birdloop ? &global_work_list : birdloop_event_list(p->loop); }
-
-static inline void proto_send_event(struct proto *p)
-{ ev_send(proto_event_list(p), p->event); }
-
-#define PROTO_ENTER_FROM_MAIN(p)    ({ \
-    ASSERT_DIE(birdloop_inside(&main_birdloop)); \
-    struct birdloop *_loop = (p)->loop; \
-    if (_loop != &main_birdloop) birdloop_enter(_loop); \
-    _loop; \
-    })
-
-#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
-
-#define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
-
-
 static inline int channel_is_active(struct channel *c)
 { return (c->channel_state != CS_DOWN); }
 
@@ -576,7 +555,7 @@ channel_check_stopped(struct channel *c)
 	return;
 
       channel_set_state(c, CS_DOWN);
-      proto_send_event(c->proto);
+      proto_send_event(c->proto, c->proto->event);
 
       break;
     case CS_PAUSE:
@@ -794,7 +773,7 @@ channel_do_down(struct channel *c)
 
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
-    proto_send_event(c->proto);
+    proto_send_event(c->proto, c->proto->event);
 }
 
 void
@@ -2119,7 +2098,7 @@ proto_do_stop(struct proto *p)
   rt_destroy_sources(&p->sources, p->event);
 
   p->do_stop = 1;
-  proto_send_event(p);
+  proto_send_event(p, p->event);
 }
 
 static void
@@ -2129,7 +2108,7 @@ proto_do_down(struct proto *p)
 
   /* Shutdown is finished in the protocol event */
   if (proto_is_done(p))
-    proto_send_event(p);
+    proto_send_event(p, p->event);
 }
 
 
diff --git a/nest/protocol.h b/nest/protocol.h
index dfbfff46..f9f89c06 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -232,6 +232,15 @@ void channel_graceful_restart_unlock(struct channel *c);
 
 #define DEFAULT_GR_WAIT	240
 
+static inline event_list *proto_event_list(struct proto *p)
+{ return p->loop == &main_birdloop ? &global_event_list : birdloop_event_list(p->loop); }
+
+static inline event_list *proto_work_list(struct proto *p)
+{ return p->loop == &main_birdloop ? &global_work_list : birdloop_event_list(p->loop); }
+
+static inline void proto_send_event(struct proto *p, event *e)
+{ ev_send(proto_event_list(p), e); }
+
 void channel_show_limit(struct limit *l, const char *dsc, int active, int action);
 void channel_show_info(struct channel *c);
 void channel_cmd_debug(struct channel *c, uint mask);
@@ -250,6 +259,17 @@ struct proto *proto_iterate_named(struct symbol *sym, struct protocol *proto, st
 
 #define PROTO_WALK_CMD(sym,pr,p) for(struct proto *p = NULL; p = proto_iterate_named(sym, pr, p); )
 
+#define PROTO_ENTER_FROM_MAIN(p)    ({ \
+    ASSERT_DIE(birdloop_inside(&main_birdloop)); \
+    struct birdloop *_loop = (p)->loop; \
+    if (_loop != &main_birdloop) birdloop_enter(_loop); \
+    _loop; \
+    })
+
+#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
+
+#define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
+
 
 #define CMD_RELOAD	0
 #define CMD_RELOAD_IN	1

From b8a230e478d41def757344bbe1eee7fa886682e5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 4 Apr 2023 16:41:55 +0200
Subject: [PATCH 257/431] Interface subsystem locking

---
 nest/iface.c           | 295 ++++++++++++++++++++++++++++++-----------
 nest/iface.h           |  17 +--
 nest/neighbor.c        |  73 ++++++----
 nest/proto.c           |   3 +-
 proto/babel/babel.c    |   4 +-
 proto/ospf/iface.c     |   6 +-
 proto/radv/radv.c      |   3 +-
 proto/rip/rip.c        |   4 +-
 sysdep/bsd/krt-sock.c  |   5 +-
 sysdep/linux/netlink.c |   7 +-
 10 files changed, 291 insertions(+), 126 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index c49ad95e..f1938664 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -31,19 +31,51 @@
 #include "nest/cli.h"
 #include "lib/resource.h"
 #include "lib/string.h"
+#include "lib/locking.h"
 #include "conf/conf.h"
 #include "sysdep/unix/krt.h"
 
+DOMAIN(attrs) iface_domain;
+
+#define IFACE_LOCK	LOCK_DOMAIN(attrs, iface_domain)
+#define IFACE_UNLOCK	UNLOCK_DOMAIN(attrs, iface_domain)
+#define IFACE_ASSERT_LOCKED	ASSERT_DIE(DOMAIN_IS_LOCKED(attrs, iface_domain))
 
 static TLIST_LIST(ifsub) iface_sub_list;
 static slab *iface_sub_slab;
 static pool *if_pool;
 
-list iface_list;
+list global_iface_list;
 struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
 
+static void ifa_dump_locked(struct ifa *);
+static void if_dump_locked(struct iface *);
+
+struct iface *
+if_walk_first(void)
+{
+  IFACE_LOCK;
+  struct iface *i = HEAD(global_iface_list);
+  return NODE_VALID(i) ? i : NULL;
+}
+
+struct iface *
+if_walk_next(struct iface *i)
+{
+  IFACE_ASSERT_LOCKED;
+  i = NODE_NEXT(i);
+  return NODE_VALID(i) ? i : NULL;
+}
+
+void
+if_walk_done(void)
+{
+  IFACE_ASSERT_LOCKED;
+  IFACE_UNLOCK;
+}
+
 /**
  * ifa_dump - dump interface address
  * @a: interface address descriptor
@@ -52,6 +84,14 @@ static void if_recalc_preferred(struct iface *i);
  */
 void
 ifa_dump(struct ifa *a)
+{
+  IFACE_LOCK;
+  ifa_dump_locked(a);
+  IFACE_UNLOCK;
+}
+
+static void
+ifa_dump_locked(struct ifa *a)
 {
   debug("\t%I, net %N bc %I -> %I%s%s%s%s\n", a->ip, &a->prefix, a->brd, a->opposite,
 	(a->flags & IA_PRIMARY) ? " PRIMARY" : "",
@@ -69,6 +109,14 @@ ifa_dump(struct ifa *a)
  */
 void
 if_dump(struct iface *i)
+{
+  IFACE_LOCK;
+  if_dump_locked(i);
+  IFACE_UNLOCK;
+}
+
+static void
+if_dump_locked(struct iface *i)
 {
   struct ifa *a;
 
@@ -96,7 +144,7 @@ if_dump(struct iface *i)
   debug(" MTU=%d\n", i->mtu);
   WALK_LIST(a, i->addrs)
     {
-      ifa_dump(a);
+      ifa_dump_locked(a);
       ASSERT(!!(a->flags & IA_PRIMARY) ==
 	     ((a == i->addr4) || (a == i->addr6) || (a == i->llv6)));
     }
@@ -111,14 +159,60 @@ if_dump(struct iface *i)
 void
 if_dump_all(void)
 {
-  struct iface *i;
-
   debug("Known network interfaces:\n");
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     if_dump(i);
   debug("Router ID: %08x\n", config->router_id);
 }
 
+void
+if_link(struct iface *i)
+{
+  IFACE_ASSERT_LOCKED;
+
+  if (i)
+    i->uc++;
+}
+
+void
+if_unlink(struct iface *i)
+{
+  IFACE_ASSERT_LOCKED;
+
+  if (i)
+    i->uc--;
+  /* TODO: Do some interface object cleanup */
+}
+
+void ifa_link(struct ifa *a)
+{
+  IFACE_ASSERT_LOCKED;
+
+  if (a)
+  {
+    debug("ifa_link: %p %d\n", a, a->uc);
+    a->uc++;
+  }
+}
+
+void ifa_unlink(struct ifa *a)
+{
+  IFACE_ASSERT_LOCKED;
+
+  if (!a)
+    return;
+
+  debug("ifa_unlink: %p %d\n", a, a->uc);
+  if (--a->uc)
+    return;
+
+  if_unlink(a->iface);
+#if DEBUGGING
+  memset(a, 0x5b, sizeof(struct ifa));
+#endif
+  mb_free(a);
+}
+
 static inline unsigned
 if_what_changed(struct iface *i, struct iface *j)
 {
@@ -151,6 +245,8 @@ if_copy(struct iface *to, struct iface *from)
 void
 if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s)
 {
+  IFACE_ASSERT_LOCKED;
+
   switch (x.type) {
     case IFNOT_ADDRESS:
       if (!s->ifa_notify) return;
@@ -174,12 +270,14 @@ if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s)
   debug("Enqueue notify %d/%p (%p) to %p\n", x.type, x.a, in, s);
 
   ifnot_add_tail(&s->queue, in);
-  ev_schedule(&s->event);
+  ev_send(s->target, &s->event);
 }
 
 void
 if_enqueue_notify(struct iface_notification x)
 {
+  IFACE_ASSERT_LOCKED;
+
   WALK_TLIST(ifsub, s, &iface_sub_list)
     if_enqueue_notify_to(x, s);
 }
@@ -261,7 +359,7 @@ if_notify_change(unsigned c, struct iface *i)
 
   DBG("Interface change notification (%x) for %s\n", c, i->name);
 #ifdef LOCAL_DEBUG
-  if_dump(i);
+  if_dump_locked(i);
 #endif
 
   if (c & IF_CHANGE_DOWN)
@@ -323,10 +421,12 @@ if_change_flags(struct iface *i, uint flags)
 void
 if_delete(struct iface *old)
 {
+  IFACE_LOCK;
   struct iface f = {};
   strncpy(f.name, old->name, sizeof(f.name)-1);
   f.flags = IF_SHUTDOWN;
-  if_update(&f);
+  if_update_locked(&f);
+  IFACE_UNLOCK;
 }
 
 /**
@@ -347,6 +447,15 @@ if_delete(struct iface *old)
  */
 struct iface *
 if_update(struct iface *new)
+{
+  IFACE_LOCK;
+  struct iface *i = if_update_locked(new);
+  IFACE_UNLOCK;
+  return i;
+}
+
+struct iface *
+if_update_locked(struct iface *new)
 {
   struct iface *i;
   unsigned c;
@@ -354,7 +463,7 @@ if_update(struct iface *new)
   if (!new->master)
     new->master = &default_vrf;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(new->name, i->name))
       {
 	new->flags = if_recalc_flags(new, new->flags);
@@ -389,17 +498,16 @@ if_update(struct iface *new)
   init_list(&i->neighbors);
 newif:
   i->flags |= IF_UPDATED | IF_TMP_DOWN;		/* Tmp down as we don't have addresses yet */
-  add_tail(&iface_list, &i->n);
+  add_tail(&global_iface_list, &i->n);
   return i;
 }
 
 void
 if_start_update(void)
 {
-  struct iface *i;
   struct ifa *a;
 
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     {
       i->flags &= ~IF_UPDATED;
       WALK_LIST(a, i->addrs)
@@ -407,8 +515,8 @@ if_start_update(void)
     }
 }
 
-void
-if_end_partial_update(struct iface *i)
+static void
+if_end_partial_update_locked(struct iface *i)
 {
   if (i->flags & IF_NEEDS_RECALC)
     if_recalc_preferred(i);
@@ -417,13 +525,20 @@ if_end_partial_update(struct iface *i)
     if_change_flags(i, i->flags & ~IF_TMP_DOWN);
 }
 
+void
+if_end_partial_update(struct iface *i)
+{
+  IFACE_LOCK;
+  if_end_partial_update_locked(i);
+  IFACE_UNLOCK;
+}
+
 void
 if_end_update(void)
 {
-  struct iface *i;
   struct ifa *a, *b;
 
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     {
       if (!(i->flags & IF_UPDATED))
 	if_change_flags(i, (i->flags & ~IF_ADMIN_UP) | IF_SHUTDOWN);
@@ -432,55 +547,53 @@ if_end_update(void)
 	  WALK_LIST_DELSAFE(a, b, i->addrs)
 	    if (!(a->flags & IA_UPDATED))
 	      ifa_delete(a);
-	  if_end_partial_update(i);
+	  if_end_partial_update_locked(i);
 	}
     }
 }
 
-void
-if_link(struct iface *i)
-{
-  if (i)
-    i->uc++;
-}
-
-void
-if_unlink(struct iface *i)
-{
-  if (i)
-    i->uc--;
-  /* TODO: Do some interface object cleanup */
-}
-
 static void
 iface_notify_hook(void *_s)
 {
   struct iface_subscription *s = _s;
 
+  IFACE_LOCK;
+
   while (!EMPTY_TLIST(ifnot, &s->queue))
   {
     struct iface_notification *n = THEAD(ifnot, &s->queue);
     debug("Process notify %d/%p (%p) to %p\n", n->type, n->a, n, s);
+    IFACE_UNLOCK;
+
     switch (n->type) {
       case IFNOT_ADDRESS:
 	ifa_send_notify(s, n->flags, n->a);
+	IFACE_LOCK;
 	ifa_unlink(n->a);
+	IFACE_UNLOCK;
 	break;
       case IFNOT_INTERFACE:
 	if_send_notify(s, n->flags, n->i);
+	IFACE_LOCK;
 	if_unlink(n->i);
+	IFACE_UNLOCK;
 	break;
       case IFNOT_NEIGHBOR:
 	s->neigh_notify(n->n);
+	IFACE_LOCK;
 	neigh_unlink(n->n);
+	IFACE_UNLOCK;
 	break;
       default:
 	bug("Bad interface notification type: %d", n->type);
     }
 
+    IFACE_LOCK;
     ifnot_rem_node(&s->queue, n);
     sl_free(n);
   }
+
+  IFACE_UNLOCK;
 }
 
 
@@ -494,6 +607,7 @@ iface_notify_hook(void *_s)
 void
 iface_subscribe(struct iface_subscription *s)
 {
+  IFACE_LOCK;
   ifsub_add_tail(&iface_sub_list, s);
   s->event = (event) {
     .hook = iface_notify_hook,
@@ -501,19 +615,34 @@ iface_subscribe(struct iface_subscription *s)
   };
 
   if (!s->if_notify && !s->ifa_notify)	/* shortcut */
+  {
+    IFACE_UNLOCK;
     return;
+  }
 
   struct iface *i;
   DBG("Announcing interfaces to new protocol %s\n", p->name);
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
-      if_send_notify(s, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), i);
+      if_enqueue_notify_to(
+	  (struct iface_notification) {
+	  .type = IFNOT_INTERFACE,
+	  .i = i,
+	  .flags = IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0),
+	  }, s);
 
       struct ifa *a;
       if (i->flags & IF_UP)
 	WALK_LIST(a, i->addrs)
-	  ifa_send_notify(s, IF_CHANGE_CREATE | IF_CHANGE_UP, a);
+	  if_enqueue_notify_to(
+	      (struct iface_notification) {
+	      .type = IFNOT_ADDRESS,
+	      .a = a,
+	      .flags = IF_CHANGE_CREATE | IF_CHANGE_UP,
+	      }, s);
     }
+
+  IFACE_UNLOCK;
 }
 
 /**
@@ -523,6 +652,12 @@ iface_subscribe(struct iface_subscription *s)
 void
 iface_unsubscribe(struct iface_subscription *s)
 {
+  IFACE_LOCK;
+
+  struct proto *p = SKIP_BACK(struct proto, iface_sub, s);
+  WALK_TLIST_DELSAFE(proto_neigh, n, &p->neighbors)
+    neigh_unlink(n);
+
   ifsub_rem_node(&iface_sub_list, s);
   ev_postpone(&s->event);
 
@@ -547,6 +682,10 @@ iface_unsubscribe(struct iface_subscription *s)
     ifnot_rem_node(&s->queue, n);
     sl_free(n);
   }
+
+  ASSERT_DIE(EMPTY_TLIST(proto_neigh, &p->neighbors));
+
+  IFACE_UNLOCK;
 }
 
 /**
@@ -558,16 +697,26 @@ iface_unsubscribe(struct iface_subscription *s)
  * if no such structure exists.
  */
 struct iface *
-if_find_by_index(unsigned idx)
+if_find_by_index_locked(unsigned idx)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if (i->index == idx && !(i->flags & IF_SHUTDOWN))
       return i;
+
   return NULL;
 }
 
+struct iface *
+if_find_by_index(unsigned idx)
+{
+  IFACE_LOCK;
+  struct iface *i = if_find_by_index_locked(idx);
+  IFACE_UNLOCK;
+  return i;
+}
+
 /**
  * if_find_by_name - find interface by name
  * @name: interface name
@@ -581,9 +730,15 @@ if_find_by_name(const char *name)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  IFACE_LOCK;
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name) && !(i->flags & IF_SHUTDOWN))
+    {
+      IFACE_UNLOCK;
       return i;
+    }
+
+  IFACE_UNLOCK;
   return NULL;
 }
 
@@ -592,9 +747,13 @@ if_get_by_name(const char *name)
 {
   struct iface *i;
 
-  WALK_LIST(i, iface_list)
+  IFACE_LOCK;
+  WALK_LIST(i, global_iface_list)
     if (!strcmp(i->name, name))
+    {
+      IFACE_UNLOCK;
       return i;
+    }
 
   /* No active iface, create a dummy */
   i = mb_allocz(if_pool, sizeof(struct iface));
@@ -602,7 +761,9 @@ if_get_by_name(const char *name)
   i->flags = IF_SHUTDOWN;
   init_list(&i->addrs);
   init_list(&i->neighbors);
-  add_tail(&iface_list, &i->n);
+  add_tail(&global_iface_list, &i->n);
+
+  IFACE_UNLOCK;
   return i;
 }
 
@@ -686,9 +847,7 @@ if_recalc_preferred(struct iface *i)
 void
 if_recalc_all_preferred_addresses(void)
 {
-  struct iface *i;
-
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
   {
     if_recalc_preferred(i);
 
@@ -715,6 +874,8 @@ ifa_same(struct ifa *a, struct ifa *b)
 struct ifa *
 ifa_update(struct ifa *a)
 {
+  IFACE_LOCK;
+
   struct iface *i = a->iface;
   struct ifa *b;
 
@@ -727,6 +888,8 @@ ifa_update(struct ifa *a)
 	    !((b->flags ^ a->flags) & (IA_SECONDARY | IA_PEER | IA_HOST)))
 	  {
 	    b->flags |= IA_UPDATED;
+
+	    IFACE_UNLOCK;
 	    return b;
 	  }
 	ifa_delete(b);
@@ -746,6 +909,8 @@ ifa_update(struct ifa *a)
   i->flags |= IF_NEEDS_RECALC;
   if (i->flags & IF_UP)
     ifa_notify_change(IF_CHANGE_CREATE | IF_CHANGE_UP, b);
+
+  IFACE_UNLOCK;
   return b;
 }
 
@@ -763,6 +928,8 @@ ifa_delete(struct ifa *a)
   struct iface *i = a->iface;
   struct ifa *b;
 
+  IFACE_LOCK;
+
   WALK_LIST(b, i->addrs)
     if (ifa_same(b, a))
       {
@@ -787,43 +954,23 @@ ifa_delete(struct ifa *a)
 	  ifa_notify_change(IF_CHANGE_DOWN, b);
 
 	ifa_unlink(b);
+	IFACE_UNLOCK;
 	return;
       }
-}
 
-void ifa_link(struct ifa *a)
-{
-  if (a)
-  {
-    debug("ifa_link: %p %d\n", a, a->uc);
-    a->uc++;
-  }
-}
-
-void ifa_unlink(struct ifa *a)
-{
-  if (!a)
-    return;
-
-  debug("ifa_unlink: %p %d\n", a, a->uc);
-  if (--a->uc)
-    return;
-
-  if_unlink(a->iface);
-#if DEBUGGING
-  memset(a, 0x5b, sizeof(struct ifa));
-#endif
-  mb_free(a);
+  IFACE_UNLOCK;
 }
 
 u32
 if_choose_router_id(struct iface_patt *mask, u32 old_id)
 {
+  IFACE_LOCK;
+
   struct iface *i;
   struct ifa *a, *b;
 
   b = NULL;
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     {
       if (!(i->flags & IF_ADMIN_UP) ||
 	  (i->flags & IF_SHUTDOWN))
@@ -850,6 +997,8 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 	}
     }
 
+  IFACE_UNLOCK;
+
   if (!b)
     return 0;
 
@@ -870,10 +1019,11 @@ void
 if_init(void)
 {
   if_pool = rp_new(&root_pool, "Interfaces");
-  init_list(&iface_list);
+  init_list(&global_iface_list);
   iface_sub_slab = sl_new(if_pool, sizeof(struct iface_notification));
   strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
+  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
 }
 
 /*
@@ -995,11 +1145,10 @@ if_show_addr(struct ifa *a)
 void
 if_show(void)
 {
-  struct iface *i;
   struct ifa *a;
   char *type;
 
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     {
       if (i->flags & IF_SHUTDOWN)
 	continue;
@@ -1039,10 +1188,8 @@ if_show(void)
 void
 if_show_summary(void)
 {
-  struct iface *i;
-
   cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     {
       byte a4[IPA_MAX_TEXT_LENGTH + 17];
       byte a6[IPA_MAX_TEXT_LENGTH + 17];
diff --git a/nest/iface.h b/nest/iface.h
index a3f4f30a..05898a55 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -9,13 +9,12 @@
 #ifndef _BIRD_IFACE_H_
 #define _BIRD_IFACE_H_
 
+#include "lib/locking.h"
 #include "lib/event.h"
 #include "lib/lists.h"
 #include "lib/tlists.h"
 #include "lib/ip.h"
 
-extern list iface_list;
-
 struct proto;
 struct pool;
 
@@ -112,6 +111,7 @@ void ifa_dump(struct ifa *);
 void if_show(void);
 void if_show_summary(void);
 struct iface *if_update(struct iface *);
+struct iface *if_update_locked(struct iface *);
 void if_delete(struct iface *old);
 struct ifa *ifa_update(struct ifa *);
 void ifa_delete(struct ifa *);
@@ -119,14 +119,16 @@ void if_start_update(void);
 void if_end_partial_update(struct iface *);
 void if_end_update(void);
 struct iface *if_find_by_index(unsigned);
+struct iface *if_find_by_index_locked(unsigned);
 struct iface *if_find_by_name(const char *);
 struct iface *if_get_by_name(const char *);
 void if_recalc_all_preferred_addresses(void);
 
-void if_link(struct iface *);
-void if_unlink(struct iface *);
-void ifa_link(struct ifa *);
-void ifa_unlink(struct ifa *);
+struct iface *if_walk_first(void);
+struct iface *if_walk_next(struct iface *);
+void if_walk_done(void);
+
+#define IFACE_WALK(_i)	for (struct iface *_i = if_walk_first(); _i || (if_walk_done(), 0); _i = if_walk_next(_i))
 
 /* The Neighbor Cache */
 
@@ -161,9 +163,7 @@ typedef struct neighbor {
 
 neighbor *neigh_find(struct proto *p, ip_addr a, struct iface *ifa, uint flags);
 
-void neigh_dump(neighbor *);
 void neigh_dump_all(void);
-void neigh_prune(struct proto *);
 void neigh_if_up(struct iface *);
 void neigh_if_down(struct iface *);
 void neigh_if_link(struct iface *);
@@ -212,6 +212,7 @@ struct iface_subscription {
   TLIST_DEFAULT_NODE;
 
   event event;
+  event_list *target;
   TLIST_LIST(ifnot) queue;
 
   void (*if_notify)(struct proto *, unsigned flags, struct iface *i);
diff --git a/nest/neighbor.c b/nest/neighbor.c
index 88ac2860..934cd35c 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -60,6 +60,19 @@
 static slab *neigh_slab;
 static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list;
 
+void if_link(struct iface *);
+void if_unlink(struct iface *);
+void ifa_link(struct ifa *);
+void ifa_unlink(struct ifa *);
+
+extern list global_iface_list;
+
+extern DOMAIN(attrs) iface_domain;
+
+#define IFACE_LOCK	LOCK_DOMAIN(attrs, iface_domain)
+#define IFACE_UNLOCK	UNLOCK_DOMAIN(attrs, iface_domain)
+#define IFACE_ASSERT_LOCKED	ASSERT_DIE(DOMAIN_IS_LOCKED(attrs, iface_domain))
+
 static inline uint
 neigh_hash(struct proto *p, ip_addr a, struct iface *i)
 {
@@ -152,7 +165,7 @@ if_connected_any(ip_addr a, struct iface *vrf, struct iface **iface, struct ifa
   *addr = NULL;
 
   /* Prefer SCOPE_HOST or longer prefix */
-  WALK_LIST(i, iface_list)
+  WALK_LIST(i, global_iface_list)
     if ((!vrf || vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
       if (scope_better(s, scope) || (scope_remote(s, scope) && ifa_better(b, *addr)))
       {
@@ -210,6 +223,8 @@ if_intersect(struct iface *ia, struct iface *ib)
 neighbor *
 neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
 {
+  IFACE_LOCK;
+
   neighbor *n;
   int class, scope = -1;
   uint h = neigh_hash(p, a, iface);
@@ -218,26 +233,29 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
 
   WALK_LIST(n, neigh_hash_table[h])	/* Search the cache */
     if ((n->proto == p) && ipa_equal(n->addr, a) && (n->ifreq == iface))
+    {
+      IFACE_UNLOCK;
       return n;
+    }
 
   if (flags & NEF_IFACE)
   {
     if (ipa_nonzero(a) || !iface)
-      return NULL;
+      goto bad;
   }
   else
   {
     class = ipa_classify(a);
     if (class < 0)			/* Invalid address */
-      return NULL;
+      goto bad;
     if (((class & IADDR_SCOPE_MASK) == SCOPE_HOST) ||
 	(((class & IADDR_SCOPE_MASK) == SCOPE_LINK) && !iface) ||
 	!(class & IADDR_HOST))
-      return NULL;			/* Bad scope or a somecast */
+      goto bad;				/* Bad scope or a somecast */
   }
 
   if ((flags & NEF_ONLINK) && !iface)
-      return NULL;
+    goto bad;
 
   if (iface)
   {
@@ -251,7 +269,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
   /* scope >= 0  <=>  iface != NULL */
 
   if ((scope < 0) && !(flags & NEF_STICKY))
-    return NULL;
+    goto bad;
 
   n = sl_allocz(neigh_slab);
   add_tail(&neigh_hash_table[h], &n->n);
@@ -267,7 +285,12 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
 
   neigh_link(n);
 
+  IFACE_UNLOCK;
   return n;
+
+bad:
+  IFACE_UNLOCK;
+  return NULL;
 }
 
 /**
@@ -276,7 +299,7 @@ neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
  *
  * This functions dumps the contents of a given neighbor entry to debug output.
  */
-void
+static void
 neigh_dump(neighbor *n)
 {
   debug("%p %I %s %s ", n, n->addr,
@@ -298,6 +321,8 @@ neigh_dump(neighbor *n)
 void
 neigh_dump_all(void)
 {
+  IFACE_LOCK;
+
   neighbor *n;
   int i;
 
@@ -306,11 +331,14 @@ neigh_dump_all(void)
     WALK_LIST(n, neigh_hash_table[i])
       neigh_dump(n);
   debug("\n");
+
+  IFACE_UNLOCK;
 }
 
 static inline void
 neigh_notify(neighbor *n)
 {
+  IFACE_ASSERT_LOCKED;
   if_enqueue_notify_to((struct iface_notification) { .type = IFNOT_NEIGHBOR, .n = n, }, &n->proto->iface_sub);
 }
 
@@ -352,12 +380,14 @@ neigh_down(neighbor *n)
 void
 neigh_link(neighbor *n)
 {
+  IFACE_ASSERT_LOCKED;
   n->uc++;
 }
 
 void
 neigh_unlink(neighbor *n)
 {
+  IFACE_ASSERT_LOCKED;
   if (--n->uc)
     return;
 
@@ -365,7 +395,7 @@ neigh_unlink(neighbor *n)
   proto_neigh_rem_node(&p->neighbors, n);
 
   if ((p->proto_state == PS_DOWN) && EMPTY_TLIST(proto_neigh, &p->neighbors))
-    ev_schedule(p->event);
+    proto_send_event(p, p->event);
 
   n->proto = NULL;
 
@@ -391,6 +421,8 @@ neigh_unlink(neighbor *n)
 void
 neigh_update(neighbor *n, struct iface *iface)
 {
+  IFACE_ASSERT_LOCKED;
+
   struct proto *p = n->proto;
   struct ifa *ifa = NULL;
   int scope = -1;
@@ -461,12 +493,13 @@ neigh_update(neighbor *n, struct iface *iface)
 void
 neigh_if_up(struct iface *i)
 {
+  IFACE_ASSERT_LOCKED;
   struct iface *ii;
   neighbor *n;
   node *x, *y;
 
   /* Update neighbors that might be better off with the new iface */
-  WALK_LIST(ii, iface_list)
+  WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && (ii != i) && if_intersect(i, ii))
       WALK_LIST2_DELSAFE(n, x, y, ii->neighbors, if_n)
 	neigh_update(n, i);
@@ -486,6 +519,7 @@ neigh_if_up(struct iface *i)
 void
 neigh_if_down(struct iface *i)
 {
+  IFACE_ASSERT_LOCKED;
   neighbor *n;
   node *x, *y;
 
@@ -503,6 +537,7 @@ neigh_if_down(struct iface *i)
 void
 neigh_if_link(struct iface *i)
 {
+  IFACE_ASSERT_LOCKED;
   neighbor *n;
   node *x, *y;
 
@@ -523,12 +558,13 @@ neigh_if_link(struct iface *i)
 void
 neigh_ifa_up(struct ifa *a)
 {
+  IFACE_ASSERT_LOCKED;
   struct iface *i = a->iface, *ii;
   neighbor *n;
   node *x, *y;
 
   /* Update neighbors that might be better off with the new ifa */
-  WALK_LIST(ii, iface_list)
+  WALK_LIST(ii, global_iface_list)
     if (!EMPTY_LIST(ii->neighbors) && ifa_intersect(a, ii))
       WALK_LIST2_DELSAFE(n, x, y, ii->neighbors, if_n)
 	neigh_update(n, i);
@@ -541,6 +577,7 @@ neigh_ifa_up(struct ifa *a)
 void
 neigh_ifa_down(struct ifa *a)
 {
+  IFACE_ASSERT_LOCKED;
   struct iface *i = a->iface;
   neighbor *n;
   node *x, *y;
@@ -551,22 +588,6 @@ neigh_ifa_down(struct ifa *a)
       neigh_update(n, i);
 }
 
-/**
- * neigh_prune - prune neighbor cache
- *
- * neigh_prune() examines all neighbor entries cached and removes those
- * corresponding to inactive protocols. It's called whenever a protocol
- * is shut down to get rid of all its heritage.
- */
-void
-neigh_prune(struct proto *p)
-{
-  WALK_TLIST_DELSAFE(proto_neigh, n, &p->neighbors)
-    neigh_unlink(n);
-
-  ASSERT_DIE(EMPTY_TLIST(proto_neigh, &p->neighbors));
-}
-
 /**
  * neigh_init - initialize the neighbor cache.
  * @if_pool: resource pool to be used for neighbor entries.
diff --git a/nest/proto.c b/nest/proto.c
index 877c8ab2..aaa2a602 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1142,7 +1142,6 @@ proto_event(void *ptr)
   if (p->do_stop)
   {
     iface_unsubscribe(&p->iface_sub);
-    neigh_prune(p);
 
     p->do_stop = 0;
   }
@@ -1219,6 +1218,8 @@ proto_start(struct proto *p)
   if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
     p->loop = birdloop_new(p->pool, p->cf->loop_order, p->pool->name);
 
+  p->iface_sub.target = proto_event_list(p);
+
   PROTO_LOCKED_FROM_MAIN(p)
     proto_notify_state(p, (p->proto->start ? p->proto->start(p) : PS_UP));
 }
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index c2de7599..86306180 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1944,9 +1944,7 @@ babel_reconfigure_iface(struct babel_proto *p, struct babel_iface *ifa, struct b
 static void
 babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
 {
-  struct iface *iface;
-
-  WALK_LIST(iface, iface_list)
+  IFACE_WALK(iface)
   {
     if (p->p.vrf && p->p.vrf != iface->master)
       continue;
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 59255350..1919bccb 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -1225,10 +1225,9 @@ ospf_ifa_notify3(struct proto *P, uint flags, struct ifa *a)
 static void
 ospf_reconfigure_ifaces2(struct ospf_proto *p)
 {
-  struct iface *iface;
   struct ifa *a;
 
-  WALK_LIST(iface, iface_list)
+  IFACE_WALK(iface)
   {
     if (p->p.vrf && p->p.vrf != iface->master)
       continue;
@@ -1274,10 +1273,9 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p)
 static void
 ospf_reconfigure_ifaces3(struct ospf_proto *p)
 {
-  struct iface *iface;
   struct ifa *a;
 
-  WALK_LIST(iface, iface_list)
+  IFACE_WALK(iface)
   {
     if (p->p.vrf && p->p.vrf != iface->master)
       continue;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index a23b8945..434155dc 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -666,8 +666,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
   if (!old->propagate_routes && new->propagate_routes)
     channel_request_feeding(p->p.main_channel);
 
-  struct iface *iface;
-  WALK_LIST(iface, iface_list)
+  IFACE_WALK(iface)
   {
     if (p->p.vrf && p->p.vrf != iface->master)
       continue;
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index e9aaf7b1..97d1dd80 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -807,9 +807,7 @@ rip_reconfigure_iface(struct rip_proto *p, struct rip_iface *ifa, struct rip_ifa
 static void
 rip_reconfigure_ifaces(struct rip_proto *p, struct rip_config *cf)
 {
-  struct iface *iface;
-
-  WALK_LIST(iface, iface_list)
+  IFACE_WALK(iface)
   {
     if (p->p.vrf && p->p.vrf != iface->master)
       continue;
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index ca1c9e89..e7b21474 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -277,14 +277,17 @@ krt_send_route(struct krt_proto *p, int cmd, const rte *e)
    */
   if (!i)
   {
-    WALK_LIST(j, iface_list)
+    j = if_walk_first();
+    while (j)
     {
       if (j->flags & IF_LOOPBACK)
       {
         i = j;
         break;
       }
+      j = if_walk_next(j);
     }
+    if_walk_done();
 
     if (!i)
     {
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 0609fde8..b18cb899 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1283,8 +1283,7 @@ kif_do_scan(struct kif_proto *p UNUSED)
       log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
 
   /* Re-resolve master interface for slaves */
-  struct iface *i;
-  WALK_LIST(i, iface_list)
+  IFACE_WALK(i)
     if (i->master_index)
     {
       struct iface f = {
@@ -1292,13 +1291,13 @@ kif_do_scan(struct kif_proto *p UNUSED)
 	.mtu = i->mtu,
 	.index = i->index,
 	.master_index = i->master_index,
-	.master = if_find_by_index(i->master_index)
+	.master = if_find_by_index_locked(i->master_index)
       };
 
       if (f.master != i->master)
       {
 	memcpy(f.name, i->name, sizeof(f.name));
-	if_update(&f);
+	if_update_locked(&f);
       }
     }
 

From 6899ba2232f232e44c4e45d06036409f173fbe23 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 19 Feb 2023 03:59:10 +0100
Subject: [PATCH 258/431] Conf: Fix too early free of old configuration

The change 371eb49043d225d2bab8149187b813a14b4b86d2 introduced early free
of old_config. Unfortunately, it did not properly check whether it is not
still in use (blocked by obstacle during reconfiguration). Fix that.

It also means that we still could have a short peak when three configs
are in use (when a new reconfig is requeste while the previous one is
still active).
---
 conf/conf.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index fc8e3c46..daac85c1 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -195,8 +195,12 @@ cleanup:
 void
 config_free(struct config *c)
 {
-  if (c)
-    rfree(c->pool);
+  if (!c)
+    return;
+
+  ASSERT(!c->obstacle_count);
+
+  rfree(c->pool);
 }
 
 /**
@@ -205,10 +209,14 @@ config_free(struct config *c)
  * This function frees the old configuration (%old_config) that is saved for the
  * purpose of undo. It is useful before parsing a new config when reconfig is
  * requested, to avoid keeping three (perhaps memory-heavy) configs together.
+ * Configuration is not freed when it is still active during reconfiguration.
  */
 void
 config_free_old(void)
 {
+  if (!old_config || old_config->obstacle_count)
+    return;
+
   tm_stop(config_timer);
   undo_available = 0;
 

From 958bb84f772ba098d67d70bcbbdb9b700f17abb7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Mar 2023 16:32:20 +0100
Subject: [PATCH 259/431] Temporarily switching off time annotations of debug
 log

The "dump *" commands are totally garbled by the time annotations.
---
 sysdep/unix/log.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index d09481bc..be7f8adf 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -314,6 +314,7 @@ debug(const char *msg, ...)
   va_start(args, msg);
   if (dbgf)
     {
+#if 0
       struct timespec dbg_time;
       clock_gettime(CLOCK_MONOTONIC, &dbg_time);
       uint nsec;
@@ -333,7 +334,7 @@ debug(const char *msg, ...)
       int n = bsnprintf(pos, max, "%u.%09u: [%04x] ", sec, nsec, THIS_THREAD_ID);
       pos += n;
       max -= n;
-
+#endif
       if (bvsnprintf(pos, max, msg, args) < 0)
 	bug("Extremely long debug output, split it.");
 

From 6543303ad4d509340643ae1f2b585f6278cf0463 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Feb 2023 15:14:40 +0100
Subject: [PATCH 260/431] BFD notifications respect protocol loop settings

---
 nest/bfd.h            |  5 ++--
 proto/bfd/bfd.c       | 63 ++++++++++++++++++++++++++++++++++---------
 proto/bgp/bgp.c       |  2 +-
 proto/ospf/neighbor.c |  2 +-
 proto/rip/rip.c       |  2 +-
 proto/static/static.c |  2 +-
 6 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/nest/bfd.h b/nest/bfd.h
index 37561266..e8977dbd 100644
--- a/nest/bfd.h
+++ b/nest/bfd.h
@@ -35,6 +35,7 @@ struct bfd_request {
 
   void (*hook)(struct bfd_request *);
   void *data;
+  struct birdloop *target;
 
   struct bfd_session *session;
 
@@ -57,14 +58,14 @@ static inline struct bfd_options * bfd_new_options(void)
 
 #ifdef CONFIG_BFD
 
-struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data, const struct bfd_options *opts);
+struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data, struct birdloop *target, const struct bfd_options *opts);
 void bfd_update_request(struct bfd_request *req, const struct bfd_options *opts);
 
 static inline void cf_check_bfd(int use UNUSED) { }
 
 #else
 
-static inline struct bfd_request * bfd_request_session(pool *p UNUSED, ip_addr addr UNUSED, ip_addr local UNUSED, struct iface *iface UNUSED, struct iface *vrf UNUSED, void (*hook)(struct bfd_request *) UNUSED, void *data UNUSED, const struct bfd_options *opts UNUSED) { return NULL; }
+static inline struct bfd_request * bfd_request_session(pool *p UNUSED, ip_addr addr UNUSED, ip_addr local UNUSED, struct iface *iface UNUSED, struct iface *vrf UNUSED, void (*hook)(struct bfd_request *) UNUSED, void *data UNUSED, struct birdloop *target UNUSED, const struct bfd_options *opts UNUSED) { return NULL; }
 static inline void bfd_update_request(struct bfd_request *req UNUSED, const struct bfd_options *opts UNUSED) { };
 
 static inline void cf_check_bfd(int use) { if (use) cf_error("BFD not available"); }
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 575ebc3c..59134a22 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -657,7 +657,17 @@ bfd_request_notify(struct bfd_request *req, u8 state, u8 diag)
   req->down = (old_state == BFD_STATE_UP) && (state == BFD_STATE_DOWN);
 
   if (req->hook)
+  {
+    struct birdloop *target = !birdloop_inside(req->target) ? req->target : NULL;
+
+    if (target)
+      birdloop_enter(target);
+
     req->hook(req);
+
+    if (target)
+      birdloop_leave(target);
+  }
 }
 
 static int
@@ -676,7 +686,6 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 
   uint ifindex = req->iface ? req->iface->index : 0;
   struct bfd_session *s = bfd_find_session_by_addr(p, req->addr, ifindex);
-  u8 state, diag;
 
   if (!s)
     s = bfd_add_session(p, req->addr, req->local, req->iface, &req->opts);
@@ -686,11 +695,15 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
   req->session = s;
 
   bfd_lock_sessions(p);
-  state = s->loc_state;
-  diag = s->loc_diag;
+
+  int notify = !NODE_VALID(&s->n);
+  if (notify)
+    add_tail(&p->notify_list, &s->n);
+
   bfd_unlock_sessions(p);
 
-  bfd_request_notify(req, state, diag);
+  if (notify)
+    ev_send(&global_event_list, &p->notify_event);
 
   return 1;
 }
@@ -698,6 +711,26 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 static void
 bfd_pickup_requests(void *_data UNUSED)
 {
+  /* NOTE TO MY FUTURE SELF
+   *
+   * Functions bfd_take_requests() and bfd_drop_requests() need to have
+   * consistent &bfd_global.wait_list and this is ensured only by having these
+   * functions called from bfd_start() and bfd_shutdown() which are both called
+   * in PROTO_LOCKED_FROM_MAIN context, i.e. always from &main_birdloop.
+   *
+   * This pickup event is also called in &main_birdloop, therefore we can
+   * freely do BFD_LOCK/BFD_UNLOCK while processing all the requests. All BFD
+   * protocols capable of bfd_add_request() are either started before this code
+   * happens or after that.
+   *
+   * If BFD protocols could start in parallel with this routine, they might
+   * miss some of the waiting requests, thus if anybody tries to start
+   * protocols or run this pickup event outside &main_birdloop in future, they
+   * shall ensure that this race condition is mitigated somehow.
+   *
+   * Thank you, my future self, for understanding. Have a nice day!
+   */
+
   node *n;
   WALK_LIST(n, bfd_global.proto_list)
   {
@@ -714,12 +747,16 @@ bfd_pickup_requests(void *_data UNUSED)
   }
 
   BFD_LOCK;
-  node *rn, *rnxt;
-  WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
+  while (!EMPTY_LIST(bfd_global.pickup_list))
   {
-    rem_node(rn);
-    add_tail(&bfd_global.wait_list, rn);
-    bfd_request_notify(SKIP_BACK(struct bfd_request, n, rn), BFD_STATE_ADMIN_DOWN, 0);
+    struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(bfd_global.pickup_list));
+    rem_node(&req->n);
+    BFD_UNLOCK;
+
+    bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
+
+    BFD_LOCK;
+    add_tail(&bfd_global.wait_list, &req->n);
   }
   BFD_UNLOCK;
 }
@@ -749,7 +786,6 @@ bfd_drop_requests(struct bfd_proto *p)
       rem_node(&req->n);
       add_tail(&bfd_global.pickup_list, &req->n);
       req->session = NULL;
-      bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
     }
 
     ev_send(&global_event_list, &bfd_pickup_event);
@@ -766,6 +802,7 @@ struct bfd_request *
 bfd_request_session(pool *p, ip_addr addr, ip_addr local,
 		    struct iface *iface, struct iface *vrf,
 		    void (*hook)(struct bfd_request *), void *data,
+		    struct birdloop *target,
 		    const struct bfd_options *opts)
 {
   struct bfd_request *req = ralloc(p, &bfd_request_class);
@@ -778,8 +815,10 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
   if (opts)
     req->opts = *opts;
 
+  ASSERT_DIE(target || !hook);
   req->hook = hook;
   req->data = data;
+  req->target = target;
 
   req->session = NULL;
 
@@ -854,7 +893,7 @@ bfd_neigh_notify(struct neighbor *nb)
   if ((nb->scope > 0) && !n->req)
   {
     ip_addr local = ipa_nonzero(n->local) ? n->local : nb->ifa->ip;
-    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, p->p.vrf, NULL, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, p->p.vrf, NULL, NULL, NULL, NULL);
   }
 
   if ((nb->scope <= 0) && n->req)
@@ -871,7 +910,7 @@ bfd_start_neighbor(struct bfd_proto *p, struct bfd_neighbor *n)
 
   if (n->multihop)
   {
-    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, p->p.vrf, NULL, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, p->p.vrf, NULL, NULL, NULL, NULL);
     return;
   }
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index f350c8ca..104e5862 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1469,7 +1469,7 @@ bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd)
   if (bfd && !p->bfd_req && !bgp_is_dynamic(p))
     p->bfd_req = bfd_request_session(p->p.pool, p->remote_ip, p->local_ip,
 				     p->cf->multihop ? NULL : p->neigh->iface,
-				     p->p.vrf, bgp_bfd_notify, p, bfd);
+				     p->p.vrf, bgp_bfd_notify, p, p->p.loop, bfd);
 
   if (!bfd && p->bfd_req)
   {
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index ca369819..b0fdc42f 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -777,7 +777,7 @@ ospf_neigh_update_bfd(struct ospf_neighbor *n, int use_bfd)
   if (use_bfd && !n->bfd_req)
     n->bfd_req = bfd_request_session(n->pool, n->ip, n->ifa->addr->ip,
 				     n->ifa->iface, p->p.vrf,
-				     ospf_neigh_bfd_hook, n, NULL);
+				     ospf_neigh_bfd_hook, n, p->p.loop, NULL);
 
   if (!use_bfd && n->bfd_req)
   {
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 97d1dd80..2c504112 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -543,7 +543,7 @@ rip_update_bfd(struct rip_proto *p, struct rip_neighbor *n)
     ip_addr saddr = rip_is_v2(p) ? n->ifa->sk->saddr : n->nbr->ifa->ip;
     n->bfd_req = bfd_request_session(p->p.pool, n->nbr->addr, saddr,
 				     n->nbr->iface, p->p.vrf,
-				     rip_bfd_notify, n, NULL);
+				     rip_bfd_notify, n, p->p.loop, NULL);
   }
 
   if (!use_bfd && n->bfd_req)
diff --git a/proto/static/static.c b/proto/static/static.c
index 82fbfe7a..86142790 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -213,7 +213,7 @@ static_update_bfd(struct static_proto *p, struct static_route *r)
     // ip_addr local = ipa_nonzero(r->local) ? r->local : nb->ifa->ip;
     r->bfd_req = bfd_request_session(p->p.pool, r->via, nb->ifa->ip,
 				     nb->iface, p->p.vrf,
-				     static_bfd_notify, r, NULL);
+				     static_bfd_notify, r, p->p.loop, NULL);
   }
 
   if (!bfd_up && r->bfd_req)

From adbce76517f53e06243ed954b20172cc1313d5c3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 5 Mar 2023 16:22:55 +0100
Subject: [PATCH 261/431] BGP: show detailed TX state in show proto all output

---
 proto/bgp/bgp.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 104e5862..26fccdc3 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -2670,6 +2670,9 @@ bgp_show_proto_info(struct proto *P)
 	    tm_remains(p->conn->hold_timer), p->conn->hold_time);
     cli_msg(-1006, "    Keepalive timer:  %t/%u",
 	    tm_remains(p->conn->keepalive_timer), p->conn->keepalive_time);
+    cli_msg(-1006, "    TX pending:       %d bytes%s",
+	    p->conn->sk->tpos - p->conn->sk->ttx,
+	    ev_active(p->conn->tx_ev) ? " (refill scheduled)" : "");
   }
 
 #if 0
@@ -2723,6 +2726,22 @@ bgp_show_proto_info(struct proto *P)
 
       if (c->base_table)
 	cli_msg(-1006, "    Base table:     %s", c->base_table->name);
+
+      uint bucket_cnt = 0;
+      uint prefix_cnt = 0;
+      struct bgp_bucket *buck;
+      struct bgp_prefix *px;
+      if (c->ptx)
+	WALK_LIST(buck, c->ptx->bucket_queue)
+	{
+	  bucket_cnt++;
+	  WALK_LIST(px, buck->prefixes)
+	    if (px->cur)
+	      prefix_cnt++;
+	}
+
+      cli_msg(-1006, "    Pending %u attribute sets with total %u prefixes to send",
+	 bucket_cnt, prefix_cnt);
     }
   }
 }

From 2898f8f1771dedf4e385a5c0333da03e55d5decb Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 29 Mar 2023 18:55:46 +0200
Subject: [PATCH 262/431] BGP: LLGR Staleness optimization dropped.

This brought unnecessary complexity into the decision procedures while the
performance aspects weren't worth it. It just saved one ea_list traversal
when many others are also done.
---
 proto/bgp/attrs.c | 20 +-------------------
 proto/bgp/bgp.h   |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index a0d2f4d6..8dc5ac3e 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2280,24 +2280,8 @@ bgp_get_neighbor(rte *r)
 static inline int
 rte_stale(rte *r)
 {
-  if (r->pflags & BGP_REF_STALE)
-    return 1;
-
-  if (r->pflags & BGP_REF_NOT_STALE)
-    return 0;
-
-  /* If staleness is unknown, compute and cache it */
   eattr *a = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
-  if (a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE))
-  {
-    r->pflags |= BGP_REF_STALE;
-    return 1;
-  }
-  else
-  {
-    r->pflags |= BGP_REF_NOT_STALE;
-    return 0;
-  }
+  return a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE);
 }
 
 int
@@ -2702,8 +2686,6 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt
     /* Mark the route as LLGR */
     rte e0 = *r;
     bgp_set_attr_ptr(&e0.attrs, BA_COMMUNITY, flags, int_set_add(tmp_linpool, ad, BGP_COMM_LLGR_STALE));
-    e0.pflags &= ~BGP_REF_NOT_STALE;
-    e0.pflags |= BGP_REF_STALE;
 
     /* We need to update the route but keep it stale. */
     ASSERT_DIE(irh->stale_set == irh->stale_valid + 1);
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index acd46f00..b1167820 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -220,8 +220,6 @@ struct bgp_channel_config {
 
 /* rte->pflags */
 #define BGP_REF_SUPPRESSED	0x1	/* Used for deterministic MED comparison */
-#define BGP_REF_STALE		0x2	/* Route is LLGR_STATE */
-#define BGP_REF_NOT_STALE	0x4	/* Route is NOT LLGR_STATE */
 
 struct bgp_af_caps {
   u32 afi;

From 227352c4611a9024c93b22c94c7bbd9ac474effe Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 8 Mar 2023 19:28:31 +0100
Subject: [PATCH 263/431] BGP Export Table: Fixed route source objects leaking
 when prefix best routes is updated

---
 proto/bgp/attrs.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 8dc5ac3e..1c934301 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1702,7 +1702,16 @@ bgp_get_prefix(struct bgp_pending_tx *c, const net_addr *net, struct rte_src *sr
   struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id_hash, hash);
 
   if (px)
+  {
+    if (!add_path_tx && (path_id != px->path_id))
+    {
+      rt_unlock_source(rt_find_source_global(px->path_id));
+      rt_lock_source(src);
+      px->path_id = path_id;
+    }
+
     return px;
+  }
 
   if (c->prefix_slab)
     px = sl_alloc(c->prefix_slab);

From e565e045b6be0deae5c55bd3ae64fc1909a0a873 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Feb 2023 17:01:34 +0100
Subject: [PATCH 264/431] Flowspec links must have the destination table
 service loop locked

---
 nest/rt-table.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index fce51662..bd7cb259 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2677,6 +2677,8 @@ rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
 
   int lock_dst = 0;
 
+  birdloop_enter(dst_pub->loop);
+
   RT_LOCKED(src_pub, src)
   {
     struct rt_flowspec_link *ln = rt_flowspec_find_link(src, dst_pub);
@@ -2689,7 +2691,7 @@ rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
       ln->dst = dst_pub;
       ln->req = (struct rt_export_request) {
 	.name = mb_sprintf(p, "%s.flowspec.notifier", dst_pub->name),
-	.list = &global_work_list,
+	.list = birdloop_event_list(dst_pub->loop),
 	.trace_routes = src->config->debug,
 	.dump_req = rt_flowspec_dump_req,
 	.log_state_change = rt_flowspec_log_state_change,
@@ -2706,6 +2708,8 @@ rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
 
   if (lock_dst)
     rt_lock_table(dst_pub);
+
+  birdloop_leave(dst_pub->loop);
 }
 
 static void
@@ -2721,6 +2725,8 @@ rt_flowspec_link_stopped(struct rt_export_request *req)
 void
 rt_flowspec_unlink(rtable *src, rtable *dst)
 {
+  birdloop_enter(dst->loop);
+
   struct rt_flowspec_link *ln;
   RT_LOCKED(src, t)
   {
@@ -2731,6 +2737,8 @@ rt_flowspec_unlink(rtable *src, rtable *dst)
     if (!--ln->uc)
       rt_stop_export(&ln->req, rt_flowspec_link_stopped);
   }
+
+  birdloop_leave(dst->loop);
 }
 
 static void

From 9073eda854ecee61f723894e66036de266e63606 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Feb 2023 22:03:41 +0100
Subject: [PATCH 265/431] Reducing initial channel bitmap sizes to help extreme
 cases

---
 nest/proto.c    | 8 ++++----
 nest/rt-table.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index aaa2a602..b172ad2d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -516,8 +516,8 @@ channel_start_export(struct channel *c)
     .log_state_change = channel_export_log_state_change,
   };
 
-  bmap_init(&c->export_map, c->proto->pool, 1024);
-  bmap_init(&c->export_reject_map, c->proto->pool, 1024);
+  bmap_init(&c->export_map, c->proto->pool, 16);
+  bmap_init(&c->export_reject_map, c->proto->pool, 16);
 
   channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
@@ -597,8 +597,8 @@ channel_export_stopped(struct rt_export_request *req)
 
     channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
-    bmap_reset(&c->export_map, 1024);
-    bmap_reset(&c->export_reject_map, 1024);
+    bmap_reset(&c->export_map, 16);
+    bmap_reset(&c->export_reject_map, 16);
 
     rt_request_export(c->table, req);
     return;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index bd7cb259..a737e1b3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2215,7 +2215,7 @@ rt_init_export(struct rt_exporter *re UNUSED, struct rt_export_hook *hook)
 {
   hook->event.data = hook;
 
-  bmap_init(&hook->seq_map, hook->pool, 1024);
+  bmap_init(&hook->seq_map, hook->pool, 16);
 
   /* Regular export */
   rt_set_export_state(hook, TES_FEEDING);
@@ -3206,7 +3206,7 @@ rt_export_cleanup(struct rtable_private *tab)
 	    continue;
 
 	  ASSERT_DIE(atomic_load_explicit(&eh->last_export, memory_order_acquire) == NULL);
-	  bmap_reset(&eh->h.seq_map, 1024);
+	  bmap_reset(&eh->h.seq_map, 16);
 	}
 
 	tab->exporter.next_seq = 1;

From 03bfb8b59dbd6da41990d717a639662aeb31c144 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 6 Mar 2023 13:16:12 +0100
Subject: [PATCH 266/431] Moved table hostcache updater to table service
 routines to not bother the mainloop

---
 nest/rt-table.c | 23 ++++++++++++++---------
 nest/rt.h       |  1 +
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index a737e1b3..fab8f06d 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2573,6 +2573,14 @@ rt_flag_handler(struct birdloop_flag_handler *fh, u32 flags)
 	rt_prune_table(tab);
     }
 
+    if (flags & RTF_DELETE)
+    {
+      if (tab->hostcache)
+	rt_stop_export(&tab->hostcache->req, NULL);
+
+      rt_unlock_table(tab);
+    }
+
     rt_unlock_table(tab);
   }
 }
@@ -4155,16 +4163,13 @@ rt_commit(struct config *new, struct config *old)
 	  config_add_obstacle(old);
 	  rt_lock_table(tab);
 
-	  if (tab->hostcache)
-	  {
-	    rt_stop_export(&tab->hostcache->req, NULL);
-	    if (ev_get_list(&tab->hostcache->update) == &rt_cork.queue)
-	      ev_postpone(&tab->hostcache->update);
-	  }
-
 	  rt_check_cork_low(tab);
-	  rt_unlock_table(tab);
 
+	  if (tab->hostcache && ev_get_list(&tab->hostcache->update) == &rt_cork.queue)
+	    ev_postpone(&tab->hostcache->update);
+
+	  /* Force one more loop run */
+	  birdloop_flag(tab->loop, RTF_DELETE);
 	  RT_UNLOCK(tab);
 	}
     }
@@ -4583,7 +4588,7 @@ rt_init_hostcache(struct rtable_private *tab)
 
   hc->req = (struct rt_export_request) {
     .name = mb_sprintf(tab->rp, "%s.hcu.notifier", tab->name),
-    .list = &global_work_list,
+    .list = birdloop_event_list(tab->loop),
     .trace_routes = tab->config->debug,
     .dump_req = hc_notify_dump_req,
     .log_state_change = hc_notify_log_state_change,
diff --git a/nest/rt.h b/nest/rt.h
index cceb5edf..8de305c6 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -185,6 +185,7 @@ typedef union rtable {
 #define RTF_CLEANUP	1
 #define RTF_NHU		2
 #define RTF_EXPORT	4
+#define RTF_DELETE	8
 
 extern struct rt_cork {
   _Atomic uint active;

From c8507c124709a8640fbae46fa37015d1e00a694f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 2 Mar 2023 11:48:17 +0100
Subject: [PATCH 267/431] Fixed stopping of import request with no imports in
 idle table

---
 nest/rt-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index fab8f06d..3428c122 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3072,7 +3072,7 @@ again:
     }
 
   /* In some cases, we may want to directly proceed to export cleanup */
-  if (EMPTY_LIST(tab->exporter.e.hooks) && tab->wait_counter)
+  if (tab->wait_counter && (EMPTY_LIST(tab->exporter.e.hooks) || !tab->exporter.first))
     rt_export_cleanup(tab);
 }
 

From 7d6fe6dfb115196b6fc598bd0c6b5e17469586a9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 6 Mar 2023 19:28:08 +0100
Subject: [PATCH 268/431] Fix obvious mistake in protocol debug dump

---
 nest/proto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index b172ad2d..f8ad64db 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1784,10 +1784,10 @@ protos_dump_all(void)
   debug("Protocols:\n");
 
   struct proto *p;
-  WALK_LIST(p, proto_list)
+  WALK_LIST(p, proto_list) PROTO_LOCKED_FROM_MAIN(p)
   {
 #define DPF(x)	(p->x ? " " #x : "")
-    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s%s\n",
+    debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s\n",
 	p->name, p, p_states[p->proto_state], p->active_channels,
 	DPF(disabled), DPF(active), DPF(do_stop), DPF(reconfiguring));
 #undef DPF

From aa5fc3b99d9bada123cb4b7030fa0c8ba5fae2ea Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 7 Mar 2023 23:22:03 +0100
Subject: [PATCH 269/431] Fixed channel stopping when reload is active

---
 nest/proto.c | 77 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index f8ad64db..e37bc93a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -52,6 +52,7 @@ static void channel_init_limit(struct channel *c, struct limit *l, int dir, stru
 static void channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
 static void channel_feed_end(struct channel *c);
+static void channel_stop_export(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
 static void channel_check_stopped(struct channel *c);
 
@@ -302,14 +303,9 @@ channel_roa_in_changed(struct settle *se)
 {
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se);
   struct channel *c = s->c;
-  int active = !!c->reload_req.hook;
 
-  CD(c, "Reload triggered by RPKI change%s", active ? " - already active" : "");
-
-  if (!active)
-    channel_request_reload(c);
-  else
-    c->reload_pending = 1;
+  CD(c, "Reload triggered by RPKI change");
+  channel_request_reload(c);
 }
 
 static void
@@ -321,9 +317,7 @@ channel_roa_out_changed(struct settle *se)
   CD(c, "Feeding triggered by RPKI change");
 
   c->refeed_pending = 1;
-
-  if (c->out_req.hook)
-    rt_stop_export(&c->out_req, channel_export_stopped);
+  channel_stop_export(c);
 }
 
 static void
@@ -408,6 +402,7 @@ static void
 channel_roa_unsubscribe(struct roa_subscription *s)
 {
   rt_stop_export(&s->req, channel_roa_unsubscribed);
+  settle_cancel(&s->settle);
 }
 
 static void
@@ -551,7 +546,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->in_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->in_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -559,13 +554,11 @@ channel_check_stopped(struct channel *c)
 
       break;
     case CS_PAUSE:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_START);
       break;
-    default:
-      bug("Stopped channel in a bad state: %d", c->channel_state);
   }
 
   DBG("%s.%s: Channel requests/hooks stopped (in state %s)\n", c->proto->name, c->name, c_states[c->channel_state]);
@@ -616,8 +609,6 @@ channel_export_stopped(struct rt_export_request *req)
 static void
 channel_feed_end(struct channel *c)
 {
-  struct rt_export_request *req = &c->out_req;
-
   /* Reset export limit if the feed ended with acceptable number of exported routes */
   struct limit *l = &c->out_limit;
   if (c->refeeding &&
@@ -629,7 +620,7 @@ channel_feed_end(struct channel *c)
     channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
     c->refeed_pending = 1;
-    rt_stop_export(req, channel_export_stopped);
+    channel_stop_export(c);
     return;
   }
 
@@ -637,7 +628,7 @@ channel_feed_end(struct channel *c)
     c->proto->feed_end(c);
 
   if (c->refeed_pending)
-    rt_stop_export(req, channel_export_stopped);
+    channel_stop_export(c);
   else
     c->refeeding = 0;
 }
@@ -648,6 +639,13 @@ channel_schedule_reload(struct channel *c)
 {
   ASSERT(c->in_req.hook);
 
+  if (c->reload_req.hook)
+  {
+    CD(c, "Reload triggered before the previous one has finished");
+    c->reload_pending = 1;
+    return;
+  }
+
   rt_refresh_begin(&c->in_req);
   rt_request_export(c->table, &c->reload_req);
 }
@@ -660,6 +658,9 @@ channel_reload_stopped(struct rt_export_request *req)
   /* Restart reload */
   if (c->reload_pending)
     channel_request_reload(c);
+
+  if (c->channel_state != CS_UP)
+    channel_check_stopped(c);
 }
 
 static void
@@ -669,7 +670,9 @@ channel_reload_log_state_change(struct rt_export_request *req, u8 state)
 
   if (state == TES_READY)
   {
-    rt_refresh_end(&c->in_req);
+    if (c->channel_state == CS_UP)
+      rt_refresh_end(&c->in_req);
+
     rt_stop_export(req, channel_reload_stopped);
   }
 }
@@ -724,20 +727,18 @@ channel_do_up(struct channel *c)
 static void
 channel_do_pause(struct channel *c)
 {
+  /* Drop ROA subscriptions */
+  channel_roa_unsubscribe_all(c);
+
   /* Need to abort feeding */
-  if (c->reload_req.hook)
-  {
-    c->reload_pending = 0;
+  c->reload_pending = 0;
+
+  if (c->reload_req.hook && c->reload_req.hook->export_state != TES_STOP)
     rt_stop_export(&c->reload_req, channel_reload_stopped);
-  }
 
   /* Stop export */
-  if (c->refeed_pending)
-    c->refeed_pending = 0;
-  else if (c->out_req.hook)
-    rt_stop_export(&c->out_req, channel_export_stopped);
-
-  channel_roa_unsubscribe_all(c);
+  c->refeed_pending = 0;
+  channel_stop_export(c);
 }
 
 static void
@@ -858,6 +859,15 @@ channel_request_feeding(struct channel *c)
     return;
 
   c->refeed_pending = 1;
+  channel_stop_export(c);
+}
+
+static void
+channel_stop_export(struct channel *c)
+{
+  if (!c->out_req.hook || (c->out_req.hook->export_state == TES_STOP))
+    return;
+
   rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
@@ -1437,6 +1447,8 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
       p = oc->proto;
       sym = cf_find_symbol(new, oc->name);
 
+      struct birdloop *proto_loop = PROTO_ENTER_FROM_MAIN(p);
+
       /* Handle dynamic protocols */
       if (!sym && oc->parent && !new->shutdown)
       {
@@ -1462,8 +1474,11 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
 	nc->proto = p;
 
 	/* We will try to reconfigure protocol p */
-	if (! force_reconfig && proto_reconfigure(p, oc, nc, type))
+	if (!force_reconfig && proto_reconfigure(p, oc, nc, type))
+	{
+	  PROTO_LEAVE_FROM_MAIN(proto_loop);
 	  continue;
+	}
 
 	if (nc->parent)
 	{
@@ -1501,6 +1516,8 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
       }
 
       p->reconfiguring = 1;
+      PROTO_LEAVE_FROM_MAIN(proto_loop);
+
       config_add_obstacle(old);
       proto_rethink_goal(p);
     }

From 97d2875e999487bfe91f16c77c409ac0080541d3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 8 Mar 2023 21:38:18 +0100
Subject: [PATCH 270/431] Fixed bad filter re-evaluation with import table if
 filtered->accepted

The import table feed wasn't resetting the table-specific route values
like REF_FILTERED and thus made the route look like filtered even though
it should have been re-evaluated as accepted.
---
 lib/route.h       | 10 ++++++++++
 nest/proto.c      |  3 +++
 nest/rt-table.c   |  4 +++-
 proto/pipe/pipe.c |  7 ++-----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 50e62440..c8469163 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -46,6 +46,16 @@ static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED);
 /* Route just has REF_FILTERED flag */
 static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
 
+/* Strip the route of the table-specific values */
+static inline rte rte_init_from(const rte *r)
+{
+  return (rte) {
+    .attrs = r->attrs,
+    .net = r->net,
+    .src = r->src,
+  };
+}
+
 struct rte_src {
   struct rte_src *next;			/* Hash chain */
   struct rte_owner *owner;		/* Route source owner */
diff --git a/nest/proto.c b/nest/proto.c
index e37bc93a..6c6d4ed3 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -657,7 +657,10 @@ channel_reload_stopped(struct rt_export_request *req)
 
   /* Restart reload */
   if (c->reload_pending)
+  {
+    c->reload_pending = 0;
     channel_request_reload(c);
+  }
 
   if (c->channel_state != CS_UP)
     channel_check_stopped(c);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 3428c122..218fcbe7 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4406,8 +4406,10 @@ void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *n
   for (uint i=0; i<count; i++)
     if (feed[i]->sender == c->in_req.hook)
     {
+      /* Strip the table-specific information */
+      rte new = rte_init_from(feed[i]);
+
       /* Strip the later attribute layers */
-      rte new = *feed[i];
       while (new.attrs->next)
 	new.attrs = new.attrs->next;
 
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 9d1bb6ce..b2083010 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -62,12 +62,9 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, const net_addr *n, rte *
 
   if (new)
     {
-      rte e0 = {
-	.attrs = new->attrs,
-	.src = new->src,
-	.generation = new->generation + 1,
-      };
+      rte e0 = rte_init_from(new);
 
+      e0.generation = new->generation + 1;
       ea_unset_attr(&e0.attrs, 0, &ea_gen_hostentry);
 
       rte_update(dst, n, &e0, new->src);

From 90de93ca0336b95038dddaef276d0c7ae5b7bbff Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 8 Mar 2023 13:44:18 +0100
Subject: [PATCH 271/431] Fixed unwanted reloads while reconfiguring protocols
 with import table on

---
 nest/proto.c       |  9 +++++----
 nest/protocol.h    |  1 -
 proto/bgp/bgp.c    | 14 ++++++--------
 proto/bgp/config.Y |  3 +++
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 6c6d4ed3..3a8c938e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -690,7 +690,7 @@ channel_reload_dump_req(struct rt_export_request *req)
 void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
 
 /* Called by protocol to activate in_table */
-void
+static void
 channel_setup_in_table(struct channel *c)
 {
   c->reload_req = (struct rt_export_request) {
@@ -701,8 +701,6 @@ channel_setup_in_table(struct channel *c)
     .dump_req = channel_reload_dump_req,
     .log_state_change = channel_reload_log_state_change,
   };
-
-  c->in_keep |= RIK_PREFILTER;
 }
 
 
@@ -711,6 +709,9 @@ channel_do_start(struct channel *c)
 {
   c->proto->active_channels++;
 
+  if ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
+    channel_setup_in_table(c);
+
   CALL(c->channel->start, c);
 
   channel_start_import(c);
@@ -882,7 +883,7 @@ channel_request_reload(struct channel *c)
 
   CD(c, "Reload requested");
 
-  if (c->in_keep & RIK_PREFILTER)
+  if ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
     channel_schedule_reload(c);
   else
     c->proto->reload_routes(c);
diff --git a/nest/protocol.h b/nest/protocol.h
index f9f89c06..fe987d17 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -642,7 +642,6 @@ struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
 
 void channel_set_state(struct channel *c, uint state);
-void channel_setup_in_table(struct channel *c);
 void channel_schedule_reload(struct channel *c);
 
 static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 26fccdc3..851167b6 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -651,7 +651,7 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
 
     int active = loc->ready && rem->ready;
     c->c.disabled = !active;
-    c->c.reloadable = p->route_refresh || c->cf->import_table;
+    c->c.reloadable = p->route_refresh || ((c->c.in_keep & RIK_PREFILTER) == RIK_PREFILTER);
 
     c->index = active ? num++ : 0;
 
@@ -1868,9 +1868,6 @@ bgp_channel_start(struct channel *C)
 
   c->pool = p->p.pool; // XXXX
 
-  if (c->cf->import_table)
-    channel_setup_in_table(C);
-
   if (c->cf->export_table)
     bgp_setup_out_table(c);
 
@@ -2283,7 +2280,6 @@ bgp_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impor
       (new->llgr_time != old->llgr_time) ||
       (new->ext_next_hop != old->ext_next_hop) ||
       (new->add_path != old->add_path) ||
-      (new->import_table != old->import_table) ||
       (new->export_table != old->export_table) ||
       (TABLE(new, igp_table_ip4) != TABLE(old, igp_table_ip4)) ||
       (TABLE(new, igp_table_ip6) != TABLE(old, igp_table_ip6)) ||
@@ -2298,11 +2294,13 @@ bgp_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impor
       (new->aigp != old->aigp) ||
       (new->cost != old->cost))
   {
-    /* import_changed itself does not force ROUTE_REFRESH when import_table is active */
-    if ((c->c.in_keep & RIK_PREFILTER) && (c->c.channel_state == CS_UP))
+    /* If import table is active and route refresh is possible, we just ask for route refresh */
+    if ((c->c.in_keep & RIK_PREFILTER) && (c->c.channel_state == CS_UP) && p->route_refresh)
       bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
 
-    *import_changed = 1;
+    /* Otherwise we do complete reload */
+    else
+      *import_changed = 1;
   }
 
   if (!ipa_equal(new->next_hop_addr, old->next_hop_addr) ||
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 66d97e3b..a51c82bd 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -329,6 +329,9 @@ bgp_channel_end:
   if (!this_channel->table)
     cf_error("Routing table not specified");
 
+  if (BGP_CC->import_table)
+    this_channel->in_keep |= RIK_PREFILTER;
+
   this_channel = NULL;
 };
 

From 88fc87afe631f6600e82c3f7135f6003a9c729b6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 8 Mar 2023 13:47:42 +0100
Subject: [PATCH 272/431] Fixed use-after-free of old protocol name pointer
 copied into rte_owner structure

---
 nest/proto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nest/proto.c b/nest/proto.c
index 3a8c938e..959c948b 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1390,7 +1390,7 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
       (nc->vrf != oc->vrf))
     return 0;
 
-  p->name = nc->name;
+  p->sources.name = p->name = nc->name;
   p->debug = nc->debug;
   p->mrtdump = nc->mrtdump;
   reconfigure_type = type;

From 765bf99b695a9525fe4dfbc3f5e0bb90f56826d0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Mar 2023 16:34:17 +0100
Subject: [PATCH 273/431] Fixed default table configuration

When changing default table behavior, I missed that it enabled to
configure multiple master4 and master6 tables. Now BIRD recognizes it
and fails properly.
---
 nest/rt-table.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 218fcbe7..4c71663b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3939,6 +3939,7 @@ rt_new_default_table(struct symbol *s)
   for (uint addr_type = 0; addr_type < NET_MAX; addr_type++)
     if (s == new_config->def_tables[addr_type])
     {
+      ASSERT_DIE(!s->table);
       s->table = rt_new_table(s, addr_type);
       return;
     }
@@ -3962,6 +3963,9 @@ rt_get_default_table(struct config *cf, uint addr_type)
 struct rtable_config *
 rt_new_table(struct symbol *s, uint addr_type)
 {
+  if (s->table)
+    cf_error("Duplicate configuration of table %s", s->name);
+
   struct rtable_config *c = cfg_allocz(sizeof(struct rtable_config));
 
   if (s == new_config->def_tables[addr_type])

From 731ec008402a6e800ceb4c1171e44852ecc4679a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 19 Mar 2023 13:21:35 +0100
Subject: [PATCH 274/431] Allowing to restart a route refresh.

Repeated pipe refeed should not end route refresh as the prune routine
may start pruning otherwise valid routes.

The same applies for BGP repeated route refresh.
---
 nest/rt-table.c | 34 +++++++++++++++++-----------------
 proto/bgp/bgp.c |  7 +------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 4c71663b..8b9b2017 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2327,16 +2327,16 @@ rt_refresh_begin(struct rt_import_request *req)
 {
   struct rt_import_hook *hook = req->hook;
   ASSERT_DIE(hook);
-  ASSERT_DIE(hook->stale_set == hook->stale_valid);
 
   RT_LOCKED(hook->table, tab)
   {
 
   /* If the pruning routine is too slow */
-  if ((hook->stale_pruned < hook->stale_valid) && (hook->stale_pruned + 128 < hook->stale_valid)
-      || (hook->stale_pruned > hook->stale_valid) && (hook->stale_pruned > hook->stale_valid + 128))
+  if (((hook->stale_set - hook->stale_pruned) & 0xff) >= 240)
   {
-    log(L_WARN "Route refresh flood in table %s", hook->table->name);
+    log(L_WARN "Route refresh flood in table %s (stale_set=%u, stale_pruned=%u)", hook->table->name, hook->stale_set, hook->stale_pruned);
+
+    /* Forcibly set all old routes' stale cycle to zero. */
     FIB_WALK(&tab->fib, net, n)
       {
        for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -2344,19 +2344,15 @@ rt_refresh_begin(struct rt_import_request *req)
            e->rte.stale_cycle = 0;
       }
     FIB_WALK_END;
+
+    /* Smash the route refresh counter and zero everything. */
     tab->rr_counter -= hook->stale_set - hook->stale_pruned;
-    hook->stale_set = 1;
-    hook->stale_valid = 0;
-    hook->stale_pruned = 0;
-  }
-  /* Setting a new value of the stale modifier */
-  else if (!++hook->stale_set)
-  {
-    /* Let's reserve the stale_cycle zero value for always-invalid routes */
-    hook->stale_set = 1;
-    hook->stale_valid = 0;
+    hook->stale_set = hook->stale_valid = hook->stale_pruning = hook->stale_pruned = 0;
   }
 
+  /* Now we can safely increase the stale_set modifier */
+  hook->stale_set++;
+
   /* The table must know that we're route-refreshing */
   tab->rr_counter++;
 
@@ -2382,14 +2378,18 @@ rt_refresh_end(struct rt_import_request *req)
 
   RT_LOCKED(hook->table, tab)
   {
-    hook->stale_valid++;
-    ASSERT_DIE(hook->stale_set == hook->stale_valid);
+    /* Now valid routes are only those one with the latest stale_set value */
+    uint cnt = hook->stale_set - hook->stale_valid;
+    hook->stale_valid = hook->stale_set;
 
     /* Here we can't kick the timer as we aren't in the table service loop */
     rt_schedule_prune(tab);
 
     if (req->trace_routes & D_STATES)
-      log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+      if (cnt > 1)
+	log(L_TRACE "%s: route refresh end (x%u) [%u]", req->name, cnt, hook->stale_valid);
+      else
+	log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
   }
 }
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 851167b6..cca1283c 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -805,11 +805,9 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
       {
       case BGP_GRS_NONE:
 	c->gr_active = BGP_GRS_ACTIVE;
-	rt_refresh_begin(&c->c.in_req);
-	break;
+	/* fall through */
 
       case BGP_GRS_ACTIVE:
-	rt_refresh_end(&c->c.in_req);
 	rt_refresh_begin(&c->c.in_req);
 	break;
 
@@ -988,9 +986,6 @@ bgp_refresh_begin(struct bgp_channel *c)
   if (c->load_state == BFS_LOADING)
   { log(L_WARN "%s: BEGIN-OF-RR received before END-OF-RIB, ignoring", p->p.name); return; }
 
-  if (c->load_state == BFS_REFRESHING)
-    rt_refresh_end(&c->c.in_req);
-
   c->load_state = BFS_REFRESHING;
   rt_refresh_begin(&c->c.in_req);
 }

From 3a53a12af4fb300ab18052ec485e2b825808f670 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 30 Mar 2023 10:34:28 +0200
Subject: [PATCH 275/431] Moved channel export hooks to rt.h as the channel
 refactoring isn't going to take place soon

---
 nest/proto.c | 11 -----------
 nest/rt.h    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 959c948b..bdb905c9 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -177,15 +177,6 @@ proto_find_channel_by_name(struct proto *p, const char *n)
   return NULL;
 }
 
-int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
-
-void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-
-
 /**
  * proto_add_channel - connect protocol to a routing table
  * @p: protocol instance
@@ -687,8 +678,6 @@ channel_reload_dump_req(struct rt_export_request *req)
   debug("  Channel %s.%s import reload request %p\n", c->proto->name, c->name, req);
 }
 
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-
 /* Called by protocol to activate in_table */
 static void
 channel_setup_in_table(struct channel *c)
diff --git a/nest/rt.h b/nest/rt.h
index 8de305c6..9a149bfc 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -438,6 +438,22 @@ void rt_stop_export_common(struct rt_export_hook *hook);
 void rt_export_stopped(struct rt_export_hook *hook);
 void rt_exporter_init(struct rt_exporter *re);
 
+/*
+ * Channel export hooks. To be refactored out.
+ */
+
+int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
+void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+
+
+
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
 #define RA_OPTIMAL	1		/* Announcement of optimal route change */

From 98f69aa4190d31f749ac4999cab9700850da15a9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 30 Mar 2023 11:37:16 +0200
Subject: [PATCH 276/431] Propagated const through route feed routines

---
 lib/route.h           | 12 ++++++------
 nest/rt-show.c        |  6 +++---
 nest/rt-table.c       | 30 +++++++++++++++---------------
 nest/rt.h             | 12 ++++++------
 proto/babel/babel.c   |  4 ++--
 proto/bgp/attrs.c     | 16 ++++++++--------
 proto/bgp/bgp.h       | 10 +++++-----
 proto/ospf/ospf.c     |  6 +++---
 proto/rip/rip.c       |  6 +++---
 proto/static/static.c |  6 +++---
 sysdep/unix/krt.c     |  6 +++---
 11 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index c8469163..6189895a 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -41,10 +41,10 @@ typedef struct rte {
 #define REF_PENDING	32		/* Route has not propagated completely yet */
 
 /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
-static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }
+static inline int rte_is_valid(const rte *r) { return r && !(r->flags & REF_FILTERED); }
 
 /* Route just has REF_FILTERED flag */
-static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); }
+static inline int rte_is_filtered(const rte *r) { return !!(r->flags & REF_FILTERED); }
 
 /* Strip the route of the table-specific values */
 static inline rte rte_init_from(const rte *r)
@@ -65,9 +65,9 @@ struct rte_src {
 };
 
 struct rte_owner_class {
-  void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */
-  int (*rte_better)(struct rte *, struct rte *);
-  int (*rte_mergable)(struct rte *, struct rte *);
+  void (*get_route_info)(const rte *, byte *buf); /* Get route information (for `show route' command) */
+  int (*rte_better)(const rte *, const rte *);
+  int (*rte_mergable)(const rte *, const rte *);
   u32 (*rte_igp_metric)(const rte *);
 };
 
@@ -430,7 +430,7 @@ ea_copy_attr(ea_list **to, ea_list *from, const struct ea_class *def)
 
 /* Preference: first-order comparison */
 extern struct ea_class ea_gen_preference;
-static inline u32 rt_get_preference(rte *rt)
+static inline u32 rt_get_preference(const rte *rt)
 { return ea_get_int(rt->attrs, &ea_gen_preference, 0); }
 
 /* IGP metric: second-order comparison */
diff --git a/nest/rt-show.c b/nest/rt-show.c
index d8eb2174..40202ef6 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -40,7 +40,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
   byte tm[TM_DATETIME_BUFFER_SIZE], info[256];
   ea_list *a = e->attrs;
   int sync_error = d->tab->kernel ? krt_get_sync_error(d->tab->kernel, e) : 0;
-  void (*get_route_info)(struct rte *, byte *buf);
+  void (*get_route_info)(const rte *, byte *buf);
   eattr *nhea = net_type_match(e->net, NB_DEST) ?
     ea_find(a, &ea_gen_nexthop) : NULL;
   struct nexthop_adata *nhad = nhea ? (struct nexthop_adata *) nhea->u.ptr : NULL;
@@ -93,7 +93,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
 }
 
 static void
-rt_show_net(struct rt_show_data *d, const net_addr *n, rte **feed, uint count)
+rt_show_net(struct rt_show_data *d, const net_addr *n, const rte **feed, uint count)
 {
   struct cli *c = d->cli;
   byte ia[NET_MAX_TEXT_LENGTH+1];
@@ -211,7 +211,7 @@ rt_show_net(struct rt_show_data *d, const net_addr *n, rte **feed, uint count)
 
 static void
 rt_show_net_export_bulk(struct rt_export_request *req, const net_addr *n,
-    struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+    struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
 {
   struct rt_show_data *d = SKIP_BACK(struct rt_show_data, req, req);
   return rt_show_net(d, n, feed, count);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8b9b2017..d52131c3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -670,9 +670,9 @@ rte_free(struct rte_storage *e)
 }
 
 static int				/* Actually better or at least as good as */
-rte_better(rte *new, rte *old)
+rte_better(const rte *new, const rte *old)
 {
-  int (*better)(rte *, rte *);
+  int (*better)(const rte *, const rte *);
 
   if (!rte_is_valid(old))
     return 1;
@@ -701,9 +701,9 @@ rte_better(rte *new, rte *old)
 }
 
 static int
-rte_mergable(rte *pri, rte *sec)
+rte_mergable(const rte *pri, const rte *sec)
 {
-  int (*mergable)(rte *, rte *);
+  int (*mergable)(const rte *, const rte *);
 
   if (!rte_is_valid(pri) || !rte_is_valid(sec))
     return 0;
@@ -771,7 +771,7 @@ rte_feed_count(net *n)
 }
 
 static void
-rte_feed_obtain(net *n, struct rte **feed, uint count)
+rte_feed_obtain(net *n, const rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -921,7 +921,7 @@ channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *r
 
 void
 rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
-    struct rte **feed, uint count)
+    const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
@@ -985,13 +985,13 @@ done:
 }
 
 rte *
-rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool, int silent)
+rt_export_merged(struct channel *c, const rte **feed, uint count, linpool *pool, int silent)
 {
   _Thread_local static rte rloc;
 
   // struct proto *p = c->proto;
   struct nexthop_adata *nhs = NULL;
-  rte *best0 = feed[0];
+  const rte *best0 = feed[0];
   rte *best = NULL;
 
   if (!rte_is_valid(best0))
@@ -1048,7 +1048,7 @@ rt_export_merged(struct channel *c, struct rte **feed, uint count, linpool *pool
 
 void
 rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
-    struct rte **feed, uint count)
+    const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
@@ -1063,7 +1063,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
     return;
 #endif
 
-  rte *old_best = NULL;
+  const rte *old_best = NULL;
   /* Find old best route */
   for (uint i = 0; i < count; i++)
     if (bmap_test(&c->export_map, feed[i]->id))
@@ -1140,7 +1140,7 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
 }
 
 void
-rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
@@ -1223,7 +1223,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
     RT_LOCK(tab);
     uint count = rte_feed_count(net);
-    rte **feed = NULL;
+    const rte **feed = NULL;
     if (count)
     {
       feed = alloca(count * sizeof(rte *));
@@ -4204,7 +4204,7 @@ typedef struct {
   union {
     struct rt_pending_export *rpe;
     struct {
-      rte **feed;
+      const rte **feed;
       uint *start;
     };
   };
@@ -4257,7 +4257,7 @@ rt_process_feed(struct rt_table_export_hook *c, rt_feed_block *b)
     b->start[b->pos] = b->cnt;
     for (uint p = 0; p < b->pos; p++)
     {
-      rte **feed = &b->feed[b->start[p]];
+      const rte **feed = &b->feed[b->start[p]];
       c->h.req->export_bulk(c->h.req, feed[0]->net, NULL, feed, b->start[p+1] - b->start[p]);
     }
   }
@@ -4403,7 +4403,7 @@ rt_feed_for(void *data)
  *	Import table
  */
 
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, reload_req, req);
 
diff --git a/nest/rt.h b/nest/rt.h
index 9a149bfc..857ed2ca 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -303,7 +303,7 @@ struct rt_export_request {
    *	   and for RA_ANY, both are set to accomodate for feeding all routes but receiving single changes
    */
   void (*export_one)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-  void (*export_bulk)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+  void (*export_bulk)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
 
   void (*dump_req)(struct rt_export_request *req);
   void (*log_state_change)(struct rt_export_request *req, u8);
@@ -444,13 +444,13 @@ void rt_exporter_init(struct rt_exporter *re);
 
 int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
 
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
 
 void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
 void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
-void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, rte **feed, uint count);
+void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
+void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
+void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
 
 
 
@@ -576,7 +576,7 @@ static inline net *net_find_valid(struct rtable_private *tab, const net_addr *ad
 static inline net *net_get(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 net *net_route(struct rtable_private *tab, const net_addr *n);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
-rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
+rte *rt_export_merged(struct channel *c, const rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
 void rt_modify_stale(rtable *t, struct rt_import_request *);
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 86306180..4f3603e4 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2068,7 +2068,7 @@ babel_dump(struct proto *P)
 }
 
 static void
-babel_get_route_info(rte *rte, byte *buf)
+babel_get_route_info(const rte *rte, byte *buf)
 {
   u64 rid = 0;
   eattr *e = ea_find(rte->attrs, &ea_babel_router_id);
@@ -2388,7 +2388,7 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
 }
 
 static int
-babel_rte_better(struct rte *new, struct rte *old)
+babel_rte_better(const rte *new, const rte *old)
 {
   uint new_metric = ea_get_int(new->attrs, &ea_babel_metric, BABEL_INFINITY);
   uint old_metric = ea_get_int(old->attrs, &ea_babel_metric, BABEL_INFINITY);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1c934301..f6097078 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1958,7 +1958,7 @@ bgp_out_table_feed(void *data)
 
       if (hook->h.req->export_bulk)
       {
-	rte *feed = &es.rte;
+	const rte *feed = &es.rte;
 	hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &feed, 1);
       }
       else if (hook->h.req->export_one)
@@ -2273,7 +2273,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
 
 
 static inline u32
-bgp_get_neighbor(rte *r)
+bgp_get_neighbor(const rte *r)
 {
   eattr *e = ea_find(r->attrs, BGP_EA_ID(BA_AS_PATH));
   u32 as;
@@ -2287,14 +2287,14 @@ bgp_get_neighbor(rte *r)
 }
 
 static inline int
-rte_stale(rte *r)
+rte_stale(const rte *r)
 {
   eattr *a = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY));
   return a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE);
 }
 
 int
-bgp_rte_better(rte *new, rte *old)
+bgp_rte_better(const rte *new, const rte *old)
 {
   struct bgp_proto *new_bgp = bgp_rte_proto(new);
   struct bgp_proto *old_bgp = bgp_rte_proto(old);
@@ -2439,7 +2439,7 @@ bgp_rte_better(rte *new, rte *old)
 
 
 int
-bgp_rte_mergable(rte *pri, rte *sec)
+bgp_rte_mergable(const rte *pri, const rte *sec)
 {
   struct bgp_proto *pri_bgp = bgp_rte_proto(pri);
   struct bgp_proto *sec_bgp = bgp_rte_proto(sec);
@@ -2657,7 +2657,7 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
 }
 
 void
-bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count)
+bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
 {
   struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
   struct rt_import_hook *irh = c->c.in_req.hook;
@@ -2665,7 +2665,7 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt
   /* Find our routes among others */
   for (uint i=0; i<count; i++)
   {
-    rte *r = feed[i];
+    const rte *r = feed[i];
 
     if (
 	!rte_is_valid(r) ||			/* Not a valid route */
@@ -2755,7 +2755,7 @@ bgp_process_as4_attrs(ea_list **attrs, struct linpool *pool)
 }
 
 void
-bgp_get_route_info(rte *e, byte *buf)
+bgp_get_route_info(const rte *e, byte *buf)
 {
   eattr *p = ea_find(e->attrs, BGP_EA_ID(BA_AS_PATH));
   eattr *o = ea_find(e->attrs, BGP_EA_ID(BA_ORIGIN));
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index b1167820..1a55fef6 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -615,17 +615,17 @@ int bgp_done_bucket(struct bgp_channel *c, struct bgp_bucket *b);
 
 void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bucket *buck);
 
-int bgp_rte_better(struct rte *, struct rte *);
-int bgp_rte_mergable(rte *pri, rte *sec);
+int bgp_rte_better(const rte *, const rte *);
+int bgp_rte_mergable(const rte *pri, const rte *sec);
 int bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
-void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, rte **feed, uint count);
+void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count);
 u32 bgp_rte_igp_metric(const rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
 int bgp_preexport(struct channel *, struct rte *);
-void bgp_get_route_info(struct rte *, byte *);
+void bgp_get_route_info(const rte *, byte *);
 int bgp_total_aigp_metric_(const rte *e, u64 *metric, const struct adata **ad);
 
-static inline struct bgp_proto *bgp_rte_proto(struct rte *rte)
+static inline struct bgp_proto *bgp_rte_proto(const rte *rte)
 {
   return (rte->src->owner->class == &bgp_rte_owner_class) ?
     SKIP_BACK(struct bgp_proto, p.sources, rte->src->owner) : NULL;
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 54d67fd6..896bf5a3 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -110,7 +110,7 @@
 
 static int ospf_preexport(struct channel *C, rte *new);
 static void ospf_reload_routes(struct channel *C);
-static int ospf_rte_better(struct rte *new, struct rte *old);
+static int ospf_rte_better(const rte *new, const rte *old);
 static u32 ospf_rte_igp_metric(const rte *rt);
 static void ospf_disp(timer *timer);
 
@@ -385,7 +385,7 @@ ospf_init(struct proto_config *CF)
 
 /* If new is better return 1 */
 static int
-ospf_rte_better(struct rte *new, struct rte *old)
+ospf_rte_better(const rte *new, const rte *old)
 {
   u32 new_metric1 = ea_get_int(new->attrs, &ea_ospf_metric1, LSINFINITY);
 
@@ -570,7 +570,7 @@ ospf_get_status(struct proto *P, byte * buf)
 }
 
 static void
-ospf_get_route_info(rte * rte, byte * buf)
+ospf_get_route_info(const rte * rte, byte * buf)
 {
   char *type = "<bug>";
 
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 2c504112..d15177da 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -1119,7 +1119,7 @@ rip_reload_routes(struct channel *C)
 static struct rte_owner_class rip_rte_owner_class;
 
 static inline struct rip_proto *
-rip_rte_proto(struct rte *rte)
+rip_rte_proto(const rte *rte)
 {
   return (rte->src->owner->class == &rip_rte_owner_class) ?
     SKIP_BACK(struct rip_proto, p.sources, rte->src->owner) : NULL;
@@ -1132,7 +1132,7 @@ rip_rte_igp_metric(const rte *rt)
 }
 
 static int
-rip_rte_better(struct rte *new, struct rte *old)
+rip_rte_better(const rte *new, const rte *old)
 {
   return rip_rte_igp_metric(new) < rip_rte_igp_metric(old);
 }
@@ -1231,7 +1231,7 @@ rip_reconfigure(struct proto *P, struct proto_config *CF)
 }
 
 static void
-rip_get_route_info(rte *rte, byte *buf)
+rip_get_route_info(const rte *rte, byte *buf)
 {
   struct rip_proto *p = rip_rte_proto(rte);
   u32 rt_metric = ea_get_int(rte->attrs, &ea_rip_metric, p->infinity);
diff --git a/proto/static/static.c b/proto/static/static.c
index 86142790..6bae827b 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -406,7 +406,7 @@ static_reload_routes(struct channel *C)
 }
 
 static int
-static_rte_better(rte *new, rte *old)
+static_rte_better(const rte *new, const rte *old)
 {
   u32 n = ea_get_int(new->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   u32 o = ea_get_int(old->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
@@ -414,7 +414,7 @@ static_rte_better(rte *new, rte *old)
 }
 
 static int
-static_rte_mergable(rte *pri, rte *sec)
+static_rte_mergable(const rte *pri, const rte *sec)
 {
   u32 a = ea_get_int(pri->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
   u32 b = ea_get_int(sec->attrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN);
@@ -709,7 +709,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src)
 }
 
 static void
-static_get_route_info(rte *rte, byte *buf)
+static_get_route_info(const rte *rte, byte *buf)
 {
   eattr *a = ea_find(rte->attrs, &ea_gen_igp_metric);
   u32 pref = rt_get_preference(rte);
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index fdfaa2d4..9e6ddb45 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -355,7 +355,7 @@ rte_feed_count(net *n)
 }
 
 static void
-rte_feed_obtain(net *n, rte **feed, uint count)
+rte_feed_obtain(net *n, const rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -386,7 +386,7 @@ krt_export_net(struct krt_proto *p, net *net)
     if (!count)
       return NULL;
 
-    rte **feed = alloca(count * sizeof(rte *));
+    const rte **feed = alloca(count * sizeof(rte *));
     rte_feed_obtain(net, feed, count);
     return rt_export_merged(c, feed, count, krt_filter_lp, 1);
   }
@@ -793,7 +793,7 @@ krt_feed_end(struct channel *C)
 }
 
 static int
-krt_rte_better(rte *new, rte *old)
+krt_rte_better(const rte *new, const rte *old)
 {
   u32 n = ea_get_int(new->attrs, &ea_krt_metric, IGP_METRIC_UNKNOWN);
   u32 o = ea_get_int(old->attrs, &ea_krt_metric, IGP_METRIC_UNKNOWN);

From 0b7657a9dc449fc19f6c06a99e9b86ffad37570e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 31 Mar 2023 10:46:17 +0200
Subject: [PATCH 277/431] Route feed marks only the relevant pending exports as
 done

---
 nest/proto.c      |  2 +-
 nest/rt-show.c    |  3 ++-
 nest/rt-table.c   | 60 ++++++++++++++++++++++++++++++++++++-----------
 nest/rt.h         | 19 +++++++++------
 proto/bgp/attrs.c |  8 +++++--
 proto/bgp/bgp.h   |  2 +-
 6 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index bdb905c9..e02e232d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -319,7 +319,7 @@ channel_export_one_roa(struct rt_export_request *req, const net_addr *net UNUSED
   /* TODO: use the information about what roa has changed */
   settle_kick(&s->settle, s->c->proto->loop);
 
-  rpe_mark_seen_all(req->hook, first, NULL);
+  rpe_mark_seen_all(req->hook, first, NULL, NULL);
 }
 
 static void
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 40202ef6..a5c7dc8f 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -211,7 +211,8 @@ rt_show_net(struct rt_show_data *d, const net_addr *n, const rte **feed, uint co
 
 static void
 rt_show_net_export_bulk(struct rt_export_request *req, const net_addr *n,
-    struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
+    struct rt_pending_export *first UNUSED, struct rt_pending_export *last UNUSED,
+    const rte **feed, uint count)
 {
   struct rt_show_data *d = SKIP_BACK(struct rt_show_data, req, req);
   return rt_show_net(d, n, feed, count);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d52131c3..83230802 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -920,7 +920,8 @@ channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *r
 }
 
 void
-rt_notify_accepted(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
+rt_notify_accepted(struct rt_export_request *req, const net_addr *n,
+    struct rt_pending_export *first, struct rt_pending_export *last,
     const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
@@ -975,6 +976,8 @@ done:
 	old_best = &rpe->old->rte;
       }
     }
+    if (rpe == last)
+      break;
   }
 
   /* Nothing to export */
@@ -1047,7 +1050,8 @@ rt_export_merged(struct channel *c, const rte **feed, uint count, linpool *pool,
 }
 
 void
-rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first,
+rt_notify_merged(struct rt_export_request *req, const net_addr *n,
+    struct rt_pending_export *first, struct rt_pending_export *last,
     const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
@@ -1084,6 +1088,8 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n, struct rt_pen
 	old_best = &rpe->old->rte;
       }
     }
+    if (rpe == last)
+      break;
   }
 
   /* Prepare new merged route */
@@ -1140,7 +1146,9 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
 }
 
 void
-rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
+rt_feed_any(struct rt_export_request *req, const net_addr *net,
+    struct rt_pending_export *first, struct rt_pending_export *last,
+    const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
@@ -1150,6 +1158,13 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pendin
       rte n0 = *feed[i];
       rt_notify_basic(c, net, &n0, NULL);
     }
+
+  RPE_WALK(first, rpe, NULL)
+  {
+    channel_rpe_mark_seen(req, rpe);
+    if (rpe == last)
+      break;
+  }
 }
 
 void
@@ -1222,6 +1237,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
   {
     net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
     RT_LOCK(tab);
+    struct rt_pending_export *last = net->last;
     uint count = rte_feed_count(net);
     const rte **feed = NULL;
     if (count)
@@ -1230,7 +1246,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
       rte_feed_obtain(net, feed, count);
     }
     RT_UNLOCK(tab);
-    hook->req->export_bulk(hook->req, n, rpe, feed, count);
+    hook->req->export_bulk(hook->req, n, rpe, last, feed, count);
   }
   else
     bug("Export request must always provide an export method");
@@ -2620,7 +2636,7 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
       || !trie_match_net(dst->flowspec_trie, net))
   {
     RT_UNLOCK(dst_pub);
-    rpe_mark_seen_all(req->hook, first, NULL);
+    rpe_mark_seen_all(req->hook, first, NULL, NULL);
     return;
   }
 
@@ -4205,7 +4221,10 @@ typedef struct {
     struct rt_pending_export *rpe;
     struct {
       const rte **feed;
-      uint *start;
+      struct rt_feed_block_aux {
+	struct rt_pending_export *first, *last;
+	uint start;
+      } *aux;
     };
   };
 } rt_feed_block;
@@ -4224,11 +4243,19 @@ rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
       if (!b->cnt)
       {
 	b->feed = tmp_alloc(sizeof(rte *) * MAX(MAX_FEED_BLOCK, cnt));
-	b->start = tmp_alloc(sizeof(uint) * ((cnt >= MAX_FEED_BLOCK) ? 2 : (MAX_FEED_BLOCK + 2 - cnt)));
+
+	uint aux_block_size = (cnt >= MAX_FEED_BLOCK) ? 2 : (MAX_FEED_BLOCK + 2 - cnt);
+	b->aux = tmp_alloc(sizeof(struct rt_feed_block_aux) * aux_block_size);
       }
 
       rte_feed_obtain(n, &b->feed[b->cnt], cnt);
-      b->start[b->pos++] = b->cnt;
+
+      b->aux[b->pos++] = (struct rt_feed_block_aux) {
+	.start = b->cnt,
+	.first = n->first,
+	.last = n->last,
+      };
+
       b->cnt += cnt;
     }
     else if (b->pos == MAX_FEED_BLOCK)
@@ -4242,7 +4269,6 @@ rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
     }
   }
 
-  rpe_mark_seen_all(&c->h, n->first, NULL);
   return 1;
 }
 
@@ -4254,11 +4280,13 @@ rt_process_feed(struct rt_table_export_hook *c, rt_feed_block *b)
 
   if (c->h.req->export_bulk)
   {
-    b->start[b->pos] = b->cnt;
+    b->aux[b->pos].start =  b->cnt;
     for (uint p = 0; p < b->pos; p++)
     {
-      const rte **feed = &b->feed[b->start[p]];
-      c->h.req->export_bulk(c->h.req, feed[0]->net, NULL, feed, b->start[p+1] - b->start[p]);
+      struct rt_feed_block_aux *aux = &b->aux[p];
+      const rte **feed = &b->feed[aux->start];
+
+      c->h.req->export_bulk(c->h.req, feed[0]->net, aux->first, aux->last, feed, (aux+1)->start - aux->start);
     }
   }
   else
@@ -4403,7 +4431,9 @@ rt_feed_for(void *data)
  *	Import table
  */
 
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net,
+    struct rt_pending_export *first, struct rt_pending_export *last,
+    const rte **feed, uint count)
 {
   struct channel *c = SKIP_BACK(struct channel, reload_req, req);
 
@@ -4420,6 +4450,8 @@ void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *n
       /* And reload the route */
       rte_update(c, net, &new, new.src);
     }
+
+  rpe_mark_seen_all(req->hook, first, last, NULL);
 }
 
 
@@ -4548,7 +4580,7 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
   RT_LOCKED((rtable *) hc->update.data, tab)
     if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
     {
-      rpe_mark_seen_all(req->hook, first, NULL);
+      rpe_mark_seen_all(req->hook, first, NULL, NULL);
       interested = 0;
     }
 
diff --git a/nest/rt.h b/nest/rt.h
index 857ed2ca..01372b8c 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -303,7 +303,9 @@ struct rt_export_request {
    *	   and for RA_ANY, both are set to accomodate for feeding all routes but receiving single changes
    */
   void (*export_one)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-  void (*export_bulk)(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
+  void (*export_bulk)(struct rt_export_request *req, const net_addr *net,
+      struct rt_pending_export *rpe, struct rt_pending_export *last,
+      const rte **feed, uint count);
 
   void (*dump_req)(struct rt_export_request *req);
   void (*log_state_change)(struct rt_export_request *req, u8);
@@ -422,8 +424,11 @@ struct rt_pending_export *rpe_next(struct rt_pending_export *rpe, struct rte_src
 /* Mark the pending export processed */
 void rpe_mark_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
 
-#define rpe_mark_seen_all(hook, first, src) \
-  RPE_WALK((first), _rpe, (src)) rpe_mark_seen((hook), _rpe)
+#define rpe_mark_seen_all(hook, first, last, src) do { \
+  RPE_WALK((first), _rpe, (src)) { \
+    rpe_mark_seen((hook), _rpe); \
+    if (_rpe == last) break; \
+  }} while (0)
 
 /* Get pending export seen status */
 int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
@@ -444,13 +449,13 @@ void rt_exporter_init(struct rt_exporter *re);
 
 int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
 
-void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
+void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 
 void rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
 void rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe);
-void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
-void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
-void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *rpe, const rte **feed, uint count);
+void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
+void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
+void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 
 
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index f6097078..2f72719f 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1959,7 +1959,7 @@ bgp_out_table_feed(void *data)
       if (hook->h.req->export_bulk)
       {
 	const rte *feed = &es.rte;
-	hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &feed, 1);
+	hook->h.req->export_bulk(hook->h.req, n->net, &rpe, &rpe, &feed, 1);
       }
       else if (hook->h.req->export_one)
 	hook->h.req->export_one(hook->h.req, n->net, &rpe);
@@ -2657,7 +2657,9 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
 }
 
 void
-bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count)
+bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n,
+    struct rt_pending_export *first, struct rt_pending_export *last,
+    const rte **feed, uint count)
 {
   struct bgp_channel *c = SKIP_BACK(struct bgp_channel, stale_feed, req);
   struct rt_import_hook *irh = c->c.in_req.hook;
@@ -2705,6 +2707,8 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt
     /* Restore the memory state */
     lp_restore(tmp_linpool, &tmpp);
   }
+
+  rpe_mark_seen_all(req->hook, first, last, NULL);
 }
 
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 1a55fef6..b9c1192c 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -618,7 +618,7 @@ void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bu
 int bgp_rte_better(const rte *, const rte *);
 int bgp_rte_mergable(const rte *pri, const rte *sec);
 int bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
-void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *rpe UNUSED, const rte **feed, uint count);
+void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 u32 bgp_rte_igp_metric(const rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);
 int bgp_preexport(struct channel *, struct rte *);

From b8d0ba36e6a64518ac078139c24a7a01002dce21 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 27 Feb 2023 19:12:29 +0100
Subject: [PATCH 278/431] Allocator fix: thread local kept pages counter must
 be thread local

---
 sysdep/unix/alloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 6c68a865..8bd3770d 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -73,7 +73,7 @@ static event page_cleanup_event = { .hook = page_cleanup, };
 
 _Atomic int pages_kept = 0;
 _Atomic int pages_kept_locally = 0;
-static int pages_kept_here = 0;
+static _Thread_local int pages_kept_here = 0;
 
 static void *
 alloc_sys_page(void)

From d16321686eeda23eed53fa83d40099c2607c5c2c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Feb 2023 15:23:48 +0100
Subject: [PATCH 279/431] Misc allocator fixes

---
 sysdep/unix/alloc.c | 4 ++++
 sysdep/unix/main.c  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 8bd3770d..cafcc8dd 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -118,6 +118,8 @@ alloc_page(void)
     return fp;
   }
 
+  ASSERT_DIE(pages_kept_here == 0);
+
   /* If there is any free page kept hot in global storage, we use it. */
   rcu_read_lock();
   fp = atomic_load_explicit(&page_stack, memory_order_acquire);
@@ -176,6 +178,8 @@ free_page(void *ptr)
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
     atomic_store_explicit(&fp->next, local_page_stack, memory_order_relaxed);
+    local_page_stack = fp;
+
     atomic_fetch_add_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here++;
     return;
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 1ed57a99..ab076af6 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -935,6 +935,8 @@ main(int argc, char **argv)
   if (parse_and_exit)
     exit(0);
 
+  flush_local_pages();
+
   if (!run_in_foreground)
     {
       pid_t pid = fork();

From 8e6abea41eca5c18b03e46706cbfa2972085f954 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Feb 2023 15:19:21 +0100
Subject: [PATCH 280/431] Linpool: State restoration works in initial linpool
 state

---
 lib/mempool.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/mempool.c b/lib/mempool.c
index 33eaec86..d10f8f1c 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -231,9 +231,9 @@ lp_restore(linpool *m, lp_state *p)
   struct lp_chunk *c;
 
   /* Move ptr to the saved pos and free all newer large chunks */
-  m->current = c = p->current;
-  m->ptr = p->ptr;
-  m->end = c ? c->data + LP_DATA_SIZE : NULL;
+  m->current = c = p->current ?: m->first;
+  m->ptr = p->ptr ?: (c ? c->data : NULL);
+  m->end = c ? (c->data + LP_DATA_SIZE) : NULL;
   m->total_large = p->total_large;
 
   while ((c = m->first_large) && (c != p->large))

From d9f0f4af7dc49c22232cc3be5e40866fc7d5dda7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Feb 2023 10:42:47 +0100
Subject: [PATCH 281/431] Resource dumps also write out block addresses

---
 lib/event.c        |  2 +-
 lib/mempool.c      | 13 +++++++++++--
 lib/resource.c     | 18 +++++++-----------
 lib/resource.h     |  4 ++--
 lib/slab.c         | 15 ++++++++++++---
 lib/timer.c        |  2 +-
 nest/config.Y      |  2 +-
 nest/locks.c       |  2 +-
 nest/rt-attr.c     |  2 +-
 nest/rt-table.c    |  9 ++++++++-
 proto/bfd/bfd.c    |  2 +-
 proto/bgp/attrs.c  |  2 +-
 sysdep/unix/io.c   |  6 +++---
 sysdep/unix/main.c |  2 +-
 14 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/lib/event.c b/lib/event.c
index 55e7f446..68888a4c 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -168,7 +168,7 @@ ev_postpone(event *e)
 }
 
 static void
-ev_dump(resource *r)
+ev_dump(resource *r, unsigned indent UNUSED)
 {
   event *e = (event *) r;
 
diff --git a/lib/mempool.c b/lib/mempool.c
index d10f8f1c..5200f5e7 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -42,7 +42,7 @@ struct linpool {
 };
 
 static void lp_free(resource *);
-static void lp_dump(resource *);
+static void lp_dump(resource *, unsigned);
 static resource *lp_lookup(resource *, unsigned long);
 static struct resmem lp_memsize(resource *r);
 
@@ -262,11 +262,12 @@ lp_free(resource *r)
 }
 
 static void
-lp_dump(resource *r)
+lp_dump(resource *r, unsigned indent)
 {
   linpool *m = (linpool *) r;
   struct lp_chunk *c;
   int cnt, cntl;
+  char x[32];
 
   for(cnt=0, c=m->first; c; c=c->next, cnt++)
     ;
@@ -277,6 +278,14 @@ lp_dump(resource *r)
 	cntl,
 	m->total,
 	m->total_large);
+
+  bsprintf(x, "%%%dschunk %%p\n", indent + 2);
+  for (c=m->first; c; c=c->next)
+    debug(x, "", c);
+
+  bsprintf(x, "%%%dslarge %%p\n", indent + 2);
+  for (c=m->first_large; c; c=c->next)
+    debug(x, "", c);
 }
 
 static struct resmem
diff --git a/lib/resource.c b/lib/resource.c
index 2e367132..94b8d019 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -30,7 +30,7 @@
  * is freed upon shutdown of the module.
  */
 
-static void pool_dump(resource *);
+static void pool_dump(resource *, unsigned);
 static void pool_free(resource *);
 static resource *pool_lookup(resource *, unsigned long);
 static struct resmem pool_memsize(resource *P);
@@ -46,8 +46,6 @@ static struct resclass pool_class = {
 
 pool root_pool;
 
-static int indent;
-
 /**
  * rp_new - create a resource pool
  * @p: parent pool
@@ -95,16 +93,14 @@ pool_free(resource *P)
 }
 
 static void
-pool_dump(resource *P)
+pool_dump(resource *P, unsigned indent)
 {
   pool *p = (pool *) P;
   resource *r;
 
   debug("%s\n", p->name);
-  indent += 3;
   WALK_LIST(r, p->inside)
-    rdump(r);
-  indent -= 3;
+    rdump(r, indent + 3);
 }
 
 static struct resmem
@@ -194,7 +190,7 @@ rfree(void *res)
  * It works by calling a class-specific dump function.
  */
 void
-rdump(void *res)
+rdump(void *res, unsigned indent)
 {
   char x[16];
   resource *r = res;
@@ -204,7 +200,7 @@ rdump(void *res)
   if (r)
     {
       debug("%s ", r->class->name);
-      r->class->dump(r);
+      r->class->dump(r, indent);
     }
   else
     debug("NULL\n");
@@ -264,7 +260,7 @@ rlookup(unsigned long a)
 
   debug("Looking up %08lx\n", a);
   if (r = pool_lookup(&root_pool.r, a))
-    rdump(r);
+    rdump(r, 3);
   else
     debug("Not found.\n");
 }
@@ -331,7 +327,7 @@ static void mbl_free(resource *r UNUSED)
 {
 }
 
-static void mbl_debug(resource *r)
+static void mbl_debug(resource *r, unsigned indent UNUSED)
 {
   struct mblock *m = (struct mblock *) r;
 
diff --git a/lib/resource.h b/lib/resource.h
index 5d9e2165..911b990d 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -30,7 +30,7 @@ struct resclass {
   char *name;				/* Resource class name */
   unsigned size;			/* Standard size of single resource */
   void (*free)(resource *);		/* Freeing function */
-  void (*dump)(resource *);		/* Dump to debug output */
+  void (*dump)(resource *, unsigned indent);		/* Dump to debug output */
   resource *(*lookup)(resource *, unsigned long);	/* Look up address (only for debugging) */
   struct resmem (*memsize)(resource *);	/* Return size of memory used by the resource, may be NULL */
 };
@@ -51,7 +51,7 @@ void resource_init(void);
 pool *rp_new(pool *, const char *);	/* Create new pool */
 pool *rp_newf(pool *, const char *, ...);	/* Create a new pool with a formatted string as its name */
 void rfree(void *);			/* Free single resource */
-void rdump(void *);			/* Dump to debug output */
+void rdump(void *, unsigned indent);	/* Dump to debug output */
 struct resmem rmemsize(void *res);		/* Return size of memory used by the resource */
 void rlookup(unsigned long);		/* Look up address (only for debugging) */
 void rmove(void *, pool *);		/* Move to a different pool */
diff --git a/lib/slab.c b/lib/slab.c
index cf2ecc70..23316e82 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -41,7 +41,7 @@
 #endif
 
 static void slab_free(resource *r);
-static void slab_dump(resource *r);
+static void slab_dump(resource *r, unsigned indent);
 static resource *slab_lookup(resource *r, unsigned long addr);
 static struct resmem slab_memsize(resource *r);
 
@@ -118,7 +118,7 @@ slab_free(resource *r)
 }
 
 static void
-slab_dump(resource *r)
+slab_dump(resource *r, unsigned indent UNUSED)
 {
   slab *s = (slab *) r;
   int cnt = 0;
@@ -378,7 +378,7 @@ slab_free(resource *r)
 }
 
 static void
-slab_dump(resource *r)
+slab_dump(resource *r, unsigned indent UNUSED)
 {
   slab *s = (slab *) r;
   int ec=0, pc=0, fc=0;
@@ -390,6 +390,15 @@ slab_dump(resource *r)
   WALK_TLIST(sl_head, h, &s->full_heads)
     fc++;
   debug("(%de+%dp+%df blocks per %d objs per %d bytes)\n", ec, pc, fc, s->objs_per_slab, s->obj_size);
+
+  char x[16];
+  bsprintf(x, "%%%ds%%s %%p\n", indent + 2);
+  WALK_TLIST(sl_head, h, &s->full_heads)
+    debug(x, "", "full", h);
+  WALK_TLIST(sl_head, h, &s->partial_heads)
+    debug(x, "", "partial", h);
+  WALK_TLIST(sl_head, h, &s->empty_heads)
+    debug(x, "", "empty", h);
 }
 
 static struct resmem
diff --git a/lib/timer.c b/lib/timer.c
index ff6975a4..4e4aa55e 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -58,7 +58,7 @@ tm_free(resource *r)
 }
 
 static void
-tm_dump(resource *r)
+tm_dump(resource *r, unsigned indent UNUSED)
 {
   timer *t = (void *) r;
 
diff --git a/nest/config.Y b/nest/config.Y
index dc174b7b..8c3ee8ad 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -868,7 +868,7 @@ sym_args:
 
 CF_CLI_HELP(DUMP, ..., [[Dump debugging information]])
 CF_CLI(DUMP RESOURCES,,, [[Dump all allocated resource]])
-{ rdump(&root_pool); cli_msg(0, ""); } ;
+{ rdump(&root_pool, 0); cli_msg(0, ""); } ;
 CF_CLI(DUMP SOCKETS,,, [[Dump open sockets]])
 { sk_dump_all(); cli_msg(0, ""); } ;
 CF_CLI(DUMP EVENTS,,, [[Dump event log]])
diff --git a/nest/locks.c b/nest/locks.c
index fb245cdc..247d0c56 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -107,7 +107,7 @@ olock_free(resource *r)
 }
 
 static void
-olock_dump(resource *r)
+olock_dump(resource *r, unsigned indent UNUSED)
 {
   struct object_lock *l = (struct object_lock *) r;
   static char *olock_states[] = { "free", "locked", "waiting", "event" };
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 761ec0d9..903926f6 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -550,7 +550,7 @@ ea_class_ref_free(resource *r)
 }
 
 static void
-ea_class_ref_dump(resource *r)
+ea_class_ref_dump(resource *r, unsigned indent UNUSED)
 {
   struct ea_class_ref *ref = SKIP_BACK(struct ea_class_ref, r, r);
   debug("name \"%s\", type=%d\n", ref->class->name, ref->class->type);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 83230802..6be47470 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2801,12 +2801,19 @@ rt_free(resource *_r)
 }
 
 static void
-rt_res_dump(resource *_r)
+rt_res_dump(resource *_r, unsigned indent)
 {
   struct rtable_private *r = SKIP_BACK(struct rtable_private, r, _r);
 
   debug("name \"%s\", addr_type=%s, rt_count=%u, use_count=%d\n",
       r->name, net_label[r->addr_type], r->rt_count, r->use_count);
+
+  char x[32];
+  bsprintf(x, "%%%dspending export %%p\n", indent + 2);
+
+  node *n;
+  WALK_LIST(n, r->exporter.pending)
+    debug(x, "", n);
 }
 
 static struct resclass rt_class = {
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 59134a22..1ef92b18 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -860,7 +860,7 @@ bfd_request_free(resource *r)
 }
 
 static void
-bfd_request_dump(resource *r)
+bfd_request_dump(resource *r, unsigned indent UNUSED)
 {
   struct bfd_request *req = (struct bfd_request *) r;
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 2f72719f..039fdff5 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1839,7 +1839,7 @@ bgp_pending_tx_rfree(resource *r)
   HASH_WALK_END;
 }
 
-static void bgp_pending_tx_dump(resource *r UNUSED) { debug("\n"); }
+static void bgp_pending_tx_dump(resource *r UNUSED, unsigned indent UNUSED) { debug("\n"); }
 
 static struct resclass bgp_pending_tx_class = {
   .name = "BGP Pending TX",
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index fc1586ff..78908676 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -76,7 +76,7 @@ rf_free(resource *r)
 }
 
 static void
-rf_dump(resource *r)
+rf_dump(resource *r, unsigned indent UNUSED)
 {
   struct rfile *a = (struct rfile *) r;
 
@@ -862,7 +862,7 @@ sk_reallocate(sock *s)
 }
 
 static void
-sk_dump(resource *r)
+sk_dump(resource *r, unsigned indent UNUSED)
 {
   sock *s = (sock *) r;
   static char *sk_type_names[] = { "TCP<", "TCP>", "TCP", "UDP", NULL, "IP", NULL, "MAGIC", "UNIX<", "UNIX", "SSH>", "SSH", "DEL!" };
@@ -2053,7 +2053,7 @@ sk_dump_all(void)
   {
     s = SKIP_BACK(sock, n, n);
     debug("%p ", s);
-    sk_dump(&s->r);
+    sk_dump(&s->r, 3);
   }
   debug("\n");
 }
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index ab076af6..a9ae842a 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -52,7 +52,7 @@ async_dump(void)
 {
   debug("INTERNAL STATE DUMP\n\n");
 
-  rdump(&root_pool);
+  rdump(&root_pool, 0);
   sk_dump_all();
   // XXXX tm_dump_all();
   if_dump_all();

From 571c4f69bfbcf437d848b332bb2f4995fea2347d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Feb 2023 09:13:35 +0100
Subject: [PATCH 282/431] More efficient IO loop event execution to avoid long
 loops

If there are lots of loops in a single thread and only some of the loops
are actually active, the other loops are now kept aside and not checked
until they actually get some timers, events or active sockets.

This should help with extreme loads like 100k tables and protocols.

Also ping and loop pickup mechanism was allowing subtle race
conditions. Now properly handling collisions between loop ping and pickup.
---
 lib/locking.h         |   1 +
 nest/proto.c          |   1 +
 nest/rt-table.c       |   1 +
 proto/bgp/bgp.c       |   8 +-
 sysdep/unix/io-loop.c | 518 ++++++++++++++++++++++++++++--------------
 sysdep/unix/io-loop.h |  24 +-
 sysdep/unix/io.c      |  78 ++-----
 7 files changed, 398 insertions(+), 233 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index 7e014bd0..6bed14bf 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -13,6 +13,7 @@ struct domain_generic;
 
 /* Here define the global lock order; first to last. */
 struct lock_order {
+  struct domain_generic *meta;
   struct domain_generic *the_bird;
   struct domain_generic *control;
   struct domain_generic *proto;
diff --git a/nest/proto.c b/nest/proto.c
index e02e232d..21460e56 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1131,6 +1131,7 @@ proto_loop_stopped(void *ptr)
 
   birdloop_enter(&main_birdloop);
 
+  birdloop_free(p->loop);
   p->loop = &main_birdloop;
   proto_cleanup(p);
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6be47470..54aa90a6 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4073,6 +4073,7 @@ rt_delete(void *tab_)
 
   RT_UNLOCK(RT_PUB(tab));
 
+  birdloop_free(tab->loop);
   rfree(tab->rp);
   config_del_obstacle(conf);
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index cca1283c..122b0c22 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -217,6 +217,8 @@ bgp_open(struct bgp_proto *p)
   req->port = p->cf->local_port;
   req->flags = p->cf->free_bind ? SKF_FREEBIND : 0;
 
+  BGP_TRACE(D_EVENTS, "Requesting listen socket at %I%J port %u", req->addr, req->iface, req->port);
+
   add_tail(&bgp_listen_pending, &req->n);
   ev_schedule(&bgp_listen_event);
 }
@@ -243,7 +245,9 @@ bgp_listen_create(void *_ UNUSED)
 	break;
 
     /* Not found any */
-    if (!NODE_VALID(bs))
+    if (NODE_VALID(bs))
+      BGP_TRACE(D_EVENTS, "Found a listening socket: %p", bs);
+    else
     {
       sock *sk = sk_new(proto_pool);
       sk->type = SK_TCP_PASSIVE;
@@ -275,6 +279,8 @@ bgp_listen_create(void *_ UNUSED)
 
       init_list(&bs->requests);
       add_tail(&bgp_sockets, &bs->n);
+
+      BGP_TRACE(D_EVENTS, "Created new listening socket: %p", bs);
     }
 
     add_tail(&bs->requests, &req->n);
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index cc2e0523..df162c6e 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -31,6 +31,8 @@
 
 #define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
 
+static struct birdloop *birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup);
+
 /*
  *	Nanosecond time for accounting purposes
  *
@@ -65,6 +67,9 @@ _Thread_local struct birdloop *birdloop_current;
 static _Thread_local struct birdloop *birdloop_wakeup_masked;
 static _Thread_local uint birdloop_wakeup_masked_count;
 
+#define LOOP_TRACE(loop, fmt, args...)	do { if (config && config->latency_debug) log(L_TRACE "%s (%p): " fmt, domain_name((loop)->time.domain), (loop), ##args); } while (0)
+#define THREAD_TRACE(...)		do { if (config && config->latency_debug) log(L_TRACE "Thread: " __VA_ARGS__); } while (0)
+
 event_list *
 birdloop_event_list(struct birdloop *loop)
 {
@@ -190,11 +195,13 @@ pipe_kick(struct pipe *p)
 }
 
 void
-pipe_pollin(struct pipe *p, struct pollfd *pfd)
+pipe_pollin(struct pipe *p, struct pfd *pfd)
 {
-  pfd->fd = p->fd[0];
-  pfd->events = POLLIN;
-  pfd->revents = 0;
+  BUFFER_PUSH(pfd->pfd) = (struct pollfd) {
+      .fd = p->fd[0],
+      .events = POLLIN,
+      };
+  BUFFER_PUSH(pfd->loop) = NULL;
 }
 
 static inline void
@@ -215,28 +222,80 @@ wakeup_do_kick(struct bird_thread *loop)
   pipe_kick(&loop->wakeup);
 }
 
+static inline _Bool
+birdloop_try_ping(struct birdloop *loop, u32 ltt)
+{
+  /* Somebody else is already pinging, be idempotent */
+  if (ltt & LTT_PING)
+  {
+    LOOP_TRACE(loop, "already being pinged");
+    return 0;
+  }
+
+  /* Thread moving is an implicit ping */
+  if (ltt & LTT_MOVE)
+  {
+    LOOP_TRACE(loop, "ping while moving");
+    return 1;
+  }
+
+  /* No more flags allowed */
+  ASSERT_DIE(!ltt);
+
+  /* No ping when not picked up */
+  if (!loop->thread)
+  {
+    LOOP_TRACE(loop, "not picked up yet, can't ping");
+    return 1;
+  }
+
+  /* No ping when masked */
+  if (loop == birdloop_wakeup_masked)
+  {
+    LOOP_TRACE(loop, "wakeup masked, can't ping");
+    birdloop_wakeup_masked_count++;
+    return 1;
+  }
+
+  /* Send meta event to ping */
+  if ((loop != loop->thread->meta) && (loop != &main_birdloop))
+  {
+    LOOP_TRACE(loop, "Ping by meta event to %p", loop->thread->meta);
+    ev_send_loop(loop->thread->meta, &loop->event);
+    return 1;
+  }
+
+  /* Do the real ping */
+  LOOP_TRACE(loop, "sending pipe ping");
+  wakeup_do_kick(loop->thread);
+  return 0;
+}
+
 static inline void
 birdloop_do_ping(struct birdloop *loop)
 {
-  if (!loop->thread)
-    return;
+  /* Register our ping effort */
+  u32 ltt = atomic_fetch_or_explicit(&loop->thread_transition, LTT_PING, memory_order_acq_rel);
 
-  if (atomic_fetch_add_explicit(&loop->thread->ping_sent, 1, memory_order_acq_rel))
-    return;
-
-  if (loop == birdloop_wakeup_masked)
-    birdloop_wakeup_masked_count++;
-  else
-    wakeup_do_kick(loop->thread);
+  /* Try to ping in multiple ways */
+  if (birdloop_try_ping(loop, ltt))
+    atomic_fetch_and_explicit(&loop->thread_transition, ~LTT_PING, memory_order_acq_rel);
 }
 
 void
 birdloop_ping(struct birdloop *loop)
 {
-  if (birdloop_inside(loop) && !loop->ping_pending)
-    loop->ping_pending++;
-  else
+  if (!birdloop_inside(loop))
+  {
+    LOOP_TRACE(loop, "ping from outside");
     birdloop_do_ping(loop);
+  }
+  else
+  {
+    LOOP_TRACE(loop, "ping from inside, pending=%d", loop->ping_pending);
+    if (!loop->ping_pending)
+      loop->ping_pending++;
+  }
 }
 
 
@@ -254,6 +313,7 @@ sockets_init(struct birdloop *loop)
 static void
 sockets_add(struct birdloop *loop, sock *s)
 {
+  LOOP_TRACE(loop, "adding socket %p (total=%d)", s, loop->sock_num);
   add_tail(&loop->sock_list, &s->n);
   loop->sock_num++;
 
@@ -278,6 +338,8 @@ sockets_remove(struct birdloop *loop, sock *s)
     return;
 
   /* Decouple the socket from the loop at all. */
+  LOOP_TRACE(loop, "removing socket %p (total=%d)", s, loop->sock_num);
+
   rem_node(&s->n);
   loop->sock_num--;
   if (loop->thread)
@@ -302,30 +364,30 @@ sk_stop(sock *s)
 static inline uint sk_want_events(sock *s)
 { return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
 
-static struct pollfd *
-sockets_prepare(struct birdloop *loop, struct pollfd *pfd, struct pollfd *end)
+void
+sockets_prepare(struct birdloop *loop, struct pfd *pfd)
 {
   node *n;
-  loop->pfd = pfd;
-
   WALK_LIST(n, loop->sock_list)
   {
     sock *s = SKIP_BACK(sock, n, n);
+    uint w = sk_want_events(s);
 
-    /* Out of space for pfds. Force reallocation. */
-    if (pfd >= end)
-      return NULL;
+    if (!w)
+    {
+      s->index = -1;
+      continue;
+    }
 
-    s->index = pfd - loop->pfd;
+    s->index = pfd->pfd.used;
+    LOOP_TRACE(loop, "socket %p poll index is %d", s, s->index);
 
-    pfd->fd = s->fd;
-    pfd->events = sk_want_events(s);
-    pfd->revents = 0;
-
-    pfd++;
+    BUFFER_PUSH(pfd->pfd) = (struct pollfd) {
+	.fd = s->fd,
+	.events = sk_want_events(s),
+    };
+    BUFFER_PUSH(pfd->loop) = loop;
   }
-
-  return pfd;
 }
 
 int sk_read(sock *s, int revents);
@@ -334,10 +396,9 @@ int sk_write(sock *s);
 static void
 sockets_fire(struct birdloop *loop)
 {
-  struct pollfd *pfd = loop->pfd;
-
   times_update();
 
+  struct pollfd *pfd = loop->thread->pfd->pfd.data;
   sock *s; node *n, *nxt;
   WALK_LIST2_DELSAFE(s, n, nxt, loop->sock_list, n)
   {
@@ -378,6 +439,99 @@ static list bird_thread_pickup;
 
 static _Thread_local struct bird_thread *this_thread;
 
+static void
+birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
+{
+  /* Signal our moving effort */
+  u32 ltt = atomic_fetch_or_explicit(&loop->thread_transition, LTT_MOVE, memory_order_acq_rel);
+  ASSERT_DIE((ltt & LTT_MOVE) == 0);
+
+  while (ltt & LTT_PING)
+  {
+    birdloop_yield();
+    ltt = atomic_load_explicit(&loop->thread_transition, memory_order_acquire);
+    ASSERT_DIE(ltt & LTT_MOVE);
+  }
+  /* Now we are free of running pings */
+
+  if (loop->thread = thr)
+    add_tail(&thr->loops, &loop->n);
+  else
+  {
+    LOCK_DOMAIN(resource, birdloop_domain);
+    add_tail(&birdloop_pickup, &loop->n);
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+  }
+
+  /* Finished */
+  atomic_fetch_and_explicit(&loop->thread_transition, ~LTT_MOVE, memory_order_acq_rel);
+
+  /* Request to run by force */
+  ev_send_loop(loop->thread->meta, &loop->event);
+}
+
+static struct birdloop *
+birdloop_take(void)
+{
+  struct birdloop *loop = NULL;
+
+  LOCK_DOMAIN(resource, birdloop_domain);
+  if (!EMPTY_LIST(birdloop_pickup))
+  {
+    /* Take the first loop from the pickup list and unlock */
+    loop = SKIP_BACK(struct birdloop, n, HEAD(birdloop_pickup));
+    rem_node(&loop->n);
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+
+    birdloop_set_thread(loop, this_thread);
+
+    /* This thread goes to the end of the pickup list */
+    LOCK_DOMAIN(resource, birdloop_domain);
+    rem_node(&this_thread->n);
+    add_tail(&bird_thread_pickup, &this_thread->n);
+
+    /* If there are more loops to be picked up, wakeup the next thread in order */
+    if (!EMPTY_LIST(birdloop_pickup))
+      wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+  }
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+
+  return loop;
+}
+
+static void
+birdloop_drop(struct birdloop *loop)
+{
+  /* Remove loop from this thread's list */
+  rem_node(&loop->n);
+
+  /* Unset loop's thread */
+  if (birdloop_inside(loop))
+    birdloop_set_thread(loop, NULL);
+  else
+  {
+    birdloop_enter(loop);
+    birdloop_set_thread(loop, NULL);
+    birdloop_leave(loop);
+  }
+
+  /* Put loop into pickup list */
+  LOCK_DOMAIN(resource, birdloop_domain);
+  add_tail(&birdloop_pickup, &loop->n);
+  UNLOCK_DOMAIN(resource, birdloop_domain);
+}
+
+static int
+poll_timeout(struct birdloop *loop)
+{
+  timer *t = timers_first(&loop->time);
+  if (!t)
+    return -1;
+
+  btime remains = tm_remains(t);
+  return remains TO_MS + ((remains TO_MS) MS < remains);
+}
+
 static void *
 bird_thread_main(void *arg)
 {
@@ -389,103 +543,79 @@ bird_thread_main(void *arg)
   tmp_init(thr->pool);
   init_list(&thr->loops);
 
-  u32 refresh_sockets = 1;
+  thr->meta = birdloop_new_internal(thr->pool, DOMAIN_ORDER(meta), "Thread Meta", 0);
+  thr->meta->thread = thr;
+  birdloop_enter(thr->meta);
 
-  struct pollfd *pfd, *end;
+  u32 refresh_sockets = 1;
+  struct pfd pfd;
+  BUFFER_INIT(pfd.pfd, thr->pool, 16);
+  BUFFER_INIT(pfd.loop, thr->pool, 16);
+  thr->pfd = &pfd;
 
   while (1)
   {
-    /* Wakeup at least once a minute. */
-    int timeout = 60000;
+    int timeout;
 
     /* Pickup new loops */
-    LOCK_DOMAIN(resource, birdloop_domain);
-    if (!EMPTY_LIST(birdloop_pickup))
+    struct birdloop *loop = birdloop_take();
+    if (loop)
     {
-      struct birdloop *loop = SKIP_BACK(struct birdloop, n, HEAD(birdloop_pickup));
-      rem_node(&loop->n);
-      UNLOCK_DOMAIN(resource, birdloop_domain);
-
-      add_tail(&thr->loops, &loop->n);
-
       birdloop_enter(loop);
-      loop->thread = thr;
       if (!EMPTY_LIST(loop->sock_list))
 	refresh_sockets = 1;
       birdloop_leave(loop);
-
-      /* If there are more loops to be picked up, wakeup the next thread */
-      LOCK_DOMAIN(resource, birdloop_domain);
-      rem_node(&thr->n);
-      add_tail(&bird_thread_pickup, &thr->n);
-
-      if (!EMPTY_LIST(birdloop_pickup))
-	wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
     }
-    UNLOCK_DOMAIN(resource, birdloop_domain);
 
-    struct birdloop *loop; node *nn;
-    WALK_LIST2(loop, nn, thr->loops, n)
+    /* Schedule all loops with timed out timers */
+    timers_fire(&thr->meta->time, 0);
+
+    /* Run all scheduled loops */
+    int more_events = ev_run_list(&thr->meta->event_list);
+    if (more_events)
     {
-      birdloop_enter(loop);
-      u64 after_enter = ns_now();
-
-      timer *t;
-
-      times_update();
-      timers_fire(&loop->time, 0);
-      int again = birdloop_process_flags(loop) + ev_run_list(&loop->event_list);
-
-#if 0
-      if (loop->n.next->next)
-	__builtin_prefetch(SKIP_BACK(struct birdloop, n, loop->n.next)->time.domain);
-#endif
-
-      if (again)
-	timeout = MIN(0, timeout);
-      else if (t = timers_first(&loop->time))
-	timeout = MIN(((tm_remains(t) TO_MS) + 1), timeout);
-
-      u64 before_leave = ns_now();
-      loop->total_time_spent_ns += (before_leave - after_enter);
-      birdloop_leave(loop);
-
-      ev_run_list(&thr->priority_events);
+      THREAD_TRACE("More events to run");
+      timeout = 0;
+    }
+    else
+    {
+      timeout = poll_timeout(thr->meta);
+      if (timeout == -1)
+	THREAD_TRACE("No timers, no events");
+      else
+	THREAD_TRACE("Next timer in %d ms", timeout);
     }
 
+    /* Run priority events before sleeping */
+    ev_run_list(&thr->priority_events);
+
+    /* Do we have to refresh sockets? */
     refresh_sockets += atomic_exchange_explicit(&thr->poll_changed, 0, memory_order_acq_rel);
 
-    if (!refresh_sockets && ((timeout < 0) || (timeout > 5000)))
-      flush_local_pages();
-
-    while (refresh_sockets)
+    if (refresh_sockets)
     {
-sock_retry:;
-      end = (pfd = thr->pfd) + thr->pfd_max;
+      BUFFER_FLUSH(pfd.pfd);
+      BUFFER_FLUSH(pfd.loop);
 
-      /* Add internal wakeup fd */
-      pipe_pollin(&thr->wakeup, pfd);
-      pfd++;
+      pipe_pollin(&thr->wakeup, &pfd);
 
+      node *nn;
       WALK_LIST2(loop, nn, thr->loops, n)
       {
 	birdloop_enter(loop);
-	pfd = sockets_prepare(loop, pfd, end);
+	sockets_prepare(loop, &pfd);
 	birdloop_leave(loop);
-
-	if (!pfd)
-	{
-	  mb_free(thr->pfd);
-	  thr->pfd = mb_alloc(thr->pool, sizeof(struct pollfd) * (thr->pfd_max *= 2));
-	  goto sock_retry;
-	}
       }
 
+      ASSERT_DIE(pfd.loop.used == pfd.pfd.used);
       refresh_sockets = 0;
     }
+    /* Nothing to do in at least 5 seconds, flush local hot page cache */
+    else if (timeout > 5000)
+      flush_local_pages();
 
 poll_retry:;
-    int rv = poll(thr->pfd, pfd - thr->pfd, timeout);
+    int rv = poll(pfd.pfd.data, pfd.pfd.used, timeout);
     if (rv < 0)
     {
       if (errno == EINTR || errno == EAGAIN)
@@ -494,51 +624,26 @@ poll_retry:;
     }
 
     /* Drain wakeup fd */
-    if (thr->pfd[0].revents & POLLIN)
+    if (pfd.pfd.data[0].revents & POLLIN)
     {
       ASSERT_DIE(rv > 0);
       rv--;
       wakeup_drain(thr);
     }
 
-    atomic_exchange_explicit(&thr->ping_sent, 0, memory_order_acq_rel);
+    atomic_fetch_and_explicit(&thr->meta->thread_transition, ~LTT_PING, memory_order_acq_rel);
 
-    if (!rv && !atomic_exchange_explicit(&thr->run_cleanup, 0, memory_order_acq_rel))
-      continue;
-
-    /* Process stops and regular sockets */
-    node *nxt;
-    WALK_LIST2_DELSAFE(loop, nn, nxt, thr->loops, n)
-    {
-      birdloop_enter(loop);
-
-      if (loop->stopped)
-      {
-	/* Flush remaining events */
-	ASSERT_DIE(!ev_run_list(&loop->event_list));
-
-	/* Drop timers */
-	timer *t;
-	while (t = timers_first(&loop->time))
-	  tm_stop(t);
-
-	/* No sockets allowed */
-	ASSERT_DIE(EMPTY_LIST(loop->sock_list));
-	
-	/* Declare loop stopped */
-	rem_node(&loop->n);
-	birdloop_leave(loop);
-	loop->stopped(loop->stop_data);
-
-	/* Birdloop already left */
-	continue;
-      }
-      else if (rv)
-	sockets_fire(loop);
-
-      birdloop_leave(loop);
-    }
+    /* Schedule loops with active sockets */
+    if (rv)
+      for (uint i = 1; i < pfd.pfd.used; i++)
+	if (pfd.pfd.data[i].revents)
+	{
+	  LOOP_TRACE(pfd.loop.data[i], "socket id %d got revents=%d", i, pfd.pfd.data[i].revents);
+	  ev_send_loop(thr->meta, &pfd.loop.data[i]->event);
+	}
   }
+
+  bug("An infinite loop has ended.");
 }
 
 static void
@@ -563,11 +668,8 @@ bird_thread_start(void)
 
   struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
   thr->pool = p;
-  thr->pfd = mb_alloc(p, sizeof(struct pollfd) * (thr->pfd_max = 16));
   thr->cleanup_event = (event) { .hook = bird_thread_cleanup, .data = thr, };
 
-  atomic_store_explicit(&thr->ping_sent, 0, memory_order_relaxed);
-
   wakeup_init(thr);
   ev_init_list(&thr->priority_events, NULL, "Thread direct event list");
 
@@ -615,7 +717,7 @@ bird_thread_shutdown(void * _ UNUSED)
 
   UNLOCK_DOMAIN(resource, birdloop_domain);
 
-  log(L_INFO "Thread pickup size differs from dropper goal by %d%s", dif, tdl_stop ? ", stopping" : "");
+  DBG("Thread pickup size differs from dropper goal by %d%s\n", dif, tdl_stop ? ", stopping" : "");
 
   if (tdl_stop)
   {
@@ -628,29 +730,11 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Leave the thread-picker list to get no more loops */
   LOCK_DOMAIN(resource, birdloop_domain);
   rem_node(&thr->n);
+  UNLOCK_DOMAIN(resource, birdloop_domain);
 
   /* Drop loops including the thread dropper itself */
   while (!EMPTY_LIST(thr->loops))
-  {
-    /* Remove loop from this thread's list */
-    struct birdloop *loop = HEAD(thr->loops);
-    rem_node(&loop->n);
-    UNLOCK_DOMAIN(resource, birdloop_domain);
-
-    /* Unset loop's thread */
-    if (birdloop_inside(loop))
-      loop->thread = NULL;
-    else
-    {
-      birdloop_enter(loop);
-      loop->thread = NULL;
-      birdloop_leave(loop);
-    }
-
-    /* Put loop into pickup list */
-    LOCK_DOMAIN(resource, birdloop_domain);
-    add_tail(&birdloop_pickup, &loop->n);
-  }
+    birdloop_drop(HEAD(thr->loops));
 
   /* Let others know about new loops */
   if (!EMPTY_LIST(birdloop_pickup))
@@ -660,6 +744,11 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Leave the thread-dropper loop as we aren't going to return. */
   birdloop_leave(thread_dropper);
 
+  /* Stop the meta loop */
+  birdloop_leave(thr->meta);
+  domain_free(thr->meta->time.domain);
+  rfree(thr->meta->pool);
+
   /* Local pages not needed anymore */
   flush_local_pages();
 
@@ -865,8 +954,81 @@ birdloop_init(void)
   birdloop_enter_locked(&main_birdloop);
 }
 
-struct birdloop *
-birdloop_new(pool *pp, uint order, const char *name)
+static void
+birdloop_stop_internal(struct birdloop *loop)
+{
+  /* Flush remaining events */
+  ASSERT_DIE(!ev_run_list(&loop->event_list));
+
+  /* Drop timers */
+  timer *t;
+  while (t = timers_first(&loop->time))
+    tm_stop(t);
+
+  /* No sockets allowed */
+  ASSERT_DIE(EMPTY_LIST(loop->sock_list));
+
+  /* Unschedule from Meta */
+  ev_postpone(&loop->event);
+  tm_stop(&loop->timer);
+
+  /* Declare loop stopped */
+  rem_node(&loop->n);
+  birdloop_leave(loop);
+
+  /* Tail-call the stopped hook */
+  loop->stopped(loop->stop_data);
+}
+
+static void
+birdloop_run(void *_loop)
+{
+  /* Run priority events before the loop is executed */
+  ev_run_list(&this_thread->priority_events);
+
+  struct birdloop *loop = _loop;
+  birdloop_enter(loop);
+
+  if (loop->stopped)
+    /* Birdloop left inside the helper function */
+    return birdloop_stop_internal(loop);
+
+  /* Process sockets */
+  sockets_fire(loop);
+
+  /* Run timers */
+  timers_fire(&loop->time, 0);
+
+  /* Run flag handlers */
+  if (birdloop_process_flags(loop))
+  {
+    LOOP_TRACE(loop, "Flag processing needs another run");
+    ev_send_loop(this_thread->meta, &loop->event);
+  }
+
+  /* Run events */
+  ev_run_list(&loop->event_list);
+
+  /* Request meta timer */
+  timer *t = timers_first(&loop->time);
+  if (t)
+    tm_start_in(&loop->timer, tm_remains(t), this_thread->meta);
+  else
+    tm_stop(&loop->timer);
+
+  birdloop_leave(loop);
+}
+
+static void
+birdloop_run_timer(timer *tm)
+{
+  struct birdloop *loop = tm->data;
+  LOOP_TRACE(loop, "Timer ready, requesting run");
+  ev_send_loop(loop->thread->meta, &loop->event);
+}
+
+static struct birdloop *
+birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup)
 {
   struct domain_generic *dg = domain_new(name, order);
 
@@ -877,32 +1039,45 @@ birdloop_new(pool *pp, uint order, const char *name)
   loop->time.domain = dg;
   loop->time.loop = loop;
 
+  atomic_store_explicit(&loop->thread_transition, 0, memory_order_relaxed);
+
   birdloop_enter(loop);
 
   ev_init_list(&loop->event_list, loop, name);
   timers_init(&loop->time, p);
   sockets_init(loop);
 
-  LOCK_DOMAIN(resource, birdloop_domain);
-  add_tail(&birdloop_pickup, &loop->n);
-  wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  loop->event = (event) { .hook = birdloop_run, .data = loop, };
+  loop->timer = (timer) { .hook = birdloop_run_timer, .data = loop, };
+
+  if (request_pickup)
+  {
+    LOCK_DOMAIN(resource, birdloop_domain);
+    add_tail(&birdloop_pickup, &loop->n);
+    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+    UNLOCK_DOMAIN(resource, birdloop_domain);
+  }
+  else
+    loop->n.next = loop->n.prev = &loop->n;
 
   birdloop_leave(loop);
 
   return loop;
 }
 
+struct birdloop *
+birdloop_new(pool *pp, uint order, const char *name)
+{
+  return birdloop_new_internal(pp, order, name, 1);
+}
+
 static void
 birdloop_do_stop(struct birdloop *loop, void (*stopped)(void *data), void *data)
 {
   loop->stopped = stopped;
   loop->stop_data = data;
-  if (loop->thread)
-  {
-    atomic_store_explicit(&loop->thread->run_cleanup, 1, memory_order_release);
-    wakeup_do_kick(loop->thread);
-  }
+
+  birdloop_do_ping(loop);
 }
 
 void
@@ -961,6 +1136,7 @@ birdloop_leave_locked(struct birdloop *loop)
   /* Send pending pings */
   if (loop->ping_pending)
   {
+    LOOP_TRACE(loop, "sending pings on leave");
     loop->ping_pending = 0;
     birdloop_do_ping(loop);
   }
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index e23a9be0..e606f07e 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -16,8 +16,15 @@ struct pipe
   int fd[2];
 };
 
+struct pfd {
+  BUFFER(struct pollfd) pfd;
+  BUFFER(struct birdloop *) loop;
+};
+
+void sockets_prepare(struct birdloop *, struct pfd *);
+
 void pipe_new(struct pipe *);
-void pipe_pollin(struct pipe *, struct pollfd *);
+void pipe_pollin(struct pipe *, struct pfd *);
 void pipe_drain(struct pipe *);
 void pipe_kick(struct pipe *);
 
@@ -25,6 +32,9 @@ struct birdloop
 {
   node n;
 
+  event event;
+  timer timer;
+
   pool *pool;
 
   struct timeloop time;
@@ -36,6 +46,9 @@ struct birdloop
 
   uint links;
 
+  _Atomic u32 thread_transition;
+#define LTT_PING  1
+#define LTT_MOVE  2
   _Atomic u32 flags;
   struct birdloop_flag_handler *flag_handler;
 
@@ -45,7 +58,6 @@ struct birdloop
   struct birdloop *prev_loop;
 
   struct bird_thread *thread;
-  struct pollfd *pfd;
 
   u64 total_time_spent_ns;
 };
@@ -54,16 +66,13 @@ struct bird_thread
 {
   node n;
 
-  struct pollfd *pfd;
-  uint pfd_max;
-
-  _Atomic u32 ping_sent;
-  _Atomic u32 run_cleanup;
   _Atomic u32 poll_changed;
 
   struct pipe wakeup;
   event_list priority_events;
 
+  struct birdloop *meta;
+
   pthread_t thread_id;
   pthread_attr_t thread_attr;
 
@@ -71,6 +80,7 @@ struct bird_thread
 
   list loops;
   pool *pool;
+  struct pfd *pfd;
 
   event cleanup_event;
 };
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 78908676..06797096 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -140,7 +140,7 @@ times_update(void)
 
   if ((ts.tv_sec < 0) || (((u64) ts.tv_sec) > ((u64) 1 << 40)))
     log(L_WARN "Monotonic clock is crazy");
-  
+
   btime new_time = ts.tv_sec S + ts.tv_nsec NS;
 
   if (new_time < old_time)
@@ -722,7 +722,6 @@ sk_log_error(sock *s, const char *p)
  *	Actual struct birdsock code
  */
 
-static list sock_list;
 static struct birdsock *current_sock;
 static struct birdsock *stored_sock;
 
@@ -1026,7 +1025,7 @@ sk_setup(sock *s)
 static void
 sk_insert(sock *s)
 {
-  add_tail(&sock_list, &s->n);
+  add_tail(&main_birdloop.sock_list, &s->n);
 }
 
 static void
@@ -2049,7 +2048,7 @@ sk_dump_all(void)
   sock *s;
 
   debug("Open sockets:\n");
-  WALK_LIST(n, sock_list)
+  WALK_LIST(n, main_birdloop.sock_list)
   {
     s = SKIP_BACK(sock, n, n);
     debug("%p ", s);
@@ -2208,7 +2207,7 @@ watchdog_stop(void)
 void
 io_init(void)
 {
-  init_list(&sock_list);
+  init_list(&main_birdloop.sock_list);
   ev_init_list(&global_event_list, &main_birdloop, "Global event list");
   ev_init_list(&global_work_list, &main_birdloop, "Global work list");
   ev_init_list(&main_birdloop.event_list, &main_birdloop, "Global fast event list");
@@ -2229,12 +2228,11 @@ void
 io_loop(void)
 {
   int poll_tout, timeout;
-  int nfds, events, pout;
+  int events, pout;
   timer *t;
-  sock *s;
-  node *n;
-  int fdmax = 256;
-  struct pollfd *pfd = xmalloc(fdmax * sizeof(struct pollfd));
+  struct pfd pfd;
+  BUFFER_INIT(pfd.pfd, &root_pool, 16);
+  BUFFER_INIT(pfd.loop, &root_pool, 16);
 
   watchdog_start1();
   for(;;)
@@ -2255,39 +2253,11 @@ io_loop(void)
 	poll_tout = MIN(poll_tout, timeout);
       }
 
-      /* A hack to reload main io_loop() when something has changed asynchronously. */
-      pipe_pollin(&main_birdloop.thread->wakeup, &pfd[0]);
+      BUFFER_FLUSH(pfd.pfd);
+      BUFFER_FLUSH(pfd.loop);
 
-      nfds = 1;
-
-      WALK_LIST(n, sock_list)
-	{
-	  pfd[nfds] = (struct pollfd) { .fd = -1 }; /* everything other set to 0 by this */
-	  s = SKIP_BACK(sock, n, n);
-	  if (s->rx_hook)
-	    {
-	      pfd[nfds].fd = s->fd;
-	      pfd[nfds].events |= POLLIN;
-	    }
-	  if (s->tx_hook && s->ttx != s->tpos)
-	    {
-	      pfd[nfds].fd = s->fd;
-	      pfd[nfds].events |= POLLOUT;
-	    }
-	  if (pfd[nfds].fd != -1)
-	    {
-	      s->index = nfds;
-	      nfds++;
-	    }
-	  else
-	    s->index = -1;
-
-	  if (nfds >= fdmax)
-	    {
-	      fdmax *= 2;
-	      pfd = xrealloc(pfd, fdmax * sizeof(struct pollfd));
-	    }
-	}
+      pipe_pollin(&main_birdloop.thread->wakeup, &pfd);
+      sockets_prepare(&main_birdloop, &pfd);
 
       /*
        * Yes, this is racy. But even if the signal comes before this test
@@ -2319,7 +2289,7 @@ io_loop(void)
       /* And finally enter poll() to find active sockets */
       watchdog_stop();
       birdloop_leave(&main_birdloop);
-      pout = poll(pfd, nfds, poll_tout);
+      pout = poll(pfd.pfd.data, pfd.pfd.used, poll_tout);
       birdloop_enter(&main_birdloop);
       watchdog_start();
 
@@ -2331,18 +2301,18 @@ io_loop(void)
 	}
       if (pout)
 	{
-	  if (pfd[0].revents & POLLIN)
+	  if (pfd.pfd.data[0].revents & POLLIN)
 	  {
 	    /* IO loop reload requested */
 	    pipe_drain(&main_birdloop.thread->wakeup);
-	    atomic_exchange_explicit(&main_birdloop.thread->ping_sent, 0, memory_order_acq_rel);
+	    atomic_fetch_and_explicit(&main_birdloop.thread_transition, ~LTT_PING, memory_order_acq_rel);
 	    continue;
 	  }
 
 	  times_update();
 
 	  /* guaranteed to be non-empty */
-	  current_sock = SKIP_BACK(sock, n, HEAD(sock_list));
+	  current_sock = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
 
 	  while (current_sock)
 	    {
@@ -2357,19 +2327,19 @@ io_loop(void)
 	      int steps;
 
 	      steps = MAX_STEPS;
-	      if (s->fast_rx && (pfd[s->index].revents & POLLIN) && s->rx_hook)
+	      if (s->fast_rx && (pfd.pfd.data[s->index].revents & POLLIN) && s->rx_hook)
 		do
 		  {
 		    steps--;
 		    io_log_event(s->rx_hook, s->data);
-		    e = sk_read(s, pfd[s->index].revents);
+		    e = sk_read(s, pfd.pfd.data[s->index].revents);
 		    if (s != current_sock)
 		      goto next;
 		  }
 		while (e && s->rx_hook && steps);
 
 	      steps = MAX_STEPS;
-	      if (pfd[s->index].revents & POLLOUT)
+	      if (pfd.pfd.data[s->index].revents & POLLOUT)
 		do
 		  {
 		    steps--;
@@ -2392,7 +2362,7 @@ io_loop(void)
 	  int count = 0;
 	  current_sock = stored_sock;
 	  if (current_sock == NULL)
-	    current_sock = SKIP_BACK(sock, n, HEAD(sock_list));
+	    current_sock = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
 
 	  while (current_sock && count < MAX_RX_STEPS)
 	    {
@@ -2403,18 +2373,18 @@ io_loop(void)
 		  goto next2;
 		}
 
-	      if (!s->fast_rx && (pfd[s->index].revents & POLLIN) && s->rx_hook)
+	      if (!s->fast_rx && (pfd.pfd.data[s->index].revents & POLLIN) && s->rx_hook)
 		{
 		  count++;
 		  io_log_event(s->rx_hook, s->data);
-		  sk_read(s, pfd[s->index].revents);
+		  sk_read(s, pfd.pfd.data[s->index].revents);
 		  if (s != current_sock)
 		    goto next2;
 		}
 
-	      if (pfd[s->index].revents & (POLLHUP | POLLERR))
+	      if (pfd.pfd.data[s->index].revents & (POLLHUP | POLLERR))
 		{
-		  sk_err(s, pfd[s->index].revents);
+		  sk_err(s, pfd.pfd.data[s->index].revents);
 		  if (s != current_sock)
 		    goto next2;
 		}

From 836e857b3098f8962c621a33f7ae5b532cf512f3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 2 Apr 2023 19:15:22 +0200
Subject: [PATCH 283/431] Sockets: Unified API for main and other loops

Now sk_open() requires an explicit IO loop to open the socket in. Also
specific functions for socket RX pause / resume are added to allow for
BGP corking.

And last but not least, socket reloop is now synchronous to resolve
weird cases of the target loop stopping before actually picking up the
relooped socket. Now the caller must ensure that both loops are locked
while relooping, and this way all sockets always have their respective
loop.
---
 lib/io-loop.h              |   8 +-
 lib/socket.h               |  12 +-
 proto/babel/packets.c      |   2 +-
 proto/bfd/bfd.c            |  11 --
 proto/bfd/packets.c        |  15 +--
 proto/bgp/bgp.c            |   4 +-
 proto/bgp/packets.c        |   5 +-
 proto/ospf/iface.c         |   4 +-
 proto/radv/packets.c       |   2 +-
 proto/rip/packets.c        |   2 +-
 proto/rpki/ssh_transport.c |   4 +-
 proto/rpki/tcp_transport.c |   4 +-
 proto/rpki/transport.c     |   2 -
 sysdep/bsd/krt-sock.c      |   2 +-
 sysdep/linux/netlink.c     |   2 +-
 sysdep/unix/io-loop.c      | 220 ++++++++++++++++++++++++-------------
 sysdep/unix/io-loop.h      |   9 +-
 sysdep/unix/io.c           | 155 ++++++++++----------------
 sysdep/unix/main.c         |   2 +-
 sysdep/unix/unix.h         |   5 +-
 20 files changed, 243 insertions(+), 227 deletions(-)

diff --git a/lib/io-loop.h b/lib/io-loop.h
index ae58bbee..502d77fc 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -16,10 +16,6 @@
 
 extern struct birdloop main_birdloop;
 
-void sk_start(sock *s);
-void sk_stop(sock *s);
-void sk_reloop(sock *s, struct birdloop *loop);
-
 /* Start a new birdloop owned by given pool and domain */
 struct birdloop *birdloop_new(pool *p, uint order, const char *name);
 
@@ -58,6 +54,10 @@ struct birdloop_flag_handler {
 void birdloop_flag(struct birdloop *loop, u32 flag);
 void birdloop_flag_set_handler(struct birdloop *, struct birdloop_flag_handler *);
 
+/* Setup sockets */
+void birdloop_add_socket(struct birdloop *, struct birdsock *);
+void birdloop_remove_socket(struct birdloop *, struct birdsock *);
+
 void birdloop_init(void);
 
 /* Yield for a little while. Use only in special cases. */
diff --git a/lib/socket.h b/lib/socket.h
index 5c69482e..4b169581 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -80,17 +80,22 @@ typedef struct birdsock {
   const char *password;			/* Password for MD5 authentication */
   const char *err;			/* Error message */
   struct ssh_sock *ssh;			/* Used in SK_SSH */
-  struct event reloop;			/* Reloop event */
+  struct birdloop *loop;		/* BIRDLoop owning this socket */
 } sock;
 
 sock *sock_new(pool *);			/* Allocate new socket */
 #define sk_new(X) sock_new(X)		/* Wrapper to avoid name collision with OpenSSL */
 
-int sk_open(sock *);			/* Open socket */
+int sk_open(sock *, struct birdloop *);		/* Open socket */
+void sk_reloop(sock *, struct birdloop *);	/* Move socket to another loop. Both loops must be locked. */
+
 int sk_rx_ready(sock *s);
+_Bool sk_tx_pending(sock *s);
 int sk_send(sock *, uint len);		/* Send data, <0=err, >0=ok, 0=sleep */
 int sk_send_to(sock *, uint len, ip_addr to, uint port); /* sk_send to given destination */
 void sk_reallocate(sock *);		/* Free and allocate tbuf & rbuf */
+void sk_pause_rx(struct birdloop *loop, sock *s);
+void sk_resume_rx(struct birdloop *loop, sock *s, int (*hook)(sock *, uint));
 void sk_set_rbsize(sock *s, uint val);	/* Resize RX buffer */
 void sk_set_tbsize(sock *s, uint val);	/* Resize TX buffer, keeping content */
 void sk_set_tbuf(sock *s, void *tbuf);	/* Switch TX buffer, NULL-> return to internal */
@@ -114,6 +119,7 @@ int sk_set_icmp6_filter(sock *s, int p1, int p2);
 void sk_log_error(sock *s, const char *p);
 
 byte * sk_rx_buffer(sock *s, int *len);	/* Temporary */
+sock *sk_next(sock *s);
 
 extern int sk_priority_control;		/* Suggested priority for control traffic, should be sysdep define */
 
@@ -127,11 +133,9 @@ extern int sk_priority_control;		/* Suggested priority for control traffic, shou
 #define SKF_HIGH_PORT	0x20	/* Choose port from high range if possible */
 #define SKF_FREEBIND	0x40	/* Allow socket to bind to a nonlocal address */
 
-#define SKF_THREAD	0x100	/* Socked used in thread, Do not add to main loop */
 #define SKF_TRUNCATED	0x200	/* Received packet was truncated, set by IO layer */
 #define SKF_HDRINCL	0x400	/* Used internally */
 #define SKF_PKTINFO	0x800	/* Used internally */
-#define SKF_PASSIVE_THREAD  0x1000  /* Child sockets used in thread, do not add to main loop */
 
 /*
  *	Socket types		     SA SP DA DP IF  TTL SendTo	(?=may, -=must not, *=must)
diff --git a/proto/babel/packets.c b/proto/babel/packets.c
index d4acc170..f13bb5ba 100644
--- a/proto/babel/packets.c
+++ b/proto/babel/packets.c
@@ -1617,7 +1617,7 @@ babel_open_socket(struct babel_iface *ifa)
   sk->ttl = 1;
   sk->flags = SKF_LADDR_RX;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
   if (sk_setup_multicast(sk) < 0)
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 1ef92b18..b6ccdb9a 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -603,16 +603,10 @@ bfd_free_iface(struct bfd_iface *ifa)
     return;
 
   if (ifa->sk)
-  {
-    sk_stop(ifa->sk);
     rfree(ifa->sk);
-  }
 
   if (ifa->rx)
-  {
-    sk_stop(ifa->rx);
     rfree(ifa->rx);
-  }
 
   rem_node(&ifa->n);
   mb_free(ifa);
@@ -1100,11 +1094,6 @@ bfd_shutdown(struct proto *P)
 
   bfd_drop_requests(p);
 
-  if (p->rx4_1) sk_stop(p->rx4_1);
-  if (p->rx4_m) sk_stop(p->rx4_m);
-  if (p->rx6_1) sk_stop(p->rx6_1);
-  if (p->rx6_m) sk_stop(p->rx6_m);
-
   return PS_DOWN;
 }
 
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index 2200ab09..a22f223b 100644
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -430,12 +430,11 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop, int af)
   /* TODO: configurable ToS and priority */
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->priority = sk_priority_control;
-  sk->flags = SKF_THREAD | SKF_LADDR_RX | (!multihop ? SKF_TTL_RX : 0);
+  sk->flags = SKF_LADDR_RX | (!multihop ? SKF_TTL_RX : 0);
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
-  sk_start(sk);
   return sk;
 
  err:
@@ -462,12 +461,11 @@ bfd_open_rx_sk_bound(struct bfd_proto *p, ip_addr local, struct iface *ifa)
   /* TODO: configurable ToS and priority */
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->priority = sk_priority_control;
-  sk->flags = SKF_THREAD | SKF_BIND | (ifa ? SKF_TTL_RX : 0);
+  sk->flags = SKF_BIND | (ifa ? SKF_TTL_RX : 0);
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
-  sk_start(sk);
   return sk;
 
  err:
@@ -494,12 +492,11 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
   sk->tos = IP_PREC_INTERNET_CONTROL;
   sk->priority = sk_priority_control;
   sk->ttl = ifa ? 255 : -1;
-  sk->flags = SKF_THREAD | SKF_BIND | SKF_HIGH_PORT;
+  sk->flags = SKF_BIND | SKF_HIGH_PORT;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
-  sk_start(sk);
   return sk;
 
  err:
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 122b0c22..a9028353 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -263,7 +263,7 @@ bgp_listen_create(void *_ UNUSED)
       sk->rx_hook = bgp_incoming_connection;
       sk->err_hook = bgp_listen_sock_err;
 
-      if (sk_open(sk) < 0)
+      if (sk_open(sk, &main_birdloop) < 0)
       {
 	sk_log_error(sk, p->p.name);
 	log(L_ERR "%s: Cannot open listening socket", p->p.name);
@@ -1203,7 +1203,7 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
   bgp_setup_sk(conn, s);
   bgp_conn_set_state(conn, BS_CONNECT);
 
-  if (sk_open(s) < 0)
+  if (sk_open(s, p->p.loop) < 0)
     goto err;
 
   /* Set minimal receive TTL if needed */
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 924d6828..c90798a0 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -3015,7 +3015,7 @@ bgp_kick_tx(void *vconn)
     ;
 
   if (!max && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    proto_send_event(&conn->bgp->p, conn->tx_ev);
 }
 
 void
@@ -3023,13 +3023,14 @@ bgp_tx(sock *sk)
 {
   struct bgp_conn *conn = sk->data;
 
+  ASSERT_DIE(birdloop_inside(conn->bgp->p.loop));
   DBG("BGP: TX hook\n");
   uint max = 1024;
   while (--max && (bgp_fire_tx(conn) > 0))
     ;
 
   if (!max && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    proto_send_event(&conn->bgp->p, conn->tx_ev);
 }
 
 
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 1919bccb..0aa7fa00 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -136,7 +136,7 @@ ospf_sk_open(struct ospf_iface *ifa)
   sk->flags = SKF_LADDR_RX | (ifa->check_ttl ? SKF_TTL_RX : 0);
   sk->ttl = ifa->cf->ttl_security ? 255 : 1;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
   /* 12 is an offset of the checksum in an OSPFv3 packet */
@@ -220,7 +220,7 @@ ospf_open_vlink_sk(struct ospf_proto *p)
   sk->data = (void *) p;
   sk->flags = 0;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
   /* 12 is an offset of the checksum in an OSPFv3 packet */
diff --git a/proto/radv/packets.c b/proto/radv/packets.c
index 5cd8b2de..c6b565d2 100644
--- a/proto/radv/packets.c
+++ b/proto/radv/packets.c
@@ -493,7 +493,7 @@ radv_sk_open(struct radv_iface *ifa)
   sk->data = ifa;
   sk->flags = SKF_LADDR_RX;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, ifa->ra->p.loop) < 0)
     goto err;
 
   /* We want listen just to ICMPv6 messages of type RS and RA */
diff --git a/proto/rip/packets.c b/proto/rip/packets.c
index 9c3bd7a3..fecdf896 100644
--- a/proto/rip/packets.c
+++ b/proto/rip/packets.c
@@ -1012,7 +1012,7 @@ rip_open_socket(struct rip_iface *ifa)
 
   /* sk->rbsize and sk->tbsize are handled in rip_iface_update_buffers() */
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, p->p.loop) < 0)
     goto err;
 
   if (ifa->cf->mode == RIP_IM_MULTICAST)
diff --git a/proto/rpki/ssh_transport.c b/proto/rpki/ssh_transport.c
index 223afa80..425ad460 100644
--- a/proto/rpki/ssh_transport.c
+++ b/proto/rpki/ssh_transport.c
@@ -35,11 +35,9 @@ rpki_tr_ssh_open(struct rpki_tr_sock *tr)
   sk->ssh->subsystem = "rpki-rtr";
   sk->ssh->state = SK_SSH_CONNECT;
 
-  if (sk_open(sk) != 0)
+  if (sk_open(sk, cache->p->p.loop) != 0)
     return RPKI_TR_ERROR;
 
-  sk_start(sk);
-
   return RPKI_TR_SUCCESS;
 }
 
diff --git a/proto/rpki/tcp_transport.c b/proto/rpki/tcp_transport.c
index 4e850c44..ebb8030f 100644
--- a/proto/rpki/tcp_transport.c
+++ b/proto/rpki/tcp_transport.c
@@ -28,11 +28,9 @@ rpki_tr_tcp_open(struct rpki_tr_sock *tr)
 
   sk->type = SK_TCP_ACTIVE;
 
-  if (sk_open(sk) != 0)
+  if (sk_open(sk, tr->cache->p->p.loop) != 0)
     return RPKI_TR_ERROR;
 
-  sk_start(sk);
-
   return RPKI_TR_SUCCESS;
 }
 
diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c
index 4026fca4..81bd6dd8 100644
--- a/proto/rpki/transport.c
+++ b/proto/rpki/transport.c
@@ -85,7 +85,6 @@ rpki_tr_open(struct rpki_tr_sock *tr)
   sk->rbsize = RPKI_RX_BUFFER_SIZE;
   sk->tbsize = RPKI_TX_BUFFER_SIZE;
   sk->tos = IP_PREC_INTERNET_CONTROL;
-  sk->flags |= SKF_THREAD;
   sk->vrf = cache->p->p.vrf;
 
   if (ipa_zero(sk->daddr) && sk->host)
@@ -121,7 +120,6 @@ rpki_tr_close(struct rpki_tr_sock *tr)
 
   if (tr->sk)
   {
-    sk_stop(tr->sk);
     rfree(tr->sk);
     tr->sk = NULL;
   }
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index e7b21474..094268b7 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -1088,7 +1088,7 @@ krt_sock_open(pool *pool, void *data, int table_id UNUSED)
   sk->fd = fd;
   sk->data = data;
 
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, &main_birdloop) < 0)
     bug("krt-sock: sk_open failed");
 
   return sk;
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index b18cb899..e8a86ce4 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -2043,7 +2043,7 @@ nl_open_async(void)
   sk->rx_hook = nl_async_hook;
   sk->err_hook = nl_async_err_hook;
   sk->fd = fd;
-  if (sk_open(sk) < 0)
+  if (sk_open(sk, &main_birdloop) < 0)
     bug("Netlink: sk_open failed");
 }
 
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index df162c6e..0e2396f7 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -310,59 +310,95 @@ sockets_init(struct birdloop *loop)
   loop->sock_num = 0;
 }
 
-static void
-sockets_add(struct birdloop *loop, sock *s)
+void
+socket_changed(sock *s)
 {
-  LOOP_TRACE(loop, "adding socket %p (total=%d)", s, loop->sock_num);
-  add_tail(&loop->sock_list, &s->n);
-  loop->sock_num++;
-
-  s->index = -1;
-  if (loop->thread)
-    atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
+  struct birdloop *loop = s->loop;
+  ASSERT_DIE(birdloop_inside(loop));
 
+  loop->sock_changed++;
   birdloop_ping(loop);
 }
 
 void
-sk_start(sock *s)
+birdloop_add_socket(struct birdloop *loop, sock *s)
 {
-  ASSERT_DIE(birdloop_current != &main_birdloop);
-  sockets_add(birdloop_current, s);
+  ASSERT_DIE(birdloop_inside(loop));
+  ASSERT_DIE(!s->loop);
+
+  LOOP_TRACE(loop, "adding socket %p (total=%d)", s, loop->sock_num);
+  add_tail(&loop->sock_list, &s->n);
+  loop->sock_num++;
+
+  s->loop = loop;
+  s->index = -1;
+
+  socket_changed(s);
 }
 
-static void
-sockets_remove(struct birdloop *loop, sock *s)
+extern sock *stored_sock; /* mainloop hack */
+
+void
+birdloop_remove_socket(struct birdloop *loop, sock *s)
 {
-  if (!enlisted(&s->n))
+  ASSERT_DIE(!enlisted(&s->n) == !s->loop);
+
+  if (!s->loop)
     return;
 
+  ASSERT_DIE(birdloop_inside(loop));
+  ASSERT_DIE(s->loop == loop);
+
   /* Decouple the socket from the loop at all. */
   LOOP_TRACE(loop, "removing socket %p (total=%d)", s, loop->sock_num);
 
+  if (loop->sock_active == s)
+    loop->sock_active = sk_next(s);
+
+  if ((loop == &main_birdloop) && (s == stored_sock))
+    stored_sock = sk_next(s);
+
   rem_node(&s->n);
   loop->sock_num--;
-  if (loop->thread)
-    atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
 
+  socket_changed(s);
+
+  s->loop = NULL;
   s->index = -1;
-
-  /* Close the filedescriptor. If it ever gets into the poll(), it just returns
-   * POLLNVAL for this fd which then is ignored because nobody checks for
-   * that result. Or some other routine opens another fd, getting this number,
-   * yet also in this case poll() at worst spuriously returns and nobody checks
-   * for the result in this fd. No further precaution is needed. */
-  close(s->fd);
 }
 
 void
-sk_stop(sock *s)
+sk_reloop(sock *s, struct birdloop *loop)
 {
-  sockets_remove(birdloop_current, s);
+  ASSERT_DIE(birdloop_inside(loop));
+  ASSERT_DIE(birdloop_inside(s->loop));
+
+  if (loop == s->loop)
+    return;
+
+  birdloop_remove_socket(s->loop, s);
+  birdloop_add_socket(loop, s);
+}
+
+void
+sk_pause_rx(struct birdloop *loop, sock *s)
+{
+  ASSERT_DIE(birdloop_inside(loop));
+  s->rx_hook = NULL;
+  socket_changed(s);
+}
+
+void
+sk_resume_rx(struct birdloop *loop, sock *s, int (*hook)(sock *, uint))
+{
+  ASSERT_DIE(birdloop_inside(loop));
+  ASSERT_DIE(hook);
+  s->rx_hook = hook;
+  socket_changed(s);
 }
 
 static inline uint sk_want_events(sock *s)
-{ return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); }
+{ return (s->rx_hook ? POLLIN : 0) | (sk_tx_pending(s) ? POLLOUT : 0); }
 
 void
 sockets_prepare(struct birdloop *loop, struct pfd *pfd)
@@ -392,40 +428,60 @@ sockets_prepare(struct birdloop *loop, struct pfd *pfd)
 
 int sk_read(sock *s, int revents);
 int sk_write(sock *s);
+void sk_err(sock *s, int revents);
 
-static void
+static int
 sockets_fire(struct birdloop *loop)
 {
+  if (EMPTY_LIST(loop->sock_list))
+    return 0;
+
+  int sch = 0;
+
   times_update();
 
   struct pollfd *pfd = loop->thread->pfd->pfd.data;
-  sock *s; node *n, *nxt;
-  WALK_LIST2_DELSAFE(s, n, nxt, loop->sock_list, n)
+  loop->sock_active = SKIP_BACK(sock, n, HEAD(loop->sock_list));
+
+  while (loop->sock_active)
   {
-    if (s->index < 0)
-      continue;
+    sock *s = loop->sock_active;
 
-    int rev = pfd[s->index].revents;
-
-    if (!rev)
-      continue;
-
-    if (rev & POLLNVAL)
-      bug("poll: invalid fd %d", s->fd);
-
-    int e = 1;
-
-    if (rev & POLLIN)
-      while (e && s->rx_hook)
-	e = sk_read(s, rev);
-
-    if (rev & POLLOUT)
+    int rev;
+    if ((s->index >= 0) && (rev = pfd[s->index].revents) && !(rev & POLLNVAL))
     {
-      atomic_store_explicit(&loop->thread->poll_changed, 1, memory_order_release);
-      while (e = sk_write(s))
-	;
+      int e = 1;
+
+      if (rev & POLLOUT)
+      {
+	while ((s == loop->sock_active) && (e = sk_write(s)))
+	  ;
+
+	if (s != loop->sock_active)
+	  continue;
+
+	if (!sk_tx_pending(s))
+	  sch++;
+      }
+
+      if (rev & POLLIN)
+	while (e && (s == loop->sock_active) && s->rx_hook)
+	  e = sk_read(s, rev);
+
+      if (s != loop->sock_active)
+	continue;
+
+      if (!(rev & (POLLOUT | POLLIN)) && (rev & POLLERR))
+	sk_err(s, rev);
+
+      if (s != loop->sock_active)
+	continue;
     }
+
+    loop->sock_active = sk_next(s);
   }
+
+  return sch;
 }
 
 /*
@@ -547,7 +603,8 @@ bird_thread_main(void *arg)
   thr->meta->thread = thr;
   birdloop_enter(thr->meta);
 
-  u32 refresh_sockets = 1;
+  thr->sock_changed = 1;
+
   struct pfd pfd;
   BUFFER_INIT(pfd.pfd, thr->pool, 16);
   BUFFER_INIT(pfd.loop, thr->pool, 16);
@@ -563,7 +620,7 @@ bird_thread_main(void *arg)
     {
       birdloop_enter(loop);
       if (!EMPTY_LIST(loop->sock_list))
-	refresh_sockets = 1;
+	thr->sock_changed = 1;
       birdloop_leave(loop);
     }
 
@@ -590,10 +647,10 @@ bird_thread_main(void *arg)
     ev_run_list(&thr->priority_events);
 
     /* Do we have to refresh sockets? */
-    refresh_sockets += atomic_exchange_explicit(&thr->poll_changed, 0, memory_order_acq_rel);
-
-    if (refresh_sockets)
+    if (thr->sock_changed)
     {
+      thr->sock_changed = 0;
+
       BUFFER_FLUSH(pfd.pfd);
       BUFFER_FLUSH(pfd.loop);
 
@@ -608,7 +665,6 @@ bird_thread_main(void *arg)
       }
 
       ASSERT_DIE(pfd.loop.used == pfd.pfd.used);
-      refresh_sockets = 0;
     }
     /* Nothing to do in at least 5 seconds, flush local hot page cache */
     else if (timeout > 5000)
@@ -957,6 +1013,15 @@ birdloop_init(void)
 static void
 birdloop_stop_internal(struct birdloop *loop)
 {
+  LOOP_TRACE(loop, "Stopping");
+
+  /* Block incoming pings */
+  u32 ltt = atomic_load_explicit(&loop->thread_transition, memory_order_acquire);
+  while (!atomic_compare_exchange_strong_explicit(
+	&loop->thread_transition, &ltt, LTT_PING,
+	memory_order_acq_rel, memory_order_acquire))
+    ;
+
   /* Flush remaining events */
   ASSERT_DIE(!ev_run_list(&loop->event_list));
 
@@ -965,17 +1030,27 @@ birdloop_stop_internal(struct birdloop *loop)
   while (t = timers_first(&loop->time))
     tm_stop(t);
 
-  /* No sockets allowed */
-  ASSERT_DIE(EMPTY_LIST(loop->sock_list));
+  /* Drop sockets */
+  sock *s;
+  WALK_LIST_FIRST2(s, n, loop->sock_list)
+    birdloop_remove_socket(loop, s);
 
   /* Unschedule from Meta */
   ev_postpone(&loop->event);
   tm_stop(&loop->timer);
 
-  /* Declare loop stopped */
+  /* Remove from thread loop list */
   rem_node(&loop->n);
+  loop->thread = NULL;
+
+  /* Leave the loop context without causing any other fuss */
+  ASSERT_DIE(!ev_active(&loop->event));
+  loop->ping_pending = 0;
   birdloop_leave(loop);
 
+  /* Request local socket reload */
+  this_thread->sock_changed++;
+
   /* Tail-call the stopped hook */
   loop->stopped(loop->stop_data);
 }
@@ -989,12 +1064,14 @@ birdloop_run(void *_loop)
   struct birdloop *loop = _loop;
   birdloop_enter(loop);
 
+  LOOP_TRACE(loop, "Regular run");
+
   if (loop->stopped)
     /* Birdloop left inside the helper function */
     return birdloop_stop_internal(loop);
 
   /* Process sockets */
-  sockets_fire(loop);
+  this_thread->sock_changed += sockets_fire(loop);
 
   /* Run timers */
   timers_fire(&loop->time, 0);
@@ -1016,6 +1093,10 @@ birdloop_run(void *_loop)
   else
     tm_stop(&loop->timer);
 
+  /* Collect socket change requests */
+  this_thread->sock_changed += loop->sock_changed;
+  loop->sock_changed = 0;
+
   birdloop_leave(loop);
 }
 
@@ -1074,6 +1155,8 @@ birdloop_new(pool *pp, uint order, const char *name)
 static void
 birdloop_do_stop(struct birdloop *loop, void (*stopped)(void *data), void *data)
 {
+  LOOP_TRACE(loop, "Stop requested");
+
   loop->stopped = stopped;
   loop->stop_data = data;
 
@@ -1100,8 +1183,7 @@ birdloop_stop_self(struct birdloop *loop, void (*stopped)(void *data), void *dat
 void
 birdloop_free(struct birdloop *loop)
 {
-  ASSERT_DIE(loop->links == 0);
-  ASSERT_DIE(birdloop_in_this_thread(loop));
+  ASSERT_DIE(loop->thread == NULL);
 
   domain_free(loop->time.domain);
   rfree(loop->pool);
@@ -1170,20 +1252,6 @@ birdloop_unmask_wakeups(struct birdloop *loop)
   birdloop_wakeup_masked_count = 0;
 }
 
-void
-birdloop_link(struct birdloop *loop)
-{
-  ASSERT_DIE(birdloop_inside(loop));
-  loop->links++;
-}
-
-void
-birdloop_unlink(struct birdloop *loop)
-{
-  ASSERT_DIE(birdloop_inside(loop));
-  loop->links--;
-}
-
 void
 birdloop_yield(void)
 {
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index e606f07e..7ec903af 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -22,6 +22,7 @@ struct pfd {
 };
 
 void sockets_prepare(struct birdloop *, struct pfd *);
+void socket_changed(struct birdsock *);
 
 void pipe_new(struct pipe *);
 void pipe_pollin(struct pipe *, struct pfd *);
@@ -40,12 +41,12 @@ struct birdloop
   struct timeloop time;
   event_list event_list;
   list sock_list;
+  struct birdsock *sock_active;
   int sock_num;
+  uint sock_changed;
 
   uint ping_pending;
 
-  uint links;
-
   _Atomic u32 thread_transition;
 #define LTT_PING  1
 #define LTT_MOVE  2
@@ -66,8 +67,6 @@ struct bird_thread
 {
   node n;
 
-  _Atomic u32 poll_changed;
-
   struct pipe wakeup;
   event_list priority_events;
 
@@ -83,6 +82,8 @@ struct bird_thread
   struct pfd *pfd;
 
   event cleanup_event;
+
+  int sock_changed;
 };
 
 #endif
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 06797096..88d187a4 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -722,10 +722,7 @@ sk_log_error(sock *s, const char *p)
  *	Actual struct birdsock code
  */
 
-static struct birdsock *current_sock;
-static struct birdsock *stored_sock;
-
-static inline sock *
+sock *
 sk_next(sock *s)
 {
   if (!s->n.next->next)
@@ -787,6 +784,7 @@ sk_ssh_free(sock *s)
 }
 #endif
 
+
 static void
 sk_free(resource *r)
 {
@@ -799,18 +797,10 @@ sk_free(resource *r)
     sk_ssh_free(s);
 #endif
 
-  if ((s->fd < 0) || (s->flags & SKF_THREAD))
-    return;
+  if (s->loop)
+    birdloop_remove_socket(s->loop, s);
 
-  if (s == current_sock)
-    current_sock = sk_next(s);
-  if (s == stored_sock)
-    stored_sock = sk_next(s);
-
-  if (enlisted(&s->n))
-    rem_node(&s->n);
-
-  if (s->type != SK_SSH && s->type != SK_SSH_ACTIVE)
+  if (s->fd >= 0 && s->type != SK_SSH && s->type != SK_SSH_ACTIVE)
     close(s->fd);
 
   s->fd = -1;
@@ -1022,12 +1012,6 @@ sk_setup(sock *s)
   return 0;
 }
 
-static void
-sk_insert(sock *s)
-{
-  add_tail(&main_birdloop.sock_list, &s->n);
-}
-
 static void
 sk_tcp_connected(sock *s)
 {
@@ -1101,10 +1085,7 @@ sk_passive_connected(sock *s, int type)
     return 1;
   }
 
-  if (s->flags & SKF_PASSIVE_THREAD)
-    t->flags |= SKF_THREAD;
-  else
-    sk_insert(t);
+  birdloop_add_socket(s->loop, t);
 
   sk_alloc_bufs(t);
   s->rx_hook(t, 0);
@@ -1319,6 +1300,7 @@ sk_open_ssh(sock *s)
 
 /**
  * sk_open - open a socket
+ * @loop: loop
  * @s: socket
  *
  * This function takes a socket resource created by sk_new() and
@@ -1328,7 +1310,7 @@ sk_open_ssh(sock *s)
  * Result: 0 for success, -1 for an error.
  */
 int
-sk_open(sock *s)
+sk_open(sock *s, struct birdloop *loop)
 {
   int af = AF_UNSPEC;
   int fd = -1;
@@ -1481,9 +1463,7 @@ sk_open(sock *s)
     sk_alloc_bufs(s);
   }
 
-  if (!(s->flags & SKF_THREAD))
-    sk_insert(s);
-
+  birdloop_add_socket(loop, s);
   return 0;
 
 err:
@@ -1493,7 +1473,7 @@ err:
 }
 
 int
-sk_open_unix(sock *s, char *name)
+sk_open_unix(sock *s, struct birdloop *loop, char *name)
 {
   struct sockaddr_un sa;
   int fd;
@@ -1520,40 +1500,10 @@ sk_open_unix(sock *s, char *name)
     return -1;
 
   s->fd = fd;
-  sk_insert(s);
+  birdloop_add_socket(loop, s);
   return 0;
 }
 
-static void
-sk_reloop_hook(void *_vs)
-{
-  sock *s = _vs;
-  if (birdloop_inside(&main_birdloop))
-  {
-    s->flags &= ~SKF_THREAD;
-    sk_insert(s);
-  }
-  else
-  {
-    s->flags |= SKF_THREAD;
-    sk_start(s);
-  }
-}
-
-void
-sk_reloop(sock *s, struct birdloop *loop)
-{
-  if (enlisted(&s->n))
-    rem_node(&s->n);
-
-  s->reloop = (event) {
-    .hook = sk_reloop_hook,
-    .data = s,
-  };
-
-  ev_send_loop(loop, &s->reloop);
-}
-
 
 #define CMSG_RX_SPACE MAX(CMSG4_SPACE_PKTINFO+CMSG4_SPACE_TTL, \
 			  CMSG6_SPACE_PKTINFO+CMSG6_SPACE_TTL)
@@ -1676,6 +1626,13 @@ sk_recvmsg(sock *s)
 
 static inline void reset_tx_buffer(sock *s) { s->ttx = s->tpos = s->tbuf; }
 
+_Bool
+sk_tx_pending(sock *s)
+{
+  return s->ttx != s->tpos;
+}
+
+
 static int
 sk_maybe_write(sock *s)
 {
@@ -1686,7 +1643,7 @@ sk_maybe_write(sock *s)
   case SK_TCP:
   case SK_MAGIC:
   case SK_UNIX:
-    while (s->ttx != s->tpos)
+    while (sk_tx_pending(s))
     {
       e = write(s->fd, s->ttx, s->tpos - s->ttx);
 
@@ -1708,7 +1665,7 @@ sk_maybe_write(sock *s)
 
 #ifdef HAVE_LIBSSH
   case SK_SSH:
-    while (s->ttx != s->tpos)
+    while (sk_tx_pending(s))
     {
       e = ssh_channel_write(s->ssh->channel, s->ttx, s->tpos - s->ttx);
 
@@ -1791,7 +1748,12 @@ sk_send(sock *s, unsigned len)
 {
   s->ttx = s->tbuf;
   s->tpos = s->tbuf + len;
-  return sk_maybe_write(s);
+
+  int e = sk_maybe_write(s);
+  if (e == 0) /* Trigger thread poll reload to poll this socket's write. */
+    socket_changed(s);
+
+  return e;
 }
 
 /**
@@ -1838,7 +1800,7 @@ call_rx_hook(sock *s, int size)
   if (s->rx_hook(s, size))
   {
     /* We need to be careful since the socket could have been deleted by the hook */
-    if (current_sock == s)
+    if (s->loop->sock_active == s)
       s->rpos = s->rbuf;
   }
 }
@@ -2002,7 +1964,7 @@ sk_write_noflush(sock *s)
 #endif
 
   default:
-    if (s->ttx != s->tpos && sk_maybe_write(s) > 0)
+    if (sk_tx_pending(s) && sk_maybe_write(s) > 0)
     {
       if (s->tx_hook)
 	s->tx_hook(s);
@@ -2224,6 +2186,8 @@ static int short_loops = 0;
 #define SHORT_LOOP_MAX 10
 #define WORK_EVENTS_MAX 10
 
+sock *stored_sock;
+
 void
 io_loop(void)
 {
@@ -2312,17 +2276,13 @@ io_loop(void)
 	  times_update();
 
 	  /* guaranteed to be non-empty */
-	  current_sock = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
+	  main_birdloop.sock_active = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
 
-	  while (current_sock)
+	  while (main_birdloop.sock_active)
+	  {
+	    sock *s = main_birdloop.sock_active;
+	    if (s->index != -1)
 	    {
-	      sock *s = current_sock;
-	      if (s->index == -1)
-		{
-		  current_sock = sk_next(s);
-		  goto next;
-		}
-
 	      int e;
 	      int steps;
 
@@ -2333,10 +2293,11 @@ io_loop(void)
 		    steps--;
 		    io_log_event(s->rx_hook, s->data);
 		    e = sk_read(s, pfd.pfd.data[s->index].revents);
-		    if (s != current_sock)
-		      goto next;
 		  }
-		while (e && s->rx_hook && steps);
+		while (e && (main_birdloop.sock_active == s) && s->rx_hook && steps);
+
+	      if (s != main_birdloop.sock_active)
+		continue;
 
 	      steps = MAX_STEPS;
 	      if (pfd.pfd.data[s->index].revents & POLLOUT)
@@ -2345,56 +2306,54 @@ io_loop(void)
 		    steps--;
 		    io_log_event(s->tx_hook, s->data);
 		    e = sk_write(s);
-		    if (s != current_sock)
-		      goto next;
 		  }
-		while (e && steps);
+		while (e && (main_birdloop.sock_active == s) && steps);
 
-	      current_sock = sk_next(s);
-	    next: ;
+	      if (s != main_birdloop.sock_active)
+		continue;
 	    }
 
+	    main_birdloop.sock_active = sk_next(s);
+	  }
+
 	  short_loops++;
 	  if (events && (short_loops < SHORT_LOOP_MAX))
 	    continue;
 	  short_loops = 0;
 
 	  int count = 0;
-	  current_sock = stored_sock;
-	  if (current_sock == NULL)
-	    current_sock = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
+	  main_birdloop.sock_active = stored_sock;
+	  if (main_birdloop.sock_active == NULL)
+	    main_birdloop.sock_active = SKIP_BACK(sock, n, HEAD(main_birdloop.sock_list));
 
-	  while (current_sock && count < MAX_RX_STEPS)
+	  while (main_birdloop.sock_active && count < MAX_RX_STEPS)
 	    {
-	      sock *s = current_sock;
+	      sock *s = main_birdloop.sock_active;
 	      if (s->index == -1)
-		{
-		  current_sock = sk_next(s);
-		  goto next2;
-		}
+		goto next2;
 
 	      if (!s->fast_rx && (pfd.pfd.data[s->index].revents & POLLIN) && s->rx_hook)
 		{
 		  count++;
 		  io_log_event(s->rx_hook, s->data);
 		  sk_read(s, pfd.pfd.data[s->index].revents);
-		  if (s != current_sock)
-		    goto next2;
+		  if (s != main_birdloop.sock_active)
+		    continue;
 		}
 
 	      if (pfd.pfd.data[s->index].revents & (POLLHUP | POLLERR))
 		{
 		  sk_err(s, pfd.pfd.data[s->index].revents);
-		  if (s != current_sock)
-		    goto next2;
+		  if (s != main_birdloop.sock_active)
+		    continue;
 		}
 
-	      current_sock = sk_next(s);
 	    next2: ;
+	      main_birdloop.sock_active = sk_next(s);
 	    }
 
 
-	  stored_sock = current_sock;
+	  stored_sock = main_birdloop.sock_active;
 	}
     }
 }
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index a9ae842a..79db32d3 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -542,7 +542,7 @@ cli_init_unix(uid_t use_uid, gid_t use_gid)
   /* Return value intentionally ignored */
   unlink(path_control_socket);
 
-  if (sk_open_unix(s, path_control_socket) < 0)
+  if (sk_open_unix(s, &main_birdloop, path_control_socket) < 0)
     die("Cannot create control socket %s: %m", path_control_socket);
 
   if (use_uid || use_gid)
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index e26afe41..606b79cd 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -9,6 +9,9 @@
 #ifndef _BIRD_UNIX_H_
 #define _BIRD_UNIX_H_
 
+#include "nest/bird.h"
+#include "lib/io-loop.h"
+
 #include <sys/socket.h>
 #include <signal.h>
 
@@ -110,7 +113,7 @@ extern volatile sig_atomic_t async_shutdown_flag;
 void io_init(void);
 void io_loop(void);
 void io_log_dump(void);
-int sk_open_unix(struct birdsock *s, char *name);
+int sk_open_unix(struct birdsock *s, struct birdloop *, char *name);
 struct rfile *rf_open(struct pool *, const char *name, const char *mode);
 void *rf_file(struct rfile *f);
 int rf_fileno(struct rfile *f);

From e33902e15cb5399900fd346b4dba522ad821f0f0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 2 Apr 2023 19:35:35 +0200
Subject: [PATCH 284/431] BGP now has its own loop

---
 proto/bgp/bgp.c     | 133 ++++++++++++++++++++++++++++++++------------
 proto/bgp/bgp.h     |   2 +-
 proto/bgp/config.Y  |   1 +
 proto/bgp/packets.c |  10 ++--
 4 files changed, 104 insertions(+), 42 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index a9028353..328f6cf4 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -126,13 +126,13 @@
 
 #include "bgp.h"
 
-
 static void bgp_listen_create(void *);
 
 static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets */
 static list STATIC_LIST_INIT(bgp_listen_pending);	/* Global list of listening socket open requests */
 static event bgp_listen_event = { .hook = bgp_listen_create };
 
+DOMAIN(rtable) bgp_listen_domain;
 
 static void bgp_connect(struct bgp_proto *p);
 static void bgp_active(struct bgp_proto *p);
@@ -151,6 +151,13 @@ static void bgp_graceful_restart_feed(struct bgp_channel *c);
 static inline int
 bgp_setup_auth(struct bgp_proto *p, int enable)
 {
+  /* Beware. This is done from main_birdloop and protocol birdloop is NOT ENTERED.
+   * Anyway, we are only accessing:
+   *  - protocol config which can be changed only from main_birdloop (reconfig)
+   *  - protocol listen socket which is always driven by main_birdloop
+   *  - protocol name which is set on reconfig
+   */
+
   if (p->cf->password && p->listen.sock)
   {
     ip_addr prefix = p->cf->remote_ip;
@@ -184,16 +191,21 @@ bgp_setup_auth(struct bgp_proto *p, int enable)
 static void
 bgp_close(struct bgp_proto *p)
 {
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
+
   struct bgp_listen_request *req = &p->listen;
   struct bgp_socket *bs = req->sock;
 
-  ASSERT(bs);
+  if (bs)
+  {
+    req->sock = NULL;
+    rem_node(&req->n);
 
-  req->sock = NULL;
-  rem_node(&req->n);
+    if (bs && EMPTY_LIST(bs->requests))
+      ev_send(&global_event_list, &bgp_listen_event);
+  }
 
-  if (EMPTY_LIST(bs->requests))
-    ev_schedule(&bgp_listen_event);
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 }
 
 /**
@@ -208,6 +220,8 @@ bgp_close(struct bgp_proto *p)
 static void
 bgp_open(struct bgp_proto *p)
 {
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
+
   struct bgp_listen_request *req = &p->listen;
   /* We assume that cf->iface is defined iff cf->local_ip is link-local */
   req->iface = p->cf->strict_bind ? p->cf->iface : NULL;
@@ -220,17 +234,28 @@ bgp_open(struct bgp_proto *p)
   BGP_TRACE(D_EVENTS, "Requesting listen socket at %I%J port %u", req->addr, req->iface, req->port);
 
   add_tail(&bgp_listen_pending, &req->n);
-  ev_schedule(&bgp_listen_event);
+  ev_send(&global_event_list, &bgp_listen_event);
+
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 }
 
 static void
 bgp_listen_create(void *_ UNUSED)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
   uint flag_mask = SKF_FREEBIND;
 
-  struct bgp_listen_request *req;
-  WALK_LIST_FIRST(req, bgp_listen_pending)
-  {
+  while (1) {
+    LOCK_DOMAIN(rtable, bgp_listen_domain);
+
+    if (EMPTY_LIST(bgp_listen_pending))
+    {
+      UNLOCK_DOMAIN(rtable, bgp_listen_domain);
+      break;
+    }
+
+    /* Get the first request to match */
+    struct bgp_listen_request *req = HEAD(bgp_listen_pending);
     struct bgp_proto *p = SKIP_BACK(struct bgp_proto, listen, req);
     rem_node(&req->n);
 
@@ -249,6 +274,8 @@ bgp_listen_create(void *_ UNUSED)
       BGP_TRACE(D_EVENTS, "Found a listening socket: %p", bs);
     else
     {
+      /* Allocating new socket from global protocol pool.
+       * We can do this in main_birdloop. */
       sock *sk = sk_new(proto_pool);
       sk->type = SK_TCP_PASSIVE;
       sk->ttl = 255;
@@ -268,8 +295,9 @@ bgp_listen_create(void *_ UNUSED)
 	sk_log_error(sk, p->p.name);
 	log(L_ERR "%s: Cannot open listening socket", p->p.name);
 	rfree(sk);
-	bgp_initiate_disable(p, BEM_NO_SOCKET);
+	UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 
+	bgp_initiate_disable(p, BEM_NO_SOCKET);
 	continue;
       }
 
@@ -283,17 +311,25 @@ bgp_listen_create(void *_ UNUSED)
       BGP_TRACE(D_EVENTS, "Created new listening socket: %p", bs);
     }
 
-    add_tail(&bs->requests, &req->n);
     req->sock = bs;
+    add_tail(&bs->requests, &req->n);
 
     if (bgp_setup_auth(p, 1) < 0)
     {
-      bgp_close(p);
+      rem_node(&req->n);
+      req->sock = NULL;
+
+      UNLOCK_DOMAIN(rtable, bgp_listen_domain);
+
       bgp_initiate_disable(p, BEM_INVALID_MD5);
+      continue;
     }
+
+    UNLOCK_DOMAIN(rtable, bgp_listen_domain);
   }
 
   /* Cleanup leftover listening sockets */
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
   struct bgp_socket *bs;
   node *nxt;
   WALK_LIST_DELSAFE(bs, nxt, bgp_sockets)
@@ -303,6 +339,7 @@ bgp_listen_create(void *_ UNUSED)
       rem_node(&bs->n);
       mb_free(bs);
     }
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 }
 
 static inline struct bgp_channel *
@@ -328,6 +365,9 @@ bgp_startup(struct bgp_proto *p)
   if (p->postponed_sk)
   {
     /* Apply postponed incoming connection */
+    sk_unmain(p->postponed_sk);
+    sk_start(p->postponed_sk);
+
     bgp_setup_conn(p, &p->incoming_conn);
     bgp_setup_sk(&p->incoming_conn, p->postponed_sk);
     bgp_send_open(&p->incoming_conn);
@@ -354,7 +394,7 @@ bgp_initiate(struct bgp_proto *p)
   {
     p->start_state = BSS_DELAY;
     BGP_TRACE(D_EVENTS, "Startup delayed by %d seconds due to errors", p->startup_delay);
-    bgp_start_timer(p->startup_timer, p->startup_delay);
+    bgp_start_timer(p, p->startup_timer, p->startup_delay);
   }
   else
     bgp_startup(p);
@@ -363,13 +403,19 @@ bgp_initiate(struct bgp_proto *p)
 static void
 bgp_initiate_disable(struct bgp_proto *p, int err_val)
 {
-  p->p.disabled = 1;
-  bgp_store_error(p, NULL, BE_MISC, err_val);
-
-  p->neigh = NULL;
-  proto_notify_state(&p->p, PS_DOWN);
-
-  return;
+  PROTO_LOCKED_FROM_MAIN(&p->p)
+  {
+    /* The protocol may be already down for another reason.
+     * Shutdown the protocol only if it isn't already shutting down. */
+    switch (p->p.proto_state)
+    {
+      case PS_START:
+      case PS_UP:
+	p->p.disabled = 1;
+	bgp_store_error(p, NULL, BE_MISC, err_val);
+	bgp_stop(p, err_val, NULL, 0);
+    }
+  }
 }
 
 /**
@@ -382,14 +428,14 @@ bgp_initiate_disable(struct bgp_proto *p, int err_val)
  * timers.
  */
 void
-bgp_start_timer(timer *t, uint value)
+bgp_start_timer(struct bgp_proto *p, timer *t, uint value)
 {
   if (value)
   {
     /* The randomization procedure is specified in RFC 4271 section 10 */
     btime time = value S;
     btime randomize = random() % ((time / 4) + 1);
-    tm_start(t, time - randomize);
+    tm_start_in(t, time - randomize, p->p.loop);
   }
   else
     tm_stop(t);
@@ -419,6 +465,7 @@ bgp_close_conn(struct bgp_conn *conn)
 
   rfree(conn->tx_ev);
   conn->tx_ev = NULL;
+
   rfree(conn->sk);
   conn->sk = NULL;
 
@@ -564,7 +611,7 @@ bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len)
     if (c->ptx)
       bgp_free_pending_tx(c);
 
-  ev_schedule(p->event);
+  proto_send_event(&p->p, p->event);
 }
 
 static inline void
@@ -755,7 +802,7 @@ bgp_conn_enter_close_state(struct bgp_conn *conn)
   conn->sk->rx_hook = NULL;
 
   /* Timeout for CLOSE state, if we cannot send notification soon then we just hangup */
-  bgp_start_timer(conn->hold_timer, 10);
+  bgp_start_timer(p, conn->hold_timer, 10);
 
   if (os == BS_ESTABLISHED)
     bgp_conn_leave_established_state(p);
@@ -769,7 +816,7 @@ bgp_conn_enter_idle_state(struct bgp_conn *conn)
 
   bgp_close_conn(conn);
   bgp_conn_set_state(conn, BS_IDLE);
-  ev_schedule(p->event);
+  proto_send_event(&p->p, p->event);
 
   if (os == BS_ESTABLISHED)
     bgp_conn_leave_established_state(p);
@@ -840,7 +887,7 @@ bgp_handle_graceful_restart(struct bgp_proto *p)
   ASSERT(p->gr_active_num > 0);
 
   proto_notify_state(&p->p, PS_START);
-  tm_start(p->gr_timer, p->conn->remote_caps->gr_time S);
+  tm_start_in(p->gr_timer, p->conn->remote_caps->gr_time S, p->p.loop);
 }
 
 static void
@@ -954,7 +1001,7 @@ bgp_graceful_restart_timeout(timer *t)
 
       /* Channel is in GR, and supports LLGR -> start LLGR */
       c->gr_active = BGP_GRS_LLGR;
-      tm_start(c->stale_timer, c->stale_time S);
+      tm_start_in(c->stale_timer, c->stale_time S, p->p.loop);
       bgp_graceful_restart_feed(c);
     }
   }
@@ -1028,7 +1075,7 @@ bgp_send_open(struct bgp_conn *conn)
   bgp_prepare_capabilities(conn);
   bgp_schedule_packet(conn, NULL, PKT_OPEN);
   bgp_conn_set_state(conn, BS_OPENSENT);
-  bgp_start_timer(conn->hold_timer, conn->bgp->cf->initial_hold_time);
+  bgp_start_timer(conn->bgp, conn->hold_timer, conn->bgp->cf->initial_hold_time);
 }
 
 static void
@@ -1105,7 +1152,7 @@ bgp_hold_timeout(timer *t)
      and perhaps just not processed BGP packets in time. */
 
   if (sk_rx_ready(conn->sk) > 0)
-    bgp_start_timer(conn->hold_timer, 10);
+    bgp_start_timer(p, conn->hold_timer, 10);
   else if ((conn->state == BS_ESTABLISHED) && p->llgr_ready)
   {
     BGP_TRACE(D_EVENTS, "Hold timer expired");
@@ -1165,7 +1212,7 @@ bgp_active(struct bgp_proto *p)
   BGP_TRACE(D_EVENTS, "Connect delayed by %d seconds", delay);
   bgp_setup_conn(p, conn);
   bgp_conn_set_state(conn, BS_ACTIVE);
-  bgp_start_timer(conn->connect_timer, delay);
+  bgp_start_timer(p, conn->connect_timer, delay);
 }
 
 /**
@@ -1196,6 +1243,7 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
   s->tos = IP_PREC_INTERNET_CONTROL;
   s->password = p->cf->password;
   s->tx_hook = bgp_connected;
+  s->flags = SKF_THREAD;
   BGP_TRACE(D_EVENTS, "Connecting to %I%J from local address %I%J",
 	    s->daddr, ipa_is_link_local(s->daddr) ? p->cf->iface : NULL,
 	    s->saddr, ipa_is_link_local(s->saddr) ? s->iface : NULL);
@@ -1212,7 +1260,7 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
       goto err;
 
   DBG("BGP: Waiting for connect success\n");
-  bgp_start_timer(conn->connect_timer, p->cf->connect_retry_time);
+  bgp_start_timer(p, conn->connect_timer, p->cf->connect_retry_time);
   return;
 
 err:
@@ -1239,6 +1287,8 @@ bgp_find_proto(sock *sk)
   /* sk->iface is valid only if src or dst address is link-local */
   int link = ipa_is_link_local(sk->saddr) || ipa_is_link_local(sk->daddr);
 
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
+
   WALK_LIST(req, bs->requests)
   {
     struct bgp_proto *p = SKIP_BACK(struct bgp_proto, listen, req);
@@ -1257,6 +1307,7 @@ bgp_find_proto(sock *sk)
     }
   }
 
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
   return best;
 }
 
@@ -1275,6 +1326,8 @@ bgp_find_proto(sock *sk)
 static int
 bgp_incoming_connection(sock *sk, uint dummy UNUSED)
 {
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+
   struct bgp_proto *p;
   int acc, hops;
 
@@ -1288,6 +1341,8 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
     return 0;
   }
 
+  birdloop_enter(p->p.loop);
+
   /*
    * BIRD should keep multiple incoming connections in OpenSent state (for
    * details RFC 4271 8.2.1 par 3), but it keeps just one. Duplicate incoming
@@ -1317,7 +1372,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
   if (!acc)
   {
     rfree(sk);
-    return 0;
+    goto leave;
   }
 
   hops = p->cf->multihop ? : 1;
@@ -1342,19 +1397,24 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
     p = bgp_spawn(p, sk->daddr);
     p->postponed_sk = sk;
     rmove(sk, p->p.pool);
-    return 0;
+    goto leave;
   }
 
   rmove(sk, p->p.pool);
+  sk_reloop(sk, p->p.loop);
+
   bgp_setup_conn(p, &p->incoming_conn);
   bgp_setup_sk(&p->incoming_conn, sk);
   bgp_send_open(&p->incoming_conn);
-  return 0;
+  goto leave;
 
 err:
   sk_log_error(sk, p->p.name);
   log(L_ERR "%s: Incoming connection aborted", p->p.name);
   rfree(sk);
+
+leave:
+  birdloop_leave(p->p.loop);
   return 0;
 }
 
@@ -1679,7 +1739,7 @@ bgp_start(struct proto *P)
     .hook = bgp_start_locked,
     .data = p,
   };
-  lock->target = &global_event_list;
+  lock->target = proto_event_list(P);
 
   /* For dynamic BGP, we use inst 1 to avoid collisions with regular BGP */
   if (bgp_is_dynamic(p))
@@ -2776,4 +2836,5 @@ void bgp_build(void)
 {
   proto_build(&proto_bgp);
   bgp_register_attrs();
+  bgp_listen_domain = DOMAIN_NEW(rtable, "BGP Listen Sockets");
 }
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index b9c1192c..621e1bc5 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -547,7 +547,7 @@ bgp_parse_error(struct bgp_parse_state *s, uint subcode)
 }
 
 
-void bgp_start_timer(timer *t, uint value);
+void bgp_start_timer(struct bgp_proto *p, timer *t, uint value);
 void bgp_check_config(struct bgp_config *c);
 void bgp_error(struct bgp_conn *c, unsigned code, unsigned subcode, byte *data, int len);
 void bgp_close_conn(struct bgp_conn *c);
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index a51c82bd..8b0d4356 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -52,6 +52,7 @@ proto: bgp_proto '}'  ;
 
 bgp_proto_start: proto_start BGP {
      this_proto = proto_config_new(&proto_bgp, $1);
+     this_proto->loop_order = DOMAIN_ORDER(proto);
      BGP_CFG->local_port = BGP_PORT;
      BGP_CFG->remote_port = BGP_PORT;
      BGP_CFG->multihop = -1;	/* undefined */
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index c90798a0..ab171189 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -973,7 +973,7 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, uint len)
       conn->hold_time, conn->keepalive_time, p->remote_as, p->remote_id, conn->as4_session);
 
   bgp_schedule_packet(conn, NULL, PKT_KEEPALIVE);
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
   bgp_conn_enter_openconfirm_state(conn);
 }
 
@@ -2572,7 +2572,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
   if (conn->state != BS_ESTABLISHED)
   { bgp_error(conn, 5, fsm_err_subcode[conn->state], NULL, 0); return; }
 
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
 
   struct lp_state tmpp;
   lp_save(tmp_linpool, &tmpp);
@@ -2913,7 +2913,7 @@ bgp_fire_tx(struct bgp_conn *conn)
   {
     conn->packets_to_send &= ~(1 << PKT_KEEPALIVE);
     BGP_TRACE(D_PACKETS, "Sending KEEPALIVE");
-    bgp_start_timer(conn->keepalive_timer, conn->keepalive_time);
+    bgp_start_timer(p, conn->keepalive_timer, conn->keepalive_time);
     return bgp_send(conn, PKT_KEEPALIVE, BGP_HEADER_LENGTH);
   }
   else while (conn->channels_to_send)
@@ -3002,7 +3002,7 @@ bgp_schedule_packet(struct bgp_conn *conn, struct bgp_channel *c, int type)
     conn->packets_to_send |= 1 << type;
 
   if ((conn->sk->tpos == conn->sk->tbuf) && !ev_active(conn->tx_ev))
-    ev_schedule(conn->tx_ev);
+    proto_send_event(&p->p, conn->tx_ev);
 }
 void
 bgp_kick_tx(void *vconn)
@@ -3219,7 +3219,7 @@ bgp_rx_keepalive(struct bgp_conn *conn)
   struct bgp_proto *p = conn->bgp;
 
   BGP_TRACE(D_PACKETS, "Got KEEPALIVE");
-  bgp_start_timer(conn->hold_timer, conn->hold_time);
+  bgp_start_timer(p, conn->hold_timer, conn->hold_time);
 
   if (conn->state == BS_OPENCONFIRM)
   { bgp_conn_enter_established_state(conn); return; }

From 1b1ed1fc78740f0a2c76e7288be0fc85877484da Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 2 Apr 2023 19:15:27 +0200
Subject: [PATCH 285/431] BGP: sockets use sk_resume_rx and sk_pause_rx

---
 proto/bgp/packets.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index ab171189..546f0809 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -3264,16 +3264,25 @@ bgp_rx_packet(struct bgp_conn *conn, byte *pkt, uint len)
 void
 bgp_uncork(void *vp)
 {
+  /* The uncork event is run from &main_birdloop and there is no useful way how
+   * to assign the target loop to it, thus we have to lock it ourselves. */
+
   struct bgp_proto *p = vp;
+  if (!p)
+    return;
+
+  birdloop_enter(p->p.loop);
 
   if (p && p->conn && (p->conn->state == BS_ESTABLISHED) && !p->conn->sk->rx_hook)
   {
     struct birdsock *sk = p->conn->sk;
     ASSERT_DIE(sk->rpos > sk->rbuf);
-    sk->rx_hook = bgp_rx;
+    sk_resume_rx(p->p.loop, sk, bgp_rx);
     bgp_rx(sk, sk->rpos - sk->rbuf);
     BGP_TRACE(D_PACKETS, "Uncorked");
   }
+
+  birdloop_leave(p->p.loop);
 }
 
 /**
@@ -3302,7 +3311,7 @@ bgp_rx(sock *sk, uint size)
 	return 0;
       if ((conn->state == BS_ESTABLISHED) && rt_cork_check(conn->bgp->uncork_ev))
       {
-	sk->rx_hook = NULL;
+	sk_pause_rx(p->p.loop, sk);
 	BGP_TRACE(D_PACKETS, "Corked");
 	return 0;
       }

From 4a69a64745e44066abfa4f6a17a7bb7a2fde9834 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 6 Mar 2023 20:00:01 +0100
Subject: [PATCH 286/431] BGP: set free bind also for connect sockets if
 configured

---
 proto/bgp/bgp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 328f6cf4..41df59bb 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -365,8 +365,7 @@ bgp_startup(struct bgp_proto *p)
   if (p->postponed_sk)
   {
     /* Apply postponed incoming connection */
-    sk_unmain(p->postponed_sk);
-    sk_start(p->postponed_sk);
+    sk_reloop(p->postponed_sk, p->p.loop);
 
     bgp_setup_conn(p, &p->incoming_conn);
     bgp_setup_sk(&p->incoming_conn, p->postponed_sk);
@@ -1243,7 +1242,7 @@ bgp_connect(struct bgp_proto *p)	/* Enter Connect state and start establishing c
   s->tos = IP_PREC_INTERNET_CONTROL;
   s->password = p->cf->password;
   s->tx_hook = bgp_connected;
-  s->flags = SKF_THREAD;
+  s->flags = p->cf->free_bind ? SKF_FREEBIND : 0;
   BGP_TRACE(D_EVENTS, "Connecting to %I%J from local address %I%J",
 	    s->daddr, ipa_is_link_local(s->daddr) ? p->cf->iface : NULL,
 	    s->saddr, ipa_is_link_local(s->saddr) ? s->iface : NULL);

From 22a0900ec22511b6ce872f126e9766ccb4e5a824 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 5 Apr 2023 21:59:01 +0200
Subject: [PATCH 287/431] BFD: fixed a request pickup race condition

When several BGPs requested a BFD session in short time, chances were
that the second BGP would file a request while the pickup routine was
still running and it would get enqueued into the waiting list instead of
being picked up.

Fixed this by enforcing pickup loop restart when new requests got added,
and also by atomically moving the unpicked requests to a temporary list
to announce admin down before actually being added into the wait list.
---
 proto/bfd/bfd.c | 93 +++++++++++++++++++++++++++++++++----------------
 proto/bfd/bfd.h |  1 -
 proto/bgp/bgp.c |  7 ++++
 3 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index b6ccdb9a..c88c1cb2 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -121,6 +121,7 @@ static struct {
   list wait_list;
   list pickup_list;
   list proto_list;
+  uint pickup_reload;
 } bfd_global;
 
 const char *bfd_state_names[] = { "AdminDown", "Down", "Init", "Up" };
@@ -670,18 +671,29 @@ bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
   struct bfd_config *cf = (struct bfd_config *) (p->p.cf);
 
   if (p->p.vrf && (p->p.vrf != req->vrf))
+  {
+    TRACE(D_EVENTS, "Not accepting request to %I with different VRF", req->addr);
     return 0;
+  }
 
   if (ipa_is_ip4(req->addr) ? !cf->accept_ipv4 : !cf->accept_ipv6)
+  {
+    TRACE(D_EVENTS, "Not accepting request to %I (AF limit)", req->addr);
     return 0;
+  }
 
   if (req->iface ? !cf->accept_direct : !cf->accept_multihop)
+  {
+    TRACE(D_EVENTS, "Not accepting %s request to %I", req->iface ? "direct" : "multihop", req->addr);
     return 0;
+  }
 
   uint ifindex = req->iface ? req->iface->index : 0;
   struct bfd_session *s = bfd_find_session_by_addr(p, req->addr, ifindex);
 
-  if (!s)
+  if (s)
+    TRACE(D_EVENTS, "Session to %I reused", s->addr);
+  else
     s = bfd_add_session(p, req->addr, req->local, req->iface, &req->opts);
 
   rem_node(&req->n);
@@ -725,33 +737,57 @@ bfd_pickup_requests(void *_data UNUSED)
    * Thank you, my future self, for understanding. Have a nice day!
    */
 
-  node *n;
-  WALK_LIST(n, bfd_global.proto_list)
-  {
-    struct bfd_proto *p = SKIP_BACK(struct bfd_proto, bfd_node, n);
-    birdloop_enter(p->p.loop);
-    BFD_LOCK;
-
-    node *rn, *rnxt;
-    WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
-      bfd_add_request(p, SKIP_BACK(struct bfd_request, n, rn));
-
-    BFD_UNLOCK;
-    birdloop_leave(p->p.loop);
-  }
+  DBG("BFD pickup loop starting");
 
   BFD_LOCK;
-  while (!EMPTY_LIST(bfd_global.pickup_list))
-  {
-    struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(bfd_global.pickup_list));
-    rem_node(&req->n);
+  do {
+    bfd_global.pickup_reload = 0;
     BFD_UNLOCK;
 
-    bfd_request_notify(req, BFD_STATE_ADMIN_DOWN, 0);
+    node *n;
+    WALK_LIST(n, bfd_global.proto_list)
+    {
+      struct bfd_proto *p = SKIP_BACK(struct bfd_proto, bfd_node, n);
+      birdloop_enter(p->p.loop);
+      BFD_LOCK;
+
+      TRACE(D_EVENTS, "Picking up new requests (%d available)", list_length(&bfd_global.pickup_list));
+
+      node *rn, *rnxt;
+      WALK_LIST_DELSAFE(rn, rnxt, bfd_global.pickup_list)
+	bfd_add_request(p, SKIP_BACK(struct bfd_request, n, rn));
+
+      BFD_UNLOCK;
+
+      /* Remove sessions with no requests */
+      HASH_WALK_DELSAFE(p->session_hash_id, next_id, s)
+      {
+	if (EMPTY_LIST(s->request_list))
+	  bfd_remove_session_locked(p, s);
+      }
+      HASH_WALK_END;
+
+      birdloop_leave(p->p.loop);
+    }
 
     BFD_LOCK;
-    add_tail(&bfd_global.wait_list, &req->n);
-  }
+  } while (bfd_global.pickup_reload);
+
+  list tmp_list;
+  init_list(&tmp_list);
+  add_tail_list(&tmp_list, &bfd_global.pickup_list);
+
+  init_list(&bfd_global.pickup_list);
+  BFD_UNLOCK;
+
+  log(L_TRACE "No protocol for %d BFD requests", list_length(&tmp_list));
+
+  node *n;
+  WALK_LIST(n, tmp_list)
+    bfd_request_notify(SKIP_BACK(struct bfd_request, n, n), BFD_STATE_ADMIN_DOWN, 0);
+
+  BFD_LOCK;
+  add_tail_list(&bfd_global.wait_list, &tmp_list);
   BFD_UNLOCK;
 }
 
@@ -817,8 +853,10 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local,
   req->session = NULL;
 
   BFD_LOCK;
+  bfd_global.pickup_reload++;
   add_tail(&bfd_global.pickup_list, &req->n);
   ev_send(&global_event_list, &bfd_pickup_event);
+  DBG("New BFD request enlisted.\n");
   BFD_UNLOCK;
 
   return req;
@@ -842,15 +880,12 @@ static void
 bfd_request_free(resource *r)
 {
   struct bfd_request *req = (struct bfd_request *) r;
-  struct bfd_session *s = req->session;
 
+  BFD_LOCK;
   rem_node(&req->n);
+  BFD_UNLOCK;
 
-  /* Remove the session if there is no request for it. Skip that if
-     inside notify hooks, will be handled by bfd_notify_hook() itself */
-
-  if (s && EMPTY_LIST(s->request_list) && !s->notify_running)
-    bfd_remove_session(s->ifa->bfd, s);
+  ev_send(&global_event_list, &bfd_pickup_event);
 }
 
 static void
@@ -1007,10 +1042,8 @@ bfd_notify_hook(void *data)
     diag = s->loc_diag;
     bfd_unlock_sessions(p);
 
-    s->notify_running = 1;
     WALK_LIST_DELSAFE(n, nn, s->request_list)
       bfd_request_notify(SKIP_BACK(struct bfd_request, n, n), state, diag);
-    s->notify_running = 0;
 
     /* Remove the session if all requests were removed in notify hooks */
     if (EMPTY_LIST(s->request_list))
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 9a8e20c6..a4b7d63c 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -165,7 +165,6 @@ struct bfd_session
 
   list request_list;			/* List of client requests (struct bfd_request) */
   btime last_state_change;		/* Time of last state change */
-  u8 notify_running;			/* 1 if notify hooks are running */
 
   u8 rx_csn_known;			/* Received crypto sequence number is known */
   u32 rx_csn;				/* Last received crypto sequence number */
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 41df59bb..fffa8cec 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1524,15 +1524,22 @@ static void
 bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd)
 {
   if (bfd && p->bfd_req)
+  {
+    BGP_TRACE(D_EVENTS, "Updating existing BFD request");
     bfd_update_request(p->bfd_req, bfd);
+  }
 
   if (bfd && !p->bfd_req && !bgp_is_dynamic(p))
+  {
     p->bfd_req = bfd_request_session(p->p.pool, p->remote_ip, p->local_ip,
 				     p->cf->multihop ? NULL : p->neigh->iface,
 				     p->p.vrf, bgp_bfd_notify, p, p->p.loop, bfd);
+    BGP_TRACE(D_EVENTS, "Requesting a new BFD session");
+  }
 
   if (!bfd && p->bfd_req)
   {
+    BGP_TRACE(D_EVENTS, "Retracting the BFD request");
     rfree(p->bfd_req);
     p->bfd_req = NULL;
   }

From 6e2f00ff9391ed41c7e0e991daff17f603d51c4d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 6 Apr 2023 20:18:04 +0200
Subject: [PATCH 288/431] Loop: keep running the same loop for some time if
 there is work to do

---
 lib/birdlib.h         |  1 +
 sysdep/unix/io-loop.c | 85 +++++++++++++++++++++++++++++++------------
 sysdep/unix/io-loop.h |  4 ++
 3 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index d7b394ce..3f65b8c2 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -115,6 +115,7 @@ typedef s64 btime;
 #define TO_S	/1000000
 #define TO_MS	/1000
 #define TO_US	/1
+#define TO_NS	* (btime) 1000
 
 #ifndef PARSER
 #define S	S_
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 0e2396f7..2532fe33 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -67,9 +67,14 @@ _Thread_local struct birdloop *birdloop_current;
 static _Thread_local struct birdloop *birdloop_wakeup_masked;
 static _Thread_local uint birdloop_wakeup_masked_count;
 
-#define LOOP_TRACE(loop, fmt, args...)	do { if (config && config->latency_debug) log(L_TRACE "%s (%p): " fmt, domain_name((loop)->time.domain), (loop), ##args); } while (0)
+#define LOOP_NAME(loop)			domain_name((loop)->time.domain)
+
+#define LOOP_TRACE(loop, fmt, args...)	do { if (config && config->latency_debug) log(L_TRACE "%s (%p): " fmt, LOOP_NAME(loop), (loop), ##args); } while (0)
 #define THREAD_TRACE(...)		do { if (config && config->latency_debug) log(L_TRACE "Thread: " __VA_ARGS__); } while (0)
 
+#define LOOP_WARN(loop, fmt, args...)	log(L_TRACE "%s (%p): " fmt, LOOP_NAME(loop), (loop), ##args)
+
+
 event_list *
 birdloop_event_list(struct birdloop *loop)
 {
@@ -436,7 +441,7 @@ sockets_fire(struct birdloop *loop)
   if (EMPTY_LIST(loop->sock_list))
     return 0;
 
-  int sch = 0;
+  int repeat = 0;
 
   times_update();
 
@@ -454,6 +459,7 @@ sockets_fire(struct birdloop *loop)
 
       if (rev & POLLOUT)
       {
+	/* Write everything. */
 	while ((s == loop->sock_active) && (e = sk_write(s)))
 	  ;
 
@@ -461,12 +467,14 @@ sockets_fire(struct birdloop *loop)
 	  continue;
 
 	if (!sk_tx_pending(s))
-	  sch++;
+	  loop->thread->sock_changed++;
       }
 
       if (rev & POLLIN)
-	while (e && (s == loop->sock_active) && s->rx_hook)
-	  e = sk_read(s, rev);
+	/* Read just one packet and request repeat. */
+	if ((s == loop->sock_active) && s->rx_hook)
+	  if (sk_read(s, rev))
+	    repeat++;
 
       if (s != loop->sock_active)
 	continue;
@@ -481,7 +489,7 @@ sockets_fire(struct birdloop *loop)
     loop->sock_active = sk_next(s);
   }
 
-  return sch;
+  return repeat;
 }
 
 /*
@@ -498,6 +506,9 @@ static _Thread_local struct bird_thread *this_thread;
 static void
 birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
 {
+  struct bird_thread *old = loop->thread;
+  ASSERT_DIE(!thr != !old);
+
   /* Signal our moving effort */
   u32 ltt = atomic_fetch_or_explicit(&loop->thread_transition, LTT_MOVE, memory_order_acq_rel);
   ASSERT_DIE((ltt & LTT_MOVE) == 0);
@@ -511,9 +522,14 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
   /* Now we are free of running pings */
 
   if (loop->thread = thr)
+  {
     add_tail(&thr->loops, &loop->n);
+    thr->loop_count++;
+  }
   else
   {
+    old->loop_count--;
+
     LOCK_DOMAIN(resource, birdloop_domain);
     add_tail(&birdloop_pickup, &loop->n);
     UNLOCK_DOMAIN(resource, birdloop_domain);
@@ -612,6 +628,7 @@ bird_thread_main(void *arg)
 
   while (1)
   {
+    u64 thr_loop_start = ns_now();
     int timeout;
 
     /* Pickup new loops */
@@ -627,6 +644,11 @@ bird_thread_main(void *arg)
     /* Schedule all loops with timed out timers */
     timers_fire(&thr->meta->time, 0);
 
+    /* Compute maximal time per loop */
+    u64 thr_before_run = ns_now();
+    if (thr->loop_count > 0)
+      thr->max_loop_time_ns = (thr->max_latency_ns / 2 - (thr_before_run - thr_loop_start)) / (u64) thr->loop_count;
+
     /* Run all scheduled loops */
     int more_events = ev_run_list(&thr->meta->event_list);
     if (more_events)
@@ -716,7 +738,7 @@ bird_thread_cleanup(void *_thr)
 }
 
 static struct bird_thread *
-bird_thread_start(void)
+bird_thread_start(btime max_latency)
 {
   ASSERT_DIE(birdloop_inside(&main_birdloop));
 
@@ -725,6 +747,7 @@ bird_thread_start(void)
   struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
   thr->pool = p;
   thr->cleanup_event = (event) { .hook = bird_thread_cleanup, .data = thr, };
+  thr->max_latency_ns = max_latency TO_NS;
 
   wakeup_init(thr);
   ev_init_list(&thr->priority_events, NULL, "Thread direct event list");
@@ -839,7 +862,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
 
     if (dif < 0)
     {
-      bird_thread_start();
+      bird_thread_start(5 S);
       continue;
     }
 
@@ -1061,30 +1084,40 @@ birdloop_run(void *_loop)
   /* Run priority events before the loop is executed */
   ev_run_list(&this_thread->priority_events);
 
+  u64 start_time = ns_now();
+  u64 end_time = start_time + this_thread->max_loop_time_ns;
+
   struct birdloop *loop = _loop;
   birdloop_enter(loop);
 
-  LOOP_TRACE(loop, "Regular run");
+  u64 locked_time = ns_now(), task_done_time;
+  if (locked_time > end_time)
+    LOOP_WARN(loop, "locked %luns after its scheduled end time", locked_time - end_time);
 
-  if (loop->stopped)
-    /* Birdloop left inside the helper function */
-    return birdloop_stop_internal(loop);
+  uint repeat, loop_runs = 0;
+  do {
+    repeat = 0;
+    LOOP_TRACE(loop, "Regular run");
+    loop_runs++;
 
-  /* Process sockets */
-  this_thread->sock_changed += sockets_fire(loop);
+    if (loop->stopped)
+      /* Birdloop left inside the helper function */
+      return birdloop_stop_internal(loop);
 
-  /* Run timers */
-  timers_fire(&loop->time, 0);
+    /* Process sockets */
+    repeat += sockets_fire(loop);
 
-  /* Run flag handlers */
-  if (birdloop_process_flags(loop))
-  {
-    LOOP_TRACE(loop, "Flag processing needs another run");
-    ev_send_loop(this_thread->meta, &loop->event);
-  }
+    /* Run timers */
+    timers_fire(&loop->time, 0);
 
-  /* Run events */
-  ev_run_list(&loop->event_list);
+    /* Run flag handlers */
+    repeat += birdloop_process_flags(loop);
+
+    /* Run events */
+    repeat += ev_run_list(&loop->event_list);
+
+    /* Check end time */
+  } while (((task_done_time = ns_now()) < end_time) && repeat);
 
   /* Request meta timer */
   timer *t = timers_first(&loop->time);
@@ -1093,6 +1126,10 @@ birdloop_run(void *_loop)
   else
     tm_stop(&loop->timer);
 
+  /* Request re-run if needed */
+  if (repeat)
+    ev_send_loop(this_thread->meta, &loop->event);
+
   /* Collect socket change requests */
   this_thread->sock_changed += loop->sock_changed;
   loop->sock_changed = 0;
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 7ec903af..c531d43e 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -84,6 +84,10 @@ struct bird_thread
   event cleanup_event;
 
   int sock_changed;
+  uint loop_count;
+
+  u64 max_latency_ns;
+  u64 max_loop_time_ns;
 };
 
 #endif

From 16144c19a81439c462bdbc366c610c56c387f9a7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 12 Apr 2023 18:42:59 +0200
Subject: [PATCH 289/431] Temporarily disable MRT as it still lacks proper
 locking; to be re-enabled in 3.0-alpha2

---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b3735123..bf5c6df4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,8 @@ if test "$enable_mpls_kernel" != no ; then
   fi
 fi
 
-all_protocols="bfd babel bgp mrt ospf perf pipe radv rip rpki static"
+# temporarily removed "mrt" from all_protocols to speed up 3.0-alpha1 release
+all_protocols="bfd babel bgp ospf perf pipe radv rip rpki static"
 all_protocols=`echo $all_protocols | sed 's/ /,/g'`
 
 if test "$with_protocols" = all ; then

From 787fb56da37bfe9da4ea8d1a5a0d0cab02c9523a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 17 Apr 2023 11:37:29 +0200
Subject: [PATCH 290/431] IO: added a specific loop pickup group for BFD; to be
 done better in future

---
 lib/io-loop.h         |   2 +-
 nest/proto.c          |   2 +-
 nest/protocol.h       |   1 +
 nest/rt-table.c       |   2 +-
 proto/bfd/config.Y    |   1 +
 sysdep/unix/io-loop.c | 209 ++++++++++++++++++++++++------------------
 sysdep/unix/io-loop.h |   1 +
 7 files changed, 128 insertions(+), 90 deletions(-)

diff --git a/lib/io-loop.h b/lib/io-loop.h
index 502d77fc..877cd5ce 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -17,7 +17,7 @@
 extern struct birdloop main_birdloop;
 
 /* Start a new birdloop owned by given pool and domain */
-struct birdloop *birdloop_new(pool *p, uint order, const char *name);
+struct birdloop *birdloop_new(pool *p, uint order, const char *name, btime max_latency);
 
 /* Stop the loop. At the end, the @stopped callback is called unlocked in tail
  * position to finish cleanup. Run birdloop_free() from that callback to free
diff --git a/nest/proto.c b/nest/proto.c
index 21460e56..cd6a3faa 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1220,7 +1220,7 @@ proto_start(struct proto *p)
     p->gr_recovery = 1;
 
   if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
-    p->loop = birdloop_new(p->pool, p->cf->loop_order, p->pool->name);
+    p->loop = birdloop_new(p->pool, p->cf->loop_order, p->pool->name, p->cf->loop_max_latency);
 
   p->iface_sub.target = proto_event_list(p);
 
diff --git a/nest/protocol.h b/nest/protocol.h
index fe987d17..01153162 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -106,6 +106,7 @@ struct proto_config {
   u32 debug, mrtdump;			/* Debugging bitfields, both use D_* constants */
   u32 router_id;			/* Protocol specific router ID */
   uint loop_order;			/* Launch a birdloop on this locking level; use DOMAIN_ORDER(the_bird) for mainloop */
+  btime loop_max_latency;		/* Request this specific maximum latency of loop; zero to default */
 
   list channels;			/* List of channel configs (struct channel_config) */
   struct iface *vrf;			/* Related VRF instance, NULL if global */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 54aa90a6..b18727b1 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2907,7 +2907,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   }
 
   /* Start the service thread */
-  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing table %s", t->name));
+  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing table %s", t->name), 0);
   birdloop_enter(t->loop);
   birdloop_flag_set_handler(t->loop, &t->fh);
   birdloop_leave(t->loop);
diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y
index 0d6e33fa..8e608bda 100644
--- a/proto/bfd/config.Y
+++ b/proto/bfd/config.Y
@@ -38,6 +38,7 @@ bfd_proto_start: proto_start BFD
 {
   this_proto = proto_config_new(&proto_bfd, $1);
   this_proto->loop_order = DOMAIN_ORDER(proto);
+  this_proto->loop_max_latency = 10 MS_;
   init_list(&BFD_CFG->patt_list);
   init_list(&BFD_CFG->neigh_list);
   BFD_CFG->accept_ipv4 = BFD_CFG->accept_ipv6 = 1;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 2532fe33..efb408e0 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -31,7 +31,7 @@
 
 #define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
 
-static struct birdloop *birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup);
+static struct birdloop *birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup, struct birdloop_pickup_group *group);
 
 /*
  *	Nanosecond time for accounting purposes
@@ -497,14 +497,26 @@ sockets_fire(struct birdloop *loop)
  */
 
 DEFINE_DOMAIN(resource);
-static DOMAIN(resource) birdloop_domain;
-static list birdloop_pickup;
-static list bird_thread_pickup;
+
+struct birdloop_pickup_group {
+  DOMAIN(resource) domain;
+  list loops;
+  list threads;
+  btime max_latency;
+} pickup_groups[2] = {
+  {
+    /* all zeroes */
+  },
+  {
+    /* FIXME: make this dynamic, now it copies the loop_max_latency value from proto/bfd/config.Y */
+    .max_latency = 10 MS,
+  },
+};
 
 static _Thread_local struct bird_thread *this_thread;
 
 static void
-birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
+birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdloop_pickup_group *group)
 {
   struct bird_thread *old = loop->thread;
   ASSERT_DIE(!thr != !old);
@@ -530,9 +542,9 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
   {
     old->loop_count--;
 
-    LOCK_DOMAIN(resource, birdloop_domain);
-    add_tail(&birdloop_pickup, &loop->n);
-    UNLOCK_DOMAIN(resource, birdloop_domain);
+    LOCK_DOMAIN(resource, group->domain);
+    add_tail(&group->loops, &loop->n);
+    UNLOCK_DOMAIN(resource, group->domain);
   }
 
   /* Finished */
@@ -543,54 +555,54 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr)
 }
 
 static struct birdloop *
-birdloop_take(void)
+birdloop_take(struct birdloop_pickup_group *group)
 {
   struct birdloop *loop = NULL;
 
-  LOCK_DOMAIN(resource, birdloop_domain);
-  if (!EMPTY_LIST(birdloop_pickup))
+  LOCK_DOMAIN(resource, group->domain);
+  if (!EMPTY_LIST(group->loops))
   {
     /* Take the first loop from the pickup list and unlock */
-    loop = SKIP_BACK(struct birdloop, n, HEAD(birdloop_pickup));
+    loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
     rem_node(&loop->n);
-    UNLOCK_DOMAIN(resource, birdloop_domain);
+    UNLOCK_DOMAIN(resource, group->domain);
 
-    birdloop_set_thread(loop, this_thread);
+    birdloop_set_thread(loop, this_thread, group);
 
     /* This thread goes to the end of the pickup list */
-    LOCK_DOMAIN(resource, birdloop_domain);
+    LOCK_DOMAIN(resource, group->domain);
     rem_node(&this_thread->n);
-    add_tail(&bird_thread_pickup, &this_thread->n);
+    add_tail(&group->threads, &this_thread->n);
 
     /* If there are more loops to be picked up, wakeup the next thread in order */
-    if (!EMPTY_LIST(birdloop_pickup))
-      wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
+    if (!EMPTY_LIST(group->loops))
+      wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
   }
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  UNLOCK_DOMAIN(resource, group->domain);
 
   return loop;
 }
 
 static void
-birdloop_drop(struct birdloop *loop)
+birdloop_drop(struct birdloop *loop, struct birdloop_pickup_group *group)
 {
   /* Remove loop from this thread's list */
   rem_node(&loop->n);
 
   /* Unset loop's thread */
   if (birdloop_inside(loop))
-    birdloop_set_thread(loop, NULL);
+    birdloop_set_thread(loop, NULL, group);
   else
   {
     birdloop_enter(loop);
-    birdloop_set_thread(loop, NULL);
+    birdloop_set_thread(loop, NULL, group);
     birdloop_leave(loop);
   }
 
   /* Put loop into pickup list */
-  LOCK_DOMAIN(resource, birdloop_domain);
-  add_tail(&birdloop_pickup, &loop->n);
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  LOCK_DOMAIN(resource, group->domain);
+  add_tail(&group->loops, &loop->n);
+  UNLOCK_DOMAIN(resource, group->domain);
 }
 
 static int
@@ -615,7 +627,7 @@ bird_thread_main(void *arg)
   tmp_init(thr->pool);
   init_list(&thr->loops);
 
-  thr->meta = birdloop_new_internal(thr->pool, DOMAIN_ORDER(meta), "Thread Meta", 0);
+  thr->meta = birdloop_new_internal(thr->pool, DOMAIN_ORDER(meta), "Thread Meta", 0, thr->group);
   thr->meta->thread = thr;
   birdloop_enter(thr->meta);
 
@@ -632,7 +644,7 @@ bird_thread_main(void *arg)
     int timeout;
 
     /* Pickup new loops */
-    struct birdloop *loop = birdloop_take();
+    struct birdloop *loop = birdloop_take(thr->group);
     if (loop)
     {
       birdloop_enter(loop);
@@ -738,23 +750,23 @@ bird_thread_cleanup(void *_thr)
 }
 
 static struct bird_thread *
-bird_thread_start(btime max_latency)
+bird_thread_start(struct birdloop_pickup_group *group)
 {
   ASSERT_DIE(birdloop_inside(&main_birdloop));
+  ASSERT_DIE(DOMAIN_IS_LOCKED(resource, group->domain));
 
   pool *p = rp_new(&root_pool, "Thread");
 
   struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
   thr->pool = p;
   thr->cleanup_event = (event) { .hook = bird_thread_cleanup, .data = thr, };
-  thr->max_latency_ns = max_latency TO_NS;
+  thr->group = group;
+  thr->max_latency_ns = (group->max_latency ?: 5 S) TO_NS;
 
   wakeup_init(thr);
   ev_init_list(&thr->priority_events, NULL, "Thread direct event list");
 
-  LOCK_DOMAIN(resource, birdloop_domain);
-  add_tail(&bird_thread_pickup, &thr->n);
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  add_tail(&group->threads, &thr->n);
 
   int e = 0;
 
@@ -782,8 +794,9 @@ static uint thread_dropper_goal;
 static void
 bird_thread_shutdown(void * _ UNUSED)
 {
-  LOCK_DOMAIN(resource, birdloop_domain);
-  int dif = list_length(&bird_thread_pickup) - thread_dropper_goal;
+  struct birdloop_pickup_group *group = this_thread->group;
+  LOCK_DOMAIN(resource, group->domain);
+  int dif = list_length(&group->threads) - thread_dropper_goal;
   struct birdloop *tdl_stop = NULL;
 
   if (dif > 0)
@@ -794,7 +807,7 @@ bird_thread_shutdown(void * _ UNUSED)
     thread_dropper = NULL;
   }
 
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  UNLOCK_DOMAIN(resource, group->domain);
 
   DBG("Thread pickup size differs from dropper goal by %d%s\n", dif, tdl_stop ? ", stopping" : "");
 
@@ -807,18 +820,18 @@ bird_thread_shutdown(void * _ UNUSED)
   struct bird_thread *thr = this_thread;
 
   /* Leave the thread-picker list to get no more loops */
-  LOCK_DOMAIN(resource, birdloop_domain);
+  LOCK_DOMAIN(resource, group->domain);
   rem_node(&thr->n);
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  UNLOCK_DOMAIN(resource, group->domain);
 
   /* Drop loops including the thread dropper itself */
   while (!EMPTY_LIST(thr->loops))
-    birdloop_drop(HEAD(thr->loops));
+    birdloop_drop(HEAD(thr->loops), group);
 
   /* Let others know about new loops */
-  if (!EMPTY_LIST(birdloop_pickup))
-    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
-  UNLOCK_DOMAIN(resource, birdloop_domain);
+  if (!EMPTY_LIST(group->loops))
+    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
+  UNLOCK_DOMAIN(resource, group->domain);
 
   /* Leave the thread-dropper loop as we aren't going to return. */
   birdloop_leave(thread_dropper);
@@ -855,26 +868,30 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
 
   while (1)
   {
-    LOCK_DOMAIN(resource, birdloop_domain);
-    int dif = list_length(&bird_thread_pickup) - (thread_dropper_goal = new->thread_count);
+    struct birdloop_pickup_group *group = &pickup_groups[0];
+    LOCK_DOMAIN(resource, group->domain);
+
+    int dif = list_length(&group->threads) - (thread_dropper_goal = new->thread_count);
     _Bool thread_dropper_running = !!thread_dropper;
-    UNLOCK_DOMAIN(resource, birdloop_domain);
 
     if (dif < 0)
     {
-      bird_thread_start(5 S);
+      bird_thread_start(group);
+      UNLOCK_DOMAIN(resource, group->domain);
       continue;
     }
 
+    UNLOCK_DOMAIN(resource, group->domain);
+
     if ((dif > 0) && !thread_dropper_running)
     {
-      struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), "Thread dropper");
+      struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), "Thread dropper", group->max_latency);
       event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
 
-      LOCK_DOMAIN(resource, birdloop_domain);
+      LOCK_DOMAIN(resource, group->domain);
       thread_dropper = tdl;
       thread_dropper_event = tde;
-      UNLOCK_DOMAIN(resource, birdloop_domain);
+      UNLOCK_DOMAIN(resource, group->domain);
 
       ev_send_loop(thread_dropper, thread_dropper_event);
     }
@@ -945,26 +962,31 @@ bird_thread_show(void *data)
   {
     the_bird_lock();
 
-    LOCK_DOMAIN(resource, birdloop_domain);
-    if (!EMPTY_LIST(birdloop_pickup))
-      if (tsd->show_loops)
-      {
-	cli_printf(tsd->cli, -1026, "Unassigned loops");
-	WALK_LIST(loop, birdloop_pickup)
-	  cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
-      }
-      else
-      {
-	uint count = 0;
-	u64 total_time_ns = 0;
-	WALK_LIST(loop, birdloop_pickup)
+    for (int i=0; i<2; i++)
+    {
+      struct birdloop_pickup_group *group = &pickup_groups[i];
+
+      LOCK_DOMAIN(resource, group->domain);
+      if (!EMPTY_LIST(group->loops))
+	if (tsd->show_loops)
 	{
-	  count++;
-	  total_time_ns += loop->total_time_spent_ns;
+	  cli_printf(tsd->cli, -1026, "Unassigned loops");
+	  WALK_LIST(loop, group->loops)
+	    cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
 	}
-	cli_printf(tsd->cli, -1026, "Unassigned loops: %d, total time %t", count, total_time_ns NS);
-      }
-    UNLOCK_DOMAIN(resource, birdloop_domain);
+	else
+	{
+	  uint count = 0;
+	  u64 total_time_ns = 0;
+	  WALK_LIST(loop, group->loops)
+	  {
+	    count++;
+	    total_time_ns += loop->total_time_spent_ns;
+	  }
+	  cli_printf(tsd->cli, -1026, "Unassigned loops: %d, total time %t", count, total_time_ns NS);
+	}
+      UNLOCK_DOMAIN(resource, group->domain);
+    }
 
     cli_write_trigger(tsd->cli);
     DOMAIN_FREE(control, tsd->lock);
@@ -989,19 +1011,24 @@ cmd_show_threads(int show_loops)
   this_cli->cont = bird_thread_show_cli_cont;
   this_cli->cleanup = bird_thread_show_cli_cleanup;
 
-  LOCK_DOMAIN(control, tsd->lock);
-  LOCK_DOMAIN(resource, birdloop_domain);
-
-  struct bird_thread *thr;
-  WALK_LIST(thr, bird_thread_pickup)
+  for (int i=0; i<2; i++)
   {
-    tsd->total++;
-    ev_send(&thr->priority_events, ev_new_init(p, bird_thread_show, tsd));
-    wakeup_do_kick(thr);
-  }
+    struct birdloop_pickup_group *group = &pickup_groups[i];
 
-  UNLOCK_DOMAIN(resource, birdloop_domain);
-  UNLOCK_DOMAIN(control, tsd->lock);
+    LOCK_DOMAIN(control, tsd->lock);
+    LOCK_DOMAIN(resource, group->domain);
+
+    struct bird_thread *thr;
+    WALK_LIST(thr, group->threads)
+    {
+      tsd->total++;
+      ev_send(&thr->priority_events, ev_new_init(p, bird_thread_show, tsd));
+      wakeup_do_kick(thr);
+    }
+
+    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(control, tsd->lock);
+  }
 }
 
 /*
@@ -1018,9 +1045,14 @@ birdloop_init(void)
 {
   ns_init();
 
-  birdloop_domain = DOMAIN_NEW(resource, "Loop Pickup");
-  init_list(&birdloop_pickup);
-  init_list(&bird_thread_pickup);
+  for (int i=0; i<2; i++)
+  {
+    struct birdloop_pickup_group *group = &pickup_groups[i];
+
+    group->domain = DOMAIN_NEW(resource, "Loop Pickup");
+    init_list(&group->loops);
+    init_list(&group->threads);
+  }
 
   wakeup_init(main_birdloop.thread);
 
@@ -1146,7 +1178,7 @@ birdloop_run_timer(timer *tm)
 }
 
 static struct birdloop *
-birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup)
+birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup, struct birdloop_pickup_group *group)
 {
   struct domain_generic *dg = domain_new(name, order);
 
@@ -1170,10 +1202,13 @@ birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup
 
   if (request_pickup)
   {
-    LOCK_DOMAIN(resource, birdloop_domain);
-    add_tail(&birdloop_pickup, &loop->n);
-    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(bird_thread_pickup)));
-    UNLOCK_DOMAIN(resource, birdloop_domain);
+    LOCK_DOMAIN(resource, group->domain);
+    add_tail(&group->loops, &loop->n);
+    if (EMPTY_LIST(group->threads))
+      bird_thread_start(group);
+
+    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
+    UNLOCK_DOMAIN(resource, group->domain);
   }
   else
     loop->n.next = loop->n.prev = &loop->n;
@@ -1184,9 +1219,9 @@ birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup
 }
 
 struct birdloop *
-birdloop_new(pool *pp, uint order, const char *name)
+birdloop_new(pool *pp, uint order, const char *name, btime max_latency)
 {
-  return birdloop_new_internal(pp, order, name, 1);
+  return birdloop_new_internal(pp, order, name, 1, max_latency ? &pickup_groups[1] : &pickup_groups[0]);
 }
 
 static void
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index c531d43e..2b0b7ebf 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -78,6 +78,7 @@ struct bird_thread
   struct rcu_thread rcu;
 
   list loops;
+  struct birdloop_pickup_group *group;
   pool *pool;
   struct pfd *pfd;
 

From 9f0ef3045d2a0b0eafaa7a01c8c1b53b256b3d05 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 18 Apr 2023 09:52:12 +0200
Subject: [PATCH 291/431] NEWS and version update

---
 NEWS            | 11 +++++++++++
 misc/bird.spec  |  2 +-
 sysdep/config.h |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 948c99e1..e95a6afd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Version 3.0-alpha1 (2023-04-18)
+  o Worker threads for BGP, Pipe, RPKI and BFD
+  o Configurable number of threads
+  o Asynchronous route export
+  o Flat attribute structure
+  o Inline import tables
+  o Export tables merged with BGP prefix / attribute buckets
+  o Fixed ROA check locking inversion in route table dumps
+  o MRT switched off
+
+
 Version 2.0.12 (2023-01-23)
   o Filter: New 'onlink' route attribute
   o Compile-time option to use 4-way tries instead of 16-way ones
diff --git a/misc/bird.spec b/misc/bird.spec
index d08c130a..c6b94636 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 3.0-alpha0
+Version: 3.0-alpha1
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/sysdep/config.h b/sysdep/config.h
index 861e52bc..928f1f83 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -13,7 +13,7 @@
 #ifdef GIT_LABEL
 #define BIRD_VERSION XSTR1(GIT_LABEL)
 #else
-#define BIRD_VERSION "2.0.12"
+#define BIRD_VERSION "3.0-alpha1"
 #endif
 
 /* Include parameters determined by configure script */

From 67fe3d096d57760af5f412240aaf79d63f5bbb44 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 18 Apr 2023 10:11:07 +0200
Subject: [PATCH 292/431] Updated the version number to not include dash
 (breaks RPM)

---
 NEWS            | 2 +-
 misc/bird.spec  | 2 +-
 sysdep/config.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index e95a6afd..7aaab32e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 3.0-alpha1 (2023-04-18)
+Version 3.0alpha1 (2023-04-18)
   o Worker threads for BGP, Pipe, RPKI and BFD
   o Configurable number of threads
   o Asynchronous route export
diff --git a/misc/bird.spec b/misc/bird.spec
index c6b94636..d013d85c 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 3.0-alpha1
+Version: 3.0alpha1
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/sysdep/config.h b/sysdep/config.h
index 928f1f83..ec66a353 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -13,7 +13,7 @@
 #ifdef GIT_LABEL
 #define BIRD_VERSION XSTR1(GIT_LABEL)
 #else
-#define BIRD_VERSION "3.0-alpha1"
+#define BIRD_VERSION "3.0alpha1"
 #endif
 
 /* Include parameters determined by configure script */

From 06963f96b363680380f83ccbb073d7e42f811afd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 19 Apr 2023 17:52:52 +0200
Subject: [PATCH 293/431] Typed lists keep an explicit pointer to the list
 head.

This change adds one pointer worth of memory to every list node.
Keeping this information helps auditing the lists, checking that the
node indeed is outside of list or inside the right one.

The typed lists shouldn't be used anywhere with memory pressure anyway,
thus the one added pointer isn't significant.
---
 lib/tlists.h | 46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/tlists.h b/lib/tlists.h
index 1437e17e..ea21b141 100644
--- a/lib/tlists.h
+++ b/lib/tlists.h
@@ -79,6 +79,11 @@ typedef struct TLIST_LIST_STRUCT {
   TLIST_TYPE *last;
 } TLIST_LIST_STRUCT;
 
+static inline struct TLIST_LIST_STRUCT * TLIST_NAME(enlisted)(TLIST_TYPE *node)
+{
+  return node->TLIST_ITEM.list;
+}
+
 #ifdef TLIST_WANT_WALK
 static inline struct TLIST_NAME(node) * TLIST_NAME(node_get)(TLIST_TYPE *node)
 { return &(node->TLIST_ITEM); }
@@ -87,11 +92,14 @@ static inline struct TLIST_NAME(node) * TLIST_NAME(node_get)(TLIST_TYPE *node)
 #ifdef TLIST_WANT_ADD_HEAD
 static inline void TLIST_NAME(add_head)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
 {
-  ASSERT_DIE(!node->TLIST_ITEM.prev && !node->TLIST_ITEM.next);
+  ASSERT_DIE(!TLIST_NAME(enlisted)(node));
+  node->TLIST_ITEM.list = list;
+
   if (node->TLIST_ITEM.next = list->first)
     list->first->TLIST_ITEM.prev = node;
   else
     list->last = node;
+
   list->first = node;
 }
 #endif
@@ -99,17 +107,39 @@ static inline void TLIST_NAME(add_head)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
 #ifdef TLIST_WANT_ADD_TAIL
 static inline void TLIST_NAME(add_tail)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
 {
-  ASSERT_DIE(!node->TLIST_ITEM.prev && !node->TLIST_ITEM.next);
+  ASSERT_DIE(!TLIST_NAME(enlisted)(node));
+  node->TLIST_ITEM.list = list;
+
   if (node->TLIST_ITEM.prev = list->last)
     list->last->TLIST_ITEM.next = node;
   else
     list->first = node;
+
   list->last = node;
 }
 #endif
 
+#ifdef TLIST_WANT_UPDATE_NODE
+static inline void TLIST_NAME(update_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
+{
+  ASSERT_DIE(TLIST_NAME(enlisted)(node) == list);
+
+  if (node->TLIST_ITEM.prev)
+    node->TLIST_ITEM.prev->TLIST_ITEM.next = node;
+  else
+    list->first = node;
+
+  if (node->TLIST_ITEM.next)
+    node->TLIST_ITEM.next->TLIST_ITEM.prev = node;
+  else
+    list->last = node;
+}
+#endif
+
 static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
 {
+  ASSERT_DIE(TLIST_NAME(enlisted)(node) == list);
+
   if (node->TLIST_ITEM.prev)
     node->TLIST_ITEM.prev->TLIST_ITEM.next = node->TLIST_ITEM.next;
   else
@@ -127,6 +157,7 @@ static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
   }
 
   node->TLIST_ITEM.next = node->TLIST_ITEM.prev = NULL;
+  node->TLIST_ITEM.list = NULL;
 }
 
 #undef TLIST_PREFIX
@@ -136,6 +167,7 @@ static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
 #undef TLIST_ITEM
 #undef TLIST_WANT_ADD_HEAD
 #undef TLIST_WANT_ADD_TAIL
+#undef TLIST_WANT_UPDATE_NODE
 
 # endif
 #else
@@ -147,12 +179,12 @@ static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
 #error "You should first include lib/tlists.h without requesting a TLIST"
 #endif
 
-#define TLIST_NODE_CONTENTS(_type)	{ _type *next; _type *prev; }
-#define TLIST_NODE(_name, _type)	struct _name##_node TLIST_NODE_CONTENTS(_type) 
-#define TLIST_DEFAULT_NODE		struct MACRO_CONCAT_AFTER(TLIST_PREFIX,_node) \
-					TLIST_NODE_CONTENTS(TLIST_TYPE) TLIST_ITEM
+#define TLIST_LIST(_name)		struct _name##_list
 
-#define TLIST_LIST(_name)		struct _name##_list 
+#define TLIST_NODE_IN(_name, _type)	{ _type *next; _type *prev; TLIST_LIST(_name) *list; }
+#define TLIST_NODE(_name, _type)	struct _name##_node TLIST_NODE_IN(_name, _type)
+#define TLIST_DEFAULT_NODE		struct MACRO_CONCAT_AFTER(TLIST_PREFIX,_node) \
+					TLIST_NODE_IN(TLIST_PREFIX,TLIST_TYPE) TLIST_ITEM
 
 
 /* Use ->first and ->last to access HEAD and TAIL */

From 2c809894dc194ecd2778b8b57771c5c67ae7bb6e Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Fri, 21 Apr 2023 09:08:54 +0200
Subject: [PATCH 294/431] Alpha0 news added

---
 NEWS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/NEWS b/NEWS
index 7aaab32e..04cca01d 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,20 @@ Version 3.0alpha1 (2023-04-18)
   o Fixed ROA check locking inversion in route table dumps
   o MRT switched off
 
+Version 3.0-alpha0 (2022-02-07)
+  o Removal of fixed protocol-specific route attributes
+  o Asynchronous route export
+  o Explicit table import / export hooks
+  o Partially lockless route attribute cache
+  o Thread-safe resource management
+  o Thread-safe interface notifications
+  o Thread-safe protocol API
+  o Adoption of BFD IO loop for general use
+  o Parallel Pipe protocol
+  o Parallel RPKI protocol
+  o Parallel BGP protocol
+  o Lots of refactoring
+  o Bugfixes and improvements as they came along
 
 Version 2.0.12 (2023-01-23)
   o Filter: New 'onlink' route attribute

From 48dfcb60d61ab7aec478468bd50eb0196c332ee3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 19 Apr 2023 21:02:20 +0200
Subject: [PATCH 295/431] Typed lists: added add_after() and unit tests

---
 lib/Makefile      |   2 +-
 lib/tlists.h      |  28 ++++-
 lib/tlists_test.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 lib/tlists_test.c

diff --git a/lib/Makefile b/lib/Makefile
index f4ade9a6..6ed778cc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,6 @@ src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c type_test.c
+tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c tlists_test.c type_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/lib/tlists.h b/lib/tlists.h
index ea21b141..d7f1cf03 100644
--- a/lib/tlists.h
+++ b/lib/tlists.h
@@ -89,7 +89,7 @@ static inline struct TLIST_NAME(node) * TLIST_NAME(node_get)(TLIST_TYPE *node)
 { return &(node->TLIST_ITEM); }
 #endif
 
-#ifdef TLIST_WANT_ADD_HEAD
+#if defined(TLIST_WANT_ADD_HEAD) || defined(TLIST_WANT_ADD_AFTER)
 static inline void TLIST_NAME(add_head)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
 {
   ASSERT_DIE(!TLIST_NAME(enlisted)(node));
@@ -136,6 +136,32 @@ static inline void TLIST_NAME(update_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *
 }
 #endif
 
+#ifdef TLIST_WANT_ADD_AFTER
+static inline void TLIST_NAME(add_after)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node, TLIST_TYPE *after)
+{
+  ASSERT_DIE(!TLIST_NAME(enlisted)(node));
+
+  /* Adding to beginning */
+  if (!(node->TLIST_ITEM.prev = after))
+    return TLIST_NAME(add_head)(list, node);
+
+  /* OK, Adding after a real node */
+  node->TLIST_ITEM.list = list;
+
+  /* There is another node after the anchor */
+  if (node->TLIST_ITEM.next = after->TLIST_ITEM.next)
+    /* Link back */
+    node->TLIST_ITEM.next->TLIST_ITEM.prev = node;
+  else
+    /* Or we are adding the last node */
+    list->last = node;
+
+  /* Link forward from "after" */
+  after->TLIST_ITEM.next = node;
+}
+#endif
+
+
 static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *node)
 {
   ASSERT_DIE(TLIST_NAME(enlisted)(node) == list);
diff --git a/lib/tlists_test.c b/lib/tlists_test.c
new file mode 100644
index 00000000..8ba080a6
--- /dev/null
+++ b/lib/tlists_test.c
@@ -0,0 +1,314 @@
+/*
+ *	BIRD Library -- Linked Lists Tests
+ *
+ *	(c) 2015 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "test/birdtest.h"
+#include "lib/tlists.h"
+
+#define TLIST_PREFIX tp
+#define TLIST_TYPE struct test_node
+#define TLIST_ITEM n
+#define TLIST_WANT_ADD_HEAD
+#define TLIST_WANT_ADD_TAIL
+#define TLIST_WANT_ADD_AFTER
+#define TLIST_WANT_UPDATE_NODE
+
+struct test_node {
+  TLIST_DEFAULT_NODE;
+};
+
+#include "lib/tlists.h"
+
+#define MAX_NUM 1000
+
+static struct test_node nodes[MAX_NUM];
+static TLIST_LIST(tp) l;
+
+static void
+show_list(void)
+{
+  bt_debug("\n");
+  bt_debug("list.first points to %p\n", l.first);
+  bt_debug("list.last  points to %p\n", l.last);
+
+  int i;
+  for (i = 0; i < MAX_NUM; i++)
+  {
+    bt_debug("n[%3i] is at %p\n", i, &nodes[i]);
+    bt_debug("  prev is at %p and point to %p\n", &(nodes[i].n.prev), nodes[i].n.prev);
+    bt_debug("  next is at %p and point to %p\n", &(nodes[i].n.next), nodes[i].n.next);
+  }
+}
+
+static int
+is_filled_list_well_linked(void)
+{
+  int i;
+  bt_assert(l.first == &nodes[0]);
+  bt_assert(l.last == &nodes[MAX_NUM-1]);
+  bt_assert(!nodes[0].n.prev);
+  bt_assert(!nodes[MAX_NUM-1].n.next);
+
+  for (i = 0; i < MAX_NUM; i++)
+  {
+    bt_assert(nodes[i].n.list == &l);
+
+    if (i < (MAX_NUM-1))
+      bt_assert(nodes[i].n.next == &nodes[i+1]);
+
+    if (i > 0)
+      bt_assert(nodes[i].n.prev == &nodes[i-1]);
+  }
+
+  return 1;
+}
+
+static int
+is_empty_list_well_unlinked(void)
+{
+  int i;
+
+  bt_assert(!l.first);
+  bt_assert(!l.last);
+  bt_assert(EMPTY_TLIST(tp, &l));
+
+  for (i = 0; i < MAX_NUM; i++)
+  {
+    bt_assert(nodes[i].n.next == NULL);
+    bt_assert(nodes[i].n.prev == NULL);
+    bt_assert(nodes[i].n.list == NULL);
+  }
+
+  return 1;
+}
+
+static void
+init_list__(TLIST_LIST(tp) *l, struct test_node nodes[])
+{
+  *l = (TLIST_LIST(tp)) {};
+
+  int i;
+  for (i = 0; i < MAX_NUM; i++)
+  {
+    nodes[i].n.next = NULL;
+    nodes[i].n.prev = NULL;
+    nodes[i].n.list = NULL;
+  }
+}
+
+static void
+init_list_(void)
+{
+  init_list__(&l, nodes);
+}
+
+static int
+t_add_tail(void)
+{
+  int i;
+
+  init_list_();
+  for (i = 0; i < MAX_NUM; i++)
+  {
+    tp_add_tail(&l, &nodes[i]);
+    bt_debug(".");
+    bt_assert(l.last == &nodes[i]);
+    bt_assert(l.first == &nodes[0]);
+
+    bt_assert(nodes[i].n.list == &l);
+    bt_assert(!nodes[i].n.next);
+
+    if (i > 0)
+    {
+      bt_assert(nodes[i-1].n.next == &nodes[i]);
+      bt_assert(nodes[i].n.prev == &nodes[i-1]);
+    }
+  }
+  show_list();
+  bt_assert(is_filled_list_well_linked());
+
+  return 1;
+}
+
+static int
+t_add_head(void)
+{
+  int i;
+
+  init_list_();
+  for (i = MAX_NUM-1; i >= 0; i--)
+  {
+    tp_add_head(&l, &nodes[i]);
+    bt_debug(".");
+    bt_assert(l.first == &nodes[i]);
+    bt_assert(l.last == &nodes[MAX_NUM-1]);
+    if (i < MAX_NUM-1)
+    {
+      bt_assert(nodes[i+1].n.prev == &nodes[i]);
+      bt_assert(nodes[i].n.next == &nodes[i+1]);
+    }
+  }
+  show_list();
+  bt_assert(is_filled_list_well_linked());
+
+  return 1;
+}
+
+static void
+insert_node_(TLIST_LIST(tp) *l, struct test_node *n, struct test_node *after)
+{
+  tp_add_after(l, n, after);
+  bt_debug(".");
+}
+
+static int
+t_insert_node(void)
+{
+  int i;
+
+  init_list_();
+
+  // add first node
+  insert_node_(&l, &nodes[0], NULL);
+
+  // add odd nodes
+  for (i = 2; i < MAX_NUM; i+=2)
+    insert_node_(&l, &nodes[i], &nodes[i-2]);
+
+  // add even nodes
+  for (i = 1; i < MAX_NUM; i+=2)
+    insert_node_(&l, &nodes[i], &nodes[i-1]);
+
+  bt_debug("\n");
+  bt_assert(is_filled_list_well_linked());
+
+  return 1;
+}
+
+static void
+fill_list2(TLIST_LIST(tp) *l, struct test_node nodes[])
+{
+  int i;
+  for (i = 0; i < MAX_NUM; i++)
+    tp_add_tail(l, &nodes[i]);
+}
+
+static void
+fill_list(void)
+{
+  fill_list2(&l, nodes);
+}
+
+static int
+t_remove_node(void)
+{
+  int i;
+
+  init_list_();
+
+  /* Fill & Remove & Check */
+  fill_list();
+  for (i = 0; i < MAX_NUM; i++)
+    tp_rem_node(&l, &nodes[i]);
+  bt_assert(is_empty_list_well_unlinked());
+
+  /* Fill & Remove the half of nodes & Check & Remove the rest nodes & Check */
+  fill_list();
+  for (i = 0; i < MAX_NUM; i+=2)
+    tp_rem_node(&l, &nodes[i]);
+
+  int tail_node_index = (MAX_NUM % 2) ? MAX_NUM - 2 : MAX_NUM - 1;
+  bt_assert(l.first == &nodes[1]);
+  bt_assert(l.last == &nodes[tail_node_index]);
+  bt_assert(!nodes[tail_node_index].n.next);
+
+  for (i = 1; i < MAX_NUM; i+=2)
+  {
+    if (i > 1)
+      bt_assert(nodes[i].n.prev == &nodes[i-2]);
+    if (i < tail_node_index)
+      bt_assert(nodes[i].n.next == &nodes[i+2]);
+  }
+
+  for (i = 1; i < MAX_NUM; i+=2)
+    tp_rem_node(&l, &nodes[i]);
+  bt_assert(is_empty_list_well_unlinked());
+
+  return 1;
+}
+
+static int
+t_update_node(void)
+{
+  struct test_node head, inside, tail;
+
+  init_list_();
+  fill_list();
+
+  head = nodes[0];
+  tp_update_node(&l, &head);
+  bt_assert(l.first == &head);
+  bt_assert(head.n.prev == NULL);
+  bt_assert(head.n.next == &nodes[1]);
+  bt_assert(nodes[1].n.prev == &head);
+
+  inside = nodes[MAX_NUM/2];
+  tp_update_node(&l, &inside);
+  bt_assert(nodes[MAX_NUM/2-1].n.next == &inside);
+  bt_assert(nodes[MAX_NUM/2+1].n.prev == &inside);
+  bt_assert(inside.n.prev == &nodes[MAX_NUM/2-1]);
+  bt_assert(inside.n.next == &nodes[MAX_NUM/2+1]);
+
+  tail = nodes[MAX_NUM-1];
+  tp_update_node(&l, &tail);
+  bt_assert(l.last == &tail);
+  bt_assert(tail.n.prev == &nodes[MAX_NUM-2]);
+  bt_assert(tail.n.next == NULL);
+  bt_assert(nodes[MAX_NUM-2].n.next == &tail);
+
+  return 1;
+}
+
+#if 0
+static int
+t_add_tail_list(void)
+{
+  node nodes2[MAX_NUM];
+  list l2;
+
+  init_list__(&l, (node *) nodes);
+  fill_list2(&l, (node *) nodes);
+
+  init_list__(&l2, (node *) nodes2);
+  fill_list2(&l2, (node *) nodes2);
+
+  add_tail_list(&l, &l2);
+
+  bt_assert(nodes[MAX_NUM-1].next == &nodes2[0]);
+  bt_assert(nodes2[0].prev == &nodes[MAX_NUM-1]);
+  bt_assert(l.tail == &nodes2[MAX_NUM-1]);
+
+  return 1;
+}
+#endif
+
+int
+main(int argc, char *argv[])
+{
+  bt_init(argc, argv);
+
+  bt_test_suite(t_add_tail, "Adding nodes to tail of list");
+  bt_test_suite(t_add_head, "Adding nodes to head of list");
+  bt_test_suite(t_insert_node, "Inserting nodes to list");
+  bt_test_suite(t_remove_node, "Removing nodes from list");
+  bt_test_suite(t_update_node, "Updating nodes in list");
+#if 0
+  bt_test_suite(t_add_tail_list, "At the tail of a list adding the another list");
+#endif
+
+  return bt_exit_value();
+}

From 074739e0e9baaba53f2a99edd348b76c3613b455 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 19 Apr 2023 21:18:12 +0200
Subject: [PATCH 296/431] Global protocol list is typed to avoid typecast
 confusion

---
 nest/proto.c    | 46 +++++++++++++++++++++-------------------------
 nest/protocol.h | 12 ++++++++++--
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index cd6a3faa..280585dd 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -23,7 +23,7 @@
 #include "filter/f-inst.h"
 
 pool *proto_pool;
-list STATIC_LIST_INIT(proto_list);
+static TLIST_LIST(proto) global_proto_list;
 
 static list STATIC_LIST_INIT(protocol_list);
 
@@ -1190,7 +1190,7 @@ proto_new(struct proto_config *cf)
 }
 
 static struct proto *
-proto_init(struct proto_config *c, node *n)
+proto_init(struct proto_config *c, struct proto *after)
 {
   struct protocol *pr = c->protocol;
   struct proto *p = pr->init(c);
@@ -1199,7 +1199,7 @@ proto_init(struct proto_config *c, node *n)
   p->proto_state = PS_DOWN;
   p->last_state_change = current_time();
   p->vrf = c->vrf;
-  insert_node(&p->n, n);
+  proto_add_after(&global_proto_list, p, after);
 
   p->event = ev_new_init(proto_pool, proto_event, p);
 
@@ -1430,8 +1430,6 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
   struct proto_config *oc, *nc;
   struct symbol *sym;
   struct proto *p;
-  node *n;
-
 
   DBG("protos_commit:\n");
   if (old)
@@ -1518,8 +1516,8 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
   }
 
   struct proto *first_dev_proto = NULL;
+  struct proto *after = NULL;
 
-  n = NODE &(proto_list.head);
   WALK_LIST(nc, new->protos)
     if (!nc->proto)
     {
@@ -1527,14 +1525,14 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
       if (old)
 	log(L_INFO "Adding protocol %s", nc->name);
 
-      p = proto_init(nc, n);
-      n = NODE p;
+      p = proto_init(nc, after);
+      after = p;
 
       if (p->proto == &proto_unix_iface)
 	first_dev_proto = p;
     }
     else
-      n = NODE nc->proto;
+      after = nc->proto;
 
   DBG("Protocol start\n");
 
@@ -1552,7 +1550,7 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
   }
 
   /* Start all new protocols */
-  WALK_LIST_DELSAFE(p, n, proto_list)
+  WALK_TLIST_DELSAFE(proto, p, &global_proto_list)
     proto_rethink_goal(p);
 }
 
@@ -1574,18 +1572,19 @@ proto_rethink_goal(struct proto *p)
   if (p->reconfiguring && !p->active)
   {
     struct proto_config *nc = p->cf_new;
-    node *n = p->n.prev;
+    struct proto *after = p->n.prev;
+
     DBG("%s has shut down for reconfiguration\n", p->name);
     p->cf->proto = NULL;
     config_del_obstacle(p->cf->global);
     proto_remove_channels(p);
-    rem_node(&p->n);
+    proto_rem_node(&global_proto_list, p);
     rfree(p->event);
     mb_free(p->message);
     mb_free(p);
     if (!nc)
       return;
-    p = proto_init(nc, n);
+    p = proto_init(nc, after);
   }
 
   /* Determine what state we want to reach */
@@ -1601,7 +1600,7 @@ proto_rethink_goal(struct proto *p)
 struct proto *
 proto_spawn(struct proto_config *cf, uint disabled)
 {
-  struct proto *p = proto_init(cf, TAIL(proto_list));
+  struct proto *p = proto_init(cf, global_proto_list.last);
   p->disabled = disabled;
   proto_rethink_goal(p);
   return p;
@@ -1697,8 +1696,7 @@ graceful_restart_done(timer *t UNUSED)
   log(L_INFO "Graceful restart done");
   graceful_restart_state = GRS_DONE;
 
-  struct proto *p;
-  WALK_LIST(p, proto_list)
+  WALK_TLIST(proto, p, &global_proto_list)
   {
     if (!p->gr_recovery)
       continue;
@@ -1794,8 +1792,7 @@ protos_dump_all(void)
 {
   debug("Protocols:\n");
 
-  struct proto *p;
-  WALK_LIST(p, proto_list) PROTO_LOCKED_FROM_MAIN(p)
+  WALK_TLIST(proto, p, &global_proto_list) PROTO_LOCKED_FROM_MAIN(p)
   {
 #define DPF(x)	(p->x ? " " #x : "")
     debug("  protocol %s (%p) state %s with %d active channels flags: %s%s%s%s\n",
@@ -2481,10 +2478,9 @@ proto_apply_cmd_symbol(const struct symbol *s, void (* cmd)(struct proto *, uint
 static void
 proto_apply_cmd_patt(const char *patt, void (* cmd)(struct proto *, uintptr_t, int), uintptr_t arg)
 {
-  struct proto *p;
   int cnt = 0;
 
-  WALK_LIST(p, proto_list)
+  WALK_TLIST(proto, p, &global_proto_list)
     if (!patt || patmatch(patt, p->name))
       PROTO_LOCKED_FROM_MAIN(p)
 	cmd(p, arg, cnt++);
@@ -2511,7 +2507,7 @@ proto_apply_cmd(struct proto_spec ps, void (* cmd)(struct proto *, uintptr_t, in
 struct proto *
 proto_get_named(struct symbol *sym, struct protocol *pr)
 {
-  struct proto *p, *q;
+  struct proto *p;
 
   if (sym)
   {
@@ -2525,7 +2521,7 @@ proto_get_named(struct symbol *sym, struct protocol *pr)
   else
   {
     p = NULL;
-    WALK_LIST(q, proto_list)
+    WALK_TLIST(proto, q, &global_proto_list)
       if ((q->proto == pr) && (q->proto_state != PS_DOWN))
       {
 	if (p)
@@ -2562,9 +2558,9 @@ proto_iterate_named(struct symbol *sym, struct protocol *proto, struct proto *ol
   }
   else
   {
-    for (struct proto *p = !old ? HEAD(proto_list) : NODE_NEXT(old);
-	 NODE_VALID(p);
-	 p = NODE_NEXT(p))
+    for (struct proto *p = old ? old->n.next : global_proto_list.first;
+	p;
+	p = p->n.next)
     {
       if ((p->proto == proto) && (p->proto_state != PS_DOWN))
       {
diff --git a/nest/protocol.h b/nest/protocol.h
index 01153162..eccfcb73 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -116,9 +116,16 @@ struct proto_config {
   /* Protocol-specific data follow... */
 };
 
+#define TLIST_PREFIX proto
+#define TLIST_TYPE struct proto
+#define TLIST_ITEM n
+#define TLIST_WANT_WALK
+#define TLIST_WANT_ADD_TAIL
+#define TLIST_WANT_ADD_AFTER
+
 /* Protocol statistics */
 struct proto {
-  node n;				/* Node in global proto_list */
+  TLIST_DEFAULT_NODE;			/* Node in global proto_list */
   struct protocol *proto;		/* Protocol */
   struct proto_config *cf;		/* Configuration data */
   struct proto_config *cf_new;		/* Configuration we want to switch to after shutdown (NULL=delete) */
@@ -198,6 +205,8 @@ struct proto {
   /* Hic sunt protocol-specific data */
 };
 
+#include "lib/tlists.h"
+
 struct proto_spec {
   const void *ptr;
   int patt;
@@ -284,7 +293,6 @@ proto_get_router_id(struct proto_config *pc)
 
 
 extern pool *proto_pool;
-extern list proto_list;
 
 /*
  *  Each protocol instance runs two different state machines:

From b3f805ce29487f790090fcf31096f5a7cf1d585d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 20 Apr 2023 21:06:42 +0200
Subject: [PATCH 297/431] Socket closing has its dedicated function

---
 lib/socket.h           |  1 +
 nest/cli.c             |  2 +-
 proto/babel/packets.c  |  2 +-
 proto/bfd/bfd.c        |  4 ++--
 proto/bfd/packets.c    |  6 +++---
 proto/bgp/bgp.c        | 12 ++++++------
 proto/ospf/iface.c     |  4 ++--
 proto/radv/packets.c   |  2 +-
 proto/rip/packets.c    |  2 +-
 proto/rip/rip.c        |  2 +-
 proto/rpki/transport.c |  2 +-
 sysdep/bsd/krt-sock.c  |  4 ++--
 sysdep/unix/io.c       |  2 +-
 13 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/lib/socket.h b/lib/socket.h
index 4b169581..6225977b 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -88,6 +88,7 @@ sock *sock_new(pool *);			/* Allocate new socket */
 
 int sk_open(sock *, struct birdloop *);		/* Open socket */
 void sk_reloop(sock *, struct birdloop *);	/* Move socket to another loop. Both loops must be locked. */
+static inline void sk_close(sock *s) { rfree(&s->r); }	/* Explicitly close socket */
 
 int sk_rx_ready(sock *s);
 _Bool sk_tx_pending(sock *s);
diff --git a/nest/cli.c b/nest/cli.c
index 1debfccf..39a3eef7 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -417,7 +417,7 @@ cli_free(cli *c)
 
   if (defer)
   {
-    rfree(c->sock);
+    sk_close(c->sock);
     c->sock = NULL;
   }
   else
diff --git a/proto/babel/packets.c b/proto/babel/packets.c
index d26ee5c6..47d065cd 100644
--- a/proto/babel/packets.c
+++ b/proto/babel/packets.c
@@ -1680,7 +1680,7 @@ babel_open_socket(struct babel_iface *ifa)
 
 err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return 0;
 }
 
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index c88c1cb2..ddbc4948 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -604,10 +604,10 @@ bfd_free_iface(struct bfd_iface *ifa)
     return;
 
   if (ifa->sk)
-    rfree(ifa->sk);
+    sk_close(ifa->sk);
 
   if (ifa->rx)
-    rfree(ifa->rx);
+    sk_close(ifa->rx);
 
   rem_node(&ifa->n);
   mb_free(ifa);
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index a22f223b..fa8c328f 100644
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -439,7 +439,7 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop, int af)
 
  err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return NULL;
 }
 
@@ -470,7 +470,7 @@ bfd_open_rx_sk_bound(struct bfd_proto *p, ip_addr local, struct iface *ifa)
 
  err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return NULL;
 }
 
@@ -501,6 +501,6 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
 
  err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return NULL;
 }
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index cda0eb8d..0525d502 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -294,7 +294,7 @@ bgp_listen_create(void *_ UNUSED)
       {
 	sk_log_error(sk, p->p.name);
 	log(L_ERR "%s: Cannot open listening socket", p->p.name);
-	rfree(sk);
+	sk_close(sk);
 	UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 
 	bgp_initiate_disable(p, BEM_NO_SOCKET);
@@ -335,7 +335,7 @@ bgp_listen_create(void *_ UNUSED)
   WALK_LIST_DELSAFE(bs, nxt, bgp_sockets)
     if (EMPTY_LIST(bs->requests))
     {
-      rfree(bs->sk);
+      sk_close(bs->sk);
       rem_node(&bs->n);
       mb_free(bs);
     }
@@ -465,7 +465,7 @@ bgp_close_conn(struct bgp_conn *conn)
   rfree(conn->tx_ev);
   conn->tx_ev = NULL;
 
-  rfree(conn->sk);
+  sk_close(conn->sk);
   conn->sk = NULL;
 
   mb_free(conn->local_caps);
@@ -1336,7 +1336,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
   {
     log(L_WARN "BGP: Unexpected connect from unknown address %I%J (port %d)",
 	sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL, sk->dport);
-    rfree(sk);
+    sk_close(sk);
     return 0;
   }
 
@@ -1370,7 +1370,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
 
   if (!acc)
   {
-    rfree(sk);
+    sk_close(sk);
     goto leave;
   }
 
@@ -1410,7 +1410,7 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
 err:
   sk_log_error(sk, p->p.name);
   log(L_ERR "%s: Incoming connection aborted", p->p.name);
-  rfree(sk);
+  sk_close(sk);
 
 leave:
   birdloop_leave(p->p.loop);
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 0aa7fa00..37f642d1 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -173,7 +173,7 @@ ospf_sk_open(struct ospf_iface *ifa)
 
  err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return 0;
 }
 
@@ -234,7 +234,7 @@ ospf_open_vlink_sk(struct ospf_proto *p)
  err:
   sk_log_error(sk, p->p.name);
   log(L_ERR "%s: Cannot open virtual link socket", p->p.name);
-  rfree(sk);
+  sk_close(sk);
 }
 
 static void
diff --git a/proto/radv/packets.c b/proto/radv/packets.c
index c6b565d2..d1d8663f 100644
--- a/proto/radv/packets.c
+++ b/proto/radv/packets.c
@@ -511,7 +511,7 @@ radv_sk_open(struct radv_iface *ifa)
 
  err:
   sk_log_error(sk, ifa->ra->p.name);
-  rfree(sk);
+  sk_close(sk);
   return 0;
 }
 
diff --git a/proto/rip/packets.c b/proto/rip/packets.c
index fecdf896..70108ac3 100644
--- a/proto/rip/packets.c
+++ b/proto/rip/packets.c
@@ -1040,6 +1040,6 @@ rip_open_socket(struct rip_iface *ifa)
 
 err:
   sk_log_error(sk, p->p.name);
-  rfree(sk);
+  sk_close(sk);
   return 0;
 }
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index d15177da..dded05c7 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -750,7 +750,7 @@ rip_remove_iface(struct rip_proto *p, struct rip_iface *ifa)
 
   rem_node(NODE ifa);
 
-  rfree(ifa->sk);
+  sk_close(ifa->sk);
   rfree(ifa->lock);
   rfree(ifa->timer);
 
diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c
index 81bd6dd8..8c6dcc11 100644
--- a/proto/rpki/transport.c
+++ b/proto/rpki/transport.c
@@ -120,7 +120,7 @@ rpki_tr_close(struct rpki_tr_sock *tr)
 
   if (tr->sk)
   {
-    rfree(tr->sk);
+    sk_close(tr->sk);
     tr->sk = NULL;
   }
 }
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 094268b7..6bf756ff 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -1118,7 +1118,7 @@ krt_sock_close_shared(void)
 
   if (!krt_sock_count)
   {
-    rfree(krt_sock);
+    sk_close(krt_sock);
     krt_sock = NULL;
   }
 }
@@ -1181,7 +1181,7 @@ krt_sys_shutdown(struct krt_proto *p)
 {
   krt_table_cf[(KRT_CF->sys.table_id)/32][!!(p->af == AF_INET6)] &= ~(1 << ((KRT_CF->sys.table_id)%32));
 
-  rfree(p->sys.sk);
+  sk_close(p->sys.sk);
   p->sys.sk = NULL;
 
   krt_buffer_release(&p->p);
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 88d187a4..40a6f114 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1081,7 +1081,7 @@ sk_passive_connected(sock *s, int type)
     /* FIXME: handle it better in rfree() */
     close(t->fd);
     t->fd = -1;
-    rfree(t);
+    sk_close(t);
     return 1;
   }
 

From 1141ce4e2d924f29e6e31ccf5e325f870c8895dd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 20 Apr 2023 21:08:38 +0200
Subject: [PATCH 298/431] Resource pool closing has its dedicated function

---
 conf/conf.c           | 2 +-
 lib/resource.c        | 4 ++--
 lib/resource.h        | 7 +++++++
 nest/cli.c            | 2 +-
 nest/proto.c          | 2 +-
 nest/rt-show.c        | 2 +-
 nest/rt-table.c       | 2 +-
 proto/babel/babel.c   | 2 +-
 proto/bgp/attrs.c     | 2 +-
 proto/mrt/mrt.c       | 2 +-
 proto/ospf/iface.c    | 2 +-
 proto/ospf/neighbor.c | 2 +-
 proto/radv/radv.c     | 2 +-
 sysdep/unix/io-loop.c | 8 ++++----
 14 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index daac85c1..2cfe7b15 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -200,7 +200,7 @@ config_free(struct config *c)
 
   ASSERT(!c->obstacle_count);
 
-  rfree(c->pool);
+  rp_free(c->pool);
 }
 
 /**
diff --git a/lib/resource.c b/lib/resource.c
index 94b8d019..0006bc8d 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -298,7 +298,7 @@ void
 tmp_flush(void)
 {
   lp_flush(tmp_linpool);
-  rfree(tmp_res.pool);
+  rp_free(tmp_res.pool);
   tmp_res.pool = rp_new(tmp_res.parent, "TMP");
 }
 
@@ -449,7 +449,7 @@ mb_free(void *m)
     return;
 
   struct mblock *b = SKIP_BACK(struct mblock, data, m);
-  rfree(b);
+  rfree(&b->r);
 }
 
 
diff --git a/lib/resource.h b/lib/resource.h
index 911b990d..64803778 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -58,6 +58,12 @@ void rmove(void *, pool *);		/* Move to a different pool */
 
 void *ralloc(pool *, struct resclass *);
 
+pool *rp_new(pool *, const char *);		/* Create a new pool */
+pool *rp_newf(pool *, const char *, ...);	/* Create a new pool with a formatted string as its name */
+void rp_init(pool *, const char *);		/* Init a new pool */
+void rp_initf(pool *, const char *, ...);	/* Init a new pool with a formatted string as its name */
+static inline void rp_free(pool *p) { rfree(&p->r); }	/* Free the whole pool */
+
 extern pool root_pool;
 
 /* Normal memory blocks */
@@ -111,6 +117,7 @@ slab *sl_new(pool *, unsigned size);
 void *sl_alloc(slab *);
 void *sl_allocz(slab *);
 void sl_free(void *);
+void sl_delete(slab *);
 
 /*
  * Low-level memory allocation functions, please don't use
diff --git a/nest/cli.c b/nest/cli.c
index 39a3eef7..29591d26 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -421,7 +421,7 @@ cli_free(cli *c)
     c->sock = NULL;
   }
   else
-    rfree(c->pool);
+    rp_free(c->pool);
 }
 
 /**
diff --git a/nest/proto.c b/nest/proto.c
index 280585dd..1b25dfe9 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1116,7 +1116,7 @@ proto_cleanup(struct proto *p)
 {
   CALL(p->proto->cleanup, p);
 
-  rfree(p->pool);
+  rp_free(p->pool);
   p->pool = NULL;
 
   p->active = 0;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index a5c7dc8f..eacd4e31 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -227,7 +227,7 @@ rt_show_export_stopped_cleanup(struct rt_export_request *req)
   req->hook = NULL;
 
   /* And free the CLI (deferred) */
-  rfree(d->cli->pool);
+  rp_free(d->cli->pool);
 }
 
 static int
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b18727b1..cec13318 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2027,7 +2027,7 @@ rt_export_stopped(struct rt_export_hook *hook)
   rem_node(&hook->n);
 
   /* Free the hook itself together with its pool */
-  rfree(hook->pool);
+  rp_free(hook->pool);
 }
 
 static inline void
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index d398da8e..e95a0ead 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1881,7 +1881,7 @@ babel_remove_iface(struct babel_proto *p, struct babel_iface *ifa)
 
   rem_node(NODE ifa);
 
-  rfree(ifa->pool); /* contains ifa itself, locks, socket, etc */
+  rp_free(ifa->pool); /* contains ifa itself, locks, socket, etc */
 }
 
 static int
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 8bff4c78..4e6524f4 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1867,7 +1867,7 @@ bgp_free_pending_tx(struct bgp_channel *c)
   ASSERT_DIE(c->ptx);
   ASSERT_DIE(c->ptx->pool);
 
-  rfree(c->ptx->pool);
+  rp_free(c->ptx->pool);
   c->ptx = NULL;
 }
 
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index 82fd426a..92c19b63 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -590,7 +590,7 @@ mrt_table_dump_free(struct mrt_table_dump_state *s)
 
   config_del_obstacle(s->config);
 
-  rfree(s->pool);
+  rp_free(s->pool);
 }
 
 
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 37f642d1..0eecb432 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -311,7 +311,7 @@ ospf_iface_remove(struct ospf_iface *ifa)
 
   ospf_iface_sm(ifa, ISM_DOWN);
   rem_node(NODE ifa);
-  rfree(ifa->pool);
+  rp_free(ifa->pool);
 }
 
 void
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index b0fdc42f..2c73d251 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -120,7 +120,7 @@ ospf_neigh_down(struct ospf_neighbor *n)
   s_get(&(n->dbsi));
   release_lsrtl(p, n);
   rem_node(NODE n);
-  rfree(n->pool);
+  rp_free(n->pool);
 
   OSPF_TRACE(D_EVENTS, "Neighbor %R on %s removed", rid, ifa->ifname);
 }
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 434155dc..eb15f9cb 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -323,7 +323,7 @@ radv_iface_remove(struct radv_iface *ifa)
 
   rem_node(NODE ifa);
 
-  rfree(ifa->pool);
+  rp_free(ifa->pool);
 }
 
 static void
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index efb408e0..8481bb6e 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -746,7 +746,7 @@ bird_thread_cleanup(void *_thr)
   pthread_attr_destroy(&thr->thread_attr);
 
   /* Free all remaining memory */
-  rfree(thr->pool);
+  rp_free(thr->pool);
 }
 
 static struct bird_thread *
@@ -839,7 +839,7 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Stop the meta loop */
   birdloop_leave(thr->meta);
   domain_free(thr->meta->time.domain);
-  rfree(thr->meta->pool);
+  rp_free(thr->meta->pool);
 
   /* Local pages not needed anymore */
   flush_local_pages();
@@ -990,7 +990,7 @@ bird_thread_show(void *data)
 
     cli_write_trigger(tsd->cli);
     DOMAIN_FREE(control, tsd->lock);
-    rfree(tsd->pool);
+    rp_free(tsd->pool);
 
     the_bird_unlock();
   }
@@ -1258,7 +1258,7 @@ birdloop_free(struct birdloop *loop)
   ASSERT_DIE(loop->thread == NULL);
 
   domain_free(loop->time.domain);
-  rfree(loop->pool);
+  rp_free(loop->pool);
 }
 
 static void

From 6230d87c74e3629e21f1e0fe22a874a58302a01e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 22 Apr 2023 21:20:19 +0200
Subject: [PATCH 299/431] Protocols and tables now use the birdloop pools as
 primary

---
 lib/io-loop.h         |  5 ++++-
 lib/resource.c        | 10 ++++++++--
 lib/resource.h        |  3 +++
 nest/proto.c          | 18 +++++++++++++-----
 nest/rt-table.c       | 12 ++++++++----
 sysdep/unix/io-loop.c | 38 +++++++++++++++++++++++++++++---------
 6 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/lib/io-loop.h b/lib/io-loop.h
index 877cd5ce..b0d3d6cc 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -17,7 +17,7 @@
 extern struct birdloop main_birdloop;
 
 /* Start a new birdloop owned by given pool and domain */
-struct birdloop *birdloop_new(pool *p, uint order, const char *name, btime max_latency);
+struct birdloop *birdloop_new(pool *p, uint order, btime max_latency, const char *fmt, ...);
 
 /* Stop the loop. At the end, the @stopped callback is called unlocked in tail
  * position to finish cleanup. Run birdloop_free() from that callback to free
@@ -32,6 +32,9 @@ event_list *birdloop_event_list(struct birdloop *loop);
 /* Get birdloop's time heap */
 struct timeloop *birdloop_time_loop(struct birdloop *loop);
 
+/* Get birdloop's pool */
+pool *birdloop_pool(struct birdloop *loop);
+
 /* Enter and exit the birdloop */
 void birdloop_enter(struct birdloop *loop);
 void birdloop_leave(struct birdloop *loop);
diff --git a/lib/resource.c b/lib/resource.c
index 0006bc8d..b1b89bdf 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -64,13 +64,19 @@ rp_new(pool *p, const char *name)
 }
 
 pool *
-rp_newf(pool *p, const char *fmt, ...)
+rp_vnewf(pool *p, const char *fmt, va_list args)
 {
   pool *z = rp_new(p, NULL);
+  z->name = mb_vsprintf(p, fmt, args);
+  return z;
+}
 
+pool *
+rp_newf(pool *p, const char *fmt, ...)
+{
   va_list args;
   va_start(args, fmt);
-  z->name = mb_vsprintf(p, fmt, args);
+  pool *z = rp_vnewf(p, fmt, args);
   va_end(args);
 
   return z;
diff --git a/lib/resource.h b/lib/resource.h
index 64803778..2adb9de0 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -12,6 +12,8 @@
 
 #include "lib/lists.h"
 
+#include <stdarg.h>
+
 struct resmem {
   size_t effective;			/* Memory actually used for data storage */
   size_t overhead;			/* Overhead memory imposed by allocator strategies */
@@ -60,6 +62,7 @@ void *ralloc(pool *, struct resclass *);
 
 pool *rp_new(pool *, const char *);		/* Create a new pool */
 pool *rp_newf(pool *, const char *, ...);	/* Create a new pool with a formatted string as its name */
+pool *rp_vnewf(pool *, const char *, va_list);	/* Create a new pool with a formatted string as its name */
 void rp_init(pool *, const char *);		/* Init a new pool */
 void rp_initf(pool *, const char *, ...);	/* Init a new pool with a formatted string as its name */
 static inline void rp_free(pool *p) { rfree(&p->r); }	/* Free the whole pool */
diff --git a/nest/proto.c b/nest/proto.c
index 1b25dfe9..d6269272 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1116,8 +1116,11 @@ proto_cleanup(struct proto *p)
 {
   CALL(p->proto->cleanup, p);
 
-  rp_free(p->pool);
-  p->pool = NULL;
+  if (p->pool)
+  {
+    rp_free(p->pool);
+    p->pool = NULL;
+  }
 
   p->active = 0;
   proto_log_state_change(p);
@@ -1131,8 +1134,10 @@ proto_loop_stopped(void *ptr)
 
   birdloop_enter(&main_birdloop);
 
+  p->pool = NULL; /* is freed by birdloop_free() */
   birdloop_free(p->loop);
   p->loop = &main_birdloop;
+
   proto_cleanup(p);
 
   birdloop_leave(&main_birdloop);
@@ -1214,13 +1219,16 @@ proto_start(struct proto *p)
   DBG("Kicking %s up\n", p->name);
   PD(p, "Starting");
 
-  p->pool = rp_newf(proto_pool, "Protocol %s", p->cf->name);
-
   if (graceful_restart_state == GRS_INIT)
     p->gr_recovery = 1;
 
   if (p->cf->loop_order != DOMAIN_ORDER(the_bird))
-    p->loop = birdloop_new(p->pool, p->cf->loop_order, p->pool->name, p->cf->loop_max_latency);
+  {
+    p->loop = birdloop_new(proto_pool, p->cf->loop_order, p->cf->loop_max_latency, "Protocol %s", p->cf->name);
+    p->pool = birdloop_pool(p->loop);
+  }
+  else
+    p->pool = rp_newf(proto_pool, "Protocol %s", p->cf->name);
 
   p->iface_sub.target = proto_event_list(p);
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index cec13318..9629db2c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2845,10 +2845,15 @@ rt_setup(pool *pp, struct rtable_config *cf)
 {
   ASSERT_DIE(birdloop_inside(&main_birdloop));
 
-  pool *p = rp_newf(pp, "Routing table %s", cf->name);
+  /* Start the service thread */
+  struct birdloop *loop = birdloop_new(pp, DOMAIN_ORDER(service), 0, "Routing table service %s", cf->name);
+  pool *sp = birdloop_pool(loop);
+  pool *p = rp_newf(sp, "Routing table data %s", cf->name);
 
+  /* Create the actual table */
   struct rtable_private *t = ralloc(p, &rt_class);
   t->rp = p;
+  t->loop = loop;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
 
@@ -2906,8 +2911,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
     t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
   }
 
-  /* Start the service thread */
-  t->loop = birdloop_new(p, DOMAIN_ORDER(service), mb_sprintf(p, "Routing table %s", t->name), 0);
+  /* Setup the service thread flag handler */
   birdloop_enter(t->loop);
   birdloop_flag_set_handler(t->loop, &t->fh);
   birdloop_leave(t->loop);
@@ -4073,8 +4077,8 @@ rt_delete(void *tab_)
 
   RT_UNLOCK(RT_PUB(tab));
 
+  /* Everything is freed by freeing the loop */
   birdloop_free(tab->loop);
-  rfree(tab->rp);
   config_del_obstacle(conf);
 
   birdloop_leave(&main_birdloop);
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 8481bb6e..701eddf7 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -31,7 +31,7 @@
 
 #define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
 
-static struct birdloop *birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup, struct birdloop_pickup_group *group);
+static struct birdloop *birdloop_new_no_pickup(pool *pp, uint order, const char *name, ...);
 
 /*
  *	Nanosecond time for accounting purposes
@@ -87,6 +87,12 @@ birdloop_time_loop(struct birdloop *loop)
   return &loop->time;
 }
 
+pool *
+birdloop_pool(struct birdloop *loop)
+{
+  return loop->pool;
+}
+
 _Bool
 birdloop_inside(struct birdloop *loop)
 {
@@ -627,7 +633,7 @@ bird_thread_main(void *arg)
   tmp_init(thr->pool);
   init_list(&thr->loops);
 
-  thr->meta = birdloop_new_internal(thr->pool, DOMAIN_ORDER(meta), "Thread Meta", 0, thr->group);
+  thr->meta = birdloop_new_no_pickup(thr->pool, DOMAIN_ORDER(meta), "Thread Meta");
   thr->meta->thread = thr;
   birdloop_enter(thr->meta);
 
@@ -885,7 +891,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
 
     if ((dif > 0) && !thread_dropper_running)
     {
-      struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), "Thread dropper", group->max_latency);
+      struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), group->max_latency, "Thread dropper");
       event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
 
       LOCK_DOMAIN(resource, group->domain);
@@ -1178,11 +1184,11 @@ birdloop_run_timer(timer *tm)
 }
 
 static struct birdloop *
-birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup, struct birdloop_pickup_group *group)
+birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group, const char *name, va_list args)
 {
   struct domain_generic *dg = domain_new(name, order);
 
-  pool *p = rp_new(pp, name);
+  pool *p = rp_vnewf(pp, name, args);
   struct birdloop *loop = mb_allocz(p, sizeof(struct birdloop));
   loop->pool = p;
 
@@ -1200,7 +1206,7 @@ birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup
   loop->event = (event) { .hook = birdloop_run, .data = loop, };
   loop->timer = (timer) { .hook = birdloop_run_timer, .data = loop, };
 
-  if (request_pickup)
+  if (group)
   {
     LOCK_DOMAIN(resource, group->domain);
     add_tail(&group->loops, &loop->n);
@@ -1218,10 +1224,24 @@ birdloop_new_internal(pool *pp, uint order, const char *name, int request_pickup
   return loop;
 }
 
-struct birdloop *
-birdloop_new(pool *pp, uint order, const char *name, btime max_latency)
+static struct birdloop *
+birdloop_new_no_pickup(pool *pp, uint order, const char *name, ...)
 {
-  return birdloop_new_internal(pp, order, name, 1, max_latency ? &pickup_groups[1] : &pickup_groups[0]);
+  va_list args;
+  va_start(args, name);
+  struct birdloop *loop = birdloop_vnew_internal(pp, order, NULL, name, args);
+  va_end(args);
+  return loop;
+}
+
+struct birdloop *
+birdloop_new(pool *pp, uint order, btime max_latency, const char *name, ...)
+{
+  va_list args;
+  va_start(args, name);
+  struct birdloop *loop = birdloop_vnew_internal(pp, order, max_latency ? &pickup_groups[1] : &pickup_groups[0], name, args);
+  va_end(args);
+  return loop;
 }
 
 static void

From 22f54eaee6c6dbe12ad7bb0ee1da09e3e026b970 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 21 Apr 2023 15:26:06 +0200
Subject: [PATCH 300/431] Resource pools are now bound with domains.

Memory allocation is a fragile part of BIRD and we need checking that
everybody is using the resource pools in an appropriate way. To assure
this, all the resource pools are associated with locking domains and
every resource manipulation is thoroughly checked whether the
appropriate locking domain is locked.

With transitive resource manipulation like resource dumping or mass free
operations, domains are locked and unlocked on the go, thus we require
pool domains to have higher order than their parent to allow for this
transitive operations.

Adding pool locking revealed some cases of insecure memory manipulation
and this commit fixes that as well.
---
 conf/conf.c           |   4 +-
 lib/hash_test.c       |   2 +-
 lib/io-loop.h         |   1 +
 lib/locking.h         |   2 +-
 lib/resource.c        | 139 ++++++++++++++++++++++++++++++------------
 lib/resource.h        |  34 +++++++----
 nest/cli.c            |   6 +-
 nest/cli.h            |   1 +
 nest/iface.c          |   7 ++-
 nest/locks.h          |   1 +
 nest/password.h       |   2 +
 nest/proto.c          |  12 ++--
 nest/protocol.h       |   2 +
 nest/rt-attr.c        |  20 +++++-
 nest/rt-show.c        |   1 +
 nest/rt-table.c       |  63 +++++++++++--------
 nest/rt.h             |   3 +-
 proto/babel/babel.c   |   2 +-
 proto/bfd/bfd.c       |   2 +-
 proto/bgp/attrs.c     |   4 +-
 proto/bgp/bgp.c       |   3 +-
 proto/ospf/iface.c    |   4 +-
 proto/ospf/neighbor.c |   2 +-
 proto/radv/radv.c     |   2 +-
 proto/rpki/rpki.c     |   2 +-
 sysdep/unix/io-loop.c |  59 ++++++++++++------
 sysdep/unix/krt.c     |   2 +-
 27 files changed, 257 insertions(+), 125 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index 2cfe7b15..c7cd81fe 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -90,7 +90,7 @@ int undo_available;			/* Undo was not requested from last reconfiguration */
 struct config *
 config_alloc(const char *name)
 {
-  pool *p = rp_new(config_pool, "Config");
+  pool *p = rp_new(config_pool, the_bird_domain.the_bird, "Config");
   linpool *l = lp_new_default(p);
   struct config *c = lp_allocz(l, sizeof(struct config));
 
@@ -515,7 +515,7 @@ config_timeout(timer *t UNUSED)
 void
 config_init(void)
 {
-  config_pool = rp_new(&root_pool, "Configurations");
+  config_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Configurations");
 
   config_event = ev_new(config_pool);
   config_event->hook = config_done;
diff --git a/lib/hash_test.c b/lib/hash_test.c
index ecfcdd66..30213320 100644
--- a/lib/hash_test.c
+++ b/lib/hash_test.c
@@ -61,7 +61,7 @@ dump_nodes(void)
 static void
 init_hash_(uint order)
 {
-  my_pool = rp_new(&root_pool, "Test pool");
+  my_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Test pool");
 
   HASH_INIT(hash, my_pool, order);
 
diff --git a/lib/io-loop.h b/lib/io-loop.h
index b0d3d6cc..80cd2ea2 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -31,6 +31,7 @@ event_list *birdloop_event_list(struct birdloop *loop);
 
 /* Get birdloop's time heap */
 struct timeloop *birdloop_time_loop(struct birdloop *loop);
+#define birdloop_domain(l)  (birdloop_time_loop((l))->domain)
 
 /* Get birdloop's pool */
 pool *birdloop_pool(struct birdloop *loop);
diff --git a/lib/locking.h b/lib/locking.h
index 6bed14bf..751eecbd 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -13,8 +13,8 @@ struct domain_generic;
 
 /* Here define the global lock order; first to last. */
 struct lock_order {
-  struct domain_generic *meta;
   struct domain_generic *the_bird;
+  struct domain_generic *meta;
   struct domain_generic *control;
   struct domain_generic *proto;
   struct domain_generic *service;
diff --git a/lib/resource.c b/lib/resource.c
index b1b89bdf..2071a411 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -46,6 +46,16 @@ static struct resclass pool_class = {
 
 pool root_pool;
 
+static void
+rp_init(pool *z, struct domain_generic *dom, const char *name)
+{
+  ASSERT_DIE(DG_IS_LOCKED(dom));
+
+  z->name = name;
+  z->domain = dom;
+  z->inside = (TLIST_LIST(resource)) {};
+}
+
 /**
  * rp_new - create a resource pool
  * @p: parent pool
@@ -55,77 +65,106 @@ pool root_pool;
  * parent pool.
  */
 pool *
-rp_new(pool *p, const char *name)
+rp_new(pool *p, struct domain_generic *dom, const char *name)
 {
   pool *z = ralloc(p, &pool_class);
-  z->name = name;
-  init_list(&z->inside);
+
+  if (dg_order(p->domain) > dg_order(dom))
+    bug("Requested reverse order pool creation: %s (%d) can't be a parent of %s (%d)",
+	domain_name(p->domain), dg_order(p->domain),
+	domain_name(dom), dg_order(dom));
+
+  if ((dg_order(p->domain) == dg_order(dom)) && (p->domain != dom))
+    bug("Requested incomparable order pool creation: %s (%d) can't be a parent of %s (%d)",
+	domain_name(p->domain), dg_order(p->domain),
+	domain_name(dom), dg_order(dom));
+
+  rp_init(z, dom, name);
   return z;
 }
 
 pool *
-rp_vnewf(pool *p, const char *fmt, va_list args)
+rp_vnewf(pool *p, struct domain_generic *dom, const char *fmt, va_list args)
 {
-  pool *z = rp_new(p, NULL);
+  pool *z = rp_new(p, dom, NULL);
   z->name = mb_vsprintf(p, fmt, args);
   return z;
 }
 
 pool *
-rp_newf(pool *p, const char *fmt, ...)
+rp_newf(pool *p, struct domain_generic *dom, const char *fmt, ...)
 {
   va_list args;
   va_start(args, fmt);
-  pool *z = rp_vnewf(p, fmt, args);
+  pool *z = rp_vnewf(p, dom, fmt, args);
   va_end(args);
 
   return z;
 }
 
+#define POOL_LOCK				\
+  struct domain_generic *dom = p->domain;	\
+  int locking = !DG_IS_LOCKED(dom);		\
+  if (locking)					\
+    DG_LOCK(dom);				\
+
+#define POOL_UNLOCK if (locking) DG_UNLOCK(dom);\
+
+void rp_free(pool *p)
+{
+  ASSERT_DIE(DG_IS_LOCKED(p->domain));
+  rfree(p);
+}
 
 static void
 pool_free(resource *P)
 {
   pool *p = (pool *) P;
-  resource *r, *rr;
 
-  r = HEAD(p->inside);
-  while (rr = (resource *) r->n.next)
+  POOL_LOCK;
+  WALK_TLIST_DELSAFE(resource, r, &p->inside)
     {
       r->class->free(r);
       xfree(r);
-      r = rr;
     }
+  POOL_UNLOCK;
 }
 
+
 static void
 pool_dump(resource *P, unsigned indent)
 {
   pool *p = (pool *) P;
-  resource *r;
+
+  POOL_LOCK;
 
   debug("%s\n", p->name);
-  WALK_LIST(r, p->inside)
+  WALK_TLIST_DELSAFE(resource, r, &p->inside)
     rdump(r, indent + 3);
+
+  POOL_UNLOCK;
 }
 
 static struct resmem
 pool_memsize(resource *P)
 {
   pool *p = (pool *) P;
-  resource *r;
   struct resmem sum = {
     .effective = 0,
     .overhead = sizeof(pool) + ALLOC_OVERHEAD,
   };
 
-  WALK_LIST(r, p->inside)
+  POOL_LOCK;
+
+  WALK_TLIST(resource, r, &p->inside)
   {
     struct resmem add = rmemsize(r);
     sum.effective += add.effective;
     sum.overhead += add.overhead;
   }
 
+  POOL_UNLOCK;
+
   return sum;
 }
 
@@ -133,14 +172,25 @@ static resource *
 pool_lookup(resource *P, unsigned long a)
 {
   pool *p = (pool *) P;
-  resource *r, *q;
+  resource *q = NULL;
 
-  WALK_LIST(r, p->inside)
+  POOL_LOCK;
+
+  WALK_TLIST(resource, r, &p->inside)
     if (r->class->lookup && (q = r->class->lookup(r, a)))
-      return q;
-  return NULL;
+      break;
+
+  POOL_UNLOCK;
+  return q;
 }
 
+static pool *
+resource_parent(resource *r)
+{
+  return SKIP_BACK(pool, inside, resource_enlisted(r));
+}
+
+
 /**
  * rmove - move a resource
  * @res: resource
@@ -152,13 +202,13 @@ pool_lookup(resource *P, unsigned long a)
 void rmove(void *res, pool *p)
 {
   resource *r = res;
+  pool *orig = resource_parent(r);
 
-  if (r)
-    {
-      if (r->n.next)
-        rem_node(&r->n);
-      add_tail(&p->inside, &r->n);
-    }
+  ASSERT_DIE(DG_IS_LOCKED(orig->domain));
+  ASSERT_DIE(DG_IS_LOCKED(p->domain));
+
+  resource_rem_node(&orig->inside, r);
+  resource_add_tail(&p->inside, r);
 }
 
 /**
@@ -179,8 +229,10 @@ rfree(void *res)
   if (!r)
     return;
 
-  if (r->n.next)
-    rem_node(&r->n);
+  pool *orig = resource_parent(r);
+  ASSERT_DIE(DG_IS_LOCKED(orig->domain));
+  resource_rem_node(&orig->inside, r);
+
   r->class->free(r);
   r->class = NULL;
   xfree(r);
@@ -239,12 +291,14 @@ rmemsize(void *res)
 void *
 ralloc(pool *p, struct resclass *c)
 {
+  ASSERT_DIE(DG_IS_LOCKED(p->domain));
+
   resource *r = xmalloc(c->size);
   bzero(r, c->size);
 
   r->class = c;
-  if (p)
-    add_tail(&p->inside, &r->n);
+  resource_add_tail(&p->inside, r);
+
   return r;
 }
 
@@ -284,28 +338,29 @@ resource_init(void)
   rcu_init();
   resource_sys_init();
 
-  root_pool.r.class = &pool_class;
-  root_pool.name = "Root";
-  init_list(&root_pool.inside);
-  tmp_init(&root_pool);
+  rp_init(&root_pool, the_bird_domain.the_bird, "Root");
+  tmp_init(&root_pool, the_bird_domain.the_bird);
 }
 
 _Thread_local struct tmp_resources tmp_res;
 
 void
-tmp_init(pool *p)
+tmp_init(pool *p, struct domain_generic *dom)
 {
   tmp_res.lp = lp_new_default(p);
   tmp_res.parent = p;
-  tmp_res.pool = rp_new(p, "TMP");
+  tmp_res.pool = rp_new(p, dom, "TMP");
+  tmp_res.domain = dom;
 }
 
 void
 tmp_flush(void)
 {
+  ASSERT_DIE(DG_IS_LOCKED(tmp_res.domain));
+
   lp_flush(tmp_linpool);
   rp_free(tmp_res.pool);
-  tmp_res.pool = rp_new(tmp_res.parent, "TMP");
+  tmp_res.pool = rp_new(tmp_res.parent, tmp_res.domain, "TMP");
 }
 
 
@@ -385,11 +440,13 @@ static struct resclass mb_class = {
 void *
 mb_alloc(pool *p, unsigned size)
 {
+  ASSERT_DIE(DG_IS_LOCKED(p->domain));
+
   struct mblock *b = xmalloc(sizeof(struct mblock) + size);
 
   b->r.class = &mb_class;
-  b->r.n = (node) {};
-  add_tail(&p->inside, &b->r.n);
+  b->r.n = (struct resource_node) {};
+  resource_add_tail(&p->inside, &b->r);
   b->size = size;
   return b->data;
 }
@@ -434,10 +491,14 @@ void *
 mb_realloc(void *m, unsigned size)
 {
   struct mblock *b = SKIP_BACK(struct mblock, data, m);
+  struct pool *p = resource_parent(&b->r);
+
+  ASSERT_DIE(DG_IS_LOCKED(p->domain));
 
   b = xrealloc(b, sizeof(struct mblock) + size);
-  update_node(&b->r.n);
   b->size = size;
+
+  resource_update_node(&p->inside, &b->r);
   return b->data;
 }
 
diff --git a/lib/resource.h b/lib/resource.h
index 2adb9de0..810334c1 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -10,7 +10,8 @@
 #ifndef _BIRD_RESOURCE_H_
 #define _BIRD_RESOURCE_H_
 
-#include "lib/lists.h"
+#include "lib/locking.h"
+#include "lib/tlists.h"
 
 #include <stdarg.h>
 
@@ -21,11 +22,20 @@ struct resmem {
 
 /* Resource */
 
+#define TLIST_PREFIX resource
+#define TLIST_TYPE struct resource
+#define TLIST_ITEM n
+#define TLIST_WANT_WALK
+#define TLIST_WANT_ADD_TAIL
+#define TLIST_WANT_UPDATE_NODE
+
 typedef struct resource {
-  node n;				/* Inside resource pool */
-  struct resclass *class;		/* Resource class */
+  TLIST_DEFAULT_NODE;			/* Inside resource pool */
+  const struct resclass *class;		/* Resource class */
 } resource;
 
+#include "lib/tlists.h"
+
 /* Resource class */
 
 struct resclass {
@@ -44,14 +54,13 @@ struct resclass {
 
 typedef struct pool {
   resource r;
-  list inside;
+  TLIST_LIST(resource) inside;
+  struct domain_generic *domain;
   const char *name;
 } pool;
 
 
 void resource_init(void);
-pool *rp_new(pool *, const char *);	/* Create new pool */
-pool *rp_newf(pool *, const char *, ...);	/* Create a new pool with a formatted string as its name */
 void rfree(void *);			/* Free single resource */
 void rdump(void *, unsigned indent);	/* Dump to debug output */
 struct resmem rmemsize(void *res);		/* Return size of memory used by the resource */
@@ -60,12 +69,10 @@ void rmove(void *, pool *);		/* Move to a different pool */
 
 void *ralloc(pool *, struct resclass *);
 
-pool *rp_new(pool *, const char *);		/* Create a new pool */
-pool *rp_newf(pool *, const char *, ...);	/* Create a new pool with a formatted string as its name */
-pool *rp_vnewf(pool *, const char *, va_list);	/* Create a new pool with a formatted string as its name */
-void rp_init(pool *, const char *);		/* Init a new pool */
-void rp_initf(pool *, const char *, ...);	/* Init a new pool with a formatted string as its name */
-static inline void rp_free(pool *p) { rfree(&p->r); }	/* Free the whole pool */
+pool *rp_new(pool *, struct domain_generic *, const char *);		/* Create a new pool */
+pool *rp_newf(pool *, struct domain_generic *, const char *, ...);	/* Create a new pool with a formatted string as its name */
+pool *rp_vnewf(pool *, struct domain_generic *, const char *, va_list);	/* Create a new pool with a formatted string as its name */
+void rp_free(pool *p);							/* Free the whole pool */
 
 extern pool root_pool;
 
@@ -97,6 +104,7 @@ void lp_restore(linpool *m, lp_state *p);	/* Restore state */
 struct tmp_resources {
   pool *pool, *parent;
   linpool *lp;
+  struct domain_generic *domain;
 };
 
 extern _Thread_local struct tmp_resources tmp_res;
@@ -106,7 +114,7 @@ extern _Thread_local struct tmp_resources tmp_res;
 #define tmp_allocu(sz)	lp_allocu(tmp_linpool, sz)
 #define tmp_allocz(sz)	lp_allocz(tmp_linpool, sz)
 
-void tmp_init(pool *p);
+void tmp_init(pool *p, struct domain_generic *dg);
 void tmp_flush(void);
 
 
diff --git a/nest/cli.c b/nest/cli.c
index 29591d26..b74edffb 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -262,7 +262,7 @@ cli_command(struct cli *c)
     log(L_TRACE "CLI: %s", c->rx_buf);
   bzero(&f, sizeof(f));
   f.mem = c->parser_pool;
-  f.pool = rp_new(c->pool, "Config");
+  f.pool = rp_new(c->pool, the_bird_domain.the_bird, "Config");
   init_list(&f.symbols);
   cf_read_hook = cli_cmd_read_hook;
   cli_rh_pos = c->rx_buf;
@@ -309,7 +309,7 @@ cli_event(void *data)
 cli *
 cli_new(struct birdsock *sock)
 {
-  pool *p = rp_new(cli_pool, "CLI");
+  pool *p = rp_new(cli_pool, the_bird_domain.the_bird, "CLI");
   cli *c = mb_alloc(p, sizeof(cli));
 
   bzero(c, sizeof(cli));
@@ -433,7 +433,7 @@ cli_free(cli *c)
 void
 cli_init(void)
 {
-  cli_pool = rp_new(&root_pool, "CLI");
+  cli_pool = rp_new(&root_pool, the_bird_domain.the_bird, "CLI");
   init_list(&cli_log_hooks);
   cli_log_inited = 1;
 }
diff --git a/nest/cli.h b/nest/cli.h
index 2d876571..c5cbd8d7 100644
--- a/nest/cli.h
+++ b/nest/cli.h
@@ -10,6 +10,7 @@
 #define _BIRD_CLI_H_
 
 #include "lib/resource.h"
+#include "lib/lists.h"
 #include "lib/event.h"
 
 #define CLI_RX_BUF_SIZE 4096
diff --git a/nest/iface.c b/nest/iface.c
index f1938664..a024b943 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -1018,12 +1018,15 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 void
 if_init(void)
 {
-  if_pool = rp_new(&root_pool, "Interfaces");
+  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
+
+  IFACE_LOCK;
+  if_pool = rp_new(&root_pool, iface_domain.attrs, "Interfaces");
   init_list(&global_iface_list);
   iface_sub_slab = sl_new(if_pool, sizeof(struct iface_notification));
   strcpy(default_vrf.name, "default");
   neigh_init(if_pool);
-  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
+  IFACE_UNLOCK;
 }
 
 /*
diff --git a/nest/locks.h b/nest/locks.h
index 04571e69..993e296b 100644
--- a/nest/locks.h
+++ b/nest/locks.h
@@ -10,6 +10,7 @@
 #define _BIRD_LOCKS_H_
 
 #include "lib/resource.h"
+#include "lib/lists.h"
 #include "lib/event.h"
 
 /*
diff --git a/nest/password.h b/nest/password.h
index 53168bb7..335b9cd4 100644
--- a/nest/password.h
+++ b/nest/password.h
@@ -10,6 +10,8 @@
 #ifndef PASSWORD_H
 #define PASSWORD_H
 
+#include "lib/lists.h"
+
 struct password_item {
   node n;
   const char *password;			/* Key data, null terminated */
diff --git a/nest/proto.c b/nest/proto.c
index d6269272..32183c9d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -367,6 +367,7 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
       .name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s",
 	  c->proto->name, c->name, dir ? "in" : "out", tab->name),
       .list = proto_work_list(c->proto),
+      .pool = c->proto->pool,
       .trace_routes = c->debug | c->proto->debug,
       .dump_req = channel_dump_roa_req,
       .export_one = channel_export_one_roa,
@@ -495,6 +496,7 @@ channel_start_export(struct channel *c)
   c->out_req = (struct rt_export_request) {
     .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
+    .pool = c->proto->pool,
     .addr = c->out_subprefix,
     .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
     .trace_routes = c->debug | c->proto->debug,
@@ -685,6 +687,7 @@ channel_setup_in_table(struct channel *c)
   c->reload_req = (struct rt_export_request) {
     .name = mb_sprintf(c->proto->pool, "%s.%s.import", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
+    .pool = c->proto->pool,
     .trace_routes = c->debug | c->proto->debug,
     .export_bulk = channel_reload_export_bulk,
     .dump_req = channel_reload_dump_req,
@@ -1132,15 +1135,14 @@ proto_loop_stopped(void *ptr)
 {
   struct proto *p = ptr;
 
-  birdloop_enter(&main_birdloop);
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+  ASSERT_DIE(p->loop != &main_birdloop);
 
   p->pool = NULL; /* is freed by birdloop_free() */
   birdloop_free(p->loop);
   p->loop = &main_birdloop;
 
   proto_cleanup(p);
-
-  birdloop_leave(&main_birdloop);
 }
 
 static void
@@ -1228,7 +1230,7 @@ proto_start(struct proto *p)
     p->pool = birdloop_pool(p->loop);
   }
   else
-    p->pool = rp_newf(proto_pool, "Protocol %s", p->cf->name);
+    p->pool = rp_newf(proto_pool, the_bird_domain.the_bird, "Protocol %s", p->cf->name);
 
   p->iface_sub.target = proto_event_list(p);
 
@@ -1859,7 +1861,7 @@ protos_build(void)
 {
   protos_build_gen();
 
-  proto_pool = rp_new(&root_pool, "Protocols");
+  proto_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Protocols");
 }
 
 
diff --git a/nest/protocol.h b/nest/protocol.h
index eccfcb73..02ec5c15 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -280,6 +280,8 @@ struct proto *proto_iterate_named(struct symbol *sym, struct protocol *proto, st
 
 #define PROTO_LOCKED_FROM_MAIN(p)	for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
 
+static inline struct domain_generic *proto_domain(struct proto *p)
+{ return birdloop_domain(p->loop); }
 
 #define CMD_RELOAD	0
 #define CMD_RELOAD_IN	1
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 903926f6..38612a4e 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -605,9 +605,16 @@ ea_register(pool *p, struct ea_class *def)
 struct ea_class_ref *
 ea_register_alloc(pool *p, struct ea_class cl)
 {
+  struct ea_class_ref *ref;
+
+  RTA_LOCK;
   struct ea_class *clp = ea_class_find_by_name(cl.name);
   if (clp && clp->type == cl.type)
-    return ea_ref_class(p, clp);
+  {
+    ref = ea_ref_class(p, clp);
+    RTA_UNLOCK;
+    return ref;
+  }
 
   uint namelen = strlen(cl.name) + 1;
 
@@ -619,14 +626,18 @@ ea_register_alloc(pool *p, struct ea_class cl)
   memcpy(cla->name, cl.name, namelen);
   cla->cl.name = cla->name;
 
-  return ea_register(p, &cla->cl);
+  ref = ea_register(p, &cla->cl);
+  RTA_UNLOCK;
+  return ref;
 }
 
 void
 ea_register_init(struct ea_class *clp)
 {
+  RTA_LOCK;
   ASSERT_DIE(!ea_class_find_by_name(clp->name));
   ea_register(&root_pool, clp);
+  RTA_UNLOCK;
 }
 
 struct ea_class *
@@ -1598,7 +1609,8 @@ rta_init(void)
 {
   attrs_domain = DOMAIN_NEW(attrs, "Attributes");
 
-  rta_pool = rp_new(&root_pool, "Attributes");
+  RTA_LOCK;
+  rta_pool = rp_new(&root_pool, attrs_domain.attrs, "Attributes");
 
   for (uint i=0; i<ARRAY_SIZE(ea_slab_sizes); i++)
     ea_slab[i] = sl_new(rta_pool, ea_slab_sizes[i]);
@@ -1607,6 +1619,8 @@ rta_init(void)
   rte_src_init();
   ea_class_init();
 
+  RTA_UNLOCK;
+
   /* These attributes are required to be first for nice "show route" output */
   ea_register_init(&ea_gen_nexthop);
   ea_register_init(&ea_gen_hostentry);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index eacd4e31..7a8b629b 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -288,6 +288,7 @@ rt_show_cont(struct rt_show_data *d)
     .addr = d->addr,
     .name = "CLI Show Route",
     .list = &global_work_list,
+    .pool = c->pool,
     .export_bulk = rt_show_net_export_bulk,
     .dump_req = rt_show_dump_req,
     .log_state_change = rt_show_log_state_change,
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 9629db2c..f1e3c8f7 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2131,7 +2131,7 @@ rt_table_export_start_locked(struct rtable_private *tab, struct rt_export_reques
   struct rt_exporter *re = &tab->exporter.e;
   rt_lock_table(tab);
 
-  req->hook = rt_alloc_export(re, sizeof(struct rt_table_export_hook));
+  req->hook = rt_alloc_export(re, req->pool, sizeof(struct rt_table_export_hook));
   req->hook->req = req;
 
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, req->hook);
@@ -2212,9 +2212,9 @@ rt_request_export_other(struct rt_exporter *re, struct rt_export_request *req)
 }
 
 struct rt_export_hook *
-rt_alloc_export(struct rt_exporter *re, uint size)
+rt_alloc_export(struct rt_exporter *re, pool *pp, uint size)
 {
-  pool *p = rp_new(re->rp, "Export hook");
+  pool *p = rp_new(pp, pp->domain, "Export hook");
   struct rt_export_hook *hook = mb_allocz(p, size);
 
   hook->pool = p;
@@ -2709,13 +2709,14 @@ rt_flowspec_link(rtable *src_pub, rtable *dst_pub)
 
     if (!ln)
     {
-      pool *p = src->rp;
+      pool *p = birdloop_pool(dst_pub->loop);
       ln = mb_allocz(p, sizeof(struct rt_flowspec_link));
       ln->src = src_pub;
       ln->dst = dst_pub;
       ln->req = (struct rt_export_request) {
 	.name = mb_sprintf(p, "%s.flowspec.notifier", dst_pub->name),
 	.list = birdloop_event_list(dst_pub->loop),
+	.pool = p,
 	.trace_routes = src->config->debug,
 	.dump_req = rt_flowspec_dump_req,
 	.log_state_change = rt_flowspec_log_state_change,
@@ -2781,8 +2782,6 @@ rt_free(resource *_r)
 {
   struct rtable_private *r = SKIP_BACK(struct rtable_private, r, _r);
 
-  DOMAIN_FREE(rtable, r->lock);
-
   DBG("Deleting routing table %s\n", r->name);
   ASSERT_DIE(r->use_count == 0);
 
@@ -2847,13 +2846,20 @@ rt_setup(pool *pp, struct rtable_config *cf)
 
   /* Start the service thread */
   struct birdloop *loop = birdloop_new(pp, DOMAIN_ORDER(service), 0, "Routing table service %s", cf->name);
+  birdloop_enter(loop);
   pool *sp = birdloop_pool(loop);
-  pool *p = rp_newf(sp, "Routing table data %s", cf->name);
+
+  /* Create the table domain and pool */
+  DOMAIN(rtable) dom = DOMAIN_NEW(rtable, cf->name);
+  LOCK_DOMAIN(rtable, dom);
+
+  pool *p = rp_newf(sp, dom.rtable, "Routing table data %s", cf->name);
 
   /* Create the actual table */
   struct rtable_private *t = ralloc(p, &rt_class);
   t->rp = p;
   t->loop = loop;
+  t->lock = dom;
 
   t->rte_slab = sl_new(p, sizeof(struct rte_storage));
 
@@ -2864,8 +2870,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
   if (t->id >= rtable_max_id)
     rtable_max_id = t->id + 1;
 
-  t->lock = DOMAIN_NEW(rtable, t->name);
-
   fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
 
   if (cf->trie_used)
@@ -2911,8 +2915,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
     t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
   }
 
+  UNLOCK_DOMAIN(rtable, dom);
+
   /* Setup the service thread flag handler */
-  birdloop_enter(t->loop);
   birdloop_flag_set_handler(t->loop, &t->fh);
   birdloop_leave(t->loop);
 
@@ -2929,7 +2934,7 @@ void
 rt_init(void)
 {
   rta_init();
-  rt_table_pool = rp_new(&root_pool, "Routing tables");
+  rt_table_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Routing tables");
   init_list(&routing_tables);
   init_list(&deleted_routing_tables);
   ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release");
@@ -4067,13 +4072,14 @@ rt_shutdown(void *tab_)
 static void
 rt_delete(void *tab_)
 {
-  birdloop_enter(&main_birdloop);
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
 
   /* We assume that nobody holds the table reference now as use_count is zero.
    * Anyway the last holder may still hold the lock. Therefore we lock and
    * unlock it the last time to be sure that nobody is there. */
   struct rtable_private *tab = RT_LOCK((rtable *) tab_);
   struct config *conf = tab->deleted;
+  DOMAIN(rtable) dom = tab->lock;
 
   RT_UNLOCK(RT_PUB(tab));
 
@@ -4081,7 +4087,8 @@ rt_delete(void *tab_)
   birdloop_free(tab->loop);
   config_del_obstacle(conf);
 
-  birdloop_leave(&main_birdloop);
+  /* Also drop the domain */
+  DOMAIN_FREE(rtable, dom);
 }
 
 
@@ -4636,18 +4643,9 @@ rt_init_hostcache(struct rtable_private *tab)
     .data = tab,
   };
 
-  hc->req = (struct rt_export_request) {
-    .name = mb_sprintf(tab->rp, "%s.hcu.notifier", tab->name),
-    .list = birdloop_event_list(tab->loop),
-    .trace_routes = tab->config->debug,
-    .dump_req = hc_notify_dump_req,
-    .log_state_change = hc_notify_log_state_change,
-    .export_one = hc_notify_export_one,
-  };
-
-  rt_table_export_start_locked(tab, &hc->req);
-
   tab->hostcache = hc;
+
+  ev_send_loop(tab->loop, &hc->update);
 }
 
 static void
@@ -4775,9 +4773,24 @@ rt_update_hostcache(void *data)
 
   RT_LOCKED((rtable *) data, tab)
   {
-
   struct hostcache *hc = tab->hostcache;
 
+  /* Finish initialization */
+  if (!hc->req.name)
+  {
+    hc->req = (struct rt_export_request) {
+      .name = mb_sprintf(tab->rp, "%s.hcu.notifier", tab->name),
+      .list = birdloop_event_list(tab->loop),
+      .pool = tab->rp,
+      .trace_routes = tab->config->debug,
+      .dump_req = hc_notify_dump_req,
+      .log_state_change = hc_notify_log_state_change,
+      .export_one = hc_notify_export_one,
+    };
+
+    rt_table_export_start_locked(tab, &hc->req);
+  }
+
   /* Shutdown shortcut */
   if (!hc->req.hook)
     RT_RETURN(tab);
diff --git a/nest/rt.h b/nest/rt.h
index 01372b8c..4fe8eb53 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -294,6 +294,7 @@ struct rt_export_request {
   u8 addr_mode;				/* Network prefilter mode (TE_ADDR_*) */
 
   event_list *list;			/* Where to schedule export events */
+  pool *pool;				/* Pool to use for allocations */
 
   /* There are two methods of export. You can either request feeding every single change
    * or feeding the whole route feed. In case of regular export, &export_one is preferred.
@@ -438,7 +439,7 @@ int rpe_get_seen(struct rt_export_hook *hook, struct rt_pending_export *rpe);
  */
 
 void rt_init_export(struct rt_exporter *re, struct rt_export_hook *hook);
-struct rt_export_hook *rt_alloc_export(struct rt_exporter *re, uint size);
+struct rt_export_hook *rt_alloc_export(struct rt_exporter *re, pool *pool, uint size);
 void rt_stop_export_common(struct rt_export_hook *hook);
 void rt_export_stopped(struct rt_export_hook *hook);
 void rt_exporter_init(struct rt_exporter *re);
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index e95a0ead..decaa407 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -1826,7 +1826,7 @@ babel_add_iface(struct babel_proto *p, struct iface *new, struct babel_iface_con
 
   TRACE(D_EVENTS, "Adding interface %s", new->name);
 
-  pool *pool = rp_new(p->p.pool, new->name);
+  pool *pool = rp_new(p->p.pool, proto_domain(&p->p), new->name);
 
   ifa = mb_allocz(pool, sizeof(struct babel_iface));
   ifa->proto = p;
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index ddbc4948..f7d8f8d9 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -1073,7 +1073,7 @@ bfd_start(struct proto *P)
 
   pthread_spin_init(&p->lock, PTHREAD_PROCESS_PRIVATE);
 
-  p->tpool = rp_new(P->pool, "BFD loop pool");
+  p->tpool = birdloop_pool(P->loop);
 
   p->session_slab = sl_new(P->pool, sizeof(struct bfd_session));
   HASH_INIT(p->session_hash_id, P->pool, 8);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 4e6524f4..82971c01 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1853,7 +1853,7 @@ bgp_init_pending_tx(struct bgp_channel *c)
 {
   ASSERT_DIE(!c->ptx);
 
-  pool *p = rp_new(c->pool, "BGP Pending TX");
+  pool *p = rp_new(c->pool, proto_domain(c->c.proto), "BGP Pending TX");
   c->ptx = ralloc(p, &bgp_pending_tx_class);
   c->ptx->pool = p;
 
@@ -1981,7 +1981,7 @@ bgp_out_table_feed(void *data)
 static void
 bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req)
 {
-  req->hook = rt_alloc_export(re, sizeof(struct bgp_out_export_hook));
+  req->hook = rt_alloc_export(re, req->pool, sizeof(struct bgp_out_export_hook));
   req->hook->req = req;
 
   struct bgp_out_export_hook *hook = SKIP_BACK(struct bgp_out_export_hook, h, req->hook);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 0525d502..e60884ba 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -922,7 +922,8 @@ bgp_graceful_restart_feed(struct bgp_channel *c)
 {
   c->stale_feed = (struct rt_export_request) {
     .name = "BGP-GR",
-    .list = &global_work_list,
+    .list = proto_event_list(c->c.proto),
+    .pool = c->c.proto->pool,
     .trace_routes = c->c.debug | c->c.proto->debug,
     .dump_req = bgp_graceful_restart_feed_dump_req,
     .log_state_change = bgp_graceful_restart_feed_log_state_change,
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 0eecb432..c3ec4a4c 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -567,7 +567,7 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
     OSPF_TRACE(D_EVENTS, "Adding interface %s (%N) to area %R",
 	       iface->name, &addr->prefix, oa->areaid);
 
-  pool = rp_new(p->p.pool, "OSPF Interface");
+  pool = rp_new(p->p.pool, proto_domain(&p->p), "OSPF Interface");
   ifa = mb_allocz(pool, sizeof(struct ospf_iface));
   ifa->iface = iface;
   ifa->addr = addr;
@@ -690,7 +690,7 @@ ospf_iface_new_vlink(struct ospf_proto *p, struct ospf_iface_patt *ip)
 
   /* Vlink ifname is stored just after the ospf_iface structure */
 
-  pool = rp_new(p->p.pool, "OSPF Vlink");
+  pool = rp_new(p->p.pool, proto_domain(&p->p), "OSPF Vlink");
   ifa = mb_allocz(pool, sizeof(struct ospf_iface) + 16);
   ifa->oa = p->backbone;
   ifa->cf = ip;
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 2c73d251..59a60587 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -80,7 +80,7 @@ struct ospf_neighbor *
 ospf_neighbor_new(struct ospf_iface *ifa)
 {
   struct ospf_proto *p = ifa->oa->po;
-  struct pool *pool = rp_new(p->p.pool, "OSPF Neighbor");
+  struct pool *pool = rp_new(p->p.pool, proto_domain(&p->p), "OSPF Neighbor");
   struct ospf_neighbor *n = mb_allocz(pool, sizeof(struct ospf_neighbor));
 
   n->pool = pool;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index eb15f9cb..3d5fe5a3 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -287,7 +287,7 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
 
   RADV_TRACE(D_EVENTS, "Adding interface %s", iface->name);
 
-  pool *pool = rp_new(p->p.pool, iface->name);
+  pool *pool = rp_new(p->p.pool, proto_domain(&p->p), iface->name);
   ifa = mb_allocz(pool, sizeof(struct radv_iface));
   ifa->pool = pool;
   ifa->ra = p;
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index e5638aff..0fd686b3 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -599,7 +599,7 @@ rpki_check_expire_interval(uint seconds)
 static struct rpki_cache *
 rpki_init_cache(struct rpki_proto *p, struct rpki_config *cf)
 {
-  pool *pool = rp_new(p->p.pool, cf->hostname);
+  pool *pool = rp_new(p->p.pool, proto_domain(&p->p), cf->hostname);
 
   struct rpki_cache *cache = mb_allocz(pool, sizeof(struct rpki_cache));
 
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 701eddf7..8e95a698 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -503,12 +503,14 @@ sockets_fire(struct birdloop *loop)
  */
 
 DEFINE_DOMAIN(resource);
+static void bird_thread_start_event(void *_data);
 
 struct birdloop_pickup_group {
   DOMAIN(resource) domain;
   list loops;
   list threads;
   btime max_latency;
+  event start_threads;
 } pickup_groups[2] = {
   {
     /* all zeroes */
@@ -516,6 +518,8 @@ struct birdloop_pickup_group {
   {
     /* FIXME: make this dynamic, now it copies the loop_max_latency value from proto/bfd/config.Y */
     .max_latency = 10 MS,
+    .start_threads.hook = bird_thread_start_event,
+    .start_threads.data = &pickup_groups[1],
   },
 };
 
@@ -630,13 +634,11 @@ bird_thread_main(void *arg)
   rcu_thread_start(&thr->rcu);
   synchronize_rcu();
 
-  tmp_init(thr->pool);
-  init_list(&thr->loops);
-
-  thr->meta = birdloop_new_no_pickup(thr->pool, DOMAIN_ORDER(meta), "Thread Meta");
-  thr->meta->thread = thr;
   birdloop_enter(thr->meta);
 
+  tmp_init(thr->pool, birdloop_domain(thr->meta));
+  init_list(&thr->loops);
+
   thr->sock_changed = 1;
 
   struct pfd pfd;
@@ -759,15 +761,20 @@ static struct bird_thread *
 bird_thread_start(struct birdloop_pickup_group *group)
 {
   ASSERT_DIE(birdloop_inside(&main_birdloop));
-  ASSERT_DIE(DOMAIN_IS_LOCKED(resource, group->domain));
 
-  pool *p = rp_new(&root_pool, "Thread");
+  struct birdloop *meta = birdloop_new_no_pickup(&root_pool, DOMAIN_ORDER(meta), "Thread Meta");
+  pool *p = birdloop_pool(meta);
+
+  birdloop_enter(meta);
+  LOCK_DOMAIN(resource, group->domain);
 
   struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
   thr->pool = p;
   thr->cleanup_event = (event) { .hook = bird_thread_cleanup, .data = thr, };
   thr->group = group;
   thr->max_latency_ns = (group->max_latency ?: 5 S) TO_NS;
+  thr->meta = meta;
+  thr->meta->thread = thr;
 
   wakeup_init(thr);
   ev_init_list(&thr->priority_events, NULL, "Thread direct event list");
@@ -790,9 +797,18 @@ bird_thread_start(struct birdloop_pickup_group *group)
   if (e = pthread_create(&thr->thread_id, &thr->thread_attr, bird_thread_main, thr))
     die("pthread_create() failed: %M", e);
 
+  UNLOCK_DOMAIN(resource, group->domain);
+  birdloop_leave(meta);
   return thr;
 }
 
+static void
+bird_thread_start_event(void *_data)
+{
+  struct birdloop_pickup_group *group = _data;
+  bird_thread_start(group);
+}
+
 static struct birdloop *thread_dropper;
 static event *thread_dropper_event;
 static uint thread_dropper_goal;
@@ -880,15 +896,14 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
     int dif = list_length(&group->threads) - (thread_dropper_goal = new->thread_count);
     _Bool thread_dropper_running = !!thread_dropper;
 
+    UNLOCK_DOMAIN(resource, group->domain);
+
     if (dif < 0)
     {
       bird_thread_start(group);
-      UNLOCK_DOMAIN(resource, group->domain);
       continue;
     }
 
-    UNLOCK_DOMAIN(resource, group->domain);
-
     if ((dif > 0) && !thread_dropper_running)
     {
       struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), group->max_latency, "Thread dropper");
@@ -1006,12 +1021,13 @@ bird_thread_show(void *data)
 void
 cmd_show_threads(int show_loops)
 {
-  pool *p = rp_new(&root_pool, "Show Threads");
+  DOMAIN(control) lock = DOMAIN_NEW(control, "Show Threads");
+  pool *p = rp_new(&root_pool, lock.control, "Show Threads");
 
   struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
-  tsd->lock = DOMAIN_NEW(control, "Show Threads");
   tsd->cli = this_cli;
   tsd->pool = p;
+  tsd->lock = lock;
   tsd->show_loops = show_loops;
 
   this_cli->cont = bird_thread_show_cli_cont;
@@ -1112,8 +1128,10 @@ birdloop_stop_internal(struct birdloop *loop)
   /* Request local socket reload */
   this_thread->sock_changed++;
 
-  /* Tail-call the stopped hook */
-  loop->stopped(loop->stop_data);
+  /* Call the stopped hook from the main loop */
+  loop->event.hook = loop->stopped;
+  loop->event.data = loop->stop_data;
+  ev_send_loop(&main_birdloop, &loop->event);
 }
 
 static void
@@ -1187,8 +1205,9 @@ static struct birdloop *
 birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group, const char *name, va_list args)
 {
   struct domain_generic *dg = domain_new(name, order);
+  DG_LOCK(dg);
 
-  pool *p = rp_vnewf(pp, name, args);
+  pool *p = rp_vnewf(pp, dg, name, args);
   struct birdloop *loop = mb_allocz(p, sizeof(struct birdloop));
   loop->pool = p;
 
@@ -1197,7 +1216,7 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
 
   atomic_store_explicit(&loop->thread_transition, 0, memory_order_relaxed);
 
-  birdloop_enter(loop);
+  birdloop_enter_locked(loop);
 
   ev_init_list(&loop->event_list, loop, name);
   timers_init(&loop->time, p);
@@ -1211,8 +1230,7 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
     LOCK_DOMAIN(resource, group->domain);
     add_tail(&group->loops, &loop->n);
     if (EMPTY_LIST(group->threads))
-      bird_thread_start(group);
-
+      ev_send(&global_event_list, &group->start_threads);
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
     UNLOCK_DOMAIN(resource, group->domain);
   }
@@ -1277,8 +1295,11 @@ birdloop_free(struct birdloop *loop)
 {
   ASSERT_DIE(loop->thread == NULL);
 
-  domain_free(loop->time.domain);
+  struct domain_generic *dg = loop->time.domain;
+  DG_LOCK(dg);
   rp_free(loop->pool);
+  DG_UNLOCK(dg);
+  domain_free(dg);
 }
 
 static void
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 9e6ddb45..6e94b0b6 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -74,7 +74,7 @@ static list krt_proto_list;
 void
 krt_io_init(void)
 {
-  krt_pool = rp_new(&root_pool, "Kernel Syncer");
+  krt_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Kernel Syncer");
   krt_filter_lp = lp_new_default(krt_pool);
   init_list(&krt_proto_list);
   krt_sys_io_init();

From 942d3cbcdd548a73ecc1915a97e297e9bf0bb5e6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Apr 2023 10:39:08 +0200
Subject: [PATCH 301/431] Removed duplicate version 3.0-alpha0 news

---
 NEWS | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/NEWS b/NEWS
index 04cca01d..99027014 100644
--- a/NEWS
+++ b/NEWS
@@ -109,22 +109,6 @@ Version 2.0.9 (2022-02-09)
   filtering.
 
 
-Version 3.0-alpha0 (2022-02-07)
-  o Removal of fixed protocol-specific route attributes
-  o Asynchronous route export
-  o Explicit table import / export hooks
-  o Partially lockless route attribute cache
-  o Thread-safe resource management
-  o Thread-safe interface notifications
-  o Thread-safe protocol API
-  o Adoption of BFD IO loop for general use
-  o Parallel Pipe protocol
-  o Parallel RPKI protocol
-  o Parallel BGP protocol
-  o Lots of refactoring
-  o Bugfixes and improvements as they came along
-
-
 Version 2.0.8 (2021-03-18)
   o Automatic channel reloads based on RPKI changes
   o Multiple static routes with the same network

From 19e79eb8adddb6194248974443b9a906f66984ce Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Apr 2023 11:35:05 +0200
Subject: [PATCH 302/431] Fix of failing show threads command

---
 sysdep/unix/io-loop.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 8e95a698..daa86560 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -930,6 +930,7 @@ struct bird_thread_show_data {
   DOMAIN(control) lock;
   uint total;
   uint done;
+  event finish_event;
   u8 show_loops;
 };
 
@@ -977,11 +978,15 @@ bird_thread_show(void *data)
   else
     cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "Thread %p time %t", this_thread, total_time_ns NS);
 
-  UNLOCK_DOMAIN(control, tsd->lock);
+  ev_send(&global_event_list, &tsd->finish_event);
 
-  if (last)
-  {
-    the_bird_lock();
+  UNLOCK_DOMAIN(control, tsd->lock);
+}
+
+static void
+bird_thread_show_finish(void *data)
+{
+  struct bird_thread_show_data *tsd = data;
 
     for (int i=0; i<2; i++)
     {
@@ -992,6 +997,8 @@ bird_thread_show(void *data)
 	if (tsd->show_loops)
 	{
 	  cli_printf(tsd->cli, -1026, "Unassigned loops");
+
+	  struct birdloop *loop;
 	  WALK_LIST(loop, group->loops)
 	    cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
 	}
@@ -999,6 +1006,7 @@ bird_thread_show(void *data)
 	{
 	  uint count = 0;
 	  u64 total_time_ns = 0;
+	  struct birdloop *loop;
 	  WALK_LIST(loop, group->loops)
 	  {
 	    count++;
@@ -1010,18 +1018,19 @@ bird_thread_show(void *data)
     }
 
     cli_write_trigger(tsd->cli);
-    DOMAIN_FREE(control, tsd->lock);
+
+    DOMAIN(control) lock = tsd->lock;
+    LOCK_DOMAIN(control, lock);
     rp_free(tsd->pool);
-
-    the_bird_unlock();
-  }
+    UNLOCK_DOMAIN(control, lock);
+    DOMAIN_FREE(control, lock);
 }
 
-
 void
 cmd_show_threads(int show_loops)
 {
   DOMAIN(control) lock = DOMAIN_NEW(control, "Show Threads");
+  LOCK_DOMAIN(control, lock);
   pool *p = rp_new(&root_pool, lock.control, "Show Threads");
 
   struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
@@ -1029,6 +1038,10 @@ cmd_show_threads(int show_loops)
   tsd->pool = p;
   tsd->lock = lock;
   tsd->show_loops = show_loops;
+  tsd->finish_event = (event) {
+    .hook = bird_thread_show_finish,
+    .data = tsd,
+  };
 
   this_cli->cont = bird_thread_show_cli_cont;
   this_cli->cleanup = bird_thread_show_cli_cleanup;
@@ -1037,7 +1050,6 @@ cmd_show_threads(int show_loops)
   {
     struct birdloop_pickup_group *group = &pickup_groups[i];
 
-    LOCK_DOMAIN(control, tsd->lock);
     LOCK_DOMAIN(resource, group->domain);
 
     struct bird_thread *thr;
@@ -1049,8 +1061,9 @@ cmd_show_threads(int show_loops)
     }
 
     UNLOCK_DOMAIN(resource, group->domain);
-    UNLOCK_DOMAIN(control, tsd->lock);
   }
+
+  UNLOCK_DOMAIN(control, lock);
 }
 
 /*

From ce7495b49a5192b1cba17fd88cdb2495a40824e2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 24 Apr 2023 16:10:59 +0200
Subject: [PATCH 303/431] Refactoring of domains connected to pools

---
 lib/locking.h         |  8 ++++++--
 lib/rcu.c             |  3 ++-
 lib/resource.c        |  7 ++++++-
 nest/iface.c          |  2 +-
 nest/locks.c          |  3 ++-
 nest/proto.c          |  4 ++--
 nest/rt-attr.c        |  2 +-
 nest/rt-table.c       |  2 +-
 proto/bfd/bfd.c       |  4 +++-
 proto/bgp/bgp.c       | 17 +++++++++++++----
 sysdep/unix/alloc.c   |  3 ++-
 sysdep/unix/domain.c  | 17 +++++++++++++----
 sysdep/unix/io-loop.c |  7 ++++---
 sysdep/unix/io.c      | 19 +++++++++++++++----
 14 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index 751eecbd..fc3c59ff 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -10,6 +10,7 @@
 #define _BIRD_LOCKING_H_
 
 struct domain_generic;
+struct pool;
 
 /* Here define the global lock order; first to last. */
 struct lock_order {
@@ -30,8 +31,8 @@ extern _Thread_local struct domain_generic **last_locked;
 #define DEFINE_DOMAIN(type) DOMAIN(type) { struct domain_generic *type; }
 #define DOMAIN_ORDER(type)  OFFSETOF(struct lock_order, type)
 
-#define DOMAIN_NEW(type, name)  (DOMAIN(type)) { .type = domain_new(name, DOMAIN_ORDER(type)) }
-struct domain_generic *domain_new(const char *name, uint order);
+#define DOMAIN_NEW(type)  (DOMAIN(type)) { .type = domain_new(DOMAIN_ORDER(type)) }
+struct domain_generic *domain_new(uint order);
 
 #define DOMAIN_FREE(type, d)	domain_free((d).type)
 void domain_free(struct domain_generic *);
@@ -39,6 +40,9 @@ void domain_free(struct domain_generic *);
 #define DOMAIN_NAME(type, d)	domain_name((d).type)
 const char *domain_name(struct domain_generic *);
 
+#define DOMAIN_SETUP(type, d, n, p)	domain_setup((d).type, n, p)
+void domain_setup(struct domain_generic *, const char *name, struct pool *);
+
 #define DOMAIN_NULL(type)   (DOMAIN(type)) {}
 
 #define LOCK_DOMAIN(type, d)	do_lock(((d).type), &(locking_stack.type))
diff --git a/lib/rcu.c b/lib/rcu.c
index 8ae4f2ab..7ea6ec9b 100644
--- a/lib/rcu.c
+++ b/lib/rcu.c
@@ -73,7 +73,8 @@ rcu_thread_stop(struct rcu_thread *rc)
 void
 rcu_init(void)
 {
-  rcu_domain = DOMAIN_NEW(resource, "Read-Copy-Update");
+  rcu_domain = DOMAIN_NEW(resource);
+  DOMAIN_SETUP(resource, rcu_domain, "Read-Copy-Update", NULL);
   init_list(&rcu_thread_list);
   rcu_thread_start(&main_rcu_thread);
 }
diff --git a/lib/resource.c b/lib/resource.c
index 2071a411..e0aaac0a 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -51,6 +51,9 @@ rp_init(pool *z, struct domain_generic *dom, const char *name)
 {
   ASSERT_DIE(DG_IS_LOCKED(dom));
 
+  if (name && !domain_name(dom))
+    domain_setup(dom, name, z);
+
   z->name = name;
   z->domain = dom;
   z->inside = (TLIST_LIST(resource)) {};
@@ -87,7 +90,9 @@ pool *
 rp_vnewf(pool *p, struct domain_generic *dom, const char *fmt, va_list args)
 {
   pool *z = rp_new(p, dom, NULL);
-  z->name = mb_vsprintf(p, fmt, args);
+  z->name = mb_vsprintf(z, fmt, args);
+  if (!domain_name(dom))
+    domain_setup(dom, z->name, z);
   return z;
 }
 
diff --git a/nest/iface.c b/nest/iface.c
index a024b943..bbe38d3f 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -1018,7 +1018,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 void
 if_init(void)
 {
-  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
+  iface_domain = DOMAIN_NEW(attrs);
 
   IFACE_LOCK;
   if_pool = rp_new(&root_pool, iface_domain.attrs, "Interfaces");
diff --git a/nest/locks.c b/nest/locks.c
index 247d0c56..66409c6d 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -197,5 +197,6 @@ olock_init(void)
 {
   DBG("olock: init\n");
   init_list(&olock_list);
-  olock_domain = DOMAIN_NEW(attrs, "Object lock");
+  olock_domain = DOMAIN_NEW(attrs);
+  DOMAIN_SETUP(attrs, olock_domain, "Object lock", NULL);
 }
diff --git a/nest/proto.c b/nest/proto.c
index 32183c9d..647b7f4e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1859,9 +1859,9 @@ void protos_build_gen(void);
 void
 protos_build(void)
 {
-  protos_build_gen();
-
   proto_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Protocols");
+
+  protos_build_gen();
 }
 
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 38612a4e..c035a2dc 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1607,7 +1607,7 @@ ea_show_list(struct cli *c, ea_list *eal)
 void
 rta_init(void)
 {
-  attrs_domain = DOMAIN_NEW(attrs, "Attributes");
+  attrs_domain = DOMAIN_NEW(attrs);
 
   RTA_LOCK;
   rta_pool = rp_new(&root_pool, attrs_domain.attrs, "Attributes");
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f1e3c8f7..a934d3c3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2850,7 +2850,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   pool *sp = birdloop_pool(loop);
 
   /* Create the table domain and pool */
-  DOMAIN(rtable) dom = DOMAIN_NEW(rtable, cf->name);
+  DOMAIN(rtable) dom = DOMAIN_NEW(rtable);
   LOCK_DOMAIN(rtable, dom);
 
   pool *p = rp_newf(sp, dom.rtable, "Routing table data %s", cf->name);
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index f7d8f8d9..e373e4dd 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -1232,7 +1232,9 @@ bfd_build(void)
 {
   proto_build(&proto_bfd);
 
-  bfd_global.lock = DOMAIN_NEW(rtable, "BFD Global");
+  bfd_global.lock = DOMAIN_NEW(rtable);
+  DOMAIN_SETUP(rtable, bfd_global.lock, "BFD Global", NULL);
+
   init_list(&bfd_global.wait_list);
   init_list(&bfd_global.pickup_list);
   init_list(&bfd_global.proto_list);
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index e60884ba..f4d80e8d 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -132,7 +132,8 @@ static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets
 static list STATIC_LIST_INIT(bgp_listen_pending);	/* Global list of listening socket open requests */
 static event bgp_listen_event = { .hook = bgp_listen_create };
 
-DOMAIN(rtable) bgp_listen_domain;
+static DOMAIN(rtable) bgp_listen_domain;
+static pool *bgp_listen_pool;
 
 static void bgp_connect(struct bgp_proto *p);
 static void bgp_active(struct bgp_proto *p);
@@ -276,7 +277,7 @@ bgp_listen_create(void *_ UNUSED)
     {
       /* Allocating new socket from global protocol pool.
        * We can do this in main_birdloop. */
-      sock *sk = sk_new(proto_pool);
+      sock *sk = sk_new(bgp_listen_pool);
       sk->type = SK_TCP_PASSIVE;
       sk->ttl = 255;
       sk->saddr = req->addr;
@@ -301,7 +302,7 @@ bgp_listen_create(void *_ UNUSED)
 	continue;
       }
 
-      bs = mb_allocz(proto_pool, sizeof(struct bgp_socket));
+      bs = mb_allocz(bgp_listen_pool, sizeof(struct bgp_socket));
       bs->sk = sk;
       sk->data = bs;
 
@@ -1337,7 +1338,9 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
   {
     log(L_WARN "BGP: Unexpected connect from unknown address %I%J (port %d)",
 	sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL, sk->dport);
+    LOCK_DOMAIN(rtable, bgp_listen_domain);
     sk_close(sk);
+    UNLOCK_DOMAIN(rtable, bgp_listen_domain);
     return 0;
   }
 
@@ -1365,6 +1368,8 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
       bgp_close_conn(&p->incoming_conn);
   }
 
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
+
   BGP_TRACE(D_EVENTS, "Incoming connection from %I%J (port %d) %s",
 	    sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL,
 	    sk->dport, acc ? "accepted" : "rejected");
@@ -1414,6 +1419,7 @@ err:
   sk_close(sk);
 
 leave:
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
   birdloop_leave(p->p.loop);
   return 0;
 }
@@ -2843,5 +2849,8 @@ void bgp_build(void)
 {
   proto_build(&proto_bgp);
   bgp_register_attrs();
-  bgp_listen_domain = DOMAIN_NEW(rtable, "BGP Listen Sockets");
+  bgp_listen_domain = DOMAIN_NEW(rtable);
+  LOCK_DOMAIN(rtable, bgp_listen_domain);
+  bgp_listen_pool = rp_new(proto_pool, bgp_listen_domain.rtable, "BGP Listen Sockets");
+  UNLOCK_DOMAIN(rtable, bgp_listen_domain);
 }
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index cafcc8dd..1b951da2 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -318,7 +318,8 @@ resource_sys_init(void)
     /* We assume that page size has only one bit and is between 1K and 256K (incl.).
      * Otherwise, the assumptions in lib/slab.c (sl_head's num_full range) aren't met. */
 
-    empty_pages_domain = DOMAIN_NEW(resource, "Empty Pages");
+    empty_pages_domain = DOMAIN_NEW(resource);
+    DOMAIN_SETUP(resource, empty_pages_domain, "Empty Pages", NULL);
     initialized = 1;
     return;
   }
diff --git a/sysdep/unix/domain.c b/sysdep/unix/domain.c
index f4ee595d..c04e91ea 100644
--- a/sysdep/unix/domain.c
+++ b/sysdep/unix/domain.c
@@ -46,20 +46,21 @@ struct domain_generic {
   struct domain_generic **prev;
   struct lock_order *locked_by;
   const char *name;
+  pool *pool;
 };
 
-#define DOMAIN_INIT(_name, _order) { .mutex = PTHREAD_MUTEX_INITIALIZER, .name = _name, .order = _order }
+#define DOMAIN_INIT(_order) { .mutex = PTHREAD_MUTEX_INITIALIZER, .order = _order }
 
-static struct domain_generic the_bird_domain_gen = DOMAIN_INIT("The BIRD", OFFSETOF(struct lock_order, the_bird));
+static struct domain_generic the_bird_domain_gen = DOMAIN_INIT(OFFSETOF(struct lock_order, the_bird));
 
 DOMAIN(the_bird) the_bird_domain = { .the_bird = &the_bird_domain_gen };
 
 struct domain_generic *
-domain_new(const char *name, uint order)
+domain_new(uint order)
 {
   ASSERT_DIE(order < sizeof(struct lock_order));
   struct domain_generic *dg = xmalloc(sizeof(struct domain_generic));
-  *dg = (struct domain_generic) DOMAIN_INIT(name, order);
+  *dg = (struct domain_generic) DOMAIN_INIT(order);
   return dg;
 }
 
@@ -81,6 +82,14 @@ uint dg_order(struct domain_generic *dg)
   return dg->order;
 }
 
+void
+domain_setup(struct domain_generic *dg, const char *name, pool *p)
+{
+  ASSERT_DIE(dg->pool == NULL);
+  dg->pool = p;
+  dg->name = name;
+}
+
 void do_lock(struct domain_generic *dg, struct domain_generic **lsp)
 {
   struct lock_order stack_copy;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index daa86560..1a3333ef 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -1029,7 +1029,7 @@ bird_thread_show_finish(void *data)
 void
 cmd_show_threads(int show_loops)
 {
-  DOMAIN(control) lock = DOMAIN_NEW(control, "Show Threads");
+  DOMAIN(control) lock = DOMAIN_NEW(control);
   LOCK_DOMAIN(control, lock);
   pool *p = rp_new(&root_pool, lock.control, "Show Threads");
 
@@ -1084,7 +1084,8 @@ birdloop_init(void)
   {
     struct birdloop_pickup_group *group = &pickup_groups[i];
 
-    group->domain = DOMAIN_NEW(resource, "Loop Pickup");
+    group->domain = DOMAIN_NEW(resource);
+    DOMAIN_SETUP(resource, group->domain, "Loop Pickup", NULL);
     init_list(&group->loops);
     init_list(&group->threads);
   }
@@ -1217,7 +1218,7 @@ birdloop_run_timer(timer *tm)
 static struct birdloop *
 birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group, const char *name, va_list args)
 {
-  struct domain_generic *dg = domain_new(name, order);
+  struct domain_generic *dg = domain_new(order);
   DG_LOCK(dg);
 
   pool *p = rp_vnewf(pp, dg, name, args);
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 40a6f114..b21df057 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1052,6 +1052,10 @@ sk_passive_connected(sock *s, int type)
     return 0;
   }
 
+  struct domain_generic *sock_lock = DG_IS_LOCKED(s->pool->domain) ? NULL : s->pool->domain;
+  if (sock_lock)
+    DG_LOCK(sock_lock);
+
   sock *t = sk_new(s->pool);
   t->type = type;
   t->data = s->data;
@@ -1082,13 +1086,20 @@ sk_passive_connected(sock *s, int type)
     close(t->fd);
     t->fd = -1;
     sk_close(t);
-    return 1;
+    t = NULL;
+  }
+  else
+  {
+    birdloop_add_socket(s->loop, t);
+    sk_alloc_bufs(t);
   }
 
-  birdloop_add_socket(s->loop, t);
+  if (sock_lock)
+    DG_UNLOCK(sock_lock);
+
+  if (t)
+    s->rx_hook(t, 0);
 
-  sk_alloc_bufs(t);
-  s->rx_hook(t, 0);
   return 1;
 }
 

From 2ddb34c9d18bc4e793c04658b7bec243e35d6b17 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 26 Apr 2023 19:10:52 +0200
Subject: [PATCH 304/431] IO loops now actually measuring their time (show
 threads all works)

---
 sysdep/unix/io-loop.c | 54 +++++++++++++++++++++++++++++++++++++++++--
 sysdep/unix/io-loop.h |  8 +++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 1a3333ef..db8556a6 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -49,15 +49,20 @@ static void ns_init(void)
     bug("clock_gettime: %m");
 }
 
+#define NSEC_IN_SEC	((u64) (1000 * 1000 * 1000))
+
 static u64 ns_now(void)
 {
   struct timespec ts;
   if (clock_gettime(CLOCK_MONOTONIC, &ts))
     bug("clock_gettime: %m");
 
-  return (u64) (ts.tv_sec - ns_begin.tv_sec) * 1000000000 + ts.tv_nsec - ns_begin.tv_nsec;
+  return (u64) (ts.tv_sec - ns_begin.tv_sec) * NSEC_IN_SEC + ts.tv_nsec - ns_begin.tv_nsec;
 }
 
+#define NSEC_TO_SEC(x)	((x) / NSEC_IN_SEC)
+#define CURRENT_SEC	NSEC_TO_SEC(ns_now())
+
 
 /*
  *	Current thread context
@@ -960,7 +965,21 @@ bird_thread_show(void *data)
   WALK_LIST(loop, this_thread->loops)
   {
     if (tsd->show_loops)
-      cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
+    {
+      char b[TIME_BY_SEC_SIZE * sizeof("123456789, ")], *bptr = b, *bend = b + sizeof(b);
+      uint cs = CURRENT_SEC;
+      uint fs = NSEC_TO_SEC(loop->last_time_finished_ns);
+      for (uint i = 0; i <= cs && i < TIME_BY_SEC_SIZE; i++)
+	bptr += bsnprintf(bptr, bend - bptr, "% 9lu ",
+	    (cs - i > fs) ? 0 : loop->time_by_sec_ns[(cs - i) % TIME_BY_SEC_SIZE]);
+      bptr[-1] = 0; /* Drop the trailing space */
+
+      cli_printf(tsd->cli, -1026, "  Loop %s total time: %t",
+	  domain_name(loop->time.domain), loop->total_time_spent_ns NS);
+      cli_printf(tsd->cli, -1026, "    last %d secs [ns]: %s",
+	  MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
+    }
+
     total_time_ns += loop->total_time_spent_ns;
   }
 
@@ -1204,6 +1223,37 @@ birdloop_run(void *_loop)
   this_thread->sock_changed += loop->sock_changed;
   loop->sock_changed = 0;
 
+  /* Get finish time */
+  u64 finish_time = ns_now();
+  loop->total_time_spent_ns += finish_time - locked_time;
+
+  log(L_INFO "%p: lock to finish time: %lu %lu", loop, locked_time, finish_time);
+
+  /* Zero records for seconds where we haven't run */
+  if (NSEC_TO_SEC(loop->last_time_finished_ns) + TIME_BY_SEC_SIZE < NSEC_TO_SEC(locked_time))
+    memset(loop->time_by_sec_ns, 0, sizeof(loop->time_by_sec_ns));
+  else
+    for (u64 fclr = NSEC_TO_SEC(loop->last_time_finished_ns) + 1;
+	fclr <= NSEC_TO_SEC(locked_time);
+	fclr++)
+    {
+      log(L_INFO "%p: fclr %lu", loop, fclr % TIME_BY_SEC_SIZE);
+      loop->time_by_sec_ns[fclr % TIME_BY_SEC_SIZE] = 0;
+    }
+
+  while (NSEC_TO_SEC(locked_time) != NSEC_TO_SEC(finish_time))
+  {
+    u64 part = (NSEC_TO_SEC(locked_time) + 1) * NSEC_IN_SEC - locked_time;
+    log(L_INFO "%p: part %lu to %lu", loop, part, NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE);
+    loop->time_by_sec_ns[NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE] += part;
+    locked_time += part;
+  }
+
+  log(L_INFO "%p: part %lu to %lu", loop, finish_time - locked_time, NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE);
+  loop->time_by_sec_ns[NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE] += finish_time - locked_time;
+
+  loop->last_time_finished_ns = finish_time;
+
   birdloop_leave(loop);
 }
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 2b0b7ebf..b5da7aba 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -29,6 +29,11 @@ void pipe_pollin(struct pipe *, struct pfd *);
 void pipe_drain(struct pipe *);
 void pipe_kick(struct pipe *);
 
+struct total_time_since {
+  u64 total;
+  u64 since;
+};
+
 struct birdloop
 {
   node n;
@@ -60,6 +65,9 @@ struct birdloop
 
   struct bird_thread *thread;
 
+#define TIME_BY_SEC_SIZE	16
+  u64 time_by_sec_ns[TIME_BY_SEC_SIZE];
+  u64 last_time_finished_ns;
   u64 total_time_spent_ns;
 };
 

From ab83bab9d1c51e4102f6626430e0e1b2b7f1e53a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 26 Apr 2023 19:34:29 +0200
Subject: [PATCH 305/431] Loops track also locking time

---
 sysdep/unix/io-loop.c | 10 ++++++----
 sysdep/unix/io-loop.h |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index db8556a6..b3d930cb 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -974,10 +974,10 @@ bird_thread_show(void *data)
 	    (cs - i > fs) ? 0 : loop->time_by_sec_ns[(cs - i) % TIME_BY_SEC_SIZE]);
       bptr[-1] = 0; /* Drop the trailing space */
 
-      cli_printf(tsd->cli, -1026, "  Loop %s total time: %t",
-	  domain_name(loop->time.domain), loop->total_time_spent_ns NS);
-      cli_printf(tsd->cli, -1026, "    last %d secs [ns]: %s",
-	  MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
+      cli_printf(tsd->cli, -1026, "  Loop %s", domain_name(loop->time.domain));
+      cli_printf(tsd->cli, -1026, "    Total time: %t s", loop->total_time_spent_ns NS);
+      cli_printf(tsd->cli, -1026, "    Total locking time: %t s", loop->total_time_locking_ns NS);
+      cli_printf(tsd->cli, -1026, "    Last %d secs [ns]: %s", MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
     }
 
     total_time_ns += loop->total_time_spent_ns;
@@ -1183,6 +1183,8 @@ birdloop_run(void *_loop)
   if (locked_time > end_time)
     LOOP_WARN(loop, "locked %luns after its scheduled end time", locked_time - end_time);
 
+  loop->total_time_locking_ns += (locked_time - start_time);
+
   uint repeat, loop_runs = 0;
   do {
     repeat = 0;
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index b5da7aba..d60b5206 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -69,6 +69,7 @@ struct birdloop
   u64 time_by_sec_ns[TIME_BY_SEC_SIZE];
   u64 last_time_finished_ns;
   u64 total_time_spent_ns;
+  u64 total_time_locking_ns;
 };
 
 struct bird_thread

From 9c2231061212c24de1466b235486c4ee0ec8dc0f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 26 Apr 2023 22:24:42 +0200
Subject: [PATCH 306/431] Loop spent time refactored to separate structures and
 functions

---
 sysdep/unix/io-loop.c | 221 ++++++++++++++++++++++++++----------------
 sysdep/unix/io-loop.h |  16 +--
 2 files changed, 149 insertions(+), 88 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index b3d930cb..79cbe3fe 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -63,6 +63,80 @@ static u64 ns_now(void)
 #define NSEC_TO_SEC(x)	((x) / NSEC_IN_SEC)
 #define CURRENT_SEC	NSEC_TO_SEC(ns_now())
 
+static _Thread_local struct spent_time *account_target_spent_time;
+static _Thread_local u64 *account_target_total;
+static _Thread_local u64 account_last;
+
+static u64 account_finish(void)
+{
+  /* Get current time */
+  u64 now = ns_now();
+  u64 dif = now - account_last;
+
+  /* Update second by second */
+  if (account_target_spent_time)
+  {
+    /* Drop old time information if difference is too large */
+    if (NSEC_TO_SEC(account_last) + TIME_BY_SEC_SIZE - 1 < NSEC_TO_SEC(now))
+      account_last = (NSEC_TO_SEC(now) - TIME_BY_SEC_SIZE + 1) * NSEC_IN_SEC;
+
+    /* Zero new records */
+    if (NSEC_TO_SEC(account_target_spent_time->last_written_ns) + TIME_BY_SEC_SIZE < NSEC_TO_SEC(account_last))
+      memset(account_target_spent_time->by_sec_ns, 0, sizeof(account_target_spent_time->by_sec_ns));
+    else
+      for (u64 fclr = NSEC_TO_SEC(account_target_spent_time->last_written_ns) + 1;
+	  fclr <= NSEC_TO_SEC(now);
+	  fclr++)
+	account_target_spent_time->by_sec_ns[fclr % TIME_BY_SEC_SIZE] = 0;
+
+    /* Add times second by second */
+    while (NSEC_TO_SEC(account_last) != NSEC_TO_SEC(now))
+    {
+      u64 part = (NSEC_TO_SEC(account_last) + 1) * NSEC_IN_SEC - account_last;
+      account_target_spent_time->by_sec_ns[NSEC_TO_SEC(account_last) % TIME_BY_SEC_SIZE] += part;
+      account_last += part;
+    }
+
+    /* Update the last second */
+    account_target_spent_time->by_sec_ns[NSEC_TO_SEC(account_last) % TIME_BY_SEC_SIZE] += now - account_last;
+
+    /* Store the current time */
+    account_target_spent_time->last_written_ns = now;
+  }
+
+  /* Update the total */
+  if (account_target_total)
+    *account_target_total += dif;
+
+  /* Store current time */
+  account_last = now;
+
+  return dif;
+}
+
+static u64 account_to_spent_time(struct spent_time *st)
+{
+  u64 elapsed = account_finish();
+
+  account_target_spent_time = st;
+  account_target_total = &st->total_ns;
+
+  return elapsed;
+}
+
+static u64 account_to_total(u64 *total)
+{
+  u64 elapsed = account_finish();
+
+  account_target_spent_time = NULL;
+  account_target_total = total;
+
+  return elapsed;
+}
+
+#define account_to(_arg)	_Generic((_arg), \
+    struct spent_time *: account_to_spent_time, \
+    u64 *: account_to_total)(_arg)
 
 /*
  *	Current thread context
@@ -639,6 +713,8 @@ bird_thread_main(void *arg)
   rcu_thread_start(&thr->rcu);
   synchronize_rcu();
 
+  account_to(&thr->overhead);
+
   birdloop_enter(thr->meta);
 
   tmp_init(thr->pool, birdloop_domain(thr->meta));
@@ -951,6 +1027,29 @@ bird_thread_show_cli_cleanup(struct cli *c UNUSED)
   return 1; /* Defer the cleanup until the writeout is finished. */
 }
 
+static void
+bird_thread_show_spent_time(struct cli *c, const char *name, struct spent_time *st)
+{
+  char b[TIME_BY_SEC_SIZE * sizeof("1234567890, ")], *bptr = b, *bend = b + sizeof(b);
+  uint cs = CURRENT_SEC;
+  uint fs = NSEC_TO_SEC(st->last_written_ns);
+
+  for (uint i = 0; i <= cs && i < TIME_BY_SEC_SIZE; i++)
+    bptr += bsnprintf(bptr, bend - bptr, "% 10lu ",
+	(cs - i > fs) ? 0 : st->by_sec_ns[(cs - i) % TIME_BY_SEC_SIZE]);
+  bptr[-1] = 0; /* Drop the trailing space */
+
+  cli_printf(c, -1026, "    %s total time: % 9t s; last %d secs [ns]: %s", name, st->total_ns NS, MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
+}
+
+static void
+bird_thread_show_loop(struct cli *c, struct birdloop *loop)
+{
+  cli_printf(c, -1026, "  Loop %s", domain_name(loop->time.domain));
+  bird_thread_show_spent_time(c, "    Working", &loop->working);
+  bird_thread_show_spent_time(c, "    Locking", &loop->locking);
+}
+
 static void
 bird_thread_show(void *data)
 {
@@ -965,40 +1064,29 @@ bird_thread_show(void *data)
   WALK_LIST(loop, this_thread->loops)
   {
     if (tsd->show_loops)
-    {
-      char b[TIME_BY_SEC_SIZE * sizeof("123456789, ")], *bptr = b, *bend = b + sizeof(b);
-      uint cs = CURRENT_SEC;
-      uint fs = NSEC_TO_SEC(loop->last_time_finished_ns);
-      for (uint i = 0; i <= cs && i < TIME_BY_SEC_SIZE; i++)
-	bptr += bsnprintf(bptr, bend - bptr, "% 9lu ",
-	    (cs - i > fs) ? 0 : loop->time_by_sec_ns[(cs - i) % TIME_BY_SEC_SIZE]);
-      bptr[-1] = 0; /* Drop the trailing space */
-
-      cli_printf(tsd->cli, -1026, "  Loop %s", domain_name(loop->time.domain));
-      cli_printf(tsd->cli, -1026, "    Total time: %t s", loop->total_time_spent_ns NS);
-      cli_printf(tsd->cli, -1026, "    Total locking time: %t s", loop->total_time_locking_ns NS);
-      cli_printf(tsd->cli, -1026, "    Last %d secs [ns]: %s", MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
-    }
-
-    total_time_ns += loop->total_time_spent_ns;
+      bird_thread_show_loop(tsd->cli, loop);
+    
+    total_time_ns += loop->working.total_ns + loop->locking.total_ns;
   }
 
-  tsd->done++;
-  int last = (tsd->done == tsd->total);
+  int last = (++tsd->done == tsd->total);
+
+  if (tsd->show_loops)
+  {
+    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "  Total working time: %t", total_time_ns NS);
+    bird_thread_show_spent_time(tsd->cli, "  Overhead", &this_thread->overhead);
+  }
+  else
+    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "Thread %p working %t s overhead %t s",
+	this_thread, total_time_ns NS, this_thread->overhead.total_ns NS);
 
   if (last)
   {
     tsd->cli->cont = NULL;
     tsd->cli->cleanup = NULL;
+    ev_send(&global_event_list, &tsd->finish_event);
   }
 
-  if (tsd->show_loops)
-    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "  Total time: %t", total_time_ns NS);
-  else
-    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "Thread %p time %t", this_thread, total_time_ns NS);
-
-  ev_send(&global_event_list, &tsd->finish_event);
-
   UNLOCK_DOMAIN(control, tsd->lock);
 }
 
@@ -1012,27 +1100,31 @@ bird_thread_show_finish(void *data)
       struct birdloop_pickup_group *group = &pickup_groups[i];
 
       LOCK_DOMAIN(resource, group->domain);
+      uint count = 0;
+      u64 total_time_ns = 0;
       if (!EMPTY_LIST(group->loops))
+      {
 	if (tsd->show_loops)
-	{
-	  cli_printf(tsd->cli, -1026, "Unassigned loops");
+	  cli_printf(tsd->cli, -1026, "Unassigned loops:");
 
-	  struct birdloop *loop;
-	  WALK_LIST(loop, group->loops)
-	    cli_printf(tsd->cli, -1026, "  Loop %s time: %t", domain_name(loop->time.domain), loop->total_time_spent_ns NS);
-	}
-	else
+	struct birdloop *loop;
+	WALK_LIST(loop, group->loops)
 	{
-	  uint count = 0;
-	  u64 total_time_ns = 0;
-	  struct birdloop *loop;
-	  WALK_LIST(loop, group->loops)
-	  {
-	    count++;
-	    total_time_ns += loop->total_time_spent_ns;
-	  }
-	  cli_printf(tsd->cli, -1026, "Unassigned loops: %d, total time %t", count, total_time_ns NS);
+	  if (tsd->show_loops)
+	    bird_thread_show_loop(tsd->cli, loop);
+
+	  total_time_ns += loop->working.total_ns + loop->locking.total_ns;
+	  count++;
 	}
+
+	if (tsd->show_loops)
+	  cli_printf(tsd->cli, 1026, "  Total working time: %t", total_time_ns NS);
+	else
+	  cli_printf(tsd->cli, 1026, "Unassigned %d loops, total time %t", count, total_time_ns NS);
+      }
+      else
+	cli_printf(tsd->cli, 1026, "All loops are assigned.");
+
       UNLOCK_DOMAIN(resource, group->domain);
     }
 
@@ -1156,6 +1248,7 @@ birdloop_stop_internal(struct birdloop *loop)
   /* Leave the loop context without causing any other fuss */
   ASSERT_DIE(!ev_active(&loop->event));
   loop->ping_pending = 0;
+  account_to(&this_thread->overhead);
   birdloop_leave(loop);
 
   /* Request local socket reload */
@@ -1173,17 +1266,13 @@ birdloop_run(void *_loop)
   /* Run priority events before the loop is executed */
   ev_run_list(&this_thread->priority_events);
 
-  u64 start_time = ns_now();
-  u64 end_time = start_time + this_thread->max_loop_time_ns;
-
   struct birdloop *loop = _loop;
+  account_to(&loop->locking);
   birdloop_enter(loop);
+  u64 dif = account_to(&loop->working);
 
-  u64 locked_time = ns_now(), task_done_time;
-  if (locked_time > end_time)
-    LOOP_WARN(loop, "locked %luns after its scheduled end time", locked_time - end_time);
-
-  loop->total_time_locking_ns += (locked_time - start_time);
+  if (dif > this_thread->max_loop_time_ns)
+    LOOP_WARN(loop, "locked %lu ns after its scheduled end time", dif);
 
   uint repeat, loop_runs = 0;
   do {
@@ -1208,7 +1297,7 @@ birdloop_run(void *_loop)
     repeat += ev_run_list(&loop->event_list);
 
     /* Check end time */
-  } while (((task_done_time = ns_now()) < end_time) && repeat);
+  } while (repeat && (ns_now() < account_last + this_thread->max_loop_time_ns));
 
   /* Request meta timer */
   timer *t = timers_first(&loop->time);
@@ -1225,37 +1314,7 @@ birdloop_run(void *_loop)
   this_thread->sock_changed += loop->sock_changed;
   loop->sock_changed = 0;
 
-  /* Get finish time */
-  u64 finish_time = ns_now();
-  loop->total_time_spent_ns += finish_time - locked_time;
-
-  log(L_INFO "%p: lock to finish time: %lu %lu", loop, locked_time, finish_time);
-
-  /* Zero records for seconds where we haven't run */
-  if (NSEC_TO_SEC(loop->last_time_finished_ns) + TIME_BY_SEC_SIZE < NSEC_TO_SEC(locked_time))
-    memset(loop->time_by_sec_ns, 0, sizeof(loop->time_by_sec_ns));
-  else
-    for (u64 fclr = NSEC_TO_SEC(loop->last_time_finished_ns) + 1;
-	fclr <= NSEC_TO_SEC(locked_time);
-	fclr++)
-    {
-      log(L_INFO "%p: fclr %lu", loop, fclr % TIME_BY_SEC_SIZE);
-      loop->time_by_sec_ns[fclr % TIME_BY_SEC_SIZE] = 0;
-    }
-
-  while (NSEC_TO_SEC(locked_time) != NSEC_TO_SEC(finish_time))
-  {
-    u64 part = (NSEC_TO_SEC(locked_time) + 1) * NSEC_IN_SEC - locked_time;
-    log(L_INFO "%p: part %lu to %lu", loop, part, NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE);
-    loop->time_by_sec_ns[NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE] += part;
-    locked_time += part;
-  }
-
-  log(L_INFO "%p: part %lu to %lu", loop, finish_time - locked_time, NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE);
-  loop->time_by_sec_ns[NSEC_TO_SEC(locked_time) % TIME_BY_SEC_SIZE] += finish_time - locked_time;
-
-  loop->last_time_finished_ns = finish_time;
-
+  account_to(&this_thread->overhead);
   birdloop_leave(loop);
 }
 
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index d60b5206..9b0efb6c 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -29,9 +29,12 @@ void pipe_pollin(struct pipe *, struct pfd *);
 void pipe_drain(struct pipe *);
 void pipe_kick(struct pipe *);
 
-struct total_time_since {
-  u64 total;
-  u64 since;
+#define TIME_BY_SEC_SIZE	16
+
+struct spent_time {
+  u64 total_ns;
+  u64 last_written_ns;
+  u64 by_sec_ns[TIME_BY_SEC_SIZE];
 };
 
 struct birdloop
@@ -66,10 +69,7 @@ struct birdloop
   struct bird_thread *thread;
 
 #define TIME_BY_SEC_SIZE	16
-  u64 time_by_sec_ns[TIME_BY_SEC_SIZE];
-  u64 last_time_finished_ns;
-  u64 total_time_spent_ns;
-  u64 total_time_locking_ns;
+  struct spent_time working, locking;
 };
 
 struct bird_thread
@@ -98,6 +98,8 @@ struct bird_thread
 
   u64 max_latency_ns;
   u64 max_loop_time_ns;
+
+  struct spent_time overhead;
 };
 
 #endif

From 8bc27583ff6d5d8f6789ca1b3d628c967f24a13a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 27 Apr 2023 10:42:11 +0200
Subject: [PATCH 307/431] Explicitly counting loops and threads

---
 sysdep/unix/io-loop.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 79cbe3fe..9f2ac634 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -588,6 +588,8 @@ struct birdloop_pickup_group {
   DOMAIN(resource) domain;
   list loops;
   list threads;
+  uint thread_count;
+  uint loop_count;
   btime max_latency;
   event start_threads;
 } pickup_groups[2] = {
@@ -878,6 +880,8 @@ bird_thread_start(struct birdloop_pickup_group *group)
   if (e = pthread_create(&thr->thread_id, &thr->thread_attr, bird_thread_main, thr))
     die("pthread_create() failed: %M", e);
 
+  group->thread_count++;
+
   UNLOCK_DOMAIN(resource, group->domain);
   birdloop_leave(meta);
   return thr;
@@ -899,7 +903,7 @@ bird_thread_shutdown(void * _ UNUSED)
 {
   struct birdloop_pickup_group *group = this_thread->group;
   LOCK_DOMAIN(resource, group->domain);
-  int dif = list_length(&group->threads) - thread_dropper_goal;
+  int dif = group->thread_count - thread_dropper_goal;
   struct birdloop *tdl_stop = NULL;
 
   if (dif > 0)
@@ -925,6 +929,7 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Leave the thread-picker list to get no more loops */
   LOCK_DOMAIN(resource, group->domain);
   rem_node(&thr->n);
+  group->thread_count--;
   UNLOCK_DOMAIN(resource, group->domain);
 
   /* Drop loops including the thread dropper itself */
@@ -932,6 +937,7 @@ bird_thread_shutdown(void * _ UNUSED)
     birdloop_drop(HEAD(thr->loops), group);
 
   /* Let others know about new loops */
+  LOCK_DOMAIN(resource, group->domain);
   if (!EMPTY_LIST(group->loops))
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
   UNLOCK_DOMAIN(resource, group->domain);
@@ -974,7 +980,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
     struct birdloop_pickup_group *group = &pickup_groups[0];
     LOCK_DOMAIN(resource, group->domain);
 
-    int dif = list_length(&group->threads) - (thread_dropper_goal = new->thread_count);
+    int dif = group->thread_count - (thread_dropper_goal = new->thread_count);
     _Bool thread_dropper_running = !!thread_dropper;
 
     UNLOCK_DOMAIN(resource, group->domain);
@@ -1242,9 +1248,15 @@ birdloop_stop_internal(struct birdloop *loop)
   tm_stop(&loop->timer);
 
   /* Remove from thread loop list */
+  ASSERT_DIE(loop->thread == this_thread);
   rem_node(&loop->n);
   loop->thread = NULL;
 
+  /* Uncount from thread group */
+  LOCK_DOMAIN(resource, this_thread->group->domain);
+  this_thread->group->loop_count--;
+  UNLOCK_DOMAIN(resource, this_thread->group->domain);
+
   /* Leave the loop context without causing any other fuss */
   ASSERT_DIE(!ev_active(&loop->event));
   loop->ping_pending = 0;
@@ -1353,6 +1365,7 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
   if (group)
   {
     LOCK_DOMAIN(resource, group->domain);
+    group->loop_count++;
     add_tail(&group->loops, &loop->n);
     if (EMPTY_LIST(group->threads))
       ev_send(&global_event_list, &group->start_threads);

From 9bc5cbd3c74a20a0071ce87884bfb217c0aacb8d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 27 Apr 2023 11:02:02 +0200
Subject: [PATCH 308/431] Show threads: Fixed problems with CLI buffer
 reallocation

... by allocating all the output locally and then sending it out at
once.
---
 sysdep/unix/io-loop.c | 68 +++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 9f2ac634..c2bb71f0 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -1014,13 +1014,22 @@ DEFINE_DOMAIN(control);
 struct bird_thread_show_data {
   cli *cli;
   pool *pool;
+  linpool *lp;
   DOMAIN(control) lock;
   uint total;
   uint done;
   event finish_event;
   u8 show_loops;
+  uint line_pos;
+  uint line_max;
+  const char *lines[];
 };
 
+#define tsd_append(...)		do { \
+  ASSERT_DIE(tsd->line_pos < tsd->line_max); \
+  tsd->lines[tsd->line_pos++] = lp_sprintf(tsd->lp, __VA_ARGS__); \
+} while (0)
+
 static void
 bird_thread_show_cli_cont(struct cli *c UNUSED)
 {
@@ -1034,7 +1043,7 @@ bird_thread_show_cli_cleanup(struct cli *c UNUSED)
 }
 
 static void
-bird_thread_show_spent_time(struct cli *c, const char *name, struct spent_time *st)
+bird_thread_show_spent_time(struct bird_thread_show_data *tsd, const char *name, struct spent_time *st)
 {
   char b[TIME_BY_SEC_SIZE * sizeof("1234567890, ")], *bptr = b, *bend = b + sizeof(b);
   uint cs = CURRENT_SEC;
@@ -1045,15 +1054,15 @@ bird_thread_show_spent_time(struct cli *c, const char *name, struct spent_time *
 	(cs - i > fs) ? 0 : st->by_sec_ns[(cs - i) % TIME_BY_SEC_SIZE]);
   bptr[-1] = 0; /* Drop the trailing space */
 
-  cli_printf(c, -1026, "    %s total time: % 9t s; last %d secs [ns]: %s", name, st->total_ns NS, MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
+  tsd_append("    %s total time: % 9t s; last %d secs [ns]: %s", name, st->total_ns NS, MIN(CURRENT_SEC+1, TIME_BY_SEC_SIZE), b);
 }
 
 static void
-bird_thread_show_loop(struct cli *c, struct birdloop *loop)
+bird_thread_show_loop(struct bird_thread_show_data *tsd, struct birdloop *loop)
 {
-  cli_printf(c, -1026, "  Loop %s", domain_name(loop->time.domain));
-  bird_thread_show_spent_time(c, "    Working", &loop->working);
-  bird_thread_show_spent_time(c, "    Locking", &loop->locking);
+  tsd_append("  Loop %s", domain_name(loop->time.domain));
+  bird_thread_show_spent_time(tsd, "    Working", &loop->working);
+  bird_thread_show_spent_time(tsd, "    Locking", &loop->locking);
 }
 
 static void
@@ -1063,14 +1072,14 @@ bird_thread_show(void *data)
 
   LOCK_DOMAIN(control, tsd->lock);
   if (tsd->show_loops)
-    cli_printf(tsd->cli, -1026, "Thread %p", this_thread);
+    tsd_append("Thread %p", this_thread);
 
   u64 total_time_ns = 0;
   struct birdloop *loop;
   WALK_LIST(loop, this_thread->loops)
   {
     if (tsd->show_loops)
-      bird_thread_show_loop(tsd->cli, loop);
+      bird_thread_show_loop(tsd, loop);
     
     total_time_ns += loop->working.total_ns + loop->locking.total_ns;
   }
@@ -1079,11 +1088,11 @@ bird_thread_show(void *data)
 
   if (tsd->show_loops)
   {
-    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "  Total working time: %t", total_time_ns NS);
-    bird_thread_show_spent_time(tsd->cli, "  Overhead", &this_thread->overhead);
+    tsd_append("  Total working time: %t", total_time_ns NS);
+    bird_thread_show_spent_time(tsd, "  Overhead", &this_thread->overhead);
   }
   else
-    cli_printf(tsd->cli, (last ? 1 : -1) * 1026, "Thread %p working %t s overhead %t s",
+    tsd_append("Thread %p working %t s overhead %t s",
 	this_thread, total_time_ns NS, this_thread->overhead.total_ns NS);
 
   if (last)
@@ -1100,6 +1109,9 @@ static void
 bird_thread_show_finish(void *data)
 {
   struct bird_thread_show_data *tsd = data;
+  ASSERT_DIE(birdloop_inside(&main_birdloop));
+  DOMAIN(control) lock = tsd->lock;
+  LOCK_DOMAIN(control, lock);
 
     for (int i=0; i<2; i++)
     {
@@ -1111,33 +1123,35 @@ bird_thread_show_finish(void *data)
       if (!EMPTY_LIST(group->loops))
       {
 	if (tsd->show_loops)
-	  cli_printf(tsd->cli, -1026, "Unassigned loops:");
+	  tsd_append("Unassigned loops in group %d:", i);
 
 	struct birdloop *loop;
 	WALK_LIST(loop, group->loops)
 	{
 	  if (tsd->show_loops)
-	    bird_thread_show_loop(tsd->cli, loop);
+	    bird_thread_show_loop(tsd, loop);
 
 	  total_time_ns += loop->working.total_ns + loop->locking.total_ns;
 	  count++;
 	}
 
 	if (tsd->show_loops)
-	  cli_printf(tsd->cli, 1026, "  Total working time: %t", total_time_ns NS);
+	  tsd_append("  Total working time: %t", total_time_ns NS);
 	else
-	  cli_printf(tsd->cli, 1026, "Unassigned %d loops, total time %t", count, total_time_ns NS);
+	  tsd_append("Unassigned %d loops in group %d, total time %t", count, i, total_time_ns NS);
       }
       else
-	cli_printf(tsd->cli, 1026, "All loops are assigned.");
+	tsd_append("All loops in group %d are assigned.", i);
 
       UNLOCK_DOMAIN(resource, group->domain);
     }
 
+    for (uint i = 0; i < tsd->line_pos - 1; i++)
+      cli_printf(tsd->cli, -1026, "%s", tsd->lines[i]);
+
+    cli_printf(tsd->cli, 1026, "%s", tsd->lines[tsd->line_pos-1]);
     cli_write_trigger(tsd->cli);
 
-    DOMAIN(control) lock = tsd->lock;
-    LOCK_DOMAIN(control, lock);
     rp_free(tsd->pool);
     UNLOCK_DOMAIN(control, lock);
     DOMAIN_FREE(control, lock);
@@ -1150,15 +1164,31 @@ cmd_show_threads(int show_loops)
   LOCK_DOMAIN(control, lock);
   pool *p = rp_new(&root_pool, lock.control, "Show Threads");
 
-  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
+  uint total_threads = 0, total_loops = 0;
+  for (int i=0; i<2; i++)
+  {
+    struct birdloop_pickup_group *group = &pickup_groups[i];
+    LOCK_DOMAIN(resource, group->domain);
+    total_threads += group->thread_count;
+    total_loops += group->loop_count;
+    UNLOCK_DOMAIN(resource, group->domain);
+  }
+
+  /* Total number of lines must be recalculated when changing the code! */
+  uint total_lines = total_threads * (show_loops + 1) + total_loops * 3 * show_loops + 10;
+
+  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data) + total_lines * sizeof(const char *));
   tsd->cli = this_cli;
   tsd->pool = p;
+  tsd->lp = lp_new(p);
   tsd->lock = lock;
   tsd->show_loops = show_loops;
   tsd->finish_event = (event) {
     .hook = bird_thread_show_finish,
     .data = tsd,
   };
+  tsd->line_pos = 0;
+  tsd->line_max = total_lines;
 
   this_cli->cont = bird_thread_show_cli_cont;
   this_cli->cleanup = bird_thread_show_cli_cleanup;

From 91471531a1a7c9a4794731d5ed327e7ab7861ffa Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 27 Apr 2023 12:38:50 +0200
Subject: [PATCH 309/431] Fixed race condition in hostentry allocation

---
 nest/rt-table.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index a934d3c3..f6d2ca0f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4831,6 +4831,39 @@ rt_update_hostcache(void *data)
 	rt_schedule_nhu(dst);
 }
 
+struct hostentry_tmp_lock {
+  resource r;
+  rtable *tab;
+  struct hostentry *he;
+};
+
+static void
+hostentry_tmp_unlock(resource *r)
+{
+  struct hostentry_tmp_lock *l = SKIP_BACK(struct hostentry_tmp_lock, r, r);
+  RT_LOCKED(l->tab, tab)
+  {
+    l->he->uc--;
+    rt_unlock_table(tab);
+  }
+}
+
+static void
+hostentry_tmp_lock_dump(resource *r, unsigned indent UNUSED)
+{
+  struct hostentry_tmp_lock *l = SKIP_BACK(struct hostentry_tmp_lock, r, r);
+  debug("he=%p tab=%s\n", l->he, l->tab->name);
+}
+
+struct resclass hostentry_tmp_lock_class = {
+  .name = "Temporary hostentry lock",
+  .size = sizeof(struct hostentry_tmp_lock),
+  .free = hostentry_tmp_unlock,
+  .dump = hostentry_tmp_lock_dump,
+  .lookup = NULL,
+  .memsize = NULL,
+};
+
 static struct hostentry *
 rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep)
 {
@@ -4844,10 +4877,20 @@ rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep)
   struct hostcache *hc = tab->hostcache;
   for (he = hc->hash_table[k >> hc->hash_shift]; he != NULL; he = he->next)
     if (ipa_equal(he->addr, a) && ipa_equal(he->link, link) && (he->tab == dep))
-      return he;
+      break;
+
+  if (!he)
+  {
+    he = hc_new_hostentry(hc, tab->rp, a, link, dep, k);
+    rt_update_hostentry(tab, he);
+  }
+
+  struct hostentry_tmp_lock *l = ralloc(tmp_res.pool, &hostentry_tmp_lock_class);
+  l->he = he;
+  l->tab = RT_PUB(tab);
+  l->he->uc++;
+  rt_lock_table(tab);
 
-  he = hc_new_hostentry(hc, tab->rp, a, link, dep, k);
-  rt_update_hostentry(tab, he);
   return he;
 }
 

From 010c26c29602d52e704ea7cb83f2f6acacbddd0d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 28 Apr 2023 12:32:41 +0200
Subject: [PATCH 310/431] Linpool flushes unused pages even on lp_restore()

---
 lib/mempool.c | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/lib/mempool.c b/lib/mempool.c
index be98de51..56a4c3db 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -27,6 +27,7 @@
 
 struct lp_chunk {
   struct lp_chunk *next;
+  struct linpool *lp;
   uintptr_t data_align[0];
   byte data[0];
 };
@@ -100,30 +101,29 @@ lp_alloc(linpool *m, uint size)
 	{
 	  /* Too large => allocate large chunk */
 	  c = xmalloc(sizeof(struct lp_chunk) + size);
-	  m->total_large += size;
+	  c->lp = m;
 	  c->next = m->first_large;
+
+	  m->total_large += size;
 	  m->first_large = c;
 	}
       else
 	{
-	  if (m->current && m->current->next)
-	    {
-	      /* Still have free chunks from previous incarnation (before lp_flush()) */
-	      c = m->current->next;
-	    }
+	  if (m->current)
+	    ASSERT_DIE(!m->current->next);
+
+	  /* Need to allocate a new chunk */
+	  c = alloc_page();
+
+	  m->total += LP_DATA_SIZE;
+	  c->next = NULL;
+	  c->lp = m;
+
+	  if (m->current)
+	    m->current->next = c;
 	  else
-	    {
-	      /* Need to allocate a new chunk */
-	      c = alloc_page();
+	    m->first = c;
 
-	      m->total += LP_DATA_SIZE;
-	      c->next = NULL;
-
-	      if (m->current)
-		m->current->next = c;
-	      else
-		m->first = c;
-	    }
 	  m->current = c;
 	  m->ptr = c->data + size;
 	  m->end = c->data + LP_DATA_SIZE;
@@ -248,6 +248,12 @@ lp_restore(linpool *m, lp_state *p)
       m->first_large = c->next;
       xfree(c);
     }
+
+  while (m->current && (c = m->current->next))
+    {
+      m->current->next = c->next;
+      free_page(c);
+    }
 }
 
 static void

From 9f25dd79b8e9fdea9050c9f7e3a10cea8791d745 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 28 Apr 2023 23:48:03 +0200
Subject: [PATCH 311/431] Allocation from linpools and slabs requires the
 appropriate lock to be taken

---
 lib/mempool.c  | 5 +++++
 lib/resource.c | 7 -------
 lib/resource.h | 3 +++
 lib/slab.c     | 2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/mempool.c b/lib/mempool.c
index 56a4c3db..578750c1 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -86,6 +86,7 @@ linpool
 void *
 lp_alloc(linpool *m, uint size)
 {
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
   byte *a = (byte *) BIRD_ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN);
   byte *e = a + size;
 
@@ -145,6 +146,7 @@ lp_alloc(linpool *m, uint size)
 void *
 lp_allocu(linpool *m, uint size)
 {
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
   byte *a = m->ptr;
   byte *e = a + size;
 
@@ -183,6 +185,7 @@ lp_allocz(linpool *m, uint size)
 void
 lp_flush(linpool *m)
 {
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
   struct lp_chunk *c;
 
   /* Move ptr to the first chunk and free all other chunks */
@@ -216,6 +219,7 @@ lp_flush(linpool *m)
 void
 lp_save(linpool *m, lp_state *p)
 {
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
   p->current = m->current;
   p->large = m->first_large;
   p->total_large = m->total_large;
@@ -236,6 +240,7 @@ void
 lp_restore(linpool *m, lp_state *p)
 {
   struct lp_chunk *c;
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
 
   /* Move ptr to the saved pos and free all newer large chunks */
   m->current = c = p->current ?: m->first;
diff --git a/lib/resource.c b/lib/resource.c
index e0aaac0a..611db4d7 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -189,13 +189,6 @@ pool_lookup(resource *P, unsigned long a)
   return q;
 }
 
-static pool *
-resource_parent(resource *r)
-{
-  return SKIP_BACK(pool, inside, resource_enlisted(r));
-}
-
-
 /**
  * rmove - move a resource
  * @res: resource
diff --git a/lib/resource.h b/lib/resource.h
index 810334c1..06af4289 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -76,6 +76,9 @@ void rp_free(pool *p);							/* Free the whole pool */
 
 extern pool root_pool;
 
+static inline pool *resource_parent(resource *r)
+{ return SKIP_BACK(pool, inside, resource_enlisted(r)); }
+
 /* Normal memory blocks */
 
 void *mb_alloc(pool *, unsigned size);
diff --git a/lib/slab.c b/lib/slab.c
index 23316e82..7d2c87e9 100644
--- a/lib/slab.c
+++ b/lib/slab.c
@@ -256,6 +256,7 @@ void *
 sl_alloc(slab *s)
 {
   struct sl_head *h;
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&s->r)->domain));
 
 redo:
   if (!(h = s->partial_heads.first))
@@ -331,6 +332,7 @@ sl_free(void *oo)
 {
   struct sl_head *h = SL_GET_HEAD(oo);
   struct slab *s = h->slab;
+  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&s->r)->domain));
 
 #ifdef POISON
   memset(oo, 0xdb, s->data_size);

From fa973c2c153eaaa1abcef8d0f52a0b1fd68c37d8 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 30 Apr 2023 22:17:42 +0200
Subject: [PATCH 312/431] First try of loop balancing

If a thread encounters timeout == 0 for poll, it considers itself
"busy" and with some hysteresis it tries to drop loops for others to
pick and thus better distribute work between threads.
---
 sysdep/unix/io-loop.c | 175 ++++++++++++++++++++++++++++++------------
 sysdep/unix/io-loop.h |   8 +-
 2 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index c2bb71f0..cf54a511 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -406,7 +406,7 @@ socket_changed(sock *s)
   struct birdloop *loop = s->loop;
   ASSERT_DIE(birdloop_inside(loop));
 
-  loop->sock_changed++;
+  loop->sock_changed = 1;
   birdloop_ping(loop);
 }
 
@@ -552,7 +552,7 @@ sockets_fire(struct birdloop *loop)
 	  continue;
 
 	if (!sk_tx_pending(s))
-	  loop->thread->sock_changed++;
+	  loop->thread->sock_changed = 1;
       }
 
       if (rev & POLLIN)
@@ -590,6 +590,7 @@ struct birdloop_pickup_group {
   list threads;
   uint thread_count;
   uint loop_count;
+  uint thread_busy_count;
   btime max_latency;
   event start_threads;
 } pickup_groups[2] = {
@@ -624,25 +625,49 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   }
   /* Now we are free of running pings */
 
-  if (loop->thread = thr)
+  /* Update the thread value */
+  loop->thread = thr;
+
+  /* Put into appropriate lists */
+  if (thr)
   {
     add_tail(&thr->loops, &loop->n);
     thr->loop_count++;
+    ev_send_loop(loop->thread->meta, &loop->event);
   }
   else
   {
     old->loop_count--;
 
+    /* Unschedule from Meta */
+    ev_postpone(&loop->event);
+    tm_stop(&loop->timer);
+
+    /* Request local socket reload */
+    this_thread->sock_changed = 1;
+
+    /* Put into pickup list */
     LOCK_DOMAIN(resource, group->domain);
     add_tail(&group->loops, &loop->n);
     UNLOCK_DOMAIN(resource, group->domain);
   }
 
-  /* Finished */
+  /* Allow pings */
   atomic_fetch_and_explicit(&loop->thread_transition, ~LTT_MOVE, memory_order_acq_rel);
+}
 
-  /* Request to run by force */
-  ev_send_loop(loop->thread->meta, &loop->event);
+static void
+bird_thread_pickup_next(struct birdloop_pickup_group *group)
+{
+  /* This thread goes to the end of the pickup list */
+  LOCK_DOMAIN(resource, group->domain);
+  rem_node(&this_thread->n);
+  add_tail(&group->threads, &this_thread->n);
+
+  /* If there are more loops to be picked up, wakeup the next thread in order */
+  if (!EMPTY_LIST(group->loops))
+    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
+  UNLOCK_DOMAIN(resource, group->domain);
 }
 
 static struct birdloop *
@@ -651,7 +676,32 @@ birdloop_take(struct birdloop_pickup_group *group)
   struct birdloop *loop = NULL;
 
   LOCK_DOMAIN(resource, group->domain);
-  if (!EMPTY_LIST(group->loops))
+
+  int drop =
+    this_thread->busy_active &&
+    (group->thread_busy_count < group->thread_count) &&
+    (this_thread->loop_count > 1);
+  int take = !EMPTY_LIST(group->loops);
+
+  if (drop)
+  {
+    UNLOCK_DOMAIN(resource, group->domain);
+    node *n;
+    WALK_LIST2(loop, n, this_thread->loops, n)
+      if (ev_active(&loop->event))
+      {
+	LOOP_TRACE(loop, "Moving to another thread");
+
+	/* Pass to another thread */
+	rem_node(&loop->n);
+	birdloop_set_thread(loop, NULL, group);
+	bird_thread_pickup_next(group);
+	break;
+      }
+
+    return NULL;
+  }
+  else if (take)
   {
     /* Take the first loop from the pickup list and unlock */
     loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
@@ -659,41 +709,14 @@ birdloop_take(struct birdloop_pickup_group *group)
     UNLOCK_DOMAIN(resource, group->domain);
 
     birdloop_set_thread(loop, this_thread, group);
-
-    /* This thread goes to the end of the pickup list */
-    LOCK_DOMAIN(resource, group->domain);
-    rem_node(&this_thread->n);
-    add_tail(&group->threads, &this_thread->n);
-
-    /* If there are more loops to be picked up, wakeup the next thread in order */
-    if (!EMPTY_LIST(group->loops))
-      wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
+    bird_thread_pickup_next(group);
+    return loop;
   }
-  UNLOCK_DOMAIN(resource, group->domain);
-
-  return loop;
-}
-
-static void
-birdloop_drop(struct birdloop *loop, struct birdloop_pickup_group *group)
-{
-  /* Remove loop from this thread's list */
-  rem_node(&loop->n);
-
-  /* Unset loop's thread */
-  if (birdloop_inside(loop))
-    birdloop_set_thread(loop, NULL, group);
   else
   {
-    birdloop_enter(loop);
-    birdloop_set_thread(loop, NULL, group);
-    birdloop_leave(loop);
+    UNLOCK_DOMAIN(resource, group->domain);
+    return NULL;
   }
-
-  /* Put loop into pickup list */
-  LOCK_DOMAIN(resource, group->domain);
-  add_tail(&group->loops, &loop->n);
-  UNLOCK_DOMAIN(resource, group->domain);
 }
 
 static int
@@ -707,6 +730,38 @@ poll_timeout(struct birdloop *loop)
   return remains TO_MS + ((remains TO_MS) MS < remains);
 }
 
+static void
+bird_thread_busy_update(struct bird_thread *thr, int val)
+{
+  if (thr->busy_active == val)
+    return;
+
+  if (val)
+    thr->busy_counter++;
+  else
+    thr->busy_counter--;
+
+  switch (thr->busy_counter)
+  {
+    case 0:
+      thr->busy_active = 0;
+      break;
+    case 4:
+      thr->busy_active = 1;
+      break;
+
+    default:
+      return;
+  }
+
+  LOCK_DOMAIN(resource, thr->group->domain);
+  if (val)
+    thr->group->thread_busy_count++;
+  else
+    thr->group->thread_busy_count--;
+  UNLOCK_DOMAIN(resource, thr->group->domain);
+}
+
 static void *
 bird_thread_main(void *arg)
 {
@@ -795,6 +850,9 @@ bird_thread_main(void *arg)
     else if (timeout > 5000)
       flush_local_pages();
 
+    bird_thread_busy_update(thr, (timeout == 0));
+
+    account_to(&this_thread->idle);
 poll_retry:;
     int rv = poll(pfd.pfd.data, pfd.pfd.used, timeout);
     if (rv < 0)
@@ -804,6 +862,8 @@ poll_retry:;
       bug("poll in %p: %m", thr);
     }
 
+    account_to(&this_thread->overhead);
+
     /* Drain wakeup fd */
     if (pfd.pfd.data[0].revents & POLLIN)
     {
@@ -934,7 +994,22 @@ bird_thread_shutdown(void * _ UNUSED)
 
   /* Drop loops including the thread dropper itself */
   while (!EMPTY_LIST(thr->loops))
-    birdloop_drop(HEAD(thr->loops), group);
+  {
+    struct birdloop *loop = HEAD(thr->loops);
+
+    /* Remove loop from this thread's list */
+    rem_node(&loop->n);
+
+    /* Unset loop's thread */
+    if (birdloop_inside(loop))
+      birdloop_set_thread(loop, NULL, group);
+    else
+    {
+      birdloop_enter(loop);
+      birdloop_set_thread(loop, NULL, group);
+      birdloop_leave(loop);
+    }
+  }
 
   /* Let others know about new loops */
   LOCK_DOMAIN(resource, group->domain);
@@ -1022,11 +1097,12 @@ struct bird_thread_show_data {
   u8 show_loops;
   uint line_pos;
   uint line_max;
-  const char *lines[];
+  const char **lines;
 };
 
 #define tsd_append(...)		do { \
-  ASSERT_DIE(tsd->line_pos < tsd->line_max); \
+  if (tsd->line_pos >= tsd->line_max) \
+    tsd->lines = mb_realloc(tsd->lines, sizeof (const char *) * (tsd->line_max *= 2)); \
   tsd->lines[tsd->line_pos++] = lp_sprintf(tsd->lp, __VA_ARGS__); \
 } while (0)
 
@@ -1061,8 +1137,8 @@ static void
 bird_thread_show_loop(struct bird_thread_show_data *tsd, struct birdloop *loop)
 {
   tsd_append("  Loop %s", domain_name(loop->time.domain));
-  bird_thread_show_spent_time(tsd, "    Working", &loop->working);
-  bird_thread_show_spent_time(tsd, "    Locking", &loop->locking);
+  bird_thread_show_spent_time(tsd, "Working ", &loop->working);
+  bird_thread_show_spent_time(tsd, "Locking ", &loop->locking);
 }
 
 static void
@@ -1089,7 +1165,8 @@ bird_thread_show(void *data)
   if (tsd->show_loops)
   {
     tsd_append("  Total working time: %t", total_time_ns NS);
-    bird_thread_show_spent_time(tsd, "  Overhead", &this_thread->overhead);
+    bird_thread_show_spent_time(tsd, "Overhead", &this_thread->overhead);
+    bird_thread_show_spent_time(tsd, "Idle    ", &this_thread->idle);
   }
   else
     tsd_append("Thread %p working %t s overhead %t s",
@@ -1175,9 +1252,8 @@ cmd_show_threads(int show_loops)
   }
 
   /* Total number of lines must be recalculated when changing the code! */
-  uint total_lines = total_threads * (show_loops + 1) + total_loops * 3 * show_loops + 10;
 
-  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data) + total_lines * sizeof(const char *));
+  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
   tsd->cli = this_cli;
   tsd->pool = p;
   tsd->lp = lp_new(p);
@@ -1188,7 +1264,8 @@ cmd_show_threads(int show_loops)
     .data = tsd,
   };
   tsd->line_pos = 0;
-  tsd->line_max = total_lines;
+  tsd->line_max = 64;
+  tsd->lines = mb_allocz(p, sizeof(const char *) * tsd->line_max);
 
   this_cli->cont = bird_thread_show_cli_cont;
   this_cli->cleanup = bird_thread_show_cli_cleanup;
@@ -1294,7 +1371,7 @@ birdloop_stop_internal(struct birdloop *loop)
   birdloop_leave(loop);
 
   /* Request local socket reload */
-  this_thread->sock_changed++;
+  this_thread->sock_changed = 1;
 
   /* Call the stopped hook from the main loop */
   loop->event.hook = loop->stopped;
@@ -1353,7 +1430,7 @@ birdloop_run(void *_loop)
     ev_send_loop(this_thread->meta, &loop->event);
 
   /* Collect socket change requests */
-  this_thread->sock_changed += loop->sock_changed;
+  this_thread->sock_changed |= loop->sock_changed;
   loop->sock_changed = 0;
 
   account_to(&this_thread->overhead);
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index 9b0efb6c..e16a4a05 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -51,7 +51,7 @@ struct birdloop
   list sock_list;
   struct birdsock *sock_active;
   int sock_num;
-  uint sock_changed;
+  uint sock_changed:1;
 
   uint ping_pending;
 
@@ -93,13 +93,15 @@ struct bird_thread
 
   event cleanup_event;
 
-  int sock_changed;
+  u8 sock_changed;
+  u8 busy_active;
+  u16 busy_counter;
   uint loop_count;
 
   u64 max_latency_ns;
   u64 max_loop_time_ns;
 
-  struct spent_time overhead;
+  struct spent_time overhead, idle;
 };
 
 #endif

From fac64056696680a21f1121d15620969876407ef7 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 3 May 2023 21:39:36 +0200
Subject: [PATCH 313/431] Page allocator: indentation of messy ifdef blocks

---
 sysdep/unix/alloc.c | 100 ++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 1b951da2..22b9a88c 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -17,79 +17,79 @@
 #include <unistd.h>
 
 #ifdef HAVE_MMAP
-#include <sys/mman.h>
+# include <sys/mman.h>
 #endif
 
 #ifdef CONFIG_DISABLE_THP
-#include <sys/prctl.h>
-#ifndef PR_SET_THP_DISABLE
-#define PR_SET_THP_DISABLE 41
-#endif
+# include <sys/prctl.h>
+# ifndef PR_SET_THP_DISABLE
+#   define PR_SET_THP_DISABLE 41
+# endif
 #endif
 
 long page_size = 0;
 
 #ifdef HAVE_MMAP
-#define KEEP_PAGES_MAX	512
-#define KEEP_PAGES_MIN	32
-#define KEEP_PAGES_MAX_LOCAL	16
-#define ALLOC_PAGES_AT_ONCE	8
+# define KEEP_PAGES_MAX	512
+# define KEEP_PAGES_MIN	32
+# define KEEP_PAGES_MAX_LOCAL	16
+# define ALLOC_PAGES_AT_ONCE	8
 
-STATIC_ASSERT(KEEP_PAGES_MIN * 4 < KEEP_PAGES_MAX);
-STATIC_ASSERT(ALLOC_PAGES_AT_ONCE < KEEP_PAGES_MAX_LOCAL);
+  STATIC_ASSERT(KEEP_PAGES_MIN * 4 < KEEP_PAGES_MAX);
+  STATIC_ASSERT(ALLOC_PAGES_AT_ONCE < KEEP_PAGES_MAX_LOCAL);
 
-static _Bool use_fake = 0;
-static _Bool initialized = 0;
+  static _Bool use_fake = 0;
+  static _Bool initialized = 0;
 
-#if DEBUGGING
-struct free_page {
-  node unused[42];
-  struct free_page * _Atomic next;
-};
-#else
-struct free_page {
-  struct free_page * _Atomic next;
-};
-#endif
+# if DEBUGGING
+    struct free_page {
+      node unused[42];
+      struct free_page * _Atomic next;
+    };
+# else
+    struct free_page {
+      struct free_page * _Atomic next;
+    };
+# endif
 
-#define EP_POS_MAX	((page_size - OFFSETOF(struct empty_pages, pages)) / sizeof (void *))
+# define EP_POS_MAX	((page_size - OFFSETOF(struct empty_pages, pages)) / sizeof (void *))
 
-struct empty_pages {
-  struct empty_pages *next;
-  uint pos;
-  void *pages[0];
-};
+  struct empty_pages {
+    struct empty_pages *next;
+    uint pos;
+    void *pages[0];
+  };
 
-DEFINE_DOMAIN(resource);
-static DOMAIN(resource) empty_pages_domain;
-static struct empty_pages *empty_pages = NULL;
+  DEFINE_DOMAIN(resource);
+  static DOMAIN(resource) empty_pages_domain;
+  static struct empty_pages *empty_pages = NULL;
 
-static struct free_page * _Atomic page_stack = NULL;
-static _Thread_local struct free_page * local_page_stack = NULL;
+  static struct free_page * _Atomic page_stack = NULL;
+  static _Thread_local struct free_page * local_page_stack = NULL;
 
-static void page_cleanup(void *);
-static event page_cleanup_event = { .hook = page_cleanup, };
-#define SCHEDULE_CLEANUP  do if (initialized && !shutting_down) ev_send(&global_event_list, &page_cleanup_event); while (0)
+  static void page_cleanup(void *);
+  static event page_cleanup_event = { .hook = page_cleanup, };
+# define SCHEDULE_CLEANUP  do if (initialized && !shutting_down) ev_send(&global_event_list, &page_cleanup_event); while (0)
 
-_Atomic int pages_kept = 0;
-_Atomic int pages_kept_locally = 0;
-static _Thread_local int pages_kept_here = 0;
+  _Atomic int pages_kept = 0;
+  _Atomic int pages_kept_locally = 0;
+  static _Thread_local int pages_kept_here = 0;
 
-static void *
-alloc_sys_page(void)
-{
-  void *ptr = mmap(NULL, page_size * ALLOC_PAGES_AT_ONCE, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  static void *
+  alloc_sys_page(void)
+  {
+    void *ptr = mmap(NULL, page_size * ALLOC_PAGES_AT_ONCE, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
-  if (ptr == MAP_FAILED)
-    die("mmap(%ld) failed: %m", (s64) page_size);
+    if (ptr == MAP_FAILED)
+      die("mmap(%ld) failed: %m", (s64) page_size);
 
-  return ptr;
-}
+    return ptr;
+  }
 
-extern int shutting_down; /* Shutdown requested. */
+  extern int shutting_down; /* Shutdown requested. */
 
 #else // ! HAVE_MMAP
-#define use_fake  1
+# define use_fake  1
 #endif
 
 void *

From b21909c6ee9dee131a9177a003c6d97cfb6fe1e0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 1 May 2023 14:21:26 +0200
Subject: [PATCH 314/431] Debug: Explicit mprotect() on freed pages to better
 locate use-after-free bugs

---
 sysdep/unix/alloc.c | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 22b9a88c..2205f152 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -10,7 +10,6 @@
 #include "lib/resource.h"
 #include "lib/lists.h"
 #include "lib/event.h"
-#include "lib/rcu.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -41,7 +40,17 @@ long page_size = 0;
   static _Bool use_fake = 0;
   static _Bool initialized = 0;
 
+# define PROTECT_PAGE(pg)
+# define UNPROTECT_PAGE(pg)
+
 # if DEBUGGING
+#   ifdef ENABLE_EXPENSIVE_CHECKS
+#     undef PROTECT_PAGE
+#     undef UNPROTECT_PAGE
+#     define PROTECT_PAGE(pg)	mprotect((pg), page_size, PROT_READ)
+#     define UNPROTECT_PAGE(pg)	mprotect((pg), page_size, PROT_READ | PROT_WRITE)
+#   endif
+
     struct free_page {
       node unused[42];
       struct free_page * _Atomic next;
@@ -52,6 +61,8 @@ long page_size = 0;
     };
 # endif
 
+# define WRITE_NEXT(pg, val)	do { UNPROTECT_PAGE((pg)); atomic_store_explicit(&(pg)->next, (val), memory_order_release); PROTECT_PAGE((pg)); } while (0)
+
 # define EP_POS_MAX	((page_size - OFFSETOF(struct empty_pages, pages)) / sizeof (void *))
 
   struct empty_pages {
@@ -115,32 +126,37 @@ alloc_page(void)
     local_page_stack = atomic_load_explicit(&fp->next, memory_order_acquire);
     atomic_fetch_sub_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here--;
+    UNPROTECT_PAGE(fp);
     return fp;
   }
 
   ASSERT_DIE(pages_kept_here == 0);
 
   /* If there is any free page kept hot in global storage, we use it. */
-  rcu_read_lock();
   fp = atomic_load_explicit(&page_stack, memory_order_acquire);
   while (fp && !atomic_compare_exchange_strong_explicit(
 	&page_stack, &fp, atomic_load_explicit(&fp->next, memory_order_acquire),
 	memory_order_acq_rel, memory_order_acquire))
     ;
-  rcu_read_unlock();
 
   if (fp)
   {
     atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
+    UNPROTECT_PAGE(fp);
     return fp;
   }
 
   /* If there is any free page kept cold, we use that. */
   LOCK_DOMAIN(resource, empty_pages_domain);
   if (empty_pages) {
+    UNPROTECT_PAGE(empty_pages);
     if (empty_pages->pos)
+    {
       /* Either the keeper page contains at least one cold page pointer, return that */
       fp = empty_pages->pages[--empty_pages->pos];
+      PROTECT_PAGE(empty_pages);
+      UNPROTECT_PAGE(fp);
+    }
     else
     {
       /* Or the keeper page has no more cold page pointer, return the keeper page */
@@ -178,6 +194,7 @@ free_page(void *ptr)
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
     atomic_store_explicit(&fp->next, local_page_stack, memory_order_relaxed);
+    PROTECT_PAGE(fp);
     local_page_stack = fp;
 
     atomic_fetch_add_explicit(&pages_kept_locally, 1, memory_order_relaxed);
@@ -186,14 +203,15 @@ free_page(void *ptr)
   }
 
   /* If there are too many local pages, we add the free page to the global hot-free-page list */
-  rcu_read_lock();
   struct free_page *next = atomic_load_explicit(&page_stack, memory_order_acquire);
 
-  do atomic_store_explicit(&fp->next, next, memory_order_release);
+  atomic_store_explicit(&fp->next, next, memory_order_release);
+  PROTECT_PAGE(fp);
+
   while (!atomic_compare_exchange_strong_explicit(
 	&page_stack, &next, fp,
-	memory_order_acq_rel, memory_order_acquire));
-  rcu_read_unlock();
+	memory_order_acq_rel, memory_order_acquire))
+    WRITE_NEXT(fp, next);
 
   /* And if there are too many global hot free pages, we ask for page cleanup */
   if (atomic_fetch_add_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX)
@@ -223,16 +241,14 @@ flush_local_pages(void)
   ASSERT_DIE(check_count == pages_kept_here);
 
   /* Repeatedly trying to insert the whole page list into global page stack at once. */
-  rcu_read_lock();
   next = atomic_load_explicit(&page_stack, memory_order_acquire);
 
   /* First we set the outwards pointer (from our last),
    * then we try to set the inwards pointer to our first page. */
-  do atomic_store_explicit(&last->next, next, memory_order_release);
+  do WRITE_NEXT(last, next);
   while (!atomic_compare_exchange_strong_explicit(
 	&page_stack, &next, local_page_stack,
 	memory_order_acq_rel, memory_order_acquire));
-  rcu_read_unlock();
 
   /* Finished. Now the local stack is empty. */
   local_page_stack = NULL;
@@ -258,7 +274,6 @@ page_cleanup(void *_ UNUSED)
 
 
   do {
-    synchronize_rcu();
     struct free_page *fp = stack;
     stack = atomic_load_explicit(&fp->next, memory_order_acquire);
 
@@ -268,13 +283,19 @@ page_cleanup(void *_ UNUSED)
     {
       /* There is either no pointer block or the last block is full. We use this block as a pointer block. */
       empty_pages = (struct empty_pages *) fp;
+      UNPROTECT_PAGE(empty_pages);
       *empty_pages = (struct empty_pages) {};
+      PROTECT_PAGE(empty_pages);
     }
     else
     {
       /* We store this block as a pointer into the first free place
        * and tell the OS that the underlying memory is trash. */
+      UNPROTECT_PAGE(empty_pages);
       empty_pages->pages[empty_pages->pos++] = fp;
+      PROTECT_PAGE(empty_pages);
+
+      PROTECT_PAGE(fp);
       if (madvise(fp, page_size,
 #ifdef CONFIG_MADV_DONTNEED_TO_FREE
 	    MADV_DONTNEED
@@ -292,6 +313,7 @@ page_cleanup(void *_ UNUSED)
   {
     struct free_page *f = stack;
     stack = atomic_load_explicit(&f->next, memory_order_acquire);
+    UNPROTECT_PAGE(f);
     free_page(f);
 
     atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);

From 7d8e54105713ee29c03c9aea108c3a6880836dcd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 1 May 2023 15:10:53 +0200
Subject: [PATCH 315/431] Linpool state save and restore refactoring

---
 filter/tree_test.c    |  5 ++--
 lib/mempool.c         | 54 ++++++++++++++++++-------------------------
 lib/resource.h        |  6 +++--
 nest/rt-table.c       |  6 ++---
 proto/bgp/attrs.c     |  5 ++--
 proto/bgp/packets.c   | 27 +++++++++++-----------
 proto/static/static.c |  8 ++-----
 7 files changed, 47 insertions(+), 64 deletions(-)

diff --git a/filter/tree_test.c b/filter/tree_test.c
index 655205c2..8accdf58 100644
--- a/filter/tree_test.c
+++ b/filter/tree_test.c
@@ -182,8 +182,7 @@ t_balancing_random(void)
     uint i;
     for(i = 0; i < 10; i++)
     {
-      struct lp_state lps;
-      lp_save(tmp_linpool, &lps);
+      struct lp_state *lps = lp_save(tmp_linpool);
 
       struct f_tree *random_degenerated_tree = get_random_degenerated_left_tree(nodes_count);
       show_tree(random_degenerated_tree);
@@ -195,7 +194,7 @@ t_balancing_random(void)
 
       bt_assert(same_tree(balanced_tree_from_random, expected_balanced_tree));
 
-      lp_restore(tmp_linpool, &lps);
+      lp_restore(tmp_linpool, lps);
     }
 
     tmp_flush();
diff --git a/lib/mempool.c b/lib/mempool.c
index 578750c1..da1dc857 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -39,6 +39,7 @@ struct linpool {
   byte *ptr, *end;
   struct lp_chunk *first, *current;		/* Normal (reusable) chunks */
   struct lp_chunk *first_large;			/* Large chunks */
+  struct lp_state *initial;			/* Initial state to restore to */
   uint total, total_large;
 };
 
@@ -66,7 +67,9 @@ static struct resclass lp_class = {
 linpool
 *lp_new(pool *p)
 {
-  return ralloc(p, &lp_class);
+  linpool *m = ralloc(p, &lp_class);
+  m->initial = lp_save(m);
+  return m;
 }
 
 /**
@@ -185,27 +188,8 @@ lp_allocz(linpool *m, uint size)
 void
 lp_flush(linpool *m)
 {
-  ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
-  struct lp_chunk *c;
-
-  /* Move ptr to the first chunk and free all other chunks */
-  m->current = c = m->first;
-  m->ptr = c ? c->data : NULL;
-  m->end = c ? c->data + LP_DATA_SIZE : NULL;
-
-  while (c && c->next)
-  {
-    struct lp_chunk *d = c->next;
-    c->next = d->next;
-    free_page(d);
-  }
-
-  while (c = m->first_large)
-    {
-      m->first_large = c->next;
-      xfree(c);
-    }
-  m->total_large = 0;
+  lp_restore(m, m->initial);
+  m->initial = lp_save(m);
 }
 
 /**
@@ -216,14 +200,19 @@ lp_flush(linpool *m)
  * This function saves the state of a linear memory pool. Saved state can be
  * used later to restore the pool (to free memory allocated since).
  */
-void
-lp_save(linpool *m, lp_state *p)
+struct lp_state *
+lp_save(linpool *m)
 {
   ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
-  p->current = m->current;
-  p->large = m->first_large;
-  p->total_large = m->total_large;
-  p->ptr = m->ptr;
+  struct lp_state *p = lp_alloc(m, sizeof(struct lp_state));
+  ASSERT_DIE(m->current);
+  *p = (struct lp_state) {
+    .current = m->current,
+    .large = m->first_large,
+    .total_large = m->total_large,
+  };
+
+  return p;
 }
 
 /**
@@ -243,9 +232,10 @@ lp_restore(linpool *m, lp_state *p)
   ASSERT_DIE(DG_IS_LOCKED(resource_parent(&m->r)->domain));
 
   /* Move ptr to the saved pos and free all newer large chunks */
-  m->current = c = p->current ?: m->first;
-  m->ptr = p->ptr ?: (c ? c->data : NULL);
-  m->end = c ? (c->data + LP_DATA_SIZE) : NULL;
+  ASSERT_DIE(p->current);
+  m->current = c = p->current;
+  m->ptr = (byte *) p;
+  m->end = c->data + LP_DATA_SIZE;
   m->total_large = p->total_large;
 
   while ((c = m->first_large) && (c != p->large))
@@ -254,7 +244,7 @@ lp_restore(linpool *m, lp_state *p)
       xfree(c);
     }
 
-  while (m->current && (c = m->current->next))
+  while (c = m->current->next)
     {
       m->current->next = c->next;
       free_page(c);
diff --git a/lib/resource.h b/lib/resource.h
index 06af4289..abcf46fa 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -92,7 +92,6 @@ typedef struct linpool linpool;
 
 typedef struct lp_state {
   void *current, *large;
-  byte *ptr;
   uint total_large;
 } lp_state;
 
@@ -101,9 +100,12 @@ void *lp_alloc(linpool *, unsigned size);	/* Aligned */
 void *lp_allocu(linpool *, unsigned size);	/* Unaligned */
 void *lp_allocz(linpool *, unsigned size);	/* With clear */
 void lp_flush(linpool *);			/* Free everything, but leave linpool */
-void lp_save(linpool *m, lp_state *p);		/* Save state */
+lp_state *lp_save(linpool *m);			/* Save state */
 void lp_restore(linpool *m, lp_state *p);	/* Restore state */
 
+#define LP_SAVED(m)	for (struct lp_state *_lp_state = lp_save(m); _lp_state; lp_restore(m, _lp_state), _lp_state = NULL)
+#define TMP_SAVED	LP_SAVED(tmp_linpool)
+
 struct tmp_resources {
   pool *pool, *parent;
   linpool *lp;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f6d2ca0f..132057fe 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3946,10 +3946,8 @@ rt_next_hop_update(struct rtable_private *tab)
 	  birdloop_flag(tab->loop, RTF_NHU);
 	  return;
 	}
-      lp_state lps;
-      lp_save(tmp_linpool, &lps);
-      max_feed -= rt_next_hop_update_net(tab, n);
-      lp_restore(tmp_linpool, &lps);
+      TMP_SAVED
+	max_feed -= rt_next_hop_update_net(tab, n);
     }
   FIB_ITERATE_END;
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 82971c01..88639442 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2691,8 +2691,7 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n,
       continue;
 
     /* Store the tmp_linpool state to aggresively save memory */
-    struct lp_state tmpp;
-    lp_save(tmp_linpool, &tmpp);
+    struct lp_state *tmpp = lp_save(tmp_linpool);
 
     /* Mark the route as LLGR */
     rte e0 = *r;
@@ -2705,7 +2704,7 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n,
     irh->stale_set++;
 
     /* Restore the memory state */
-    lp_restore(tmp_linpool, &tmpp);
+    lp_restore(tmp_linpool, tmpp);
   }
 
   rpe_mark_seen_all(req->hook, first, last, NULL);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 978a1891..b9fc38ce 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2387,11 +2387,13 @@ bgp_create_update(struct bgp_channel *c, byte *buf)
   struct bgp_bucket *buck;
   byte *end = buf + (bgp_max_packet_length(p->conn) - BGP_HEADER_LENGTH);
   byte *res = NULL;
+  struct lp_state *tmpp = NULL;
 
-again: ;
+again:
+  if (tmpp)
+    lp_restore(tmp_linpool, tmpp);
 
-  struct lp_state tmpp;
-  lp_save(tmp_linpool, &tmpp);
+  tmpp = lp_save(tmp_linpool);
 
   /* Initialize write state */
   struct bgp_write_state s = {
@@ -2421,10 +2423,7 @@ again: ;
 
     /* Cleanup empty buckets */
     if (bgp_done_bucket(c, buck))
-    {
-      lp_restore(tmp_linpool, &tmpp);
       goto again;
-    }
 
     res = !s.mp_reach ?
       bgp_create_ip_reach(&s, buck, buf, end):
@@ -2433,21 +2432,19 @@ again: ;
     bgp_done_bucket(c, buck);
 
     if (!res)
-    {
-      lp_restore(tmp_linpool, &tmpp);
       goto again;
-    }
 
     goto done;
   }
 
   /* No more prefixes to send */
+  lp_restore(tmp_linpool, tmpp);
   return NULL;
 
 done:
   BGP_TRACE_RL(&rl_snd_update, D_PACKETS, "Sending UPDATE");
   p->stats.tx_updates++;
-  lp_restore(tmp_linpool, &tmpp);
+  lp_restore(tmp_linpool, tmpp);
 
   return res;
 }
@@ -2574,8 +2571,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
 
   bgp_start_timer(p, conn->hold_timer, conn->hold_time);
 
-  struct lp_state tmpp;
-  lp_save(tmp_linpool, &tmpp);
+  struct lp_state *tmpp = lp_save(tmp_linpool);
 
   /* Initialize parse state */
   struct bgp_parse_state s = {
@@ -2593,7 +2589,10 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
 
   /* Check minimal length */
   if (len < 23)
-  { bgp_error(conn, 1, 2, pkt+16, 2); return; }
+  {
+    bgp_error(conn, 1, 2, pkt+16, 2);
+    goto done;
+  }
 
   /* Skip fixed header */
   uint pos = 19;
@@ -2658,7 +2657,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len)
 
 done:
   rta_free(s.cached_ea);
-  lp_restore(tmp_linpool, &tmpp);
+  lp_restore(tmp_linpool, tmpp);
   return;
 }
 
diff --git a/proto/static/static.c b/proto/static/static.c
index 6bae827b..74603a93 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -494,12 +494,8 @@ static_start(struct proto *P)
   proto_notify_state(P, PS_UP);
 
   WALK_LIST(r, cf->routes)
-  {
-    struct lp_state lps;
-    lp_save(tmp_linpool, &lps);
-    static_add_rte(p, r);
-    lp_restore(tmp_linpool, &lps);
-  }
+    TMP_SAVED
+      static_add_rte(p, r);
 
   return PS_UP;
 }

From ed91d884d3f31eb0185c68d4cf1237cf56ed579e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 1 May 2023 14:20:27 +0200
Subject: [PATCH 316/431] Hostentry: fix pool locking

---
 nest/rt-table.c | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 132057fe..ef740562 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4592,34 +4592,28 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
 {
   struct hostcache *hc = SKIP_BACK(struct hostcache, req, req);
 
-  /* No interest in this update, mark seen only */
-  int interested = 1;
   RT_LOCKED((rtable *) hc->update.data, tab)
     if (ev_active(&hc->update) || !trie_match_net(hc->trie, net))
-    {
+      /* No interest in this update, mark seen only */
       rpe_mark_seen_all(req->hook, first, NULL, NULL);
-      interested = 0;
-    }
+    else
+    {
+      /* This net may affect some hostentries, check the actual change */
+      rte *o = RTE_VALID_OR_NULL(first->old_best);
+      struct rte_storage *new_best = first->new_best;
 
-  if (!interested)
-    return;
+      RPE_WALK(first, rpe, NULL)
+      {
+	rpe_mark_seen(req->hook, rpe);
+	new_best = rpe->new_best;
+      }
 
-  /* This net may affect some hostentries, check the actual change */
-  rte *o = RTE_VALID_OR_NULL(first->old_best);
-  struct rte_storage *new_best = first->new_best;
-
-  RPE_WALK(first, rpe, NULL)
-  {
-    rpe_mark_seen(req->hook, rpe);
-    new_best = rpe->new_best;
-  }
-
-  /* Yes, something has actually changed. Do the hostcache update. */
-  if (o != RTE_VALID_OR_NULL(new_best))
-    RT_LOCKED((rtable *) hc->update.data, tab)
-      if ((atomic_load_explicit(&req->hook->export_state, memory_order_acquire) == TES_READY)
+      /* Yes, something has actually changed. Do the hostcache update. */
+      if ((o != RTE_VALID_OR_NULL(new_best))
+	  && (atomic_load_explicit(&req->hook->export_state, memory_order_acquire) == TES_READY)
 	  && !ev_active(&hc->update))
 	ev_send_loop(tab->loop, &hc->update);
+    }
 }
 
 

From 1e998a434909b6ad5506c4b0084b7ad1ef3da2b1 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 3 May 2023 18:59:52 +0200
Subject: [PATCH 317/431] Fixed cold page cache leak

The empty_pages pointer wasn't being propagated into the ->next pointer
when more empty_pages were to be stored
---
 sysdep/unix/alloc.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 2205f152..891a0e69 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -282,10 +282,13 @@ page_cleanup(void *_ UNUSED)
     if (!empty_pages || (empty_pages->pos == EP_POS_MAX))
     {
       /* There is either no pointer block or the last block is full. We use this block as a pointer block. */
-      empty_pages = (struct empty_pages *) fp;
-      UNPROTECT_PAGE(empty_pages);
-      *empty_pages = (struct empty_pages) {};
-      PROTECT_PAGE(empty_pages);
+      struct empty_pages *ep = (struct empty_pages *) fp;
+      UNPROTECT_PAGE(ep);
+      *ep = (struct empty_pages) {
+	.next = empty_pages,
+      };
+      PROTECT_PAGE(ep);
+      empty_pages = ep;
     }
     else
     {

From 00f30ac40bda76b289b1dc5c5aa8a5d2e4941985 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 3 May 2023 19:01:19 +0200
Subject: [PATCH 318/431] Debug: keep a circular log of memory page operations

---
 lib/birdlib.h       |  2 ++
 sysdep/unix/alloc.c | 80 ++++++++++++++++++++++++++++++++++++++++++---
 sysdep/unix/log.c   |  2 +-
 3 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 3f65b8c2..9132fb93 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -183,6 +183,8 @@ void bug(const char *msg, ...) NORET;
 void debug(const char *msg, ...);	/* Printf to debug output */
 void debug_safe(const char *msg);	/* Printf to debug output, async-safe */
 
+extern _Thread_local uint this_thread_id;
+
 /* Debugging */
 
 #if defined(LOCAL_DEBUG) || defined(GLOBAL_DEBUG)
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 891a0e69..b7566f96 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -51,14 +51,62 @@ long page_size = 0;
 #     define UNPROTECT_PAGE(pg)	mprotect((pg), page_size, PROT_READ | PROT_WRITE)
 #   endif
 
+#   define AJSIZE	16384
+
+    static struct alloc_journal {
+      void *fp;
+      void *next;
+      u16 pos;
+      u16 type;
+      uint thread_id;
+    } alloc_journal[AJSIZE];
+
+    _Thread_local int alloc_journal_local_pos = -1;
+    _Atomic int alloc_journal_pos = 0;
+
+#   define AJT_ALLOC_LOCAL_HOT		1
+#   define AJT_ALLOC_GLOBAL_HOT		2
+#   define AJT_ALLOC_COLD_STD		3
+#   define AJT_ALLOC_COLD_KEEPER	4
+#   define AJT_ALLOC_MMAP		5
+
+#   define AJT_FREE_LOCAL_HOT		0x11
+#   define AJT_FREE_GLOBAL_HOT		0x12
+
+#   define AJT_CLEANUP_NOTHING		0xc0
+#   define AJT_CLEANUP_COLD_STD		0xc3
+#   define AJT_CLEANUP_COLD_KEEPER	0xc4
+#   define AJT_CLEANUP_BEGIN		0xcb
+#   define AJT_CLEANUP_END		0xce
+
+#   define AJT_FLUSH_LOCAL_BEGIN	0xfb
+#   define AJT_FLUSH_LOCAL_END		0xfe
+#   define AJT_SCHEDULE_CLEANUP		0xff
+
+    static void
+    ajlog(void *fp, void *next, u16 pos, u16 type)
+    {
+      alloc_journal[(alloc_journal_local_pos = atomic_fetch_add_explicit(&alloc_journal_pos, 1, memory_order_relaxed)) % AJSIZE] = (struct alloc_journal) {
+	.fp = fp,
+	.next = next,
+	.pos = pos,
+	.type = type,
+	.thread_id = this_thread_id,
+      };
+    }
+
     struct free_page {
       node unused[42];
       struct free_page * _Atomic next;
     };
-# else
+# else /* ! DEBUGGING */
+
+#   define ajlog(...)
+
     struct free_page {
       struct free_page * _Atomic next;
     };
+
 # endif
 
 # define WRITE_NEXT(pg, val)	do { UNPROTECT_PAGE((pg)); atomic_store_explicit(&(pg)->next, (val), memory_order_release); PROTECT_PAGE((pg)); } while (0)
@@ -127,6 +175,7 @@ alloc_page(void)
     atomic_fetch_sub_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here--;
     UNPROTECT_PAGE(fp);
+    ajlog(fp, local_page_stack, pages_kept_here, AJT_ALLOC_LOCAL_HOT);
     return fp;
   }
 
@@ -141,8 +190,9 @@ alloc_page(void)
 
   if (fp)
   {
-    atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
+    uint pk = atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
     UNPROTECT_PAGE(fp);
+    ajlog(fp, atomic_load_explicit(&fp->next, memory_order_relaxed), pk, AJT_ALLOC_GLOBAL_HOT);
     return fp;
   }
 
@@ -156,12 +206,14 @@ alloc_page(void)
       fp = empty_pages->pages[--empty_pages->pos];
       PROTECT_PAGE(empty_pages);
       UNPROTECT_PAGE(fp);
+      ajlog(fp, empty_pages, empty_pages->pos, AJT_ALLOC_COLD_STD);
     }
     else
     {
       /* Or the keeper page has no more cold page pointer, return the keeper page */
       fp = (struct free_page *) empty_pages;
       empty_pages = empty_pages->next;
+      ajlog(fp, empty_pages, 0, AJT_ALLOC_COLD_KEEPER);
     }
   }
   UNLOCK_DOMAIN(resource, empty_pages_domain);
@@ -171,6 +223,8 @@ alloc_page(void)
 
   /* And in the worst case, allocate some new pages by mmap() */
   void *ptr = alloc_sys_page();
+  ajlog(ptr, NULL, 0, AJT_ALLOC_MMAP);
+
   for (int i=1; i<ALLOC_PAGES_AT_ONCE; i++)
     free_page(ptr + page_size * i);
 
@@ -193,12 +247,14 @@ free_page(void *ptr)
   struct free_page *fp = ptr;
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
-    atomic_store_explicit(&fp->next, local_page_stack, memory_order_relaxed);
+    struct free_page *next = local_page_stack;
+    atomic_store_explicit(&fp->next, next, memory_order_relaxed);
     PROTECT_PAGE(fp);
     local_page_stack = fp;
 
     atomic_fetch_add_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here++;
+    ajlog(fp, next, pages_kept_here, AJT_FREE_LOCAL_HOT);
     return;
   }
 
@@ -213,8 +269,11 @@ free_page(void *ptr)
 	memory_order_acq_rel, memory_order_acquire))
     WRITE_NEXT(fp, next);
 
+  uint pk = atomic_fetch_add_explicit(&pages_kept, 1, memory_order_relaxed);
+  ajlog(fp, next, pk, AJT_FREE_GLOBAL_HOT);
+
   /* And if there are too many global hot free pages, we ask for page cleanup */
-  if (atomic_fetch_add_explicit(&pages_kept, 1, memory_order_relaxed) >= KEEP_PAGES_MAX)
+  if (pk >= KEEP_PAGES_MAX)
     SCHEDULE_CLEANUP;
 #endif
 }
@@ -227,6 +286,8 @@ flush_local_pages(void)
   if (use_fake || !local_page_stack || shutting_down)
     return;
 
+  ajlog(local_page_stack, NULL, pages_kept_here, AJT_FLUSH_LOCAL_BEGIN);
+
   /* We first count the pages to enable consistency checking.
    * Also, we need to know the last page. */
   struct free_page *last = local_page_stack, *next;
@@ -254,6 +315,8 @@ flush_local_pages(void)
   local_page_stack = NULL;
   pages_kept_here = 0;
 
+  ajlog(NULL, NULL, 0, AJT_FLUSH_LOCAL_END);
+
   /* Check the state of global page cache and maybe schedule its cleanup. */
   atomic_fetch_sub_explicit(&pages_kept_locally, check_count, memory_order_relaxed);
   if (atomic_fetch_add_explicit(&pages_kept, check_count, memory_order_relaxed) >= KEEP_PAGES_MAX)
@@ -268,10 +331,14 @@ page_cleanup(void *_ UNUSED)
   if (shutting_down)
     return;
 
+  ajlog(NULL, NULL, 0, AJT_CLEANUP_BEGIN);
+
   struct free_page *stack = atomic_exchange_explicit(&page_stack, NULL, memory_order_acq_rel);
   if (!stack)
+  {
+    ajlog(NULL, NULL, 0, AJT_CLEANUP_NOTHING);
     return;
-
+  }
 
   do {
     struct free_page *fp = stack;
@@ -289,6 +356,7 @@ page_cleanup(void *_ UNUSED)
       };
       PROTECT_PAGE(ep);
       empty_pages = ep;
+      ajlog(empty_pages, empty_pages->next, 0, AJT_CLEANUP_COLD_KEEPER);
     }
     else
     {
@@ -307,6 +375,7 @@ page_cleanup(void *_ UNUSED)
 #endif
 	    ) < 0)
 	bug("madvise(%p) failed: %m", fp);
+      ajlog(fp, empty_pages, empty_pages->pos, AJT_CLEANUP_COLD_STD);
     }
     UNLOCK_DOMAIN(resource, empty_pages_domain);
   }
@@ -321,6 +390,7 @@ page_cleanup(void *_ UNUSED)
 
     atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
   }
+  ajlog(NULL, NULL, 0, AJT_CLEANUP_END);
 }
 #endif
 
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index be7f8adf..c200db38 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -38,7 +38,7 @@ static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
 static _Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
-static _Thread_local uint this_thread_id;
+_Thread_local uint this_thread_id;
 
 #define THIS_THREAD_ID  (this_thread_id ?: (this_thread_id = atomic_fetch_add_explicit(&max_thread_id, 1, memory_order_acq_rel)))
 

From a95141111c89803347c36501185a76fc73a9764a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 5 May 2023 09:39:13 +0200
Subject: [PATCH 319/431] Fixed a bug in hot page global storage

The original algorithm was suffering from an ABA race condition:

A: fp = page_stack
B: completely allocates the same page and writes into it some data
A: unsuspecting, loads (invalid) next = fp->next
B: finishes working with the page and returns it back to page_stack
A: compare-exchange page_stack: fp => next succeeds and writes garbage
to page_stack

Fixed this by using an implicit spinlock in hot page allocator.
---
 lib/birdlib.h            |  4 ++
 sysdep/unix/Makefile     |  3 ++
 sysdep/unix/alloc.c      | 80 +++++++++++++++++++++++-----------------
 sysdep/unix/alloc_test.c | 74 +++++++++++++++++++++++++++++++++++++
 sysdep/unix/log.c        |  4 +-
 5 files changed, 128 insertions(+), 37 deletions(-)
 create mode 100644 sysdep/unix/alloc_test.c

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 9132fb93..2eec5c0f 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -183,7 +183,11 @@ void bug(const char *msg, ...) NORET;
 void debug(const char *msg, ...);	/* Printf to debug output */
 void debug_safe(const char *msg);	/* Printf to debug output, async-safe */
 
+/* Internal thread ID, useful for logging */
+extern _Atomic uint max_thread_id;
 extern _Thread_local uint this_thread_id;
+#define THIS_THREAD_ID  (this_thread_id ?: (this_thread_id = atomic_fetch_add_explicit(&max_thread_id, 1, memory_order_acq_rel)))
+
 
 /* Debugging */
 
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index 6f6b0d26..efbf3c70 100644
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -5,4 +5,7 @@ $(cf-local)
 $(conf-y-targets): $(s)krt.Y
 
 src := $(filter-out main.c, $(src))
+
+tests_src := alloc_test.c
+tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index b7566f96..56e755db 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -10,6 +10,7 @@
 #include "lib/resource.h"
 #include "lib/lists.h"
 #include "lib/event.h"
+#include "lib/io-loop.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -91,7 +92,7 @@ long page_size = 0;
 	.next = next,
 	.pos = pos,
 	.type = type,
-	.thread_id = this_thread_id,
+	.thread_id = THIS_THREAD_ID,
       };
     }
 
@@ -104,12 +105,12 @@ long page_size = 0;
 #   define ajlog(...)
 
     struct free_page {
-      struct free_page * _Atomic next;
+      struct free_page *next;
     };
 
 # endif
 
-# define WRITE_NEXT(pg, val)	do { UNPROTECT_PAGE((pg)); atomic_store_explicit(&(pg)->next, (val), memory_order_release); PROTECT_PAGE((pg)); } while (0)
+# define WRITE_NEXT(pg, val)	do { UNPROTECT_PAGE((pg)); (pg)->next = (val); PROTECT_PAGE((pg)); } while (0)
 
 # define EP_POS_MAX	((page_size - OFFSETOF(struct empty_pages, pages)) / sizeof (void *))
 
@@ -125,6 +126,15 @@ long page_size = 0;
 
   static struct free_page * _Atomic page_stack = NULL;
   static _Thread_local struct free_page * local_page_stack = NULL;
+  static struct free_page page_stack_blocked;
+
+  /* Try to replace the page stack head with a cork, until it succeeds. */
+# define PAGE_STACK_GET	({ \
+    struct free_page *fp; \
+    while ((fp = atomic_exchange_explicit(&page_stack, &page_stack_blocked, memory_order_acq_rel)) == &page_stack_blocked) birdloop_yield(); \
+    fp; })
+  /* Reinstate the stack with another value */
+# define PAGE_STACK_PUT(val)	ASSERT_DIE(atomic_exchange_explicit(&page_stack, (val), memory_order_acq_rel) == &page_stack_blocked)
 
   static void page_cleanup(void *);
   static event page_cleanup_event = { .hook = page_cleanup, };
@@ -171,7 +181,7 @@ alloc_page(void)
   struct free_page *fp = local_page_stack;
   if (fp)
   {
-    local_page_stack = atomic_load_explicit(&fp->next, memory_order_acquire);
+    local_page_stack = fp->next;
     atomic_fetch_sub_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here--;
     UNPROTECT_PAGE(fp);
@@ -182,20 +192,23 @@ alloc_page(void)
   ASSERT_DIE(pages_kept_here == 0);
 
   /* If there is any free page kept hot in global storage, we use it. */
-  fp = atomic_load_explicit(&page_stack, memory_order_acquire);
-  while (fp && !atomic_compare_exchange_strong_explicit(
-	&page_stack, &fp, atomic_load_explicit(&fp->next, memory_order_acquire),
-	memory_order_acq_rel, memory_order_acquire))
-    ;
-
-  if (fp)
+  if (fp = PAGE_STACK_GET)
   {
-    uint pk = atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
+    /* Reinstate the stack with the next page in list */
+    PAGE_STACK_PUT(fp->next);
+
+    /* Update the counters */
+    UNUSED uint pk = atomic_fetch_sub_explicit(&pages_kept, 1, memory_order_relaxed);
+
+    /* Release the page */
     UNPROTECT_PAGE(fp);
-    ajlog(fp, atomic_load_explicit(&fp->next, memory_order_relaxed), pk, AJT_ALLOC_GLOBAL_HOT);
+    ajlog(fp, fp->next, pk, AJT_ALLOC_GLOBAL_HOT);
     return fp;
   }
 
+  /* Reinstate the stack with zero */
+  PAGE_STACK_PUT(NULL);
+
   /* If there is any free page kept cold, we use that. */
   LOCK_DOMAIN(resource, empty_pages_domain);
   if (empty_pages) {
@@ -247,8 +260,7 @@ free_page(void *ptr)
   struct free_page *fp = ptr;
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
-    struct free_page *next = local_page_stack;
-    atomic_store_explicit(&fp->next, next, memory_order_relaxed);
+    UNUSED struct free_page *next = fp->next = local_page_stack;
     PROTECT_PAGE(fp);
     local_page_stack = fp;
 
@@ -259,16 +271,13 @@ free_page(void *ptr)
   }
 
   /* If there are too many local pages, we add the free page to the global hot-free-page list */
-  struct free_page *next = atomic_load_explicit(&page_stack, memory_order_acquire);
-
-  atomic_store_explicit(&fp->next, next, memory_order_release);
+  UNUSED struct free_page *next = fp->next = PAGE_STACK_GET;
   PROTECT_PAGE(fp);
 
-  while (!atomic_compare_exchange_strong_explicit(
-	&page_stack, &next, fp,
-	memory_order_acq_rel, memory_order_acquire))
-    WRITE_NEXT(fp, next);
+  /* Unblock the stack with the page being freed */
+  PAGE_STACK_PUT(fp);
 
+  /* Update counters */
   uint pk = atomic_fetch_add_explicit(&pages_kept, 1, memory_order_relaxed);
   ajlog(fp, next, pk, AJT_FREE_GLOBAL_HOT);
 
@@ -292,7 +301,7 @@ flush_local_pages(void)
    * Also, we need to know the last page. */
   struct free_page *last = local_page_stack, *next;
   int check_count = 1;
-  while (next = atomic_load_explicit(&last->next, memory_order_acquire))
+  while (next = last->next)
   {
     check_count++;
     last = next;
@@ -301,15 +310,13 @@ flush_local_pages(void)
   /* The actual number of pages must be equal to the counter value. */
   ASSERT_DIE(check_count == pages_kept_here);
 
-  /* Repeatedly trying to insert the whole page list into global page stack at once. */
-  next = atomic_load_explicit(&page_stack, memory_order_acquire);
+  /* Block the stack by a cork */
+  UNPROTECT_PAGE(last);
+  last->next = PAGE_STACK_GET;
+  PROTECT_PAGE(last);
 
-  /* First we set the outwards pointer (from our last),
-   * then we try to set the inwards pointer to our first page. */
-  do WRITE_NEXT(last, next);
-  while (!atomic_compare_exchange_strong_explicit(
-	&page_stack, &next, local_page_stack,
-	memory_order_acq_rel, memory_order_acquire));
+  /* Update the stack */
+  PAGE_STACK_PUT(last);
 
   /* Finished. Now the local stack is empty. */
   local_page_stack = NULL;
@@ -333,7 +340,12 @@ page_cleanup(void *_ UNUSED)
 
   ajlog(NULL, NULL, 0, AJT_CLEANUP_BEGIN);
 
-  struct free_page *stack = atomic_exchange_explicit(&page_stack, NULL, memory_order_acq_rel);
+  /* Prevent contention */
+  struct free_page *stack = PAGE_STACK_GET;
+
+  /* Always replace by zero */
+  PAGE_STACK_PUT(NULL);
+
   if (!stack)
   {
     ajlog(NULL, NULL, 0, AJT_CLEANUP_NOTHING);
@@ -342,7 +354,7 @@ page_cleanup(void *_ UNUSED)
 
   do {
     struct free_page *fp = stack;
-    stack = atomic_load_explicit(&fp->next, memory_order_acquire);
+    stack = fp->next;
 
     LOCK_DOMAIN(resource, empty_pages_domain);
     /* Empty pages are stored as pointers. To store them, we need a pointer block. */
@@ -384,7 +396,7 @@ page_cleanup(void *_ UNUSED)
   while (stack)
   {
     struct free_page *f = stack;
-    stack = atomic_load_explicit(&f->next, memory_order_acquire);
+    stack = f->next;
     UNPROTECT_PAGE(f);
     free_page(f);
 
diff --git a/sysdep/unix/alloc_test.c b/sysdep/unix/alloc_test.c
new file mode 100644
index 00000000..202af2b2
--- /dev/null
+++ b/sysdep/unix/alloc_test.c
@@ -0,0 +1,74 @@
+/*
+ *	BIRD -- Allocator Tests
+ *
+ *	(c) 2023       CZ.NIC z.s.p.o.
+ *	(c) 2023       Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "test/birdtest.h"
+#include "test/bt-utils.h"
+#include "lib/resource.h"
+
+#include <unistd.h>
+#include <pthread.h>
+
+#define ALLOC_AND_TREE_LIMIT	(1 << 14)
+
+static void *
+alloc_and_free_main(void *data UNUSED)
+{
+#define BLOCK_SIZE	32
+  void *block[BLOCK_SIZE];
+
+  for (int i=0; i<ALLOC_AND_TREE_LIMIT; i++)
+  {
+    for (int b=0; b<BLOCK_SIZE; b++)
+    {
+      block[b] = alloc_page();
+      ASSERT_DIE(PAGE_HEAD(block[b]) == block[b]);
+      memset(block[b], 0x42, page_size);
+    }
+
+    for (int b=0; b<BLOCK_SIZE; b++)
+    {
+      free_page(block[b]);
+      block[b] = alloc_page();
+      ASSERT_DIE(PAGE_HEAD(block[b]) == block[b]);
+      memset(block[b], 0x53, page_size); 
+    }
+
+    for (int b=0; b<BLOCK_SIZE; b++)
+      free_page(block[b]);
+  }
+
+  return NULL;
+}
+
+static int
+t_alloc_and_free(void)
+{
+#define THR_N	16
+  pthread_t tid[THR_N];
+
+  for (int i=0; i<THR_N; i++)
+  {
+    pthread_create(&tid[i], NULL, alloc_and_free_main, NULL);
+    usleep(50 * i);
+  }
+
+  for (int i=0; i<THR_N; i++)
+    pthread_join(tid[i], NULL);
+
+  return 1;
+}
+
+int main(int argc, char **argv)
+{
+  bt_init(argc, argv);
+  
+  bt_test_suite(t_alloc_and_free, "Testing parallel allocations and free");
+
+  return bt_exit_value();
+}
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index c200db38..d929e80e 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -37,11 +37,9 @@ static FILE *dbgf;
 static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
-static _Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
+_Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
 _Thread_local uint this_thread_id;
 
-#define THIS_THREAD_ID  (this_thread_id ?: (this_thread_id = atomic_fetch_add_explicit(&max_thread_id, 1, memory_order_acq_rel)))
-
 #include <pthread.h>
 
 static pthread_mutex_t log_mutex;

From e0c09e6bee8e9bd8686d8165d819a488dc3e09f8 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 5 May 2023 15:19:14 +0200
Subject: [PATCH 320/431] Fix loop dropping routines

---
 sysdep/unix/io-loop.c | 110 +++++++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 49 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index cf54a511..594709d4 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -631,14 +631,12 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   /* Put into appropriate lists */
   if (thr)
   {
-    add_tail(&thr->loops, &loop->n);
     thr->loop_count++;
+    add_tail(&thr->loops, &loop->n);
     ev_send_loop(loop->thread->meta, &loop->event);
   }
   else
   {
-    old->loop_count--;
-
     /* Unschedule from Meta */
     ev_postpone(&loop->event);
     tm_stop(&loop->timer);
@@ -686,18 +684,27 @@ birdloop_take(struct birdloop_pickup_group *group)
   if (drop)
   {
     UNLOCK_DOMAIN(resource, group->domain);
+
     node *n;
     WALK_LIST2(loop, n, this_thread->loops, n)
+    {
+      birdloop_enter(loop);
       if (ev_active(&loop->event))
       {
 	LOOP_TRACE(loop, "Moving to another thread");
-
 	/* Pass to another thread */
 	rem_node(&loop->n);
+	this_thread->loop_count--;
+
+	/* This also unschedules the loop from Meta */
 	birdloop_set_thread(loop, NULL, group);
+
+	birdloop_leave(loop);
 	bird_thread_pickup_next(group);
 	break;
       }
+      birdloop_leave(loop);
+    }
 
     return NULL;
   }
@@ -731,37 +738,36 @@ poll_timeout(struct birdloop *loop)
 }
 
 static void
-bird_thread_busy_update(struct bird_thread *thr, int val)
+bird_thread_busy_set(struct bird_thread *thr, int val)
 {
-  if (thr->busy_active == val)
-    return;
-
-  if (val)
-    thr->busy_counter++;
-  else
-    thr->busy_counter--;
-
-  switch (thr->busy_counter)
-  {
-    case 0:
-      thr->busy_active = 0;
-      break;
-    case 4:
-      thr->busy_active = 1;
-      break;
-
-    default:
-      return;
-  }
-
   LOCK_DOMAIN(resource, thr->group->domain);
-  if (val)
+  if (thr->busy_active = val)
     thr->group->thread_busy_count++;
   else
     thr->group->thread_busy_count--;
+  ASSERT_DIE(thr->group->thread_busy_count <= thr->group->thread_count);
   UNLOCK_DOMAIN(resource, thr->group->domain);
 }
 
+static void
+bird_thread_busy_update(struct bird_thread *thr, int timeout_ms)
+{
+  int idle_force = (timeout_ms < 0);
+  int val = (timeout_ms < 5) && !idle_force;
+
+  if (val == thr->busy_active)
+    return;
+
+  if (val && (++thr->busy_counter == 4))
+    return bird_thread_busy_set(thr, 1);
+
+  if (!val && (idle_force || (--thr->busy_counter == 0)))
+  {
+    thr->busy_counter = 0;
+    bird_thread_busy_set(thr, 0);
+  }
+}
+
 static void *
 bird_thread_main(void *arg)
 {
@@ -847,10 +853,10 @@ bird_thread_main(void *arg)
       ASSERT_DIE(pfd.loop.used == pfd.pfd.used);
     }
     /* Nothing to do in at least 5 seconds, flush local hot page cache */
-    else if (timeout > 5000)
+    else if ((timeout > 5000) && (timeout < 0))
       flush_local_pages();
 
-    bird_thread_busy_update(thr, (timeout == 0));
+    bird_thread_busy_update(thr, timeout);
 
     account_to(&this_thread->idle);
 poll_retry:;
@@ -893,11 +899,12 @@ bird_thread_cleanup(void *_thr)
   struct bird_thread *thr = _thr;
   ASSERT_DIE(birdloop_inside(&main_birdloop));
 
+  /* Free the meta loop */
+  thr->meta->thread = NULL;
+  birdloop_free(thr->meta);
+
   /* Thread attributes no longer needed */
   pthread_attr_destroy(&thr->thread_attr);
-
-  /* Free all remaining memory */
-  rp_free(thr->pool);
 }
 
 static struct bird_thread *
@@ -958,6 +965,13 @@ static struct birdloop *thread_dropper;
 static event *thread_dropper_event;
 static uint thread_dropper_goal;
 
+static void
+bird_thread_dropper_free(void *data)
+{
+  struct birdloop *tdl_stop = data;
+  birdloop_free(tdl_stop);
+}
+
 static void
 bird_thread_shutdown(void * _ UNUSED)
 {
@@ -980,35 +994,37 @@ bird_thread_shutdown(void * _ UNUSED)
 
   if (tdl_stop)
   {
-    birdloop_stop_self(tdl_stop, NULL, NULL);
+    birdloop_stop_self(tdl_stop, bird_thread_dropper_free, tdl_stop);
     return;
   }
 
   struct bird_thread *thr = this_thread;
 
-  /* Leave the thread-picker list to get no more loops */
   LOCK_DOMAIN(resource, group->domain);
+  /* Leave the thread-picker list to get no more loops */
   rem_node(&thr->n);
   group->thread_count--;
+
+  /* Fix the busy count */
+  if (thr->busy_active)
+    group->thread_busy_count--;
+
   UNLOCK_DOMAIN(resource, group->domain);
 
+  /* Leave the thread-dropper loop as we aren't going to return. */
+  birdloop_leave(thread_dropper);
+
   /* Drop loops including the thread dropper itself */
   while (!EMPTY_LIST(thr->loops))
   {
     struct birdloop *loop = HEAD(thr->loops);
 
     /* Remove loop from this thread's list */
+    this_thread->loop_count--;
     rem_node(&loop->n);
 
     /* Unset loop's thread */
-    if (birdloop_inside(loop))
-      birdloop_set_thread(loop, NULL, group);
-    else
-    {
-      birdloop_enter(loop);
-      birdloop_set_thread(loop, NULL, group);
-      birdloop_leave(loop);
-    }
+    birdloop_set_thread(loop, NULL, group);
   }
 
   /* Let others know about new loops */
@@ -1017,13 +1033,8 @@ bird_thread_shutdown(void * _ UNUSED)
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
   UNLOCK_DOMAIN(resource, group->domain);
 
-  /* Leave the thread-dropper loop as we aren't going to return. */
-  birdloop_leave(thread_dropper);
-
   /* Stop the meta loop */
   birdloop_leave(thr->meta);
-  domain_free(thr->meta->time.domain);
-  rp_free(thr->meta->pool);
 
   /* Local pages not needed anymore */
   flush_local_pages();
@@ -1038,7 +1049,6 @@ bird_thread_shutdown(void * _ UNUSED)
   pthread_exit(NULL);
 }
 
-
 void
 bird_thread_commit(struct config *new, struct config *old UNUSED)
 {
@@ -1069,6 +1079,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
     if ((dif > 0) && !thread_dropper_running)
     {
       struct birdloop *tdl = birdloop_new(&root_pool, DOMAIN_ORDER(control), group->max_latency, "Thread dropper");
+      birdloop_enter(tdl);
       event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
 
       LOCK_DOMAIN(resource, group->domain);
@@ -1077,6 +1088,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
       UNLOCK_DOMAIN(resource, group->domain);
 
       ev_send_loop(thread_dropper, thread_dropper_event);
+      birdloop_leave(tdl);
     }
 
     return;
@@ -1148,7 +1160,7 @@ bird_thread_show(void *data)
 
   LOCK_DOMAIN(control, tsd->lock);
   if (tsd->show_loops)
-    tsd_append("Thread %p", this_thread);
+    tsd_append("Thread %p%s (busy counter %d)", this_thread, this_thread->busy_active ? " [busy]" : "", this_thread->busy_counter);
 
   u64 total_time_ns = 0;
   struct birdloop *loop;

From 62432affd97b94f257471bd562fc6c680d5a79c3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 5 May 2023 16:08:50 +0200
Subject: [PATCH 321/431] Fixed loop movement to not collide on LTT_MOVE

---
 sysdep/unix/io-loop.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 594709d4..a923267c 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -355,7 +355,7 @@ birdloop_try_ping(struct birdloop *loop, u32 ltt)
     return 1;
   }
 
-  /* Do the real ping */
+  /* Do the real ping of Meta or Main */
   LOOP_TRACE(loop, "sending pipe ping");
   wakeup_do_kick(loop->thread);
   return 0;
@@ -617,6 +617,7 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   u32 ltt = atomic_fetch_or_explicit(&loop->thread_transition, LTT_MOVE, memory_order_acq_rel);
   ASSERT_DIE((ltt & LTT_MOVE) == 0);
 
+  /* Wait until all previously started pings end */
   while (ltt & LTT_PING)
   {
     birdloop_yield();
@@ -625,9 +626,22 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   }
   /* Now we are free of running pings */
 
+  if (!thr)
+  {
+    /* Unschedule from Meta */
+    ev_postpone(&loop->event);
+    tm_stop(&loop->timer);
+
+    /* Request local socket reload */
+    this_thread->sock_changed = 1;
+  }
+
   /* Update the thread value */
   loop->thread = thr;
 
+  /* Allow pings */
+  atomic_fetch_and_explicit(&loop->thread_transition, ~LTT_MOVE, memory_order_acq_rel);
+
   /* Put into appropriate lists */
   if (thr)
   {
@@ -637,21 +651,11 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   }
   else
   {
-    /* Unschedule from Meta */
-    ev_postpone(&loop->event);
-    tm_stop(&loop->timer);
-
-    /* Request local socket reload */
-    this_thread->sock_changed = 1;
-
     /* Put into pickup list */
     LOCK_DOMAIN(resource, group->domain);
     add_tail(&group->loops, &loop->n);
     UNLOCK_DOMAIN(resource, group->domain);
   }
-
-  /* Allow pings */
-  atomic_fetch_and_explicit(&loop->thread_transition, ~LTT_MOVE, memory_order_acq_rel);
 }
 
 static void
@@ -878,6 +882,7 @@ poll_retry:;
       wakeup_drain(thr);
     }
 
+    /* Unset ping information for Meta */
     atomic_fetch_and_explicit(&thr->meta->thread_transition, ~LTT_PING, memory_order_acq_rel);
 
     /* Schedule loops with active sockets */

From cb51ff1fbb83c15fece1f6c4fa3e538dc137d186 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 5 May 2023 20:35:55 +0200
Subject: [PATCH 322/431] IO Loop / Thread Groups Lock moved to level -attrs-
 to allow for page allocation while locked

---
 sysdep/unix/io-loop.c | 72 +++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index a923267c..751f882f 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -581,11 +581,11 @@ sockets_fire(struct birdloop *loop)
  *	Threads
  */
 
-DEFINE_DOMAIN(resource);
+DEFINE_DOMAIN(attrs);
 static void bird_thread_start_event(void *_data);
 
 struct birdloop_pickup_group {
-  DOMAIN(resource) domain;
+  DOMAIN(attrs) domain;
   list loops;
   list threads;
   uint thread_count;
@@ -652,9 +652,9 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   else
   {
     /* Put into pickup list */
-    LOCK_DOMAIN(resource, group->domain);
+    LOCK_DOMAIN(attrs, group->domain);
     add_tail(&group->loops, &loop->n);
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
   }
 }
 
@@ -662,14 +662,14 @@ static void
 bird_thread_pickup_next(struct birdloop_pickup_group *group)
 {
   /* This thread goes to the end of the pickup list */
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
   rem_node(&this_thread->n);
   add_tail(&group->threads, &this_thread->n);
 
   /* If there are more loops to be picked up, wakeup the next thread in order */
   if (!EMPTY_LIST(group->loops))
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
-  UNLOCK_DOMAIN(resource, group->domain);
+  UNLOCK_DOMAIN(attrs, group->domain);
 }
 
 static struct birdloop *
@@ -677,7 +677,7 @@ birdloop_take(struct birdloop_pickup_group *group)
 {
   struct birdloop *loop = NULL;
 
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
 
   int drop =
     this_thread->busy_active &&
@@ -687,7 +687,7 @@ birdloop_take(struct birdloop_pickup_group *group)
 
   if (drop)
   {
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
 
     node *n;
     WALK_LIST2(loop, n, this_thread->loops, n)
@@ -717,7 +717,7 @@ birdloop_take(struct birdloop_pickup_group *group)
     /* Take the first loop from the pickup list and unlock */
     loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
     rem_node(&loop->n);
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
 
     birdloop_set_thread(loop, this_thread, group);
     bird_thread_pickup_next(group);
@@ -725,7 +725,7 @@ birdloop_take(struct birdloop_pickup_group *group)
   }
   else
   {
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
     return NULL;
   }
 }
@@ -744,13 +744,13 @@ poll_timeout(struct birdloop *loop)
 static void
 bird_thread_busy_set(struct bird_thread *thr, int val)
 {
-  LOCK_DOMAIN(resource, thr->group->domain);
+  LOCK_DOMAIN(attrs, thr->group->domain);
   if (thr->busy_active = val)
     thr->group->thread_busy_count++;
   else
     thr->group->thread_busy_count--;
   ASSERT_DIE(thr->group->thread_busy_count <= thr->group->thread_count);
-  UNLOCK_DOMAIN(resource, thr->group->domain);
+  UNLOCK_DOMAIN(attrs, thr->group->domain);
 }
 
 static void
@@ -921,7 +921,7 @@ bird_thread_start(struct birdloop_pickup_group *group)
   pool *p = birdloop_pool(meta);
 
   birdloop_enter(meta);
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
 
   struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
   thr->pool = p;
@@ -954,7 +954,7 @@ bird_thread_start(struct birdloop_pickup_group *group)
 
   group->thread_count++;
 
-  UNLOCK_DOMAIN(resource, group->domain);
+  UNLOCK_DOMAIN(attrs, group->domain);
   birdloop_leave(meta);
   return thr;
 }
@@ -981,7 +981,7 @@ static void
 bird_thread_shutdown(void * _ UNUSED)
 {
   struct birdloop_pickup_group *group = this_thread->group;
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
   int dif = group->thread_count - thread_dropper_goal;
   struct birdloop *tdl_stop = NULL;
 
@@ -993,7 +993,7 @@ bird_thread_shutdown(void * _ UNUSED)
     thread_dropper = NULL;
   }
 
-  UNLOCK_DOMAIN(resource, group->domain);
+  UNLOCK_DOMAIN(attrs, group->domain);
 
   DBG("Thread pickup size differs from dropper goal by %d%s\n", dif, tdl_stop ? ", stopping" : "");
 
@@ -1005,7 +1005,7 @@ bird_thread_shutdown(void * _ UNUSED)
 
   struct bird_thread *thr = this_thread;
 
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
   /* Leave the thread-picker list to get no more loops */
   rem_node(&thr->n);
   group->thread_count--;
@@ -1014,7 +1014,7 @@ bird_thread_shutdown(void * _ UNUSED)
   if (thr->busy_active)
     group->thread_busy_count--;
 
-  UNLOCK_DOMAIN(resource, group->domain);
+  UNLOCK_DOMAIN(attrs, group->domain);
 
   /* Leave the thread-dropper loop as we aren't going to return. */
   birdloop_leave(thread_dropper);
@@ -1033,10 +1033,10 @@ bird_thread_shutdown(void * _ UNUSED)
   }
 
   /* Let others know about new loops */
-  LOCK_DOMAIN(resource, group->domain);
+  LOCK_DOMAIN(attrs, group->domain);
   if (!EMPTY_LIST(group->loops))
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
-  UNLOCK_DOMAIN(resource, group->domain);
+  UNLOCK_DOMAIN(attrs, group->domain);
 
   /* Stop the meta loop */
   birdloop_leave(thr->meta);
@@ -1068,12 +1068,12 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
   while (1)
   {
     struct birdloop_pickup_group *group = &pickup_groups[0];
-    LOCK_DOMAIN(resource, group->domain);
+    LOCK_DOMAIN(attrs, group->domain);
 
     int dif = group->thread_count - (thread_dropper_goal = new->thread_count);
     _Bool thread_dropper_running = !!thread_dropper;
 
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
 
     if (dif < 0)
     {
@@ -1087,10 +1087,10 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
       birdloop_enter(tdl);
       event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
 
-      LOCK_DOMAIN(resource, group->domain);
+      LOCK_DOMAIN(attrs, group->domain);
       thread_dropper = tdl;
       thread_dropper_event = tde;
-      UNLOCK_DOMAIN(resource, group->domain);
+      UNLOCK_DOMAIN(attrs, group->domain);
 
       ev_send_loop(thread_dropper, thread_dropper_event);
       birdloop_leave(tdl);
@@ -1211,7 +1211,7 @@ bird_thread_show_finish(void *data)
     {
       struct birdloop_pickup_group *group = &pickup_groups[i];
 
-      LOCK_DOMAIN(resource, group->domain);
+      LOCK_DOMAIN(attrs, group->domain);
       uint count = 0;
       u64 total_time_ns = 0;
       if (!EMPTY_LIST(group->loops))
@@ -1237,7 +1237,7 @@ bird_thread_show_finish(void *data)
       else
 	tsd_append("All loops in group %d are assigned.", i);
 
-      UNLOCK_DOMAIN(resource, group->domain);
+      UNLOCK_DOMAIN(attrs, group->domain);
     }
 
     for (uint i = 0; i < tsd->line_pos - 1; i++)
@@ -1262,10 +1262,10 @@ cmd_show_threads(int show_loops)
   for (int i=0; i<2; i++)
   {
     struct birdloop_pickup_group *group = &pickup_groups[i];
-    LOCK_DOMAIN(resource, group->domain);
+    LOCK_DOMAIN(attrs, group->domain);
     total_threads += group->thread_count;
     total_loops += group->loop_count;
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
   }
 
   /* Total number of lines must be recalculated when changing the code! */
@@ -1291,7 +1291,7 @@ cmd_show_threads(int show_loops)
   {
     struct birdloop_pickup_group *group = &pickup_groups[i];
 
-    LOCK_DOMAIN(resource, group->domain);
+    LOCK_DOMAIN(attrs, group->domain);
 
     struct bird_thread *thr;
     WALK_LIST(thr, group->threads)
@@ -1301,7 +1301,7 @@ cmd_show_threads(int show_loops)
       wakeup_do_kick(thr);
     }
 
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
   }
 
   UNLOCK_DOMAIN(control, lock);
@@ -1325,8 +1325,8 @@ birdloop_init(void)
   {
     struct birdloop_pickup_group *group = &pickup_groups[i];
 
-    group->domain = DOMAIN_NEW(resource);
-    DOMAIN_SETUP(resource, group->domain, "Loop Pickup", NULL);
+    group->domain = DOMAIN_NEW(attrs);
+    DOMAIN_SETUP(attrs, group->domain, "Loop Pickup", NULL);
     init_list(&group->loops);
     init_list(&group->threads);
   }
@@ -1377,9 +1377,9 @@ birdloop_stop_internal(struct birdloop *loop)
   loop->thread = NULL;
 
   /* Uncount from thread group */
-  LOCK_DOMAIN(resource, this_thread->group->domain);
+  LOCK_DOMAIN(attrs, this_thread->group->domain);
   this_thread->group->loop_count--;
-  UNLOCK_DOMAIN(resource, this_thread->group->domain);
+  UNLOCK_DOMAIN(attrs, this_thread->group->domain);
 
   /* Leave the loop context without causing any other fuss */
   ASSERT_DIE(!ev_active(&loop->event));
@@ -1488,13 +1488,13 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
 
   if (group)
   {
-    LOCK_DOMAIN(resource, group->domain);
+    LOCK_DOMAIN(attrs, group->domain);
     group->loop_count++;
     add_tail(&group->loops, &loop->n);
     if (EMPTY_LIST(group->threads))
       ev_send(&global_event_list, &group->start_threads);
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
-    UNLOCK_DOMAIN(resource, group->domain);
+    UNLOCK_DOMAIN(attrs, group->domain);
   }
   else
     loop->n.next = loop->n.prev = &loop->n;

From 318ac8720fcf5ab14ef794d36947870abb7d85f9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 7 May 2023 17:30:33 +0200
Subject: [PATCH 323/431] OLocks in BGP must be freed early

---
 nest/proto.c    | 9 ++++++++-
 nest/protocol.h | 2 ++
 proto/bgp/bgp.c | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 647b7f4e..c07560c6 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1157,11 +1157,15 @@ proto_event(void *ptr)
     p->do_stop = 0;
   }
 
-  if (proto_is_done(p))
+  if (proto_is_done(p) && p->pool_fragile)  /* perusing pool_fragile to do this once only */
+  {
+    rp_free(p->pool_fragile);
+    p->pool_fragile = NULL;
     if (p->loop != &main_birdloop)
       birdloop_stop_self(p->loop, proto_loop_stopped, p);
     else
       proto_cleanup(p);
+  }
 }
 
 
@@ -1235,7 +1239,10 @@ proto_start(struct proto *p)
   p->iface_sub.target = proto_event_list(p);
 
   PROTO_LOCKED_FROM_MAIN(p)
+  {
+    p->pool_fragile = rp_newf(p->pool, birdloop_domain(p->loop), "Protocol %s fragile objects", p->cf->name);
     proto_notify_state(p, (p->proto->start ? p->proto->start(p) : PS_UP));
+  }
 }
 
 
diff --git a/nest/protocol.h b/nest/protocol.h
index 02ec5c15..e8f19801 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -130,6 +130,8 @@ struct proto {
   struct proto_config *cf;		/* Configuration data */
   struct proto_config *cf_new;		/* Configuration we want to switch to after shutdown (NULL=delete) */
   pool *pool;				/* Pool containing local objects */
+  pool *pool_fragile;			/* Pool containing fragile local objects which need to be freed
+					   before the protocol's birdloop actually stops, like olocks */
   event *event;				/* Protocol event */
   timer *restart_timer;			/* Timer to restart the protocol from limits */
   event *restart_event;			/* Event to restart/shutdown the protocol from limits */
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index f4d80e8d..9d81b85b 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1742,7 +1742,7 @@ bgp_start(struct proto *P)
    * so that we are the only instance attempting to talk with that neighbor.
    */
   struct object_lock *lock;
-  lock = p->lock = olock_new(P->pool);
+  lock = p->lock = olock_new(P->pool_fragile);
   lock->addr = p->remote_ip;
   lock->port = p->cf->remote_port;
   lock->iface = p->cf->iface;

From bb28b16fd6b9173ffdfaedddb3b2fd6de772674f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 7 May 2023 21:39:05 +0200
Subject: [PATCH 324/431] BGP: proactively rehash prefix hash up to shorten
 collision lists

---
 proto/bgp/attrs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 88639442..e1b2f868 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1677,7 +1677,7 @@ bgp_withdraw_bucket(struct bgp_channel *bc, struct bgp_bucket *b)
 #define PXH_FN(n,i,h)		h
 
 #define PXH_REHASH		bgp_pxh_rehash
-#define PXH_PARAMS		/8, *2, 2, 2, 12, 24
+#define PXH_PARAMS		/16, *1, 2, 2, 12, 24
 
 
 HASH_DEFINE_REHASH_FN(PXH, struct bgp_prefix)

From a818a3011e6543f6e224e37fb8eb46f64bafa490 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 7 May 2023 23:04:47 +0200
Subject: [PATCH 325/431] Channel: configurable feed block size

---
 doc/bird.sgml   |  7 +++++++
 nest/config.Y   |  1 +
 nest/proto.c    |  6 ++++++
 nest/protocol.h |  4 ++++
 nest/rt-table.c | 13 +++++++------
 nest/rt.h       |  1 +
 proto/bgp/bgp.c |  1 +
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 3f6acaed..7c8e9895 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1024,6 +1024,13 @@ inherited from templates can be updated by new definitions.
 	counter ignores route blocking and block action also blocks route
 	updates of already accepted routes -- and these details will probably
 	change in the future. Default: <cf/off/.
+
+	<tag><label id="proto-export-block">export block <m/number/</tag>
+        Set the minimum amount of routes exported at once when feeding or
+	if `merge paths` or `secondary` is selected. This affects overall latency.
+	Basically, when your export filters are very expensive, processing
+	the whole block of routes may take too much time. In such cases, you may need to
+        shrink this value to improve responsiveness. Default: <cf/16384/.
 </descrip>
 
 <p>This is a trivial example of RIP configured for IPv6 on all interfaces:
diff --git a/nest/config.Y b/nest/config.Y
index bce8b228..e7347877 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -320,6 +320,7 @@ channel_item_:
      this_channel->out_filter = $4;
    }
  | EXPORT imexport { this_channel->out_filter = $2; }
+ | EXPORT BLOCK expr { this_channel->feed_block_size = $3; }
  | RECEIVE LIMIT limit_spec { this_channel->rx_limit = $3; }
  | IMPORT LIMIT limit_spec { this_channel->in_limit = $3; }
  | EXPORT LIMIT limit_spec { this_channel->out_limit = $3; }
diff --git a/nest/proto.c b/nest/proto.c
index c07560c6..b06f7b72 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -207,6 +207,8 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
   c->out_filter = cf->out_filter;
   c->out_subprefix = cf->out_subprefix;
 
+  c->feed_block_size = cf->feed_block_size;
+
   channel_init_limit(c, &c->rx_limit, PLD_RX, &cf->rx_limit);
   channel_init_limit(c, &c->in_limit, PLD_IN, &cf->in_limit);
   channel_init_limit(c, &c->out_limit, PLD_OUT, &cf->out_limit);
@@ -497,6 +499,7 @@ channel_start_export(struct channel *c)
     .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
     .pool = c->proto->pool,
+    .feed_block_size = c->feed_block_size,
     .addr = c->out_subprefix,
     .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
     .trace_routes = c->debug | c->proto->debug,
@@ -688,6 +691,7 @@ channel_setup_in_table(struct channel *c)
     .name = mb_sprintf(c->proto->pool, "%s.%s.import", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
     .pool = c->proto->pool,
+    .feed_block_size = c->feed_block_size,
     .trace_routes = c->debug | c->proto->debug,
     .export_bulk = channel_reload_export_bulk,
     .dump_req = channel_reload_dump_req,
@@ -913,6 +917,8 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
   cf->table = tab;
   cf->out_filter = FILTER_REJECT;
 
+  cf->feed_block_size = 16384;
+
   cf->net_type = net_type;
   cf->ra_mode = RA_OPTIMAL;
   cf->preference = proto->protocol->preference;
diff --git a/nest/protocol.h b/nest/protocol.h
index e8f19801..4916e756 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -502,6 +502,8 @@ struct channel_config {
 
   struct settle_config roa_settle;	/* Settle times for ROA-induced reload */
 
+  uint feed_block_size;			/* How many routes to feed at once */
+
   u8 net_type;				/* Routing table network type (NET_*), 0 for undefined */
   u8 ra_mode;				/* Mode of received route advertisements (RA_*) */
   u16 preference;			/* Default route preference */
@@ -560,6 +562,8 @@ struct channel {
 
   u32 refeed_count;			/* Number of routes exported during refeed regardless of out_limit */
 
+  uint feed_block_size;			/* How many routes to feed at once */
+
   u8 net_type;				/* Routing table network type (NET_*), 0 for undefined */
   u8 ra_mode;				/* Mode of received route advertisements (RA_*) */
   u16 preference;			/* Default route preference */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ef740562..c1bb1588 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4231,7 +4231,6 @@ rt_feed_done(struct rt_export_hook *c)
   rt_send_export_event(c);
 }
 
-#define MAX_FEED_BLOCK	1024
 typedef struct {
   uint cnt, pos;
   union {
@@ -4249,19 +4248,21 @@ typedef struct {
 static int
 rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
 {
+  uint bs = c->h.req->feed_block_size ?: 16384;
+
   if (n->routes)
   {
     if (c->h.req->export_bulk)
     {
       uint cnt = rte_feed_count(n);
-      if (b->cnt && (b->cnt + cnt > MAX_FEED_BLOCK))
+      if (b->cnt && (b->cnt + cnt > bs))
 	return 0;
 
       if (!b->cnt)
       {
-	b->feed = tmp_alloc(sizeof(rte *) * MAX(MAX_FEED_BLOCK, cnt));
+	b->feed = tmp_alloc(sizeof(rte *) * MAX(bs, cnt));
 
-	uint aux_block_size = (cnt >= MAX_FEED_BLOCK) ? 2 : (MAX_FEED_BLOCK + 2 - cnt);
+	uint aux_block_size = (cnt >= bs) ? 2 : (bs + 2 - cnt);
 	b->aux = tmp_alloc(sizeof(struct rt_feed_block_aux) * aux_block_size);
       }
 
@@ -4275,12 +4276,12 @@ rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
 
       b->cnt += cnt;
     }
-    else if (b->pos == MAX_FEED_BLOCK)
+    else if (b->pos == bs)
       return 0;
     else
     {
       if (!b->pos)
-	b->rpe = tmp_alloc(sizeof(struct rt_pending_export) * MAX_FEED_BLOCK);
+	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 };
     }
diff --git a/nest/rt.h b/nest/rt.h
index 4fe8eb53..76d33ec7 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -292,6 +292,7 @@ struct rt_export_request {
   const net_addr *addr;			/* Network prefilter address */
   u8 trace_routes;
   u8 addr_mode;				/* Network prefilter mode (TE_ADDR_*) */
+  uint feed_block_size;			/* How many routes to feed at once */
 
   event_list *list;			/* Where to schedule export events */
   pool *pool;				/* Pool to use for allocations */
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 9d81b85b..e2a0d7df 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -925,6 +925,7 @@ bgp_graceful_restart_feed(struct bgp_channel *c)
     .name = "BGP-GR",
     .list = proto_event_list(c->c.proto),
     .pool = c->c.proto->pool,
+    .feed_block_size = c->c.feed_block_size,
     .trace_routes = c->c.debug | c->c.proto->debug,
     .dump_req = bgp_graceful_restart_feed_dump_req,
     .log_state_change = bgp_graceful_restart_feed_log_state_change,

From b36d2847887b8e398885d4401ce3e7d23ad4b4c5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 7 May 2023 23:40:38 +0200
Subject: [PATCH 326/431] Threads take loops faster

---
 sysdep/unix/io-loop.c | 70 ++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 751f882f..c73381da 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -589,8 +589,9 @@ struct birdloop_pickup_group {
   list loops;
   list threads;
   uint thread_count;
-  uint loop_count;
   uint thread_busy_count;
+  uint loop_count;
+  uint loop_unassigned_count;
   btime max_latency;
   event start_threads;
 } pickup_groups[2] = {
@@ -647,6 +648,9 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
   {
     thr->loop_count++;
     add_tail(&thr->loops, &loop->n);
+
+    if (!EMPTY_LIST(loop->sock_list))
+      thr->sock_changed = 1;
     ev_send_loop(loop->thread->meta, &loop->event);
   }
   else
@@ -654,6 +658,7 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
     /* Put into pickup list */
     LOCK_DOMAIN(attrs, group->domain);
     add_tail(&group->loops, &loop->n);
+    group->loop_unassigned_count++;
     UNLOCK_DOMAIN(attrs, group->domain);
   }
 }
@@ -662,17 +667,15 @@ static void
 bird_thread_pickup_next(struct birdloop_pickup_group *group)
 {
   /* This thread goes to the end of the pickup list */
-  LOCK_DOMAIN(attrs, group->domain);
   rem_node(&this_thread->n);
   add_tail(&group->threads, &this_thread->n);
 
   /* If there are more loops to be picked up, wakeup the next thread in order */
   if (!EMPTY_LIST(group->loops))
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
-  UNLOCK_DOMAIN(attrs, group->domain);
 }
 
-static struct birdloop *
+static void
 birdloop_take(struct birdloop_pickup_group *group)
 {
   struct birdloop *loop = NULL;
@@ -704,30 +707,49 @@ birdloop_take(struct birdloop_pickup_group *group)
 	birdloop_set_thread(loop, NULL, group);
 
 	birdloop_leave(loop);
+
+	LOCK_DOMAIN(attrs, group->domain);
 	bird_thread_pickup_next(group);
+	UNLOCK_DOMAIN(attrs, group->domain);
 	break;
       }
       birdloop_leave(loop);
     }
 
-    return NULL;
+    return;
   }
-  else if (take)
-  {
-    /* Take the first loop from the pickup list and unlock */
-    loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
-    rem_node(&loop->n);
-    UNLOCK_DOMAIN(attrs, group->domain);
 
-    birdloop_set_thread(loop, this_thread, group);
-    bird_thread_pickup_next(group);
-    return loop;
-  }
-  else
+  if (take)
   {
-    UNLOCK_DOMAIN(attrs, group->domain);
-    return NULL;
+    /* Take a proportional amount of loops from the pickup list and unlock */
+    uint thread_count = group->thread_count + 1;
+    if (group->thread_busy_count < group->thread_count)
+      thread_count -= group->thread_busy_count;
+
+    uint assign = 1 + group->loop_unassigned_count / thread_count;
+    for (uint i=0; !EMPTY_LIST(group->loops) && i<assign; i++)
+    {
+      loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
+      rem_node(&loop->n);
+      group->loop_unassigned_count--;
+      UNLOCK_DOMAIN(attrs, group->domain);
+
+      birdloop_enter(loop);
+      birdloop_set_thread(loop, this_thread, group);
+
+      node *n;
+      WALK_LIST(n, loop->sock_list)
+	SKIP_BACK(sock, n, n)->index = -1;
+
+      birdloop_leave(loop);
+
+      LOCK_DOMAIN(attrs, group->domain);
+    }
+
+    bird_thread_pickup_next(group);
   }
+
+  UNLOCK_DOMAIN(attrs, group->domain);
 }
 
 static int
@@ -800,14 +822,7 @@ bird_thread_main(void *arg)
     int timeout;
 
     /* Pickup new loops */
-    struct birdloop *loop = birdloop_take(thr->group);
-    if (loop)
-    {
-      birdloop_enter(loop);
-      if (!EMPTY_LIST(loop->sock_list))
-	thr->sock_changed = 1;
-      birdloop_leave(loop);
-    }
+    birdloop_take(thr->group);
 
     /* Schedule all loops with timed out timers */
     timers_fire(&thr->meta->time, 0);
@@ -847,6 +862,7 @@ bird_thread_main(void *arg)
       pipe_pollin(&thr->wakeup, &pfd);
 
       node *nn;
+      struct birdloop *loop;
       WALK_LIST2(loop, nn, thr->loops, n)
       {
 	birdloop_enter(loop);
@@ -1173,7 +1189,7 @@ bird_thread_show(void *data)
   {
     if (tsd->show_loops)
       bird_thread_show_loop(tsd, loop);
-    
+
     total_time_ns += loop->working.total_ns + loop->locking.total_ns;
   }
 

From fcbf22d1f62851fbb710bdb2bafb609d9b62b491 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 May 2023 13:09:02 +0200
Subject: [PATCH 327/431] Properly protecting the route src global index by RCU
 read lock and atomic operations

There was a bug occuring when one thread sought for a src by its global id
and another one was allocating another src with such an ID that it caused
route src global index reallocation. This brief moment of inconsistency
led to a rare use-after-free of the old global index block.
---
 nest/rt-attr.c | 70 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 13 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index c035a2dc..0457e68a 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -201,14 +201,21 @@ static struct idm src_ids;
 #define RSH_REHASH		rte_src_rehash
 #define RSH_PARAMS		/2, *2, 1, 1, 8, 20
 #define RSH_INIT_ORDER		2
-static struct rte_src **rte_src_global;
-static uint rte_src_global_max = SRC_ID_INIT_SIZE;
+static struct rte_src * _Atomic * _Atomic rte_src_global;
+static _Atomic uint rte_src_global_max;
 
 static void
 rte_src_init(void)
 {
   rte_src_slab = sl_new(rta_pool, sizeof(struct rte_src));
-  rte_src_global = mb_allocz(rta_pool, sizeof(struct rte_src *) * rte_src_global_max);
+
+  uint gmax = SRC_ID_INIT_SIZE * 32;
+  struct rte_src * _Atomic *g = mb_alloc(rta_pool, sizeof(struct rte_src * _Atomic) * gmax);
+  for (uint i = 0; i < gmax; i++)
+    atomic_store_explicit(&g[i], NULL, memory_order_relaxed);
+
+  atomic_store_explicit(&rte_src_global, g, memory_order_release);
+  atomic_store_explicit(&rte_src_global_max, gmax, memory_order_release);
 
   idm_init(&src_ids, rta_pool, SRC_ID_INIT_SIZE);
 }
@@ -227,6 +234,8 @@ rt_get_source_o(struct rte_owner *p, u32 id)
   if (p->stop)
     bug("Stopping route owner asked for another source.");
 
+  ASSERT_DIE(birdloop_inside(p->list->loop));
+
   struct rte_src *src = rt_find_source(p, id);
 
   if (src)
@@ -249,26 +258,60 @@ rt_get_source_o(struct rte_owner *p, u32 id)
     log(L_TRACE "Allocated new rte_src for %s, ID %uL %uG, have %u sources now",
 	p->name, src->private_id, src->global_id, p->uc);
 
-  if (src->global_id >= rte_src_global_max)
+  uint gm = atomic_load_explicit(&rte_src_global_max, memory_order_relaxed);
+  struct rte_src * _Atomic * g = atomic_load_explicit(&rte_src_global, memory_order_relaxed);
+
+  if (src->global_id >= gm)
   {
-    rte_src_global = mb_realloc(rte_src_global, sizeof(struct rte_src *) * (rte_src_global_max *= 2));
-    memset(&rte_src_global[rte_src_global_max / 2], 0,
-	sizeof(struct rte_src *) * (rte_src_global_max / 2));
+    /* Allocate new block */
+    size_t old_len = sizeof(struct rte_src * _Atomic) * gm;
+    struct rte_src * _Atomic * new_block = mb_alloc(rta_pool, old_len * 2);
+    memcpy(new_block, g, old_len);
+
+    for (uint i = 0; i < gm; i++)
+      atomic_store_explicit(&new_block[gm+i], NULL, memory_order_relaxed);
+
+    /* Update the pointer */
+    atomic_store_explicit(&rte_src_global, new_block, memory_order_release);
+    atomic_store_explicit(&rte_src_global_max, gm * 2, memory_order_release);
+
+    /* Wait for readers */
+    synchronize_rcu();
+
+    /* Free the old block */
+    mb_free(g);
+    g = new_block;
   }
 
-  rte_src_global[src->global_id] = src;
+  atomic_store_explicit(&g[src->global_id], src, memory_order_release);
   RTA_UNLOCK;
 
   return src;
 }
 
+/**
+ * Find a rte source by its global ID. Only available for existing and locked
+ * sources stored by their ID. Checking for non-existent or foreign source is unsafe.
+ *
+ * @id: requested global ID
+ *
+ * Returns the found source or dies. Result of this function is guaranteed to
+ * be a valid source as long as the caller owns it.
+ */
 struct rte_src *
 rt_find_source_global(u32 id)
 {
-  if (id >= rte_src_global_max)
-    return NULL;
-  else
-    return rte_src_global[id];
+  rcu_read_lock();
+  ASSERT_DIE(id < atomic_load_explicit(&rte_src_global_max, memory_order_acquire));
+
+  struct rte_src * _Atomic * g = atomic_load_explicit(&rte_src_global, memory_order_acquire);
+  struct rte_src *src = atomic_load_explicit(&g[id], memory_order_acquire);
+  ASSERT_DIE(src);
+  ASSERT_DIE(src->global_id == id);
+
+  rcu_read_unlock();
+
+  return src;
 }
 
 static inline void
@@ -295,7 +338,8 @@ rt_prune_sources(void *data)
       HASH_DO_REMOVE(o->hash, RSH, sp);
 
       RTA_LOCK;
-      rte_src_global[src->global_id] = NULL;
+      struct rte_src * _Atomic * g = atomic_load_explicit(&rte_src_global, memory_order_acquire);
+      atomic_store_explicit(&g[src->global_id], NULL, memory_order_release);
       idm_free(&src_ids, src->global_id);
       sl_free(src);
       RTA_UNLOCK;

From 2623b7ba5d2bc52640fe875fd8b02ec6c54cf7a2 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 May 2023 15:13:49 +0200
Subject: [PATCH 328/431] ID Maps are checking whether their pool is locked

---
 lib/idm.c | 5 +++++
 lib/idm.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib/idm.c b/lib/idm.c
index 66e311c6..ac5ec571 100644
--- a/lib/idm.c
+++ b/lib/idm.c
@@ -22,6 +22,7 @@ idm_init(struct idm *m, pool *p, uint size)
   m->used = 1;
   m->size = size;
   m->data = mb_allocz(p, m->size * sizeof(u32));
+  m->pool = p;
 
   /* ID 0 is reserved */
   m->data[0] = 1;
@@ -34,6 +35,8 @@ idm_alloc(struct idm *m)
 {
   uint i, j;
 
+  ASSERT_DIE(DG_IS_LOCKED(m->pool->domain));
+
   for (i = m->pos; i < m->size; i++)
     if (m->data[i] != 0xffffffff)
       goto found;
@@ -67,6 +70,8 @@ found:
 void
 idm_free(struct idm *m, u32 id)
 {
+  ASSERT_DIE(DG_IS_LOCKED(m->pool->domain));
+
   uint i = id / 32;
   uint j = id % 32;
 
diff --git a/lib/idm.h b/lib/idm.h
index e3380cce..69e26ff5 100644
--- a/lib/idm.h
+++ b/lib/idm.h
@@ -12,6 +12,7 @@
 
 struct idm
 {
+  pool *pool;
   u32 *data;
   u32 pos;
   u32 used;

From 794f555f63cc662c73e9113fd1eff2ebba4e50ff Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 May 2023 18:57:32 +0200
Subject: [PATCH 329/431] BGP: fix listen socket cleanup

---
 proto/bgp/bgp.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index e2a0d7df..c98f84ab 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -197,13 +197,20 @@ bgp_close(struct bgp_proto *p)
   struct bgp_listen_request *req = &p->listen;
   struct bgp_socket *bs = req->sock;
 
-  if (bs)
+  if (enlisted(&req->n))
   {
-    req->sock = NULL;
+    /* Remove listen request from listen socket or pending list */
     rem_node(&req->n);
 
-    if (bs && EMPTY_LIST(bs->requests))
-      ev_send(&global_event_list, &bgp_listen_event);
+    if (bs)
+    {
+      /* Already had a socket. */
+      req->sock = NULL;
+
+      /* Request listen socket cleanup */
+      if (bs && EMPTY_LIST(bs->requests))
+	ev_send(&global_event_list, &bgp_listen_event);
+    }
   }
 
   UNLOCK_DOMAIN(rtable, bgp_listen_domain);

From 92d934f0d191e56c3fe172b40cfcc2dd49087bdb Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 9 May 2023 23:31:47 +0200
Subject: [PATCH 330/431] Fix use-after free in thread stopping code

---
 sysdep/unix/io-loop.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index c73381da..a3b54394 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -294,6 +294,13 @@ pipe_pollin(struct pipe *p, struct pfd *pfd)
   BUFFER_PUSH(pfd->loop) = NULL;
 }
 
+void
+pipe_free(struct pipe *p)
+{
+  close(p->fd[0]);
+  close(p->fd[1]);
+}
+
 static inline void
 wakeup_init(struct bird_thread *loop)
 {
@@ -312,6 +319,12 @@ wakeup_do_kick(struct bird_thread *loop)
   pipe_kick(&loop->wakeup);
 }
 
+static inline void
+wakeup_free(struct bird_thread *loop)
+{
+  pipe_free(&loop->wakeup);
+}
+
 static inline _Bool
 birdloop_try_ping(struct birdloop *loop, u32 ltt)
 {
@@ -918,14 +931,24 @@ static void
 bird_thread_cleanup(void *_thr)
 {
   struct bird_thread *thr = _thr;
+  struct birdloop *meta = thr->meta;
   ASSERT_DIE(birdloop_inside(&main_birdloop));
 
-  /* Free the meta loop */
-  thr->meta->thread = NULL;
-  birdloop_free(thr->meta);
+  /* Wait until the thread actually finishes */
+  ASSERT_DIE(meta);
+  birdloop_enter(meta);
+  birdloop_leave(meta);
+
+  /* No more wakeup */
+  wakeup_free(thr);
 
   /* Thread attributes no longer needed */
   pthread_attr_destroy(&thr->thread_attr);
+
+  /* Free the meta loop */
+  thr->meta->thread = NULL;
+  thr->meta = NULL;
+  birdloop_free(meta);
 }
 
 static struct bird_thread *
@@ -1035,6 +1058,10 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Leave the thread-dropper loop as we aren't going to return. */
   birdloop_leave(thread_dropper);
 
+  /* Last try to run the priority event list; ruin it then to be extra sure */
+  ev_run_list(&this_thread->priority_events);
+  memset(&this_thread->priority_events, 0xa5, sizeof(this_thread->priority_events));
+
   /* Drop loops including the thread dropper itself */
   while (!EMPTY_LIST(thr->loops))
   {
@@ -1054,8 +1081,8 @@ bird_thread_shutdown(void * _ UNUSED)
     wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
   UNLOCK_DOMAIN(attrs, group->domain);
 
-  /* Stop the meta loop */
-  birdloop_leave(thr->meta);
+  /* Request thread cleanup from main loop */
+  ev_send_loop(&main_birdloop, &thr->cleanup_event);
 
   /* Local pages not needed anymore */
   flush_local_pages();
@@ -1063,8 +1090,8 @@ bird_thread_shutdown(void * _ UNUSED)
   /* Unregister from RCU */
   rcu_thread_stop(&thr->rcu);
 
-  /* Request thread cleanup from main loop */
-  ev_send_loop(&main_birdloop, &thr->cleanup_event);
+  /* Now we can be cleaned up */
+  birdloop_leave(thr->meta);
 
   /* Exit! */
   pthread_exit(NULL);

From deb303a451d38fad10ebcf66a7f3dac9f05079fa Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 11 May 2023 11:37:48 +0200
Subject: [PATCH 331/431] NEWS and version update

---
 NEWS            | 6 ++++++
 misc/bird.spec  | 2 +-
 sysdep/config.h | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 99027014..5a344f42 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Version 3.0alpha2 (2023-05-11)
+  o Fixed memory leaks and use-after free bugs
+  o Simple thread work balancing
+  o MRT switched off
+  o Slow kernel route synchronization to be fixed later
+
 Version 3.0alpha1 (2023-04-18)
   o Worker threads for BGP, Pipe, RPKI and BFD
   o Configurable number of threads
diff --git a/misc/bird.spec b/misc/bird.spec
index d013d85c..0ccbec40 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 3.0alpha1
+Version: 3.0alpha2
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/sysdep/config.h b/sysdep/config.h
index ec66a353..415b9dfc 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -13,7 +13,7 @@
 #ifdef GIT_LABEL
 #define BIRD_VERSION XSTR1(GIT_LABEL)
 #else
-#define BIRD_VERSION "3.0alpha1"
+#define BIRD_VERSION "3.0alpha2"
 #endif
 
 /* Include parameters determined by configure script */

From 6a3e5c2ae81540ec55ec4e642b50e8db5293c0f6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 13 May 2023 20:33:35 +0200
Subject: [PATCH 332/431] Fixed abort when running in foreground but stdin is
 closed

A forgotten else-clause caused BIRD to treat some pseudo-random place in
memory as fd-pair. This was happening only on startup of the first
thread in group and the value there in memory was typically zero ... and
writing to stdin succeeded.

When running BIRD with stdin not present (like systemd does), it died on
this spurious write. Now it seems to work correctly.

Thanks to Daniel Suchy <danny@danysek.cz> for reporting.

http://trubka.network.cz/pipermail/bird-users/2023-May/016929.html
---
 sysdep/unix/io-loop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index a3b54394..58e296a6 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -1536,7 +1536,8 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
     add_tail(&group->loops, &loop->n);
     if (EMPTY_LIST(group->threads))
       ev_send(&global_event_list, &group->start_threads);
-    wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
+    else
+      wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
     UNLOCK_DOMAIN(attrs, group->domain);
   }
   else

From 5ba9878b4f74a375d54a2d79a5ab80c7f1d0c466 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 29 May 2023 19:32:26 +0200
Subject: [PATCH 333/431] BFD: Fixed reconfiguration issues

After converting BFD to the new IO loop system, reconfiguration never
really worked. Sadly, we missed this case in our testing suite so it
passed under the radar for quite a while.

Thanks to Andrei Dinu <andrei.dinu@digitalit.ro> for reporting and
isolating this issue.
---
 proto/bfd/bfd.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index e373e4dd..5980148b 100644
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -528,7 +528,7 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
   if (EMPTY_LIST(s->request_list))
     return;
 
-  birdloop_enter(p->p.loop);
+  ASSERT_DIE(birdloop_inside(p->p.loop));
 
   struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(s->request_list));
   s->cf = bfd_merge_options(s->ifa->cf, &req->opts);
@@ -541,8 +541,6 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
 
   bfd_session_control_tx_timer(s, 0);
 
-  birdloop_leave(p->p.loop);
-
   TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
 }
 
@@ -614,7 +612,7 @@ bfd_free_iface(struct bfd_iface *ifa)
 }
 
 static void
-bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_config *nc)
+bfd_reconfigure_iface(struct bfd_proto *p UNUSED, struct bfd_iface *ifa, struct bfd_config *nc)
 {
   struct bfd_iface_config *new = bfd_find_iface_config(nc, ifa->iface);
   struct bfd_iface_config *old = ifa->cf;
@@ -628,9 +626,7 @@ bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_con
     (new->passive != old->passive);
 
   /* This should be probably changed to not access ifa->cf from the BFD thread */
-  birdloop_enter(p->p.loop);
   ifa->cf = new;
-  birdloop_leave(p->p.loop);
 }
 
 
@@ -873,7 +869,12 @@ bfd_update_request(struct bfd_request *req, const struct bfd_options *opts)
   req->opts = *opts;
 
   if (s)
-    bfd_reconfigure_session(s->ifa->bfd, s);
+  {
+    struct bfd_proto *p = s->ifa->bfd;
+    birdloop_enter(p->p.loop);
+    bfd_reconfigure_session(p, s);
+    birdloop_leave(p->p.loop);
+  }
 }
 
 static void

From 7776e47e321e0561a0ae8934a2d1f6414bce9002 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 21 Aug 2023 15:37:09 +0200
Subject: [PATCH 334/431] Config obstacles are lockless now

---
 conf/conf.c | 19 ++++++++++---------
 conf/conf.h |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index c7cd81fe..99927ce0 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -70,7 +70,7 @@ static int future_cftype;		/* Type of scheduled transition, may also be RECONFIG
 /* Note that when future_cftype is RECONFIG_UNDO, then future_config is NULL,
    therefore proper check for future scheduled config checks future_cftype */
 
-static event *config_event;		/* Event for finalizing reconfiguration */
+static void config_done(void *cf);
 static timer *config_timer;		/* Timer for scheduled configuration rollback */
 
 /* These are public just for cmd_show_status(), should not be accessed elsewhere */
@@ -110,6 +110,8 @@ config_alloc(const char *name)
   c->tf_base = c->tf_log = TM_ISO_LONG_MS;
   c->gr_wait = DEFAULT_GR_WAIT;
 
+  c->done_event = (event) { .hook = config_done, .data = c, };
+
   return c;
 }
 
@@ -228,16 +230,15 @@ void
 config_add_obstacle(struct config *c)
 {
   DBG("+++ adding obstacle %d\n", c->obstacle_count);
-  c->obstacle_count++;
+  atomic_fetch_add_explicit(&c->obstacle_count, 1, memory_order_acq_rel);
 }
 
 void
 config_del_obstacle(struct config *c)
 {
   DBG("+++ deleting obstacle %d\n", c->obstacle_count);
-  c->obstacle_count--;
-  if (!c->obstacle_count && (c != config))
-    ev_schedule(config_event);
+  if (atomic_fetch_sub_explicit(&c->obstacle_count, 1, memory_order_acq_rel) == 1)
+    ev_send_loop(&main_birdloop, &c->done_event);
 }
 
 static int
@@ -313,8 +314,11 @@ config_do_commit(struct config *c, int type)
 }
 
 static void
-config_done(void *unused UNUSED)
+config_done(void *cf)
 {
+  if (cf == config)
+    return;
+
   if (config->shutdown)
     sysdep_shutdown_done();
 
@@ -517,9 +521,6 @@ config_init(void)
 {
   config_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Configurations");
 
-  config_event = ev_new(config_pool);
-  config_event->hook = config_done;
-
   config_timer = tm_new(config_pool);
   config_timer->hook = config_timeout;
 }
diff --git a/conf/conf.h b/conf/conf.h
index b30914c1..c51b01c9 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -57,7 +57,8 @@ struct config {
   int thread_count;			/* How many worker threads to prefork */
 
   struct sym_scope *root_scope;		/* Scope for root symbols */
-  int obstacle_count;			/* Number of items blocking freeing of this config */
+  _Atomic int obstacle_count;		/* Number of items blocking freeing of this config */
+  event done_event;			/* Called when obstacle_count reaches zero */
   int shutdown;				/* This is a pseudo-config for daemon shutdown */
   int gr_down;				/* This is a pseudo-config for graceful restart */
   btime load_time;			/* When we've got this configuration */

From 510b1046e186a913ea4195d27009e95794dd1e51 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 28 Aug 2023 15:36:40 +0200
Subject: [PATCH 335/431] Hostentry application locking

Due to a race condition between rta_apply_hostentry() and rt_update_hostentry(),
happening when a new route is inserted to a table, this commit makes it mandatory
to lock the next hop resolution table while resolving the next hop.

This may be slow, we'll fix it better in some future release
---
 nest/rt-table.c | 9 ++++++---
 nest/rt.h       | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index c1bb1588..6d99a7b3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3416,7 +3416,7 @@ ea_set_hostentry(ea_list **to, rtable *dep, rtable *src, ip_addr gw, ip_addr ll,
 
 
 static void
-rta_apply_hostentry(ea_list **to, struct hostentry_adata *head)
+rta_apply_hostentry(struct rtable_private *tab UNUSED, ea_list **to, struct hostentry_adata *head)
 {
   struct hostentry *he = head->he;
   u32 *labels = head->labels;
@@ -3544,7 +3544,8 @@ rt_next_hop_update_rte(rte *old, rte *new)
     return 0;
 
   *new = *old;
-  rta_apply_hostentry(&new->attrs, head);
+  RT_LOCKED(head->he->owner, tab)
+    rta_apply_hostentry(tab, &new->attrs, head);
   return 1;
 }
 
@@ -3557,7 +3558,8 @@ rt_next_hop_resolve_rte(rte *r)
 
   struct hostentry_adata *head = (struct hostentry_adata *) heea->u.ptr;
 
-  rta_apply_hostentry(&r->attrs, head);
+  RT_LOCKED(head->he->owner, tab)
+    rta_apply_hostentry(tab, &r->attrs, head);
 }
 
 #ifdef CONFIG_BGP
@@ -4875,6 +4877,7 @@ rt_get_hostentry(struct rtable_private *tab, ip_addr a, ip_addr ll, rtable *dep)
   if (!he)
   {
     he = hc_new_hostentry(hc, tab->rp, a, link, dep, k);
+    he->owner = RT_PUB(tab);
     rt_update_hostentry(tab, he);
   }
 
diff --git a/nest/rt.h b/nest/rt.h
index 76d33ec7..a251b3a5 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -489,6 +489,7 @@ struct hostentry {
   ip_addr link;				/* (link-local) IP address of host, used as gw
 					   if host is directly attached */
   rtable *tab;				/* Dependent table, part of key */
+  rtable *owner;			/* Nexthop owner table */
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */

From 0faf3bb6306bbc36f2f600bf5b3f8dcba8559c7f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Sep 2023 14:40:33 +0200
Subject: [PATCH 336/431] Enhanced tracing of route refresh state

---
 nest/rt-table.c | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6d99a7b3..1c7c5da6 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -138,6 +138,7 @@ static void rt_next_hop_update(struct rtable_private *tab);
 static void rt_nhu_uncork(void *_tab);
 static inline void rt_next_hop_resolve_rte(rte *r);
 static inline void rt_flowspec_resolve_rte(rte *r, struct channel *c);
+static void rt_refresh_trace(struct rtable_private *tab, struct rt_import_hook *ih, const char *msg);
 static inline void rt_prune_table(struct rtable_private *tab);
 static void rt_kick_prune_timer(struct rtable_private *tab);
 static void rt_feed_by_fib(void *);
@@ -2082,6 +2083,8 @@ rt_stop_import(struct rt_import_request *req, void (*stopped)(struct rt_import_r
     rt_set_import_state(hook, TIS_STOP);
     hook->stopped = stopped;
 
+    rt_refresh_trace(tab, hook, "stop import");
+
     /* Cancel table rr_counter */
     if (hook->stale_set != hook->stale_pruned)
       tab->rr_counter -= (hook->stale_set - hook->stale_pruned);
@@ -2372,9 +2375,7 @@ rt_refresh_begin(struct rt_import_request *req)
   /* The table must know that we're route-refreshing */
   tab->rr_counter++;
 
-  if (req->trace_routes & D_STATES)
-    log(L_TRACE "%s: route refresh begin [%u]", req->name, hook->stale_set);
-
+  rt_refresh_trace(tab, hook, "route refresh begin");
   }
 }
 
@@ -2395,20 +2396,32 @@ rt_refresh_end(struct rt_import_request *req)
   RT_LOCKED(hook->table, tab)
   {
     /* Now valid routes are only those one with the latest stale_set value */
-    uint cnt = hook->stale_set - hook->stale_valid;
+    UNUSED uint cnt = hook->stale_set - hook->stale_valid;
     hook->stale_valid = hook->stale_set;
 
     /* Here we can't kick the timer as we aren't in the table service loop */
     rt_schedule_prune(tab);
 
-    if (req->trace_routes & D_STATES)
-      if (cnt > 1)
-	log(L_TRACE "%s: route refresh end (x%u) [%u]", req->name, cnt, hook->stale_valid);
-      else
-	log(L_TRACE "%s: route refresh end [%u]", req->name, hook->stale_valid);
+    rt_refresh_trace(tab, hook, "route refresh end");
   }
 }
 
+/**
+ * rt_refresh_trace - log information about route refresh
+ * @tab: table
+ * @ih: import hook doing the route refresh
+ * @msg: what is happening
+ *
+ * This function consistently logs route refresh messages.
+ */
+static void
+rt_refresh_trace(struct rtable_private *tab, struct rt_import_hook *ih, const char *msg)
+{
+  if (ih->req->trace_routes & D_STATES)
+    log(L_TRACE "%s: %s: rr %u set %u valid %u pruning %u pruned %u", ih->req->name, msg,
+	tab->rr_counter, ih->stale_set, ih->stale_valid, ih->stale_pruning, ih->stale_pruned);
+}
+
 /**
  * rte_dump - dump a route
  * @e: &rte to be dumped
@@ -2983,9 +2996,7 @@ rt_prune_table(struct rtable_private *tab)
       else if ((ih->stale_valid != ih->stale_pruning) && (ih->stale_pruning == ih->stale_pruned))
       {
 	ih->stale_pruning = ih->stale_valid;
-
-	if (ih->req->trace_routes & D_STATES)
-	  log(L_TRACE "%s: table prune after refresh begin [%u]", ih->req->name, ih->stale_pruning);
+	rt_refresh_trace(tab, ih, "table prune after refresh begin");
       }
 
     FIB_ITERATE_INIT(fit, &tab->fib);
@@ -3096,11 +3107,9 @@ again:
     }
     else if (ih->stale_pruning != ih->stale_pruned)
     {
-      DBG("pruning %s %s rr %u set %u valid %u pruning %u pruned %u", ih->req->name, tab->name, tab->rr_counter, ih->stale_set, ih->stale_valid, ih->stale_pruning, ih->stale_pruned);
       tab->rr_counter -= (ih->stale_pruning - ih->stale_pruned);
       ih->stale_pruned = ih->stale_pruning;
-      if (ih->req->trace_routes & D_STATES)
-	log(L_TRACE "%s: table prune after refresh end [%u]", ih->req->name, ih->stale_pruned);
+      rt_refresh_trace(tab, ih, "table prune after refresh end");
     }
 
   /* In some cases, we may want to directly proceed to export cleanup */

From 8638c6f0b3f0809ae754045a8aca64552d077210 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 14 Sep 2023 14:44:35 +0200
Subject: [PATCH 337/431] BGP: When debug { routes } is set, updates considered
 as loop are logged

---
 proto/bgp/attrs.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index e1b2f868..46145fc5 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -135,6 +135,10 @@ bgp_unset_attr(ea_list **to, uint code)
 #define REPORT(msg, args...) \
   ({ log(L_REMOTE "%s: " msg, s->proto->p.name, ## args); })
 
+#define RTRACE(msg, args...) \
+  ({ if (s->proto->p.debug & D_ROUTES) \
+   log(L_TRACE "%s: " msg, s->proto->p.name, ## args); })
+
 #define DISCARD(msg, args...) \
   ({ REPORT(msg, ## args); return; })
 
@@ -1473,21 +1477,23 @@ bgp_decode_attrs(struct bgp_parse_state *s, byte *data, uint len)
   if (!p->as4_session)
     bgp_process_as4_attrs(&attrs, s->pool);
 
+#define IS_LOOP(msg, args...)  { RTRACE("update is loop (" msg "), treating as withdraw", ##args); goto loop; }
+
   /* Reject routes with our ASN in AS_PATH attribute */
   if (bgp_as_path_loopy(p, attrs, p->local_as))
-    goto loop;
+    IS_LOOP("Our ASN %d in AS_PATH", p->local_as);
 
   /* Reject routes with our Confederation ID in AS_PATH attribute; RFC 5065 4.0 */
   if ((p->public_as != p->local_as) && bgp_as_path_loopy(p, attrs, p->public_as))
-    goto loop;
+    IS_LOOP("Our Confederation ID %d in AS_PATH", p->public_as);
 
   /* Reject routes with our Router ID in ORIGINATOR_ID attribute; RFC 4456 8 */
   if (p->is_internal && bgp_originator_id_loopy(p, attrs))
-    goto loop;
+    IS_LOOP("Our Router ID is Originator ID");
 
   /* Reject routes with our Cluster ID in CLUSTER_LIST attribute; RFC 4456 8 */
   if (p->rr_client && bgp_cluster_list_loopy(p, attrs))
-    goto loop;
+    IS_LOOP("Our Cluster ID is in Cluster List");
 
   /* If there is no local preference, define one */
   if (!BIT32_TEST(s->attrs_seen, BA_LOCAL_PREF))

From 88307c31c5156e8e963ac7196ec221f76a965846 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 15 Aug 2023 17:05:58 +0200
Subject: [PATCH 338/431] CLI: Dropping the mechanism of echoing log messages

This is better done by running tail -f on a logfile.
---
 nest/cli.c         | 109 ---------------------------------------------
 nest/cli.h         |   5 ---
 nest/config.Y      |  22 +--------
 sysdep/unix/log.c  |   9 ----
 sysdep/unix/main.c |   3 --
 sysdep/unix/unix.h |   1 -
 6 files changed, 1 insertion(+), 148 deletions(-)

diff --git a/nest/cli.c b/nest/cli.c
index b74edffb..e253a745 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -160,43 +160,6 @@ cli_printf(cli *c, int code, char *msg, ...)
   memcpy(cli_alloc_out(c, size), buf, size);
 }
 
-static void
-cli_copy_message(cli *c)
-{
-  byte *p, *q;
-  uint cnt = 2;
-
-  if (c->ring_overflow)
-    {
-      byte buf[64];
-      int n = bsprintf(buf, "<%d messages lost>\n", c->ring_overflow);
-      c->ring_overflow = 0;
-      memcpy(cli_alloc_out(c, n), buf, n);
-    }
-  p = c->ring_read;
-  while (*p)
-    {
-      cnt++;
-      p++;
-      if (p == c->ring_end)
-	p = c->ring_buf;
-      ASSERT(p != c->ring_write);
-    }
-  c->async_msg_size += cnt;
-  q = cli_alloc_out(c, cnt);
-  *q++ = '+';
-  p = c->ring_read;
-  do
-    {
-      *q = *p++;
-      if (p == c->ring_end)
-	p = c->ring_buf;
-    }
-  while (*q++);
-  c->ring_read = p;
-  q[-1] = '\n';
-}
-
 static void
 cli_hello(cli *c)
 {
@@ -283,10 +246,6 @@ cli_event(void *data)
   cli *c = data;
   int err;
 
-  while (c->ring_read != c->ring_write &&
-      c->async_msg_size < CLI_MAX_ASYNC_QUEUE)
-    cli_copy_message(c);
-
   if (c->tx_pos)
     ;
   else if (c->cont)
@@ -335,80 +294,12 @@ cli_kick(cli *c)
 static list cli_log_hooks;
 static int cli_log_inited;
 
-void
-cli_set_log_echo(cli *c, uint mask, uint size)
-{
-  if (c->ring_buf)
-    {
-      mb_free(c->ring_buf);
-      c->ring_buf = c->ring_end = c->ring_read = c->ring_write = NULL;
-      rem_node(&c->n);
-    }
-  c->log_mask = mask;
-  if (mask && size)
-    {
-      c->ring_buf = mb_alloc(c->pool, size);
-      c->ring_end = c->ring_buf + size;
-      c->ring_read = c->ring_write = c->ring_buf;
-      add_tail(&cli_log_hooks, &c->n);
-      c->log_threshold = size / 8;
-    }
-  c->ring_overflow = 0;
-}
-
-void
-cli_echo(uint class, byte *msg)
-{
-  unsigned len, free, i, l;
-  cli *c;
-  byte *m;
-
-  if (!cli_log_inited || EMPTY_LIST(cli_log_hooks))
-    return;
-  len = strlen(msg) + 1;
-  WALK_LIST(c, cli_log_hooks)
-    {
-      if (!(c->log_mask & (1 << class)))
-	continue;
-      if (c->ring_read <= c->ring_write)
-	free = (c->ring_end - c->ring_buf) - (c->ring_write - c->ring_read + 1);
-      else
-	free = c->ring_read - c->ring_write - 1;
-      if ((len > free) ||
-	  (free < c->log_threshold && class < (unsigned) L_INFO[0]))
-	{
-	  c->ring_overflow++;
-	  continue;
-	}
-      if (c->ring_read == c->ring_write)
-	ev_schedule(c->event);
-      m = msg;
-      l = len;
-      while (l)
-	{
-	  if (c->ring_read <= c->ring_write)
-	    i = c->ring_end - c->ring_write;
-	  else
-	    i = c->ring_read - c->ring_write;
-	  if (i > l)
-	    i = l;
-	  memcpy(c->ring_write, m, i);
-	  m += i;
-	  l -= i;
-	  c->ring_write += i;
-	  if (c->ring_write == c->ring_end)
-	    c->ring_write = c->ring_buf;
-	}
-    }
-}
-
 /* Hack for scheduled undo notification */
 extern cli *cmd_reconfig_stored_cli;
 
 void
 cli_free(cli *c)
 {
-  cli_set_log_echo(c, 0, 0);
   int defer = 0;
   if (c->cleanup)
     defer = c->cleanup(c);
diff --git a/nest/cli.h b/nest/cli.h
index c5cbd8d7..189d8389 100644
--- a/nest/cli.h
+++ b/nest/cli.h
@@ -40,9 +40,6 @@ typedef struct cli {
   int last_reply;
   int restricted;			/* CLI is restricted to read-only commands */
   struct linpool *parser_pool;		/* Pool used during parsing */
-  byte *ring_buf;			/* Ring buffer for asynchronous messages */
-  byte *ring_end, *ring_read, *ring_write;	/* Pointers to the ring buffer */
-  uint ring_overflow;			/* Counter of ring overflows */
   uint log_mask;			/* Mask of allowed message levels */
   uint log_threshold;			/* When free < log_threshold, store only important messages */
   uint async_msg_size;			/* Total size of async messages queued in tx_buf */
@@ -57,7 +54,6 @@ extern struct cli *this_cli;		/* Used during parsing */
 
 void cli_printf(cli *, int, char *, ...);
 #define cli_msg(x...) cli_printf(this_cli, x)
-void cli_set_log_echo(cli *, uint mask, uint size);
 
 static inline void cli_separator(cli *c)
 { if (c->last_reply) cli_printf(c, -c->last_reply, ""); };
@@ -69,7 +65,6 @@ void cli_init(void);
 void cli_free(cli *);
 void cli_kick(cli *);
 void cli_written(cli *);
-void cli_echo(uint class, byte *msg);
 
 static inline int cli_access_restricted(void)
 {
diff --git a/nest/config.Y b/nest/config.Y
index e7347877..2e70461a 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -143,7 +143,7 @@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
 %type <s> optproto
 %type <ra> r_args
 %type <sd> sym_args
-%type <i> proto_start echo_mask echo_size debug_mask debug_list debug_flag mrtdump_mask mrtdump_list mrtdump_flag export_mode limit_action net_type tos password_algorithm
+%type <i> proto_start debug_mask debug_list debug_flag mrtdump_mask mrtdump_list mrtdump_flag export_mode limit_action net_type tos password_algorithm
 %type <ps> proto_patt proto_patt2
 %type <cc> channel_start proto_channel
 %type <cl> limit_spec
@@ -892,26 +892,6 @@ CF_CLI(DUMP FILTER ALL,,, [[Dump all filters in linearized form]])
 CF_CLI(EVAL, term, <expr>, [[Evaluate an expression]])
 { cmd_eval(f_linearize($2, 1)); } ;
 
-CF_CLI_HELP(ECHO, ..., [[Control echoing of log messages]])
-CF_CLI(ECHO, echo_mask echo_size, (all | off | { debug|trace|info|remote|warning|error|auth [, ...] }) [<buffer-size>], [[Control echoing of log messages]]) {
-  cli_set_log_echo(this_cli, $2, $3);
-  cli_msg(0, "");
-} ;
-
-echo_mask:
-   ALL { $$ = ~0; }
- | OFF { $$ = 0; }
- | '{' log_mask_list '}' { $$ = $2; }
- ;
-
-echo_size:
-   /* empty */ { $$ = 4096; }
- | NUM {
-     if ($1 < 256 || $1 > 65536) cf_error("Invalid log buffer size");
-     $$ = $1;
-   }
- ;
-
 CF_CLI(DISABLE, proto_patt opttext, (<protocol> | \"<pattern>\" | all) [message], [[Disable protocol]])
 { proto_apply_cmd($2, proto_cmd_disable, 1, (uintptr_t) $3); } ;
 CF_CLI(ENABLE, proto_patt opttext, (<protocol> | \"<pattern>\" | all) [message], [[Enable protocol]])
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index d929e80e..5a1241dc 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -46,11 +46,6 @@ static pthread_mutex_t log_mutex;
 static inline void log_lock(void) { pthread_mutex_lock(&log_mutex); }
 static inline void log_unlock(void) { pthread_mutex_unlock(&log_mutex); }
 
-static pthread_t main_thread;
-void main_thread_init(void) { main_thread = pthread_self(); }
-static int main_thread_self(void) { return pthread_equal(pthread_self(), main_thread); }
-
-
 #ifdef HAVE_SYSLOG_H
 #include <sys/syslog.h>
 
@@ -195,10 +190,6 @@ log_commit(int class, buffer *buf)
     }
   log_unlock();
 
-  /* cli_echo is not thread-safe, so call it just from the main thread */
-  if (main_thread_self())
-    cli_echo(class, buf->start);
-
   buf->pos = buf->start;
 }
 
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 0337c755..738efe46 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -951,9 +951,6 @@ main(int argc, char **argv)
       dup2(0, 2);
     }
 
-
-  main_thread_init();
-
   write_pid_file();
 
   signal_init();
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 606b79cd..5262f3bb 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -125,7 +125,6 @@ void krt_io_init(void);
 
 /* log.c */
 
-void main_thread_init(void);
 void log_init_debug(char *);		/* Initialize debug dump to given file (NULL=stderr, ""=off) */
 void log_switch(int initial, list *l, const char *);
 

From 32009cb6eb8f53333e56c96050896a6645d68f50 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 16 Aug 2023 15:05:36 +0200
Subject: [PATCH 339/431] Logging: Abolished stdio in favor of write() to make
 the logging faster.

---
 filter/data.c        |   2 +-
 filter/f-inst.c      |   9 ++-
 filter/filter.c      |  10 +--
 lib/birdlib.h        |  18 +++--
 lib/timer.c          |   5 +-
 nest/cmds.c          |   2 +-
 proto/bgp/bgp.c      |   2 +-
 sysdep/unix/config.Y |   9 +--
 sysdep/unix/io.c     |  40 ++++++----
 sysdep/unix/log.c    | 179 ++++++++++++++++++++++---------------------
 sysdep/unix/main.c   |  19 +++--
 sysdep/unix/unix.h   |  14 +++-
 12 files changed, 165 insertions(+), 144 deletions(-)

diff --git a/filter/data.c b/filter/data.c
index f104d2f8..ce8d7561 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -598,7 +598,7 @@ val_format(const struct f_val *v, buffer *buf)
 char *
 val_format_str(struct linpool *lp, const struct f_val *v) {
   buffer b;
-  LOG_BUFFER_INIT(b);
+  STACK_BUFFER_INIT(b, 1024);
   val_format(v, &b);
   return lp_strdup(lp, b.start);
 }
diff --git a/filter/f-inst.c b/filter/f-inst.c
index caffc2b8..4d0974e9 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -656,15 +656,20 @@
     VARARG;
 
     if (whati->varcount && !(fs->flags & FF_SILENT))
+    {
+      if (!fs->buf.class)
+	log_prepare(&fs->buf, *L_INFO);
+
       for (uint i=0; i<whati->varcount; i++)
-	val_format(&(vv(i)), &fs->buf);
+	val_format(&(vv(i)), &fs->buf.buf);
+    }
   }
 
   INST(FI_FLUSH, 0, 0) {
     NEVER_CONSTANT;
     if (!(fs->flags & FF_SILENT))
       /* After log_commit, the buffer is reset */
-      log_commit(*L_INFO, &fs->buf);
+      log_commit(&fs->buf);
   }
 
   INST(FI_DIE, 0, 0) {
diff --git a/filter/filter.c b/filter/filter.c
index 0aff4d30..931bc85e 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -77,7 +77,7 @@ struct filter_state {
   struct rte *rte;
 
   /* Buffer for log output */
-  struct buffer buf;
+  log_buffer buf;
 
   /* Filter execution flags */
   int flags;
@@ -219,8 +219,6 @@ f_run(const struct filter *filter, struct rte *rte, int flags)
 
   f_stack_init(filter_state);
 
-  LOG_BUFFER_INIT(filter_state.buf);
-
   /* Run the interpreter itself */
   enum filter_return fret = interpret(&filter_state, filter->root, NULL);
 
@@ -256,8 +254,6 @@ f_eval_rte(const struct f_line *expr, struct rte *rte)
 
   f_stack_init(filter_state);
 
-  LOG_BUFFER_INIT(filter_state.buf);
-
   ASSERT(!rta_is_cached(rte->attrs));
 
   return interpret(&filter_state, expr, NULL);
@@ -276,8 +272,6 @@ f_eval(const struct f_line *expr, struct f_val *pres)
 
   f_stack_init(filter_state);
 
-  LOG_BUFFER_INIT(filter_state.buf);
-
   enum filter_return fret = interpret(&filter_state, expr, pres);
   return fret;
 }
@@ -297,8 +291,6 @@ f_eval_int(const struct f_line *expr)
 
   struct f_val val;
 
-  LOG_BUFFER_INIT(filter_state.buf);
-
   if (interpret(&filter_state, expr, &val) > F_RETURN)
     cf_error("Runtime error while evaluating expression; see log for details");
 
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 2eec5c0f..8146e63b 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -151,6 +151,16 @@ typedef struct buffer {
   byte *end;
 } buffer;
 
+#define LOG_BUFFER_SIZE 2560
+
+typedef struct log_buffer {
+  struct buffer buf;
+  byte *tm_pos;
+  byte *msg_pos;
+  int class;
+  char block[LOG_BUFFER_SIZE];
+} log_buffer;
+
 #define STACK_BUFFER_INIT(buf,size)		\
   do {						\
     buf.start = alloca(size);			\
@@ -158,13 +168,9 @@ typedef struct buffer {
     buf.end = buf.start + size;			\
   } while(0)
 
-#define LOG_BUFFER_INIT(buf)			\
-  STACK_BUFFER_INIT(buf, LOG_BUFFER_SIZE)
-
-#define LOG_BUFFER_SIZE 1024
-
 #define log log_msg
-void log_commit(int class, buffer *buf);
+void log_prepare(log_buffer *buf, int class);
+void log_commit(log_buffer *buf);
 void log_msg(const char *msg, ...);
 void log_rl(struct tbf *rl, const char *msg, ...);
 void die(const char *msg, ...) NORET;
diff --git a/lib/timer.c b/lib/timer.c
index 4e4aa55e..d64a3921 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -323,8 +323,5 @@ tm_format_real_time(char *x, size_t max, const char *fmt, btime t)
   if (!strfusec(tbuf, tbuf_size, fmt, t2))
     return 0;
 
-  if (!strftime(x, max, tbuf, &tm))
-    return 0;
-
-  return 1;
+  return strftime(x, max, tbuf, &tm);
 }
diff --git a/nest/cmds.c b/nest/cmds.c
index 6717be0c..4805b5a2 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -134,7 +134,7 @@ void
 cmd_eval(const struct f_line *expr)
 {
   buffer buf;
-  LOG_BUFFER_INIT(buf);
+  STACK_BUFFER_INIT(buf, CLI_MSG_SIZE);
 
   if (f_eval_buf(expr, &buf) > F_RETURN)
     {
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index c98f84ab..3a7ed6b7 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -2532,7 +2532,7 @@ static void
 bgp_show_afis(int code, char *s, u32 *afis, uint count)
 {
   buffer b;
-  LOG_BUFFER_INIT(b);
+  STACK_BUFFER_INIT(b, CLI_MSG_SIZE);
 
   buffer_puts(&b, s);
 
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index a50ec757..b1d60906 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -52,15 +52,14 @@ log_file:
    text log_limit {
      if (!parse_and_exit)
      {
-       this_log->rf = rf_open(new_config->pool, $1, "a");
+       this_log->rf = rf_open(new_config->pool, $1, RF_APPEND);
        if (!this_log->rf) cf_error("Unable to open log file '%s': %m", $1);
-       this_log->fh = rf_file(this_log->rf);
      }
      this_log->pos = -1;
      this_log->filename = $1;
    }
- | SYSLOG syslog_name { this_log->fh = NULL; new_config->syslog_name = $2; }
- | STDERR { this_log->fh = stderr; }
+ | SYSLOG syslog_name { this_log->rf = NULL; new_config->syslog_name = $2; }
+ | STDERR { this_log->rf = &rf_stderr; }
  ;
 
 log_mask:
@@ -93,7 +92,7 @@ mrtdump_base:
  | MRTDUMP text ';' {
      if (!parse_and_exit)
      {
-       struct rfile *f = rf_open(new_config->pool, $2, "a");
+       struct rfile *f = rf_open(new_config->pool, $2, RF_APPEND);
        if (!f) cf_error("Unable to open MRTDump file '%s': %m", $2);
        new_config->mrtdump_file = rf_fileno(f);
      }
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index b21df057..74f3fc71 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -64,7 +64,11 @@
 
 struct rfile {
   resource r;
-  FILE *f;
+  int fd;
+};
+
+struct rfile rf_stderr = {
+  .fd = 2,
 };
 
 static void
@@ -72,7 +76,7 @@ rf_free(resource *r)
 {
   struct rfile *a = (struct rfile *) r;
 
-  fclose(a->f);
+  close(a->fd);
 }
 
 static void
@@ -80,7 +84,7 @@ rf_dump(resource *r, unsigned indent UNUSED)
 {
   struct rfile *a = (struct rfile *) r;
 
-  debug("(FILE *%p)\n", a->f);
+  debug("(fd %d)\n", a->fd);
 }
 
 static struct resclass rf_class = {
@@ -93,28 +97,34 @@ static struct resclass rf_class = {
 };
 
 struct rfile *
-rf_open(pool *p, const char *name, const char *mode)
+rf_open(pool *p, const char *name, enum rf_mode mode)
 {
-  FILE *f = fopen(name, mode);
+  int omode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
+  int flags;
 
-  if (!f)
-    return NULL;
+  switch (mode)
+  {
+    case RF_APPEND:
+      flags = O_WRONLY | O_CREAT | O_APPEND;
+      break;
+
+    default:
+      bug("rf_open() must have the mode set");
+  }
+
+  int fd = open(name, flags, omode);
+  if (fd < 0)
+    return NULL; /* The caller takes care of printing %m. */
 
   struct rfile *r = ralloc(p, &rf_class);
-  r->f = f;
+  r->fd = fd;
   return r;
 }
 
-void *
-rf_file(struct rfile *f)
-{
-  return f->f;
-}
-
 int
 rf_fileno(struct rfile *f)
 {
-  return fileno(f->f);
+  return f->fd;
 }
 
 
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 5a1241dc..b5159914 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -32,8 +32,7 @@
 #include "lib/lists.h"
 #include "sysdep/unix/unix.h"
 
-static int dbg_fd = -1;
-static FILE *dbgf;
+static struct rfile *dbg_rf;
 static list *current_log_list;
 static char *current_syslog_name; /* NULL -> syslog closed */
 
@@ -46,6 +45,12 @@ static pthread_mutex_t log_mutex;
 static inline void log_lock(void) { pthread_mutex_lock(&log_mutex); }
 static inline void log_unlock(void) { pthread_mutex_unlock(&log_mutex); }
 
+/* Logging flags to validly prepare logging messages */
+#define LOGGING_TO_TERMINAL   0x1
+#define LOGGING_TO_FILE	      0x2
+
+static _Atomic uint logging_flags;
+
 #ifdef HAVE_SYSLOG_H
 #include <sys/syslog.h>
 
@@ -86,15 +91,16 @@ log_size(struct log_config *l)
 static void
 log_close(struct log_config *l)
 {
-  rfree(l->rf);
+  if (l->rf != &rf_stderr)
+    rfree(l->rf);
+
   l->rf = NULL;
-  l->fh = NULL;
 }
 
 static int
 log_open(struct log_config *l)
 {
-  l->rf = rf_open(config->pool, l->filename, "a");
+  l->rf = rf_open(config->pool, l->filename, RF_APPEND);
   if (!l->rf)
   {
     /* Well, we cannot do much in case of error as log is closed */
@@ -102,7 +108,6 @@ log_open(struct log_config *l)
     return -1;
   }
 
-  l->fh = rf_file(l->rf);
   l->pos = log_size(l);
 
   return 0;
@@ -125,6 +130,8 @@ log_rotate(struct log_config *l)
   return log_open(l);
 }
 
+#define LOG_MSG_OFFSET	(TM_DATETIME_BUFFER_SIZE + 64)
+
 /**
  * log_commit - commit a log message
  * @class: message class information (%L_DEBUG to %L_BUG, see |lib/birdlib.h|)
@@ -139,69 +146,83 @@ log_rotate(struct log_config *l)
  * in log(), so it should be written like *L_INFO.
  */
 void
-log_commit(int class, buffer *buf)
+log_commit(log_buffer *buf)
 {
   struct log_config *l;
 
-  if (buf->pos == buf->end)
-    strcpy(buf->end - 100, " ... <too long>");
+  if (buf->buf.pos == buf->buf.end)
+#define TOO_LONG " ... <too long>"
+    memcpy(buf->buf.end - sizeof TOO_LONG, TOO_LONG, sizeof TOO_LONG);
+#undef TOO_LONG
 
   log_lock();
   WALK_LIST(l, *current_log_list)
     {
-      if (!(l->mask & (1 << class)))
+      if (!(l->mask & (1 << buf->class)))
 	continue;
-      if (l->fh)
+      if (l->rf && buf->tm_pos)
 	{
-	  if (l->terminal_flag)
-	    fputs("bird: ", l->fh);
-	  else
-	    {
-	      byte tbuf[TM_DATETIME_BUFFER_SIZE];
-	      const char *fmt = config ? config->tf_log.fmt1 : "%F %T.%3f";
-	      if (!tm_format_real_time(tbuf, sizeof(tbuf), fmt, current_real_time()))
-		strcpy(tbuf, "<error>");
+	  *buf->buf.pos = '\n';
+	  byte *begin = l->terminal_flag ? buf->buf.start : buf->tm_pos;
+	  off_t msg_len = buf->buf.pos - begin + 1;
+	  if (l->limit && (l->pos + msg_len > l->limit) && (log_rotate(l) < 0))
+	    continue;
 
-	      if (l->limit)
-	      {
-		off_t msg_len = strlen(tbuf) + strlen(class_names[class]) +
-		  (buf->pos - buf->start) + 5;
-
-		if (l->pos < 0)
-		  l->pos = log_size(l);
-
-		if (l->pos + msg_len > l->limit)
-		  if (log_rotate(l) < 0)
-		    continue;
-
-		l->pos += msg_len;
-	      }
-
-	      fprintf(l->fh, "%s [%04x] <%s> ", tbuf, THIS_THREAD_ID, class_names[class]);
-	    }
-	  fputs(buf->start, l->fh);
-	  fputc('\n', l->fh);
-	  fflush(l->fh);
+	  l->pos += msg_len;
+	  while ((write(rf_fileno(l->rf), buf->tm_pos, msg_len) < 0) && (errno == EINTR))
+	    ;
 	}
 #ifdef HAVE_SYSLOG_H
       else
-	syslog(syslog_priorities[class], "%s", buf->start);
+      {
+	*buf->buf.pos = '\0';
+	syslog(syslog_priorities[buf->class], "%s", buf->msg_pos);
+      }
 #endif
     }
   log_unlock();
 
-  buf->pos = buf->start;
+  buf->msg_pos = buf->tm_pos = NULL;
 }
 
 int buffer_vprint(buffer *buf, const char *fmt, va_list args);
 
+void
+log_prepare(log_buffer *buf, int class)
+{
+  buf->buf.start = buf->buf.pos = buf->block;
+  buf->buf.end = buf->block + sizeof buf->block;
+
+  int lf = atomic_load_explicit(&logging_flags, memory_order_acquire);
+  if (lf & LOGGING_TO_TERMINAL)
+    buffer_puts(&buf->buf, "bird: ");
+
+  if (lf & LOGGING_TO_FILE)
+  {
+    const char *fmt = config ? config->tf_log.fmt1 : "%F %T.%3f";
+
+    buf->tm_pos = buf->buf.pos;
+    int t = tm_format_real_time(buf->buf.pos, buf->buf.end - buf->buf.pos, fmt, current_real_time());
+    if (t)
+      buf->buf.pos += t;
+    else
+      buffer_puts(&buf->buf, "<time format error>");
+
+    buffer_print(&buf->buf, " [%04x] <%s> ", THIS_THREAD_ID, class_names[class]);
+  }
+
+  buf->msg_pos = buf->buf.pos;
+  buf->class = class;
+}
+
 static void
 vlog(int class, const char *msg, va_list args)
 {
-  buffer buf;
-  LOG_BUFFER_INIT(buf);
-  buffer_vprint(&buf, msg, args);
-  log_commit(class, &buf);
+  static _Thread_local log_buffer buf;
+
+  log_prepare(&buf, class);
+  buffer_vprint(&buf.buf, msg, args);
+  log_commit(&buf);
 }
 
 
@@ -301,33 +322,13 @@ debug(const char *msg, ...)
   int max = MAX_DEBUG_BUFSIZE;
 
   va_start(args, msg);
-  if (dbgf)
+  if (dbg_rf)
     {
-#if 0
-      struct timespec dbg_time;
-      clock_gettime(CLOCK_MONOTONIC, &dbg_time);
-      uint nsec;
-      uint sec;
-
-      if (dbg_time.tv_nsec > dbg_time_start.tv_nsec)
-      {
-	nsec = dbg_time.tv_nsec - dbg_time_start.tv_nsec;
-	sec = dbg_time.tv_sec - dbg_time_start.tv_sec;
-      }
-      else
-      {
-	nsec = 1000000000 + dbg_time.tv_nsec - dbg_time_start.tv_nsec;
-	sec = dbg_time.tv_sec - dbg_time_start.tv_sec - 1;
-      }
-
-      int n = bsnprintf(pos, max, "%u.%09u: [%04x] ", sec, nsec, THIS_THREAD_ID);
-      pos += n;
-      max -= n;
-#endif
-      if (bvsnprintf(pos, max, msg, args) < 0)
+      int s = bvsnprintf(pos, max, msg, args);
+      if (s < 0)
 	bug("Extremely long debug output, split it.");
 
-      fputs(buf, dbgf);
+      write(rf_fileno(dbg_rf), buf, s);
     }
   va_end(args);
 }
@@ -343,8 +344,8 @@ debug(const char *msg, ...)
 void
 debug_safe(const char *msg)
 {
-  if (dbg_fd >= 0)
-    write(dbg_fd, msg, strlen(msg));
+  if (dbg_rf)
+    write(rf_fileno(dbg_rf), msg, strlen(msg));
 }
 
 static list *
@@ -355,7 +356,7 @@ default_log_list(int initial, const char **syslog_name)
   *syslog_name = NULL;
 
 #ifdef HAVE_SYSLOG_H
-  if (!dbgf)
+  if (!dbg_rf)
     {
       static struct log_config lc_syslog;
       lc_syslog = (struct log_config){
@@ -367,24 +368,24 @@ default_log_list(int initial, const char **syslog_name)
     }
 #endif
 
-  if (dbgf && (dbgf != stderr))
+  if (dbg_rf && (dbg_rf != &rf_stderr))
     {
       static struct log_config lc_debug;
       lc_debug = (struct log_config){
 	.mask = ~0,
-	.fh = dbgf
+	.rf = dbg_rf,
       };
 
       add_tail(&log_list, &lc_debug.n);
     }
 
-  if (initial || (dbgf == stderr))
+  if (initial || (dbg_rf == &rf_stderr))
     {
       static struct log_config lc_stderr;
       lc_stderr = (struct log_config){
 	.mask = ~0,
 	.terminal_flag = 1,
-	.fh = stderr
+	.rf = &rf_stderr,
       };
 
       add_tail(&log_list, &lc_stderr.n);
@@ -411,10 +412,19 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
 	log_close(l);
 
   /* Reopen the logs, needed for 'configure undo' */
+  uint flags = 0;
   if (logs)
     WALK_LIST(l, *logs)
+    {
+      if (l->terminal_flag)
+	flags |= LOGGING_TO_TERMINAL;
       if (l->filename && !l->rf)
 	log_open(l);
+      if (l->rf)
+	flags |= LOGGING_TO_FILE;
+    }
+
+  atomic_store_explicit(&logging_flags, flags, memory_order_release);
 
   current_log_list = logs;
 
@@ -447,24 +457,17 @@ log_init_debug(char *f)
 {
   clock_gettime(CLOCK_MONOTONIC, &dbg_time_start);
 
-  dbg_fd = -1;
-  if (dbgf && dbgf != stderr)
-    fclose(dbgf);
+  if (dbg_rf && dbg_rf != &rf_stderr)
+    close(rf_fileno(dbg_rf));
 
   if (!f)
-    dbgf = NULL;
+    dbg_rf = NULL;
   else if (!*f)
-    dbgf = stderr;
-  else if (!(dbgf = fopen(f, "a")))
+    dbg_rf = &rf_stderr;
+  else if (!(dbg_rf = rf_open(&root_pool, f, RF_APPEND)))
   {
     /* Cannot use die() nor log() here, logging is not yet initialized */
     fprintf(stderr, "bird: Unable to open debug file %s: %s\n", f, strerror(errno));
     exit(1);
   }
-
-  if (dbgf)
-  {
-    setvbuf(dbgf, NULL, _IONBF, 0);
-    dbg_fd = fileno(dbgf);
-  }
 }
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 738efe46..57a57e52 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -202,9 +202,10 @@ sysdep_preconfig(struct config *c)
 int
 sysdep_commit(struct config *new, struct config *old)
 {
-  log_switch(0, &new->logfiles, new->syslog_name);
-  bird_thread_commit(new, old);
+  if (!new->shutdown)
+    log_switch(0, &new->logfiles, new->syslog_name);
 
+  bird_thread_commit(new, old);
   return 0;
 }
 
@@ -893,14 +894,12 @@ main(int argc, char **argv)
     dmalloc_debug(0x2f03d00);
 #endif
 
-  times_update();
-  parse_args(argc, argv);
-  log_switch(1, NULL, NULL);
-
+  /* Prepare necessary infrastructure */
   the_bird_lock();
-
-  random_init();
+  times_update();
   resource_init();
+  random_init();
+
   birdloop_init();
   olock_init();
   rt_init();
@@ -909,6 +908,10 @@ main(int argc, char **argv)
 //  roa_init();
   config_init();
 
+  /* Arguments and logs */
+  parse_args(argc, argv);
+  log_switch(1, NULL, NULL);
+
   uid_t use_uid = get_uid(use_user);
   gid_t use_gid = get_gid(use_group);
 
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 5262f3bb..66a3118a 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -114,9 +114,16 @@ void io_init(void);
 void io_loop(void);
 void io_log_dump(void);
 int sk_open_unix(struct birdsock *s, struct birdloop *, char *name);
-struct rfile *rf_open(struct pool *, const char *name, const char *mode);
-void *rf_file(struct rfile *f);
+
+enum rf_mode {
+  RF_APPEND,
+};
+
+struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode);
 int rf_fileno(struct rfile *f);
+
+extern struct rfile rf_stderr;
+
 void test_old_bird(char *path);
 
 /* krt.c bits */
@@ -131,8 +138,7 @@ void log_switch(int initial, list *l, const char *);
 struct log_config {
   node n;
   uint mask;				/* Classes to log */
-  void *fh;				/* FILE to log to, NULL=syslog */
-  struct rfile *rf;			/* Resource for log file */
+  struct rfile *rf;			/* Resource for log file; NULL=syslog */
   const char *filename;			/* Log filename */
   const char *backup;			/* Secondary filename (for log rotation) */
   off_t pos;				/* Position/size of current log */

From 3c9429a282be9400a04bea0c591ea8666e931a86 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 21 Aug 2023 20:56:19 +0200
Subject: [PATCH 340/431] Threads: added a generic method to run in all threads

---
 sysdep/unix/io-loop.c | 197 ++++++++++++++++++++++++------------------
 sysdep/unix/io-loop.h |  16 ++++
 2 files changed, 127 insertions(+), 86 deletions(-)

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 58e296a6..cf4573c4 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -1143,17 +1143,79 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
   }
 }
 
+/* Cleanup after last thread */
+static void
+bird_thread_sync_finish(void *_sync)
+{
+  ASSERT_THE_BIRD_LOCKED;
+  struct bird_thread_syncer *sync = _sync;
+
+  /* Keep necessary pointers locally */
+  pool *p = sync->pool;
+  DOMAIN(control) lock = sync->lock;
+  LOCK_DOMAIN(control, lock);
+
+  /* This invalidates the `sync` pointer */
+  CALL(sync->finish, sync);
+
+  /* Free pool and domain */
+  rp_free(p);
+  UNLOCK_DOMAIN(control, lock);
+  DOMAIN_FREE(control, lock);
+}
+
+/* Process regular one thread hook */
+static void
+bird_thread_sync_one(void *_sync)
+{
+  struct bird_thread_syncer *sync = _sync;
+
+  LOCK_DOMAIN(control, sync->lock);
+  CALL(sync->hook, sync);
+  sync->done++;
+  if (sync->done == sync->total)
+    ev_send_loop(&main_birdloop, ev_new_init(sync->pool, bird_thread_sync_finish, sync));
+  UNLOCK_DOMAIN(control, sync->lock);
+}
+
+void
+bird_thread_sync_all(struct bird_thread_syncer *sync,
+    void (*hook)(struct bird_thread_syncer *),
+    void (*done)(struct bird_thread_syncer *), const char *name)
+{
+  sync->lock = DOMAIN_NEW(control);
+  DOMAIN_SETUP(control, sync->lock, name, NULL);
+  LOCK_DOMAIN(control, sync->lock);
+
+  sync->pool = rp_new(&root_pool, sync->lock.control, name);
+  sync->hook = hook;
+  sync->finish = done;
+
+  for (int i=0; i<2; i++)
+  {
+    struct birdloop_pickup_group *group = &pickup_groups[i];
+
+    LOCK_DOMAIN(attrs, group->domain);
+
+    struct bird_thread *thr;
+    WALK_LIST(thr, group->threads)
+    {
+      sync->total++;
+      ev_send(&thr->priority_events, ev_new_init(sync->pool, bird_thread_sync_one, sync));
+      wakeup_do_kick(thr);
+    }
+
+    UNLOCK_DOMAIN(attrs, group->domain);
+  }
+
+  UNLOCK_DOMAIN(control, sync->lock);
+}
 
-DEFINE_DOMAIN(control);
 
 struct bird_thread_show_data {
+  struct bird_thread_syncer sync;
   cli *cli;
-  pool *pool;
   linpool *lp;
-  DOMAIN(control) lock;
-  uint total;
-  uint done;
-  event finish_event;
   u8 show_loops;
   uint line_pos;
   uint line_max;
@@ -1161,6 +1223,8 @@ struct bird_thread_show_data {
 };
 
 #define tsd_append(...)		do { \
+  if (!tsd->lines) \
+    tsd->lines = mb_allocz(tsd->sync.pool, sizeof(const char *) * tsd->line_max); \
   if (tsd->line_pos >= tsd->line_max) \
     tsd->lines = mb_realloc(tsd->lines, sizeof (const char *) * (tsd->line_max *= 2)); \
   tsd->lines[tsd->line_pos++] = lp_sprintf(tsd->lp, __VA_ARGS__); \
@@ -1202,11 +1266,13 @@ bird_thread_show_loop(struct bird_thread_show_data *tsd, struct birdloop *loop)
 }
 
 static void
-bird_thread_show(void *data)
+bird_thread_show(struct bird_thread_syncer *sync)
 {
-  struct bird_thread_show_data *tsd = data;
+  struct bird_thread_show_data *tsd = SKIP_BACK(struct bird_thread_show_data, sync, sync);
+
+  if (!tsd->lp)
+    tsd->lp = lp_new(tsd->sync.pool);
 
-  LOCK_DOMAIN(control, tsd->lock);
   if (tsd->show_loops)
     tsd_append("Thread %p%s (busy counter %d)", this_thread, this_thread->busy_active ? " [busy]" : "", this_thread->busy_counter);
 
@@ -1220,8 +1286,6 @@ bird_thread_show(void *data)
     total_time_ns += loop->working.total_ns + loop->locking.total_ns;
   }
 
-  int last = (++tsd->done == tsd->total);
-
   if (tsd->show_loops)
   {
     tsd_append("  Total working time: %t", total_time_ns NS);
@@ -1231,76 +1295,61 @@ bird_thread_show(void *data)
   else
     tsd_append("Thread %p working %t s overhead %t s",
 	this_thread, total_time_ns NS, this_thread->overhead.total_ns NS);
-
-  if (last)
-  {
-    tsd->cli->cont = NULL;
-    tsd->cli->cleanup = NULL;
-    ev_send(&global_event_list, &tsd->finish_event);
-  }
-
-  UNLOCK_DOMAIN(control, tsd->lock);
 }
 
 static void
-bird_thread_show_finish(void *data)
+cmd_show_threads_done(struct bird_thread_syncer *sync)
 {
-  struct bird_thread_show_data *tsd = data;
+  struct bird_thread_show_data *tsd = SKIP_BACK(struct bird_thread_show_data, sync, sync);
   ASSERT_DIE(birdloop_inside(&main_birdloop));
-  DOMAIN(control) lock = tsd->lock;
-  LOCK_DOMAIN(control, lock);
 
-    for (int i=0; i<2; i++)
+  tsd->cli->cont = NULL;
+  tsd->cli->cleanup = NULL;
+
+  for (int i=0; i<2; i++)
+  {
+    struct birdloop_pickup_group *group = &pickup_groups[i];
+
+    LOCK_DOMAIN(attrs, group->domain);
+    uint count = 0;
+    u64 total_time_ns = 0;
+    if (!EMPTY_LIST(group->loops))
     {
-      struct birdloop_pickup_group *group = &pickup_groups[i];
+      if (tsd->show_loops)
+	tsd_append("Unassigned loops in group %d:", i);
 
-      LOCK_DOMAIN(attrs, group->domain);
-      uint count = 0;
-      u64 total_time_ns = 0;
-      if (!EMPTY_LIST(group->loops))
+      struct birdloop *loop;
+      WALK_LIST(loop, group->loops)
       {
 	if (tsd->show_loops)
-	  tsd_append("Unassigned loops in group %d:", i);
+	  bird_thread_show_loop(tsd, loop);
 
-	struct birdloop *loop;
-	WALK_LIST(loop, group->loops)
-	{
-	  if (tsd->show_loops)
-	    bird_thread_show_loop(tsd, loop);
-
-	  total_time_ns += loop->working.total_ns + loop->locking.total_ns;
-	  count++;
-	}
-
-	if (tsd->show_loops)
-	  tsd_append("  Total working time: %t", total_time_ns NS);
-	else
-	  tsd_append("Unassigned %d loops in group %d, total time %t", count, i, total_time_ns NS);
+	total_time_ns += loop->working.total_ns + loop->locking.total_ns;
+	count++;
       }
+
+      if (tsd->show_loops)
+	tsd_append("  Total working time: %t", total_time_ns NS);
       else
-	tsd_append("All loops in group %d are assigned.", i);
-
-      UNLOCK_DOMAIN(attrs, group->domain);
+	tsd_append("Unassigned %d loops in group %d, total time %t", count, i, total_time_ns NS);
     }
+    else
+      tsd_append("All loops in group %d are assigned.", i);
 
-    for (uint i = 0; i < tsd->line_pos - 1; i++)
-      cli_printf(tsd->cli, -1026, "%s", tsd->lines[i]);
+    UNLOCK_DOMAIN(attrs, group->domain);
+  }
 
-    cli_printf(tsd->cli, 1026, "%s", tsd->lines[tsd->line_pos-1]);
-    cli_write_trigger(tsd->cli);
+  for (uint i = 0; i < tsd->line_pos - 1; i++)
+    cli_printf(tsd->cli, -1026, "%s", tsd->lines[i]);
 
-    rp_free(tsd->pool);
-    UNLOCK_DOMAIN(control, lock);
-    DOMAIN_FREE(control, lock);
+  cli_printf(tsd->cli, 1026, "%s", tsd->lines[tsd->line_pos-1]);
+  cli_write_trigger(tsd->cli);
+  mb_free(tsd);
 }
 
 void
 cmd_show_threads(int show_loops)
 {
-  DOMAIN(control) lock = DOMAIN_NEW(control);
-  LOCK_DOMAIN(control, lock);
-  pool *p = rp_new(&root_pool, lock.control, "Show Threads");
-
   uint total_threads = 0, total_loops = 0;
   for (int i=0; i<2; i++)
   {
@@ -1313,43 +1362,19 @@ cmd_show_threads(int show_loops)
 
   /* Total number of lines must be recalculated when changing the code! */
 
-  struct bird_thread_show_data *tsd = mb_allocz(p, sizeof(struct bird_thread_show_data));
+  struct bird_thread_show_data *tsd = mb_allocz(&root_pool, sizeof(struct bird_thread_show_data));
   tsd->cli = this_cli;
-  tsd->pool = p;
-  tsd->lp = lp_new(p);
-  tsd->lock = lock;
   tsd->show_loops = show_loops;
-  tsd->finish_event = (event) {
-    .hook = bird_thread_show_finish,
-    .data = tsd,
-  };
   tsd->line_pos = 0;
   tsd->line_max = 64;
-  tsd->lines = mb_allocz(p, sizeof(const char *) * tsd->line_max);
 
   this_cli->cont = bird_thread_show_cli_cont;
   this_cli->cleanup = bird_thread_show_cli_cleanup;
 
-  for (int i=0; i<2; i++)
-  {
-    struct birdloop_pickup_group *group = &pickup_groups[i];
-
-    LOCK_DOMAIN(attrs, group->domain);
-
-    struct bird_thread *thr;
-    WALK_LIST(thr, group->threads)
-    {
-      tsd->total++;
-      ev_send(&thr->priority_events, ev_new_init(p, bird_thread_show, tsd));
-      wakeup_do_kick(thr);
-    }
-
-    UNLOCK_DOMAIN(attrs, group->domain);
-  }
-
-  UNLOCK_DOMAIN(control, lock);
+  bird_thread_sync_all(&tsd->sync, bird_thread_show, cmd_show_threads_done, "Show Threads");
 }
 
+
 /*
  *	Birdloop
  */
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index e16a4a05..d1fb4ea8 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -104,4 +104,20 @@ struct bird_thread
   struct spent_time overhead, idle;
 };
 
+
+DEFINE_DOMAIN(control);
+
+struct bird_thread_syncer {
+  pool *pool;
+  DOMAIN(control) lock;
+  uint total;
+  uint done;
+  void (*hook)(struct bird_thread_syncer *);	/* Runs in worker threads */
+  void (*finish)(struct bird_thread_syncer *);	/* Runs in main thread last */
+};
+
+void bird_thread_sync_all(struct bird_thread_syncer *sync,
+    void (*hook)(struct bird_thread_syncer *),
+    void (*done)(struct bird_thread_syncer *), const char *name);
+
 #endif

From 427177edb73120e4a43944f00babd0540b1890a5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 21 Aug 2023 18:44:10 +0200
Subject: [PATCH 341/431] Logging now doesn't lock with each message

The original logging routines were locking a common mutex. This led to
massive underperformance and unwanted serialization when heavily logging
due to lock contention. Now the logging is lockless, though still
serializing on write() syscalls to the same filedescriptor.

This change also brings in a persistent logging channel structures and
thus avoids writing into active configuration data structures during
regular run.
---
 conf/conf.c           |   1 -
 conf/conf.h           |   2 +-
 lib/locking.h         |   1 +
 sysdep/unix/config.Y  |   3 +-
 sysdep/unix/io-loop.c |  13 --
 sysdep/unix/io.c      |  61 ++++++-
 sysdep/unix/log.c     | 387 ++++++++++++++++++++++++++++++++----------
 sysdep/unix/unix.h    |   7 +-
 test/bt-utils.c       |   2 +-
 9 files changed, 356 insertions(+), 121 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index 99927ce0..d828b6df 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -101,7 +101,6 @@ config_alloc(const char *name)
 
   init_list(&c->tests);
   init_list(&c->symbols);
-  c->mrtdump_file = -1; /* Hack, this should be sysdep-specific */
   c->pool = p;
   c->mem = l;
   c->file_name = ndup;
diff --git a/conf/conf.h b/conf/conf.h
index c51b01c9..58a2733b 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -25,7 +25,7 @@ struct config {
   list tests;				/* Configured unit tests (f_bt_test_suite) */
   list symbols;				/* Configured symbols in config order */
 
-  int mrtdump_file;			/* Configured MRTDump file (sysdep, fd in unix) */
+  struct rfile *mrtdump_file;		/* Configured MRTDump file */
   const char *syslog_name;		/* Name used for syslog (NULL -> no syslog) */
   struct symbol *def_tables[NET_MAX];	/* Default routing tables for each network */
   struct iface_patt *router_id_from;	/* Configured list of router ID iface patterns */
diff --git a/lib/locking.h b/lib/locking.h
index fc3c59ff..fbc8fd8b 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -21,6 +21,7 @@ struct lock_order {
   struct domain_generic *service;
   struct domain_generic *rtable;
   struct domain_generic *attrs;
+  struct domain_generic *logging;
   struct domain_generic *resource;
 };
 
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index b1d60906..49aa8582 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -55,7 +55,6 @@ log_file:
        this_log->rf = rf_open(new_config->pool, $1, RF_APPEND);
        if (!this_log->rf) cf_error("Unable to open log file '%s': %m", $1);
      }
-     this_log->pos = -1;
      this_log->filename = $1;
    }
  | SYSLOG syslog_name { this_log->rf = NULL; new_config->syslog_name = $2; }
@@ -94,7 +93,7 @@ mrtdump_base:
      {
        struct rfile *f = rf_open(new_config->pool, $2, RF_APPEND);
        if (!f) cf_error("Unable to open MRTDump file '%s': %m", $2);
-       new_config->mrtdump_file = rf_fileno(f);
+       new_config->mrtdump_file = f;
      }
    }
  ;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index cf4573c4..db5bbcb5 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -1184,7 +1184,6 @@ bird_thread_sync_all(struct bird_thread_syncer *sync,
     void (*done)(struct bird_thread_syncer *), const char *name)
 {
   sync->lock = DOMAIN_NEW(control);
-  DOMAIN_SETUP(control, sync->lock, name, NULL);
   LOCK_DOMAIN(control, sync->lock);
 
   sync->pool = rp_new(&root_pool, sync->lock.control, name);
@@ -1350,18 +1349,6 @@ cmd_show_threads_done(struct bird_thread_syncer *sync)
 void
 cmd_show_threads(int show_loops)
 {
-  uint total_threads = 0, total_loops = 0;
-  for (int i=0; i<2; i++)
-  {
-    struct birdloop_pickup_group *group = &pickup_groups[i];
-    LOCK_DOMAIN(attrs, group->domain);
-    total_threads += group->thread_count;
-    total_loops += group->loop_count;
-    UNLOCK_DOMAIN(attrs, group->domain);
-  }
-
-  /* Total number of lines must be recalculated when changing the code! */
-
   struct bird_thread_show_data *tsd = mb_allocz(&root_pool, sizeof(struct bird_thread_show_data));
   tsd->cli = this_cli;
   tsd->show_loops = show_loops;
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 74f3fc71..ff6f96af 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/un.h>
@@ -64,7 +65,9 @@
 
 struct rfile {
   resource r;
+  struct stat stat;
   int fd;
+  _Atomic off_t pos;
 };
 
 struct rfile rf_stderr = {
@@ -96,8 +99,8 @@ static struct resclass rf_class = {
   NULL
 };
 
-struct rfile *
-rf_open(pool *p, const char *name, enum rf_mode mode)
+static int
+rf_open_get_fd(const char *name, enum rf_mode mode)
 {
   int omode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
   int flags;
@@ -112,19 +115,65 @@ rf_open(pool *p, const char *name, enum rf_mode mode)
       bug("rf_open() must have the mode set");
   }
 
-  int fd = open(name, flags, omode);
+  return open(name, flags, omode);
+}
+
+static void
+rf_stat(struct rfile *r)
+{
+  if (fstat(r->fd, &r->stat) < 0)
+    die("fstat() failed: %m");
+}
+
+struct rfile *
+rf_open(pool *p, const char *name, enum rf_mode mode)
+{
+  int fd = rf_open_get_fd(name, mode);
+
   if (fd < 0)
     return NULL; /* The caller takes care of printing %m. */
 
   struct rfile *r = ralloc(p, &rf_class);
   r->fd = fd;
+
+  switch (mode)
+  {
+    case RF_APPEND:
+      rf_stat(r);
+      r->pos = S_ISREG(r->stat.st_mode) ? r->stat.st_size : 0;
+      break;
+
+    default:
+      bug("rf_open() must have the mode set");
+  }
+
   return r;
 }
 
-int
-rf_fileno(struct rfile *f)
+off_t
+rf_size(struct rfile *r)
 {
-  return f->fd;
+  return atomic_load_explicit(&r->pos, memory_order_relaxed);
+}
+
+int
+rf_same(struct rfile *a, struct rfile *b)
+{
+  rf_stat(a);
+  rf_stat(b);
+
+  return
+    (a->stat.st_mode == b->stat.st_mode) &&
+    (a->stat.st_dev == b->stat.st_dev) &&
+    (a->stat.st_ino == b->stat.st_ino);
+}
+
+void
+rf_write(struct rfile *r, const void *buf, size_t count)
+{
+  while ((write(r->fd, buf, count) < 0) && (errno == EINTR))
+    ;
+  atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed);
 }
 
 
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index b5159914..87df4fc6 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -20,8 +20,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 
@@ -31,25 +29,31 @@
 #include "lib/string.h"
 #include "lib/lists.h"
 #include "sysdep/unix/unix.h"
+#include "sysdep/unix/io-loop.h"
+
+static pool *log_pool;
 
 static struct rfile *dbg_rf;
-static list *current_log_list;
-static char *current_syslog_name; /* NULL -> syslog closed */
+static char *current_syslog_name = NULL; /* NULL -> syslog closed */
 
 _Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
 _Thread_local uint this_thread_id;
 
 #include <pthread.h>
 
-static pthread_mutex_t log_mutex;
-static inline void log_lock(void) { pthread_mutex_lock(&log_mutex); }
-static inline void log_unlock(void) { pthread_mutex_unlock(&log_mutex); }
+DEFINE_DOMAIN(logging);
+static DOMAIN(logging) log_domain;
+#define log_lock()  LOCK_DOMAIN(logging, log_domain);
+#define log_unlock()  UNLOCK_DOMAIN(logging, log_domain);
+
+static struct log_channel * _Atomic global_logs;
 
 /* Logging flags to validly prepare logging messages */
 #define LOGGING_TO_TERMINAL   0x1
 #define LOGGING_TO_FILE	      0x2
 
 static _Atomic uint logging_flags;
+static _Atomic uint logging_mask;
 
 #ifdef HAVE_SYSLOG_H
 #include <sys/syslog.h>
@@ -81,53 +85,76 @@ static char *class_names[] = {
   "BUG"
 };
 
-static inline off_t
-log_size(struct log_config *l)
+struct log_channel {
+  struct log_channel * _Atomic next;
+  const char *filename;			/* Log filename */
+  const char *backup;			/* Secondary filename (for log rotation) */
+  struct rfile * _Atomic rf;		/* File handle */
+  off_t limit;				/* Log size limit */
+  _Atomic uint mask;			/* Classes to log */
+  uint new_mask;			/* Pending new mask */
+  uint terminal:1;			/* Is terminal */
+};
+
+struct log_thread_syncer {
+  struct bird_thread_syncer sync;
+  struct log_channel *lc_close;
+  struct rfile *rf_close;
+  const char *name;
+  event lts_event;
+};
+
+static void
+lts_done(struct bird_thread_syncer *sync)
 {
-  struct stat st;
-  return (!fstat(rf_fileno(l->rf), &st) && S_ISREG(st.st_mode)) ? st.st_size : 0;
+  struct log_thread_syncer *lts = SKIP_BACK(struct log_thread_syncer, sync, sync);
+
+  log_lock();
+  if (lts->lc_close)
+  {
+    lts->rf_close = atomic_load_explicit(&lts->lc_close->rf, memory_order_relaxed);
+    mb_free(lts->lc_close);
+  }
+
+  if (lts->rf_close && lts->rf_close != &rf_stderr)
+    rfree(lts->rf_close);
+
+  mb_free(lts);
+  log_unlock();
 }
 
 static void
-log_close(struct log_config *l)
+lts_event(void *_lts)
 {
-  if (l->rf != &rf_stderr)
-    rfree(l->rf);
-
-  l->rf = NULL;
+  struct log_thread_syncer *lts = _lts;
+  bird_thread_sync_all(&lts->sync, NULL, lts_done, lts->name);
 }
 
-static int
-log_open(struct log_config *l)
+static void
+lts_request(struct log_channel *lc_close, struct rfile *rf_close, const char *name)
 {
-  l->rf = rf_open(config->pool, l->filename, RF_APPEND);
-  if (!l->rf)
-  {
-    /* Well, we cannot do much in case of error as log is closed */
-    l->mask = 0;
-    return -1;
-  }
-
-  l->pos = log_size(l);
-
-  return 0;
+  struct log_thread_syncer *lts = mb_allocz(log_pool, sizeof *lts);
+  lts->lc_close = lc_close;
+  lts->rf_close = rf_close;
+  lts->name = name;
+  lts->lts_event = (event) { .hook = lts_event, .data = lts, };
+  ev_send_loop(&main_birdloop, &lts->lts_event);
 }
 
-static int
-log_rotate(struct log_config *l)
+static void
+log_rotate(struct log_channel *lc)
 {
-  log_close(l);
+  struct log_thread_syncer *lts = mb_allocz(log_pool, sizeof *lts);
 
-  /* If we cannot rename the logfile, we at least try to delete it
-     in order to continue logging and not exceeding logfile size */
-  if ((rename(l->filename, l->backup) < 0) &&
-      (unlink(l->filename) < 0))
-  {
-    l->mask = 0;
-    return -1;
-  }
+  if ((rename(lc->filename, lc->backup) < 0) && (unlink(lc->filename) < 0))
+    return lts_request(lc, NULL, "Log Rotate Failed");
 
-  return log_open(l);
+  struct rfile *rf = rf_open(log_pool, lc->filename, RF_APPEND);
+  if (!rf)
+    return lts_request(lc, NULL, "Log Rotate Failed");
+
+  lts_request(NULL, atomic_load_explicit(&lc->rf, memory_order_relaxed), "Log Rotate Close Old File");
+  atomic_store_explicit(&lc->rf, rf, memory_order_release);
 }
 
 #define LOG_MSG_OFFSET	(TM_DATETIME_BUFFER_SIZE + 64)
@@ -148,29 +175,40 @@ log_rotate(struct log_config *l)
 void
 log_commit(log_buffer *buf)
 {
-  struct log_config *l;
-
   if (buf->buf.pos == buf->buf.end)
 #define TOO_LONG " ... <too long>"
     memcpy(buf->buf.end - sizeof TOO_LONG, TOO_LONG, sizeof TOO_LONG);
 #undef TOO_LONG
 
-  log_lock();
-  WALK_LIST(l, *current_log_list)
+  for (
+      struct log_channel *l = atomic_load_explicit(&global_logs, memory_order_acquire);
+      l;
+      l = atomic_load_explicit(&l->next, memory_order_acquire)
+      )
     {
-      if (!(l->mask & (1 << buf->class)))
+      uint mask = atomic_load_explicit(&l->mask, memory_order_acquire);
+      if (!(mask & (1 << buf->class)))
 	continue;
-      if (l->rf && buf->tm_pos)
+
+      struct rfile *rf = atomic_load_explicit(&l->rf, memory_order_acquire);
+      if (rf && buf->tm_pos)
 	{
 	  *buf->buf.pos = '\n';
-	  byte *begin = l->terminal_flag ? buf->buf.start : buf->tm_pos;
+	  byte *begin = l->terminal ? buf->buf.start : buf->tm_pos;
 	  off_t msg_len = buf->buf.pos - begin + 1;
-	  if (l->limit && (l->pos + msg_len > l->limit) && (log_rotate(l) < 0))
-	    continue;
+	  if (l->limit && (rf_size(rf) + msg_len > l->limit))
+	    {
+	      log_lock();
+              rf = atomic_load_explicit(&l->rf, memory_order_acquire);
+	      if (rf_size(rf) + msg_len > l->limit)
+	      {
+		log_rotate(l);
+		rf = atomic_load_explicit(&l->rf, memory_order_relaxed);
+	      }
+	      log_unlock();
+	    }
 
-	  l->pos += msg_len;
-	  while ((write(rf_fileno(l->rf), buf->tm_pos, msg_len) < 0) && (errno == EINTR))
-	    ;
+	  rf_write(l->rf, buf->tm_pos, msg_len);
 	}
 #ifdef HAVE_SYSLOG_H
       else
@@ -180,7 +218,6 @@ log_commit(log_buffer *buf)
       }
 #endif
     }
-  log_unlock();
 
   buf->msg_pos = buf->tm_pos = NULL;
 }
@@ -220,6 +257,10 @@ vlog(int class, const char *msg, va_list args)
 {
   static _Thread_local log_buffer buf;
 
+  /* No logging at all if nobody would receive the message either */
+  if (!(atomic_load_explicit(&logging_mask, memory_order_acquire) & (1 << class)))
+    return;
+
   log_prepare(&buf, class);
   buffer_vprint(&buf.buf, msg, args);
   log_commit(&buf);
@@ -328,7 +369,7 @@ debug(const char *msg, ...)
       if (s < 0)
 	bug("Extremely long debug output, split it.");
 
-      write(rf_fileno(dbg_rf), buf, s);
+      rf_write(dbg_rf, buf, s);
     }
   va_end(args);
 }
@@ -345,7 +386,7 @@ void
 debug_safe(const char *msg)
 {
   if (dbg_rf)
-    write(rf_fileno(dbg_rf), msg, strlen(msg));
+    rf_write(dbg_rf, msg, strlen(msg));
 }
 
 static list *
@@ -397,59 +438,217 @@ default_log_list(int initial, const char **syslog_name)
 void
 log_switch(int initial, list *logs, const char *new_syslog_name)
 {
-  struct log_config *l;
+  if (initial)
+  {
+    log_domain = DOMAIN_NEW(logging);
+    log_lock();
+    log_pool = rp_new(&root_pool, log_domain.logging, "Log files");
 
-  /* We should not manipulate with log list when other threads may use it */
-  log_lock();
+#if HAVE_SYSLOG_H
+    /* Create syslog channel */
+    struct log_channel *lc = mb_alloc(log_pool, sizeof *lc);
+
+    *lc = (struct log_channel) {};
+    ASSERT_DIE(NULL == atomic_exchange_explicit(&global_logs, lc, memory_order_release));
+#endif
+
+    log_unlock();
+  }
 
   if (!logs || EMPTY_LIST(*logs))
     logs = default_log_list(initial, &new_syslog_name);
 
-  /* Close the logs to avoid pinning them on disk when deleted */
-  if (current_log_list)
-    WALK_LIST(l, *current_log_list)
-      if (l->rf)
-	log_close(l);
+  ASSERT_DIE(logs);
 
-  /* Reopen the logs, needed for 'configure undo' */
-  uint flags = 0;
-  if (logs)
-    WALK_LIST(l, *logs)
+  /* Prepare the new log configuration */
+  struct log_config *l;
+  WALK_LIST(l, *logs)
+  {
+    int erf = 0;
+    log_lock();
+    if (l->rf && (l->rf != &rf_stderr))
+      rmove(l->rf, log_pool);
+    else if (l->filename)
     {
-      if (l->terminal_flag)
-	flags |= LOGGING_TO_TERMINAL;
-      if (l->filename && !l->rf)
-	log_open(l);
-      if (l->rf)
-	flags |= LOGGING_TO_FILE;
+      l->rf = rf_open(log_pool, l->filename, RF_APPEND);
+      erf = l->rf ? 0 : errno;
+    }
+    log_unlock();
+    if (erf)
+      log(L_ERR "Failed to open log file '%s': %M", l->filename, erf);
+  }
+
+  uint total_mask = 0;
+  uint flags = 0;
+
+  /* Update pre-existing log channels */
+  for (
+      struct log_channel * _Atomic *pprev = &global_logs, *ol;
+      ol = atomic_load_explicit(pprev, memory_order_acquire);
+      pprev = &ol->next)
+  {
+    ol->new_mask = 0;
+    if (ol->rf)
+    {
+      WALK_LIST(l, *logs)
+	if (l->rf && rf_same(l->rf, ol->rf))
+	{
+	  /* Merge the mask */
+	  ol->new_mask |= l->mask;
+	  total_mask |= l->mask;
+
+	  /* Merge flags */
+	  flags |= LOGGING_TO_FILE;
+	  if (l->terminal_flag)
+	  {
+	    flags |= LOGGING_TO_TERMINAL;
+	    ol->terminal = 1;
+	  }
+
+	  /* The filehandle is no longer needed */
+	  if (l->rf != &rf_stderr)
+	  {
+	    log_lock();
+	    rfree(l->rf);
+	    log_unlock();
+	  }
+
+	  l->rf = NULL;
+	}
+    }
+    else
+      WALK_LIST(l, *logs)
+	if (!l->filename && !l->rf)
+	{
+	  ol->new_mask |= l->mask;
+	  total_mask |= l->mask;
+	}
+
+    /* First only extend masks */
+    atomic_fetch_or_explicit(&ol->mask, ol->new_mask, memory_order_acq_rel);
+  }
+
+  atomic_fetch_or_explicit(&logging_mask, total_mask, memory_order_acq_rel);
+
+  /* Open new log channels */
+  WALK_LIST(l, *logs)
+  {
+    if (!l->rf)
+      continue;
+
+    /* Truly new log channel */
+    log_lock();
+    struct log_channel *lc = mb_alloc(log_pool, sizeof *lc);
+    log_unlock();
+
+    *lc = (struct log_channel) {
+      .filename = l->filename,
+      .backup = l->backup,
+      .rf = l->rf,
+      .limit = l->limit,
+      .new_mask = l->mask,
+      .terminal = l->terminal_flag,
+    };
+
+    total_mask |= l->mask;
+
+    /* Message preparation flags */
+    flags |= LOGGING_TO_FILE;
+    if (l->terminal_flag)
+    {
+      flags |= LOGGING_TO_TERMINAL;
+      lc->terminal = 1;
     }
 
-  atomic_store_explicit(&logging_flags, flags, memory_order_release);
+    /* Now the file handle ownership is transferred to the log channel */
+    l->rf = NULL;
 
-  current_log_list = logs;
+    /* Find more */
+    for (struct log_config *ll = NODE_NEXT(l); NODE_VALID(ll); ll = NODE_NEXT(ll))
+      if (ll->filename && ll->rf && rf_same(lc->rf, ll->rf))
+      {
+	/* Merged with this channel */
+	lc->new_mask |= ll->mask;
+	total_mask |= ll->mask;
+
+	if (l->rf != &rf_stderr)
+	{
+	  log_lock();
+	  rfree(ll->rf);
+	  log_unlock();
+	}
+	ll->rf = NULL;
+      }
+
+    atomic_store_explicit(&lc->mask, lc->new_mask, memory_order_release);
+
+    /* Insert into the main log list */
+    struct log_channel *head = atomic_load_explicit(&global_logs, memory_order_acquire);
+    do atomic_store_explicit(&lc->next, head, memory_order_release);
+    while (!atomic_compare_exchange_strong_explicit(
+	  &global_logs, &head, lc,
+	  memory_order_acq_rel, memory_order_acquire));
+  }
+
+  /* Merge overall flags */
+  atomic_fetch_or_explicit(&logging_flags, flags, memory_order_acq_rel);
+  atomic_fetch_or_explicit(&logging_mask, total_mask, memory_order_acq_rel);
+
+  /* Close end-of-life log channels */
+  for (struct log_channel * _Atomic *pprev = &global_logs,
+			  *ol = atomic_load_explicit(pprev, memory_order_acquire);
+      ol; )
+  {
+    /* Store new mask after opening new files to minimize missing log message race conditions */
+    atomic_store_explicit(&ol->mask, ol->new_mask, memory_order_release);
+
+    /* Never close syslog channel */
+    if (ol->new_mask || !ol->rf)
+    {
+      pprev = &ol->next;
+      ol = atomic_load_explicit(pprev, memory_order_acquire);
+    }
+    else
+    {
+      /* This file has no logging set up, remove from list */
+      struct log_channel *next = atomic_load_explicit(&ol->next, memory_order_acquire);
+      atomic_store_explicit(pprev, next, memory_order_release);
+
+      /* Free the channel after all worker threads leave the critical section */
+      log_lock();
+      lts_request(ol, NULL, "Log Reconfigure Close Old File");
+      log_unlock();
+
+      /* Continue to next */
+      ol = next;
+    }
+  }
+
+  /* Set overall flags after files are closed */
+  atomic_store_explicit(&logging_flags, flags, memory_order_release);
+  atomic_store_explicit(&logging_mask, total_mask, memory_order_release);
 
 #ifdef HAVE_SYSLOG_H
-  if (!bstrcmp(current_syslog_name, new_syslog_name))
-    goto done;
-
-  if (current_syslog_name)
+  if ((!current_syslog_name != !new_syslog_name)
+      || bstrcmp(current_syslog_name, new_syslog_name))
   {
-    closelog();
-    xfree(current_syslog_name);
-    current_syslog_name = NULL;
-  }
+    char *old_syslog_name = current_syslog_name;
 
-  if (new_syslog_name)
-  {
-    current_syslog_name = xstrdup(new_syslog_name);
-    openlog(current_syslog_name, LOG_CONS | LOG_NDELAY, LOG_DAEMON);
-  }
+    if (new_syslog_name)
+    {
+      current_syslog_name = xstrdup(new_syslog_name);
+      openlog(current_syslog_name, LOG_CONS | LOG_NDELAY, LOG_DAEMON);
+    }
+    else
+    {
+      current_syslog_name = NULL;
+      closelog();
+    }
 
+    if (old_syslog_name)
+      xfree(old_syslog_name);
+  }
 #endif
-
-done:
-  /* Logs exchange done, let the threads log as before */
-  log_unlock();
 }
 
 void
@@ -458,7 +657,7 @@ log_init_debug(char *f)
   clock_gettime(CLOCK_MONOTONIC, &dbg_time_start);
 
   if (dbg_rf && dbg_rf != &rf_stderr)
-    close(rf_fileno(dbg_rf));
+    rfree(dbg_rf);
 
   if (!f)
     dbg_rf = NULL;
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 66a3118a..e73778ec 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -120,7 +120,9 @@ enum rf_mode {
 };
 
 struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode);
-int rf_fileno(struct rfile *f);
+off_t rf_size(struct rfile *);
+int rf_same(struct rfile *, struct rfile *);
+void rf_write(struct rfile *, const void *, size_t);
 
 extern struct rfile rf_stderr;
 
@@ -138,10 +140,9 @@ void log_switch(int initial, list *l, const char *);
 struct log_config {
   node n;
   uint mask;				/* Classes to log */
-  struct rfile *rf;			/* Resource for log file; NULL=syslog */
+  struct rfile *rf;			/* File handle */
   const char *filename;			/* Log filename */
   const char *backup;			/* Secondary filename (for log rotation) */
-  off_t pos;				/* Position/size of current log */
   off_t limit;				/* Log size limit */
   int terminal_flag;
 };
diff --git a/test/bt-utils.c b/test/bt-utils.c
index d497840f..5cfc6e17 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -60,10 +60,10 @@ bt_bird_init(void)
 {
   if(bt_verbose)
     log_init_debug("");
-  log_switch(bt_verbose != 0, NULL, NULL);
 
   olock_init();
   rt_init();
+  log_switch(1, NULL, NULL);
   io_init();
   if_init();
   config_init();

From 75a5936924e2c65cf1f344946fe7c8a9d40ff2d9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 24 Aug 2023 15:38:44 +0200
Subject: [PATCH 342/431] Logging limit enforcement moved into the rfile
 structure

---
 sysdep/unix/config.Y |  4 ++--
 sysdep/unix/io.c     | 20 +++++++++++++++-----
 sysdep/unix/log.c    | 28 ++++++++++++++++------------
 sysdep/unix/unix.h   |  4 ++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index 49aa8582..a9feec02 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -52,7 +52,7 @@ log_file:
    text log_limit {
      if (!parse_and_exit)
      {
-       this_log->rf = rf_open(new_config->pool, $1, RF_APPEND);
+       this_log->rf = rf_open(new_config->pool, $1, RF_APPEND, this_log->limit);
        if (!this_log->rf) cf_error("Unable to open log file '%s': %m", $1);
      }
      this_log->filename = $1;
@@ -91,7 +91,7 @@ mrtdump_base:
  | MRTDUMP text ';' {
      if (!parse_and_exit)
      {
-       struct rfile *f = rf_open(new_config->pool, $2, RF_APPEND);
+       struct rfile *f = rf_open(new_config->pool, $2, RF_APPEND, 0);
        if (!f) cf_error("Unable to open MRTDump file '%s': %m", $2);
        new_config->mrtdump_file = f;
      }
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index ff6f96af..faf759a5 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -67,6 +67,7 @@ struct rfile {
   resource r;
   struct stat stat;
   int fd;
+  off_t limit;
   _Atomic off_t pos;
 };
 
@@ -126,7 +127,7 @@ rf_stat(struct rfile *r)
 }
 
 struct rfile *
-rf_open(pool *p, const char *name, enum rf_mode mode)
+rf_open(pool *p, const char *name, enum rf_mode mode, off_t limit)
 {
   int fd = rf_open_get_fd(name, mode);
 
@@ -135,6 +136,7 @@ rf_open(pool *p, const char *name, enum rf_mode mode)
 
   struct rfile *r = ralloc(p, &rf_class);
   r->fd = fd;
+  r->limit = limit;
 
   switch (mode)
   {
@@ -168,12 +170,20 @@ rf_same(struct rfile *a, struct rfile *b)
     (a->stat.st_ino == b->stat.st_ino);
 }
 
-void
+int
 rf_write(struct rfile *r, const void *buf, size_t count)
 {
-  while ((write(r->fd, buf, count) < 0) && (errno == EINTR))
-    ;
-  atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed);
+  if (r->limit && (atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) + (off_t) count > r->limit))
+  {
+    atomic_fetch_sub_explicit(&r->pos, count, memory_order_relaxed);
+    return 0;
+  }
+  else
+  {
+    while ((write(r->fd, buf, count) < 0) && (errno == EINTR))
+      ;
+    return 1;
+  }
 }
 
 
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 87df4fc6..0c89ebd6 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -149,7 +149,7 @@ log_rotate(struct log_channel *lc)
   if ((rename(lc->filename, lc->backup) < 0) && (unlink(lc->filename) < 0))
     return lts_request(lc, NULL, "Log Rotate Failed");
 
-  struct rfile *rf = rf_open(log_pool, lc->filename, RF_APPEND);
+  struct rfile *rf = rf_open(log_pool, lc->filename, RF_APPEND, lc->limit);
   if (!rf)
     return lts_request(lc, NULL, "Log Rotate Failed");
 
@@ -196,19 +196,23 @@ log_commit(log_buffer *buf)
 	  *buf->buf.pos = '\n';
 	  byte *begin = l->terminal ? buf->buf.start : buf->tm_pos;
 	  off_t msg_len = buf->buf.pos - begin + 1;
-	  if (l->limit && (rf_size(rf) + msg_len > l->limit))
+	  do {
+	    if (rf_write(rf, buf->tm_pos, msg_len))
+	      break;
+
+	    log_lock();
+	    rf = atomic_load_explicit(&l->rf, memory_order_acquire);
+	    if (rf_write(rf, buf->tm_pos, msg_len))
 	    {
-	      log_lock();
-              rf = atomic_load_explicit(&l->rf, memory_order_acquire);
-	      if (rf_size(rf) + msg_len > l->limit)
-	      {
-		log_rotate(l);
-		rf = atomic_load_explicit(&l->rf, memory_order_relaxed);
-	      }
 	      log_unlock();
+	      break;
 	    }
 
-	  rf_write(l->rf, buf->tm_pos, msg_len);
+	    log_rotate(l);
+	    log_unlock();
+
+	    rf = atomic_load_explicit(&l->rf, memory_order_relaxed);
+	  } while (!rf_write(rf, buf->tm_pos, msg_len));
 	}
 #ifdef HAVE_SYSLOG_H
       else
@@ -470,7 +474,7 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
       rmove(l->rf, log_pool);
     else if (l->filename)
     {
-      l->rf = rf_open(log_pool, l->filename, RF_APPEND);
+      l->rf = rf_open(log_pool, l->filename, RF_APPEND, l->limit);
       erf = l->rf ? 0 : errno;
     }
     log_unlock();
@@ -663,7 +667,7 @@ log_init_debug(char *f)
     dbg_rf = NULL;
   else if (!*f)
     dbg_rf = &rf_stderr;
-  else if (!(dbg_rf = rf_open(&root_pool, f, RF_APPEND)))
+  else if (!(dbg_rf = rf_open(&root_pool, f, RF_APPEND, 0)))
   {
     /* Cannot use die() nor log() here, logging is not yet initialized */
     fprintf(stderr, "bird: Unable to open debug file %s: %s\n", f, strerror(errno));
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index e73778ec..f193a8db 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -119,10 +119,10 @@ enum rf_mode {
   RF_APPEND,
 };
 
-struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode);
+struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode, off_t limit);
 off_t rf_size(struct rfile *);
 int rf_same(struct rfile *, struct rfile *);
-void rf_write(struct rfile *, const void *, size_t);
+int rf_write(struct rfile *, const void *, size_t);
 
 extern struct rfile rf_stderr;
 

From 144ac4c1d301863bf85b8aee8e9dca7a7e9e4466 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 24 Aug 2023 17:00:54 +0200
Subject: [PATCH 343/431] Logging: fixed size logfiles behaving as mmapped
 ringbuffers

This variant of logging avoids calling write() for every log line,
allowing for waitless logging. This makes heavy logging less heavy
and more useful for race condition debugging.
---
 doc/bird.sgml        |  5 +++--
 sysdep/unix/config.Y | 10 +++++++++-
 sysdep/unix/io.c     | 44 ++++++++++++++++++++++++++++++++++++++++++--
 sysdep/unix/unix.h   |  3 ++-
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 7c8e9895..0da616c7 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -471,7 +471,7 @@ ipv6 table
 include "tablename.conf";;
 </code>
 
-	<tag><label id="opt-log">log "<m/filename/" [<m/limit/ "<m/backup/"] | syslog [name <m/name/] | stderr all|{ <m/list of classes/ }</tag>
+	<tag><label id="opt-log">log "<m/filename/" [<m/limit/ "<m/backup/"] | fixed "<m/filename/" <m/size/ | syslog [name <m/name/] | stderr all|{ <m/list of classes/ }</tag>
 	Set logging of messages having the given class (either <cf/all/ or <cf>{
 	error|trace [, <m/.../] }</cf> etc.) into selected destination - a file
 	specified as a filename string (with optional log rotation information),
@@ -488,7 +488,8 @@ include "tablename.conf";;
 	Logging directly to file supports basic log rotation -- there is an
 	optional log file limit and a backup filename, when log file reaches the
 	limit, the current log file is renamed to the backup filename and a new
-	log file is created.
+	log file is created. It's also possible to log to a single file behaving
+	as a ring buffer with a fixed size.
 
 	You may specify more than one <cf/log/ line to establish logging to
 	multiple destinations. Default: log everything to the system log, or
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index a9feec02..a4aed847 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -19,7 +19,7 @@ CF_DECLS
 
 CF_KEYWORDS(LOG, SYSLOG, ALL, DEBUG, TRACE, INFO, REMOTE, WARNING, ERROR, AUTH, FATAL, BUG, STDERR, SOFT)
 CF_KEYWORDS(NAME, CONFIRM, UNDO, CHECK, TIMEOUT, DEBUG, LATENCY, LIMIT, WATCHDOG, WARNING, STATUS)
-CF_KEYWORDS(GRACEFUL, RESTART)
+CF_KEYWORDS(GRACEFUL, RESTART, FIXED)
 
 %type <i> log_mask log_mask_list log_cat cfg_timeout
 %type <t> cfg_name
@@ -57,6 +57,14 @@ log_file:
      }
      this_log->filename = $1;
    }
+ | FIXED text expr {
+     if (!parse_and_exit)
+     {
+       this_log->rf = rf_open(new_config->pool, $2, RF_FIXED, this_log->limit = $3);
+       if (!this_log->rf) cf_error("Unable to open log file '%s': %m", $2);
+     }
+     this_log->filename = $2;
+   }
  | SYSLOG syslog_name { this_log->rf = NULL; new_config->syslog_name = $2; }
  | STDERR { this_log->rf = &rf_stderr; }
  ;
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index faf759a5..83149a96 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -69,6 +70,7 @@ struct rfile {
   int fd;
   off_t limit;
   _Atomic off_t pos;
+  void *mapping;
 };
 
 struct rfile rf_stderr = {
@@ -80,6 +82,9 @@ rf_free(resource *r)
 {
   struct rfile *a = (struct rfile *) r;
 
+  if (a->mapping)
+    munmap(a->mapping, a->limit);
+
   close(a->fd);
 }
 
@@ -112,6 +117,10 @@ rf_open_get_fd(const char *name, enum rf_mode mode)
       flags = O_WRONLY | O_CREAT | O_APPEND;
       break;
 
+    case RF_FIXED:
+      flags = O_RDWR | O_CREAT;
+      break;
+
     default:
       bug("rf_open() must have the mode set");
   }
@@ -145,6 +154,18 @@ rf_open(pool *p, const char *name, enum rf_mode mode, off_t limit)
       r->pos = S_ISREG(r->stat.st_mode) ? r->stat.st_size : 0;
       break;
 
+    case RF_FIXED:
+      if ((ftruncate(fd, limit) < 0)
+	  || ((r->mapping = mmap(NULL, limit, PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED))
+      {
+	int erf = errno;
+	r->mapping = NULL;
+	rfree(r);
+	errno = erf;
+	return NULL;
+      }
+      break;
+
     default:
       bug("rf_open() must have the mode set");
   }
@@ -165,15 +186,34 @@ rf_same(struct rfile *a, struct rfile *b)
   rf_stat(b);
 
   return
+    (a->limit == b->limit) &&
     (a->stat.st_mode == b->stat.st_mode) &&
     (a->stat.st_dev == b->stat.st_dev) &&
     (a->stat.st_ino == b->stat.st_ino);
 }
 
 int
-rf_write(struct rfile *r, const void *buf, size_t count)
+rf_write(struct rfile *r, const void *buf, size_t _count)
 {
-  if (r->limit && (atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) + (off_t) count > r->limit))
+  off_t count = _count;
+
+  if (r->mapping)
+  {
+    /* Update the pointer */
+    off_t target = atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) % r->limit;
+
+    /* Take care of wrapping */
+    if (target + count > r->limit)
+    {
+      memcpy(r->mapping, buf + (r->limit - target), target + count - r->limit);
+      count = r->limit - target;
+    }
+
+    /* Write the line */
+    memcpy(r->mapping + target, buf, count);
+    return 1;
+  }
+  else if (r->limit && (atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) + count > r->limit))
   {
     atomic_fetch_sub_explicit(&r->pos, count, memory_order_relaxed);
     return 0;
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index f193a8db..7e1ef97c 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -116,7 +116,8 @@ void io_log_dump(void);
 int sk_open_unix(struct birdsock *s, struct birdloop *, char *name);
 
 enum rf_mode {
-  RF_APPEND,
+  RF_APPEND = 1,
+  RF_FIXED,
 };
 
 struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode, off_t limit);

From b43580d77d24b30d620b4fc394d596b4d2125754 Mon Sep 17 00:00:00 2001
From: Vojtech Vilimek <vojtech.vilimek@nic.cz>
Date: Thu, 14 Sep 2023 15:21:53 +0200
Subject: [PATCH 344/431] Renamed channel class pointers

The channel class pointers were strangely named , not .
---
 nest/proto.c      | 24 ++++++++++++------------
 nest/protocol.h   |  4 ++--
 nest/rt-table.c   |  2 +-
 proto/bgp/attrs.c |  4 ++--
 proto/bgp/bgp.c   |  8 ++++----
 proto/bgp/bgp.h   |  4 ++--
 proto/pipe/pipe.c |  4 ++--
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index b06f7b72..83fbce2c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -195,10 +195,10 @@ proto_find_channel_by_name(struct proto *p, const char *n)
 struct channel *
 proto_add_channel(struct proto *p, struct channel_config *cf)
 {
-  struct channel *c = mb_allocz(proto_pool, cf->channel->channel_size);
+  struct channel *c = mb_allocz(proto_pool, cf->class->channel_size);
 
   c->name = cf->name;
-  c->channel = cf->channel;
+  c->class = cf->class;
   c->proto = p;
   c->table = cf->table->table;
   rt_lock_table(c->table);
@@ -227,7 +227,7 @@ proto_add_channel(struct proto *p, struct channel_config *cf)
 
   init_list(&c->roa_subscriptions);
 
-  CALL(c->channel->init, c, cf);
+  CALL(c->class->init, c, cf);
 
   add_tail(&p->channels, &c->n);
 
@@ -415,7 +415,7 @@ channel_roa_subscribe_filter(struct channel *c, int dir)
 
 #ifdef CONFIG_BGP
   /* No automatic reload for BGP channels without in_table / out_table */
-  if (c->channel == &channel_bgp)
+  if (c->class == &channel_bgp)
     valid = dir ? ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER) : !!c->out_table;
 #endif
 
@@ -708,7 +708,7 @@ channel_do_start(struct channel *c)
   if ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
     channel_setup_in_table(c);
 
-  CALL(c->channel->start, c);
+  CALL(c->class->start, c);
 
   channel_start_import(c);
 }
@@ -752,7 +752,7 @@ channel_do_stop(struct channel *c)
   if (c->gr_lock)
     channel_graceful_restart_unlock(c);
 
-  CALL(c->channel->shutdown, c);
+  CALL(c->class->shutdown, c);
 
 }
 
@@ -770,7 +770,7 @@ channel_do_down(struct channel *c)
 
   /* The in_table and out_table are going to be freed by freeing their resource pools. */
 
-  CALL(c->channel->cleanup, c);
+  CALL(c->class->cleanup, c);
 
   /* Schedule protocol shutddown */
   if (proto_is_done(c->proto))
@@ -912,7 +912,7 @@ channel_config_new(const struct channel_class *cc, const char *name, uint net_ty
 
   cf = cfg_allocz(cc->config_size);
   cf->name = name;
-  cf->channel = cc;
+  cf->class = cc;
   cf->parent = proto;
   cf->table = tab;
   cf->out_filter = FILTER_REJECT;
@@ -959,12 +959,12 @@ channel_config_get(const struct channel_class *cc, const char *name, uint net_ty
 struct channel_config *
 channel_copy_config(struct channel_config *src, struct proto_config *proto)
 {
-  struct channel_config *dst = cfg_alloc(src->channel->config_size);
+  struct channel_config *dst = cfg_alloc(src->class->config_size);
 
-  memcpy(dst, src, src->channel->config_size);
+  memcpy(dst, src, src->class->config_size);
   memset(&dst->n, 0, sizeof(node));
   add_tail(&proto->channels, &dst->n);
-  CALL(src->channel->copy_config, dst, src);
+  CALL(src->class->copy_config, dst, src);
 
   return dst;
 }
@@ -1031,7 +1031,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   }
 
   /* Execute channel-specific reconfigure hook */
-  if (c->channel->reconfigure && !c->channel->reconfigure(c, cf, &import_changed, &export_changed))
+  if (c->class->reconfigure && !c->class->reconfigure(c, cf, &import_changed, &export_changed))
     return 0;
 
   /* If the channel is not open, it has no routes and we cannot reload it anyways */
diff --git a/nest/protocol.h b/nest/protocol.h
index 4916e756..82bbf56c 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -488,7 +488,7 @@ extern struct channel_class channel_bgp;
 struct channel_config {
   node n;
   const char *name;
-  const struct channel_class *channel;
+  const struct channel_class *class;
 
   struct proto_config *parent;		/* Where channel is defined (proto or template) */
   struct rtable_config *table;		/* Table we're attached to */
@@ -518,7 +518,7 @@ struct channel {
   node n;				/* Node in proto->channels */
 
   const char *name;			/* Channel name (may be NULL) */
-  const struct channel_class *channel;
+  const struct channel_class *class;
   struct proto *proto;
 
   rtable *table;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 1c7c5da6..609f3c6d 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3738,7 +3738,7 @@ rt_flowspec_resolve_rte(rte *r, struct channel *c)
   struct bgp_channel *bc = (struct bgp_channel *) c;
 
   if (	(rt_get_source_attr(r) == RTS_BGP)
-     && (c->channel == &channel_bgp)
+     && (c->class == &channel_bgp)
      && (bc->base_table))
   {
     struct bgp_proto *p = SKIP_BACK(struct bgp_proto, p, bc->c.proto);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 46145fc5..f0d93d15 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2041,7 +2041,7 @@ bgp_preexport(struct channel *C, rte *e)
   struct bgp_channel *c = (struct bgp_channel *) C;
 
   /* Ignore non-BGP channels */
-  if (C->channel != &channel_bgp)
+  if (C->class != &channel_bgp)
     return -1;
 
   /* Reject our routes */
@@ -2252,7 +2252,7 @@ bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, c
   struct rte_src *path;
 
   /* Ignore non-BGP channels */
-  if (C->channel != &channel_bgp)
+  if (C->class != &channel_bgp)
     return;
 
   if (new)
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 3a7ed6b7..573fa152 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1567,7 +1567,7 @@ bgp_reload_routes(struct channel *C)
   struct bgp_channel *c = (void *) C;
 
   /* Ignore non-BGP channels */
-  if (C->channel != &channel_bgp)
+  if (C->class != &channel_bgp)
     return;
 
   ASSERT(p->conn && p->route_refresh);
@@ -1581,7 +1581,7 @@ bgp_feed_begin(struct channel *C, int initial)
   struct bgp_channel *c = (void *) C;
 
   /* Ignore non-BGP channels */
-  if (C->channel != &channel_bgp)
+  if (C->class != &channel_bgp)
     return;
 
   /* This should not happen */
@@ -1616,7 +1616,7 @@ bgp_feed_end(struct channel *C)
   struct bgp_channel *c = (void *) C;
 
   /* Ignore non-BGP channels */
-  if (C->channel != &channel_bgp)
+  if (C->class != &channel_bgp)
     return;
 
   if (c->feed_out_table)
@@ -2781,7 +2781,7 @@ bgp_show_proto_info(struct proto *P)
     {
       channel_show_info(&c->c);
 
-      if (c->c.channel != &channel_bgp)
+      if (c->c.class != &channel_bgp)
 	continue;
 
       if (p->gr_active_num)
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 6f75874f..69942b6b 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -516,8 +516,8 @@ struct bgp_parse_state {
 #define BGP_RX_BUFFER_EXT_SIZE	65535
 #define BGP_TX_BUFFER_EXT_SIZE	65535
 
-#define BGP_CF_WALK_CHANNELS(P,C) WALK_LIST(C, P->c.channels) if (C->c.channel == &channel_bgp)
-#define BGP_WALK_CHANNELS(P,C) WALK_LIST(C, P->p.channels) if (C->c.channel == &channel_bgp)
+#define BGP_CF_WALK_CHANNELS(P,C) WALK_LIST(C, P->c.channels) if (C->c.class == &channel_bgp)
+#define BGP_WALK_CHANNELS(P,C) WALK_LIST(C, P->p.channels) if (C->c.class == &channel_bgp)
 
 static inline int bgp_channel_is_ipv4(struct bgp_channel *c)
 { return BGP_AFI(c->afi) == BGP_AFI_IPV4; }
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index b2083010..1267a657 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -172,7 +172,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
 
   struct channel_config pri_cf = {
     .name = "pri",
-    .channel = cc->channel,
+    .class = cc->class,
     .table = cc->table,
     .out_filter = cc->out_filter,
     .out_subprefix = cc->out_subprefix,
@@ -184,7 +184,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
 
   struct channel_config sec_cf = {
     .name = "sec",
-    .channel = cc->channel,
+    .class = cc->class,
     .table = cf->peer,
     .out_filter = cc->in_filter,
     .out_subprefix = cf->in_subprefix,

From 206b33fd0b3506766b832e89f3fccb889219b031 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 2 Jul 2023 15:10:39 +0200
Subject: [PATCH 345/431] Filter iterator accepts lines instead of filter

---
 filter/f-inst.h | 4 ++--
 nest/proto.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/filter/f-inst.h b/filter/f-inst.h
index fbc59de7..44516174 100644
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -67,10 +67,10 @@ struct filter_iterator {
 
 void f_add_lines(const struct f_line_item *what, struct filter_iterator *fit);
 
-#define FILTER_ITERATE_INIT(fit, filter, pool)			\
+#define FILTER_ITERATE_INIT(fit, line, pool)			\
   ({								\
     BUFFER_INIT((fit)->lines, (pool), 32);			\
-    BUFFER_PUSH((fit)->lines) = (filter)->root;			\
+    BUFFER_PUSH((fit)->lines) = (line);				\
   })
 
 #define FILTER_ITERATE(fit, fi) ({				\
diff --git a/nest/proto.c b/nest/proto.c
index 83fbce2c..0304ef7f 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -420,7 +420,7 @@ channel_roa_subscribe_filter(struct channel *c, int dir)
 #endif
 
   struct filter_iterator fit;
-  FILTER_ITERATE_INIT(&fit, f, c->proto->pool);
+  FILTER_ITERATE_INIT(&fit, f->root, c->proto->pool);
 
   FILTER_ITERATE(&fit, fi)
   {

From a920b5111c2748568d89edfd09c8cba0ef30e5cf Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 3 Jul 2023 20:38:24 +0200
Subject: [PATCH 346/431] Properly consted routes inside table

---
 lib/route.h       | 22 +++++++++------
 nest/rt-table.c   | 71 +++++++++++++++++++++++++----------------------
 nest/rt.h         | 13 +++++++--
 proto/bgp/attrs.c | 38 ++++++++++++++-----------
 proto/bgp/bgp.h   |  2 +-
 5 files changed, 84 insertions(+), 62 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index 6189895a..f0934f06 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -21,20 +21,24 @@ struct network;
 struct proto;
 struct cli;
 struct rtable_private;
+struct rte_storage;
+
+#define RTE_IN_TABLE_WRITABLE \
+  byte pflags;				/* Protocol-specific flags; may change in-table (!) */ \
+  u8 stale_cycle;			/* Auxiliary value for route refresh; may change in-table (!) */ \
 
 typedef struct rte {
+  RTE_IN_TABLE_WRITABLE;
+  byte flags;				/* Table-specific flags */
+  u8 generation;			/* If this route import is based on other previously exported route,
+					   this value should be 1 + MAX(generation of the parent routes).
+					   Otherwise the route is independent and this value is zero. */
+  u32 id;				/* Table specific route id */
   struct ea_list *attrs;		/* Attributes of this route */
   const net_addr *net;			/* Network this RTE belongs to */
   struct rte_src *src;			/* Route source that created the route */
   struct rt_import_hook *sender;	/* Import hook used to send the route to the routing table */
   btime lastmod;			/* Last modified (set by table) */
-  u32 id;				/* Table specific route id */
-  byte flags;				/* Table-specific flags */
-  byte pflags;				/* Protocol-specific flags */
-  u8 generation;			/* If this route import is based on other previously exported route,
-					   this value should be 1 + MAX(generation of the parent routes).
-					   Otherwise the route is independent and this value is zero. */
-  u8 stale_cycle;			/* Auxiliary value for route refresh */
 } rte;
 
 #define REF_FILTERED	2		/* Route is rejected by import filter */
@@ -73,7 +77,7 @@ struct rte_owner_class {
 
 struct rte_owner {
   struct rte_owner_class *class;
-  int (*rte_recalculate)(struct rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
+  int (*rte_recalculate)(struct rtable_private *, struct network *, struct rte_storage *new, struct rte_storage *, struct rte_storage *);
   HASH(struct rte_src) hash;
   const char *name;
   u32 hash_key;
@@ -461,7 +465,7 @@ static inline const char *flowspec_valid_name(enum flowspec_valid v)
 { return (v < FLOWSPEC__MAX) ? flowspec_valid_names[v] : "???"; }
 
 extern struct ea_class ea_gen_flowspec_valid;
-static inline enum flowspec_valid rt_get_flowspec_valid(rte *rt)
+static inline enum flowspec_valid rt_get_flowspec_valid(const rte *rt)
 { return ea_get_int(rt->attrs, &ea_gen_flowspec_valid, FLOWSPEC_UNKNOWN); }
 
 /* Next hop: For now, stored as adata */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 609f3c6d..c3236200 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -154,7 +154,7 @@ static void rt_delete(void *);
 static void rt_export_used(struct rt_table_exporter *, const char *, const char *);
 static void rt_export_cleanup(struct rtable_private *tab);
 
-static int rte_same(rte *x, rte *y);
+static int rte_same(const rte *x, const rte *y);
 
 const char *rt_import_state_name_array[TIS_MAX] = {
   [TIS_DOWN] = "DOWN",
@@ -639,19 +639,20 @@ rte_find(net *net, struct rte_src *src)
 struct rte_storage *
 rte_store(const rte *r, net *net, struct rtable_private *tab)
 {
-  struct rte_storage *e = sl_alloc(tab->rte_slab);
+  struct rte_storage *s = sl_alloc(tab->rte_slab);
+  struct rte *e = RTES_WRITE(s);
 
-  e->rte = *r;
-  e->rte.net = net->n.addr;
+  *e = *r;
+  e->net = net->n.addr;
 
-  rt_lock_source(e->rte.src);
+  rt_lock_source(e->src);
 
-  if (ea_is_cached(e->rte.attrs))
-    e->rte.attrs = rta_clone(e->rte.attrs);
+  if (ea_is_cached(e->attrs))
+    e->attrs = rta_clone(e->attrs);
   else
-    e->rte.attrs = rta_lookup(e->rte.attrs, 1);
+    e->attrs = rta_lookup(e->attrs, 1);
 
-  return e;
+  return s;
 }
 
 /**
@@ -886,7 +887,7 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
 }
 
 static void
-rt_notify_basic(struct channel *c, const net_addr *net, rte *new, rte *old)
+rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old)
 {
   if (new && old && rte_same(new, old))
   {
@@ -1104,7 +1105,7 @@ void
 rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
-  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;
 
   RPE_WALK(first, rpe, NULL)
@@ -1123,8 +1124,8 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
-  rte *n = RTE_VALID_OR_NULL(first->new);
-  rte *o = RTE_VALID_OR_NULL(first->old);
+  const rte *n = RTE_VALID_OR_NULL(first->new);
+  const rte *o = RTE_VALID_OR_NULL(first->old);
 
   if (!n && !o)
   {
@@ -1613,7 +1614,7 @@ rte_validate(struct channel *ch, rte *e)
 }
 
 static int
-rte_same(rte *x, rte *y)
+rte_same(const rte *x, const rte *y)
 {
   /* rte.flags / rte.pflags are not checked, as they are internal to rtable */
   return
@@ -1622,7 +1623,7 @@ rte_same(rte *x, rte *y)
     rte_is_filtered(x) == rte_is_filtered(y);
 }
 
-static inline int rte_is_ok(rte *e) { return e && !rte_is_filtered(e); }
+static inline int rte_is_ok(const rte *e) { return e && !rte_is_filtered(e); }
 
 static int
 rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
@@ -1630,8 +1631,8 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
   struct rt_import_request *req = c->req;
   struct rt_import_stats *stats = &c->stats;
   struct rte_storage *old_best_stored = net->routes, *old_stored = NULL;
-  rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
-  rte *old = NULL;
+  const rte *old_best = old_best_stored ? &old_best_stored->rte : NULL;
+  const rte *old = NULL;
 
   /* If the new route is identical to the old one, we find the attributes in
    * cache and clone these with no performance drop. OTOH, if we were to lookup
@@ -1639,7 +1640,10 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
    * therefore it's definitely worth the time. */
   struct rte_storage *new_stored = NULL;
   if (new)
-    new = &(new_stored = rte_store(new, net, table))->rte;
+  {
+    new_stored = rte_store(new, net, table);
+    new = RTES_WRITE(new_stored);
+  }
 
   /* Find and remove original route from the same protocol */
   struct rte_storage **before_old = rte_find(net, src);
@@ -1666,7 +1670,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 	  if (new && rte_same(old, &new_stored->rte))
 	    {
 	      /* No changes, ignore the new route and refresh the old one */
-	      old->stale_cycle = new->stale_cycle;
+	      old_stored->stale_cycle = new->stale_cycle;
 
 	      if (!rte_is_filtered(new))
 		{
@@ -1737,7 +1741,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 	 the first position. There are several optimized cases. */
 
       if (src->owner->rte_recalculate &&
-	  src->owner->rte_recalculate(table, net, new_stored ? &new_stored->rte : NULL, old, old_best))
+	  src->owner->rte_recalculate(table, net, new_stored, old_stored, old_best_stored))
 	goto do_recalculate;
 
       if (new_stored && rte_better(&new_stored->rte, old_best))
@@ -1800,9 +1804,9 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 
   if (new_stored)
     {
-      new_stored->rte.lastmod = current_time();
-      new_stored->rte.id = hmap_first_zero(&table->id_map);
-      hmap_set(&table->id_map, new_stored->rte.id);
+      new->lastmod = current_time();
+      new->id = hmap_first_zero(&table->id_map);
+      hmap_set(&table->id_map, new->id);
     }
 
   /* Log the route change */
@@ -1829,7 +1833,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 }
 
 int
-channel_preimport(struct rt_import_request *req, rte *new, rte *old)
+channel_preimport(struct rt_import_request *req, rte *new, const rte *old)
 {
   struct channel *c = SKIP_BACK(struct channel, in_req, req);
 
@@ -2360,7 +2364,7 @@ rt_refresh_begin(struct rt_import_request *req)
       {
        for (struct rte_storage *e = n->routes; e; e = e->next)
          if (e->rte.sender == req->hook)
-           e->rte.stale_cycle = 0;
+           e->stale_cycle = 0;
       }
     FIB_WALK_END;
 
@@ -2654,7 +2658,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 */
-  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;
 
   RPE_WALK(first, rpe, NULL)
@@ -3546,7 +3550,7 @@ rta_next_hop_outdated(ea_list *a)
 }
 
 static inline int
-rt_next_hop_update_rte(rte *old, rte *new)
+rt_next_hop_update_rte(const rte *old, rte *new)
 {
   struct hostentry_adata *head = rta_next_hop_outdated(old->attrs);
   if (!head)
@@ -3704,7 +3708,7 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
 #endif /* CONFIG_BGP */
 
 static int
-rt_flowspec_update_rte(rtable *tab, rte *r, rte *new)
+rt_flowspec_update_rte(rtable *tab, const rte *r, rte *new)
 {
 #ifdef CONFIG_BGP
   if (r->generation || (rt_get_source_attr(r) != RTS_BGP))
@@ -3836,14 +3840,15 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
     if (updates[i].new_stored)
       {
 	/* Get a new ID for the route */
-	updates[i].new_stored->rte.lastmod = current_time();
-	updates[i].new_stored->rte.id = hmap_first_zero(&tab->id_map);
-	hmap_set(&tab->id_map, updates[i].new_stored->rte.id);
+	rte *new = RTES_WRITE(updates[i].new_stored);
+	new->lastmod = current_time();
+	new->id = hmap_first_zero(&tab->id_map);
+	hmap_set(&tab->id_map, new->id);
 
 	/* Call a pre-comparison hook */
 	/* Not really an efficient way to compute this */
 	if (updates[i].old->rte.src->owner->rte_recalculate)
-	  updates[i].old->rte.src->owner->rte_recalculate(tab, n, &updates[i].new_stored->rte, &updates[i].old->rte, &old_best->rte);
+	  updates[i].old->rte.src->owner->rte_recalculate(tab, n, updates[i].new_stored, updates[i].old, old_best);
       }
 
 #if DEBUGGING
@@ -4611,7 +4616,7 @@ hc_notify_export_one(struct rt_export_request *req, const net_addr *net, struct
     else
     {
       /* This net may affect some hostentries, check the actual change */
-      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;
 
       RPE_WALK(first, rpe, NULL)
diff --git a/nest/rt.h b/nest/rt.h
index a251b3a5..c1938c18 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -229,7 +229,12 @@ typedef struct network {
 
 struct rte_storage {
   struct rte_storage *next;		/* Next in chain */
-  struct rte rte;			/* Route data */
+  union {
+    struct {
+      RTE_IN_TABLE_WRITABLE;
+    };
+    const struct rte rte;			/* Route data */
+  };
 };
 
 #define RTE_COPY(r)		((r) ? (r)->rte : (rte) {})
@@ -237,6 +242,8 @@ struct rte_storage {
 #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 RTES_WRITE(r)		(((r) != ((struct rte_storage *) 0)) ? ((struct rte *) &(r)->rte) : NULL)
+
 /* Table-channel connections */
 
 struct rt_import_request {
@@ -250,7 +257,7 @@ struct rt_import_request {
   void (*log_state_change)(struct rt_import_request *req, u8 state);
   /* Preimport is called when the @new route is just-to-be inserted, replacing @old.
    * Return a route (may be different or modified in-place) to continue or NULL to withdraw. */
-  int (*preimport)(struct rt_import_request *req, struct rte *new, struct rte *old);
+  int (*preimport)(struct rt_import_request *req, struct rte *new, const struct rte *old);
 };
 
 struct rt_import_hook {
@@ -449,7 +456,7 @@ void rt_exporter_init(struct rt_exporter *re);
  * Channel export hooks. To be refactored out.
  */
 
-int channel_preimport(struct rt_import_request *req, rte *new, rte *old);
+int channel_preimport(struct rt_import_request *req, rte *new, const rte *old);
 
 void channel_reload_export_bulk(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index f0d93d15..19a09238 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2524,7 +2524,7 @@ bgp_rte_mergable(const rte *pri, const rte *sec)
 
 
 static inline int
-same_group(rte *r, u32 lpref, u32 lasn)
+same_group(const rte *r, u32 lpref, u32 lasn)
 {
   return (rt_get_preference(r) == lpref) && (bgp_get_neighbor(r) == lasn);
 }
@@ -2537,9 +2537,15 @@ use_deterministic_med(struct rte_storage *r)
 }
 
 int
-bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best)
+bgp_rte_recalculate(struct rtable_private *table, net *net,
+    struct rte_storage *new_stored, struct rte_storage *old_stored, struct rte_storage *old_best_stored)
 {
-  rte *key = new ? new : old;
+  struct rte_storage *key_stored = new_stored ? new_stored : old_stored;
+  const struct rte *new = &new_stored->rte,
+		   *old = &old_stored->rte,
+		   *old_best = &old_best_stored->rte,
+		   *key = &key_stored->rte;
+
   u32 lpref = rt_get_preference(key);
   u32 lasn = bgp_get_neighbor(key);
   int old_suppressed = old ? !!(old->pflags & BGP_REF_SUPPRESSED) : 0;
@@ -2580,8 +2586,8 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
   if (new && old && !same_group(old, lpref, lasn))
   {
     int i1, i2;
-    i1 = bgp_rte_recalculate(table, net, NULL, old, old_best);
-    i2 = bgp_rte_recalculate(table, net, new, NULL, old_best);
+    i1 = bgp_rte_recalculate(table, net, NULL, old_stored, old_best_stored);
+    i2 = bgp_rte_recalculate(table, net, new_stored, NULL, old_best_stored);
     return i1 || i2;
   }
 
@@ -2594,11 +2600,11 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
    */
 
   if (new)
-    new->pflags |= BGP_REF_SUPPRESSED;
+    new_stored->pflags |= BGP_REF_SUPPRESSED;
 
   if (old)
   {
-    old->pflags |= BGP_REF_SUPPRESSED;
+    old_stored->pflags |= BGP_REF_SUPPRESSED;
 
     /* The fast case - replace not best with worse (or remove not best) */
     if (old_suppressed && !(new && bgp_rte_better(new, old)))
@@ -2606,13 +2612,13 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
   }
 
   /* The default case - find a new best-in-group route */
-  rte *r = new; /* new may not be in the list */
+  struct rte_storage *r = new_stored; /* new may not be in the list */
   for (struct rte_storage *s = net->routes; rte_is_valid(RTE_OR_NULL(s)); s = s->next)
     if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
     {
-      s->rte.pflags |= BGP_REF_SUPPRESSED;
-      if (!r || bgp_rte_better(&s->rte, r))
-	r = &s->rte;
+      s->pflags |= BGP_REF_SUPPRESSED;
+      if (!r || bgp_rte_better(&s->rte, &r->rte))
+	r = s;
     }
 
   /* Simple case - the last route in group disappears */
@@ -2620,14 +2626,14 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
     return 0;
 
   /* Found if new is mergable with best-in-group */
-  if (new && (new != r) && bgp_rte_mergable(r, new))
-    new->pflags &= ~BGP_REF_SUPPRESSED;
+  if (new && (new_stored != r) && bgp_rte_mergable(&r->rte, new))
+    new_stored->pflags &= ~BGP_REF_SUPPRESSED;
 
   /* Found all existing routes mergable with best-in-group */
   for (struct rte_storage *s = net->routes; rte_is_valid(RTE_OR_NULL(s)); s = s->next)
     if (use_deterministic_med(s) && same_group(&s->rte, lpref, lasn))
-      if ((&s->rte != r) && bgp_rte_mergable(r, &s->rte))
-	s->rte.pflags &= ~BGP_REF_SUPPRESSED;
+      if ((s != r) && bgp_rte_mergable(&r->rte, &s->rte))
+	s->pflags &= ~BGP_REF_SUPPRESSED;
 
   /* Found best-in-group */
   r->pflags &= ~BGP_REF_SUPPRESSED;
@@ -2656,7 +2662,7 @@ bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old,
    *                 the first reason does not apply, return 0
    */
 
-  if (r == new)
+  if (r == new_stored)
     return old_best && same_group(old_best, lpref, lasn);
   else
     return !old_suppressed;
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 69942b6b..bae7055a 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -618,7 +618,7 @@ void bgp_done_prefix(struct bgp_channel *c, struct bgp_prefix *px, struct bgp_bu
 
 int bgp_rte_better(const rte *, const rte *);
 int bgp_rte_mergable(const rte *pri, const rte *sec);
-int bgp_rte_recalculate(struct rtable_private *table, net *net, rte *new, rte *old, rte *old_best);
+int bgp_rte_recalculate(struct rtable_private *table, net *net, struct rte_storage *new, struct rte_storage *old, struct rte_storage *old_best);
 void bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 u32 bgp_rte_igp_metric(const rte *);
 void bgp_rt_notify(struct proto *P, struct channel *C, const net_addr *n, rte *new, const rte *old);

From c262c728eb974e13e333cc87d3aa65183e8890b5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 15 Aug 2023 12:31:28 +0200
Subject: [PATCH 347/431] Export: More strict export state checking on change

---
 lib/birdlib.h     |  5 +++++
 nest/rt-table.c   | 44 +++++++++++++++++++++++---------------------
 nest/rt.h         |  7 ++++++-
 proto/bgp/attrs.c | 10 +++++++++-
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 8146e63b..97886646 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -13,6 +13,7 @@
 
 #include "sysdep/config.h"
 #include "lib/alloca.h"
+#include "lib/macro.h"
 
 /* Ugly structure offset handling macros */
 
@@ -89,6 +90,10 @@ static inline int u64_cmp(u64 i1, u64 i2)
 #define BIT32R_CLR(b,p)		((b)[(p)/32] &= ~BIT32R_VAL(p))
 #define BIT32R_ZERO(b,l)	memset((b), 0, (l)/8)
 
+/* Short Bitmask Constructor */
+#define BIT32_ALL_HELPER(x)	(1 << (x)) |
+#define BIT32_ALL(...)		(MACRO_FOREACH(BIT32_ALL_HELPER, __VA_ARGS__) 0)
+
 #ifndef NULL
 #define NULL ((void *) 0)
 #endif
diff --git a/nest/rt-table.c b/nest/rt-table.c
index c3236200..6cd44564 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2044,14 +2044,22 @@ rt_set_import_state(struct rt_import_hook *hook, u8 state)
   CALL(hook->req->log_state_change, hook->req, state);
 }
 
-void
-rt_set_export_state(struct rt_export_hook *hook, u8 state)
+u8
+rt_set_export_state(struct rt_export_hook *hook, u32 expected_mask, u8 state)
 {
   hook->last_state_change = current_time();
   u8 old = atomic_exchange_explicit(&hook->export_state, state, memory_order_release);
+  if (!((1 << old) & expected_mask))
+    bug("Unexpected export state change from %s to %s, expected mask %02x",
+      rt_export_state_name(old),
+      rt_export_state_name(state),
+      expected_mask
+      );
 
   if (old != state)
     CALL(hook->req->log_state_change, hook->req, state);
+
+  return old;
 }
 
 void
@@ -2148,7 +2156,7 @@ rt_table_export_start_locked(struct rtable_private *tab, struct rt_export_reques
   };
 
   if (rt_cork_check(&hook->h.event))
-    rt_set_export_state(&hook->h, TES_HUNGRY);
+    rt_set_export_state(&hook->h, BIT32_ALL(TES_DOWN), TES_HUNGRY);
   else
     rt_table_export_start_feed(tab, hook);
 }
@@ -2226,6 +2234,7 @@ rt_alloc_export(struct rt_exporter *re, pool *pp, uint size)
 
   hook->pool = p;
   hook->table = re;
+  atomic_store_explicit(&hook->export_state, TES_DOWN, memory_order_release);
 
   hook->n = (node) {};
   add_tail(&re->hooks, &hook->n);
@@ -2241,7 +2250,7 @@ rt_init_export(struct rt_exporter *re UNUSED, struct rt_export_hook *hook)
   bmap_init(&hook->seq_map, hook->pool, 16);
 
   /* Regular export */
-  rt_set_export_state(hook, TES_FEEDING);
+  rt_set_export_state(hook, BIT32_ALL(TES_DOWN, TES_HUNGRY), TES_FEEDING);
   rt_send_export_event(hook);
 }
 
@@ -2251,7 +2260,8 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
   struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter, hook->table);
 
-  switch (atomic_load_explicit(&hh->export_state, memory_order_relaxed))
+  /* Update export state, get old */
+  switch (rt_set_export_state(hh, BIT32_ALL(TES_HUNGRY, TES_FEEDING, TES_READY), TES_STOP))
   {
     case TES_HUNGRY:
       rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking", hook->h.req->name);
@@ -2288,17 +2298,12 @@ rt_table_export_stop(struct rt_export_hook *hh)
 {
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
   int ok = 0;
-  rtable *t = SKIP_BACK(rtable, priv.exporter, hook->table);
-  if (RT_IS_LOCKED(t))
+
+  RT_LOCKED_IF_NEEDED(SKIP_BACK(rtable, priv.exporter, hook->table), tab)
     ok = rt_table_export_stop_locked(hh);
-  else
-    RT_LOCKED(t, tab)
-      ok = rt_table_export_stop_locked(hh);
 
   if (ok)
     rt_stop_export_common(hh);
-  else
-    rt_set_export_state(&hook->h, TES_STOP);
 }
 
 void
@@ -2311,19 +2316,16 @@ rt_stop_export(struct rt_export_request *req, void (*stopped)(struct rt_export_r
   /* Set the stopped callback */
   hook->stopped = stopped;
 
-  /* Run the stop code */
-  if (hook->table->class->stop)
-    hook->table->class->stop(hook);
-  else
-    rt_stop_export_common(hook);
+  /* Run the stop code. Must:
+   * _locked_ update export state to TES_STOP
+   * and _unlocked_ call rt_stop_export_common() */
+  hook->table->class->stop(hook);
 }
 
+/* Call this common code from the stop code in table export class */
 void
 rt_stop_export_common(struct rt_export_hook *hook)
 {
-  /* Update export state */
-  rt_set_export_state(hook, TES_STOP);
-
   /* Reset the event as the stopped event */
   hook->event.hook = hook->table->class->done;
 
@@ -4242,7 +4244,7 @@ rt_feed_done(struct rt_export_hook *c)
 {
   c->event.hook = rt_export_hook;
 
-  rt_set_export_state(c, TES_READY);
+  rt_set_export_state(c, BIT32_ALL(TES_FEEDING), TES_READY);
 
   rt_send_export_event(c);
 }
diff --git a/nest/rt.h b/nest/rt.h
index c1938c18..e0a099e1 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -177,6 +177,11 @@ typedef union rtable {
 #define RT_PUB(tab)	SKIP_BACK(rtable, priv, tab)
 
 #define RT_LOCKED(tpub, tpriv) for (struct rtable_private *tpriv = RT_LOCK(tpub); tpriv; RT_UNLOCK(tpriv), (tpriv = NULL))
+#define RT_LOCKED_IF_NEEDED(_tpub, _tpriv) for ( \
+    struct rtable_private *_al = RT_IS_LOCKED(_tpub) ? &(_tpub)->priv : NULL, *_tpriv = _al ?: RT_LOCK(_tpub); \
+    _tpriv; \
+    _al ?: RT_UNLOCK(_tpriv), (_tpriv = NULL))
+
 #define RT_RETURN(tpriv, ...) do { RT_UNLOCK(tpriv); return __VA_ARGS__; } while (0)
 
 #define RT_PRIV_SAME(tpriv, tpub)	(&(tpub)->priv == (tpriv))
@@ -415,7 +420,7 @@ const char *rt_export_state_name(u8 state);
 static inline u8 rt_import_get_state(struct rt_import_hook *ih) { return ih ? ih->import_state : TIS_DOWN; }
 static inline u8 rt_export_get_state(struct rt_export_hook *eh) { return eh ? eh->export_state : TES_DOWN; }
 
-void rt_set_export_state(struct rt_export_hook *hook, u8 state);
+u8 rt_set_export_state(struct rt_export_hook *hook, u32 expected_mask, u8 state);
 
 void rte_import(struct rt_import_request *req, const net_addr *net, rte *new, struct rte_src *src);
 
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 19a09238..973e2935 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1981,7 +1981,7 @@ bgp_out_table_feed(void *data)
   if (hook->hash_iter)
     ev_schedule_work(&hook->h.event);
   else
-    rt_set_export_state(&hook->h, TES_READY);
+    rt_set_export_state(&hook->h, BIT32_ALL(TES_FEEDING), TES_READY);
 }
 
 static void
@@ -1996,6 +1996,13 @@ bgp_out_table_export_start(struct rt_exporter *re, struct rt_export_request *req
   rt_init_export(re, req->hook);
 }
 
+static void
+bgp_out_table_export_stop(struct rt_export_hook *hook)
+{
+  rt_set_export_state(hook, BIT32_ALL(TES_HUNGRY, TES_FEEDING, TES_READY), TES_STOP);
+  rt_stop_export_common(hook);
+}
+
 static void
 bgp_out_table_export_done(void *data)
 {
@@ -2009,6 +2016,7 @@ bgp_out_table_export_done(void *data)
 
 static const struct rt_exporter_class bgp_out_table_export_class = {
   .start = bgp_out_table_export_start,
+  .stop = bgp_out_table_export_stop,
   .done = bgp_out_table_export_done,
 };
 

From 32bb548c116b40f79d077c10356c037770ed1005 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 24 Sep 2023 11:47:24 +0200
Subject: [PATCH 348/431] Table: Fixed feed race condition

The problem happened like this:

1. Single route for the given net in table
2. A feed is started
3. The route is deleted (from another thread)
4. The feed finds an empty net, exports nothing, ignores journal (here is bug)
5. The route is added
6. The export transitions from FEEDING to READY
7. While processing the journal, the route deletion and addition combines into noop.

This way routes mysteriously disappeared in specific cases of link instability.

Problem fixed by explicitly marking the empty-net journal entries as processed in step 4.
---
 nest/proto.c    |  1 +
 nest/rt-table.c | 14 +++++++++++---
 nest/rt.h       |  4 +++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 0304ef7f..476764b8 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -505,6 +505,7 @@ channel_start_export(struct channel *c)
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
+    .mark_seen = channel_rpe_mark_seen,
   };
 
   bmap_init(&c->export_map, c->proto->pool, 16);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 6cd44564..a367a4b5 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -911,7 +911,7 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old
   do_rt_notify(c, net, new, old);
 }
 
-static void
+void
 channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *rpe)
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
@@ -4266,11 +4266,12 @@ typedef struct {
 static int
 rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
 {
-  uint bs = c->h.req->feed_block_size ?: 16384;
+  struct rt_export_request *req = c->h.req;
+  uint bs = req->feed_block_size ?: 16384;
 
   if (n->routes)
   {
-    if (c->h.req->export_bulk)
+    if (req->export_bulk)
     {
       uint cnt = rte_feed_count(n);
       if (b->cnt && (b->cnt + cnt > bs))
@@ -4304,6 +4305,13 @@ rt_prepare_feed(struct rt_table_export_hook *c, net *n, rt_feed_block *b)
       b->rpe[b->pos++] = (struct rt_pending_export) { .new = n->routes, .new_best = n->routes };
     }
   }
+  else
+    if (req->mark_seen)
+      RPE_WALK(n->first, rpe, NULL)
+	req->mark_seen(req, rpe);
+    else
+      RPE_WALK(n->first, rpe, NULL)
+	rpe_mark_seen(&c->h, rpe);
 
   return 1;
 }
diff --git a/nest/rt.h b/nest/rt.h
index e0a099e1..79694016 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -321,6 +321,8 @@ struct rt_export_request {
       struct rt_pending_export *rpe, struct rt_pending_export *last,
       const rte **feed, uint count);
 
+  void (*mark_seen)(struct rt_export_request *req, struct rt_pending_export *rpe);
+
   void (*dump_req)(struct rt_export_request *req);
   void (*log_state_change)(struct rt_export_request *req, u8);
 };
@@ -471,7 +473,7 @@ void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_p
 void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 
-
+void channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *rpe);
 
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */

From c92b5ad218f65571b601573b0deca40219059bb0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 24 Sep 2023 12:15:26 +0200
Subject: [PATCH 349/431] Table: Added some journal and export tracing

---
 nest/rt-table.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index a367a4b5..53af2d81 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -201,6 +201,16 @@ static inline rtable *rt_pub_to_pub(rtable *tab) { return tab; }
     log(L_TRACE "%s: " fmt, t->name, ##args);	\
 } while (0)
 
+#define req_trace(r, level, fmt, args...) do {	\
+  if (r->trace_routes & (level))		\
+    log(L_TRACE "%s: " fmt, r->name, ##args);	\
+} while (0)
+
+#define channel_trace(c, level, fmt, args...)  do {\
+  if ((c->debug & (level)) || (c->proto->debug & (level)))	\
+    log(L_TRACE "%s.%s: " fmt, c->proto->name, c->name, ##args);\
+} while (0)
+
 static void
 net_init_with_trie(struct fib *f, void *N)
 {
@@ -891,6 +901,8 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old
 {
   if (new && old && rte_same(new, old))
   {
+    channel_rte_trace_out(D_ROUTES, c, new, "already exported");
+
     if ((new->id != old->id) && bmap_test(&c->export_map, old->id))
     {
       bmap_set(&c->export_map, new->id);
@@ -916,6 +928,8 @@ channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *r
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
+  channel_trace(c, D_ROUTES, "Marking seen %p (%lu)", rpe, rpe->seq);
+
   rpe_mark_seen(req->hook, rpe);
   if (rpe->old)
     bmap_clear(&c->export_reject_map, rpe->old->rte.id);
@@ -1127,6 +1141,10 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
   const rte *n = RTE_VALID_OR_NULL(first->new);
   const rte *o = RTE_VALID_OR_NULL(first->old);
 
+  channel_trace(c, D_ROUTES,
+      "Notifying any, net %N, first %p (%lu), new %p, old %p",
+      net, first, first->seq, n, o);
+
   if (!n && !o)
   {
     channel_rpe_mark_seen(req, first);
@@ -1145,6 +1163,8 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
   rte n0 = RTE_COPY_VALID(new_latest);
   if (n0.src || o)
     rt_notify_basic(c, net, n0.src ? &n0 : NULL, o);
+
+  channel_trace(c, D_ROUTES, "Notified net %N", net);
 }
 
 void
@@ -1154,6 +1174,9 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net,
 {
   struct channel *c = SKIP_BACK(struct channel, out_req, req);
 
+  channel_trace(c, D_ROUTES, "Feeding any, net %N, first %p (%lu), %p (%lu), count %u",
+      net, first, first ? first->seq : 0, last ? last->seq : 0, count);
+
   for (uint i=0; i<count; i++)
     if (rte_is_valid(feed[i]))
     {
@@ -1167,6 +1190,8 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net,
     if (rpe == last)
       break;
   }
+
+  channel_trace(c, D_ROUTES, "Fed %N", net);
 }
 
 void
@@ -1359,11 +1384,17 @@ rte_announce(struct rtable_private *tab, net *net, struct rte_storage *new, stru
     .seq = tab->exporter.next_seq++,
   };
 
-  DBGL("rte_announce: table=%s net=%N new=%p id %u from %s old=%p id %u from %s new_best=%p id %u old_best=%p id %u seq=%lu",
-      tab->name, net->n.addr,
+  rt_trace(tab, D_ROUTES, "Announcing %N, "
+      "new=%p id %u from %s, "
+      "old=%p id %u from %s, "
+      "new_best=%p id %u, "
+      "old_best=%p id %u seq=%lu",
+      net->n.addr,
       new, new ? new->rte.id : 0, new ? new->rte.sender->req->name : NULL,
       old, old ? old->rte.id : 0, old ? old->rte.sender->req->name : NULL,
-      new_best, old_best, rpe->seq);
+      new_best, new_best ? new_best->rte.id : 0,
+      old_best, old_best ? old_best->rte.id : 0,
+      rpe->seq);
 
   ASSERT_DIE(atomic_fetch_add_explicit(&rpeb->end, 1, memory_order_release) == end);
 
@@ -2201,7 +2232,7 @@ rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_ho
   DBG("New export hook %p req %p in table %s uc=%u\n", hook, req, tab->name, tab->use_count);
 
   struct rt_pending_export *rpe = rt_last_export(hook->table);
-  DBG("store hook=%p last_export=%p seq=%lu\n", hook, rpe, rpe ? rpe->seq : 0);
+  req_trace(req, D_STATES, "Export initialized, last export %p (%lu)", rpe, rpe ? rpe->seq : 0);
   atomic_store_explicit(&hook->last_export, rpe, memory_order_relaxed);
 
   rt_init_export(re, req->hook);

From 5ab182d8d1bc6404ea8bac51411e63067dfbfb28 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 24 Sep 2023 22:20:01 +0200
Subject: [PATCH 350/431] Iface: trace log messages cleanup

---
 nest/iface.c | 11 +++++------
 nest/iface.h |  8 ++++++++
 nest/proto.c |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index bbe38d3f..31eb9de1 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -190,7 +190,7 @@ void ifa_link(struct ifa *a)
 
   if (a)
   {
-    debug("ifa_link: %p %d\n", a, a->uc);
+//    debug("ifa_link: %p %d\n", a, a->uc);
     a->uc++;
   }
 }
@@ -202,7 +202,7 @@ void ifa_unlink(struct ifa *a)
   if (!a)
     return;
 
-  debug("ifa_unlink: %p %d\n", a, a->uc);
+//  debug("ifa_unlink: %p %d\n", a, a->uc);
   if (--a->uc)
     return;
 
@@ -267,8 +267,7 @@ if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s)
   struct iface_notification *in = sl_alloc(iface_sub_slab);
   *in = x;
 
-  debug("Enqueue notify %d/%p (%p) to %p\n", x.type, x.a, in, s);
-
+  iface_trace(s, "Enqueueing interface notification (%d, %p, %p)", x.type, x.a, in);
   ifnot_add_tail(&s->queue, in);
   ev_send(s->target, &s->event);
 }
@@ -558,11 +557,11 @@ iface_notify_hook(void *_s)
   struct iface_subscription *s = _s;
 
   IFACE_LOCK;
+  iface_trace(s, "Processing interface notifications");
 
   while (!EMPTY_TLIST(ifnot, &s->queue))
   {
     struct iface_notification *n = THEAD(ifnot, &s->queue);
-    debug("Process notify %d/%p (%p) to %p\n", n->type, n->a, n, s);
     IFACE_UNLOCK;
 
     switch (n->type) {
@@ -663,7 +662,7 @@ iface_unsubscribe(struct iface_subscription *s)
 
   WALK_TLIST_DELSAFE(ifnot, n, &s->queue)
   {
-    debug("Drop notify %d/%p (%p) to %p\n", n->type, n->a, n, s);
+    iface_trace(s, "Dropping interface notification (%d, %p, %p) on unsubscribe", n->type, n->a, n);
     switch (n->type)
     {
       case IFNOT_ADDRESS:
diff --git a/nest/iface.h b/nest/iface.h
index 05898a55..1411ac2a 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -218,6 +218,9 @@ struct iface_subscription {
   void (*if_notify)(struct proto *, unsigned flags, struct iface *i);
   void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
   void (*neigh_notify)(struct neighbor *neigh);
+
+  const char *name;
+  int debug;
 };
 
 #include "lib/tlists.h"
@@ -229,6 +232,11 @@ void iface_flush_notifications(struct iface_subscription *);
 void iface_subscribe(struct iface_subscription *);
 void iface_unsubscribe(struct iface_subscription *);
 
+#define iface_trace(s, fmt, args...)  do {	\
+  if (s->debug)					\
+    log(L_TRACE "%s: " fmt, s->name, ##args);	\
+} while (0)
+
 /*
  *	Interface Pattern Lists
  */
diff --git a/nest/proto.c b/nest/proto.c
index 476764b8..fd613217 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1244,6 +1244,8 @@ proto_start(struct proto *p)
     p->pool = rp_newf(proto_pool, the_bird_domain.the_bird, "Protocol %s", p->cf->name);
 
   p->iface_sub.target = proto_event_list(p);
+  p->iface_sub.name = p->name;
+  p->iface_sub.debug = !!(p->debug & D_IFACES);
 
   PROTO_LOCKED_FROM_MAIN(p)
   {

From e65a5257b2136ff668fd16979f4c1a6bcb95faa0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 24 Sep 2023 23:22:43 +0200
Subject: [PATCH 351/431] Protocols have now assigned startup phases

For now, there are 4 phases: Necessary (device), Connector (kernel, pipe), Generator (static, rpki) and Regular.
Started and reconfigured are from Necessary to Regular, shutdown backwards.

This way, kernel can flush routes before actually being shutdown.
---
 nest/proto.c          | 78 ++++++++++++++++++++++++++++++++++++-------
 nest/protocol.h       |  8 +++++
 proto/pipe/pipe.c     |  1 +
 proto/rpki/rpki.c     |  1 +
 proto/static/static.c |  1 +
 sysdep/unix/krt.c     |  2 ++
 6 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index fd613217..54aa1646 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1134,6 +1134,7 @@ proto_cleanup(struct proto *p)
 
   p->active = 0;
   proto_log_state_change(p);
+
   proto_rethink_goal(p);
 }
 
@@ -1422,6 +1423,18 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
   return 1;
 }
 
+static struct protos_commit_request {
+  struct config *new;
+  struct config *old;
+  enum protocol_startup phase;
+  int force_reconfig;
+  int type;
+} protos_commit_request;
+
+static int proto_rethink_goal_pending = 0;
+
+static void protos_do_commit(struct config *new, struct config *old, int force_reconfig, int type);
+
 /**
  * protos_commit - commit new protocol configuration
  * @new: new configuration
@@ -1453,15 +1466,39 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
 void
 protos_commit(struct config *new, struct config *old, int force_reconfig, int type)
 {
+  protos_commit_request = (struct protos_commit_request) {
+    .new = new,
+    .old = old,
+    .phase = (new->shutdown && !new->gr_down) ? PROTOCOL_STARTUP_REGULAR : PROTOCOL_STARTUP_NECESSARY,
+    .force_reconfig = force_reconfig,
+    .type = type,
+  };
+
+  protos_do_commit(new, old, force_reconfig, type);
+}
+
+static void
+protos_do_commit(struct config *new, struct config *old, int force_reconfig, int type)
+{
+  enum protocol_startup phase = protos_commit_request.phase;
   struct proto_config *oc, *nc;
   struct symbol *sym;
   struct proto *p;
 
+  if ((phase < PROTOCOL_STARTUP_REGULAR) || (phase > PROTOCOL_STARTUP_NECESSARY))
+  {
+    protos_commit_request = (struct protos_commit_request) {};
+    return;
+  }
+
   DBG("protos_commit:\n");
   if (old)
   {
     WALK_LIST(oc, old->protos)
     {
+      if (oc->protocol->startup != phase)
+	continue;
+
       p = oc->proto;
       sym = cf_find_symbol(new, oc->name);
 
@@ -1541,11 +1578,10 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
     }
   }
 
-  struct proto *first_dev_proto = NULL;
   struct proto *after = NULL;
 
   WALK_LIST(nc, new->protos)
-    if (!nc->proto)
+    if ((nc->protocol->startup == phase) && !nc->proto)
     {
       /* Not a first-time configuration */
       if (old)
@@ -1554,18 +1590,13 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
       p = proto_init(nc, after);
       after = p;
 
-      if (p->proto == &proto_unix_iface)
-	first_dev_proto = p;
+      proto_rethink_goal(p);
     }
     else
       after = nc->proto;
 
   DBG("Protocol start\n");
 
-  /* Start device protocol first */
-  if (first_dev_proto)
-    proto_rethink_goal(first_dev_proto);
-
   /* Determine router ID for the first time - it has to be here and not in
      global_commit() because it is postponed after start of device protocol */
   if (!config->router_id)
@@ -1575,9 +1606,15 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty
       die("Cannot determine router ID, please configure it manually");
   }
 
-  /* Start all new protocols */
-  WALK_TLIST_DELSAFE(proto, p, &global_proto_list)
-    proto_rethink_goal(p);
+  /* Commit next round of protocols */
+  if (new->shutdown && !new->gr_down)
+    protos_commit_request.phase++;
+  else
+    protos_commit_request.phase--;
+
+  /* If something is pending, the next round will be called asynchronously from proto_rethink_goal(). */
+  if (!proto_rethink_goal_pending)
+    protos_do_commit(new, old, force_reconfig, type);
 }
 
 static void
@@ -1589,12 +1626,19 @@ proto_shutdown(struct proto *p)
     DBG("Kicking %s down\n", p->name);
     PD(p, "Shutting down");
     proto_notify_state(p, (p->proto->shutdown ? p->proto->shutdown(p) : PS_DOWN));
+    if (p->reconfiguring)
+    {
+      proto_rethink_goal_pending++;
+      p->reconfiguring = 2;
+    }
   }
 }
 
 static void
 proto_rethink_goal(struct proto *p)
 {
+  int goal_pending = (p->reconfiguring == 2);
+
   if (p->reconfiguring && !p->active)
   {
     struct proto_config *nc = p->cf_new;
@@ -1609,7 +1653,8 @@ proto_rethink_goal(struct proto *p)
     mb_free(p->message);
     mb_free(p);
     if (!nc)
-      return;
+      goto done;
+
     p = proto_init(nc, after);
   }
 
@@ -1621,6 +1666,15 @@ proto_rethink_goal(struct proto *p)
   }
   else if (!p->active)
     proto_start(p);
+
+done:
+  if (goal_pending && !--proto_rethink_goal_pending)
+    protos_do_commit(
+	protos_commit_request.new,
+	protos_commit_request.old,
+	protos_commit_request.force_reconfig,
+	protos_commit_request.type
+	);
 }
 
 struct proto *
diff --git a/nest/protocol.h b/nest/protocol.h
index 82bbf56c..60b80830 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -40,12 +40,20 @@ struct symbol;
  */
 
 
+enum protocol_startup {
+  PROTOCOL_STARTUP_REGULAR = 0,		/* Regular network routing protocol, start last */
+  PROTOCOL_STARTUP_GENERATOR = 1,	/* Static route generator, start ahead of regulars */
+  PROTOCOL_STARTUP_CONNECTOR = 2,	/* Data connector, start first */
+  PROTOCOL_STARTUP_NECESSARY = 3,	/* Vital auxiliary data, start zeroth */
+};
+
 struct protocol {
   node n;
   char *name;
   char *template;			/* Template for automatic generation of names */
   int name_counter;			/* Counter for automatic name generation */
   uint preference;			/* Default protocol preference */
+  enum protocol_startup startup;	/* When to start / stop this protocol */
   uint channel_mask;			/* Mask of accepted channel types (NB_*) */
   uint proto_size;			/* Size of protocol data structure */
   uint config_size;			/* Size of protocol config data structure */
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 1267a657..850d7cbf 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -334,6 +334,7 @@ struct protocol proto_pipe = {
   .template =		"pipe%d",
   .proto_size =		sizeof(struct pipe_proto),
   .config_size =	sizeof(struct pipe_config),
+  .startup =		PROTOCOL_STARTUP_CONNECTOR,
   .postconfig =		pipe_postconfig,
   .init =		pipe_init,
   .reconfigure =	pipe_reconfigure,
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index 0fd686b3..13a0afd2 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -994,6 +994,7 @@ struct protocol proto_rpki = {
   .preference = 	DEF_PREF_RPKI,
   .proto_size = 	sizeof(struct rpki_proto),
   .config_size =	sizeof(struct rpki_config),
+  .startup =		PROTOCOL_STARTUP_GENERATOR,
   .init = 		rpki_init,
   .start = 		rpki_start,
   .postconfig = 	rpki_postconfig,
diff --git a/proto/static/static.c b/proto/static/static.c
index 74603a93..2c3e09f4 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -775,6 +775,7 @@ struct protocol proto_static = {
   .channel_mask =	NB_ANY,
   .proto_size =		sizeof(struct static_proto),
   .config_size =	sizeof(struct static_config),
+  .startup =		PROTOCOL_STARTUP_GENERATOR,
   .postconfig =		static_postconfig,
   .init =		static_init,
   .dump =		static_dump,
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 6e94b0b6..c5ee52b8 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -243,6 +243,7 @@ struct protocol proto_unix_iface = {
   .template = 		"device%d",
   .proto_size =		sizeof(struct kif_proto),
   .config_size =	sizeof(struct kif_config),
+  .startup =		PROTOCOL_STARTUP_NECESSARY,
   .preconfig =		kif_preconfig,
   .init =		kif_init,
   .start =		kif_start,
@@ -993,6 +994,7 @@ struct protocol proto_unix_kernel = {
   .channel_mask =	NB_IP | MAYBE_IP6_SADR | MAYBE_MPLS,
   .proto_size =		sizeof(struct krt_proto),
   .config_size =	sizeof(struct krt_config),
+  .startup =		PROTOCOL_STARTUP_CONNECTOR,
   .preconfig =		krt_preconfig,
   .postconfig =		krt_postconfig,
   .init =		krt_init,

From 5cdc1b679cb879393b8d140ac5cbf81893d11258 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 24 Sep 2023 22:20:27 +0200
Subject: [PATCH 352/431] Kernel: refeed routes and delete them from kernel
 before actual shutdown

---
 sysdep/unix/krt.c | 73 +++++++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index c5ee52b8..8e9f229a 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -346,7 +346,7 @@ krt_is_installed(struct krt_proto *p, net *n)
 }
 
 static uint
-rte_feed_count(net *n)
+rte_feed_count_valid(net *n)
 {
   uint count = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -356,7 +356,7 @@ rte_feed_count(net *n)
 }
 
 static void
-rte_feed_obtain(net *n, const rte **feed, uint count)
+rte_feed_obtain_valid(net *n, const rte **feed, uint count)
 {
   uint i = 0;
   for (struct rte_storage *e = n->routes; e; e = e->next)
@@ -383,12 +383,12 @@ krt_export_net(struct krt_proto *p, net *net)
 
   if (c->ra_mode == RA_MERGED)
   {
-    uint count = rte_feed_count(net);
+    uint count = rte_feed_count_valid(net);
     if (!count)
       return NULL;
 
     const rte **feed = alloca(count * sizeof(rte *));
-    rte_feed_obtain(net, feed, count);
+    rte_feed_obtain_valid(net, feed, count);
     return rt_export_merged(c, feed, count, krt_filter_lp, 1);
   }
 
@@ -436,6 +436,10 @@ krt_same_dest(rte *k, rte *e)
 void
 krt_got_route(struct krt_proto *p, rte *e, s8 src)
 {
+  /* Ignore when flushing from table */
+  if (p->flush_routes == 1)
+    return;
+
   rte *new = NULL;
   e->pflags = 0;
 
@@ -465,8 +469,8 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   RT_LOCKED(p->p.main_channel->table, tab)
   {
 
-  /* Deleting all routes if flush is requested */
-  if (p->flush_routes)
+  /* Deleting all routes if final flush is requested */
+  if (p->flush_routes == 2)
     goto delete;
 
   /* We wait for the initial feed to have correct installed state */
@@ -560,17 +564,6 @@ krt_prune(struct krt_proto *p)
   }
 }
 
-static void
-krt_flush_routes(struct krt_proto *p)
-{
-  KRT_TRACE(p, D_EVENTS, "Flushing kernel routes");
-  p->flush_routes = 1;
-  krt_init_scan(p);
-  krt_do_scan(p);
-  /* No prune! */
-  p->flush_routes = 0;
-}
-
 void
 krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
 {
@@ -740,8 +733,11 @@ krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
 {
   struct krt_proto *p = (struct krt_proto *) P;
 
-  if (config->shutdown)
+  if (p->flush_routes)
+  {
+    krt_replace_rte(p, net, NULL, old ?: new);
     return;
+  }
 
 #ifdef CONFIG_SINGLE_ROUTE
   /* Got the same route as we imported. Keep it, do nothing. */
@@ -784,11 +780,23 @@ krt_reload_routes(struct channel *C)
   }
 }
 
+static void krt_cleanup(struct krt_proto *p);
+
 static void
 krt_feed_end(struct channel *C)
 {
   struct krt_proto *p = (void *) C->proto;
 
+  if (p->flush_routes)
+  {
+    p->flush_routes = 2;
+    krt_init_scan(p);
+    krt_do_scan(p);
+    krt_cleanup(p);
+    proto_notify_state(&p->p, PS_DOWN);
+    return;
+  }
+
   p->ready = 1;
   krt_scan_timer_kick(p);
 }
@@ -907,21 +915,32 @@ krt_shutdown(struct proto *P)
 
   krt_scan_timer_stop(p);
 
-  /* FIXME we should flush routes even when persist during reconfiguration */
-  if (p->initialized && !KRT_CF->persist && (P->down_code != PDC_CMD_GR_DOWN))
-    krt_flush_routes(p);
-
-  p->ready = 0;
-  p->initialized = 0;
-
   if (p->p.proto_state == PS_START)
     return PS_DOWN;
 
+  /* FIXME we should flush routes even when persist during reconfiguration */
+  if (p->initialized && !KRT_CF->persist && (P->down_code != PDC_CMD_GR_DOWN))
+  {
+    p->flush_routes = 1;
+    channel_request_feeding(p->p.main_channel);
+    return PS_UP;
+  }
+  else
+  {
+    krt_cleanup(p);
+    return PS_DOWN;
+  }
+}
+
+static void
+krt_cleanup(struct krt_proto *p)
+{
+  p->ready = 0;
+  p->initialized = 0;
+
   krt_sys_shutdown(p);
   rem_node(&p->krt_node);
   bmap_free(&p->sync_map);
-
-  return PS_DOWN;
 }
 
 static int

From 860fbf0d657d8e0b34b6fb2ff72c90f4030ed7ef Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 25 Sep 2023 09:31:18 +0200
Subject: [PATCH 353/431] Babel: Remove interfaces on shutdown

This avoids calling interface timer between Babel going
PS_DOWN and finally cleaning up the resource pool.
---
 proto/babel/babel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index decaa407..27ec4784 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2550,8 +2550,11 @@ babel_shutdown(struct proto *P)
 
   TRACE(D_EVENTS, "Shutdown requested");
 
-  WALK_LIST(ifa, p->interfaces)
+  WALK_LIST_FIRST(ifa, p->interfaces)
+  {
     babel_iface_shutdown(ifa);
+    babel_remove_iface(p, ifa);
+  }
 
   return PS_DOWN;
 }

From bf84daca8c83a28e2227c73a36cb41e49189148a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 27 Sep 2023 16:29:44 +0200
Subject: [PATCH 354/431] RIP: Properly handle route refeed

---
 proto/rip/rip.c | 60 ++++++++++++++++++++++++++++++++++++++++++-------
 proto/rip/rip.h |  1 +
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index dded05c7..9e6eed12 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -328,6 +328,17 @@ rip_withdraw_rte(struct rip_proto *p, net_addr *n, struct rip_neighbor *from)
     rip_announce_rte(p, en);
 }
 
+static void
+rip_withdraw_entry(struct rip_proto *p, struct rip_entry *en)
+{
+  en->valid = RIP_ENTRY_STALE;
+  en->metric = p->infinity;
+  en->tag = 0;
+  en->from = NULL;
+  en->iface = NULL;
+  en->next_hop = IPA_NONE;
+}
+
 /*
  * rip_rt_notify - core tells us about new route, so store
  * it into our data structures.
@@ -392,17 +403,11 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net, s
     /* Withdraw */
     en = fib_find(&p->rtable, net);
 
-    if (!en || en->valid != RIP_ENTRY_VALID)
+    if (!en || !(en->valid & RIP_ENTRY_VALID))
       return;
 
     old_metric = en->metric;
-
-    en->valid = RIP_ENTRY_STALE;
-    en->metric = p->infinity;
-    en->tag = 0;
-    en->from = NULL;
-    en->iface = NULL;
-    en->next_hop = IPA_NONE;
+    rip_withdraw_entry(p, en);
   }
 
   /* Activate triggered updates */
@@ -413,6 +418,43 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net, s
   }
 }
 
+void
+rip_feed_begin(struct channel *C, int initial)
+{
+  if (initial)
+    return;
+
+  struct rip_proto *p = (struct rip_proto *) C->proto;
+
+  FIB_WALK(&p->rtable, struct rip_entry, en)
+  {
+    if (en->valid == RIP_ENTRY_VALID)
+      en->valid = RIP_ENTRY_REFEEDING;
+  }
+  FIB_WALK_END;
+}
+
+void
+rip_feed_end(struct channel *C)
+{
+  struct rip_proto *p = (struct rip_proto *) C->proto;
+  int changed = 0;
+
+  FIB_WALK(&p->rtable, struct rip_entry, en)
+  {
+    if (en->valid == RIP_ENTRY_REFEEDING)
+    {
+      rip_withdraw_entry(p, en);
+      changed++;
+    }
+  }
+  FIB_WALK_END;
+
+  if (changed)
+    rip_trigger_update(p);
+}
+
+
 void
 rip_flush_table(struct rip_proto *p, struct rip_neighbor *n)
 {
@@ -1159,6 +1201,8 @@ rip_init(struct proto_config *CF)
   P->iface_sub.neigh_notify = rip_neigh_notify;
   P->reload_routes = rip_reload_routes;
   P->sources.class = &rip_rte_owner_class;
+  P->feed_begin = rip_feed_begin;
+  P->feed_end = rip_feed_end;
 
   return P;
 }
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index a01f8d3b..6d70df46 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -194,6 +194,7 @@ struct rip_rte
 #define RIP_ENTRY_DUMMY		0	/* Only used to store list of incoming routes */
 #define RIP_ENTRY_VALID		1	/* Valid outgoing route */
 #define RIP_ENTRY_STALE		2	/* Stale outgoing route, waiting for GC */
+#define RIP_ENTRY_REFEEDING	3	/* Route valid until feed ends */
 
 static inline int rip_is_v2(struct rip_proto *p)
 { return p->rip2; }

From b58ebc4ef18f9e4a77e466a218f61eeaadb8ecb4 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 27 Sep 2023 16:47:25 +0200
Subject: [PATCH 355/431] Babel: Properly handle route refeed

---
 proto/babel/babel.c | 53 ++++++++++++++++++++++++++++++++++++++++-----
 proto/babel/babel.h |  1 +
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 27ec4784..b49c6b3b 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2361,6 +2361,15 @@ babel_preexport(struct channel *C, struct rte *new)
   return 0;
 }
 
+static void
+babel_entry_invalidate(struct babel_entry *e)
+{
+  e->valid = BABEL_ENTRY_STALE;
+  e->metric = BABEL_INFINITY;
+  e->updated = current_time();
+}
+
+
 /*
  * babel_rt_notify - core tells us about new route (possibly our own),
  * so store it into our data structures.
@@ -2402,7 +2411,7 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
     e = babel_get_entry(p, net);
 
     /* Activate triggered updates */
-    if ((e->valid != BABEL_ENTRY_VALID) ||
+    if (!(e->valid & BABEL_ENTRY_VALID) ||
 	(e->router_id != rt_router_id))
     {
       babel_trigger_update(p);
@@ -2422,14 +2431,46 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
     if (!e || e->valid != BABEL_ENTRY_VALID)
       return;
 
-    e->valid = BABEL_ENTRY_STALE;
-    e->metric = BABEL_INFINITY;
-
+    babel_entry_invalidate(e);
     babel_trigger_update(p);
-    e->updated = current_time();
   }
 }
 
+static void
+babel_feed_begin(struct channel *C, int initial)
+{
+  if (initial)
+    return;
+
+  struct babel_proto *p = (struct babel_proto *) C->proto;
+  struct fib *rtable = (C->net_type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable;
+
+  FIB_WALK(rtable, struct babel_entry, e)
+    if (e->valid == BABEL_ENTRY_VALID)
+      e->valid = BABEL_ENTRY_REFEEDING;
+  FIB_WALK_END;
+}
+
+static void
+babel_feed_end(struct channel *C)
+{
+  struct babel_proto *p = (struct babel_proto *) C->proto;
+  struct fib *rtable = (C->net_type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable;
+  int changed = 0;
+
+  FIB_WALK(rtable, struct babel_entry, e)
+    if (e->valid == BABEL_ENTRY_REFEEDING)
+    {
+      babel_entry_invalidate(e);
+      changed++;
+    }
+  FIB_WALK_END;
+
+  if (changed)
+    babel_trigger_update(p);
+}
+
+
 static int
 babel_rte_better(const rte *new, const rte *old)
 {
@@ -2482,6 +2523,8 @@ babel_init(struct proto_config *CF)
   P->iface_sub.if_notify = babel_if_notify;
   P->rt_notify = babel_rt_notify;
   P->preexport = babel_preexport;
+  P->feed_begin = babel_feed_begin;
+  P->feed_end = babel_feed_end;
 
   P->sources.class = &babel_rte_owner_class;
 
diff --git a/proto/babel/babel.h b/proto/babel/babel.h
index 562abac2..2aa1ed6b 100644
--- a/proto/babel/babel.h
+++ b/proto/babel/babel.h
@@ -299,6 +299,7 @@ struct babel_entry {
 #define BABEL_ENTRY_DUMMY	0	/* No outgoing route */
 #define BABEL_ENTRY_VALID	1	/* Valid outgoing route */
 #define BABEL_ENTRY_STALE	2	/* Stale outgoing route, waiting for GC */
+#define BABEL_ENTRY_REFEEDING	3	/* Route valid until feed ends */
 
 
 /*

From 8d1215dba6c76f2f4fe5360cd20eca8a953fb0f0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 29 Sep 2023 16:24:50 +0200
Subject: [PATCH 356/431] Channel: Refeeding by an auxiliary request if needed.

If the protocol supports route refresh on export, we keep the stop-start
method of route refeed. This applies for BGP with ERR or with export
table on, for OSPF, Babel, RIP or Pipe.

For BGP without ERR or for future selective ROA reloads, we're adding an
auxiliary export request, doing the refeed while the main export request
is running, somehow resembling the original method of BIRD 2 refeed.

There is also a refeed request queue to keep track of different refeed
requests.
---
 lib/bitmap.c          |   2 +
 nest/proto.c          | 195 ++++++++++++++++++++++++++++++++++++------
 nest/protocol.h       |  38 ++++++--
 nest/rt-show.c        |   2 +-
 nest/rt-table.c       | 100 ++++++++++++++--------
 nest/rt.h             |   4 +-
 proto/babel/babel.c   |   7 +-
 proto/bgp/bgp.c       |  27 +++---
 proto/bgp/packets.c   |   7 +-
 proto/ospf/topology.c |   8 +-
 proto/ospf/topology.h |   2 +-
 proto/perf/perf.c     |   5 +-
 proto/pipe/pipe.c     |  10 ++-
 proto/radv/radv.c     |   2 +-
 proto/rip/rip.c       |   7 +-
 sysdep/unix/krt.c     |   7 +-
 16 files changed, 328 insertions(+), 95 deletions(-)

diff --git a/lib/bitmap.c b/lib/bitmap.c
index b6ea5a38..dd92b3c7 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -36,6 +36,8 @@ bmap_reset(struct bmap *b, uint size)
 void
 bmap_grow(struct bmap *b, uint need)
 {
+  ASSERT_DIE(b->size);
+
   uint size = b->size * 2;
   while (size < need)
     size *= 2;
diff --git a/nest/proto.c b/nest/proto.c
index 54aa1646..5b00cc9d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -54,6 +54,7 @@ static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
 static void channel_feed_end(struct channel *c);
 static void channel_stop_export(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
+static void channel_refeed_stopped(struct rt_export_request *req);
 static void channel_check_stopped(struct channel *c);
 
 static inline int proto_is_done(struct proto *p)
@@ -88,7 +89,7 @@ channel_export_log_state_change(struct rt_export_request *req, u8 state)
   {
     case TES_FEEDING:
       if (c->proto->feed_begin)
-	c->proto->feed_begin(c, !c->refeeding);
+	c->proto->feed_begin(c);
       break;
     case TES_READY:
       channel_feed_end(c);
@@ -96,6 +97,25 @@ channel_export_log_state_change(struct rt_export_request *req, u8 state)
   }
 }
 
+void
+channel_refeed_log_state_change(struct rt_export_request *req, u8 state)
+{
+  struct channel *c = SKIP_BACK(struct channel, refeed_req, req);
+  CD(c, "Channel export state changed to %s", rt_export_state_name(state));
+
+  switch (state)
+  {
+    case TES_FEEDING:
+      if (c->proto->feed_begin)
+	c->proto->feed_begin(c);
+      break;
+    case TES_READY:
+      rt_stop_export(req, channel_refeed_stopped);
+      break;
+  }
+}
+
+
 static void
 channel_dump_import_req(struct rt_import_request *req)
 {
@@ -110,6 +130,40 @@ channel_dump_export_req(struct rt_export_request *req)
   debug("  Channel %s.%s export request %p\n", c->proto->name, c->name, req);
 }
 
+static void
+channel_dump_refeed_req(struct rt_export_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, refeed_req, req);
+  debug("  Channel %s.%s refeed request %p\n", c->proto->name, c->name, req);
+}
+
+
+static void
+channel_rpe_mark_seen_export(struct rt_export_request *req, struct rt_pending_export *rpe)
+{
+  channel_rpe_mark_seen(SKIP_BACK(struct channel, out_req, req), rpe);
+}
+
+static void
+channel_rpe_mark_seen_refeed(struct rt_export_request *req, struct rt_pending_export *rpe)
+{
+  channel_rpe_mark_seen(SKIP_BACK(struct channel, refeed_req, req), rpe);
+}
+
+
+struct channel *
+channel_from_export_request(struct rt_export_request *req)
+{
+  if (req->dump_req == channel_dump_export_req)
+    return SKIP_BACK(struct channel, out_req, req);
+
+  if (req->dump_req == channel_dump_refeed_req)
+    return SKIP_BACK(struct channel, refeed_req, req);
+
+  bug("Garbled channel export request");
+}
+
+
 static void
 proto_log_state_change(struct proto *p)
 {
@@ -289,6 +343,7 @@ struct roa_subscription {
   struct settle settle;
   struct channel *c;
   struct rt_export_request req;
+  struct channel_feeding_request cfr[2];
 };
 
 static void
@@ -309,8 +364,23 @@ channel_roa_out_changed(struct settle *se)
 
   CD(c, "Feeding triggered by RPKI change");
 
-  c->refeed_pending = 1;
-  channel_stop_export(c);
+  /* Refeed already pending */
+  if ((s->cfr[0].state == CFRS_PENDING) || (s->cfr[1].state == CFRS_PENDING))
+    return;
+
+  /* First refeed inactive */
+  if (s->cfr[0].state == CFRS_INACTIVE)
+  {
+    s->cfr[0].type = CFRT_AUXILIARY;
+    channel_request_feeding(c, &s->cfr[0]);
+  }
+  else
+  {
+    /* Second refeed MUST be inactive */
+    ASSERT_DIE(s->cfr[1].state == CFRS_INACTIVE);
+    s->cfr[1].type = CFRT_AUXILIARY;
+    channel_request_feeding(c, &s->cfr[1]);
+  }
 }
 
 static void
@@ -505,7 +575,7 @@ channel_start_export(struct channel *c)
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
-    .mark_seen = channel_rpe_mark_seen,
+    .mark_seen = channel_rpe_mark_seen_export,
   };
 
   bmap_init(&c->export_map, c->proto->pool, 16);
@@ -533,6 +603,12 @@ channel_start_export(struct channel *c)
       bug("Unknown route announcement mode");
   }
 
+  c->refeed_req = c->out_req;
+  c->refeed_req.name = mb_sprintf(c->proto->pool, "%s.%s.refeed", c->proto->name, c->name);
+  c->refeed_req.dump_req = channel_dump_refeed_req;
+  c->refeed_req.log_state_change = channel_refeed_log_state_change;
+  c->refeed_req.mark_seen = channel_rpe_mark_seen_refeed;
+
   DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
   rt_request_export(c->table, &c->out_req);
 }
@@ -543,7 +619,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->in_req.hook || c->reload_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->in_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -551,7 +627,7 @@ channel_check_stopped(struct channel *c)
 
       break;
     case CS_PAUSE:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->reload_req.hook)
+      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_START);
@@ -582,8 +658,9 @@ channel_export_stopped(struct rt_export_request *req)
 
   if (c->refeed_pending)
   {
-    c->refeeding = 1;
-    c->refeed_pending = 0;
+    ASSERT_DIE(!c->refeeding);
+    c->refeeding = c->refeed_pending;
+    c->refeed_pending = NULL;
 
     channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
@@ -603,6 +680,34 @@ channel_export_stopped(struct rt_export_request *req)
   channel_check_stopped(c);
 }
 
+static void
+channel_refeed_stopped(struct rt_export_request *req)
+{
+  struct channel *c = SKIP_BACK(struct channel, refeed_req, req);
+
+  req->hook = NULL;
+
+  channel_feed_end(c);
+}
+
+static void
+channel_init_feeding(struct channel *c)
+{
+  for (struct channel_feeding_request *cfrp = c->refeed_pending; cfrp; cfrp = cfrp->next)
+    if (cfrp->type == CFRT_DIRECT)
+    {
+      /* Direct feeding requested? Restart the export by force. */
+      channel_stop_export(c);
+      return;
+    }
+
+  /* No direct feeding, running auxiliary refeed. */
+  c->refeeding = c->refeed_pending;
+  c->refeed_pending = NULL;
+  c->refeed_trie = f_new_trie(lp_new(c->proto->pool), 0);
+  rt_request_export(c->table, &c->refeed_req);
+}
+
 static void
 channel_feed_end(struct channel *c)
 {
@@ -610,24 +715,46 @@ channel_feed_end(struct channel *c)
   struct limit *l = &c->out_limit;
   if (c->refeeding &&
       (c->limit_active & (1 << PLD_OUT)) &&
-      (c->refeed_count <= l->max) &&
       (l->count <= l->max))
   {
     log(L_INFO "Protocol %s resets route export limit (%u)", c->proto->name, l->max);
-    channel_reset_limit(c, &c->out_limit, PLD_OUT);
+    c->limit_active &= ~(1 << PLD_OUT);
 
-    c->refeed_pending = 1;
-    channel_stop_export(c);
-    return;
+    /* Queue the same refeed batch back into pending */
+    struct channel_feeding_request **ptr = &c->refeed_pending;
+    while (*ptr)
+      ptr = &((*ptr)->next);
+
+    *ptr = c->refeeding;
+
+    /* Mark the requests to be redone */
+    for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
+      cfr->state = CFRS_PENDING;
+
+    c->refeeding = NULL;
   }
 
-  if (c->proto->feed_end)
-    c->proto->feed_end(c);
+  /* Inform the protocol about the feed ending */
+  CALL(c->proto->feed_end, c);
 
+  /* Free the dynamic feeding requests */
+  for (struct channel_feeding_request *cfr = c->refeeding, *next = cfr ? cfr->next : NULL;
+      cfr;
+      (cfr = next), (next = next ? next->next : NULL))
+    if (cfr->flags & CFRF_DYNAMIC)
+      mb_free(cfr);
+
+  /* Drop the refeed batch */
+  c->refeeding = NULL;
+  if (c->refeed_trie)
+  {
+    rfree(c->refeed_trie->lp);
+    c->refeed_trie = NULL;
+  }
+
+  /* Run the pending batch */
   if (c->refeed_pending)
-    channel_stop_export(c);
-  else
-    c->refeeding = 0;
+    channel_init_feeding(c);
 }
 
 /* Called by protocol for reload from in_table */
@@ -852,24 +979,36 @@ channel_set_state(struct channel *c, uint state)
  * even when feeding is already running, in that case it is restarted.
  */
 void
-channel_request_feeding(struct channel *c)
+channel_request_feeding(struct channel *c, struct channel_feeding_request *cfr)
 {
   ASSERT(c->out_req.hook);
 
-  if (c->refeed_pending)
-    return;
+  /* Enqueue the request */
+  cfr->next = c->refeed_pending;
+  c->refeed_pending = cfr;
 
-  c->refeed_pending = 1;
-  channel_stop_export(c);
+  /* Initialize refeeds unless already refeeding */
+  if (!c->refeeding)
+    channel_init_feeding(c);
+}
+
+void
+channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type type)
+{
+  struct channel_feeding_request *req = mb_allocz(c->proto->pool, sizeof *req);
+  req->type = type;
+  req->flags |= CFRF_DYNAMIC;
+  channel_request_feeding(c, req);
 }
 
 static void
 channel_stop_export(struct channel *c)
 {
-  if (!c->out_req.hook || (c->out_req.hook->export_state == TES_STOP))
-    return;
+  if (c->refeed_req.hook && (c->refeed_req.hook->export_state != TES_STOP))
+    rt_stop_export(&c->refeed_req, channel_refeed_stopped);
 
-  rt_stop_export(&c->out_req, channel_export_stopped);
+  if (c->out_req.hook && (c->out_req.hook->export_state != TES_STOP))
+    rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
 static void
@@ -1073,7 +1212,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
     channel_request_reload(c);
 
   if (export_changed)
-    channel_request_feeding(c);
+    channel_request_feeding_dynamic(c, CFRT_AUXILIARY);
 
 done:
   CD(c, "Reconfigured");
@@ -2511,7 +2650,7 @@ proto_cmd_reload(struct proto *p, uintptr_t dir, int cnt UNUSED)
   if (dir != CMD_RELOAD_IN)
     WALK_LIST(c, p->channels)
       if (c->channel_state == CS_UP)
-	channel_request_feeding(c);
+	channel_request_feeding_dynamic(c, CFRT_AUXILIARY);
 
   cli_msg(-15, "%s: reloading", p->name);
 }
diff --git a/nest/protocol.h b/nest/protocol.h
index 60b80830..ca33a7fc 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -17,6 +17,7 @@
 #include "nest/rt.h"
 #include "nest/limit.h"
 #include "conf/conf.h"
+#include "filter/data.h"
 
 struct iface;
 struct ifa;
@@ -194,7 +195,7 @@ struct proto {
   void (*rt_notify)(struct proto *, struct channel *, const net_addr *net, struct rte *new, const struct rte *old);
   int (*preexport)(struct channel *, struct rte *rt);
   void (*reload_routes)(struct channel *);
-  void (*feed_begin)(struct channel *, int initial);
+  void (*feed_begin)(struct channel *);
   void (*feed_end)(struct channel *);
 
   /*
@@ -568,7 +569,10 @@ struct channel {
   struct rt_import_request in_req;	/* Table import connection */
   struct rt_export_request out_req;	/* Table export connection */
 
-  u32 refeed_count;			/* Number of routes exported during refeed regardless of out_limit */
+  struct rt_export_request refeed_req;	/* Auxiliary refeed request */
+  struct f_trie *refeed_trie;		/* Auxiliary refeed trie */
+  struct channel_feeding_request *refeeding;	/* Refeeding the channel */
+  struct channel_feeding_request *refeed_pending;	/* Scheduled refeeds */
 
   uint feed_block_size;			/* How many routes to feed at once */
 
@@ -582,7 +586,6 @@ struct channel {
   u8 stale;				/* Used in reconfiguration */
 
   u8 channel_state;
-  u8 refeeding;				/* Refeeding the channel. */
   u8 reloadable;			/* Hook reload_routes() is allowed on the channel */
   u8 gr_lock;				/* Graceful restart mechanism should wait for this channel */
   u8 gr_wait;				/* Route export to channel is postponed until graceful restart */
@@ -592,7 +595,6 @@ struct channel {
   struct rt_export_request reload_req;	/* Feeder for import reload */
 
   u8 reload_pending;			/* Reloading and another reload is scheduled */
-  u8 refeed_pending;			/* Refeeding and another refeed is scheduled */
   u8 rpki_reload;			/* RPKI changes trigger channel reload */
 
   struct rt_exporter *out_table;	/* Internal table for exported routes */
@@ -673,7 +675,33 @@ static inline void channel_init(struct channel *c) { channel_set_state(c, CS_STA
 static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP); }
 static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }
 
-void channel_request_feeding(struct channel *c);
+struct channel_feeding_request {
+  struct channel_feeding_request *next;
+  PACKED enum channel_feeding_request_type {
+    CFRT_DIRECT = 1,
+    CFRT_AUXILIARY,
+  } type;
+  PACKED enum {
+    CFRS_INACTIVE = 0,
+    CFRS_PENDING,
+    CFRS_RUNNING,
+  } state;
+  PACKED enum {
+    CFRF_DYNAMIC = 1,
+  } flags;
+};
+
+struct channel *channel_from_export_request(struct rt_export_request *req);
+void channel_request_feeding(struct channel *c, struct channel_feeding_request *);
+void channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type);
+
+static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n)
+{ return (c->refeeding && c->refeed_trie && !trie_match_net(c->refeed_trie, n)); }
+static inline void channel_net_mark_refed(struct channel *c, const net_addr *n)
+{
+  ASSERT_DIE(c->refeeding && c->refeed_trie);
+  trie_add_prefix(c->refeed_trie, n, n->pxlen, n->pxlen);
+}
 void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 int channel_reconfigure(struct channel *c, struct channel_config *cf);
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 7a8b629b..6f19936f 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -142,7 +142,7 @@ rt_show_net(struct rt_show_data *d, const net_addr *n, const rte **feed, uint co
 	{
 	  /* Special case for merged export */
 	  pass = 1;
-	  rte *em = rt_export_merged(ec, feed, count, tmp_linpool, 1);
+	  rte *em = rt_export_merged(ec, n, feed, count, tmp_linpool, 1);
 
 	  if (em)
 	    e = *em;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 53af2d81..fbbfd4be 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -858,9 +858,6 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
   struct proto *p = c->proto;
   struct channel_export_stats *stats = &c->export_stats;
 
-  if (c->refeeding && new)
-    c->refeed_count++;
-
   if (!old && new)
     if (CHANNEL_LIMIT_PUSH(c, OUT))
     {
@@ -897,9 +894,9 @@ do_rt_notify(struct channel *c, const net_addr *net, rte *new, const rte *old)
 }
 
 static void
-rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old)
+rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old, int force)
 {
-  if (new && old && rte_same(new, old))
+  if (new && old && rte_same(new, old) && !force)
   {
     channel_rte_trace_out(D_ROUTES, c, new, "already exported");
 
@@ -911,6 +908,10 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old
     return;
   }
 
+  /* Refeeding and old is new */
+  if (force && !old && bmap_test(&c->export_map, new->id))
+    old = new;
+
   if (new)
     new = export_filter(c, new, 0);
 
@@ -924,13 +925,16 @@ rt_notify_basic(struct channel *c, const net_addr *net, rte *new, const rte *old
 }
 
 void
-channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *rpe)
+channel_rpe_mark_seen(struct channel *c, struct rt_pending_export *rpe)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
-
   channel_trace(c, D_ROUTES, "Marking seen %p (%lu)", rpe, rpe->seq);
 
-  rpe_mark_seen(req->hook, rpe);
+  ASSERT_DIE(c->out_req.hook);
+  rpe_mark_seen(c->out_req.hook, rpe);
+
+  if (c->refeed_req.hook && (c->refeed_req.hook->export_state == TES_FEEDING))
+    rpe_mark_seen(c->refeed_req.hook, rpe);
+
   if (rpe->old)
     bmap_clear(&c->export_reject_map, rpe->old->rte.id);
 }
@@ -940,7 +944,8 @@ rt_notify_accepted(struct rt_export_request *req, const net_addr *n,
     struct rt_pending_export *first, struct rt_pending_export *last,
     const rte **feed, uint count)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  struct channel *c = channel_from_export_request(req);
+  int refeeding = channel_net_is_refeeding(c, n);
 
   rte nb0, *new_best = NULL;
   const rte *old_best = NULL;
@@ -951,22 +956,27 @@ rt_notify_accepted(struct rt_export_request *req, const net_addr *n,
       continue;
 
     /* Has been already rejected, won't bother with it */
-    if (!c->refeeding && bmap_test(&c->export_reject_map, feed[i]->id))
+    if (!refeeding && bmap_test(&c->export_reject_map, feed[i]->id))
       continue;
 
     /* Previously exported */
     if (!old_best && bmap_test(&c->export_map, feed[i]->id))
     {
-      /* is still best */
-      if (!new_best)
+      if (new_best)
       {
+	/* is superseded */
+	old_best = feed[i];
+	break;
+      }
+      else if (refeeding)
+	/* is superseeded but maybe by a new version of itself */
+	old_best = feed[i];
+      else
+      {
+	/* is still best */
 	DBG("rt_notify_accepted: idempotent\n");
 	goto done;
       }
-
-      /* is superseded */
-      old_best = feed[i];
-      break;
     }
 
     /* Have no new best route yet */
@@ -983,7 +993,7 @@ done:
   /* Check obsolete routes for previously exported */
   RPE_WALK(first, rpe, NULL)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(c, rpe);
     if (rpe->old)
     {
       if (bmap_test(&c->export_map, rpe->old->rte.id))
@@ -1001,13 +1011,21 @@ done:
     do_rt_notify(c, n, new_best, old_best);
   else
     DBG("rt_notify_accepted: nothing to export\n");
+
+  if (refeeding)
+    channel_net_mark_refed(c, n);
 }
 
 rte *
-rt_export_merged(struct channel *c, const rte **feed, uint count, linpool *pool, int silent)
+rt_export_merged(struct channel *c, const net_addr *n, const rte **feed, uint count, linpool *pool, int silent)
 {
   _Thread_local static rte rloc;
 
+  int refeeding = !silent && channel_net_is_refeeding(c, n);
+
+  if (refeeding)
+    channel_net_mark_refed(c, n);
+
   // struct proto *p = c->proto;
   struct nexthop_adata *nhs = NULL;
   const rte *best0 = feed[0];
@@ -1017,7 +1035,7 @@ rt_export_merged(struct channel *c, const rte **feed, uint count, linpool *pool,
     return NULL;
 
   /* Already rejected, no need to re-run the filter */
-  if (!c->refeeding && bmap_test(&c->export_reject_map, best0->id))
+  if (!refeeding && bmap_test(&c->export_reject_map, best0->id))
     return NULL;
 
   rloc = *best0;
@@ -1037,7 +1055,7 @@ rt_export_merged(struct channel *c, const rte **feed, uint count, linpool *pool,
       continue;
 
     rte tmp0 = *feed[i];
-    rte *tmp = export_filter(c, &tmp0, 1);
+    rte *tmp = export_filter(c, &tmp0, !refeeding);
 
     if (!tmp || !rte_is_reachable(tmp))
       continue;
@@ -1070,7 +1088,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n,
     struct rt_pending_export *first, struct rt_pending_export *last,
     const rte **feed, uint count)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  struct channel *c = channel_from_export_request(req);
 
   // struct proto *p = c->proto;
 
@@ -1095,7 +1113,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n,
   /* Check obsolete routes for previously exported */
   RPE_WALK(first, rpe, NULL)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(c, rpe);
     if (rpe->old)
     {
       if (bmap_test(&c->export_map, rpe->old->rte.id))
@@ -1109,7 +1127,7 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n,
   }
 
   /* Prepare new merged route */
-  rte *new_merged = count ? rt_export_merged(c, feed, count, tmp_linpool, 0) : NULL;
+  rte *new_merged = count ? rt_export_merged(c, n, feed, count, tmp_linpool, 0) : NULL;
 
   if (new_merged || old_best)
     do_rt_notify(c, n, new_merged, old_best);
@@ -1118,25 +1136,30 @@ rt_notify_merged(struct rt_export_request *req, const net_addr *n,
 void
 rt_notify_optimal(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  struct channel *c = channel_from_export_request(req);
   const rte *o = RTE_VALID_OR_NULL(first->old_best);
   struct rte_storage *new_best = first->new_best;
 
+  int refeeding = channel_net_is_refeeding(c, net);
+
   RPE_WALK(first, rpe, NULL)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(c, rpe);
     new_best = rpe->new_best;
   }
 
   rte n0 = RTE_COPY_VALID(new_best);
   if (n0.src || o)
-    rt_notify_basic(c, net, n0.src ? &n0 : NULL, o);
+    rt_notify_basic(c, net, n0.src ? &n0 : NULL, o, refeeding);
+
+  if (refeeding)
+    channel_net_mark_refed(c, net);
 }
 
 void
 rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  struct channel *c = channel_from_export_request(req);
 
   const rte *n = RTE_VALID_OR_NULL(first->new);
   const rte *o = RTE_VALID_OR_NULL(first->old);
@@ -1145,9 +1168,13 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
       "Notifying any, net %N, first %p (%lu), new %p, old %p",
       net, first, first->seq, n, o);
 
-  if (!n && !o)
+  if (!n && !o || channel_net_is_refeeding(c, net))
   {
-    channel_rpe_mark_seen(req, first);
+    /* We want to skip this notification because:
+     * - there is nothing to notify, or
+     * - this net is going to get a full refeed soon
+     */
+    channel_rpe_mark_seen(c, first);
     return;
   }
 
@@ -1156,13 +1183,13 @@ rt_notify_any(struct rt_export_request *req, const net_addr *net, struct rt_pend
 
   RPE_WALK(first, rpe, src)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(c, rpe);
     new_latest = rpe->new;
   }
 
   rte n0 = RTE_COPY_VALID(new_latest);
   if (n0.src || o)
-    rt_notify_basic(c, net, n0.src ? &n0 : NULL, o);
+    rt_notify_basic(c, net, n0.src ? &n0 : NULL, o, 0);
 
   channel_trace(c, D_ROUTES, "Notified net %N", net);
 }
@@ -1172,7 +1199,8 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net,
     struct rt_pending_export *first, struct rt_pending_export *last,
     const rte **feed, uint count)
 {
-  struct channel *c = SKIP_BACK(struct channel, out_req, req);
+  struct channel *c = channel_from_export_request(req);
+  int refeeding = channel_net_is_refeeding(c, net);
 
   channel_trace(c, D_ROUTES, "Feeding any, net %N, first %p (%lu), %p (%lu), count %u",
       net, first, first ? first->seq : 0, last ? last->seq : 0, count);
@@ -1181,17 +1209,19 @@ rt_feed_any(struct rt_export_request *req, const net_addr *net,
     if (rte_is_valid(feed[i]))
     {
       rte n0 = *feed[i];
-      rt_notify_basic(c, net, &n0, NULL);
+      rt_notify_basic(c, net, &n0, NULL, refeeding);
     }
 
   RPE_WALK(first, rpe, NULL)
   {
-    channel_rpe_mark_seen(req, rpe);
+    channel_rpe_mark_seen(c, rpe);
     if (rpe == last)
       break;
   }
 
   channel_trace(c, D_ROUTES, "Fed %N", net);
+  if (refeeding)
+    channel_net_mark_refed(c, net);
 }
 
 void
diff --git a/nest/rt.h b/nest/rt.h
index 79694016..f308587f 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -473,7 +473,7 @@ void rt_feed_any(struct rt_export_request *req, const net_addr *net, struct rt_p
 void rt_notify_accepted(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 void rt_notify_merged(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first, struct rt_pending_export *last, const rte **feed, uint count);
 
-void channel_rpe_mark_seen(struct rt_export_request *req, struct rt_pending_export *rpe);
+void channel_rpe_mark_seen(struct channel *c, struct rt_pending_export *rpe);
 
 /* Types of route announcement, also used as flags */
 #define RA_UNDEF	0		/* Undefined RA type */
@@ -598,7 +598,7 @@ static inline net *net_find_valid(struct rtable_private *tab, const net_addr *ad
 static inline net *net_get(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 net *net_route(struct rtable_private *tab, const net_addr *n);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
-rte *rt_export_merged(struct channel *c, const rte ** feed, uint count, linpool *pool, int silent);
+rte *rt_export_merged(struct channel *c, const net_addr *n, const rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
 void rt_modify_stale(rtable *t, struct rt_import_request *);
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index b49c6b3b..c765c71f 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2437,9 +2437,9 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net,
 }
 
 static void
-babel_feed_begin(struct channel *C, int initial)
+babel_feed_begin(struct channel *C)
 {
-  if (initial)
+  if (!C->refeeding || C->refeed_req.hook)
     return;
 
   struct babel_proto *p = (struct babel_proto *) C->proto;
@@ -2454,6 +2454,9 @@ babel_feed_begin(struct channel *C, int initial)
 static void
 babel_feed_end(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct babel_proto *p = (struct babel_proto *) C->proto;
   struct fib *rtable = (C->net_type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable;
   int changed = 0;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 573fa152..0de9c603 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1575,7 +1575,7 @@ bgp_reload_routes(struct channel *C)
 }
 
 static void
-bgp_feed_begin(struct channel *C, int initial)
+bgp_feed_begin(struct channel *C)
 {
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
@@ -1588,21 +1588,28 @@ bgp_feed_begin(struct channel *C, int initial)
   if (!p->conn)
     return;
 
-  if (initial && p->cf->gr_mode)
-    c->feed_state = BFS_LOADING;
-
-  if (!initial && C->out_table)
+  if (!C->refeeding)
   {
-    c->feed_out_table = 1;
+    if (p->cf->gr_mode)
+      c->feed_state = BFS_LOADING;
     return;
   }
 
-  /* It is refeed and both sides support enhanced route refresh */
-  if (!initial && p->enhanced_refresh)
+  if (!C->refeed_req.hook)
   {
-    /* BoRR must not be sent before End-of-RIB */
-    if (c->feed_state == BFS_LOADING || c->feed_state == BFS_LOADED)
+    /* Direct refeed */
+    if (C->out_table)
+    {
+      /* FIXME: THIS IS BROKEN, IT DOESN'T PRUNE THE OUT TABLE */
+      c->feed_out_table = 1;
       return;
+    }
+
+    ASSERT_DIE(p->enhanced_refresh);
+
+    /* It is refeed and both sides support enhanced route refresh */
+    /* BoRR must not be sent before End-of-RIB */
+    ASSERT_DIE((c->feed_state != BFS_LOADING) && (c->feed_state != BFS_LOADED));
 
     c->feed_state = BFS_REFRESHING;
     bgp_schedule_packet(p->conn, c, PKT_BEGIN_REFRESH);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index b9fc38ce..406d2105 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2801,7 +2801,12 @@ bgp_rx_route_refresh(struct bgp_conn *conn, byte *pkt, uint len)
   {
   case BGP_RR_REQUEST:
     BGP_TRACE(D_PACKETS, "Got ROUTE-REFRESH");
-    channel_request_feeding(&c->c);
+    if (c->c.out_table)
+    {
+      /* FIXME: REQUEST REFRESH FROM OUT TABLE */
+    }
+    else
+      channel_request_feeding_dynamic(&c->c, p->enhanced_refresh ? CFRT_DIRECT : CFRT_AUXILIARY);
     break;
 
   case BGP_RR_BEGIN:
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 85bce03d..b4f5013c 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -551,8 +551,11 @@ ospf_update_lsadb(struct ospf_proto *p)
 }
 
 void
-ospf_feed_begin(struct channel *C, int initial UNUSED)
+ospf_feed_begin(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct ospf_proto *p = (struct ospf_proto *) C->proto;
   struct top_hash_entry *en;
 
@@ -565,6 +568,9 @@ ospf_feed_begin(struct channel *C, int initial UNUSED)
 void
 ospf_feed_end(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct ospf_proto *p = (struct ospf_proto *) C->proto;
   struct top_hash_entry *en;
 
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h
index 3c92b431..e919627d 100644
--- a/proto/ospf/topology.h
+++ b/proto/ospf/topology.h
@@ -187,7 +187,7 @@ struct top_hash_entry * ospf_originate_lsa(struct ospf_proto *p, struct ospf_new
 void ospf_advance_lsa(struct ospf_proto *p, struct top_hash_entry *en, struct ospf_lsa_header *lsa, u32 type, u32 domain, void *body);
 void ospf_flush_lsa(struct ospf_proto *p, struct top_hash_entry *en);
 void ospf_update_lsadb(struct ospf_proto *p);
-void ospf_feed_begin(struct channel *C, int initial);
+void ospf_feed_begin(struct channel *C);
 void ospf_feed_end(struct channel *C);
 
 static inline void ospf_flush2_lsa(struct ospf_proto *p, struct top_hash_entry **en)
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index dc5bbf2f..02723a30 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -217,7 +217,7 @@ perf_rt_notify(struct proto *P, struct channel *c UNUSED, const net_addr *net UN
 }
 
 static void
-perf_feed_begin(struct channel *c, int initial UNUSED)
+perf_feed_begin(struct channel *c)
 {
   struct perf_proto *p = (struct perf_proto *) c->proto;
 
@@ -232,6 +232,7 @@ static void
 perf_feed_end(struct channel *c)
 {
   struct perf_proto *p = (struct perf_proto *) c->proto;
+
   struct timespec ts_end;
   clock_gettime(CLOCK_MONOTONIC, &ts_end);
 
@@ -243,7 +244,7 @@ perf_feed_end(struct channel *c)
   p->feed_begin = NULL;
 
   if (p->run < p->repeat)
-    channel_request_feeding(c);
+    channel_request_feeding_dynamic(c, CFRT_DIRECT);
   else
     PLOG("feed done");
 }
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 850d7cbf..442a951f 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -102,12 +102,15 @@ pipe_reload_routes(struct channel *C)
   struct pipe_proto *p = (void *) C->proto;
 
   /* Route reload on one channel is just refeed on the other */
-  channel_request_feeding((C == p->pri) ? p->sec : p->pri);
+  channel_request_feeding_dynamic((C == p->pri) ? p->sec : p->pri, CFRT_DIRECT);
 }
 
 static void
-pipe_feed_begin(struct channel *C, int initial UNUSED)
+pipe_feed_begin(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct pipe_proto *p = (void *) C->proto;
   uint *flags = (C == p->pri) ? &p->sec_flags : &p->pri_flags;
 
@@ -117,6 +120,9 @@ pipe_feed_begin(struct channel *C, int initial UNUSED)
 static void
 pipe_feed_end(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct pipe_proto *p = (void *) C->proto;
   struct channel *dst = (C == p->pri) ? p->sec : p->pri;
   uint *flags = (C == p->pri) ? &p->sec_flags : &p->pri_flags;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 3d5fe5a3..f96481d8 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -664,7 +664,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
 
   /* We started to accept routes so we need to refeed them */
   if (!old->propagate_routes && new->propagate_routes)
-    channel_request_feeding(p->p.main_channel);
+    channel_request_feeding_dynamic(p->p.main_channel, CFRT_DIRECT);
 
   IFACE_WALK(iface)
   {
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 9e6eed12..e09d082b 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -419,9 +419,9 @@ rip_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net, s
 }
 
 void
-rip_feed_begin(struct channel *C, int initial)
+rip_feed_begin(struct channel *C)
 {
-  if (initial)
+  if (!C->refeeding || C->refeed_req.hook)
     return;
 
   struct rip_proto *p = (struct rip_proto *) C->proto;
@@ -437,6 +437,9 @@ rip_feed_begin(struct channel *C, int initial)
 void
 rip_feed_end(struct channel *C)
 {
+  if (!C->refeeding || C->refeed_req.hook)
+    return;
+
   struct rip_proto *p = (struct rip_proto *) C->proto;
   int changed = 0;
 
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 8e9f229a..0187bf0e 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -389,7 +389,7 @@ krt_export_net(struct krt_proto *p, net *net)
 
     const rte **feed = alloca(count * sizeof(rte *));
     rte_feed_obtain_valid(net, feed, count);
-    return rt_export_merged(c, feed, count, krt_filter_lp, 1);
+    return rt_export_merged(c, net->n.addr, feed, count, krt_filter_lp, 1);
   }
 
   static _Thread_local rte rt;
@@ -787,6 +787,9 @@ krt_feed_end(struct channel *C)
 {
   struct krt_proto *p = (void *) C->proto;
 
+  if (C->refeeding && C->refeed_req.hook)
+    return;
+
   if (p->flush_routes)
   {
     p->flush_routes = 2;
@@ -922,7 +925,7 @@ krt_shutdown(struct proto *P)
   if (p->initialized && !KRT_CF->persist && (P->down_code != PDC_CMD_GR_DOWN))
   {
     p->flush_routes = 1;
-    channel_request_feeding(p->p.main_channel);
+    channel_request_feeding_dynamic(p->p.main_channel, CFRT_AUXILIARY);
     return PS_UP;
   }
   else

From 216abcb12e4ade097ce06a9853f1dca46cf8f98b Mon Sep 17 00:00:00 2001
From: "katerina.kubecova" <katerina.kubecova@nic.cz>
Date: Tue, 3 Oct 2023 11:07:46 +0200
Subject: [PATCH 357/431] ROA notifications store the affected nets into trie

---
 nest/proto.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index b06f7b72..1257a7e4 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -289,6 +289,7 @@ struct roa_subscription {
   struct settle settle;
   struct channel *c;
   struct rt_export_request req;
+  struct f_trie* trie;
 };
 
 static void
@@ -309,16 +310,29 @@ channel_roa_out_changed(struct settle *se)
 
   CD(c, "Feeding triggered by RPKI change");
 
+  /* TODO feed by trie */
+
   c->refeed_pending = 1;
   channel_stop_export(c);
 }
 
 static void
-channel_export_one_roa(struct rt_export_request *req, const net_addr *net UNUSED, struct rt_pending_export *first)
+channel_export_one_roa(struct rt_export_request *req, const net_addr *net, struct rt_pending_export *first)
 {
   struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
 
-  /* TODO: use the information about what roa has changed */
+  switch (net->type)
+  {
+    case NET_ROA4:
+      trie_add_prefix(s->trie, net, net_pxlen(net), 32);
+      break;
+    case NET_ROA6:
+      trie_add_prefix(s->trie, net, net_pxlen(net), 128);
+      break;
+    default:
+      bug("ROA table sent us a non-roa export");
+  }
+
   settle_kick(&s->settle, s->c->proto->loop);
 
   rpe_mark_seen_all(req->hook, first, NULL, NULL);
@@ -365,6 +379,7 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
   *s = (struct roa_subscription) {
     .settle = SETTLE_INIT(&c->roa_settle, dir ? channel_roa_in_changed : channel_roa_out_changed, NULL),
     .c = c,
+    .trie = f_new_trie(lp_new(c->proto->pool), 0),
     .req = {
       .name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s",
 	  c->proto->name, c->name, dir ? "in" : "out", tab->name),
@@ -395,6 +410,7 @@ channel_roa_unsubscribed(struct rt_export_request *req)
 static void
 channel_roa_unsubscribe(struct roa_subscription *s)
 {
+  rfree(s->trie->lp);
   rt_stop_export(&s->req, channel_roa_unsubscribed);
   settle_cancel(&s->settle);
 }

From 93509af4c1cc508c57873dcb0de6babbf424825c Mon Sep 17 00:00:00 2001
From: "katerina.kubecova" <katerina.kubecova@nic.cz>
Date: Tue, 3 Oct 2023 11:08:28 +0200
Subject: [PATCH 358/431] Table preexport net-filter refactoring

Also added a possibility for filtering by trie.
---
 nest/proto.c      |  8 +++++---
 nest/rt-show.c    |  4 ++--
 nest/rt-table.c   | 46 ++++++++++++++++++----------------------------
 nest/rt.h         | 42 +++++++++++++++++++++++++++++++++---------
 proto/bgp/attrs.c |  9 +++++----
 5 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 1257a7e4..a7419c96 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -516,8 +516,10 @@ channel_start_export(struct channel *c)
     .list = proto_work_list(c->proto),
     .pool = c->proto->pool,
     .feed_block_size = c->feed_block_size,
-    .addr = c->out_subprefix,
-    .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
+    .prefilter = {
+      .mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
+      .addr = c->out_subprefix,
+    },
     .trace_routes = c->debug | c->proto->debug,
     .dump_req = channel_dump_export_req,
     .log_state_change = channel_export_log_state_change,
@@ -1025,7 +1027,7 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
   // c->ra_mode = cf->ra_mode;
   c->merge_limit = cf->merge_limit;
   c->preference = cf->preference;
-  c->out_req.addr = c->out_subprefix = cf->out_subprefix;
+  c->out_req.prefilter.addr = c->out_subprefix = cf->out_subprefix;
   c->debug = cf->debug;
   c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
   c->rpki_reload = cf->rpki_reload;
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 7a8b629b..cb91b5b5 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -285,14 +285,14 @@ rt_show_cont(struct rt_show_data *d)
   }
 
   d->req = (struct rt_export_request) {
-    .addr = d->addr,
+    .prefilter.addr = d->addr,
     .name = "CLI Show Route",
     .list = &global_work_list,
     .pool = c->pool,
     .export_bulk = rt_show_net_export_bulk,
     .dump_req = rt_show_dump_req,
     .log_state_change = rt_show_log_state_change,
-    .addr_mode = d->addr_mode,
+    .prefilter.mode = d->addr_mode,
   };
 
   d->table_counter++;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 1c7c5da6..d84afdc0 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1205,27 +1205,12 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
 
   const net_addr *n = rpe->new_best ? rpe->new_best->rte.net : rpe->old_best->rte.net;
 
-  switch (hook->req->addr_mode)
-    {
-      case TE_ADDR_NONE:
-	break;
+  /* Check export eligibility of this net */
+  if (!rt_prefilter_net(&hook->req->prefilter, n))
+    goto ignore;
 
-      case TE_ADDR_IN:
-	if (!net_in_netX(n, hook->req->addr))
-	  goto ignore;
-	break;
-
-      case TE_ADDR_EQUAL:
-	if (!net_equal(n, hook->req->addr))
-	  goto ignore;
-	break;
-
-      case TE_ADDR_FOR:
-	bug("Continuos export of best prefix match not implemented yet.");
-
-      default:
-	bug("Strange table export address mode: %d", hook->req->addr_mode);
-    }
+  if (hook->req->prefilter.mode == TE_ADDR_FOR)
+    bug("Continuos export of best prefix match not implemented yet.");
 
   if (rpe->new)
     hook->stats.updates_received++;
@@ -2156,20 +2141,21 @@ rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_ho
   struct rt_export_request *req = hook->h.req;
 
   /* stats zeroed by mb_allocz */
-  switch (req->addr_mode)
+  switch (req->prefilter.mode)
   {
     case TE_ADDR_IN:
       if (tab->trie && net_val_match(tab->addr_type, NB_IP))
       {
 	hook->walk_state = mb_allocz(hook->h.pool, sizeof (struct f_trie_walk_state));
 	hook->walk_lock = rt_lock_trie(tab);
-	trie_walk_init(hook->walk_state, tab->trie, req->addr);
+	trie_walk_init(hook->walk_state, tab->trie, req->prefilter.addr);
 	hook->h.event.hook = rt_feed_by_trie;
 	hook->walk_last.type = 0;
 	break;
       }
       /* fall through */
     case TE_ADDR_NONE:
+    case TE_ADDR_TRIE:
       FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
       hook->h.event.hook = rt_feed_by_fib;
       break;
@@ -2253,7 +2239,7 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
       rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking", hook->h.req->name);
       return 0;
     case TES_FEEDING:
-      switch (hh->req->addr_mode)
+      switch (hh->req->prefilter.mode)
       {
 	case TE_ADDR_IN:
 	  if (hook->walk_lock)
@@ -2266,8 +2252,12 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
 	  }
 	  /* fall through */
 	case TE_ADDR_NONE:
+	case TE_ADDR_TRIE:
 	  fit_get(&tab->fib, &hook->feed_fit);
 	  break;
+	case TE_ADDR_EQUAL:
+	case TE_ADDR_FOR:
+	  break;
       }
       break;
 
@@ -4346,7 +4336,7 @@ rt_feed_by_fib(void *data)
 
   FIB_ITERATE_START(&tab->fib, fit, net, n)
     {
-      if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
+      if (rt_prefilter_net(&c->h.req->prefilter, n->n.addr))
       {
 	if (!rt_prepare_feed(c, n, &block))
 	{
@@ -4421,9 +4411,9 @@ rt_feed_equal(void *data)
   RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
   {
     ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
-    ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
+    ASSERT_DIE(c->h.req->prefilter.mode == TE_ADDR_EQUAL);
 
-    if (n = net_find(tab, c->h.req->addr))
+    if (n = net_find(tab, c->h.req->prefilter.addr))
       ASSERT_DIE(rt_prepare_feed(c, n, &block));
   }
 
@@ -4443,9 +4433,9 @@ rt_feed_for(void *data)
   RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
   {
     ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
-    ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
+    ASSERT_DIE(c->h.req->prefilter.mode == TE_ADDR_FOR);
 
-    if (n = net_route(tab, c->h.req->addr))
+    if (n = net_route(tab, c->h.req->prefilter.addr))
       ASSERT_DIE(rt_prepare_feed(c, n, &block));
   }
 
diff --git a/nest/rt.h b/nest/rt.h
index a251b3a5..f88a446c 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -22,6 +22,8 @@
 #include "lib/io-loop.h"
 #include "lib/settle.h"
 
+#include "filter/data.h"
+
 #include <stdatomic.h>
 
 struct ea_list;
@@ -286,13 +288,27 @@ struct rt_pending_export {
   u64 seq;				/* Sequential ID (table-local) of the pending export */
 };
 
+struct rt_prefilter {
+  union {
+    const struct f_trie *trie;
+    const net_addr *addr;	/* Network prefilter address */
+  };
+				/* Network prefilter mode (TE_ADDR_*) */
+  enum {
+    TE_ADDR_NONE = 0,		/* No address matching */
+    TE_ADDR_EQUAL,		/* Exact query - show route <addr> */
+    TE_ADDR_FOR,		/* Longest prefix match - show route for <addr> */
+    TE_ADDR_IN,			/* Interval query - show route in <addr> */
+    TE_ADDR_TRIE,		/* Query defined by trie */
+  } mode;
+} PACKED;
+
 struct rt_export_request {
   struct rt_export_hook *hook;		/* Table part of the export */
-  char *name;
-  const net_addr *addr;			/* Network prefilter address */
+  char *name;		/* Network prefilter address */
   u8 trace_routes;
-  u8 addr_mode;				/* Network prefilter mode (TE_ADDR_*) */
   uint feed_block_size;			/* How many routes to feed at once */
+  struct rt_prefilter prefilter;
 
   event_list *list;			/* Where to schedule export events */
   pool *pool;				/* Pool to use for allocations */
@@ -313,6 +329,20 @@ struct rt_export_request {
   void (*log_state_change)(struct rt_export_request *req, u8);
 };
 
+static inline int rt_prefilter_net(const struct rt_prefilter *p, const net_addr *n)
+{
+  switch (p->mode)
+  {
+    case TE_ADDR_NONE:	return 1;
+    case TE_ADDR_IN:	return net_in_netX(n, p->addr);
+    case TE_ADDR_EQUAL:	return net_equal(n, p->addr);
+    case TE_ADDR_FOR:	return net_in_netX(p->addr, n);
+    case TE_ADDR_TRIE:	return trie_match_net(p->trie, n);
+  }
+
+  bug("Crazy prefilter application attempt failed wildly.");
+}
+
 struct rt_export_hook {
   node n;
   struct rt_exporter *table;		/* The connected table */
@@ -382,12 +412,6 @@ struct rt_table_export_hook {
 #define TES_STOP	4
 #define TES_MAX		5
 
-/* Value of addr_mode */
-#define TE_ADDR_NONE	0		/* No address matching */
-#define TE_ADDR_EQUAL	1		/* Exact query - show route <addr> */
-#define TE_ADDR_FOR	2		/* Longest prefix match - show route for <addr> */
-#define TE_ADDR_IN	3		/* Interval query - show route in <addr> */
-
 
 #define TFT_FIB		1
 #define TFT_TRIE	2
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 46145fc5..d33aa6a7 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1896,16 +1896,17 @@ bgp_out_table_feed(void *data)
 
   int max = 512;
 
-  const net_addr *neq = (hook->h.req->addr_mode == TE_ADDR_EQUAL) ? hook->h.req->addr : NULL;
+  const net_addr *neq = (hook->h.req->prefilter.mode == TE_ADDR_EQUAL) ? hook->h.req->prefilter.addr : NULL;
   const net_addr *cand = NULL;
 
   do {
     HASH_WALK_ITER(c->prefix_hash, PXH, n, hook->hash_iter)
     {
-      switch (hook->h.req->addr_mode)
+      switch (hook->h.req->prefilter.mode)
       {
+	case TE_ADDR_TRIE:
 	case TE_ADDR_IN:
-	  if (!net_in_netX(n->net, hook->h.req->addr))
+	  if (!rt_prefilter_net(&hook->h.req->prefilter, n->net))
 	    continue;
 	  /* fall through */
 	case TE_ADDR_NONE:
@@ -1917,7 +1918,7 @@ bgp_out_table_feed(void *data)
 	case TE_ADDR_FOR:
 	  if (!neq)
 	  {
-	    if (net_in_netX(hook->h.req->addr, n->net) && (!cand || (n->net->length > cand->length)))
+	    if (net_in_netX(hook->h.req->prefilter.addr, n->net) && (!cand || (n->net->length > cand->length)))
 	      cand = n->net;
 	    continue;
 	  }

From 6b2c9b7c66d9b9648213d3a7f071d0f720048e46 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 27 Apr 2023 17:09:00 +0200
Subject: [PATCH 359/431] Conf: Fix symbol lookup

The symbol table used just symbol name as a key, and used a trick with
active flag to find symbols in active scopes with one hash table lookup.

The disadvantage is that it can degenerate to O(n) for negative queries
in situations where are many symbols with the same name in different
scopes.

Thanks to Yanko Kaneti for the bugreport.
---
 conf/cf-lex.l | 22 ++++++++++++----------
 conf/conf.h   |  4 +++-
 lib/hash.h    |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index ceedee8a..0a02dd73 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -73,10 +73,10 @@ static uint cf_hash(const byte *c);
 #define KW_FN(k)		cf_hash(k)
 #define KW_ORDER		8 /* Fixed */
 
-#define SYM_KEY(n)		n->name, n->scope->active
+#define SYM_KEY(n)		n->name, n->scope
 #define SYM_NEXT(n)		n->next
 #define SYM_EQ(a,s1,b,s2)	!strcmp(a,b) && s1 == s2
-#define SYM_FN(k,s)		cf_hash(k)
+#define SYM_FN(k,s)		cf_hash(k) ^ ptr_hash(s)
 #define SYM_ORDER		6 /* Initial */
 
 #define SYM_REHASH		sym_rehash
@@ -602,29 +602,31 @@ cf_new_symbol(const byte *c)
 }
 
 /**
- * cf_find_symbol - find a symbol by name
+ * cf_find_local_symbol - find a symbol by name
  * @cfg: specificed config
+ * @scope: specified symbol scope
  * @c: symbol name
  *
  * This functions searches the symbol table in the config @cfg for a symbol of
- * given name. First it examines the current scope, then the second recent one
+ * given name. First it examines the scope @scope, then the parent scope
  * and so on until it either finds the symbol and returns a pointer to its
  * &symbol structure or reaches the end of the scope chain and returns %NULL to
  * signify no match.
  */
 struct symbol *
-cf_find_symbol(const struct config *cfg, const byte *c)
+cf_find_local_symbol(const struct config *cfg, const struct sym_scope *scope, const byte *c)
 {
   struct symbol *s;
 
-  if (cfg->sym_hash.data &&
-      (s = HASH_FIND(cfg->sym_hash, SYM, c, 1)))
-    return s;
+  if (cfg->sym_hash.data)
+    for (; scope; scope = scope->next)
+      if (s = HASH_FIND(cfg->sym_hash, SYM, c, scope))
+	return s;
 
   /* In CLI command parsing, fallback points to the current config, otherwise it is NULL. */
   if (cfg->fallback &&
       cfg->fallback->sym_hash.data &&
-      (s = HASH_FIND(cfg->fallback->sym_hash, SYM, c, 1)))
+      (s = HASH_FIND(cfg->fallback->sym_hash, SYM, c, cfg->fallback->root_scope)))
     return s;
 
   return NULL;
@@ -642,7 +644,7 @@ cf_find_symbol(const struct config *cfg, const byte *c)
 struct symbol *
 cf_get_symbol(const byte *c)
 {
-  return cf_find_symbol(new_config, c) ?: cf_new_symbol(c);
+  return cf_find_local_symbol(new_config, conf_this_scope, c) ?: cf_new_symbol(c);
 }
 
 /**
diff --git a/conf/conf.h b/conf/conf.h
index b409750e..cb47e7d0 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -187,7 +187,9 @@ int cf_lex(void);
 void cf_lex_init(int is_cli, struct config *c);
 void cf_lex_unwind(void);
 
-struct symbol *cf_find_symbol(const struct config *cfg, const byte *c);
+struct symbol *cf_find_local_symbol(const struct config *cfg, const struct sym_scope *scope, const byte *c);
+static inline struct symbol *cf_find_symbol(const struct config *cfg, const byte *c)
+{ return cf_find_local_symbol(cfg, cfg->root_scope, c); }
 
 struct symbol *cf_get_symbol(const byte *c);
 struct symbol *cf_default_name(char *template, int *counter);
diff --git a/lib/hash.h b/lib/hash.h
index 8febb33f..b30f7830 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -237,7 +237,7 @@ mem_hash(const void *p, uint s)
 }
 
 static inline uint
-ptr_hash(void *ptr)
+ptr_hash(const void *ptr)
 {
   uintptr_t p = (uintptr_t) ptr;
   return p ^ (p << 8) ^ (p >> 16);

From 6e908775cba9efdae09f06a630cc7777282e2715 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 27 Apr 2023 18:20:49 +0200
Subject: [PATCH 360/431] Conf: Improve handling of keywords

For whatever reason, parser allocated a symbol for every parsed keyword
in each scope. That wasted time and memory. The effect is worsened with
recent changes allowing local scopes, so keywords often promote soft
scopes (with no symbols) to real scopes.

Do not allocate a symbol for a keyword. Take care of keywords that could
be promoted to symbols (kw_sym) and do it explicitly.
---
 conf/cf-lex.l      | 17 +++++++++++++----
 conf/conf.h        |  3 +++
 conf/confbase.Y    |  4 +++-
 conf/gen_parser.m4 |  4 ++--
 nest/config.Y      |  2 ++
 proto/bgp/config.Y |  2 +-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 0a02dd73..9555949d 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -601,6 +601,10 @@ cf_new_symbol(const byte *c)
   return s;
 }
 
+struct symbol *
+cf_symbol_from_keyword(const struct keyword *kw)
+{ return cf_new_symbol(kw->name); }
+
 /**
  * cf_find_local_symbol - find a symbol by name
  * @cfg: specificed config
@@ -692,18 +696,23 @@ static enum yytokentype
 cf_lex_symbol(const char *data)
 {
   /* Have we defined such a symbol? */
-  struct symbol *sym = cf_get_symbol(data);
-  cf_lval.s = sym;
+  struct symbol *sym = cf_find_local_symbol(new_config, conf_this_scope, data);
 
-  if (sym->class != SYM_VOID)
+  if (sym && (sym->class != SYM_VOID))
+  {
+    cf_lval.s = sym;
     return CF_SYM_KNOWN;
+  }
 
   /* Is it a keyword? */
   struct keyword *k = HASH_FIND(kw_hash, KW, data);
   if (k)
   {
     if (k->value > 0)
+    {
+      cf_lval.kw = k;
       return k->value;
+    }
     else
     {
       cf_lval.i = -k->value;
@@ -712,7 +721,7 @@ cf_lex_symbol(const char *data)
   }
 
   /* OK, undefined symbol */
-  cf_lval.s = sym;
+  cf_lval.s = cf_new_symbol(data);
   return CF_SYM_UNDEFINED;
 }
 
diff --git a/conf/conf.h b/conf/conf.h
index cb47e7d0..d40f955e 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -191,6 +191,9 @@ struct symbol *cf_find_local_symbol(const struct config *cfg, const struct sym_s
 static inline struct symbol *cf_find_symbol(const struct config *cfg, const byte *c)
 { return cf_find_local_symbol(cfg, cfg->root_scope, c); }
 
+struct keyword;
+struct symbol *cf_symbol_from_keyword(const struct keyword *kw);
+
 struct symbol *cf_get_symbol(const byte *c);
 struct symbol *cf_default_name(char *template, int *counter);
 struct symbol *cf_localize_symbol(struct symbol *sym);
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 1d5738ff..3e8f5807 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -61,6 +61,7 @@ CF_DECLS
   net_addr net;
   net_addr *net_ptr;
   struct symbol *s;
+  struct keyword *kw;
   const char *t;
   struct rtable_config *r;
   struct channel_config *cc;
@@ -117,6 +118,7 @@ CF_DECLS
 
 %type <t> text opttext
 %type <s> symbol
+%type <kw> kw_sym
 
 %nonassoc PREFIX_DUMMY
 %left AND OR
@@ -172,7 +174,7 @@ expr_us:
  | expr US { $$ = $1 US_; }
  ;
 
-symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN ;
+symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN | kw_sym { $$ = cf_symbol_from_keyword($1); } ;
 
 /* Switches */
 
diff --git a/conf/gen_parser.m4 b/conf/gen_parser.m4
index af4b1455..7a2a9de4 100644
--- a/conf/gen_parser.m4
+++ b/conf/gen_parser.m4
@@ -29,9 +29,9 @@ m4_define(CF_END, `m4_divert(-1)')
 m4_define(CF_itera, `m4_ifelse($#, 1, [[CF_iter($1)]], [[CF_iter($1)[[]]CF_itera(m4_shift($@))]])')
 m4_define(CF_iterate, `m4_define([[CF_iter]], m4_defn([[$1]]))CF_itera($2)')
 
-# Keywords act as untyped %token
+# Keywords act as %token<kw>
 m4_define(CF_keywd, `m4_ifdef([[CF_tok_$1]],,[[m4_define([[CF_tok_$1]],1)m4_define([[CF_toks]],CF_toks $1)]])')
-m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token<s>[[]]CF_toks
+m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token<kw>[[]]CF_toks
 )DNL')
 
 # CLI commands
diff --git a/nest/config.Y b/nest/config.Y
index e78350ca..c83c715b 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -154,6 +154,8 @@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
 
 CF_GRAMMAR
 
+kw_sym: MIN MAX ;
+
 /* Setting of router ID */
 
 conf: rtrid ;
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 013d14af..218e0d04 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -46,7 +46,7 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,
 CF_GRAMMAR
 
 /* Workaround for collisions between keywords and symbols */
-symbol: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
+kw_sym: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
 
 proto: bgp_proto '}'  ;
 

From 2d988f71a5c3caf3b56426a45d4d234c4fd4fce7 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 21 Aug 2023 04:17:21 +0200
Subject: [PATCH 361/431] Nest: Use generic rte_announce() also for import
 tables

Remove special rte_announce_in(), so we can use generic rte_announce()
for bot feed and notifications.
---
 nest/rt-table.c | 65 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e4b27814..03f03fc9 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2148,11 +2148,11 @@ rt_setup(pool *pp, struct rtable_config *cf)
   init_list(&t->flowspec_links);
   init_list(&t->subscribers);
 
+  hmap_init(&t->id_map, p, 1024);
+  hmap_set(&t->id_map, 0);
+
   if (!(t->internal = cf->internal))
   {
-    hmap_init(&t->id_map, p, 1024);
-    hmap_set(&t->id_map, 0);
-
     t->rt_event = ev_new_init(p, rt_event, t);
     t->prune_timer = tm_new_init(p, rt_prune_timer, t, 0, 0);
     t->last_rt_change = t->gc_time = current_time();
@@ -3107,25 +3107,15 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
 
       /* Remove the old rte */
       *pos = old->next;
-      rte_free_quick(old);
       tab->rt_count--;
-
       break;
     }
 
-  if (!new)
-  {
-    if (!old)
-      goto drop_withdraw;
-
-    if (!net->routes)
-      fib_delete(&tab->fib, net);
-
-    return 1;
-  }
+  if (!old && !new)
+    goto drop_withdraw;
 
   struct channel_limit *l = &c->rx_limit;
-  if (l->action && !old)
+  if (l->action && !old && new)
   {
     if (tab->rt_count >= l->limit)
       channel_notify_limit(c, l, PLD_RX, tab->rt_count);
@@ -3140,15 +3130,40 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr
     }
   }
 
-  /* Insert the new rte */
-  rte *e = rte_do_cow(new);
-  e->flags |= REF_COW;
-  e->net = net;
-  e->sender = c;
-  e->lastmod = current_time();
-  e->next = *pos;
-  *pos = e;
-  tab->rt_count++;
+  if (new)
+  {
+    /* Insert the new rte */
+    rte *e = rte_do_cow(new);
+    e->flags |= REF_COW;
+    e->net = net;
+    e->sender = c;
+    e->lastmod = current_time();
+    e->next = *pos;
+    *pos = new = e;
+    tab->rt_count++;
+
+    if (!old)
+    {
+      new->id = hmap_first_zero(&tab->id_map);
+      hmap_set(&tab->id_map, new->id);
+    }
+    else
+      new->id = old->id;
+  }
+
+  rte_announce(tab, RA_ANY, net, new, old, NULL, NULL);
+
+  if (old)
+  {
+    if (!new)
+      hmap_clear(&tab->id_map, old->id);
+
+    rte_free_quick(old);
+  }
+
+  if (!net->routes)
+    fib_delete(&tab->fib, net);
+
   return 1;
 
 drop_update:

From b20b6a9ad204f2648ed3d62720435bb21dfb947c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 11 Oct 2023 22:23:34 +0200
Subject: [PATCH 362/431] BGP/BMP: Moved temporary allocation checks to the
 freeing functions

---
 proto/bgp/attrs.c   | 11 +++++++++
 proto/bgp/bgp.h     |  2 +-
 proto/bgp/packets.c | 58 ++++++++++++++-------------------------------
 3 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index de45cae0..adc201a7 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1631,6 +1631,9 @@ bgp_defer_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 void
 bgp_withdraw_bucket(struct bgp_channel *c, struct bgp_bucket *b)
 {
+  if (b->bmp)
+    return;
+
   struct bgp_proto *p = (void *) c->c.proto;
   struct bgp_bucket *wb = bgp_get_withdraw_bucket(c);
 
@@ -1710,6 +1713,14 @@ bgp_get_prefix(struct bgp_channel *c, net_addr *net, u32 path_id)
 void
 bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
 {
+  /* BMP hack */
+  if (
+      !NODE_VALID(px->buck_node.prev) &&
+      !NODE_VALID(px->buck_node.next) &&
+      !SKIP_BACK(struct bgp_bucket, prefixes.head, px->buck_node.prev)->bmp
+      )
+    return;
+
   rem_node(&px->buck_node);
   HASH_REMOVE2(c->prefix_hash, PXH, c->pool, px);
 
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 324df43c..73686545 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -413,6 +413,7 @@ struct bgp_bucket {
   struct bgp_bucket *next;		/* Node in bucket hash table */
   list prefixes;			/* Prefixes in this bucket (struct bgp_prefix) */
   u32 hash;				/* Hash over extended attributes */
+  u32 bmp:1;				/* Temporary bucket for BMP encoding */
   ea_list eattrs[0];			/* Per-bucket extended attributes */
 };
 
@@ -439,7 +440,6 @@ struct bgp_write_state {
   int as4_session;
   int add_path;
   int mpls;
-  int sham;
 
   eattr *mp_next_hop;
   const adata *mpls_labels;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6b728b4e..6b11eaf7 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1575,10 +1575,7 @@ bgp_encode_nlri_ip4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -1663,10 +1660,7 @@ bgp_encode_nlri_ip6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -1754,10 +1748,7 @@ bgp_encode_nlri_vpn4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -1854,10 +1845,7 @@ bgp_encode_nlri_vpn6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *b
     memcpy(pos, &a, b);
     ADVANCE(pos, size, b);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -1944,10 +1932,7 @@ bgp_encode_nlri_flow4(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
     memcpy(pos, net->data, flen);
     ADVANCE(pos, size, flen);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -2039,10 +2024,7 @@ bgp_encode_nlri_flow6(struct bgp_write_state *s, struct bgp_bucket *buck, byte *
     memcpy(pos, net->data, flen);
     ADVANCE(pos, size, flen);
 
-    if (!s->sham)
-      bgp_free_prefix(s->channel, px);
-    else
-      rem_node(&px->buck_node);
+    bgp_free_prefix(s->channel, px);
   }
 
   return pos - buf;
@@ -2286,8 +2268,7 @@ bgp_create_ip_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
   if (la < 0)
   {
     /* Attribute list too long */
-    if (!s->sham)
-      bgp_withdraw_bucket(s->channel, buck);
+    bgp_withdraw_bucket(s->channel, buck);
     return NULL;
   }
 
@@ -2334,8 +2315,7 @@ bgp_create_mp_reach(struct bgp_write_state *s, struct bgp_bucket *buck, byte *bu
   if (la < 0)
   {
     /* Attribute list too long */
-    if (!s->sham)
-      bgp_withdraw_bucket(s->channel, buck);
+    bgp_withdraw_bucket(s->channel, buck);
     return NULL;
   }
 
@@ -2427,9 +2407,6 @@ bgp_create_update_bmp(struct bgp_channel *c, byte *buf, struct bgp_bucket *buck,
   byte *res = NULL;
   /* FIXME: must be a bit shorter */
 
-  struct lp_state tmpp;
-  lp_save(tmp_linpool, &tmpp);
-
   struct bgp_caps *peer = p->conn->remote_caps;
   const struct bgp_af_caps *rem = bgp_find_af_caps(peer, c->afi);
 
@@ -2441,7 +2418,6 @@ bgp_create_update_bmp(struct bgp_channel *c, byte *buf, struct bgp_bucket *buck,
     .as4_session = 1,
     .add_path = c->add_path_rx,
     .mpls = c->desc->mpls,
-    .sham = 1,
   };
 
   if (!update)
@@ -2457,8 +2433,6 @@ bgp_create_update_bmp(struct bgp_channel *c, byte *buf, struct bgp_bucket *buck,
       bgp_create_mp_reach(&s, buck, buf, end);
   }
 
-  lp_restore(tmp_linpool, &tmpp);
-
   return res;
 }
 
@@ -2484,17 +2458,19 @@ bgp_bmp_encode_rte(struct bgp_channel *c, byte *buf, const net_addr *n,
   uint bucket_size = sizeof(struct bgp_bucket) + ea_size;
   uint prefix_size = sizeof(struct bgp_prefix) + n->length;
 
-  /* Sham bucket */
-  struct bgp_bucket *b = alloca(bucket_size);
-  *b = (struct bgp_bucket) { };
+  struct lp_state tmpp;
+  lp_save(tmp_linpool, &tmpp);
+
+  /* Temporary bucket */
+  struct bgp_bucket *b = tmp_allocz(bucket_size);
+  b->bmp = 1;
   init_list(&b->prefixes);
 
   if (attrs)
     memcpy(b->eattrs, attrs, ea_size);
 
-  /* Sham prefix */
-  struct bgp_prefix *px = alloca(prefix_size);
-  *px = (struct bgp_prefix) { };
+  /* Temporary prefix */
+  struct bgp_prefix *px = tmp_allocz(prefix_size);
   px->path_id = src->private_id;
   net_copy(px->net, n);
   add_tail(&b->prefixes, &px->buck_node);
@@ -2504,6 +2480,8 @@ bgp_bmp_encode_rte(struct bgp_channel *c, byte *buf, const net_addr *n,
   if (end)
     bgp_bmp_prepare_bgp_hdr(buf, end - buf, PKT_UPDATE);
 
+  lp_restore(tmp_linpool, &tmpp);
+
   return end;
 }
 

From 4972590ea5cc9fb5ff20b28227badd6338830649 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Oct 2023 09:29:09 +0200
Subject: [PATCH 363/431] BGP: dropped bgp_fix_attr_flags() (useless remnant
 from previous versions)

---
 proto/bgp/attrs.c | 8 --------
 proto/bgp/bgp.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index adc201a7..457a8b15 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1151,14 +1151,6 @@ bgp_attr_known(uint code)
   return (code < ARRAY_SIZE(bgp_attr_table)) && bgp_attr_table[code].name;
 }
 
-void bgp_fix_attr_flags(ea_list *attrs)
-{
-  for (u8 i = 0; i < attrs->count; i++)
-  {
-    attrs->attrs[i].flags = bgp_attr_table[EA_ID(attrs->attrs[i].id)].flags;
-  }
-}
-
 /*
  *	Attribute export
  */
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 73686545..ceba958c 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -556,8 +556,6 @@ void bgp_store_error(struct bgp_proto *p, struct bgp_conn *c, u8 class, u32 code
 void bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len);
 const char *bgp_format_role_name(u8 role);
 
-void bgp_fix_attr_flags(ea_list *attrs);
-
 static inline int
 rte_resolvable(rte *rt)
 {

From e2f08c382a2adbbbd94c5cd7d996ce9175e0fb9c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Oct 2023 10:57:55 +0200
Subject: [PATCH 364/431] BGP/BMP: fixed build with no bmp at all

---
 proto/bgp/bgp.c     | 7 +++++++
 proto/bgp/packets.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index a6e9cf83..7ae688f5 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -125,7 +125,9 @@
 #include "lib/string.h"
 
 #include "bgp.h"
+#ifdef CONFIG_BMP
 #include "proto/bmp/bmp.h"
+#endif
 
 
 static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets */
@@ -692,8 +694,11 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
 
   bgp_conn_set_state(conn, BS_ESTABLISHED);
   proto_notify_state(&p->p, PS_UP);
+
+#ifdef CONFIG_BMP
   bmp_peer_up(p, conn->local_open_msg, conn->local_open_length,
 	      conn->remote_open_msg, conn->remote_open_length);
+#endif
 }
 
 static void
@@ -706,9 +711,11 @@ bgp_conn_leave_established_state(struct bgp_conn *conn, struct bgp_proto *p)
   if (p->p.proto_state == PS_UP)
     bgp_stop(p, 0, NULL, 0);
 
+#ifdef CONFIG_BMP
   bmp_peer_down(p, p->last_error_class,
 		conn->notify_code, conn->notify_subcode,
 		conn->notify_data, conn->notify_size);
+#endif
 }
 
 void
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6b11eaf7..ff51e309 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -26,7 +26,9 @@
 #include "nest/cli.h"
 
 #include "bgp.h"
+#ifdef CONFIG_BMP
 #include "proto/bmp/bmp.h"
+#endif
 
 
 #define BGP_RR_REQUEST		0

From afb9d5d450bbaa31dc78faa08fca07dfc8812d72 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Oct 2023 10:07:57 +0200
Subject: [PATCH 365/431] Channel: using a separate pool for export data

---
 nest/proto.c | 18 ++++++++++--------
 nest/rt.h    |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 5b00cc9d..9da594dc 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -565,10 +565,12 @@ channel_start_export(struct channel *c)
 
   ASSERT(c->channel_state == CS_UP);
 
+  pool *p = rp_newf(c->proto->pool, c->proto->pool->domain, "Channel %s.%s export", c->proto->name, c->name);
+
   c->out_req = (struct rt_export_request) {
-    .name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
+    .name = mb_sprintf(p, "%s.%s", c->proto->name, c->name),
     .list = proto_work_list(c->proto),
-    .pool = c->proto->pool,
+    .pool = p,
     .feed_block_size = c->feed_block_size,
     .addr = c->out_subprefix,
     .addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
@@ -578,8 +580,8 @@ channel_start_export(struct channel *c)
     .mark_seen = channel_rpe_mark_seen_export,
   };
 
-  bmap_init(&c->export_map, c->proto->pool, 16);
-  bmap_init(&c->export_reject_map, c->proto->pool, 16);
+  bmap_init(&c->export_map, p, 16);
+  bmap_init(&c->export_reject_map, p, 16);
 
   channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
@@ -604,7 +606,7 @@ channel_start_export(struct channel *c)
   }
 
   c->refeed_req = c->out_req;
-  c->refeed_req.name = mb_sprintf(c->proto->pool, "%s.%s.refeed", c->proto->name, c->name);
+  c->refeed_req.name = mb_sprintf(p, "%s.%s.refeed", c->proto->name, c->name);
   c->refeed_req.dump_req = channel_dump_refeed_req;
   c->refeed_req.log_state_change = channel_refeed_log_state_change;
   c->refeed_req.mark_seen = channel_rpe_mark_seen_refeed;
@@ -671,12 +673,12 @@ channel_export_stopped(struct rt_export_request *req)
     return;
   }
 
-  mb_free(c->out_req.name);
-  c->out_req.name = NULL;
-
   bmap_free(&c->export_map);
   bmap_free(&c->export_reject_map);
 
+  c->out_req.name = NULL;
+  rfree(c->out_req.pool);
+
   channel_check_stopped(c);
 }
 
diff --git a/nest/rt.h b/nest/rt.h
index f308587f..6b9a0dc1 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -300,7 +300,7 @@ struct rt_pending_export {
 
 struct rt_export_request {
   struct rt_export_hook *hook;		/* Table part of the export */
-  char *name;
+  const char *name;
   const net_addr *addr;			/* Network prefilter address */
   u8 trace_routes;
   u8 addr_mode;				/* Network prefilter mode (TE_ADDR_*) */

From b901cca2df7c57c0e5840454115bb5e12601a714 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 13 Oct 2023 10:22:09 +0200
Subject: [PATCH 366/431] Protocol: better granularity of pool management

There are now 3 different pools with specific lifetime. All of these are
available since protocol start, anyway they get freed in different
moments.

First, pool_up gets freed immediately after announcing PS_STOP, to e.g.
stop all timers and events regularly updating the routing table when the
imports are already flushing.

Then, pool_inloop gets freed just before the protocol loop is finally
stopped, after all channels, imports and exports and other hooks are
cleaned up.

And finally, the pool itself is freed the last. Unless you explicitly
need the early free, use this pool.
---
 nest/proto.c      | 12 ++++++++----
 nest/protocol.h   |  4 +++-
 proto/bgp/bgp.c   |  2 +-
 proto/ospf/ospf.c |  5 +----
 proto/rip/rip.c   |  6 +++---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 9da594dc..cd887a48 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1306,10 +1306,10 @@ proto_event(void *ptr)
     p->do_stop = 0;
   }
 
-  if (proto_is_done(p) && p->pool_fragile)  /* perusing pool_fragile to do this once only */
+  if (proto_is_done(p) && p->pool_inloop)  /* perusing pool_inloop to do this once only */
   {
-    rp_free(p->pool_fragile);
-    p->pool_fragile = NULL;
+    rp_free(p->pool_inloop);
+    p->pool_inloop = NULL;
     if (p->loop != &main_birdloop)
       birdloop_stop_self(p->loop, proto_loop_stopped, p);
     else
@@ -1391,7 +1391,8 @@ proto_start(struct proto *p)
 
   PROTO_LOCKED_FROM_MAIN(p)
   {
-    p->pool_fragile = rp_newf(p->pool, birdloop_domain(p->loop), "Protocol %s fragile objects", p->cf->name);
+    p->pool_inloop = rp_newf(p->pool, birdloop_domain(p->loop), "Protocol %s early cleanup objects", p->cf->name);
+    p->pool_up = rp_newf(p->pool, birdloop_domain(p->loop), "Protocol %s stop-free objects", p->cf->name);
     proto_notify_state(p, (p->proto->start ? p->proto->start(p) : PS_UP));
   }
 }
@@ -2324,6 +2325,9 @@ proto_do_stop(struct proto *p)
     p->main_source = NULL;
   }
 
+  rp_free(p->pool_up);
+  p->pool_up = NULL;
+
   proto_stop_channels(p);
   rt_destroy_sources(&p->sources, p->event);
 
diff --git a/nest/protocol.h b/nest/protocol.h
index 70b2022d..635f84b9 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -139,7 +139,9 @@ struct proto {
   struct proto_config *cf;		/* Configuration data */
   struct proto_config *cf_new;		/* Configuration we want to switch to after shutdown (NULL=delete) */
   pool *pool;				/* Pool containing local objects */
-  pool *pool_fragile;			/* Pool containing fragile local objects which need to be freed
+  pool *pool_up;			/* Pool containing local objects which should be dropped as soon
+					   as the protocol enters the STOP / DOWN state */
+  pool *pool_inloop;			/* Pool containing local objects which need to be freed
 					   before the protocol's birdloop actually stops, like olocks */
   event *event;				/* Protocol event */
   timer *restart_timer;			/* Timer to restart the protocol from limits */
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 2257a8a9..d14facfd 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1781,7 +1781,7 @@ bgp_start(struct proto *P)
    * so that we are the only instance attempting to talk with that neighbor.
    */
   struct object_lock *lock;
-  lock = p->lock = olock_new(P->pool_fragile);
+  lock = p->lock = olock_new(P->pool_inloop);
   lock->addr = p->remote_ip;
   lock->port = p->cf->remote_port;
   lock->iface = p->cf->iface;
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 896bf5a3..cd839656 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -295,7 +295,7 @@ ospf_start(struct proto *P)
   p->gr_mode = c->gr_mode;
   p->gr_time = c->gr_time;
   p->tick = c->tick;
-  p->disp_timer = tm_new_init(P->pool, ospf_disp, p, p->tick S, 0);
+  p->disp_timer = tm_new_init(P->pool_up, ospf_disp, p, p->tick S, 0);
   tm_start(p->disp_timer, 100 MS);
   p->lsab_size = 256;
   p->lsab_used = 0;
@@ -539,9 +539,6 @@ ospf_shutdown(struct proto *P)
   }
   FIB_WALK_END;
 
-  if (tm_active(p->disp_timer))
-    tm_stop(p->disp_timer);
-
   return PS_DOWN;
 }
 
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index e09d082b..a8f9ffcd 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -769,8 +769,8 @@ rip_add_iface(struct rip_proto *p, struct iface *iface, struct rip_iface_config
 
   add_tail(&p->iface_list, NODE ifa);
 
-  ifa->timer = tm_new_init(p->p.pool, rip_iface_timer, ifa, 0, 0);
-  ifa->rxmt_timer = tm_new_init(p->p.pool, rip_rxmt_timeout, ifa, 0, 0);
+  ifa->timer = tm_new_init(p->p.pool_up, rip_iface_timer, ifa, 0, 0);
+  ifa->rxmt_timer = tm_new_init(p->p.pool_up, rip_rxmt_timeout, ifa, 0, 0);
 
   struct object_lock *lock = olock_new(p->p.pool);
   lock->type = OBJLOCK_UDP;
@@ -1220,7 +1220,7 @@ rip_start(struct proto *P)
   fib_init(&p->rtable, P->pool, cf->rip2 ? NET_IP4 : NET_IP6,
 	   sizeof(struct rip_entry), OFFSETOF(struct rip_entry, n), 0, NULL);
   p->rte_slab = sl_new(P->pool, sizeof(struct rip_rte));
-  p->timer = tm_new_init(P->pool, rip_timer, p, 0, 0);
+  p->timer = tm_new_init(P->pool_up, rip_timer, p, 0, 0);
 
   p->rip2 = cf->rip2;
   p->ecmp = cf->ecmp;

From dabf2f5625c73226d7efbe92924085f8ea9b2832 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 13 Oct 2023 11:23:21 +0200
Subject: [PATCH 367/431] RIP: actually remove the interface structures on
 shutdown

This avoids a spurious route update fail when protocol shutdown collides
with an incoming RIP packet.
---
 proto/rip/rip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 00423802..28beadb4 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -1243,8 +1243,8 @@ rip_shutdown(struct proto *P)
   TRACE(D_EVENTS, "Shutdown requested");
 
   struct rip_iface *ifa;
-  WALK_LIST(ifa, p->iface_list)
-    rip_iface_stop(ifa);
+  WALK_LIST_FIRST(ifa, p->iface_list)
+    rip_remove_iface(p, ifa);
 
   return PS_DOWN;
 }

From 1234453419620f8917f6625ecec5a725fe82bb32 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 13 Oct 2023 13:38:15 +0200
Subject: [PATCH 368/431] CI: Temporarily disabling test-ibgp-loop-big as it
 tends to hang

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc3960a7..3336073b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -435,11 +435,11 @@ test-ibgp-loop:
   variables:
     TEST_NAME: cf-ibgp-loop
 
-test-ibgp-loop-big:
-  <<: *test-base
-  variables:
-    TEST_NAME: cf-ibgp-loop-big
-
+#test-ibgp-loop-big:
+#  <<: *test-base
+#  variables:
+#    TEST_NAME: cf-ibgp-loop-big
+#
 test-ibgp-flat:
   <<: *test-base
   variables:

From ddf698ec99284a8c634e3396550c0cbed28907a5 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 29 Oct 2023 16:25:01 +0100
Subject: [PATCH 369/431] Renamed nest/rt.h back to nest/route.h

Some [redacted] (yes, myself) had a really bad idea
to rename nest/route.h to nest/rt.h while refactoring
some data structures out of it.

This led to unnecessarily complex problems with
merging updates from v2. Reverting this change
to make my life a bit easier.

At least it needed only one find-sed command:

    find -name '*.[chlY]' -type f -exec sed -i 's#nest/rt.h#nest/route.h#' '{}' +
---
 conf/cf-lex.l          | 2 +-
 conf/conf.c            | 2 +-
 conf/confbase.Y        | 2 +-
 filter/data.c          | 2 +-
 filter/f-util.c        | 2 +-
 filter/filter.c        | 2 +-
 filter/filter.h        | 2 +-
 lib/a-path.c           | 2 +-
 lib/a-path_test.c      | 2 +-
 lib/a-set.c            | 2 +-
 lib/a-set_test.c       | 2 +-
 lib/event_test.c       | 2 +-
 nest/cmds.c            | 2 +-
 nest/proto.c           | 2 +-
 nest/protocol.h        | 2 +-
 nest/{rt.h => route.h} | 0
 nest/rt-attr.c         | 2 +-
 nest/rt-dev.c          | 2 +-
 nest/rt-fib.c          | 2 +-
 nest/rt-fib_test.c     | 2 +-
 nest/rt-show.c         | 2 +-
 nest/rt-table.c        | 2 +-
 proto/babel/babel.h    | 2 +-
 proto/bfd/bfd.h        | 2 +-
 proto/bgp/attrs.c      | 2 +-
 proto/bgp/bgp.c        | 2 +-
 proto/bgp/bgp.h        | 2 +-
 proto/bgp/packets.c    | 2 +-
 proto/mrt/mrt.h        | 2 +-
 proto/ospf/ospf.h      | 2 +-
 proto/perf/perf.c      | 2 +-
 proto/pipe/pipe.c      | 2 +-
 proto/radv/radv.h      | 2 +-
 proto/rip/rip.h        | 2 +-
 proto/rpki/rpki.h      | 2 +-
 proto/static/static.c  | 2 +-
 proto/static/static.h  | 2 +-
 sysdep/bsd/krt-sock.c  | 2 +-
 sysdep/linux/netlink.c | 2 +-
 sysdep/unix/krt.c      | 2 +-
 sysdep/unix/main.c     | 2 +-
 test/bt-utils.c        | 2 +-
 42 files changed, 41 insertions(+), 41 deletions(-)
 rename nest/{rt.h => route.h} (100%)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 2a25e629..8da2e8ef 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -42,7 +42,7 @@
 #define PARSER 1
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "filter/f-inst.h"
diff --git a/conf/conf.c b/conf/conf.c
index c76046ee..84a4c048 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -46,7 +46,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 0c6dc997..fd94047f 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -19,7 +19,7 @@ CF_HDR
 #include "lib/string.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/filter/data.c b/filter/data.c
index bf8a88b7..d3ed4a62 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -16,7 +16,7 @@
 #include "lib/unaligned.h"
 #include "lib/net.h"
 #include "lib/ip.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/attrs.h"
diff --git a/filter/f-util.c b/filter/f-util.c
index e014b224..15e825d4 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -13,7 +13,7 @@
 #include "filter/f-inst.h"
 #include "lib/idm.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 
 #define P(a,b) ((a<<8) | b)
 
diff --git a/filter/filter.c b/filter/filter.c
index c5597734..9d3d0c28 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -35,7 +35,7 @@
 #include "lib/ip.h"
 #include "lib/net.h"
 #include "lib/flowspec.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/attrs.h"
diff --git a/filter/filter.h b/filter/filter.h
index 1ece636a..92c89fbe 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -13,7 +13,7 @@
 #include "lib/resource.h"
 #include "lib/ip.h"
 #include "lib/macro.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "filter/data.h"
 #include "conf/conf.h"
diff --git a/lib/a-path.c b/lib/a-path.c
index a7a22e40..5154f9ba 100644
--- a/lib/a-path.c
+++ b/lib/a-path.c
@@ -8,7 +8,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
diff --git a/lib/a-path_test.c b/lib/a-path_test.c
index 08c6c96c..2388fc13 100644
--- a/lib/a-path_test.c
+++ b/lib/a-path_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "filter/data.h"
diff --git a/lib/a-set.c b/lib/a-set.c
index dcb86058..393df608 100644
--- a/lib/a-set.c
+++ b/lib/a-set.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
diff --git a/lib/a-set_test.c b/lib/a-set_test.c
index 79b5cf9a..e401ba6b 100644
--- a/lib/a-set_test.c
+++ b/lib/a-set_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "lib/net.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "lib/resource.h"
 
diff --git a/lib/event_test.c b/lib/event_test.c
index 612deb25..f9692142 100644
--- a/lib/event_test.c
+++ b/lib/event_test.c
@@ -15,7 +15,7 @@
 #include "nest/locks.h"
 #include "sysdep/unix/unix.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 
 #define MAX_NUM 4
 
diff --git a/nest/cmds.c b/nest/cmds.c
index 7984f088..de65e9d5 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -8,7 +8,7 @@
 
 #include "nest/bird.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "nest/cmds.h"
diff --git a/nest/proto.c b/nest/proto.c
index f624f098..706161b3 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -16,7 +16,7 @@
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "conf/conf.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/nest/protocol.h b/nest/protocol.h
index 635f84b9..721f96a8 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -14,7 +14,7 @@
 #include "lib/event.h"
 #include "nest/iface.h"
 #include "lib/settle.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/limit.h"
 #include "conf/conf.h"
 #include "filter/data.h"
diff --git a/nest/rt.h b/nest/route.h
similarity index 100%
rename from nest/rt.h
rename to nest/route.h
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 201dff30..0d24853f 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -45,7 +45,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 8ae563b5..c728b5f3 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/rt-dev.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 801561da..43e3039d 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -55,7 +55,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/string.h"
 
 /*
diff --git a/nest/rt-fib_test.c b/nest/rt-fib_test.c
index b796cc68..d9d7b656 100644
--- a/nest/rt-fib_test.c
+++ b/nest/rt-fib_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/rt.h"
+#include "nest/route.h"
 
 
 #define TESTS_NUM		10
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 6f19936f..b3041bf3 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -10,7 +10,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 8d0fc403..6d36d7eb 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -93,7 +93,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
diff --git a/proto/babel/babel.h b/proto/babel/babel.h
index 5f33bd83..112171c1 100644
--- a/proto/babel/babel.h
+++ b/proto/babel/babel.h
@@ -16,7 +16,7 @@
 #include "nest/bird.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/locks.h"
 #include "nest/password.h"
diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index a4b7d63c..47ab1e4d 100644
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -13,7 +13,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/password.h"
 #include "conf/conf.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 510456e8..4fdf9e19 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index de0f2f0a..3fd846ce 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -115,7 +115,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 079a98ea..c3c19a67 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <setjmp.h>
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 //#include "lib/lists.h"
 #include "lib/hash.h"
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index c7b3ac0e..b14f22a6 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -15,7 +15,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/attrs.h"
 #include "proto/mrt/mrt.h"
 #include "conf/conf.h"
diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h
index f535a391..04865089 100644
--- a/proto/mrt/mrt.h
+++ b/proto/mrt/mrt.h
@@ -13,7 +13,7 @@
 #include "nest/bird.h"
 #include "nest/protocol.h"
 #include "lib/lists.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "lib/event.h"
 #include "lib/hash.h"
 
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3477ba5a..91204667 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -22,7 +22,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/perf/perf.c b/proto/perf/perf.c
index 02723a30..227b51be 100644
--- a/proto/perf/perf.c
+++ b/proto/perf/perf.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 442a951f..6c55ae75 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -35,7 +35,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/radv/radv.h b/proto/radv/radv.h
index ff5426d4..100dd83e 100644
--- a/proto/radv/radv.h
+++ b/proto/radv/radv.h
@@ -19,7 +19,7 @@
 #include "lib/resource.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 6d70df46..260451d1 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -16,7 +16,7 @@
 #include "nest/cli.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/password.h"
 #include "nest/locks.h"
 #include "nest/bfd.h"
diff --git a/proto/rpki/rpki.h b/proto/rpki/rpki.h
index 20253844..a70a2027 100644
--- a/proto/rpki/rpki.h
+++ b/proto/rpki/rpki.h
@@ -13,7 +13,7 @@
 #define _BIRD_RPKI_H_
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "lib/socket.h"
 #include "lib/ip.h"
diff --git a/proto/static/static.c b/proto/static/static.c
index 2c3e09f4..dbce77ef 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -38,7 +38,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "filter/filter.h"
diff --git a/proto/static/static.h b/proto/static/static.h
index ea7ca33b..cda23040 100644
--- a/proto/static/static.h
+++ b/proto/static/static.h
@@ -9,7 +9,7 @@
 #ifndef _BIRD_STATIC_H_
 #define _BIRD_STATIC_H_
 
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/bfd.h"
 #include "lib/buffer.h"
 
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index 42082443..83edfafd 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -25,7 +25,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "sysdep/unix/unix.h"
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 2ce08e9d..e2599e1c 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -16,7 +16,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/alloca.h"
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0187bf0e..19978a75 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -53,7 +53,7 @@
 
 #include "nest/bird.h"
 #include "nest/iface.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "filter/filter.h"
 #include "conf/conf.h"
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 41c1be26..f0ed85e2 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -31,7 +31,7 @@
 #include "lib/locking.h"
 #include "lib/timer.h"
 #include "lib/string.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
diff --git a/test/bt-utils.c b/test/bt-utils.c
index c2e44c14..53ee92d2 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -14,7 +14,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/bird.h"
-#include "nest/rt.h"
+#include "nest/route.h"
 #include "nest/protocol.h"
 
 #include "sysdep/unix/unix.h"

From de70474fed139f9acb4ed3f8e925d12de4edcdd0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 29 Oct 2023 19:53:09 +0100
Subject: [PATCH 370/431] Filter: adding explicit route type

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
---
 conf/confbase.Y |  2 +-
 filter/config.Y | 91 +++++++++++++++++++++----------------------------
 filter/data.c   | 21 ++++++++++++
 filter/data.h   |  7 ++++
 filter/f-inst.c | 23 +++++++++----
 nest/route.h    |  2 ++
 nest/rt-attr.c  |  2 +-
 nest/rt-table.c |  7 ++--
 8 files changed, 92 insertions(+), 63 deletions(-)

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 0364bc6e..cdf1f018 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -433,7 +433,7 @@ bytestring_text:
  ;
 
 bytestring_expr:
-   symbol_value
+   lvalue { $$ = f_lval_getter(&$1); }
  | term_bs
  | '(' term ')' { $$ = $2; }
  ;
diff --git a/filter/config.Y b/filter/config.Y
index dfabddf7..4e1f6359 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -38,15 +38,15 @@ static inline void f_method_call_start(struct f_inst *object)
     cf_error("Too many nested method calls");
 
   struct sym_scope *scope = f_type_method_scope(object->type);
-  if (!scope)
+  if (!scope && object->type != T_ROUTE)
     cf_error("No methods defined for type %s", f_type_name(object->type));
 
   FM = (struct f_method_scope) {
     .object = object,
     .main = new_config->current_scope,
     .scope = {
-      .next = NULL,
-      .hash = scope->hash,
+      .next = scope ? global_root_scope : NULL,
+      .hash = scope ? scope->hash : global_root_scope->hash,
       .active = 1,
       .block = 1,
       .readonly = 1,
@@ -244,6 +244,7 @@ f_new_lc_item(u32 f1, u32 t1, u32 f2, u32 t2, u32 f3, u32 t3)
   return t;
 }
 
+
 /*
  * Remove all new lines and doubled whitespaces
  * and convert all tabulators to spaces
@@ -302,9 +303,10 @@ static struct f_inst *
 f_lval_getter(struct f_lval *lval)
 {
   switch (lval->type) {
+    case F_LVAL_CONSTANT:	return f_new_inst(FI_CONSTANT, *(lval->sym->val));
     case F_LVAL_VARIABLE:	return f_new_inst(FI_VAR_GET, lval->sym);
-    case F_LVAL_SA:		return f_new_inst(FI_RTA_GET, lval->sa);
-    case F_LVAL_EA:		return f_new_inst(FI_EA_GET, lval->da);
+    case F_LVAL_SA:		return f_new_inst(FI_RTA_GET, lval->rte, lval->sa);
+    case F_LVAL_EA:		return f_new_inst(FI_EA_GET, lval->rte, lval->da);
     default:			bug("Unknown lval type");
   }
 }
@@ -313,8 +315,13 @@ static struct f_inst *
 f_lval_setter(struct f_lval *lval, struct f_inst *expr)
 {
   switch (lval->type) {
+    case F_LVAL_CONSTANT:	cf_error("Constant %s is read-only", lval->sym->name);
     case F_LVAL_VARIABLE:	return f_new_inst(FI_VAR_SET, expr, lval->sym);
-    case F_LVAL_SA:		return f_new_inst(FI_RTA_SET, expr, lval->sa);
+    case F_LVAL_SA:
+      if (lval->sa.readonly)
+	cf_error( "This static attribute is read-only.");
+      return f_new_inst(FI_RTA_SET, expr, lval->sa);
+
     case F_LVAL_EA:		return f_new_inst(FI_EA_SET, expr, lval->da);
     default:			bug("Unknown lval type");
   }
@@ -357,7 +364,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
 %nonassoc ELSE
 
 %type <xp> cmds_int cmd_prep
-%type <x> term term_bs cmd cmd_var cmds cmds_scoped constant constructor var var_list var_list_r function_call symbol_value bgp_path_expr bgp_path bgp_path_tail term_dot_method method_name_cont
+%type <x> term term_bs cmd cmd_var cmds cmds_scoped constant constructor var var_list var_list_r function_call bgp_path_expr bgp_path bgp_path_tail term_dot_method method_name_cont
 %type <fda> dynamic_attr
 %type <fsa> static_attr
 %type <f> filter where_filter
@@ -447,6 +454,7 @@ type:
  | CLIST { $$ = T_CLIST; }
  | ECLIST { $$ = T_ECLIST; }
  | LCLIST { $$ = T_LCLIST; }
+ | ROUTE { $$ = T_ROUTE; }
  | type SET {
 	switch ($1) {
 	  case T_INT:
@@ -740,7 +748,7 @@ switch_body: /* EMPTY */ { $$ = NULL; }
  ;
 
 bgp_path_expr:
-   symbol_value { $$ = $1; }
+   lvalue { $$ = f_lval_getter(&$1); }
  | '(' term ')' { $$ = $2; }
  ;
 
@@ -822,23 +830,6 @@ function_call:
    }
  ;
 
-symbol_value: symbol_known
-  {
-    switch ($1->class) {
-      case SYM_CONSTANT_RANGE:
-	$$ = f_new_inst(FI_CONSTANT, *($1->val));
-	break;
-      case SYM_VARIABLE_RANGE:
-	$$ = f_new_inst(FI_VAR_GET, $1);
-	break;
-      case SYM_ATTRIBUTE:
-	$$ = f_new_inst(FI_EA_GET, *$1->attribute);
-	break;
-      default:
-	cf_error("Can't get value of symbol %s", $1->name);
-    }
-  }
- ;
 
 static_attr:
    FROM    { $$ = f_new_static_attr(T_IP,         SA_FROM,	0); }
@@ -866,6 +857,16 @@ method_name_cont:
    } '(' var_list ')' {
      $$ = f_dispatch_method($1, FM.object, $4, 1);
    }
+ | static_attr {
+     if (FM.object->type != T_ROUTE)
+       cf_error("Getting a route attribute from %s, need a route", f_type_name(FM.object->type));
+     $$ = f_new_inst(FI_RTA_GET, FM.object, $1);
+   }
+ | dynamic_attr {
+     if (FM.object->type != T_ROUTE)
+       cf_error("Getting a route attribute from %s, need a route", f_type_name(FM.object->type));
+     $$ = f_new_inst(FI_EA_GET, FM.object, $1);
+   }
  ;
 
 term:
@@ -887,13 +888,10 @@ term:
  | '!' term		{ $$ = f_new_inst(FI_NOT, $2); }
  | DEFINED '(' term ')' { $$ = f_new_inst(FI_DEFINED, $3); }
 
- | symbol_value   { $$ = $1; }
  | constant { $$ = $1; }
  | constructor { $$ = $1; }
 
- | static_attr { $$ = f_new_inst(FI_RTA_GET, $1); }
-
- | dynamic_attr { $$ = f_new_inst(FI_EA_GET, $1); }
+ | lvalue { $$ = f_lval_getter(&$1); }
 
  | term_dot_method
 
@@ -902,7 +900,7 @@ term:
  | '-' '-' EMPTY '-' '-' { $$ = f_new_inst(FI_CONSTANT, val_empty(T_ECLIST)); }
  | '-' '-' '-' EMPTY '-' '-' '-' { $$ = f_new_inst(FI_CONSTANT, val_empty(T_LCLIST)); }
 
-| PREPEND '(' term ',' term ')' { $$ = f_dispatch_method_x("prepend", $3->type, $3, $5); }
+ | PREPEND '(' term ',' term ')' { $$ = f_dispatch_method_x("prepend", $3->type, $3, $5); }
  | ADD '(' term ',' term ')' { $$ = f_dispatch_method_x("add", $3->type, $3, $5); }
  | DELETE '(' term ',' term ')' { $$ = f_dispatch_method_x("delete", $3->type, $3, $5); }
  | FILTER '(' term ',' term ')' { $$ = f_dispatch_method_x("filter", $3->type, $3, $5); }
@@ -963,17 +961,8 @@ cmd:
      cf_pop_block_scope(new_config);
      $$ = f_for_cycle($3, $6, $9);
    }
- | symbol_known '=' term ';' {
-     switch ($1->class) {
-       case SYM_VARIABLE_RANGE:
-	 $$ = f_new_inst(FI_VAR_SET, $3, $1);
-	 break;
-       case SYM_ATTRIBUTE:
-	 $$ = f_new_inst(FI_EA_SET, $3, *$1->attribute);
-	 break;
-       default:
-	 cf_error("Can't assign to symbol %s", $1->name);
-     }
+ | lvalue '=' term ';' {
+     $$ = f_lval_setter(&$1, $3);
    }
  | RETURN term ';' {
      DBG( "Ook, we'll return the value\n" );
@@ -991,14 +980,6 @@ cmd:
 
      $$ = f_new_inst(FI_RETURN, $2);
    }
- | dynamic_attr '=' term ';' {
-     $$ = f_new_inst(FI_EA_SET, $3, $1);
-   }
- | static_attr '=' term ';' {
-     if ($1.readonly)
-       cf_error( "This static attribute is read-only.");
-     $$ = f_new_inst(FI_RTA_SET, $3, $1);
-   }
  | UNSET '(' dynamic_attr ')' ';' {
      $$ = f_new_inst(FI_EA_UNSET, $3);
    }
@@ -1043,17 +1024,21 @@ lvalue:
    CF_SYM_KNOWN {
      switch ($1->class)
      {
+       case SYM_CONSTANT_RANGE:
+	 $$ = (struct f_lval) { .type = F_LVAL_CONSTANT, .sym = $1, };
+	 break;
        case SYM_VARIABLE_RANGE:
-	 $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1 };
+	 $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1, };
          break;
        case SYM_ATTRIBUTE:
-         $$ = (struct f_lval) { .type = F_LVAL_EA, .da = *($1->attribute) };
+         $$ = (struct f_lval) { .type = F_LVAL_EA, .da = *($1->attribute), .rte = f_new_inst(FI_CURRENT_ROUTE), };
 	 break;
        default:
 	 cf_error("Variable name or custom attribute name required");
      }
    }
- | static_attr { $$ = (struct f_lval) { .type = F_LVAL_SA, .sa = $1 }; }
- | dynamic_attr { $$ = (struct f_lval) { .type = F_LVAL_EA, .da = $1 }; };
+ | static_attr { $$ = (struct f_lval) { .type = F_LVAL_SA, .sa = $1, .rte = f_new_inst(FI_CURRENT_ROUTE), }; }
+ | dynamic_attr { $$ = (struct f_lval) { .type = F_LVAL_EA, .da = $1, .rte = f_new_inst(FI_CURRENT_ROUTE), }; }
+ ;
 
 CF_END
diff --git a/filter/data.c b/filter/data.c
index 89b75e56..cb52b499 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -56,6 +56,8 @@ static const char * const f_type_str[] = {
   [T_LC]	= "lc",
   [T_LCLIST]	= "lclist",
   [T_RD]	= "rd",
+
+  [T_ROUTE]	= "route",
 };
 
 const char *
@@ -206,6 +208,7 @@ val_compare(const struct f_val *v1, const struct f_val *v2)
     return net_compare(v1->val.net, v2->val.net);
   case T_STRING:
     return strcmp(v1->val.s, v2->val.s);
+  case T_ROUTE:
   default:
     return F_CMP_ERROR;
   }
@@ -296,6 +299,8 @@ val_same(const struct f_val *v1, const struct f_val *v2)
     return same_tree(v1->val.t, v2->val.t);
   case T_PREFIX_SET:
     return trie_same(v1->val.ti, v2->val.ti);
+  case T_ROUTE:
+    return rte_same(v1->val.rte, v2->val.rte);
   default:
     bug("Invalid type in val_same(): %x", v1->type);
   }
@@ -569,6 +574,21 @@ val_in_range(const struct f_val *v1, const struct f_val *v2)
   return F_CMP_ERROR;
 }
 
+/*
+ * rte_format - format route information
+ */
+static void
+rte_format(const struct rte *rte, buffer *buf)
+{
+  if (rte)
+    buffer_print(buf, "Route [%d] to %N from %s.%s via %s",
+                 rte->src->global_id, rte->net->n.addr,
+                 rte->sender->proto->name, rte->sender->name,
+                 rte->src->proto->name);
+  else
+    buffer_puts(buf, "[No route]");
+}
+
 /*
  * val_format - format filter value
  */
@@ -598,6 +618,7 @@ val_format(const struct f_val *v, buffer *buf)
   case T_ECLIST: ec_set_format(v->val.ad, -1, buf2, 1000); buffer_print(buf, "(eclist %s)", buf2); return;
   case T_LCLIST: lc_set_format(v->val.ad, -1, buf2, 1000); buffer_print(buf, "(lclist %s)", buf2); return;
   case T_PATH_MASK: pm_format(v->val.path_mask, buf); return;
+  case T_ROUTE: rte_format(v->val.rte, buf); return;
   default:	buffer_print(buf, "[unknown type %x]", v->type); return;
   }
 }
diff --git a/filter/data.h b/filter/data.h
index 3430455a..620a80bf 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -62,6 +62,7 @@ enum f_type {
   T_PATH_MASK_ITEM = 0x2b,	/* Path mask item for path mask constructors */
   T_BYTESTRING = 0x2c,
 
+  T_ROUTE = 0x78,
   T_SET = 0x80,
   T_PREFIX_SET = 0x81,
 } PACKED;
@@ -90,6 +91,10 @@ struct f_val {
     const struct adata *ad;
     const struct f_path_mask *path_mask;
     struct f_path_mask_item pmi;
+    struct {
+      rte *rte;
+      ea_list *eattrs;
+    };
   } val;
 };
 
@@ -127,6 +132,7 @@ struct f_static_attr {
 
 /* Filter l-value type */
 enum f_lval_type {
+  F_LVAL_CONSTANT,
   F_LVAL_VARIABLE,
   F_LVAL_PREFERENCE,
   F_LVAL_SA,
@@ -136,6 +142,7 @@ enum f_lval_type {
 /* Filter l-value */
 struct f_lval {
   enum f_lval_type type;
+  struct f_inst *rte;
   union {
     struct symbol *sym;
     struct f_dynamic_attr da;
diff --git a/filter/f-inst.c b/filter/f-inst.c
index a7bec81e..76ec272d 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -654,11 +654,20 @@
     }
   }
 
-  INST(FI_RTA_GET, 0, 1) {
+  INST(FI_CURRENT_ROUTE, 0, 1) {
+    NEVER_CONSTANT;
+    ACCESS_EATTRS;
+    RESULT_TYPE(T_ROUTE);
+    RESULT_VAL([[(struct f_val) { .type = T_ROUTE, .val.rte = *fs->rte, .val.eattrs = *fs->eattrs, }]]);
+  }
+
+  INST(FI_RTA_GET, 1, 1) {
     {
-      STATIC_ATTR;
       ACCESS_RTE;
-      struct rta *rta = (*fs->rte)->attrs;
+      ARG(1, T_ROUTE);
+      STATIC_ATTR;
+
+      struct rta *rta = v1.val.rte->attrs;
 
       switch (sa.sa_code)
       {
@@ -797,13 +806,15 @@
     }
   }
 
-  INST(FI_EA_GET, 0, 1) {	/* Access to extended attributes */
-    DYNAMIC_ATTR;
+  INST(FI_EA_GET, 1, 1) {	/* Access to extended attributes */
     ACCESS_RTE;
     ACCESS_EATTRS;
+    ARG(1, T_ROUTE);
+    DYNAMIC_ATTR;
     RESULT_TYPE(da.f_type);
     {
-      eattr *e = ea_find(*fs->eattrs, da.ea_code);
+      struct ea_list *eal = v1.val.eattrs;
+      eattr *e = ea_find(eal, da.ea_code);
 
       if (!e) {
 	RESULT_VAL(val_empty(da.f_type));
diff --git a/nest/route.h b/nest/route.h
index 7aec7117..42da5b19 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -326,6 +326,8 @@ void rt_refresh_begin(rtable *t, struct channel *c);
 void rt_refresh_end(rtable *t, struct channel *c);
 void rt_modify_stale(rtable *t, struct channel *c);
 void rt_schedule_prune(rtable *t);
+int rte_same(rte *, rte *);
+int rta_same(struct rta *, struct rta *);
 void rte_dump(rte *);
 void rte_free(rte *);
 rte *rte_do_cow(rte *);
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index d793c72e..69ef4542 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1126,7 +1126,7 @@ rta_hash(rta *a)
   return mem_hash_value(&h) ^ nexthop_hash(&(a->nh)) ^ ea_hash(a->eattrs);
 }
 
-static inline int
+int
 rta_same(rta *x, rta *y)
 {
   return (x->source == y->source &&
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 742e2f05..206fc6ef 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1206,12 +1206,15 @@ rte_free_quick(rte *e)
   sl_free(e);
 }
 
-static int
+int
 rte_same(rte *x, rte *y)
 {
   /* rte.flags / rte.pflags are not checked, as they are internal to rtable */
   return
-    x->attrs == y->attrs &&
+    (
+     (x->attrs == y->attrs) ||
+     ((!x->attrs->cached || !y->attrs->cached) && rta_same(x->attrs, y->attrs))
+    ) &&
     x->src == y->src &&
     rte_is_filtered(x) == rte_is_filtered(y);
 }

From f0187d713c36e841fe8bab350e84f5257a74981a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 Oct 2023 09:49:20 +0100
Subject: [PATCH 371/431] Filter: adding explicit route-block type

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
---
 filter/data.c   | 26 ++++++++++++++++++++++++++
 filter/data.h   |  1 +
 filter/f-inst.c | 28 ++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/filter/data.c b/filter/data.c
index cb52b499..de745654 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -58,6 +58,7 @@ static const char * const f_type_str[] = {
   [T_RD]	= "rd",
 
   [T_ROUTE]	= "route",
+  [T_ROUTES_BLOCK] = "block of routes",
 };
 
 const char *
@@ -80,6 +81,7 @@ f_type_element_type(enum f_type t)
     case T_CLIST:  return T_PAIR;
     case T_ECLIST: return T_EC;
     case T_LCLIST: return T_LC;
+    case T_ROUTES_BLOCK: return T_ROUTE;
     default: return T_VOID;
   };
 }
@@ -209,6 +211,7 @@ val_compare(const struct f_val *v1, const struct f_val *v2)
   case T_STRING:
     return strcmp(v1->val.s, v2->val.s);
   case T_ROUTE:
+  case T_ROUTES_BLOCK:
   default:
     return F_CMP_ERROR;
   }
@@ -301,6 +304,15 @@ val_same(const struct f_val *v1, const struct f_val *v2)
     return trie_same(v1->val.ti, v2->val.ti);
   case T_ROUTE:
     return rte_same(v1->val.rte, v2->val.rte);
+  case T_ROUTES_BLOCK:
+    for (
+	rte *r1 = v1->val.rte, *r2 = v2->val.rte;
+	r1 || r2;
+	r1 = r1->next, r2 = r2->next
+	)
+      if (!r1 || !r2 || !rte_same(r1, r2))
+	return 0;
+    return 1;
   default:
     bug("Invalid type in val_same(): %x", v1->type);
   }
@@ -589,6 +601,19 @@ rte_format(const struct rte *rte, buffer *buf)
     buffer_puts(buf, "[No route]");
 }
 
+static void
+rte_block_format(const struct rte *rte, buffer *buf)
+{
+  buffer_print(buf, "Block of routes:");
+
+  for (int i = 0; rte; rte = rte->next, i++)
+  {
+    buffer_print(buf, "%s%d: ", i ? "; " : " ", i);
+    rte_format(rte, buf);
+  }
+}
+
+
 /*
  * val_format - format filter value
  */
@@ -619,6 +644,7 @@ val_format(const struct f_val *v, buffer *buf)
   case T_LCLIST: lc_set_format(v->val.ad, -1, buf2, 1000); buffer_print(buf, "(lclist %s)", buf2); return;
   case T_PATH_MASK: pm_format(v->val.path_mask, buf); return;
   case T_ROUTE: rte_format(v->val.rte, buf); return;
+  case T_ROUTES_BLOCK: rte_block_format(v->val.rte, buf); return;
   default:	buffer_print(buf, "[unknown type %x]", v->type); return;
   }
 }
diff --git a/filter/data.h b/filter/data.h
index 620a80bf..103591b7 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -63,6 +63,7 @@ enum f_type {
   T_BYTESTRING = 0x2c,
 
   T_ROUTE = 0x78,
+  T_ROUTES_BLOCK = 0x79,
   T_SET = 0x80,
   T_PREFIX_SET = 0x81,
 } PACKED;
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 76ec272d..42e38a4b 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -617,6 +617,34 @@
     METHOD_CONSTRUCTOR("!for_next");
   }
 
+  INST(FI_ROUTES_BLOCK_FOR_NEXT, 3, 0) {
+    NEVER_CONSTANT;
+    ARG(1, T_ROUTES_BLOCK);
+
+    /* Loop auxiliary variable is initialized to T_VOID.
+     * In the first run, we initialize the auxiliary variable
+     * to the routes block supplied. It changes its type
+     * to T_ROUTES_BLOCK and therefore won't be run again. */
+    if (v2.type == T_VOID)
+      v2 = v1;
+
+    if (v2.val.rte)
+    {
+      /* There is some route to process, set it into the iterator variable.
+       * Its type has been already initialized by f_for_cycle(). */
+      v3.val.rte = v2.val.rte;
+      v3.val.eattrs = v3.val.rte->attrs->eattrs;
+
+      /* Prepare next route in the loop auxiliary variable */
+      v2.val.rte = v2.val.rte->next;
+
+      /* And execute the line */
+      LINE(2,0);
+    }
+
+    METHOD_CONSTRUCTOR("!for_next");
+  }
+
   INST(FI_CONDITION, 1, 0) {
     ARG(1, T_BOOL);
     if (v1.val.i)

From 407eb388b7082b52921e93476c8ff1a98fe3b873 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 Oct 2023 10:44:45 +0100
Subject: [PATCH 372/431] Filter: predefined variables for specific blocks

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
---
 filter/config.Y       |  4 ++++
 filter/filter.c       | 34 +++++++++++++++++++++-------------
 filter/filter.h       |  3 ++-
 proto/static/static.c |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index 4e1f6359..873e4035 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -106,6 +106,10 @@ f_new_var(struct sym_scope *s)
   return offset;
 }
 
+/* Macro for top-level pre-defined variables. */
+#define f_predefined_variable(conf_, name_, type_) \
+    cf_define_symbol(conf_, cf_get_symbol(conf_, name_), SYM_VARIABLE | type_, offset, f_new_var(conf_->current_scope))
+
 /*
  * Sets and their items are during parsing handled as lists, linked
  * through left ptr. The first item in a list also contains a pointer
diff --git a/filter/filter.c b/filter/filter.c
index 65fb92a4..4c0f6f12 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -87,6 +87,9 @@ struct filter_state {
   /* Linpool for adata allocation */
   struct linpool *pool;
 
+  /* Additional external values provided to the filter */
+  const struct f_val *val;
+
   /* Buffer for log output */
   struct buffer buf;
 
@@ -157,18 +160,20 @@ static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
  * TWOARGS macro to get both of them evaluated.
  */
 static enum filter_return
-interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
+interpret(struct filter_state *fs, const struct f_line *line, uint argc, const struct f_val *argv, struct f_val *val)
 {
-  /* No arguments allowed */
-  ASSERT(line->args == 0);
+  /* Check of appropriate number of arguments */
+  ASSERT(line->args == argc);
 
   /* Initialize the filter stack */
   struct filter_stack *fstk = fs->stack;
 
-  fstk->vcnt = line->vars;
-  memset(fstk->vstk, 0, sizeof(struct f_val) * line->vars);
+  /* Set the arguments and top-level variables */
+  fstk->vcnt = line->vars + line->args;
+  memcpy(fstk->vstk, argv, sizeof(struct f_val) * line->args);
+  memset(fstk->vstk + argc, 0, sizeof(struct f_val) * line->vars);
 
-  /* The same as with the value stack. Not resetting the stack for performance reasons. */
+  /* The same as with the value stack. Not resetting the stack completely for performance reasons. */
   fstk->ecnt = 1;
   fstk->estk[0].line = line;
   fstk->estk[0].pos = 0;
@@ -271,6 +276,12 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
   if (filter == FILTER_REJECT)
     return F_REJECT;
 
+  return f_run_args(filter, rte, tmp_pool, 0, NULL, flags);
+}
+
+enum filter_return
+f_run_args(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, int flags)
+{
   int rte_cow = ((*rte)->flags & REF_COW);
   DBG( "Running filter `%s'...", filter->name );
 
@@ -285,7 +296,7 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
   LOG_BUFFER_INIT(filter_state.buf);
 
   /* Run the interpreter itself */
-  enum filter_return fret = interpret(&filter_state, filter->root, NULL);
+  enum filter_return fret = interpret(&filter_state, filter->root, argc, argv, NULL);
 
   if (filter_state.old_rta) {
     /*
@@ -337,7 +348,7 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
  */
 
 enum filter_return
-f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool)
+f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, struct f_val *pres)
 {
   filter_state = (struct filter_state) {
     .stack = &filter_stack,
@@ -347,10 +358,7 @@ f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool
 
   LOG_BUFFER_INIT(filter_state.buf);
 
-  ASSERT(!((*rte)->flags & REF_COW));
-  ASSERT(!rta_is_cached((*rte)->attrs));
-
-  return interpret(&filter_state, expr, NULL);
+  return interpret(&filter_state, expr, argc, argv, pres);
 }
 
 /*
@@ -369,7 +377,7 @@ f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres)
 
   LOG_BUFFER_INIT(filter_state.buf);
 
-  enum filter_return fret = interpret(&filter_state, expr, pres);
+  enum filter_return fret = interpret(&filter_state, expr, 0, NULL, pres);
   return fret;
 }
 
diff --git a/filter/filter.h b/filter/filter.h
index 91de696c..18ff0874 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -52,7 +52,8 @@ struct filter {
 struct rte;
 
 enum filter_return f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags);
-enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool);
+enum filter_return f_run_args(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, int flags);
+enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, struct f_val *pres);
 enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf);
 
 struct f_val cf_eval(const struct f_inst *inst, int type);
diff --git a/proto/static/static.c b/proto/static/static.c
index bb93305e..cf7a4768 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -113,7 +113,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     net_copy(e->net->n.addr, r->net);
 
     /* Evaluate the filter */
-    f_eval_rte(r->cmds, &e, static_lp);
+    f_eval_rte(r->cmds, &e, static_lp, 0, NULL, NULL);
 
     /* Remove the temporary node */
     e->net = NULL;

From df5a08e7c717ff421a52b4144d741f0a9749159f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Oct 2023 11:52:30 +0100
Subject: [PATCH 373/431] Filter: value hashing

Added a code for computing hash of filter values.

This is a split-commit of the neighboring aggregator branch
with improved lvalue and attribute handling.
---
 filter/data.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 filter/data.h |  3 +++
 2 files changed, 72 insertions(+)

diff --git a/filter/data.c b/filter/data.c
index de745654..5d36b0f5 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -586,6 +586,75 @@ val_in_range(const struct f_val *v1, const struct f_val *v2)
   return F_CMP_ERROR;
 }
 
+uint
+val_hash(struct f_val *v)
+{
+  u64 haux;
+  mem_hash_init(&haux);
+  mem_hash_mix_f_val(&haux, v);
+  return mem_hash_value(&haux);
+}
+
+void
+mem_hash_mix_f_val(u64 *h, struct f_val *v)
+{
+  mem_hash_mix_num(h, v->type);
+
+#define MX(k) mem_hash_mix(h, &IT(k), sizeof IT(k));
+#define IT(k) v->val.k
+
+  switch (v->type)
+  {
+    case T_VOID:
+      break;
+    case T_INT:
+    case T_BOOL:
+    case T_PAIR:
+    case T_QUAD:
+    case T_ENUM:
+      MX(i);
+      break;
+    case T_EC:
+    case T_RD:
+      MX(ec);
+      break;
+    case T_LC:
+      MX(lc);
+      break;
+    case T_IP:
+      MX(ip);
+      break;
+    case T_NET:
+      mem_hash_mix_num(h, net_hash(IT(net)));
+      break;
+    case T_STRING:
+      mem_hash_mix_str(h, IT(s));
+      break;
+    case T_PATH_MASK:
+      mem_hash_mix(h, IT(path_mask), sizeof(*IT(path_mask)) + IT(path_mask)->len * sizeof (IT(path_mask)->item));
+      break;
+    case T_PATH:
+    case T_CLIST:
+    case T_ECLIST:
+    case T_LCLIST:
+    case T_BYTESTRING:
+      mem_hash_mix(h, IT(ad)->data, IT(ad)->length);
+      break;
+    case T_SET:
+      MX(t);
+      break;
+    case T_PREFIX_SET:
+      MX(ti);
+      break;
+
+    case T_NONE:
+    case T_PATH_MASK_ITEM:
+    case T_ROUTE:
+    case T_ROUTES_BLOCK:
+      bug("Invalid type %s in f_val hashing", f_type_name(v->type));
+  }
+}
+
 /*
  * rte_format - format route information
  */
diff --git a/filter/data.h b/filter/data.h
index 103591b7..fbf21dcb 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -305,6 +305,9 @@ void val_format(const struct f_val *v, buffer *buf);
 char *val_format_str(struct linpool *lp, const struct f_val *v);
 const char *val_dump(const struct f_val *v);
 
+uint val_hash(struct f_val *);
+void mem_hash_mix_f_val(u64 *, struct f_val *);
+
 static inline int val_is_ip4(const struct f_val *v)
 { return (v->type == T_IP) && ipa_is_ip4(v->val.ip); }
 int val_in_range(const struct f_val *v1, const struct f_val *v2);

From ba91f4c831f057b81104d1453f99b012c01f9c9e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Oct 2023 12:03:49 +0100
Subject: [PATCH 374/431] Filters: allowing to return any number of values

---
 filter/filter.c       | 31 ++++++++++++-------------------
 filter/filter.h       |  2 +-
 proto/static/static.c |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/filter/filter.c b/filter/filter.c
index 4c0f6f12..396b7333 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -160,7 +160,7 @@ static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
  * TWOARGS macro to get both of them evaluated.
  */
 static enum filter_return
-interpret(struct filter_state *fs, const struct f_line *line, uint argc, const struct f_val *argv, struct f_val *val)
+interpret(struct filter_state *fs, const struct f_line *line, uint argc, const struct f_val *argv, uint resc, struct f_val *resv)
 {
   /* Check of appropriate number of arguments */
   ASSERT(line->args == argc);
@@ -225,21 +225,14 @@ interpret(struct filter_state *fs, const struct f_line *line, uint argc, const s
     fstk->ecnt--;
   }
 
-  if (fstk->vcnt == 0) {
-    if (val) {
-      log_rl(&rl_runtime_err, L_ERR "filters: No value left on stack");
-      return F_ERROR;
-    }
-    return F_NOP;
+  if (fstk->vcnt != resc)
+  {
+    log_rl(&rl_runtime_err, L_ERR "Filter expected to leave %d values on stack but %d left instead", resc, fstk->vcnt);
+    return F_ERROR;
   }
 
-  if (val && (fstk->vcnt == 1)) {
-    *val = fstk->vstk[0];
-    return F_NOP;
-  }
-
-  log_rl(&rl_runtime_err, L_ERR "Too many items left on stack: %u", fstk->vcnt);
-  return F_ERROR;
+  memcpy(resv, fstk->vstk, sizeof(struct f_val) * resc);
+  return F_NOP;
 }
 
 
@@ -296,7 +289,7 @@ f_run_args(const struct filter *filter, struct rte **rte, struct linpool *tmp_po
   LOG_BUFFER_INIT(filter_state.buf);
 
   /* Run the interpreter itself */
-  enum filter_return fret = interpret(&filter_state, filter->root, argc, argv, NULL);
+  enum filter_return fret = interpret(&filter_state, filter->root, argc, argv, 0, NULL);
 
   if (filter_state.old_rta) {
     /*
@@ -348,7 +341,7 @@ f_run_args(const struct filter *filter, struct rte **rte, struct linpool *tmp_po
  */
 
 enum filter_return
-f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, struct f_val *pres)
+f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, uint resc, struct f_val *resv)
 {
   filter_state = (struct filter_state) {
     .stack = &filter_stack,
@@ -358,14 +351,14 @@ f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool
 
   LOG_BUFFER_INIT(filter_state.buf);
 
-  return interpret(&filter_state, expr, argc, argv, pres);
+  return interpret(&filter_state, expr, argc, argv, resc, resv);
 }
 
 /*
  * f_eval - get a value of a term
  * @expr: filter line containing the term
  * @tmp_pool: long data may get allocated from this pool
- * @pres: here the output will be stored
+ * @pres: here the output will be stored if requested
  */
 enum filter_return
 f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres)
@@ -377,7 +370,7 @@ f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres)
 
   LOG_BUFFER_INIT(filter_state.buf);
 
-  enum filter_return fret = interpret(&filter_state, expr, 0, NULL, pres);
+  enum filter_return fret = interpret(&filter_state, expr, 0, NULL, !!pres, pres);
   return fret;
 }
 
diff --git a/filter/filter.h b/filter/filter.h
index 18ff0874..c4b1796d 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -53,7 +53,7 @@ struct rte;
 
 enum filter_return f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags);
 enum filter_return f_run_args(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, int flags);
-enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, struct f_val *pres);
+enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool, uint argc, const struct f_val *argv, uint resc, struct f_val *resv);
 enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf);
 
 struct f_val cf_eval(const struct f_inst *inst, int type);
diff --git a/proto/static/static.c b/proto/static/static.c
index cf7a4768..2d2ac310 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -113,7 +113,7 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
     net_copy(e->net->n.addr, r->net);
 
     /* Evaluate the filter */
-    f_eval_rte(r->cmds, &e, static_lp, 0, NULL, NULL);
+    f_eval_rte(r->cmds, &e, static_lp, 0, NULL, 0, NULL);
 
     /* Remove the temporary node */
     e->net = NULL;

From f42c118aa75c08006178d112a1e4a8ded5ba6504 Mon Sep 17 00:00:00 2001
From: Igor Putovny <igor.putovny@nic.cz>
Date: Wed, 21 Jun 2023 13:15:07 +0200
Subject: [PATCH 375/431] Basic route aggregation

Add a new protocol offering route aggregation.

User can specify list of route attributes in the configuration file and
run route aggregation on the export side of the pipe protocol. Routes are
sorted and for every group of equivalent routes new route is created and
exported to the routing table. It is also possible to specify filter
which will run for every route before aggregation.

Furthermore, it will be possible to set attributes of new routes
according to attributes of the aggregated routes.

This is a work in progress.

Original work by Igor Putovny, subsequent cleanups and finalization by
Maria Matejka.

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.
---
 conf/confbase.Y               |   1 +
 configure.ac                  |   3 +-
 doc/bird.sgml                 |  64 +++
 filter/data.c                 |   3 +-
 lib/hash.h                    |   8 +
 nest/a-path.c                 |  23 +
 nest/attrs.h                  |   2 +
 nest/proto.c                  |   1 -
 nest/protocol.h               |   3 +-
 nest/route.h                  |   5 +-
 nest/rt-attr.c                |   5 +-
 nest/rt-table.c               |   1 -
 proto/aggregator/Doc          |   1 +
 proto/aggregator/Makefile     |   6 +
 proto/aggregator/aggregator.c | 808 ++++++++++++++++++++++++++++++++++
 proto/aggregator/aggregator.h |  86 ++++
 proto/aggregator/config.Y     | 134 ++++++
 proto/aggregator/test.conf    | 116 +++++
 18 files changed, 1263 insertions(+), 7 deletions(-)
 create mode 100644 proto/aggregator/Doc
 create mode 100644 proto/aggregator/Makefile
 create mode 100644 proto/aggregator/aggregator.c
 create mode 100644 proto/aggregator/aggregator.h
 create mode 100644 proto/aggregator/config.Y
 create mode 100644 proto/aggregator/test.conf

diff --git a/conf/confbase.Y b/conf/confbase.Y
index cdf1f018..021fede5 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -95,6 +95,7 @@ CF_DECLS
   struct timeformat *tf;
   mpls_label_stack *mls;
   const struct adata *bs;
+  struct aggr_item_node *ai;
 }
 
 %token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT
diff --git a/configure.ac b/configure.ac
index c9c52038..a7cf0a5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,7 @@ if test "$enable_mpls_kernel" != no ; then
   fi
 fi
 
-all_protocols="$proto_bfd babel bgp mrt ospf perf pipe radv rip rpki static"
+all_protocols="aggregator $proto_bfd babel bgp mrt ospf perf pipe radv rip rpki static"
 
 all_protocols=`echo $all_protocols | sed 's/ /,/g'`
 
@@ -320,6 +320,7 @@ if test "$with_protocols" = all ; then
   with_protocols="$all_protocols"
 fi
 
+AH_TEMPLATE([CONFIG_AGGREGATOR],[Aggregator protocol])
 AH_TEMPLATE([CONFIG_BABEL], 	[Babel protocol])
 AH_TEMPLATE([CONFIG_BFD],	[BFD protocol])
 AH_TEMPLATE([CONFIG_BGP],	[BGP protocol])
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 366797ba..449a69de 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1905,6 +1905,70 @@ protocol sections.
 <chapt>Protocols
 <label id="protocols">
 
+<sect>Aggregator
+<label id="aggregator">
+
+<sect1>Introduction
+<label id="aggregator-intro">
+<p>The Aggregator protocol explicitly merges routes by the given rules. There
+   are four phases of aggregation. First routes are filtered, then sorted into buckets,
+   then buckets are merged and finally the results are filtered once again.
+   Aggregating an already aggregated route is forbidden.
+
+<p>This is an experimental protocol, use with caution.
+
+<sect1>Configuration
+<label id="aggregator-config">
+<p><descrip>
+	<tag><label id="aggregator-table">table <m/table/</tag>
+	The table from which routes are exported to get aggregated.
+
+	<tag><label id="aggregator-export">export <m/.../</tag>
+	A standard channel's <cf/export/ clause, defining which routes are accepted into aggregation.
+
+	<tag><label id="aggregator-rule">aggregate on <m/expr/ | <m/attribute/ [<m/, .../]</tag>
+	All the given filter expressions and route attributes are evaluated for each route. Then routes
+	are sorted into buckets where <em/all/ values are the same. Note: due to performance reasons,
+        all filter expressions must return a compact type, e.g. integer, a BGP
+        (standard, extended, large) community or an IP address. If you need to compare e.g. modified
+	AS Paths in the aggregation rule, you can define a custom route attribute and set this attribute
+	in the export filter. For now, it's mandatory to say <cf/net/ here, we can't merge prefixes yet.
+
+	<tag><label id="aggregation-merge">merge by { <m/filter code/ }</tag>
+	The given filter code has an extra symbol defined: <cf/routes/. By iterating over <cf/routes/,
+	you get all the routes in the bucket and you can construct your new route. All attributes
+	selected in <cf/aggregate on/ are already set to the common values. For now, it's not possible
+	to use a named filter here. You have to finalize the route by calling <cf/accept/.
+
+	<tag><label id="aggregator-import">import <m/.../</tag>
+	Filter applied to the route after <cf/merge by/. Here you can use a named filter.
+
+	<tag><label id="aggregator-peer-table">peer table <m/table/</tag>
+	The table to which aggregated routes are imported. It may be the same table
+	as <cf/table/.
+</descrip>
+
+<sect1>Example
+<label id="aggregator-example">
+
+<p><code>
+protocol aggregator {
+  table master6;
+  export where defined(bgp_path);
+  /* Merge all routes with the same AS Path length */
+  aggregate on net, bgp_path.len;
+  merge by {
+    for route r in routes do {
+      if ! defined(bgp_path) then { bgp_path = r.bgp_path }
+      bgp_community = bgp_community.add(r.bgp_community);
+    }
+    accept;
+  };
+  import all;
+  peer table agr_result;
+}
+</code>
+
 <sect>Babel
 <label id="babel">
 
diff --git a/filter/data.c b/filter/data.c
index 5d36b0f5..84f1f0b6 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -210,6 +210,8 @@ val_compare(const struct f_val *v1, const struct f_val *v2)
     return net_compare(v1->val.net, v2->val.net);
   case T_STRING:
     return strcmp(v1->val.s, v2->val.s);
+  case T_PATH:
+    return as_path_compare(v1->val.ad, v2->val.ad);
   case T_ROUTE:
   case T_ROUTES_BLOCK:
   default:
@@ -682,7 +684,6 @@ rte_block_format(const struct rte *rte, buffer *buf)
   }
 }
 
-
 /*
  * val_format - format filter value
  */
diff --git a/lib/hash.h b/lib/hash.h
index b30f7830..3c173958 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -215,6 +215,14 @@ mem_hash_mix(u64 *h, const void *p, uint s)
     *h = *h * multiplier + pp[i];
 }
 
+static inline void
+mem_hash_mix_str(u64 *h, const char *s)
+{
+  const u64 multiplier = 0xb38bc09a61202731ULL;
+  while (s)
+    *h = *h * multiplier + *s++;
+}
+
 static inline void
 mem_hash_mix_num(u64 *h, u64 val)
 {
diff --git a/nest/a-path.c b/nest/a-path.c
index c421b41f..aba2c86d 100644
--- a/nest/a-path.c
+++ b/nest/a-path.c
@@ -669,6 +669,29 @@ as_path_filter(struct linpool *pool, const struct adata *path, const struct f_va
   return res;
 }
 
+int
+as_path_compare(const struct adata *path1, const struct adata *path2)
+{
+  uint pos1 = 0;
+  uint pos2 = 0;
+  uint val1 = 0;
+  uint val2 = 0;
+
+  while (1)
+  {
+    int res1 = as_path_walk(path1, &pos1, &val1);
+    int res2 = as_path_walk(path2, &pos2, &val2);
+
+    if (res1 == 0 && res2 == 0)
+      return 0;
+
+    if (val1 == val2)
+      continue;
+
+    return val1 < val2 ? -1 : 1;
+  }
+}
+
 int
 as_path_walk(const struct adata *path, uint *pos, uint *val)
 {
diff --git a/nest/attrs.h b/nest/attrs.h
index fcd5ac16..aee3468b 100644
--- a/nest/attrs.h
+++ b/nest/attrs.h
@@ -51,6 +51,7 @@ u32 as_path_get_last_nonaggregated(const struct adata *path);
 int as_path_contains(const struct adata *path, u32 as, int min);
 int as_path_match_set(const struct adata *path, const struct f_tree *set);
 const struct adata *as_path_filter(struct linpool *pool, const struct adata *path, const struct f_val *set, int pos);
+int as_path_compare(const struct adata *path1, const struct adata *path2);
 int as_path_walk(const struct adata *path, uint *pos, uint *val);
 
 static inline struct adata *as_path_prepend(struct linpool *pool, const struct adata *path, u32 as)
@@ -238,6 +239,7 @@ int lc_set_max(const struct adata *list, lcomm *val);
 int int_set_walk(const struct adata *list, uint *pos, u32 *val);
 int ec_set_walk(const struct adata *list, uint *pos, u64 *val);
 int lc_set_walk(const struct adata *list, uint *pos, lcomm *val);
+int rte_set_walk(const struct adata *list, u32 *pos, struct rte **val);
 
 void ec_set_sort_x(struct adata *set); /* Sort in place */
 
diff --git a/nest/proto.c b/nest/proto.c
index bc7b7cc8..48ffade5 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -90,7 +90,6 @@ proto_log_state_change(struct proto *p)
     p->last_state_name_announced = NULL;
 }
 
-
 struct channel_config *
 proto_cf_find_channel(struct proto_config *pc, uint net_type)
 {
diff --git a/nest/protocol.h b/nest/protocol.h
index dad0b781..596e810e 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -39,6 +39,7 @@ struct symbol;
 
 enum protocol_class {
   PROTOCOL_NONE,
+  PROTOCOL_AGGREGATOR,
   PROTOCOL_BABEL,
   PROTOCOL_BFD,
   PROTOCOL_BGP,
@@ -103,7 +104,7 @@ void protos_dump_all(void);
 
 extern struct protocol
   proto_device, proto_radv, proto_rip, proto_static, proto_mrt,
-  proto_ospf, proto_perf,
+  proto_ospf, proto_perf, proto_aggregator,
   proto_pipe, proto_bgp, proto_bmp, proto_bfd, proto_babel, proto_rpki;
 
 /*
diff --git a/nest/route.h b/nest/route.h
index 42da5b19..641b1884 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -344,6 +344,8 @@ void rt_prune_sync(rtable *t, int all);
 int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed);
 struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
 
+int rte_same(rte *x, rte *y);
+
 static inline int rt_is_ip(rtable *tab)
 { return (tab->addr_type == NET_IP4) || (tab->addr_type == NET_IP6); }
 
@@ -476,7 +478,8 @@ typedef struct rta {
 #define RTS_BABEL 13			/* Babel route */
 #define RTS_RPKI 14			/* Route Origin Authorization */
 #define RTS_PERF 15			/* Perf checker */
-#define RTS_MAX 16
+#define RTS_AGGREGATED 16		/* Aggregated route */
+#define RTS_MAX 17
 
 #define RTD_NONE 0			/* Undefined next hop */
 #define RTD_UNICAST 1			/* Next hop is neighbor router */
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 69ef4542..c78291d4 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -75,6 +75,8 @@ const char * const rta_src_names[RTS_MAX] = {
   [RTS_PIPE]		= "pipe",
   [RTS_BABEL]		= "Babel",
   [RTS_RPKI]		= "RPKI",
+  [RTS_PERF]		= "Perf",
+  [RTS_AGGREGATED]	= "aggregated",
 };
 
 const char * rta_dest_names[RTD_MAX] = {
@@ -1272,7 +1274,8 @@ rta_dump(rta *a)
   static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
 			 "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",
 			 "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1",
-			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };
+			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL",
+			 "RTS_RPKI", "RTS_PERF", "RTS_AGGREGATED", };
   static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
 
   debug("pref=%d uc=%d %s %s%s h=%04x",
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 206fc6ef..d3ef231d 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -975,7 +975,6 @@ rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int
   return best;
 }
 
-
 static void
 rt_notify_merged(struct channel *c, net *net, rte *new_changed, rte *old_changed,
 		 rte *new_best, rte *old_best, int refeed)
diff --git a/proto/aggregator/Doc b/proto/aggregator/Doc
new file mode 100644
index 00000000..6111f2f1
--- /dev/null
+++ b/proto/aggregator/Doc
@@ -0,0 +1 @@
+S aggregator.c
diff --git a/proto/aggregator/Makefile b/proto/aggregator/Makefile
new file mode 100644
index 00000000..d1dae8dd
--- /dev/null
+++ b/proto/aggregator/Makefile
@@ -0,0 +1,6 @@
+src := aggregator.c
+obj := $(src-o-files)
+$(all-daemon)
+$(cf-local)
+
+tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
new file mode 100644
index 00000000..944d2f09
--- /dev/null
+++ b/proto/aggregator/aggregator.c
@@ -0,0 +1,808 @@
+/*
+ *	BIRD Internet Routing Daemon -- Route aggregation
+ *
+ *	(c) 2023--2023 Igor Putovny <igor.putovny@nic.cz>
+ *	(c) 2023       CZ.NIC, z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+/**
+ * DOC: Route aggregation
+ *
+ * This is an implementation of route aggregation functionality.
+ * It enables user to specify a set of route attributes in the configuarion file
+ * and then, for a given destination (net), aggregate routes with the same
+ * values of these attributes into a single multi-path route.
+ *
+ * Structure &channel contains pointer to aggregation list which is represented
+ * by &aggr_list_linearized. In rt_notify_aggregated(), attributes from this
+ * list are evaluated for every route of a given net and results are stored
+ * in &rte_val_list which contains pointer to this route and array of &f_val.
+ * Array of pointers to &rte_val_list entries is sorted using
+ * sort_rte_val_list(). For comparison of &f_val structures, val_compare()
+ * is used. Comparator function is written so that sorting is stable. If all
+ * attributes have the same values, routes are compared by their global IDs.
+ *
+ * After sorting, &rte_val_list entries containing equivalent routes will be
+ * adjacent to each other. Function process_rte_list() iterates through these
+ * entries to identify sequences of equivalent routes. New route will be
+ * created for each such sequence, even if only from a single route.
+ * Only attributes from the aggreagation list will be set for the new route.
+ * New &rta is created and prepare_rta() is used to copy static and dynamic
+ * attributes to new &rta from &rta of the original route. New route is created
+ * by create_merged_rte() from new &rta and exported to the routing table.
+ */
+
+#undef LOCAL_DEBUG
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include "nest/bird.h"
+#include "nest/iface.h"
+#include "filter/filter.h"
+#include "aggregator.h"
+
+#include <stdlib.h>
+/*
+#include "nest/route.h"
+#include "nest/iface.h"
+#include "lib/resource.h"
+#include "lib/event.h"
+#include "lib/timer.h"
+#include "lib/string.h"
+#include "conf/conf.h"
+#include "filter/filter.h"
+#include "filter/data.h"
+#include "lib/hash.h"
+#include "lib/string.h"
+#include "lib/alloca.h"
+#include "lib/flowspec.h"
+*/
+
+/*
+ * Set static attribute in @rta from static attribute in @old according to @sa.
+ */
+static void
+rta_set_static_attr(struct rta *rta, const struct rta *old, struct f_static_attr sa)
+{
+  switch (sa.sa_code)
+  {
+    case SA_NET:
+      break;
+
+    case SA_FROM:
+      rta->from = old->from;
+      break;
+
+    case SA_GW:
+      rta->dest = RTD_UNICAST;
+      rta->nh.gw = old->nh.gw;
+      rta->nh.iface = old->nh.iface;
+      rta->nh.next = NULL;
+      rta->hostentry = NULL;
+      rta->nh.labels = 0;
+      break;
+
+    case SA_SCOPE:
+      rta->scope = old->scope;
+      break;
+
+    case SA_DEST:
+      rta->dest = old->dest;
+      rta->nh.gw = IPA_NONE;
+      rta->nh.iface = NULL;
+      rta->nh.next = NULL;
+      rta->hostentry = NULL;
+      rta->nh.labels = 0;
+      break;
+
+    case SA_IFNAME:
+      rta->dest = RTD_UNICAST;
+      rta->nh.gw = IPA_NONE;
+      rta->nh.iface = old->nh.iface;
+      rta->nh.next = NULL;
+      rta->hostentry = NULL;
+      rta->nh.labels = 0;
+      break;
+
+    case SA_GW_MPLS:
+      rta->nh.labels = old->nh.labels;
+      memcpy(&rta->nh.label, &old->nh.label, sizeof(u32) * old->nh.labels);
+      break;
+
+    case SA_WEIGHT:
+      rta->nh.weight = old->nh.weight;
+      break;
+
+    case SA_PREF:
+      rta->pref = old->pref;
+      break;
+
+    default:
+      bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+  }
+}
+
+/*
+ * Compare list of &f_val entries.
+ * @count: number of &f_val entries
+ */
+static int
+same_val_list(const struct f_val *v1, const struct f_val *v2, uint len)
+{
+  for (uint i = 0; i < len; i++)
+    if (!val_same(&v1[i], &v2[i]))
+      return 0;
+
+  return 1;
+}
+
+/*
+ * Create and export new merged route.
+ * @old: first route in a sequence of equivalent routes that are to be merged
+ * @rte_val: first element in a sequence of equivalent rte_val_list entries
+ * @length: number of equivalent routes that are to be merged (at least 1)
+ * @ail: aggregation list
+ */
+static void
+aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net)
+{
+  /* Empty bucket */
+  if (!bucket->rte)
+  {
+    rte_update2(p->dst, net->n.addr, NULL, bucket->last_src);
+    bucket->last_src = NULL;
+    return;
+  }
+
+  /* Allocate RTA and EA list */
+  struct rta *rta = allocz(rta_size(bucket->rte->attrs));
+  rta->dest = RTD_UNREACHABLE;
+  rta->source = RTS_AGGREGATED;
+  rta->scope = SCOPE_UNIVERSE;
+
+  struct ea_list *eal = allocz(sizeof(struct ea_list) + sizeof(struct eattr) * p->aggr_on_da_count);
+  eal->next = NULL;
+  eal->count = 0;
+  rta->eattrs = eal;
+
+  /* Seed the attributes from aggregator rule */
+  for (uint i = 0; i < p->aggr_on_count; i++)
+  {
+    if (p->aggr_on[i].type == AGGR_ITEM_DYNAMIC_ATTR)
+    {
+      u32 ea_code = p->aggr_on[i].da.ea_code;
+      const struct eattr *e = ea_find(bucket->rte->attrs->eattrs, ea_code);
+
+      if (e)
+        eal->attrs[eal->count++] = *e;
+    }
+    else if (p->aggr_on[i].type == AGGR_ITEM_STATIC_ATTR)
+      rta_set_static_attr(rta, bucket->rte->attrs, p->aggr_on[i].sa);
+  }
+
+  struct rte *new = rte_get_temp(rta, bucket->rte->src);
+  new->net = net;
+
+  /*
+  log("=============== CREATE MERGED ROUTE ===============");
+  log("New route created: id = %d, protocol: %s", new->src->global_id, new->src->proto->name);
+  log("===================================================");
+  */
+
+  /* merge filter needs one argument called "routes" */
+  struct f_val val = {
+    .type = T_ROUTES_BLOCK,
+    .val.rte = bucket->rte,
+  };
+
+  struct lp_state tmp_state;
+  lp_save(tmp_linpool, &tmp_state);
+
+  /* Actually run the filter */
+  enum filter_return fret = f_eval_rte(p->merge_by, &new, tmp_linpool, 1, &val, 0);
+
+  /* Src must be stored now, rte_update2() may return new */
+  struct rte_src *new_src = new ? new->src : NULL;
+
+  /* Finally import the route */
+  switch (fret)
+  {
+    /* Pass the route to the protocol */
+    case F_ACCEPT:
+      rte_update2(p->dst, net->n.addr, new, bucket->last_src ?: new->src);
+      break;
+
+    /* Something bad happened */
+    default:
+      ASSERT_DIE(fret == F_ERROR);
+      /* fall through */
+
+    /* We actually don't want this route */
+    case F_REJECT:
+      if (bucket->last_src)
+	rte_update2(p->dst, net->n.addr, NULL, bucket->last_src);
+      break;
+  }
+
+  /* Switch source lock for bucket->last_src */
+  if (bucket->last_src != new_src)
+  {
+    if (new_src)
+      rt_lock_source(new_src);
+    if (bucket->last_src)
+      rt_unlock_source(bucket->last_src);
+
+    bucket->last_src = new_src;
+  }
+
+  lp_restore(tmp_linpool, &tmp_state);
+}
+
+/*
+ * Reload all the buckets on reconfiguration if merge filter has changed.
+ * TODO: make this splitted
+ */
+static void
+aggregator_reload_buckets(void *data)
+{
+  struct aggregator_proto *p = data;
+
+  HASH_WALK(p->buckets, next_hash, b)
+    if (b->rte)
+      aggregator_bucket_update(p, b, b->rte->net);
+  HASH_WALK_END;
+}
+
+
+/*
+ * Evaluate static attribute of @rt1 according to @sa
+ * and store result in @pos.
+ */
+static void
+eval_static_attr(const struct rte *rt1, struct f_static_attr sa, struct f_val *pos)
+{
+  const struct rta *rta = rt1->attrs;
+
+#define RESULT(_type, value, result)    \
+  do {                                  \
+    pos->type = _type;                  \
+    pos->val.value = result;            \
+  } while (0)
+
+  switch (sa.sa_code)
+  {
+    case SA_NET:	RESULT(sa.f_type, net, rt1->net->n.addr); break;
+    case SA_FROM:       RESULT(sa.f_type, ip, rta->from); break;
+    case SA_GW:	        RESULT(sa.f_type, ip, rta->nh.gw); break;
+    case SA_PROTO:	    RESULT(sa.f_type, s, rt1->src->proto->name); break;
+    case SA_SOURCE:	    RESULT(sa.f_type, i, rta->source); break;
+    case SA_SCOPE:	    RESULT(sa.f_type, i, rta->scope); break;
+    case SA_DEST:	    RESULT(sa.f_type, i, rta->dest); break;
+    case SA_IFNAME:	    RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
+    case SA_IFINDEX:	RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
+    case SA_WEIGHT:	    RESULT(sa.f_type, i, rta->nh.weight + 1); break;
+    case SA_PREF:	    RESULT(sa.f_type, i, rta->pref); break;
+    case SA_GW_MPLS:    RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
+    default:
+      bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+  }
+
+#undef RESULT
+}
+
+/*
+ * Evaluate dynamic attribute of @rt1 according to @da
+ * and store result in @pos.
+ */
+static void
+eval_dynamic_attr(const struct rte *rt1, struct f_dynamic_attr da, struct f_val *pos)
+{
+  const struct rta *rta = rt1->attrs;
+  const struct eattr *e = ea_find(rta->eattrs, da.ea_code);
+
+#define RESULT(_type, value, result)    \
+  do {                                  \
+    pos->type = _type;                  \
+    pos->val.value = result;            \
+  } while (0)
+
+#define RESULT_VOID         \
+  do {                      \
+    pos->type = T_VOID;     \
+  } while (0)
+
+  if (!e)
+  {
+    /* A special case: undefined as_path looks like empty as_path */
+    if (da.type == EAF_TYPE_AS_PATH)
+    {
+      RESULT(T_PATH, ad, &null_adata);
+      return;
+    }
+
+    /* The same special case for int_set */
+    if (da.type == EAF_TYPE_INT_SET)
+    {
+      RESULT(T_CLIST, ad, &null_adata);
+      return;
+    }
+
+    /* The same special case for ec_set */
+    if (da.type == EAF_TYPE_EC_SET)
+    {
+      RESULT(T_ECLIST, ad, &null_adata);
+      return;
+    }
+
+    /* The same special case for lc_set */
+    if (da.type == EAF_TYPE_LC_SET)
+    {
+      RESULT(T_LCLIST, ad, &null_adata);
+      return;
+    }
+
+    /* Undefined value */
+    RESULT_VOID;
+    return;
+  }
+
+  switch (e->type & EAF_TYPE_MASK)
+  {
+    case EAF_TYPE_INT:
+      RESULT(da.f_type, i, e->u.data);
+      break;
+    case EAF_TYPE_ROUTER_ID:
+      RESULT(T_QUAD, i, e->u.data);
+      break;
+    case EAF_TYPE_OPAQUE:
+      RESULT(T_ENUM_EMPTY, i, 0);
+      break;
+    case EAF_TYPE_IP_ADDRESS:
+      RESULT(T_IP, ip, *((ip_addr *) e->u.ptr->data));
+      break;
+    case EAF_TYPE_AS_PATH:
+      RESULT(T_PATH, ad, e->u.ptr);
+      break;
+    case EAF_TYPE_BITFIELD:
+      RESULT(T_BOOL, i, !!(e->u.data & (1u << da.bit)));
+      break;
+    case EAF_TYPE_INT_SET:
+      RESULT(T_CLIST, ad, e->u.ptr);
+      break;
+    case EAF_TYPE_EC_SET:
+      RESULT(T_ECLIST, ad, e->u.ptr);
+      break;
+    case EAF_TYPE_LC_SET:
+      RESULT(T_LCLIST, ad, e->u.ptr);
+      break;
+    default:
+      bug("Unknown dynamic attribute type");
+  }
+
+#undef RESULT
+#undef RESULT_VOID
+}
+
+static inline u32 aggr_route_hash(const rte *e)
+{
+  struct {
+    net *net;
+    struct rte_src *src;
+  } obj = {
+    .net = e->net,
+    .src = e->src,
+  };
+
+  return mem_hash(&obj, sizeof obj);
+}
+
+#define AGGR_RTE_KEY(n)			(&(n)->rte)
+#define AGGR_RTE_NEXT(n)		((n)->next_hash)
+#define AGGR_RTE_EQ(a,b)		(((a)->src == (b)->src) && ((a)->net == (b)->net))
+#define AGGR_RTE_FN(_n)			aggr_route_hash(_n)
+#define AGGR_RTE_ORDER			4 /* Initial */
+
+#define AGGR_RTE_REHASH			aggr_rte_rehash
+#define AGGR_RTE_PARAMS			/8, *2, 2, 2, 4, 24
+
+HASH_DEFINE_REHASH_FN(AGGR_RTE, struct aggregator_route);
+
+
+#define AGGR_BUCK_KEY(n)		(n)
+#define AGGR_BUCK_NEXT(n)		((n)->next_hash)
+#define AGGR_BUCK_EQ(a,b)		(((a)->hash == (b)->hash) && (same_val_list((a)->aggr_data, (b)->aggr_data, p->aggr_on_count)))
+#define AGGR_BUCK_FN(n)			((n)->hash)
+#define AGGR_BUCK_ORDER			4 /* Initial */
+
+#define AGGR_BUCK_REHASH		aggr_buck_rehash
+#define AGGR_BUCK_PARAMS		/8, *2, 2, 2, 4, 24
+
+HASH_DEFINE_REHASH_FN(AGGR_BUCK, struct aggregator_bucket);
+
+
+#define AGGR_DATA_MEMSIZE	(sizeof(struct f_val) * p->aggr_on_count)
+
+static void
+aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new, rte *old)
+{
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
+  ASSERT_DIE(src_ch == p->src);
+  struct aggregator_bucket *new_bucket = NULL, *old_bucket = NULL;
+  struct aggregator_route *old_route = NULL;
+
+  /* Find the objects for the old route */
+  if (old)
+    old_route = HASH_FIND(p->routes, AGGR_RTE, old);
+
+  if (old_route)
+    old_bucket = old_route->bucket;
+
+  /* Find the bucket for the new route */
+  if (new)
+  {
+    /* Routes are identical, do nothing */
+    if (old_route && rte_same(&old_route->rte, new))
+      return;
+
+    /* Evaluate route attributes. */
+    struct aggregator_bucket *tmp_bucket = sl_allocz(p->bucket_slab);
+    struct lp_state tmp_state;
+    lp_save(tmp_linpool, &tmp_state);
+
+    for (uint val_idx = 0; val_idx < p->aggr_on_count; val_idx++)
+    {
+      int type = p->aggr_on[val_idx].type;
+      struct f_val *pos = &tmp_bucket->aggr_data[val_idx];
+
+      switch (type)
+      {
+        case AGGR_ITEM_TERM: {
+          const struct f_line *line = p->aggr_on[val_idx].line;
+          struct rte *rt1 = new;
+          enum filter_return fret = f_eval_rte(line, &new, tmp_linpool, 0, NULL, pos);
+
+          if (rt1 != new)
+          {
+            rte_free(rt1);
+            log(L_WARN "Aggregator rule modifies the route, reverting");
+          }
+
+          if (fret > F_RETURN)
+            log(L_WARN "%s.%s: Wrong number of items left on stack after evaluation of aggregation list", rt1->src->proto->name, rt1->sender->name);
+
+	  switch (pos->type) {
+	    case T_VOID:
+	    case T_INT:
+	    case T_BOOL:
+	    case T_PAIR:
+	    case T_QUAD:
+	    case T_ENUM:
+	    case T_IP:
+	    case T_EC:
+	    case T_LC:
+	    case T_RD:
+	      /* Fits, OK */
+	      break;
+
+	    default:
+	      log(L_WARN "%s.%s: Expression evaluated to type %s unsupported by aggregator. Store this value as a custom attribute instead", new->src->proto->name, new->sender->name, f_type_name(pos->type));
+	      *pos = (struct f_val) { .type = T_INT, .val.i = 0 };
+	  }
+
+          break;
+        }
+
+        case AGGR_ITEM_STATIC_ATTR: {
+          eval_static_attr(new, p->aggr_on[val_idx].sa, pos);
+          break;
+        }
+
+        case AGGR_ITEM_DYNAMIC_ATTR: {
+          eval_dynamic_attr(new, p->aggr_on[val_idx].da, pos);
+          break;
+        }
+
+        default:
+          break;
+      }
+    }
+
+    /* Compute the hash */
+    u64 haux;
+    mem_hash_init(&haux);
+    for (uint i = 0; i < p->aggr_on_count; i++)
+    {
+      mem_hash_mix_num(&haux, tmp_bucket->aggr_data[i].type);
+
+#define MX(k) mem_hash_mix(&haux, &IT(k), sizeof IT(k));
+#define IT(k) tmp_bucket->aggr_data[i].val.k
+
+      switch (tmp_bucket->aggr_data[i].type)
+      {
+	case T_VOID:
+	  break;
+	case T_INT:
+	case T_BOOL:
+	case T_PAIR:
+	case T_QUAD:
+	case T_ENUM:
+	  MX(i);
+	  break;
+	case T_EC:
+	case T_RD:
+	  MX(ec);
+	  break;
+	case T_LC:
+	  MX(lc);
+	  break;
+	case T_IP:
+	  MX(ip);
+	  break;
+	case T_NET:
+	  mem_hash_mix_num(&haux, net_hash(IT(net)));
+	  break;
+	case T_STRING:
+	  mem_hash_mix_str(&haux, IT(s));
+	  break;
+	case T_PATH_MASK:
+	  mem_hash_mix(&haux, IT(path_mask), sizeof(*IT(path_mask)) + IT(path_mask)->len * sizeof (IT(path_mask)->item));
+	  break;
+	case T_PATH:
+	case T_CLIST:
+	case T_ECLIST:
+	case T_LCLIST:
+	case T_BYTESTRING:
+	  mem_hash_mix(&haux, IT(ad)->data, IT(ad)->length);
+	  break;
+	case T_NONE:
+	case T_PATH_MASK_ITEM:
+	case T_ROUTE:
+	case T_ROUTES_BLOCK:
+	  bug("Invalid type %s in hashing", f_type_name(tmp_bucket->aggr_data[i].type));
+	case T_SET:
+	  MX(t);
+	  break;
+	case T_PREFIX_SET:
+	  MX(ti);
+	  break;
+      }
+    }
+
+    tmp_bucket->hash = mem_hash_value(&haux);
+
+    /* Find the existing bucket */
+    if (new_bucket = HASH_FIND(p->buckets, AGGR_BUCK, tmp_bucket))
+      sl_free(tmp_bucket);
+    else
+    {
+      new_bucket = tmp_bucket;
+      HASH_INSERT2(p->buckets, AGGR_BUCK, p->p.pool, new_bucket);
+    }
+
+    /* Store the route attributes */
+    if (rta_is_cached(new->attrs))
+      rta_clone(new->attrs);
+    else
+      new->attrs = rta_lookup(new->attrs);
+
+    /* Insert the new route into the bucket */
+    struct aggregator_route *arte = sl_alloc(p->route_slab);
+    *arte = (struct aggregator_route) {
+      .bucket = new_bucket,
+      .rte = *new,
+    };
+    arte->rte.next = new_bucket->rte,
+    new_bucket->rte = &arte->rte;
+    new_bucket->count++;
+    HASH_INSERT2(p->routes, AGGR_RTE, p->p.pool, arte);
+
+    lp_restore(tmp_linpool, &tmp_state);
+  }
+
+  /* Remove the old route from its bucket */
+  if (old_bucket)
+  {
+    for (struct rte **k = &old_bucket->rte; *k; k = &(*k)->next)
+      if (*k == &old_route->rte)
+      {
+	*k = (*k)->next;
+	break;
+      }
+
+    old_bucket->count--;
+    HASH_REMOVE2(p->routes, AGGR_RTE, p->p.pool, old_route);
+    rta_free(old_route->rte.attrs);
+    sl_free(old_route);
+  }
+
+  /* Announce changes */
+  if (old_bucket)
+    aggregator_bucket_update(p, old_bucket, net);
+
+  if (new_bucket && (new_bucket != old_bucket))
+    aggregator_bucket_update(p, new_bucket, net);
+
+  /* Cleanup the old bucket if empty */
+  if (old_bucket && (!old_bucket->rte || !old_bucket->count))
+  {
+    ASSERT_DIE(!old_bucket->rte && !old_bucket->count);
+    HASH_REMOVE2(p->buckets, AGGR_BUCK, p->p.pool, old_bucket);
+    sl_free(old_bucket);
+  }
+}
+
+static int
+aggregator_preexport(struct channel *C, struct rte *new)
+{
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, C->proto);
+  /* Reject our own routes */
+  if (new->sender == p->dst)
+    return -1;
+
+  /* Disallow aggregating already aggregated routes */
+  if (new->attrs->source == RTS_AGGREGATED)
+  {
+    log(L_ERR "Multiple aggregations of the same route not supported in BIRD 2.");
+    return -1;
+  }
+
+  return 0;
+}
+
+static void
+aggregator_postconfig(struct proto_config *CF)
+{
+  struct aggregator_config *cf = SKIP_BACK(struct aggregator_config, c, CF);
+
+  if (!cf->dst->table)
+    cf_error("Source table not specified");
+
+  if (!cf->src->table)
+    cf_error("Destination table not specified");
+
+  if (cf->dst->table->addr_type != cf->src->table->addr_type)
+    cf_error("Both tables must be of the same type");
+
+  cf->dst->in_filter = cf->src->in_filter;
+
+  cf->src->in_filter = FILTER_REJECT;
+  cf->dst->out_filter = FILTER_REJECT;
+
+  cf->dst->debug = cf->src->debug;
+}
+
+static struct proto *
+aggregator_init(struct proto_config *CF)
+{
+  struct proto *P = proto_new(CF);
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
+  struct aggregator_config *cf = SKIP_BACK(struct aggregator_config, c, CF);
+
+  proto_configure_channel(P, &p->src, cf->src);
+  proto_configure_channel(P, &p->dst, cf->dst);
+
+  p->aggr_on_count = cf->aggr_on_count;
+  p->aggr_on_da_count = cf->aggr_on_da_count;
+  p->aggr_on = cf->aggr_on;
+  p->merge_by = cf->merge_by;
+
+  P->rt_notify = aggregator_rt_notify;
+  P->preexport = aggregator_preexport;
+
+  return P;
+}
+
+static int
+aggregator_start(struct proto *P)
+{
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
+
+  p->bucket_slab = sl_new(P->pool, sizeof(struct aggregator_bucket) + AGGR_DATA_MEMSIZE);
+  HASH_INIT(p->buckets, P->pool, AGGR_BUCK_ORDER);
+
+  p->route_slab = sl_new(P->pool, sizeof(struct aggregator_route));
+  HASH_INIT(p->routes, P->pool, AGGR_RTE_ORDER);
+
+  p->reload_buckets = (event) {
+    .hook = aggregator_reload_buckets,
+    .data = p,
+  };
+
+  return PS_UP;
+}
+
+static int
+aggregator_shutdown(struct proto *P)
+{
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
+
+  HASH_WALK_DELSAFE(p->buckets, next_hash, b)
+  {
+    while (b->rte)
+    {
+      struct aggregator_route *arte = SKIP_BACK(struct aggregator_route, rte, b->rte);
+      b->rte = arte->rte.next;
+      b->count--;
+      HASH_REMOVE(p->routes, AGGR_RTE, arte);
+      rta_free(arte->rte.attrs);
+      sl_free(arte);
+    }
+
+    ASSERT_DIE(b->count == 0);
+    HASH_REMOVE(p->buckets, AGGR_BUCK, b);
+    sl_free(b);
+  }
+  HASH_WALK_END;
+
+  return PS_DOWN;
+}
+
+static int
+aggregator_reconfigure(struct proto *P, struct proto_config *CF)
+{
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
+  struct aggregator_config *cf = SKIP_BACK(struct aggregator_config, c, CF);
+
+  TRACE(D_EVENTS, "Reconfiguring");
+
+  /* Compare numeric values (shortcut) */
+  if (cf->aggr_on_count != p->aggr_on_count)
+    return 0;
+
+  if (cf->aggr_on_da_count != p->aggr_on_da_count)
+    return 0;
+
+  /* Compare aggregator rule */
+  for (uint i = 0; i < p->aggr_on_count; i++)
+    switch (cf->aggr_on[i].type)
+    {
+      case AGGR_ITEM_TERM:
+	if (!f_same(cf->aggr_on[i].line, p->aggr_on[i].line))
+	  return 0;
+	break;
+      case AGGR_ITEM_STATIC_ATTR:
+	if (memcmp(&cf->aggr_on[i].sa, &p->aggr_on[i].sa, sizeof(struct f_static_attr)) != 0)
+	  return 0;
+	break;
+      case AGGR_ITEM_DYNAMIC_ATTR:
+	if (memcmp(&cf->aggr_on[i].da, &p->aggr_on[i].da, sizeof(struct f_dynamic_attr)) != 0)
+	  return 0;
+	break;
+      default:
+	bug("Broken aggregator rule");
+    }
+
+  /* Compare merge filter */
+  if (!f_same(cf->merge_by, p->merge_by))
+    ev_schedule(&p->reload_buckets);
+
+  p->aggr_on = cf->aggr_on;
+  p->merge_by = cf->merge_by;
+
+  return 1;
+}
+
+struct protocol proto_aggregator = {
+  .name =		"Aggregator",
+  .template =		"aggregator%d",
+  .class =		PROTOCOL_AGGREGATOR,
+  .preference =		1,
+  .channel_mask =	NB_ANY,
+  .proto_size =		sizeof(struct aggregator_proto),
+  .config_size =	sizeof(struct aggregator_config),
+  .postconfig =		aggregator_postconfig,
+  .init =		aggregator_init,
+  .start =		aggregator_start,
+  .shutdown =		aggregator_shutdown,
+  .reconfigure =	aggregator_reconfigure,
+};
+
+void
+aggregator_build(void)
+{
+  proto_build(&proto_aggregator);
+}
diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
new file mode 100644
index 00000000..19459b1d
--- /dev/null
+++ b/proto/aggregator/aggregator.h
@@ -0,0 +1,86 @@
+/*
+ *	BIRD -- Aggregator Pseudoprotocol
+ *
+ *	(c) 2023       Igor Putovny <igor.putovny@nic.cz>
+ *	(c) 2023       Maria Matejka <mq@ucw.cz>
+ *	(c) 2023       CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ *
+ *	This file contains the data structures used by Babel.
+ */
+
+#ifndef _BIRD_AGGREGATOR_H_
+#define _BIRD_AGGREGATOR_H_
+
+#include "nest/bird.h"
+#include "nest/protocol.h"
+#include "lib/hash.h"
+
+struct aggregator_config {
+  struct proto_config c;
+  struct channel_config *src, *dst;
+  uint aggr_on_count;
+  uint aggr_on_da_count;
+  struct aggr_item *aggr_on;
+  const struct f_line *merge_by;
+};
+
+struct aggregator_route {
+  struct aggregator_route *next_hash;
+  struct aggregator_bucket *bucket;
+  struct rte rte;
+};
+
+struct aggregator_bucket {
+  struct aggregator_bucket *next_hash;
+  struct rte *rte;			/* Pointer to struct aggregator_route.rte */
+  struct rte_src *last_src;		/* Which src we announced the bucket last with */
+  u32 count;
+  u32 hash;
+  struct f_val aggr_data[0];
+};
+
+struct aggregator_proto {
+  struct proto p;
+  struct channel *src, *dst;
+
+  /* Buckets by aggregator rule */
+  HASH(struct aggregator_bucket) buckets;
+  slab *bucket_slab;
+
+  /* Routes by net and src */
+  HASH(struct aggregator_route) routes;
+  slab *route_slab;
+
+  /* Aggregator rule */
+  uint aggr_on_count;
+  uint aggr_on_da_count;
+  struct aggr_item *aggr_on;
+
+  /* Merge filter */
+  const struct f_line *merge_by;
+  event reload_buckets;
+};
+
+enum aggr_item_type {
+  AGGR_ITEM_TERM,
+  AGGR_ITEM_STATIC_ATTR,
+  AGGR_ITEM_DYNAMIC_ATTR,
+};
+
+struct aggr_item {
+  enum aggr_item_type type;
+  union {
+    struct f_static_attr sa;
+    struct f_dynamic_attr da;
+    const struct f_line *line;
+  };
+};
+
+struct aggr_item_node {
+  const struct aggr_item_node *next;
+  struct aggr_item i;
+};
+
+#endif
diff --git a/proto/aggregator/config.Y b/proto/aggregator/config.Y
new file mode 100644
index 00000000..d7d9ae53
--- /dev/null
+++ b/proto/aggregator/config.Y
@@ -0,0 +1,134 @@
+/*
+ *	BIRD -- Aggregator configuration
+ *
+ *	(c) 2023       Igor Putovny <igor.putovny@nic.cz>
+ *	(c) 2023       Maria Matejka <mq@ucw.cz>
+ *	(c) 2023       CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+CF_HDR
+
+#include "proto/aggregator/aggregator.h"
+
+CF_DEFINES
+
+#define AGGREGATOR_CFG ((struct aggregator_config *) this_proto)
+#define AGGR_ITEM_ALLOC ((struct aggr_item_node *) cfg_allocz(sizeof(struct aggr_item_node)))
+
+
+CF_DECLS
+
+CF_KEYWORDS(AGGREGATOR, AGGREGATE, ON, MERGE, BY)
+
+%type <ai> aggr_item aggr_list
+
+CF_GRAMMAR
+
+proto: aggregator_proto ;
+
+aggregator_proto_start: proto_start AGGREGATOR
+{
+  this_proto = proto_config_new(&proto_aggregator, $1);
+  this_channel = AGGREGATOR_CFG->src = channel_config_new(NULL, "source", 0, this_proto);
+  AGGREGATOR_CFG->dst = channel_config_new(NULL, "destination", 0, this_proto);
+
+  AGGREGATOR_CFG->src->ra_mode = AGGREGATOR_CFG->dst->ra_mode = RA_ANY;
+};
+
+aggregator_proto_item:
+   proto_item
+ | channel_item_
+ | PEER TABLE rtable { AGGREGATOR_CFG->dst->table = $3; }
+ | AGGREGATE ON aggr_list {
+    if (AGGREGATOR_CFG->aggr_on)
+      cf_error("Only one aggregate on clause allowed");
+
+    _Bool net_present = 0;
+    int count = 0;
+
+    for (const struct aggr_item_node *item = $3; item; item = item->next) {
+//      log(L_WARN "type %d sacode %d", item->i.type, item->i.sa.sa_code);
+      if (item->i.type == AGGR_ITEM_STATIC_ATTR && item->i.sa.sa_code == SA_NET)
+	net_present = 1;
+
+      count++;
+    }
+
+   if (!net_present)
+     cf_error("'NET' must be present");
+
+   AGGREGATOR_CFG->aggr_on = cfg_alloc(sizeof(struct aggr_item) * count);
+
+   int pos = 0;
+   for (const struct aggr_item_node *item = $3; item; item = item->next) {
+     if (item->i.type == AGGR_ITEM_DYNAMIC_ATTR)
+       AGGREGATOR_CFG->aggr_on_da_count++;
+
+     AGGREGATOR_CFG->aggr_on[pos++] = item->i;
+   }
+
+   AGGREGATOR_CFG->aggr_on_count = pos;
+ }
+ | MERGE BY {
+   cf_push_block_scope(new_config);
+   f_predefined_variable(new_config, "routes", T_ROUTES_BLOCK);
+ } function_body {
+   cf_pop_block_scope(new_config);
+   $4->args++;	/* The predefined "routes" variable */
+   AGGREGATOR_CFG->merge_by = $4;
+ }
+;
+
+aggregator_proto_opts: /* empty */ | aggregator_proto_opts aggregator_proto_item ';' ;
+aggregator_proto: aggregator_proto_start proto_name '{' aggregator_proto_opts '}' ;
+
+
+aggr_list:
+   aggr_item
+ | aggr_list ',' aggr_item {
+       if ($3 == NULL) {
+         $$ = $1;
+       } else {
+         $$ = $3;
+         $$->next = $1;
+       }
+   }
+ ;
+
+aggr_item:
+   '(' term ')' {
+       $$ = AGGR_ITEM_ALLOC;
+       $$->i.type = AGGR_ITEM_TERM;
+       $$->i.line = f_linearize($2, 1);
+    }
+  | CF_SYM_KNOWN {
+      switch ($1->class) {
+        case SYM_ATTRIBUTE:
+          $$ = AGGR_ITEM_ALLOC;
+          $$->i.type = AGGR_ITEM_DYNAMIC_ATTR;
+          $$->i.da = *$1->attribute;
+          break;
+        case SYM_CONSTANT_RANGE:
+          $$ = NULL;
+          break;
+        default:
+          cf_error("Can't aggregate on symbol type %s.", cf_symbol_class_name($1));
+      }
+    }
+  | dynamic_attr {
+      $$ = AGGR_ITEM_ALLOC;
+      $$->i.type = AGGR_ITEM_DYNAMIC_ATTR;
+      $$->i.da = $1;
+    }
+  | static_attr {
+      $$ = AGGR_ITEM_ALLOC;
+      $$->i.type = AGGR_ITEM_STATIC_ATTR;
+      $$->i.sa = $1;
+    }
+  ;
+
+CF_CODE
+
+CF_END
diff --git a/proto/aggregator/test.conf b/proto/aggregator/test.conf
new file mode 100644
index 00000000..e5e1e267
--- /dev/null
+++ b/proto/aggregator/test.conf
@@ -0,0 +1,116 @@
+log "bird.log" all;
+
+protocol device {}
+
+protocol static {
+  ipv6;
+  route 2001:db8:0::/48 unreachable { bgp_path.prepend(65432); bgp_path.prepend(4200000000); };
+  route 2001:db8:1::/48 unreachable;
+  route 2001:db8:2::/48 unreachable;
+  route 2001:db8:3::/48 unreachable;
+  route 2001:db8:4::/48 unreachable;
+  route 2001:db8:5::/48 unreachable;
+  route 2001:db8:6::/48 unreachable;
+  route 2001:db8:7::/48 unreachable;
+  route 2001:db8:8::/48 unreachable;
+  route 2001:db8:9::/48 unreachable;
+  route 2001:db8:a::/48 unreachable;
+  route 2001:db8:b::/48 unreachable;
+  route 2001:db8:c::/48 unreachable;
+  route 2001:db8:d::/48 unreachable;
+  route 2001:db8:e::/48 unreachable;
+  route 2001:db8:f::/48 unreachable;
+}
+
+protocol static {
+  ipv6 {
+    import filter {
+      bgp_med = 1;
+      bgp_community = -empty-.add((65533,1)).add((65500,0xe));
+      accept;
+    };
+  };
+  route 2001:db8:1::/48 unreachable;
+  route 2001:db8:3::/48 unreachable;
+  route 2001:db8:5::/48 unreachable;
+  route 2001:db8:7::/48 unreachable;
+  route 2001:db8:9::/48 unreachable;
+  route 2001:db8:b::/48 unreachable;
+  route 2001:db8:d::/48 unreachable;
+  route 2001:db8:f::/48 unreachable;
+}
+
+protocol static {
+  ipv6 {
+    import filter {
+      bgp_med = 2;
+      bgp_community = -empty-.add((65533,2)).add((65500,0xd));
+      accept;
+    };
+  };
+  route 2001:db8:2::/48 unreachable;
+  route 2001:db8:3::/48 unreachable;
+  route 2001:db8:6::/48 unreachable;
+  route 2001:db8:7::/48 unreachable;
+  route 2001:db8:a::/48 unreachable;
+  route 2001:db8:b::/48 unreachable;
+  route 2001:db8:e::/48 unreachable;
+  route 2001:db8:f::/48 unreachable;
+}
+
+protocol static {
+  ipv6 {
+    import filter {
+      bgp_med = 4;
+      bgp_community = -empty-.add((65533,4)).add((65500,0xb));
+      accept;
+    };
+  };
+  route 2001:db8:4::/48 unreachable;
+  route 2001:db8:5::/48 unreachable;
+  route 2001:db8:6::/48 unreachable;
+  route 2001:db8:7::/48 unreachable;
+  route 2001:db8:c::/48 unreachable;
+  route 2001:db8:d::/48 unreachable;
+  route 2001:db8:e::/48 unreachable;
+  route 2001:db8:f::/48 unreachable;
+}
+
+protocol static {
+  ipv6 {
+    import filter {
+      bgp_med = 8;
+      bgp_community = -empty-.add((65533,8)).add((65500,0x7));
+      accept;
+    };
+  };
+  route 2001:db8:8::/48 unreachable;
+  route 2001:db8:9::/48 unreachable;
+  route 2001:db8:a::/48 unreachable;
+  route 2001:db8:b::/48 unreachable;
+  route 2001:db8:c::/48 unreachable;
+  route 2001:db8:d::/48 unreachable;
+  route 2001:db8:e::/48 unreachable;
+  route 2001:db8:f::/48 unreachable;
+}
+
+ipv6 table agr_result;
+
+protocol aggregator {
+  table master6;
+  peer table agr_result;
+  export all;
+  aggregate on net,(defined(bgp_med));
+  merge by {
+    print "Merging all these: ", routes;
+    bgp_med = 0;
+    for route r in routes do {
+      if ! defined(r.bgp_med) then { unset(bgp_med); accept; }
+
+      print r, " bgp_med: ", r.bgp_med;
+      bgp_med = bgp_med + r.bgp_med;
+      bgp_community = bgp_community.add(r.bgp_community);
+    }
+    accept;
+  };
+}

From c103b51fcae0181595b49cdcda4544cfe0603f55 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 31 Oct 2023 11:37:54 +0100
Subject: [PATCH 376/431] Aggregator: Expressed most of the attribute logic in
 filter language

---
 proto/aggregator/aggregator.c | 396 +++-------------------------------
 proto/aggregator/aggregator.h |  32 +--
 proto/aggregator/config.Y     | 124 +++++------
 proto/aggregator/test.conf    |   2 +-
 4 files changed, 101 insertions(+), 453 deletions(-)

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 944d2f09..03d7bbf9 100644
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -46,85 +46,6 @@
 #include "aggregator.h"
 
 #include <stdlib.h>
-/*
-#include "nest/route.h"
-#include "nest/iface.h"
-#include "lib/resource.h"
-#include "lib/event.h"
-#include "lib/timer.h"
-#include "lib/string.h"
-#include "conf/conf.h"
-#include "filter/filter.h"
-#include "filter/data.h"
-#include "lib/hash.h"
-#include "lib/string.h"
-#include "lib/alloca.h"
-#include "lib/flowspec.h"
-*/
-
-/*
- * Set static attribute in @rta from static attribute in @old according to @sa.
- */
-static void
-rta_set_static_attr(struct rta *rta, const struct rta *old, struct f_static_attr sa)
-{
-  switch (sa.sa_code)
-  {
-    case SA_NET:
-      break;
-
-    case SA_FROM:
-      rta->from = old->from;
-      break;
-
-    case SA_GW:
-      rta->dest = RTD_UNICAST;
-      rta->nh.gw = old->nh.gw;
-      rta->nh.iface = old->nh.iface;
-      rta->nh.next = NULL;
-      rta->hostentry = NULL;
-      rta->nh.labels = 0;
-      break;
-
-    case SA_SCOPE:
-      rta->scope = old->scope;
-      break;
-
-    case SA_DEST:
-      rta->dest = old->dest;
-      rta->nh.gw = IPA_NONE;
-      rta->nh.iface = NULL;
-      rta->nh.next = NULL;
-      rta->hostentry = NULL;
-      rta->nh.labels = 0;
-      break;
-
-    case SA_IFNAME:
-      rta->dest = RTD_UNICAST;
-      rta->nh.gw = IPA_NONE;
-      rta->nh.iface = old->nh.iface;
-      rta->nh.next = NULL;
-      rta->hostentry = NULL;
-      rta->nh.labels = 0;
-      break;
-
-    case SA_GW_MPLS:
-      rta->nh.labels = old->nh.labels;
-      memcpy(&rta->nh.label, &old->nh.label, sizeof(u32) * old->nh.labels);
-      break;
-
-    case SA_WEIGHT:
-      rta->nh.weight = old->nh.weight;
-      break;
-
-    case SA_PREF:
-      rta->pref = old->pref;
-      break;
-
-    default:
-      bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
-  }
-}
 
 /*
  * Compare list of &f_val entries.
@@ -158,35 +79,23 @@ aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *b
     return;
   }
 
-  /* Allocate RTA and EA list */
+  /* Store TMP linpool state */
+  struct lp_state tmp_state;
+  lp_save(tmp_linpool, &tmp_state);
+
+  /* Allocate RTA */
   struct rta *rta = allocz(rta_size(bucket->rte->attrs));
   rta->dest = RTD_UNREACHABLE;
   rta->source = RTS_AGGREGATED;
   rta->scope = SCOPE_UNIVERSE;
 
-  struct ea_list *eal = allocz(sizeof(struct ea_list) + sizeof(struct eattr) * p->aggr_on_da_count);
-  eal->next = NULL;
-  eal->count = 0;
-  rta->eattrs = eal;
-
-  /* Seed the attributes from aggregator rule */
-  for (uint i = 0; i < p->aggr_on_count; i++)
-  {
-    if (p->aggr_on[i].type == AGGR_ITEM_DYNAMIC_ATTR)
-    {
-      u32 ea_code = p->aggr_on[i].da.ea_code;
-      const struct eattr *e = ea_find(bucket->rte->attrs->eattrs, ea_code);
-
-      if (e)
-        eal->attrs[eal->count++] = *e;
-    }
-    else if (p->aggr_on[i].type == AGGR_ITEM_STATIC_ATTR)
-      rta_set_static_attr(rta, bucket->rte->attrs, p->aggr_on[i].sa);
-  }
-
+  /* Allocate route */
   struct rte *new = rte_get_temp(rta, bucket->rte->src);
   new->net = net;
 
+  /* Seed the attributes from aggregator rule */
+  f_eval_rte(p->premerge, &new, tmp_linpool, p->aggr_on_count, bucket->aggr_data, 0, NULL);
+
   /*
   log("=============== CREATE MERGED ROUTE ===============");
   log("New route created: id = %d, protocol: %s", new->src->global_id, new->src->proto->name);
@@ -199,11 +108,8 @@ aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *b
     .val.rte = bucket->rte,
   };
 
-  struct lp_state tmp_state;
-  lp_save(tmp_linpool, &tmp_state);
-
-  /* Actually run the filter */
-  enum filter_return fret = f_eval_rte(p->merge_by, &new, tmp_linpool, 1, &val, 0);
+  /* Actually run the merge rule */
+  enum filter_return fret = f_eval_rte(p->merge_by, &new, tmp_linpool, 1, &val, 0, NULL);
 
   /* Src must be stored now, rte_update2() may return new */
   struct rte_src *new_src = new ? new->src : NULL;
@@ -257,136 +163,6 @@ aggregator_reload_buckets(void *data)
   HASH_WALK_END;
 }
 
-
-/*
- * Evaluate static attribute of @rt1 according to @sa
- * and store result in @pos.
- */
-static void
-eval_static_attr(const struct rte *rt1, struct f_static_attr sa, struct f_val *pos)
-{
-  const struct rta *rta = rt1->attrs;
-
-#define RESULT(_type, value, result)    \
-  do {                                  \
-    pos->type = _type;                  \
-    pos->val.value = result;            \
-  } while (0)
-
-  switch (sa.sa_code)
-  {
-    case SA_NET:	RESULT(sa.f_type, net, rt1->net->n.addr); break;
-    case SA_FROM:       RESULT(sa.f_type, ip, rta->from); break;
-    case SA_GW:	        RESULT(sa.f_type, ip, rta->nh.gw); break;
-    case SA_PROTO:	    RESULT(sa.f_type, s, rt1->src->proto->name); break;
-    case SA_SOURCE:	    RESULT(sa.f_type, i, rta->source); break;
-    case SA_SCOPE:	    RESULT(sa.f_type, i, rta->scope); break;
-    case SA_DEST:	    RESULT(sa.f_type, i, rta->dest); break;
-    case SA_IFNAME:	    RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
-    case SA_IFINDEX:	RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
-    case SA_WEIGHT:	    RESULT(sa.f_type, i, rta->nh.weight + 1); break;
-    case SA_PREF:	    RESULT(sa.f_type, i, rta->pref); break;
-    case SA_GW_MPLS:    RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
-    default:
-      bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
-  }
-
-#undef RESULT
-}
-
-/*
- * Evaluate dynamic attribute of @rt1 according to @da
- * and store result in @pos.
- */
-static void
-eval_dynamic_attr(const struct rte *rt1, struct f_dynamic_attr da, struct f_val *pos)
-{
-  const struct rta *rta = rt1->attrs;
-  const struct eattr *e = ea_find(rta->eattrs, da.ea_code);
-
-#define RESULT(_type, value, result)    \
-  do {                                  \
-    pos->type = _type;                  \
-    pos->val.value = result;            \
-  } while (0)
-
-#define RESULT_VOID         \
-  do {                      \
-    pos->type = T_VOID;     \
-  } while (0)
-
-  if (!e)
-  {
-    /* A special case: undefined as_path looks like empty as_path */
-    if (da.type == EAF_TYPE_AS_PATH)
-    {
-      RESULT(T_PATH, ad, &null_adata);
-      return;
-    }
-
-    /* The same special case for int_set */
-    if (da.type == EAF_TYPE_INT_SET)
-    {
-      RESULT(T_CLIST, ad, &null_adata);
-      return;
-    }
-
-    /* The same special case for ec_set */
-    if (da.type == EAF_TYPE_EC_SET)
-    {
-      RESULT(T_ECLIST, ad, &null_adata);
-      return;
-    }
-
-    /* The same special case for lc_set */
-    if (da.type == EAF_TYPE_LC_SET)
-    {
-      RESULT(T_LCLIST, ad, &null_adata);
-      return;
-    }
-
-    /* Undefined value */
-    RESULT_VOID;
-    return;
-  }
-
-  switch (e->type & EAF_TYPE_MASK)
-  {
-    case EAF_TYPE_INT:
-      RESULT(da.f_type, i, e->u.data);
-      break;
-    case EAF_TYPE_ROUTER_ID:
-      RESULT(T_QUAD, i, e->u.data);
-      break;
-    case EAF_TYPE_OPAQUE:
-      RESULT(T_ENUM_EMPTY, i, 0);
-      break;
-    case EAF_TYPE_IP_ADDRESS:
-      RESULT(T_IP, ip, *((ip_addr *) e->u.ptr->data));
-      break;
-    case EAF_TYPE_AS_PATH:
-      RESULT(T_PATH, ad, e->u.ptr);
-      break;
-    case EAF_TYPE_BITFIELD:
-      RESULT(T_BOOL, i, !!(e->u.data & (1u << da.bit)));
-      break;
-    case EAF_TYPE_INT_SET:
-      RESULT(T_CLIST, ad, e->u.ptr);
-      break;
-    case EAF_TYPE_EC_SET:
-      RESULT(T_ECLIST, ad, e->u.ptr);
-      break;
-    case EAF_TYPE_LC_SET:
-      RESULT(T_LCLIST, ad, e->u.ptr);
-      break;
-    default:
-      bug("Unknown dynamic attribute type");
-  }
-
-#undef RESULT
-#undef RESULT_VOID
-}
-
 static inline u32 aggr_route_hash(const rte *e)
 {
   struct {
@@ -453,125 +229,29 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new
     struct lp_state tmp_state;
     lp_save(tmp_linpool, &tmp_state);
 
-    for (uint val_idx = 0; val_idx < p->aggr_on_count; val_idx++)
+    struct rte *rt1 = new;
+    enum filter_return fret = f_eval_rte(p->aggr_on, &new, tmp_linpool, 0, NULL, p->aggr_on_count, tmp_bucket->aggr_data);
+
+    if (rt1 != new)
     {
-      int type = p->aggr_on[val_idx].type;
-      struct f_val *pos = &tmp_bucket->aggr_data[val_idx];
+      rte_free(rt1);
+      log(L_WARN "Aggregator rule modifies the route, reverting");
+    }
 
-      switch (type)
-      {
-        case AGGR_ITEM_TERM: {
-          const struct f_line *line = p->aggr_on[val_idx].line;
-          struct rte *rt1 = new;
-          enum filter_return fret = f_eval_rte(line, &new, tmp_linpool, 0, NULL, pos);
+    /* Check filter return value */
+    if (fret > F_RETURN)
+    {
+      sl_free(tmp_bucket);
+      lp_restore(tmp_linpool, &tmp_state);
 
-          if (rt1 != new)
-          {
-            rte_free(rt1);
-            log(L_WARN "Aggregator rule modifies the route, reverting");
-          }
-
-          if (fret > F_RETURN)
-            log(L_WARN "%s.%s: Wrong number of items left on stack after evaluation of aggregation list", rt1->src->proto->name, rt1->sender->name);
-
-	  switch (pos->type) {
-	    case T_VOID:
-	    case T_INT:
-	    case T_BOOL:
-	    case T_PAIR:
-	    case T_QUAD:
-	    case T_ENUM:
-	    case T_IP:
-	    case T_EC:
-	    case T_LC:
-	    case T_RD:
-	      /* Fits, OK */
-	      break;
-
-	    default:
-	      log(L_WARN "%s.%s: Expression evaluated to type %s unsupported by aggregator. Store this value as a custom attribute instead", new->src->proto->name, new->sender->name, f_type_name(pos->type));
-	      *pos = (struct f_val) { .type = T_INT, .val.i = 0 };
-	  }
-
-          break;
-        }
-
-        case AGGR_ITEM_STATIC_ATTR: {
-          eval_static_attr(new, p->aggr_on[val_idx].sa, pos);
-          break;
-        }
-
-        case AGGR_ITEM_DYNAMIC_ATTR: {
-          eval_dynamic_attr(new, p->aggr_on[val_idx].da, pos);
-          break;
-        }
-
-        default:
-          break;
-      }
+      return;
     }
 
     /* Compute the hash */
     u64 haux;
     mem_hash_init(&haux);
     for (uint i = 0; i < p->aggr_on_count; i++)
-    {
-      mem_hash_mix_num(&haux, tmp_bucket->aggr_data[i].type);
-
-#define MX(k) mem_hash_mix(&haux, &IT(k), sizeof IT(k));
-#define IT(k) tmp_bucket->aggr_data[i].val.k
-
-      switch (tmp_bucket->aggr_data[i].type)
-      {
-	case T_VOID:
-	  break;
-	case T_INT:
-	case T_BOOL:
-	case T_PAIR:
-	case T_QUAD:
-	case T_ENUM:
-	  MX(i);
-	  break;
-	case T_EC:
-	case T_RD:
-	  MX(ec);
-	  break;
-	case T_LC:
-	  MX(lc);
-	  break;
-	case T_IP:
-	  MX(ip);
-	  break;
-	case T_NET:
-	  mem_hash_mix_num(&haux, net_hash(IT(net)));
-	  break;
-	case T_STRING:
-	  mem_hash_mix_str(&haux, IT(s));
-	  break;
-	case T_PATH_MASK:
-	  mem_hash_mix(&haux, IT(path_mask), sizeof(*IT(path_mask)) + IT(path_mask)->len * sizeof (IT(path_mask)->item));
-	  break;
-	case T_PATH:
-	case T_CLIST:
-	case T_ECLIST:
-	case T_LCLIST:
-	case T_BYTESTRING:
-	  mem_hash_mix(&haux, IT(ad)->data, IT(ad)->length);
-	  break;
-	case T_NONE:
-	case T_PATH_MASK_ITEM:
-	case T_ROUTE:
-	case T_ROUTES_BLOCK:
-	  bug("Invalid type %s in hashing", f_type_name(tmp_bucket->aggr_data[i].type));
-	case T_SET:
-	  MX(t);
-	  break;
-	case T_PREFIX_SET:
-	  MX(ti);
-	  break;
-      }
-    }
-
+      mem_hash_mix_f_val(&haux, &tmp_bucket->aggr_data[i]);
     tmp_bucket->hash = mem_hash_value(&haux);
 
     /* Find the existing bucket */
@@ -686,8 +366,8 @@ aggregator_init(struct proto_config *CF)
   proto_configure_channel(P, &p->dst, cf->dst);
 
   p->aggr_on_count = cf->aggr_on_count;
-  p->aggr_on_da_count = cf->aggr_on_da_count;
   p->aggr_on = cf->aggr_on;
+  p->premerge = cf->premerge;
   p->merge_by = cf->merge_by;
 
   P->rt_notify = aggregator_rt_notify;
@@ -753,34 +433,16 @@ aggregator_reconfigure(struct proto *P, struct proto_config *CF)
   if (cf->aggr_on_count != p->aggr_on_count)
     return 0;
 
-  if (cf->aggr_on_da_count != p->aggr_on_da_count)
-    return 0;
-
   /* Compare aggregator rule */
-  for (uint i = 0; i < p->aggr_on_count; i++)
-    switch (cf->aggr_on[i].type)
-    {
-      case AGGR_ITEM_TERM:
-	if (!f_same(cf->aggr_on[i].line, p->aggr_on[i].line))
-	  return 0;
-	break;
-      case AGGR_ITEM_STATIC_ATTR:
-	if (memcmp(&cf->aggr_on[i].sa, &p->aggr_on[i].sa, sizeof(struct f_static_attr)) != 0)
-	  return 0;
-	break;
-      case AGGR_ITEM_DYNAMIC_ATTR:
-	if (memcmp(&cf->aggr_on[i].da, &p->aggr_on[i].da, sizeof(struct f_dynamic_attr)) != 0)
-	  return 0;
-	break;
-      default:
-	bug("Broken aggregator rule");
-    }
+  if (!f_same(cf->aggr_on, p->aggr_on) || !f_same(cf->premerge, p->premerge))
+    return 0;
 
   /* Compare merge filter */
   if (!f_same(cf->merge_by, p->merge_by))
     ev_schedule(&p->reload_buckets);
 
   p->aggr_on = cf->aggr_on;
+  p->premerge = cf->premerge;
   p->merge_by = cf->merge_by;
 
   return 1;
diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
index 19459b1d..7155b19b 100644
--- a/proto/aggregator/aggregator.h
+++ b/proto/aggregator/aggregator.h
@@ -20,10 +20,11 @@
 struct aggregator_config {
   struct proto_config c;
   struct channel_config *src, *dst;
-  uint aggr_on_count;
-  uint aggr_on_da_count;
-  struct aggr_item *aggr_on;
+  const struct f_line *aggr_on;
+  const struct f_line *premerge;
   const struct f_line *merge_by;
+  uint aggr_on_count;
+  u8 aggr_on_net;
 };
 
 struct aggregator_route {
@@ -54,33 +55,14 @@ struct aggregator_proto {
   slab *route_slab;
 
   /* Aggregator rule */
+  const struct f_line *aggr_on;
   uint aggr_on_count;
-  uint aggr_on_da_count;
-  struct aggr_item *aggr_on;
+  u8 aggr_on_net;
 
   /* Merge filter */
+  const struct f_line *premerge;
   const struct f_line *merge_by;
   event reload_buckets;
 };
 
-enum aggr_item_type {
-  AGGR_ITEM_TERM,
-  AGGR_ITEM_STATIC_ATTR,
-  AGGR_ITEM_DYNAMIC_ATTR,
-};
-
-struct aggr_item {
-  enum aggr_item_type type;
-  union {
-    struct f_static_attr sa;
-    struct f_dynamic_attr da;
-    const struct f_line *line;
-  };
-};
-
-struct aggr_item_node {
-  const struct aggr_item_node *next;
-  struct aggr_item i;
-};
-
 #endif
diff --git a/proto/aggregator/config.Y b/proto/aggregator/config.Y
index d7d9ae53..ba4eb9c4 100644
--- a/proto/aggregator/config.Y
+++ b/proto/aggregator/config.Y
@@ -17,12 +17,11 @@ CF_DEFINES
 #define AGGREGATOR_CFG ((struct aggregator_config *) this_proto)
 #define AGGR_ITEM_ALLOC ((struct aggr_item_node *) cfg_allocz(sizeof(struct aggr_item_node)))
 
-
 CF_DECLS
 
 CF_KEYWORDS(AGGREGATOR, AGGREGATE, ON, MERGE, BY)
 
-%type <ai> aggr_item aggr_list
+%type <xp> aggr_item aggr_list
 
 CF_GRAMMAR
 
@@ -41,42 +40,31 @@ aggregator_proto_item:
    proto_item
  | channel_item_
  | PEER TABLE rtable { AGGREGATOR_CFG->dst->table = $3; }
- | AGGREGATE ON aggr_list {
+ | AGGREGATE ON {
     if (AGGREGATOR_CFG->aggr_on)
       cf_error("Only one aggregate on clause allowed");
 
-    _Bool net_present = 0;
-    int count = 0;
+    cf_push_block_scope(new_config);
+ } aggr_list {
+    int count = new_config->current_scope->slots;
+    cf_pop_block_scope(new_config);
 
-    for (const struct aggr_item_node *item = $3; item; item = item->next) {
-//      log(L_WARN "type %d sacode %d", item->i.type, item->i.sa.sa_code);
-      if (item->i.type == AGGR_ITEM_STATIC_ATTR && item->i.sa.sa_code == SA_NET)
-	net_present = 1;
+    if (!AGGREGATOR_CFG->aggr_on_net)
+      cf_error("aggregate on must be always include 'net'.");
 
-      count++;
-    }
+   AGGREGATOR_CFG->aggr_on_count = count;
+   AGGREGATOR_CFG->aggr_on = f_linearize($4.begin, count);
 
-   if (!net_present)
-     cf_error("'NET' must be present");
-
-   AGGREGATOR_CFG->aggr_on = cfg_alloc(sizeof(struct aggr_item) * count);
-
-   int pos = 0;
-   for (const struct aggr_item_node *item = $3; item; item = item->next) {
-     if (item->i.type == AGGR_ITEM_DYNAMIC_ATTR)
-       AGGREGATOR_CFG->aggr_on_da_count++;
-
-     AGGREGATOR_CFG->aggr_on[pos++] = item->i;
-   }
-
-   AGGREGATOR_CFG->aggr_on_count = pos;
+   struct f_line *premerge = f_linearize($4.end, 0);
+   premerge->args = count;
+   AGGREGATOR_CFG->premerge = premerge;
  }
  | MERGE BY {
    cf_push_block_scope(new_config);
    f_predefined_variable(new_config, "routes", T_ROUTES_BLOCK);
  } function_body {
    cf_pop_block_scope(new_config);
-   $4->args++;	/* The predefined "routes" variable */
+   $4->args++;
    AGGREGATOR_CFG->merge_by = $4;
  }
 ;
@@ -88,45 +76,61 @@ aggregator_proto: aggregator_proto_start proto_name '{' aggregator_proto_opts '}
 aggr_list:
    aggr_item
  | aggr_list ',' aggr_item {
-       if ($3 == NULL) {
-         $$ = $1;
-       } else {
-         $$ = $3;
-         $$->next = $1;
-       }
-   }
+    if ($$.begin = $3.begin)
+      $$.begin->next = $1.begin;
+    else
+      $$.begin = $1.begin;
+
+    if ($$.end = $3.end)
+      $$.end->next = $1.end;
+    else
+      $$.end = $1.end;
+ }
  ;
 
 aggr_item:
    '(' term ')' {
-       $$ = AGGR_ITEM_ALLOC;
-       $$->i.type = AGGR_ITEM_TERM;
-       $$->i.line = f_linearize($2, 1);
-    }
-  | CF_SYM_KNOWN {
-      switch ($1->class) {
-        case SYM_ATTRIBUTE:
-          $$ = AGGR_ITEM_ALLOC;
-          $$->i.type = AGGR_ITEM_DYNAMIC_ATTR;
-          $$->i.da = *$1->attribute;
-          break;
-        case SYM_CONSTANT_RANGE:
-          $$ = NULL;
-          break;
-        default:
-          cf_error("Can't aggregate on symbol type %s.", cf_symbol_class_name($1));
-      }
-    }
-  | dynamic_attr {
-      $$ = AGGR_ITEM_ALLOC;
-      $$->i.type = AGGR_ITEM_DYNAMIC_ATTR;
-      $$->i.da = $1;
-    }
-  | static_attr {
-      $$ = AGGR_ITEM_ALLOC;
-      $$->i.type = AGGR_ITEM_STATIC_ATTR;
-      $$->i.sa = $1;
+     switch ($2->type) {
+       case T_INT:
+       case T_BOOL:
+       case T_PAIR:
+       case T_QUAD:
+       case T_ENUM:
+       case T_IP:
+       case T_EC:
+       case T_LC:
+       case T_RD:
+	 /* Fits, OK */
+	 break;
+
+       default:
+	 cf_error("Expression evaluated to type %s unsupported by aggregator. Store this value as a custom attribute instead", f_type_name($2->type));
+     }
+
+     $$.begin = $2;
+     $$.end = NULL;
+     f_new_var(new_config->current_scope);
+   }
+  | lvalue {
+    $$.begin = f_lval_getter(&$1);
+    int vari = f_new_var(new_config->current_scope);
+
+    if ($1.type == F_LVAL_SA && $1.sa.sa_code == SA_NET)
+      AGGREGATOR_CFG->aggr_on_net = 1;
+    if (($1.type == F_LVAL_CONSTANT) || 
+	($1.type == F_LVAL_SA && $1.sa.readonly))
+      $$.end = NULL;
+    else
+    {
+      char varname[12];
+      bsnprintf(varname, 12, "!aggr%d", vari);
+      $$.end = f_lval_setter(&$1,
+	  f_new_inst(FI_VAR_GET, cf_define_symbol(
+	      new_config, cf_get_symbol(new_config, varname),
+	      SYM_VARIABLE | $$.begin->type, offset, vari
+	      )));
     }
+  }
   ;
 
 CF_CODE
diff --git a/proto/aggregator/test.conf b/proto/aggregator/test.conf
index e5e1e267..ec7afc4f 100644
--- a/proto/aggregator/test.conf
+++ b/proto/aggregator/test.conf
@@ -100,7 +100,7 @@ protocol aggregator {
   table master6;
   peer table agr_result;
   export all;
-  aggregate on net,(defined(bgp_med));
+  aggregate on net,(defined(bgp_med)), (1 + 3 + 5 + 7), preference, dest;
   merge by {
     print "Merging all these: ", routes;
     bgp_med = 0;

From b95822895312ba998253a8fb03a879cc3265887d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 10:57:43 +0100
Subject: [PATCH 377/431] Aggregator: Fixed bugs in filter usage

---
 nest/rt-table.c            |  2 +-
 proto/aggregator/config.Y  | 11 ++++++++++-
 proto/aggregator/test.conf | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index d3ef231d..a8f6226d 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1210,7 +1210,7 @@ rte_same(rte *x, rte *y)
 {
   /* rte.flags / rte.pflags are not checked, as they are internal to rtable */
   return
-    (
+    (x == y) || (
      (x->attrs == y->attrs) ||
      ((!x->attrs->cached || !y->attrs->cached) && rta_same(x->attrs, y->attrs))
     ) &&
diff --git a/proto/aggregator/config.Y b/proto/aggregator/config.Y
index ba4eb9c4..93d7cb57 100644
--- a/proto/aggregator/config.Y
+++ b/proto/aggregator/config.Y
@@ -52,8 +52,17 @@ aggregator_proto_item:
     if (!AGGREGATOR_CFG->aggr_on_net)
       cf_error("aggregate on must be always include 'net'.");
 
+   struct f_inst *rot = NULL;
+   while ($4.begin)
+   {
+     struct f_inst *tmp = $4.begin->next;
+     $4.begin->next = rot;
+     rot = $4.begin;
+     $4.begin = tmp;
+   }
+
    AGGREGATOR_CFG->aggr_on_count = count;
-   AGGREGATOR_CFG->aggr_on = f_linearize($4.begin, count);
+   AGGREGATOR_CFG->aggr_on = f_linearize(rot, count);
 
    struct f_line *premerge = f_linearize($4.end, 0);
    premerge->args = count;
diff --git a/proto/aggregator/test.conf b/proto/aggregator/test.conf
index ec7afc4f..e5ac6969 100644
--- a/proto/aggregator/test.conf
+++ b/proto/aggregator/test.conf
@@ -1,9 +1,17 @@
 log "bird.log" all;
 
+attribute int foo;
+
 protocol device {}
 
 protocol static {
-  ipv6;
+  ipv6 {
+    import filter {
+      preference = 111;
+      foo = 666;
+      accept;
+    };
+  };
   route 2001:db8:0::/48 unreachable { bgp_path.prepend(65432); bgp_path.prepend(4200000000); };
   route 2001:db8:1::/48 unreachable;
   route 2001:db8:2::/48 unreachable;
@@ -25,6 +33,8 @@ protocol static {
 protocol static {
   ipv6 {
     import filter {
+      preference = 222;
+      foo = 666;
       bgp_med = 1;
       bgp_community = -empty-.add((65533,1)).add((65500,0xe));
       accept;
@@ -43,6 +53,8 @@ protocol static {
 protocol static {
   ipv6 {
     import filter {
+      preference = 222;
+      foo = 666;
       bgp_med = 2;
       bgp_community = -empty-.add((65533,2)).add((65500,0xd));
       accept;
@@ -61,6 +73,8 @@ protocol static {
 protocol static {
   ipv6 {
     import filter {
+      preference = 222;
+      foo = 666;
       bgp_med = 4;
       bgp_community = -empty-.add((65533,4)).add((65500,0xb));
       accept;
@@ -79,6 +93,8 @@ protocol static {
 protocol static {
   ipv6 {
     import filter {
+      preference = 222;
+      foo = 666;
       bgp_med = 8;
       bgp_community = -empty-.add((65533,8)).add((65500,0x7));
       accept;

From 5f166f67828fb4ebdada5868ac5a51cb9ae2ebef Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 14:30:46 +0100
Subject: [PATCH 378/431] Aggregator: fixed route source unlocking on shutdown
 and withdraw

---
 proto/aggregator/aggregator.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 03d7bbf9..b7b56517 100644
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -75,6 +75,7 @@ aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *b
   if (!bucket->rte)
   {
     rte_update2(p->dst, net->n.addr, NULL, bucket->last_src);
+    rt_unlock_source(bucket->last_src);
     bucket->last_src = NULL;
     return;
   }
@@ -412,6 +413,9 @@ aggregator_shutdown(struct proto *P)
       sl_free(arte);
     }
 
+    if (b->last_src)
+      rt_unlock_source(b->last_src);
+
     ASSERT_DIE(b->count == 0);
     HASH_REMOVE(p->buckets, AGGR_BUCK, b);
     sl_free(b);

From 796f0af0ccdaf9d4078ee254365007d12a669b4d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 18:23:43 +0100
Subject: [PATCH 379/431] Fixes to root pool and meta loop to allow resource
 dumps

---
 lib/resource.c        | 1 +
 sysdep/unix/io-loop.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/resource.c b/lib/resource.c
index 611db4d7..674e778d 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -336,6 +336,7 @@ resource_init(void)
   rcu_init();
   resource_sys_init();
 
+  root_pool.r.class = &pool_class;
   rp_init(&root_pool, the_bird_domain.the_bird, "Root");
   tmp_init(&root_pool, the_bird_domain.the_bird);
 }
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index db5bbcb5..96699eb4 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -892,6 +892,7 @@ bird_thread_main(void *arg)
     bird_thread_busy_update(thr, timeout);
 
     account_to(&this_thread->idle);
+    birdloop_leave(thr->meta);
 poll_retry:;
     int rv = poll(pfd.pfd.data, pfd.pfd.used, timeout);
     if (rv < 0)
@@ -902,6 +903,7 @@ poll_retry:;
     }
 
     account_to(&this_thread->overhead);
+    birdloop_enter(thr->meta);
 
     /* Drain wakeup fd */
     if (pfd.pfd.data[0].revents & POLLIN)

From e85f4e890a4b3d910758df36886943e6e335dc08 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 18:24:32 +0100
Subject: [PATCH 380/431] Nexthop dump fix for unreachables

---
 nest/rt-attr.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 71d4d0ed..2e703a0b 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1348,7 +1348,15 @@ nexthop_dump(const struct adata *ad)
 
   debug(":");
 
-  NEXTHOP_WALK(nh, nhad)
+  if (!NEXTHOP_IS_REACHABLE(nhad))
+  {
+    const char *name = rta_dest_name(nhad->dest);
+    if (name)
+      debug(" %s", name);
+    else
+      debug(" D%d", nhad->dest);
+  }
+  else NEXTHOP_WALK(nh, nhad)
     {
       if (ipa_nonzero(nh->gw)) debug(" ->%I", nh->gw);
       if (nh->labels) debug(" L %d", nh->label[0]);

From 6f1485baf90feba852828df53efcad87306594ec Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 18:25:15 +0100
Subject: [PATCH 381/431] Debug file fix

It got mistakenly closed while applying the log configuration.
---
 sysdep/unix/log.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 81558d0a..0d6adf42 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -512,7 +512,7 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
 	  }
 
 	  /* The filehandle is no longer needed */
-	  if (l->rf != &rf_stderr)
+	  if ((l->rf != &rf_stderr ) && (l->rf != dbg_rf))
 	  {
 	    log_lock();
 	    rfree(l->rf);
@@ -608,8 +608,8 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
     /* Store new mask after opening new files to minimize missing log message race conditions */
     atomic_store_explicit(&ol->mask, ol->new_mask, memory_order_release);
 
-    /* Never close syslog channel */
-    if (ol->new_mask || !ol->rf)
+    /* Never close syslog channel or debug */
+    if (ol->new_mask || !ol->rf || (ol->rf == dbg_rf))
     {
       pprev = &ol->next;
       ol = atomic_load_explicit(pprev, memory_order_acquire);

From f730ecef4f13a8c83f1529dfe6b46261da9ff11d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 18:25:40 +0100
Subject: [PATCH 382/431] Dumping route sources along with protocols and routes

---
 lib/route.h     |  2 ++
 nest/proto.c    |  3 +++
 nest/rt-attr.c  | 24 ++++++++++++++++++++++++
 nest/rt-table.c |  1 +
 4 files changed, 30 insertions(+)

diff --git a/lib/route.h b/lib/route.h
index 0fc0d0b3..06772577 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -173,6 +173,8 @@ static inline void rt_unlock_source(struct rte_src *src)
 void rt_init_sources(struct rte_owner *, const char *name, event_list *list);
 void rt_destroy_sources(struct rte_owner *, event *);
 
+void rt_dump_sources(struct rte_owner *);
+
 /*
  *	Route Attributes
  *
diff --git a/nest/proto.c b/nest/proto.c
index 414ce704..8b949c9c 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -2034,6 +2034,9 @@ protos_dump_all(void)
 	  c->out_req.hook ? rt_export_state_name(rt_export_get_state(c->out_req.hook)) : "-");
     }
 
+    debug("\tSOURCES\n");
+    rt_dump_sources(&p->sources);
+
     if (p->proto->dump && (p->proto_state != PS_DOWN))
       p->proto->dump(p);
   }
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 2e703a0b..53111696 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -366,6 +366,30 @@ rt_prune_sources(void *data)
     RTA_UNLOCK;
 }
 
+void
+rt_dump_sources(struct rte_owner *o)
+{
+  debug("\t%s: hord=%u, uc=%u, cnt=%u prune=%p, stop=%p\n",
+      o->name, o->hash.order, o->uc, o->hash.count, o->prune, o->stop);
+  debug("\tget_route_info=%p, better=%p, mergable=%p, igp_metric=%p, recalculate=%p",
+      o->class->get_route_info, o->class->rte_better, o->class->rte_mergable,
+      o->class->rte_igp_metric, o->rte_recalculate);
+
+  int splitting = 0;
+  HASH_WALK(o->hash, next, src)
+  {
+    debug("%c%c%uL %uG %luU",
+	(splitting % 8) ? ',' : '\n',
+	(splitting % 8) ? ' ' : '\t',
+	src->private_id, src->global_id,
+	atomic_load_explicit(&src->uc, memory_order_relaxed));
+
+    splitting++;
+  }
+  HASH_WALK_END;
+  debug("\n");
+}
+
 void
 rt_init_sources(struct rte_owner *o, const char *name, event_list *list)
 {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e86397e4..0075bb7f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2502,6 +2502,7 @@ rte_dump(struct rte_storage *e)
 {
   debug("%-1N ", e->rte.net);
   debug("PF=%02x ", e->rte.pflags);
+  debug("SRC=%uG ", e->rte.src->global_id);
   ea_dump(e->rte.attrs);
   debug("\n");
 }

From 898e268d0f3119cfd01f33f2e60c452fc53f2ae0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 Oct 2023 10:02:43 +0200
Subject: [PATCH 383/431] Channel feeding request has a done-hook

---
 nest/proto.c    | 18 +++++++++++++-----
 nest/protocol.h | 16 +++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 5ddfb31e..03f502f7 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -759,8 +759,7 @@ channel_feed_end(struct channel *c)
   for (struct channel_feeding_request *cfr = c->refeeding, *next = cfr ? cfr->next : NULL;
       cfr;
       (cfr = next), (next = next ? next->next : NULL))
-    if (cfr->flags & CFRF_DYNAMIC)
-      mb_free(cfr);
+    CALL(cfr->done, cfr);
 
   /* Drop the refeed batch */
   c->refeeding = NULL;
@@ -1010,12 +1009,21 @@ channel_request_feeding(struct channel *c, struct channel_feeding_request *cfr)
     channel_init_feeding(c);
 }
 
+static void
+channel_feeding_request_done_dynamic(struct channel_feeding_request *req)
+{
+  mb_free(req);
+}
+
 void
 channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type type)
 {
-  struct channel_feeding_request *req = mb_allocz(c->proto->pool, sizeof *req);
-  req->type = type;
-  req->flags |= CFRF_DYNAMIC;
+  struct channel_feeding_request *req = mb_alloc(c->proto->pool, sizeof *req);
+  *req = (struct channel_feeding_request) {
+    .type = type,
+    .done = channel_feeding_request_done_dynamic,
+  };
+
   channel_request_feeding(c, req);
 }
 
diff --git a/nest/protocol.h b/nest/protocol.h
index ca33a7fc..7d0041f5 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -676,19 +676,17 @@ static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP)
 static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }
 
 struct channel_feeding_request {
-  struct channel_feeding_request *next;
+  struct channel_feeding_request *next;			/* Next in request chain */
+  void (*done)(struct channel_feeding_request *);	/* Called when refeed finishes */
   PACKED enum channel_feeding_request_type {
-    CFRT_DIRECT = 1,
-    CFRT_AUXILIARY,
+    CFRT_DIRECT = 1,					/* Refeed by export restart */
+    CFRT_AUXILIARY,					/* Refeed by auxiliary request */
   } type;
   PACKED enum {
-    CFRS_INACTIVE = 0,
-    CFRS_PENDING,
-    CFRS_RUNNING,
+    CFRS_INACTIVE = 0,					/* Inactive request */
+    CFRS_PENDING,					/* Request enqueued, do not touch */
+    CFRS_RUNNING,					/* Request active, do not touch */
   } state;
-  PACKED enum {
-    CFRF_DYNAMIC = 1,
-  } flags;
 };
 
 struct channel *channel_from_export_request(struct rt_export_request *req);

From 2659aebd9b241ea46346a3746d9ca93f21c73116 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 Oct 2023 10:39:46 +0200
Subject: [PATCH 384/431] Channel feeding request respects the subnet tries

---
 nest/proto.c    | 32 ++++++++++++++------------------
 nest/protocol.h | 20 +++++++++++++++++++-
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 03f502f7..9eebb110 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -357,6 +357,12 @@ channel_roa_in_changed(struct settle *se)
   channel_request_reload(c);
 }
 
+static void
+channel_roa_out_reload_done(struct channel_feeding_request *req)
+{
+  rfree(req->trie->lp);
+}
+
 static void
 channel_roa_out_changed(struct settle *se)
 {
@@ -365,25 +371,15 @@ channel_roa_out_changed(struct settle *se)
 
   CD(c, "Feeding triggered by RPKI change");
 
-  /* TODO feed by trie */
+  struct channel_feeding_request *cfr = lp_alloc(s->trie->lp, sizeof *cfr);
+  *cfr = (struct channel_feeding_request) {
+    .type = CFRT_AUXILIARY,
+    .trie = s->trie,
+    .done = channel_roa_out_reload_done,
+  };
+  channel_request_feeding(c, cfr);
 
-  /* Refeed already pending */
-  if ((s->cfr[0].state == CFRS_PENDING) || (s->cfr[1].state == CFRS_PENDING))
-    return;
-
-  /* First refeed inactive */
-  if (s->cfr[0].state == CFRS_INACTIVE)
-  {
-    s->cfr[0].type = CFRT_AUXILIARY;
-    channel_request_feeding(c, &s->cfr[0]);
-  }
-  else
-  {
-    /* Second refeed MUST be inactive */
-    ASSERT_DIE(s->cfr[1].state == CFRS_INACTIVE);
-    s->cfr[1].type = CFRT_AUXILIARY;
-    channel_request_feeding(c, &s->cfr[1]);
-  }
+  s->trie = f_new_trie(lp_new(c->proto->pool), 0);
 }
 
 static void
diff --git a/nest/protocol.h b/nest/protocol.h
index 7d0041f5..227201dc 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -678,6 +678,7 @@ static inline void channel_close(struct channel *c) { channel_set_state(c, CS_ST
 struct channel_feeding_request {
   struct channel_feeding_request *next;			/* Next in request chain */
   void (*done)(struct channel_feeding_request *);	/* Called when refeed finishes */
+  struct f_trie *trie;					/* Reload only matching nets */
   PACKED enum channel_feeding_request_type {
     CFRT_DIRECT = 1,					/* Refeed by export restart */
     CFRT_AUXILIARY,					/* Refeed by auxiliary request */
@@ -694,12 +695,29 @@ void channel_request_feeding(struct channel *c, struct channel_feeding_request *
 void channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type);
 
 static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n)
-{ return (c->refeeding && c->refeed_trie && !trie_match_net(c->refeed_trie, n)); }
+{
+  /* Not refeeding if not refeeding at all */
+  if (!c->refeeding || !c->refeed_trie)
+    return 0;
+
+  /* Not refeeding if already refed */
+  if (trie_match_net(c->refeed_trie, n))
+    return 0;
+
+  /* Refeeding if matching any request */
+  for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
+    if (!cfr->trie || trie_match_net(cfr->trie, n))
+      return 1;
+
+  /* Not matching any request */
+  return 0;
+}
 static inline void channel_net_mark_refed(struct channel *c, const net_addr *n)
 {
   ASSERT_DIE(c->refeeding && c->refeed_trie);
   trie_add_prefix(c->refeed_trie, n, n->pxlen, n->pxlen);
 }
+
 void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
 int channel_reconfigure(struct channel *c, struct channel_config *cf);

From 1c0bc707a0c045583a829aebb225ddd88a96a9ea Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 4 Oct 2023 11:03:29 +0200
Subject: [PATCH 385/431] Prefiltering routes by net and custom hook for
 partial reloads

---
 nest/proto.c    | 19 +++++++++++++++++++
 nest/rt-table.c |  4 ++++
 nest/rt.h       |  3 +++
 3 files changed, 26 insertions(+)

diff --git a/nest/proto.c b/nest/proto.c
index 9eebb110..76739556 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -51,6 +51,7 @@ static char *proto_state_name(struct proto *p);
 static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
+static int channel_refeed_prefilter(const struct rt_prefilter *p, const net_addr *n);
 static void channel_feed_end(struct channel *c);
 static void channel_stop_export(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
@@ -622,6 +623,7 @@ channel_start_export(struct channel *c)
   c->refeed_req.dump_req = channel_dump_refeed_req;
   c->refeed_req.log_state_change = channel_refeed_log_state_change;
   c->refeed_req.mark_seen = channel_rpe_mark_seen_refeed;
+  c->refeed_req.prefilter.hook = channel_refeed_prefilter;
 
   DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
   rt_request_export(c->table, &c->out_req);
@@ -719,9 +721,26 @@ channel_init_feeding(struct channel *c)
   c->refeeding = c->refeed_pending;
   c->refeed_pending = NULL;
   c->refeed_trie = f_new_trie(lp_new(c->proto->pool), 0);
+
   rt_request_export(c->table, &c->refeed_req);
 }
 
+static int
+channel_refeed_prefilter(const struct rt_prefilter *p, const net_addr *n)
+{
+  const struct channel *c =
+    SKIP_BACK(struct channel, refeed_req,
+	SKIP_BACK(struct rt_export_request, prefilter, p)
+	);
+
+  for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
+    if (!cfr->trie || trie_match_net(cfr->trie, n))
+      return 1;
+
+  return 0;
+}
+
+
 static void
 channel_feed_end(struct channel *c)
 {
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d0b4f117..160d24b1 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2229,6 +2229,7 @@ rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_ho
       /* fall through */
     case TE_ADDR_NONE:
     case TE_ADDR_TRIE:
+    case TE_ADDR_HOOK:
       FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
       hook->h.event.hook = rt_feed_by_fib;
       break;
@@ -2327,6 +2328,7 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
 	  }
 	  /* fall through */
 	case TE_ADDR_NONE:
+	case TE_ADDR_HOOK:
 	case TE_ADDR_TRIE:
 	  fit_get(&tab->fib, &hook->feed_fit);
 	  break;
@@ -4423,6 +4425,8 @@ rt_feed_by_fib(void *data)
 	  return;
 	}
       }
+      else
+	req_trace(c->h.req, D_ROUTES, "Feeding %N rejected by prefilter", n->n.addr);
     }
   FIB_ITERATE_END;
   }
diff --git a/nest/rt.h b/nest/rt.h
index 5070fcc5..bd9f9363 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -304,6 +304,7 @@ struct rt_prefilter {
   union {
     const struct f_trie *trie;
     const net_addr *addr;	/* Network prefilter address */
+    int (*hook)(const struct rt_prefilter *, const net_addr *);
   };
 				/* Network prefilter mode (TE_ADDR_*) */
   enum {
@@ -312,6 +313,7 @@ struct rt_prefilter {
     TE_ADDR_FOR,		/* Longest prefix match - show route for <addr> */
     TE_ADDR_IN,			/* Interval query - show route in <addr> */
     TE_ADDR_TRIE,		/* Query defined by trie */
+    TE_ADDR_HOOK,		/* Query processed by supplied custom hook */
   } mode;
 } PACKED;
 
@@ -352,6 +354,7 @@ static inline int rt_prefilter_net(const struct rt_prefilter *p, const net_addr
     case TE_ADDR_EQUAL:	return net_equal(n, p->addr);
     case TE_ADDR_FOR:	return net_in_netX(p->addr, n);
     case TE_ADDR_TRIE:	return trie_match_net(p->trie, n);
+    case TE_ADDR_HOOK:	return p->hook(p, n);
   }
 
   bug("Crazy prefilter application attempt failed wildly.");

From 4e9725e8256ba8283ffd8e28d15b027230c738ec Mon Sep 17 00:00:00 2001
From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Thu, 2 Nov 2023 14:28:50 +0100
Subject: [PATCH 386/431] FIB walk macros now allow continue from the loop

---
 lib/fib.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/fib.h b/lib/fib.h
index bec2a8d4..1fbcec5f 100644
--- a/lib/fib.h
+++ b/lib/fib.h
@@ -94,17 +94,16 @@ void fit_copy(struct fib *f, struct fib_iterator *dst, struct fib_iterator *src)
 	uint count_ = (fib)->hash_size;				\
 	uint hpos_ = (it)->hash;				\
 	type *z;						\
-	for(;;) {						\
-	  if (!fn_)						\
+	for(;;fn_ = fn_->next) {				\
+	  while (!fn_ && ++hpos_ < count_)			\
 	    {							\
-	       if (++hpos_ >= count_)				\
-		 break;						\
 	       fn_ = (fib)->hash_table[hpos_];			\
-	       continue;					\
 	    }							\
+	  if (hpos_ >= count_)					\
+	    break;						\
 	  z = fib_node_to_user(fib, fn_);
 
-#define FIB_ITERATE_END fn_ = fn_->next; } } while(0)
+#define FIB_ITERATE_END } } while(0)
 
 #define FIB_ITERATE_PUT(it) fit_put(it, fn_)
 

From 9680bf68e454c23ed58e18bc09b592ccd356515d Mon Sep 17 00:00:00 2001
From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Thu, 2 Nov 2023 14:33:00 +0100
Subject: [PATCH 387/431] Automatic ROA reloads on channel import

This includes updating OSPF, Pipe and RIP to enable partial route reload
directly from the protocols' internal tables.
---
 conf/confbase.Y       |   1 +
 doc/bird.sgml         |   8 +-
 nest/config.Y         |  63 ++++++++-
 nest/proto.c          | 310 +++++++++++++++++++++++++++++++++++++++---
 nest/protocol.h       |  23 +++-
 nest/rt.h             |  34 ++---
 proto/bgp/attrs.c     |   1 +
 proto/bgp/bgp.c       |  18 ++-
 proto/ospf/ospf.c     |  11 +-
 proto/ospf/ospf.h     |   1 +
 proto/ospf/rt.c       |  16 ++-
 proto/pipe/pipe.c     |  34 ++++-
 proto/pipe/pipe.h     |   5 +
 proto/rip/rip.c       |  30 +++-
 proto/rip/rip.h       |   1 +
 proto/static/static.c |  30 +++-
 sysdep/unix/krt.c     |  14 +-
 17 files changed, 524 insertions(+), 76 deletions(-)

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 8e5da9e3..c764f9e4 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -81,6 +81,7 @@ CF_DECLS
   const struct filter *f;
   struct f_tree *e;
   struct f_trie *trie;
+  const struct f_trie *const_trie;
   struct f_val v;
   struct password_item *p;
   struct rt_show_data *ra;
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 0da616c7..e90e2409 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -979,7 +979,8 @@ inherited from templates can be updated by new definitions.
 	<cf/roa_check()/ operator). In contrast to to other filter operators,
 	this status for the same route may change as the content of ROA tables
 	changes. When this option is active, BIRD activates automatic reload of
-	affected channels whenever ROA tables are updated (after a short settle
+	the appropriate subset of prefixes imported or exported by the channels
+	whenever ROA tables are updated (after a short settle
 	time). When disabled, route reloads have to be requested manually. The
 	option is ignored if <cf/roa_check()/ is not used in channel filters.
 	Note that for BGP channels, automatic reload requires
@@ -1263,7 +1264,7 @@ This argument can be omitted if there exists only a single instance.
 	Enable, disable or restart a given protocol instance, instances matching
 	the <cf><m/pattern/</cf> or <cf/all/ instances.
 
-	<tag><label id="cli-reload">reload [in|out] <m/name/|"<m/pattern/"|all</tag>
+	<tag><label id="cli-reload">reload [in|out] (<m/name/|"<m/pattern/"|all) [partial prefix] </tag>
 	Reload a given protocol instance, that means re-import routes from the
 	protocol instance and re-export preferred routes to the instance. If
 	<cf/in/ or <cf/out/ options are used, the command is restricted to one
@@ -1274,6 +1275,9 @@ This argument can be omitted if there exists only a single instance.
 	propagates the old set of routes. For example when <cf/configure soft/
 	command was used to change filters.
 
+	If <cf/partial prefix/ option is used, only corresponding routes are reloaded.
+	Protocol BGP does partial reload only if it has import table enabled, otherwise partial reload for BGP is refused.
+
 	Re-export always succeeds, but re-import is protocol-dependent and might
 	fail (for example, if BGP neighbor does not support route-refresh
 	extension). In that case, re-export is also skipped. Note that for the
diff --git a/nest/config.Y b/nest/config.Y
index 2e70461a..f871ac2a 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -107,6 +107,44 @@ proto_postconfig(void)
   this_proto = NULL;
 }
 
+static void
+channel_reload_out_done_main(void *_prr)
+{
+  struct proto_reload_request *prr = _prr;
+  ASSERT_THE_BIRD_LOCKED;
+
+  rfree(prr->trie->lp);
+}
+
+static inline void
+proto_call_cmd_reload(struct proto_spec ps, int dir, const struct f_trie *trie)
+{
+  struct proto_reload_request *prr = cfg_alloc(sizeof *prr);
+  *prr = (struct proto_reload_request) {
+    .trie = trie,
+    .dir = dir,
+    .counter = 1,
+  };
+  if (trie)
+  {
+    /* CLI linpool is moved to trie, because trie is need for longer time
+     * than the linpool would exist in CLI. The linpool is freed in channel_reload_out_done_main.
+     */
+    ASSERT_DIE(this_cli->parser_pool == prr->trie->lp);
+    rmove(this_cli->parser_pool, &root_pool);
+    this_cli->parser_pool = lp_new(this_cli->pool);
+    prr->ev = (event) {
+      .data = prr,
+      .hook = channel_reload_out_done_main,
+    };
+  }
+
+  proto_apply_cmd(ps, proto_cmd_reload, 1, (uintptr_t) prr);
+  /* This function used reference to this trie, so it is freed here as well as in protocols*/
+  if (trie)
+    if (atomic_fetch_sub_explicit(&prr->counter, 1, memory_order_acq_rel) == 1)
+      ev_send_loop(&main_birdloop, &prr->ev);
+}
 
 #define DIRECT_CFG ((struct rt_dev_config *) this_proto)
 
@@ -120,7 +158,7 @@ CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CH
 CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512)
 CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
 CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION)
-CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP)
+CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP, PARTIAL)
 CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
 CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
 CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
@@ -151,6 +189,7 @@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
 %type <net_ptr> r_args_for
 %type <t> channel_sym
 %type <c> channel_arg
+%type <const_trie> partial_opt
 
 CF_GRAMMAR
 
@@ -892,18 +931,28 @@ CF_CLI(DUMP FILTER ALL,,, [[Dump all filters in linearized form]])
 CF_CLI(EVAL, term, <expr>, [[Evaluate an expression]])
 { cmd_eval(f_linearize($2, 1)); } ;
 
+partial_opt:
+  PARTIAL term {
+    struct f_val val;
+    if (f_eval(f_linearize($2, 1), &val) > F_RETURN) cf_error("Runtime error");
+    if (val.type != T_PREFIX_SET) cf_error("Partial spec must be prefix set");
+    $$ = val.val.ti;
+  }
+  | /* empty */ { $$ = NULL; }
+  ;
+
 CF_CLI(DISABLE, proto_patt opttext, (<protocol> | \"<pattern>\" | all) [message], [[Disable protocol]])
 { proto_apply_cmd($2, proto_cmd_disable, 1, (uintptr_t) $3); } ;
 CF_CLI(ENABLE, proto_patt opttext, (<protocol> | \"<pattern>\" | all) [message], [[Enable protocol]])
 { proto_apply_cmd($2, proto_cmd_enable, 1, (uintptr_t) $3); } ;
 CF_CLI(RESTART, proto_patt opttext, (<protocol> | \"<pattern>\" | all) [message], [[Restart protocol]])
 { proto_apply_cmd($2, proto_cmd_restart, 1, (uintptr_t) $3); } ;
-CF_CLI(RELOAD, proto_patt, <protocol> | \"<pattern>\" | all, [[Reload protocol]])
-{ proto_apply_cmd($2, proto_cmd_reload, 1, CMD_RELOAD); } ;
-CF_CLI(RELOAD IN, proto_patt, <protocol> | \"<pattern>\" | all, [[Reload protocol (just imported routes)]])
-{ proto_apply_cmd($3, proto_cmd_reload, 1, CMD_RELOAD_IN); } ;
-CF_CLI(RELOAD OUT, proto_patt, <protocol> | \"<pattern>\" | all, [[Reload protocol (just exported routes)]])
-{ proto_apply_cmd($3, proto_cmd_reload, 1, CMD_RELOAD_OUT); } ;
+CF_CLI(RELOAD, proto_patt partial_opt, (<protocol> | \"<pattern>\" | all) [partial <prefix set>], [[Reload protocol]])
+{ proto_call_cmd_reload($2, CMD_RELOAD, $3); } ;
+CF_CLI(RELOAD IN, proto_patt partial_opt, <protocol> | \"<pattern>\" | all, [[Reload protocol (just imported routes)]])
+{ proto_call_cmd_reload($3, CMD_RELOAD_IN, $4); } ;
+CF_CLI(RELOAD OUT, proto_patt partial_opt, <protocol> | \"<pattern>\" | all, [[Reload protocol (just exported routes)]])
+{ proto_call_cmd_reload($3, CMD_RELOAD_OUT, $4); } ;
 
 CF_CLI_HELP(DEBUG, ..., [[Control protocol debugging via BIRD logs]])
 CF_CLI(DEBUG, debug_args, (<protocol> | <channel> | \"<pattern>\" | all) (all | off | { states|routes|filters|interfaces|events|packets [, ...] }), [[Control protocol debugging via BIRD logs]])
diff --git a/nest/proto.c b/nest/proto.c
index 76739556..e569ab76 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -52,11 +52,14 @@ static void channel_init_limit(struct channel *c, struct limit *l, int dir, stru
 static void channel_update_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
 static void channel_reset_limit(struct channel *c, struct limit *l, int dir);
 static int channel_refeed_prefilter(const struct rt_prefilter *p, const net_addr *n);
+static int channel_import_prefilter(const struct rt_prefilter *p, const net_addr *n);
 static void channel_feed_end(struct channel *c);
 static void channel_stop_export(struct channel *c);
 static void channel_export_stopped(struct rt_export_request *req);
 static void channel_refeed_stopped(struct rt_export_request *req);
 static void channel_check_stopped(struct channel *c);
+static void channel_reload_in_done(struct channel_import_request *cir);
+static void channel_request_partial_reload(struct channel *c, struct channel_import_request *cir);
 
 static inline int proto_is_done(struct proto *p)
 { return (p->proto_state == PS_DOWN) && proto_is_inactive(p); }
@@ -339,15 +342,109 @@ proto_remove_channels(struct proto *p)
     proto_remove_channel(p, c);
 }
 
+/**
+ * # Automatic ROA reloads
+ *
+ * Route origin authorizations may (and do) change over time by updates via
+ * our RPKI protocols. This then manifests in ROA tables. As the roa_check()
+ * is always executed on a specific contents of ROA table in a specific moment
+ * of time, its value may switch after updates in the ROA table and therefore
+ * must be re-evaluated any time the result may have changed.
+ *
+ * To enable this mechanism, there are auxiliary tools integrated in BIRD
+ * to automatically re-evaluate all filters that may get a different outcome
+ * after ROA change.
+ *
+ * ROA Subscription Data Structure (struct roa_subscription) is the connector
+ * between the channel and the ROA table, keeping track about unprocessed
+ * changes and initiating the reloads. The modus operandi is as follows:
+ *
+ * Init 1. Check whether the filter uses ROA at all.
+ * Init 2. Request exports from the ROA table
+ * Init 3. Allocate a trie
+ *
+ * Export from ROA: This may affect all routes for prefixes matching the ROA
+ * prefix, disregarding its maxlen. Thus we mark these routes in the request's
+ * auxiliary trie. Then we ping the settle timer to wait a reasonable amount of
+ * time before actually requesting channel reload.
+ *
+ * Settle timer fires when nothing has pinged it for the 'min' time, or 'max'
+ * time has elapsed since the first ping. It then:
+ *
+ * - requests partial channel import / export reload based on the trie
+ * - allocates a new trie
+ *
+ * As the import/export reload uses the auxiliary trie to prefilter prefixes,
+ * the trie must be freed after the reload is done, which is ensured in the
+ * .done() hook of the reimport/reexport request.
+ *
+ * # Channel export refeed
+ *
+ * The request, either by ROA or from CLI, is enqueued to the channel and an
+ * auxiliary export hook is requested from the table. This way, the ordinary
+ * updates can flow uninterrupted while refeed gets prefiltered by the given
+ * trie (if given). When the auxiliary export hook finishes, the .done() hook
+ * is then called for the requestor to do their cleanup.
+ *
+ * While refeeding, special care must be taken about route changes inside the
+ * table. For this, an auxiliary trie is allocated to keep track about already
+ * refed net, to avoid unnecessary multiple re-evaluation of filters.
+ *
+ * # Channel import reload from import table
+ *
+ * When the import table is on, the channel keeps the original version of the route
+ * in the table together with the actual version after filters, in a form of
+ * an additional layer of route attributes underneath the actual version. This makes
+ * it exceptionally simple to get the original version of the route directly
+ * from the table by an ordinary export which strips all the newer layers.
+ *
+ * Then, by processing all these auxiliary exports, the channel basically re-imports
+ * all the routes into the table back again, re-evaluating the filters and ROA checks.
+ *
+ * # Channel import reload from protocols
+ *
+ * When the import table is off, the protocol gets the reimport request directly
+ * via the .reload_routes() hook and must do its internal route reload instead.
+ * The protocol may not support it and in such case, this function returns 0
+ * indicating that no partial reload is going to happen. It's then on the
+ * developer's or user's discretion to run a full reload instead.
+ *
+ * # Caveats, FIXME's, TODO's and other kinds of hell
+ *
+ * The partial reexport uses a trie to track state for single prefixes. This
+ * may do crazy things if a partial reload was to be performed on any other
+ * table than plain IPv6 or IPv4. Network types like VPNv6 or Flowspec may
+ * cause some crashes. This is currently not checked anywhere.
+ *
+ * Anyway, we decided to split the table FIB structure to carry only a mapping
+ * between a prefix and a locally-unique ID, and after this update is done
+ * (probably also in v2), the tracking tries may be easily replaced by
+ * bitfields, therefore fixing this bug.
+ *
+ * We also probably didn't do a proper analysis of the implemented algorithm
+ * for reexports, so if there is somebody willing to formally prove that we
+ * both won't miss any update and won't reexport more than needed, you're welcome
+ * to submit such a proof.
+ *
+ * We wish you a pleasant reading, analyzing and bugfixing experience.
+ *
+ *					  Kata, Maria and the BIRD Team
+ */
+
 struct roa_subscription {
   node roa_node;
   struct settle settle;
   struct channel *c;
   struct rt_export_request req;
-  struct f_trie* trie;
-  struct channel_feeding_request cfr[2];
+  struct f_trie *trie;
 };
 
+static void
+channel_roa_in_reload_done(struct channel_import_request *req)
+{
+  rfree(req->trie->lp);
+}
+
 static void
 channel_roa_in_changed(struct settle *se)
 {
@@ -355,7 +452,15 @@ channel_roa_in_changed(struct settle *se)
   struct channel *c = s->c;
 
   CD(c, "Reload triggered by RPKI change");
-  channel_request_reload(c);
+  struct channel_import_request *cir = lp_alloc(s->trie->lp, sizeof *cir);
+  *cir = (struct channel_import_request) {
+    .trie = s->trie,
+    .done = channel_roa_in_reload_done,
+  };
+
+  s->trie = f_new_trie(lp_new(c->proto->pool), 0);
+
+  channel_request_partial_reload(c, cir);
 }
 
 static void
@@ -372,15 +477,19 @@ channel_roa_out_changed(struct settle *se)
 
   CD(c, "Feeding triggered by RPKI change");
 
+  /* Setup feeding request */
   struct channel_feeding_request *cfr = lp_alloc(s->trie->lp, sizeof *cfr);
   *cfr = (struct channel_feeding_request) {
     .type = CFRT_AUXILIARY,
     .trie = s->trie,
     .done = channel_roa_out_reload_done,
   };
-  channel_request_feeding(c, cfr);
 
+  /* Prepare new trie */
   s->trie = f_new_trie(lp_new(c->proto->pool), 0);
+
+  /* Actually request the feed */
+  channel_request_feeding(c, cfr);
 }
 
 static void
@@ -623,7 +732,6 @@ channel_start_export(struct channel *c)
   c->refeed_req.dump_req = channel_dump_refeed_req;
   c->refeed_req.log_state_change = channel_refeed_log_state_change;
   c->refeed_req.mark_seen = channel_rpe_mark_seen_refeed;
-  c->refeed_req.prefilter.hook = channel_refeed_prefilter;
 
   DBG("%s.%s: Channel start export req=%p\n", c->proto->name, c->name, &c->out_req);
   rt_request_export(c->table, &c->out_req);
@@ -709,6 +817,8 @@ channel_refeed_stopped(struct rt_export_request *req)
 static void
 channel_init_feeding(struct channel *c)
 {
+  int no_trie = 0;
+
   for (struct channel_feeding_request *cfrp = c->refeed_pending; cfrp; cfrp = cfrp->next)
     if (cfrp->type == CFRT_DIRECT)
     {
@@ -716,12 +826,25 @@ channel_init_feeding(struct channel *c)
       channel_stop_export(c);
       return;
     }
+    else if (!cfrp->trie)
+      no_trie = 1;
 
   /* No direct feeding, running auxiliary refeed. */
   c->refeeding = c->refeed_pending;
   c->refeed_pending = NULL;
   c->refeed_trie = f_new_trie(lp_new(c->proto->pool), 0);
 
+  if (no_trie)
+  {
+    c->refeed_req.prefilter.mode = TE_ADDR_NONE;
+    c->refeed_req.prefilter.hook = NULL;
+  }
+  else
+  {
+    c->refeed_req.prefilter.mode = TE_ADDR_HOOK;
+    c->refeed_req.prefilter.hook = channel_refeed_prefilter;
+  }
+
   rt_request_export(c->table, &c->refeed_req);
 }
 
@@ -733,13 +856,35 @@ channel_refeed_prefilter(const struct rt_prefilter *p, const net_addr *n)
 	SKIP_BACK(struct rt_export_request, prefilter, p)
 	);
 
+  ASSERT_DIE(c->refeeding);
   for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
     if (!cfr->trie || trie_match_net(cfr->trie, n))
       return 1;
-
   return 0;
 }
 
+int
+channel_import_request_prefilter(struct channel_import_request *cir_head, const net_addr *n)
+{
+  for (struct channel_import_request *cir = cir_head; cir; cir = cir->next)
+  {
+    if (!cir->trie || trie_match_net(cir->trie, n))
+      return 1;
+  }
+  return 0;
+}
+
+static int
+channel_import_prefilter(const struct rt_prefilter *p, const net_addr *n)
+{
+  const struct channel *c =
+    SKIP_BACK(struct channel, reload_req,
+	SKIP_BACK(struct rt_export_request, prefilter, p)
+	);
+  ASSERT_DIE(c->importing);
+
+  return channel_import_request_prefilter(c->importing, n);
+}
 
 static void
 channel_feed_end(struct channel *c)
@@ -791,9 +936,15 @@ channel_feed_end(struct channel *c)
 
 /* Called by protocol for reload from in_table */
 void
-channel_schedule_reload(struct channel *c)
+channel_schedule_reload(struct channel *c, struct channel_import_request *cir)
 {
   ASSERT(c->in_req.hook);
+  int no_trie = 0;
+  if (cir)
+  {
+    cir->next = c->import_pending;
+    c->import_pending = cir;
+  }
 
   if (c->reload_req.hook)
   {
@@ -802,7 +953,29 @@ channel_schedule_reload(struct channel *c)
     return;
   }
 
-  rt_refresh_begin(&c->in_req);
+  /* If there is any full-reload request, we can disregard all partials */
+  for (struct channel_import_request *last = cir; last && no_trie==0;)
+  {
+    if (!last->trie)
+      no_trie = 1;
+     last = last->next;
+  }
+
+  /* activating pending imports */
+  c->importing = c->import_pending;
+  c->import_pending = NULL;
+
+  if (no_trie)
+  {
+    c->reload_req.prefilter.mode = TE_ADDR_NONE;
+    c->reload_req.prefilter.hook = NULL;
+  }
+  else
+  {
+    c->reload_req.prefilter.mode = TE_ADDR_HOOK;
+    c->reload_req.prefilter.hook = channel_import_prefilter;
+  }
+
   rt_request_export(c->table, &c->reload_req);
 }
 
@@ -1013,7 +1186,11 @@ channel_set_state(struct channel *c, uint state)
 void
 channel_request_feeding(struct channel *c, struct channel_feeding_request *cfr)
 {
-  ASSERT(c->out_req.hook);
+  ASSERT_DIE(c->out_req.hook);
+
+  CD(c, "Feeding requested (%s)",
+      cfr->type == CFRT_DIRECT ? "direct" :
+      (cfr->trie ? "partial" : "auxiliary"));
 
   /* Enqueue the request */
   cfr->next = c->refeed_pending;
@@ -1052,6 +1229,12 @@ channel_stop_export(struct channel *c)
     rt_stop_export(&c->out_req, channel_export_stopped);
 }
 
+static void
+channel_import_request_done_dynamic(struct channel_import_request *req)
+{
+  mb_free(req);
+}
+
 static void
 channel_request_reload(struct channel *c)
 {
@@ -1059,11 +1242,28 @@ channel_request_reload(struct channel *c)
   ASSERT(channel_reloadable(c));
 
   CD(c, "Reload requested");
+  struct channel_import_request* cir = mb_alloc(c->proto->pool, sizeof *cir);
+  cir->trie = NULL;
+  cir->done = channel_import_request_done_dynamic;
 
   if ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
-    channel_schedule_reload(c);
-  else
-    c->proto->reload_routes(c);
+    channel_schedule_reload(c, cir);
+  else if (! c->proto->reload_routes(c, cir))
+    bug("Channel %s.%s refused full import reload.", c->proto->name, c->name);
+}
+
+static void
+channel_request_partial_reload(struct channel *c, struct channel_import_request *cir)
+{
+  ASSERT(c->in_req.hook);
+  ASSERT(channel_reloadable(c));
+
+  CD(c, "Partial import reload requested");
+
+  if ((c->in_keep & RIK_PREFILTER) == RIK_PREFILTER)
+    channel_schedule_reload(c, cir);
+  else if (! c->proto->reload_routes(c, cir))
+    cli_msg(-15, "%s.%s: partial reload refused, please run full reload instead", c->proto->name, c->name);
 }
 
 const struct channel_class channel_basic = {
@@ -2655,11 +2855,37 @@ proto_cmd_restart(struct proto *p, uintptr_t arg, int cnt UNUSED)
   cli_msg(-12, "%s: restarted", p->name);
 }
 
-void
-proto_cmd_reload(struct proto *p, uintptr_t dir, int cnt UNUSED)
-{
-  struct channel *c;
+struct channel_cmd_reload_feeding_request {
+  struct channel_feeding_request cfr;
+  struct proto_reload_request *prr;
+};
 
+struct channel_cmd_reload_import_request {
+  struct channel_import_request cir;
+  struct proto_reload_request *prr;
+};
+
+static void
+channel_reload_out_done(struct channel_feeding_request *cfr)
+{
+  struct channel_cmd_reload_feeding_request *ccrfr = SKIP_BACK(struct channel_cmd_reload_feeding_request, cfr, cfr);
+  if (atomic_fetch_sub_explicit(&ccrfr->prr->counter, 1, memory_order_acq_rel) == 1)
+    ev_send_loop(&main_birdloop, &ccrfr->prr->ev);
+}
+
+static void
+channel_reload_in_done(struct channel_import_request *cir)
+{
+  struct channel_cmd_reload_import_request *ccrir = SKIP_BACK(struct channel_cmd_reload_import_request, cir, cir);
+  if (atomic_fetch_sub_explicit(&ccrir->prr->counter, 1, memory_order_acq_rel) == 1)
+    ev_send_loop(&main_birdloop, &ccrir->prr->ev);
+}
+
+void
+proto_cmd_reload(struct proto *p, uintptr_t _prr, int cnt UNUSED)
+{
+  struct proto_reload_request *prr = (void *) _prr;
+  struct channel *c;
   if (p->disabled)
   {
     cli_msg(-8, "%s: already disabled", p->name);
@@ -2671,7 +2897,7 @@ proto_cmd_reload(struct proto *p, uintptr_t dir, int cnt UNUSED)
     return;
 
   /* All channels must support reload */
-  if (dir != CMD_RELOAD_OUT)
+  if (prr->dir != CMD_RELOAD_OUT)
     WALK_LIST(c, p->channels)
       if ((c->channel_state == CS_UP) && !channel_reloadable(c))
       {
@@ -2682,16 +2908,56 @@ proto_cmd_reload(struct proto *p, uintptr_t dir, int cnt UNUSED)
   log(L_INFO "Reloading protocol %s", p->name);
 
   /* re-importing routes */
-  if (dir != CMD_RELOAD_OUT)
+  if (prr->dir != CMD_RELOAD_OUT)
     WALK_LIST(c, p->channels)
       if (c->channel_state == CS_UP)
-	channel_request_reload(c);
+      {
+        if (prr->trie)
+	{
+	  /* Increase the refeed counter */
+	  atomic_fetch_add_explicit(&prr->counter, 1, memory_order_relaxed);
+	  ASSERT_DIE(this_cli->parser_pool != prr->trie->lp);
+
+	  struct channel_cmd_reload_import_request *req = lp_alloc(prr->trie->lp, sizeof *req);
+	  *req = (struct channel_cmd_reload_import_request) {
+	    .cir = {
+	      .done = channel_reload_in_done,
+	      .trie = prr->trie,
+	    },
+	    .prr = prr,
+	  };
+	  channel_request_partial_reload(c, &req->cir);
+        }
+        else
+	  channel_request_reload(c);
+      }
 
   /* re-exporting routes */
-  if (dir != CMD_RELOAD_IN)
+  if (prr->dir != CMD_RELOAD_IN)
     WALK_LIST(c, p->channels)
-      if (c->channel_state == CS_UP)
-	channel_request_feeding_dynamic(c, CFRT_AUXILIARY);
+      if ((c->channel_state == CS_UP) && (c->out_req.hook))
+        if (prr->trie)
+	{
+	  /* Increase the refeed counter */
+	  atomic_fetch_add_explicit(&prr->counter, 1, memory_order_relaxed);
+	  ASSERT_DIE(this_cli->parser_pool != prr->trie->lp);
+
+	  /* Request actually the feeding */
+
+	  struct channel_cmd_reload_feeding_request *req = lp_alloc(prr->trie->lp, sizeof *req);
+	  *req = (struct channel_cmd_reload_feeding_request) {
+	    .cfr = {
+	      .type = CFRT_AUXILIARY,
+	      .done = channel_reload_out_done,
+	      .trie = prr->trie,
+	    },
+	    .prr = prr,
+	  };
+
+	  channel_request_feeding(c, &req->cfr);
+	}
+	else
+	  channel_request_feeding_dynamic(c, CFRT_AUXILIARY);
 
   cli_msg(-15, "%s: reloading", p->name);
 }
diff --git a/nest/protocol.h b/nest/protocol.h
index 227201dc..77371028 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -125,6 +125,12 @@ struct proto_config {
   /* Protocol-specific data follow... */
 };
 
+struct channel_import_request {
+  struct channel_import_request *next;			/* Next in request chain */
+  void (*done)(struct channel_import_request *);	/* Called when import finishes */
+  const struct f_trie *trie;				/* Reload only matching nets */
+};
+
 #define TLIST_PREFIX proto
 #define TLIST_TYPE struct proto
 #define TLIST_ITEM n
@@ -194,7 +200,7 @@ struct proto {
 
   void (*rt_notify)(struct proto *, struct channel *, const net_addr *net, struct rte *new, const struct rte *old);
   int (*preexport)(struct channel *, struct rte *rt);
-  void (*reload_routes)(struct channel *);
+  int (*reload_routes)(struct channel *, struct channel_import_request *cir);
   void (*feed_begin)(struct channel *);
   void (*feed_end)(struct channel *);
 
@@ -280,6 +286,14 @@ struct proto *proto_iterate_named(struct symbol *sym, struct protocol *proto, st
 
 #define PROTO_WALK_CMD(sym,pr,p) for(struct proto *p = NULL; p = proto_iterate_named(sym, pr, p); )
 
+/* Request from CLI to reload multiple protocols */
+struct proto_reload_request {
+  const struct f_trie *trie;	/* Trie to apply */
+  _Atomic uint counter;		/* How many channels remaining */
+  uint dir;			/* Direction of reload */
+  event ev;			/* Event to run when finished */
+};
+
 #define PROTO_ENTER_FROM_MAIN(p)    ({ \
     ASSERT_DIE(birdloop_inside(&main_birdloop)); \
     struct birdloop *_loop = (p)->loop; \
@@ -573,6 +587,8 @@ struct channel {
   struct f_trie *refeed_trie;		/* Auxiliary refeed trie */
   struct channel_feeding_request *refeeding;	/* Refeeding the channel */
   struct channel_feeding_request *refeed_pending;	/* Scheduled refeeds */
+  struct channel_import_request *importing;	/* Importing the channel */
+  struct channel_import_request *import_pending;	/* Scheduled imports */
 
   uint feed_block_size;			/* How many routes to feed at once */
 
@@ -669,7 +685,8 @@ struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
 
 void channel_set_state(struct channel *c, uint state);
-void channel_schedule_reload(struct channel *c);
+void channel_schedule_reload(struct channel *c, struct channel_import_request *cir);
+int channel_import_request_prefilter(struct channel_import_request *cir_head, const net_addr *n);
 
 static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); }
 static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP); }
@@ -678,7 +695,7 @@ static inline void channel_close(struct channel *c) { channel_set_state(c, CS_ST
 struct channel_feeding_request {
   struct channel_feeding_request *next;			/* Next in request chain */
   void (*done)(struct channel_feeding_request *);	/* Called when refeed finishes */
-  struct f_trie *trie;					/* Reload only matching nets */
+  const struct f_trie *trie;				/* Reload only matching nets */
   PACKED enum channel_feeding_request_type {
     CFRT_DIRECT = 1,					/* Refeed by export restart */
     CFRT_AUXILIARY,					/* Refeed by auxiliary request */
diff --git a/nest/rt.h b/nest/rt.h
index bd9f9363..65da04a1 100644
--- a/nest/rt.h
+++ b/nest/rt.h
@@ -253,6 +253,23 @@ struct rte_storage {
 
 /* Table-channel connections */
 
+struct rt_prefilter {
+  union {
+    const struct f_trie *trie;
+    const net_addr *addr;	/* Network prefilter address */
+    int (*hook)(const struct rt_prefilter *, const net_addr *);
+  };
+				/* Network prefilter mode (TE_ADDR_*) */
+  enum {
+    TE_ADDR_NONE = 0,		/* No address matching */
+    TE_ADDR_EQUAL,		/* Exact query - show route <addr> */
+    TE_ADDR_FOR,		/* Longest prefix match - show route for <addr> */
+    TE_ADDR_IN,			/* Interval query - show route in <addr> */
+    TE_ADDR_TRIE,		/* Query defined by trie */
+    TE_ADDR_HOOK,		/* Query processed by supplied custom hook */
+  } mode;
+} PACKED;
+
 struct rt_import_request {
   struct rt_import_hook *hook;		/* The table part of importer */
   char *name;
@@ -300,23 +317,6 @@ struct rt_pending_export {
   u64 seq;				/* Sequential ID (table-local) of the pending export */
 };
 
-struct rt_prefilter {
-  union {
-    const struct f_trie *trie;
-    const net_addr *addr;	/* Network prefilter address */
-    int (*hook)(const struct rt_prefilter *, const net_addr *);
-  };
-				/* Network prefilter mode (TE_ADDR_*) */
-  enum {
-    TE_ADDR_NONE = 0,		/* No address matching */
-    TE_ADDR_EQUAL,		/* Exact query - show route <addr> */
-    TE_ADDR_FOR,		/* Longest prefix match - show route for <addr> */
-    TE_ADDR_IN,			/* Interval query - show route in <addr> */
-    TE_ADDR_TRIE,		/* Query defined by trie */
-    TE_ADDR_HOOK,		/* Query processed by supplied custom hook */
-  } mode;
-} PACKED;
-
 struct rt_export_request {
   struct rt_export_hook *hook;		/* Table part of the export */
   char *name;		/* Network prefilter address */
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index f7307b66..9ecc9e54 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1904,6 +1904,7 @@ bgp_out_table_feed(void *data)
     {
       switch (hook->h.req->prefilter.mode)
       {
+	case TE_ADDR_HOOK:
 	case TE_ADDR_TRIE:
 	case TE_ADDR_IN:
 	  if (!rt_prefilter_net(&hook->h.req->prefilter, n->net))
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 0de9c603..bac1af3a 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1560,18 +1560,30 @@ bgp_update_bfd(struct bgp_proto *p, const struct bfd_options *bfd)
   }
 }
 
-static void
-bgp_reload_routes(struct channel *C)
+static int
+bgp_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
   /* Ignore non-BGP channels */
   if (C->class != &channel_bgp)
-    return;
+  {
+    cir->done(cir);
+    return 1;
+  }
+
+  if (cir->trie)
+  {
+    cir->done(cir);
+    return 0;
+  }
+  /* We do not need cir anymore and later we will not be able to detect when to free it. */
+  cir->done(cir);
 
   ASSERT(p->conn && p->route_refresh);
   bgp_schedule_packet(p->conn, c, PKT_ROUTE_REFRESH);
+  return 1;
 }
 
 static void
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 896bf5a3..c1635afc 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -109,7 +109,7 @@
 #include "lib/macro.h"
 
 static int ospf_preexport(struct channel *C, rte *new);
-static void ospf_reload_routes(struct channel *C);
+static int ospf_reload_routes(struct channel *C, struct channel_import_request *cir);
 static int ospf_rte_better(const rte *new, const rte *old);
 static u32 ospf_rte_igp_metric(const rte *rt);
 static void ospf_disp(timer *timer);
@@ -432,16 +432,19 @@ ospf_schedule_rtcalc(struct ospf_proto *p)
   p->calcrt = 1;
 }
 
-static void
-ospf_reload_routes(struct channel *C)
+static int
+ospf_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct ospf_proto *p = (struct ospf_proto *) C->proto;
+  cir->next = p->cir;
+  p->cir = cir;
 
   if (p->calcrt == 2)
-    return;
+    return 1;
 
   OSPF_TRACE(D_EVENTS, "Scheduling routing table calculation with route reload");
   p->calcrt = 2;
+  return 1;
 }
 
 
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 3477ba5a..aebd04d7 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -219,6 +219,7 @@ struct ospf_proto
   slist lsal;			/* List of all LSA's */
   int calcrt;			/* Routing table calculation scheduled?
 				   0=no, 1=normal, 2=forced reload */
+  struct channel_import_request *cir; /* Struct with trie for partial reload */
   list iface_list;		/* List of OSPF interfaces (struct ospf_iface) */
   list area_list;		/* List of OSPF areas (struct ospf_area) */
   int areano;			/* Number of area I belong to */
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 69c2907d..ffb075d5 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -1700,7 +1700,8 @@ ospf_rt_spf(struct ospf_proto *p)
   rt_sync(p);
   lp_flush(p->nhpool);
 
-  p->calcrt = 0;
+  if (p->cir == NULL)	/* If there is no more cir waiting for reload */
+    p->calcrt = 0;
 }
 
 
@@ -2020,11 +2021,16 @@ rt_sync(struct ospf_proto *p)
 
   OSPF_TRACE(D_EVENTS, "Starting routing table synchronization");
 
+  struct channel_import_request *cir = p->cir;
+  p->cir = NULL;
+
   DBG("Now syncing my rt table with nest's\n");
   FIB_ITERATE_INIT(&fit, fib);
 again1:
   FIB_ITERATE_START(fib, &fit, ort, nf)
   {
+    if (cir && !channel_import_request_prefilter(cir, nf->fn.addr))
+      continue;
     /* Sanity check of next-hop addresses, failure should not happen */
     if (nf->n.type && nf->n.nhs)
     {
@@ -2099,7 +2105,6 @@ again1:
 	DBG("Mod rte type %d - %N via %I on iface %s, met %d\n",
 	    a0.source, nf->fn.addr, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1);
 	    */
-
 	rte_update(p->p.main_channel, nf->fn.addr, &e0, p->p.main_source);
       }
     }
@@ -2125,6 +2130,13 @@ again1:
   }
   FIB_ITERATE_END;
 
+  while(cir)
+  {
+    struct channel_import_request *next = cir->next;
+    cir->done(cir);
+    cir = next;
+  }
+
   WALK_LIST(oa, p->area_list)
   {
     /* Cleanup ASBR hash tables */
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 442a951f..1aeba30b 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -96,13 +96,37 @@ pipe_preexport(struct channel *C, rte *e)
   return 0;
 }
 
-static void
-pipe_reload_routes(struct channel *C)
+void
+pipe_import_by_refeed_free(struct channel_feeding_request *cfr)
+{
+  struct import_to_export_reload *reload = SKIP_BACK(struct import_to_export_reload, cfr, cfr);
+  reload->cir->done(reload->cir);
+}
+
+static int
+pipe_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct pipe_proto *p = (void *) C->proto;
-
-  /* Route reload on one channel is just refeed on the other */
-  channel_request_feeding_dynamic((C == p->pri) ? p->sec : p->pri, CFRT_DIRECT);
+  if (cir->trie)
+  {
+    struct import_to_export_reload *reload = lp_alloc(cir->trie->lp, sizeof *reload);
+    *reload = (struct import_to_export_reload) {
+      .cir = cir,
+      .cfr = {
+	      .type = CFRT_AUXILIARY,
+	      .done = pipe_import_by_refeed_free,
+	      .trie = cir->trie,
+	    },
+    };
+    channel_request_feeding((C == p->pri) ? p->sec : p->pri, &reload->cfr);
+  }
+  else
+  {
+    /* Route reload on one channel is just refeed on the other */
+    channel_request_feeding_dynamic((C == p->pri) ? p->sec : p->pri, CFRT_DIRECT);
+    cir->done(cir);
+  }
+  return 1;
 }
 
 static void
diff --git a/proto/pipe/pipe.h b/proto/pipe/pipe.h
index 501b8565..c714f13b 100644
--- a/proto/pipe/pipe.h
+++ b/proto/pipe/pipe.h
@@ -28,3 +28,8 @@ struct pipe_proto {
 #define PIPE_FL_RR_BEGIN_PENDING	1	/* Route refresh should start with the first route notified */
 
 #endif
+
+struct import_to_export_reload {
+  struct channel_import_request *cir;	/* We can not free this struct before reload finishes. */
+  struct channel_feeding_request cfr;	/* New request we actually need - import was changed to feed the other side. */
+};
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index e09d082b..50a07514 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -968,6 +968,9 @@ rip_timer(timer *t)
 
   FIB_ITERATE_INIT(&fit, &p->rtable);
 
+  struct channel_import_request *cir = p->cir;
+  p->cir = NULL;
+
   loop:
   FIB_ITERATE_START(&p->rtable, &fit, struct rip_entry, en)
   {
@@ -989,14 +992,13 @@ rip_timer(timer *t)
     }
 
     /* Propagating eventual change */
-    if (changed || p->rt_reload)
+    if ((changed || p->rt_reload) && (cir == NULL || channel_import_request_prefilter(cir, en->n.addr)))
     {
       /*
        * We have to restart the iteration because there may be a cascade of
        * synchronous events rip_announce_rte() -> nest table change ->
        * rip_rt_notify() -> p->rtable change, invalidating hidden variables.
        */
-
       FIB_ITERATE_PUT_NEXT(&fit, &p->rtable);
       rip_announce_rte(p, en);
       goto loop;
@@ -1047,7 +1049,19 @@ rip_timer(timer *t)
       }
   }
 
-  tm_start(p->timer, MAX(next - now_, 100 MS));
+  while(cir)
+  {
+    struct channel_import_request *next_cir = cir->next;
+    cir->done(cir);
+    cir = next_cir;
+  }
+  if (p->cir)
+  {
+    p->rt_reload = 1;
+    rip_kick_timer(p);
+  }
+  else
+    tm_start(p->timer, MAX(next - now_, 100 MS));
 }
 
 static inline void
@@ -1148,17 +1162,21 @@ rip_trigger_update(struct rip_proto *p)
  *	RIP protocol glue
  */
 
-static void
-rip_reload_routes(struct channel *C)
+static int
+rip_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct rip_proto *p = (struct rip_proto *) C->proto;
 
+  cir->next = p->cir;
+  p->cir = cir;
+
   if (p->rt_reload)
-    return;
+    return 1;
 
   TRACE(D_EVENTS, "Scheduling route reload");
   p->rt_reload = 1;
   rip_kick_timer(p);
+  return 1;
 }
 
 static struct rte_owner_class rip_rte_owner_class;
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 6d70df46..941efb85 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -103,6 +103,7 @@ struct rip_proto
 
   struct tbf log_pkt_tbf;		/* TBF for packet messages */
   struct tbf log_rte_tbf;		/* TBF for RTE messages */
+  struct channel_import_request *cir;	/* Trie for partial reload */
 };
 
 struct rip_iface
diff --git a/proto/static/static.c b/proto/static/static.c
index 2c3e09f4..c31b6268 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -172,6 +172,25 @@ static_mark_all(struct static_proto *p)
     ev_schedule(p->event);
 }
 
+static void
+static_mark_partial(struct static_proto *p, struct channel_import_request *cir)
+{
+  struct static_config *cf = (void *) p->p.cf;
+  struct static_route *r;
+
+  WALK_LIST(r, cf->routes)
+    if (r->state == SRS_CLEAN && trie_match_net(cir->trie, r->net))
+    {
+      r->state = SRS_DIRTY;
+      BUFFER_PUSH(p->marked) = r;
+    }
+
+  if (!ev_active(p->event))
+    ev_schedule(p->event);
+
+  cir->done(cir);
+}
+
 
 static void
 static_announce_marked(void *P)
@@ -395,14 +414,19 @@ static_bfd_notify(struct bfd_request *req)
     static_mark_rte(p, r->mp_head);
 }
 
-static void
-static_reload_routes(struct channel *C)
+static int
+static_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct static_proto *p = (void *) C->proto;
 
   TRACE(D_EVENTS, "Scheduling route reload");
 
-  static_mark_all(p);
+  if (cir->trie)
+    static_mark_partial(p, cir);
+  else
+    static_mark_all(p);
+
+  return 1;
 }
 
 static int
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0187bf0e..4c5afddc 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -766,11 +766,18 @@ krt_if_notify(struct proto *P, uint flags, struct iface *iface UNUSED)
     krt_scan_timer_kick(p);
 }
 
-static void
-krt_reload_routes(struct channel *C)
+static int
+krt_reload_routes(struct channel *C, struct channel_import_request *cir)
 {
   struct krt_proto *p = (void *) C->proto;
 
+
+  if (cir->trie)
+  {
+    cir->done(cir);
+    return 0;
+  }
+
   /* Although we keep learned routes in krt_table, we rather schedule a scan */
 
   if (KRT_CF->learn)
@@ -778,6 +785,9 @@ krt_reload_routes(struct channel *C)
     p->reload = 1;
     krt_scan_timer_kick(p);
   }
+
+  cir->done(cir);
+  return 1;
 }
 
 static void krt_cleanup(struct krt_proto *p);

From f992e7e1feea20074fff981473cbadd3182dd848 Mon Sep 17 00:00:00 2001
From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Mon, 6 Nov 2023 09:38:13 +0100
Subject: [PATCH 388/431] krt.c: fixup lots of routes learn & unlearn

---
 sysdep/unix/krt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 19978a75..6c8ee1b5 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -531,6 +531,7 @@ done:;
 static void
 krt_init_scan(struct krt_proto *p)
 {
+  rt_refresh_begin(&p->p.main_channel->in_req);
   bmap_reset(&p->seen_map, 1024);
 }
 
@@ -562,6 +563,7 @@ krt_prune(struct krt_proto *p)
     p->initialized = 1;
 
   }
+  rt_refresh_end(&p->p.main_channel->in_req);
 }
 
 void

From a0b48352539b1344ee29826cd6c62bc459721232 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 16 Oct 2023 15:21:36 +0200
Subject: [PATCH 389/431] MPLS: Fix issue with recursive MPLS routes

Recursive MPLS routes used hostentry from the original route, which
triggered different table than MPLS table, and therefore were not
updated.
---
 nest/mpls.c     | 7 +++++--
 nest/route.h    | 3 ++-
 nest/rt-table.c | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nest/mpls.c b/nest/mpls.c
index cd3a90d9..1992234c 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -838,10 +838,13 @@ mpls_announce_fec(struct mpls_fec_map *m, struct mpls_fec *fec, const rta *src)
     const u32 *labels = &src->nh.label[src->nh.labels - src->nh.labels_orig];
     mpls_label_stack ms;
 
-    /* Apply the hostentry with the original labelstack */
+    /* Reconstruct the original labelstack */
     ms.len = src->nh.labels_orig;
     memcpy(ms.stack, labels, src->nh.labels_orig * sizeof(u32));
-    rta_apply_hostentry(a, src->hostentry, &ms);
+
+    /* The same hostentry, but different dependent table */
+    struct hostentry *s = src->hostentry;
+    rta_set_recursive_next_hop(m->channel->table, a, s->owner, s->addr, s->link, &ms);
   }
 
   net_addr_mpls n = NET_ADDR_MPLS(fec->label);
diff --git a/nest/route.h b/nest/route.h
index a9bcd7d3..0e502b99 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -244,7 +244,8 @@ struct hostentry {
   ip_addr addr;				/* IP address of host, part of key */
   ip_addr link;				/* (link-local) IP address of host, used as gw
 					   if host is directly attached */
-  struct rtable *tab;			/* Dependent table, part of key */
+  rtable *tab;				/* Dependent table, part of key */
+  rtable *owner;			/* Nexthop owner table */
   struct hostentry *next;		/* Next in hash chain */
   unsigned hash_key;			/* Hash key */
   unsigned uc;				/* Use count */
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e1b2867f..31c59ccb 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3659,6 +3659,7 @@ rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
       return he;
 
   he = hc_new_hostentry(hc, tab->rp, a, link, dep, k);
+  he->owner = tab;
   rt_update_hostentry(tab, he);
   return he;
 }

From d7f5248bcca5adb8f48fd651f39251d271ded08d Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Nov 2023 17:42:22 +0100
Subject: [PATCH 390/431] More descriptive bug message on deadlock prevention

---
 lib/resource.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/resource.c b/lib/resource.c
index 674e778d..5685ef05 100644
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -73,14 +73,14 @@ rp_new(pool *p, struct domain_generic *dom, const char *name)
   pool *z = ralloc(p, &pool_class);
 
   if (dg_order(p->domain) > dg_order(dom))
-    bug("Requested reverse order pool creation: %s (%d) can't be a parent of %s (%d)",
-	domain_name(p->domain), dg_order(p->domain),
-	domain_name(dom), dg_order(dom));
+    bug("Requested reverse order pool creation: %s (%s, order %d) can't be a parent of %s (%s, order %d)",
+	p->name, domain_name(p->domain), dg_order(p->domain),
+	name, domain_name(dom), dg_order(dom));
 
   if ((dg_order(p->domain) == dg_order(dom)) && (p->domain != dom))
-    bug("Requested incomparable order pool creation: %s (%d) can't be a parent of %s (%d)",
-	domain_name(p->domain), dg_order(p->domain),
-	domain_name(dom), dg_order(dom));
+    bug("Requested incomparable order pool creation: %s (%s, order %d) can't be a parent of %s (%s, order %d)",
+	p->name, domain_name(p->domain), dg_order(p->domain),
+	name, domain_name(dom), dg_order(dom));
 
   rp_init(z, dom, name);
   return z;

From 980ef11016546ecd409a7f83b33a2f8f758ec926 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 26 Oct 2023 23:09:20 +0200
Subject: [PATCH 391/431] C Compiler Attribute Cleanup Test

There is a long-known CC attribute cleanup which allows to call a custom
cleanup function when an auto-storage variable ceases to exist. We're
gonna use it for end-of-loop and leave-locked-block macros.

This commit adds a static unit test for this compiler feature to be sure
that it really does what we want. We're looking forward to the next ISO
C norm where this may finally get a nice syntax and standardization.
---
 lib/Makefile                 |  2 +-
 lib/attribute_cleanup_test.c | 82 ++++++++++++++++++++++++++++++++++++
 lib/birdlib.h                |  1 +
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 lib/attribute_cleanup_test.c

diff --git a/lib/Makefile b/lib/Makefile
index 812f721c..5a90e6b4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,6 @@ src := bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
+tests_src := attribute_cleanup_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/lib/attribute_cleanup_test.c b/lib/attribute_cleanup_test.c
new file mode 100644
index 00000000..9d1caa05
--- /dev/null
+++ b/lib/attribute_cleanup_test.c
@@ -0,0 +1,82 @@
+/*
+ *	BIRD Library -- Auto storage attribute cleanup test
+ *
+ *	(c) 2023 Maria Matejka <mq@jmq.cz>
+ *	(c) 2023 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "test/birdtest.h"
+
+static int order_pos;
+#define CHECK(n) bt_assert(order_pos++ == (n))
+
+static void
+tacd_cleanup(int *val)
+{
+  CHECK(*val);
+}
+
+static void
+tacd_aux(int pos)
+{
+  CHECK(pos + 0);
+
+  UNUSED CLEANUP(tacd_cleanup) int upmost = pos + 18;
+
+  if (order_pos > 0)
+  {
+    CHECK(pos + 1);
+    UNUSED CLEANUP(tacd_cleanup) int inner_if = pos + 3;
+    CHECK(pos + 2);
+  }
+
+  for (int i=0; i<3; i++)
+  {
+    CHECK(pos + 4 + 3*i);
+    UNUSED CLEANUP(tacd_cleanup) int inner_for = pos + 6 + 3*i;
+    CHECK(pos + 5 + 3*i);
+  }
+
+  for (
+      CLEANUP(tacd_cleanup) int i = pos + 15;
+      i < pos + 16; i++)
+  {
+    CHECK(pos + 13);
+    UNUSED CLEANUP(tacd_cleanup) int inner_for = pos + 15;
+    CHECK(pos + 14);
+  }
+
+  CHECK(pos + 17);
+}
+
+#define CHECKCNT 19
+
+static int
+t_attribute_cleanup(void)
+{
+  order_pos = 0;
+  CHECK(0);
+
+  for (int i=0; i<3; i++)
+  {
+    CHECK(i*(CHECKCNT+3) + 1);
+    UNUSED CLEANUP(tacd_cleanup) int inner_for = (i+1) * (CHECKCNT+3);
+    tacd_aux(i*(CHECKCNT+3) + 2);
+    CHECK((i+1) * (CHECKCNT+3) - 1);
+  }
+
+  CHECK(3 * (CHECKCNT+3) + 1);
+
+  return 1;
+}
+
+int main(int argc, char **argv)
+{
+  bt_init(argc, argv);
+
+  bt_test_suite(t_attribute_cleanup, "Basic usability of the cleanup attribute");
+
+  return bt_exit_value();
+}
diff --git a/lib/birdlib.h b/lib/birdlib.h
index b7226411..bebefcda 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -76,6 +76,7 @@ static inline int u64_cmp(u64 i1, u64 i2)
 #define UNUSED __attribute__((unused))
 #define PACKED __attribute__((packed))
 #define NONNULL(...) __attribute__((nonnull((__VA_ARGS__))))
+#define CLEANUP(fun) __attribute__((cleanup(fun)))
 
 #define STATIC_ASSERT(EXP) _Static_assert(EXP, #EXP)
 #define STATIC_ASSERT_MSG(EXP,MSG) _Static_assert(EXP, MSG)

From 4d22f52f640f5475f0a83fbc163900135d353cca Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 10 Nov 2023 21:33:53 +0100
Subject: [PATCH 392/431] Locking data structures

If a data structure is associated with a lock, having a public
and a private part, there are now useful macros for these data
structures.
---
 configure.ac       |   1 +
 lib/Makefile       |   2 +-
 lib/locking.h      | 201 +++++++++++++++++++++++++++++++++++++++++++++
 lib/locking_test.c |  91 ++++++++++++++++++++
 4 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 lib/locking_test.c

diff --git a/configure.ac b/configure.ac
index c71b5eab..fc2ba940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,7 @@ if test "$bird_cflags_default" = yes ; then
   BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign], [-Wall])
   BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers], [-Wall -Wextra])
 
+
   if test "$enable_debug" = no; then
     BIRD_CHECK_LTO
   fi
diff --git a/lib/Makefile b/lib/Makefile
index 0762b606..cd40bade 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,6 @@ src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c
 obj := $(src-o-files)
 $(all-daemon)
 
-tests_src := a-set_test.c a-path_test.c attribute_cleanup_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c tlists_test.c type_test.c
+tests_src := a-set_test.c a-path_test.c attribute_cleanup_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c locking_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c tlists_test.c type_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/lib/locking.h b/lib/locking.h
index fbc8fd8b..6cec2ff3 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -72,4 +72,205 @@ extern DOMAIN(the_bird) the_bird_domain;
 
 #define ASSERT_THE_BIRD_LOCKED	({ if (!the_bird_locked()) bug("The BIRD lock must be locked here: %s:%d", __FILE__, __LINE__); })
 
+/**
+ *  Objects bound with domains
+ *
+ *  First, we need some object to have its locked and unlocked part.
+ *  This is accomplished typically by the following pattern:
+ *
+ *    struct foo_public {
+ *      ...			// Public fields
+ *      DOMAIN(bar) lock;	// The assigned domain
+ *    };
+ *
+ *    struct foo_private {
+ *      struct foo_public;	// Importing public fields
+ *      struct foo_private **locked_at;	// Auxiliary field for locking routines
+ *      ...			// Private fields
+ *    };
+ *
+ *    typedef union foo {
+ *      struct foo_public;
+ *      struct foo_private priv;
+ *    } foo;
+ *
+ *  All persistently stored object pointers MUST point to the public parts.
+ *  If accessing the locked object from embedded objects, great care must
+ *  be applied to always SKIP_BACK to the public object version, not the
+ *  private one.
+ *
+ *  To access the private object parts, either the private object pointer
+ *  is explicitly given to us, therefore assuming somewhere else the domain
+ *  has been locked, or we have to lock the domain ourselves. To do that,
+ *  there are some handy macros.
+ */
+
+#define LOBJ_LOCK_SIMPLE(_obj, _level) \
+  ({ LOCK_DOMAIN(_level, (_obj)->lock); &(_obj)->priv; })
+
+#define LOBJ_UNLOCK_SIMPLE(_obj, _level) \
+  UNLOCK_DOMAIN(_level, (_obj)->lock)
+
+/*
+ *  These macros can be used to define specific macros for given class.
+ *
+ *  #define FOO_LOCK_SIMPLE(foo)	LOBJ_LOCK_SIMPLE(foo, bar)
+ *  #define FOO_UNLOCK_SIMPLE(foo)	LOBJ_UNLOCK_SIMPLE(foo, bar)
+ *
+ *  Then these can be used like this:
+ *
+ *  void foo_frobnicate(foo *f)
+ *  {
+ *    // Unlocked context
+ *    ...
+ *    struct foo_private *fp = FOO_LOCK_SIMPLE(f);
+ *    // Locked context
+ *    ...
+ *    FOO_UNLOCK_SIMPLE(f);
+ *    // Unlocked context
+ *    ...
+ *  }
+ *
+ *  These simple calls have two major drawbacks. First, if you return
+ *  from locked context, you don't unlock, which may lock you dead.
+ *  And second, the foo_private pointer is still syntactically valid
+ *  even after unlocking.
+ *
+ *  To fight this, we need more magic and the switch should stay in that
+ *  position.
+ *
+ *  First, we need an auxiliary _function_ for unlocking. This function
+ *  is intended to be called in a local variable cleanup context.
+ */
+
+#define LOBJ_UNLOCK_CLEANUP_NAME(_stem) _lobj__##_stem##_unlock_cleanup
+
+#define LOBJ_UNLOCK_CLEANUP(_stem, _level) \
+  static inline void LOBJ_UNLOCK_CLEANUP_NAME(_stem)(struct _stem##_private **obj) { \
+    if (!*obj) return; \
+    ASSERT_DIE(LOBJ_IS_LOCKED((*obj), _level)); \
+    ASSERT_DIE((*obj)->locked_at == obj); \
+    (*obj)->locked_at = NULL; \
+    UNLOCK_DOMAIN(_level, (*obj)->lock); \
+  }
+
+#define LOBJ_LOCK(_obj, _pobj, _stem, _level) \
+  CLEANUP(LOBJ_UNLOCK_CLEANUP_NAME(_stem)) struct _stem##_private *_pobj = LOBJ_LOCK_SIMPLE(_obj, _level); _pobj->locked_at = &_pobj;
+
+/*
+ *  And now the usage of these macros. You first need to declare the auxiliary
+ *  cleanup function.
+ *
+ *  LOBJ_UNLOCK_CLEANUP(foo, bar);
+ *
+ *  And then declare the lock-local macro:
+ *
+ *  #define FOO_LOCK(foo, fpp)	LOBJ_LOCK(foo, fpp, foo, bar)
+ *
+ *  This construction then allows you to lock much more safely:
+ *
+ *  void foo_frobnicate_safer(foo *f)
+ *  {
+ *    // Unlocked context
+ *    ...
+ *    do {
+ *      FOO_LOCK(foo, fpp);
+ *	// Locked context, fpp is valid here
+ *
+ *	if (something) return;	// This implicitly unlocks
+ *	if (whatever) break;	// This unlocks too
+ *
+ *      // Finishing context with no unlock at all
+ *    } while (0);
+ *
+ *    // Here is fpp invalid and the object is back unlocked.
+ *    ...
+ *  }
+ *
+ *  There is no explicit unlock statement. To unlock, simply leave the block
+ *  with locked context.
+ *
+ *  This may be made even nicer to use by employing a for-cycle.
+ */
+
+#define LOBJ_LOCKED(_obj, _pobj, _stem, _level) \
+  for (CLEANUP(LOBJ_UNLOCK_CLEANUP_NAME(_stem)) struct _stem##_private *_pobj = LOBJ_LOCK_SIMPLE(_obj, _level); \
+      _pobj ? (_pobj->locked_at = &_pobj) : NULL; \
+      LOBJ_UNLOCK_CLEANUP_NAME(_stem)(&_pobj), _pobj = NULL)
+
+/*
+ *  This for-cycle employs heavy magic to hide as much of the boilerplate
+ *  from the user as possibly needed. Here is how it works.
+ *
+ *  First, the for-1 clause is executed, setting up _pobj, to the private
+ *  object pointer. It has a cleanup hook set.
+ *
+ *  Then, the for-2 clause is checked. As _pobj is non-NULL, _pobj->locked_at
+ *  is initialized to the _pobj address to ensure that the cleanup hook unlocks
+ *  the right object.
+ *
+ *  Now the user block is executed. If it ends by break or return, the cleanup
+ *  hook fires for _pobj, triggering object unlock.
+ *
+ *  If the user block executed completely, the for-3 clause is run, executing
+ *  the cleanup hook directly and then deactivating it by setting _pobj to NULL.
+ *
+ *  Finally, the for-2 clause is checked again but now with _pobj being NULL,
+ *  causing the loop to end. As the object has already been unlocked, nothing
+ *  happens after leaving the context.
+ *
+ *  #define FOO_LOCKED(foo, fpp)	LOBJ_LOCKED(foo, fpp, foo, bar)
+ *
+ *  Then the previous code can be modified like this:
+ *
+ *  void foo_frobnicate_safer(foo *f)
+ *  {
+ *    // Unlocked context
+ *    ...
+ *    FOO_LOCKED(foo, fpp)
+ *    {
+ *	// Locked context, fpp is valid here
+ *
+ *	if (something) return;	// This implicitly unlocks
+ *	if (whatever) break;	// This unlocks too
+ *
+ *      // Finishing context with no unlock at all
+ *    }
+ *
+ *    // Unlocked context
+ *    ...
+ *
+ *    // Locking once again without an explicit block
+ *    FOO_LOCKED(foo, fpp)
+ *	do_something(fpp);
+ *
+ *    // Here is fpp invalid and the object is back unlocked.
+ *    ...
+ *  }
+ *
+ *
+ *  For many reasons, a lock-check macro is handy.
+ *
+ *  #define FOO_IS_LOCKED(foo)	LOBJ_IS_LOCKED(foo, bar)
+ */
+
+#define LOBJ_IS_LOCKED(_obj, _level)	DOMAIN_IS_LOCKED(_level, (_obj)->lock)
+
+/*
+ *  An example implementation is available in lib/locking_test.c
+ */
+
+
+/*
+ *  Please don't use this macro unless you at least try to prove that
+ *  it's completely safe. It's a can of worms.
+ *
+ *  NEVER RETURN OR BREAK FROM THIS MACRO, it will crash.
+ */
+
+#define LOBJ_UNLOCKED_TEMPORARILY(_obj, _pobj, _stem, _level) \
+  for (union _stem *_obj = SKIP_BACK(union _stem, priv, _pobj), **_lataux = (union _stem **) _pobj->locked_at; \
+      _obj ? (_pobj->locked_at = NULL, LOBJ_UNLOCK_SIMPLE(_obj, _level), _obj) : NULL; \
+      LOBJ_LOCK_SIMPLE(_obj, _level), _pobj->locked_at = (struct _stem##_private **) _lataux, _obj = NULL)
+
 #endif
diff --git a/lib/locking_test.c b/lib/locking_test.c
new file mode 100644
index 00000000..0d99b189
--- /dev/null
+++ b/lib/locking_test.c
@@ -0,0 +1,91 @@
+#include "test/birdtest.h"
+#include "test/bt-utils.h"
+
+#include "lib/locking.h"
+#include <stdatomic.h>
+#include <pthread.h>
+
+DEFINE_DOMAIN(proto);
+
+#define FOO_PUBLIC \
+  const char *name;	\
+  _Atomic uint counter;	\
+  DOMAIN(proto) lock;	\
+
+struct foo_private {
+  struct { FOO_PUBLIC; };
+  struct foo_private **locked_at;
+  uint private_counter;
+};
+
+typedef union foo {
+  struct { FOO_PUBLIC; };
+  struct foo_private priv;
+} foo;
+
+LOBJ_UNLOCK_CLEANUP(foo, proto);
+#define FOO_LOCK(_foo, _fpp)	LOBJ_LOCK(_foo, _fpp, foo, proto)
+#define FOO_LOCKED(_foo, _fpp)	LOBJ_LOCKED(_foo, _fpp, foo, proto)
+#define FOO_IS_LOCKED(_foo)	LOBJ_IS_LOCKED(_foo, proto)
+
+static uint
+inc_public(foo *f)
+{
+  return atomic_fetch_add_explicit(&f->counter, 1, memory_order_relaxed) + 1;
+}
+
+static uint
+inc_private(foo *f)
+{
+  FOO_LOCKED(f, fp) return ++fp->private_counter;
+  bug("Returning always");
+}
+
+#define BLOCKCOUNT  4096
+#define THREADS	    16
+#define REPEATS	    128
+
+static void *
+thread_run(void *_foo)
+{
+  foo *f = _foo;
+
+  for (int i=0; i<REPEATS; i++)
+    if (i % 2)
+      for (int j=0; j<BLOCKCOUNT; j++)
+	inc_public(f);
+    else
+      for (int j=0; j<BLOCKCOUNT; j++)
+	inc_private(f);
+
+  return NULL;
+}
+
+static int
+t_locking(void)
+{
+  pthread_t thr[THREADS];
+  foo f = { .lock = DOMAIN_NEW(proto), };
+
+  for (int i=0; i<THREADS; i++)
+    bt_assert(pthread_create(&thr[i], NULL, thread_run, &f) == 0);
+
+  for (int i=0; i<THREADS; i++)
+    bt_assert(pthread_join(thr[i], NULL) == 0);
+
+  bt_assert(f.priv.private_counter == atomic_load_explicit(&f.counter, memory_order_relaxed));
+  bt_assert(f.priv.private_counter == THREADS * BLOCKCOUNT * REPEATS / 2);
+
+  return 1;
+}
+
+int
+main(int argc, char **argv)
+{
+  bt_init(argc, argv);
+  bt_bird_init();
+
+  bt_test_suite(t_locking, "Testing locks");
+
+  return bt_exit_value();
+}

From 080e580834a074f29acc64293a5f392cae4f797f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 14 Nov 2023 12:53:40 +0100
Subject: [PATCH 393/431] Route table objects use the new locked object macro
 stack

---
 nest/route.h    |  49 ++++++++++------------
 nest/rt-table.c | 109 +++++++++++++++++++++++++-----------------------
 2 files changed, 78 insertions(+), 80 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index 81c225b1..a3119c5b 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -101,20 +101,21 @@ extern uint rtable_max_id;
 DEFINE_DOMAIN(rtable);
 
 /* The public part of rtable structure */
-#define RTABLE_PUBLIC \
-    resource r;											\
-    node n;				/* Node in list of all tables */			\
-    char *name;				/* Name of this table */				\
-    uint addr_type;			/* Type of address data stored in table (NET_*) */	\
-    uint id;				/* Integer table ID for fast lookup */			\
-    DOMAIN(rtable) lock;		/* Lock to take to access the private parts */		\
-    struct rtable_config *config;	/* Configuration of this table */			\
-    struct birdloop *loop;		/* Service thread */					\
+#define RTABLE_PUBLIC										\
+  resource r;											\
+  node n;				/* Node in list of all tables */			\
+  char *name;				/* Name of this table */				\
+  uint addr_type;			/* Type of address data stored in table (NET_*) */	\
+  uint id;				/* Integer table ID for fast lookup */			\
+  DOMAIN(rtable) lock;			/* Lock to take to access the private parts */		\
+  struct rtable_config *config;		/* Configuration of this table */			\
+  struct birdloop *loop;		/* Service thread */					\
 
 /* The complete rtable structure */
 struct rtable_private {
   /* Once more the public part */
-  RTABLE_PUBLIC;
+  struct { RTABLE_PUBLIC; };
+  struct rtable_private **locked_at;
 
   /* Here the private items not to be accessed without locking */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
@@ -166,29 +167,23 @@ struct rtable_private {
 
 /* The final union private-public rtable structure */
 typedef union rtable {
-  struct {
-    RTABLE_PUBLIC;
-  };
+  struct { RTABLE_PUBLIC; };
   struct rtable_private priv;
 } rtable;
 
-#define RT_IS_LOCKED(tab)	DOMAIN_IS_LOCKED(rtable, (tab)->lock)
+/* Define the lock cleanup function */
+LOBJ_UNLOCK_CLEANUP(rtable, rtable);
+
+#define RT_IS_LOCKED(tab)	LOBJ_IS_LOCKED((tab), rtable)
+#define RT_LOCKED(tab, tp)	LOBJ_LOCKED((tab), tp, rtable, rtable)
+
+#define RT_LOCK_SIMPLE(tab)	LOBJ_LOCK_SIMPLE((tab), rtable)
+#define RT_UNLOCK_SIMPLE(tab)	LOBJ_UNLOCK_SIMPLE((tab), rtable)
+
+#define RT_UNLOCKED_TEMPORARILY(tab, tp)	LOBJ_UNLOCKED_TEMPORARILY((tab), tp, rtable, rtable)
 
-#define RT_LOCK(tab)	({ LOCK_DOMAIN(rtable, (tab)->lock); &(tab)->priv; })
-#define RT_UNLOCK(tab)	UNLOCK_DOMAIN(rtable, (tab)->lock)
-#define RT_PRIV(tab)	({ ASSERT_DIE(RT_IS_LOCKED((tab))); &(tab)->priv; })
 #define RT_PUB(tab)	SKIP_BACK(rtable, priv, tab)
 
-#define RT_LOCKED(tpub, tpriv) for (struct rtable_private *tpriv = RT_LOCK(tpub); tpriv; RT_UNLOCK(tpriv), (tpriv = NULL))
-#define RT_LOCKED_IF_NEEDED(_tpub, _tpriv) for ( \
-    struct rtable_private *_al = RT_IS_LOCKED(_tpub) ? &(_tpub)->priv : NULL, *_tpriv = _al ?: RT_LOCK(_tpub); \
-    _tpriv; \
-    _al ?: RT_UNLOCK(_tpriv), (_tpriv = NULL))
-
-#define RT_RETURN(tpriv, ...) do { RT_UNLOCK(tpriv); return __VA_ARGS__; } while (0)
-
-#define RT_PRIV_SAME(tpriv, tpub)	(&(tpub)->priv == (tpriv))
-
 /* Flags for birdloop_flag() */
 #define RTF_CLEANUP	1
 #define RTF_NHU		2
diff --git a/nest/rt-table.c b/nest/rt-table.c
index d24998d4..a038b266 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1277,17 +1277,22 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
     hook->req->export_one(hook->req, n, rpe);
   else if (hook->req->export_bulk)
   {
-    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
-    RT_LOCK(tab);
-    struct rt_pending_export *last = net->last;
-    uint count = rte_feed_count(net);
+    struct rt_pending_export *last = NULL;
+    uint count = 0;
     const rte **feed = NULL;
-    if (count)
+
+    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+
+    RT_LOCKED(tab, tp)
     {
-      feed = alloca(count * sizeof(rte *));
-      rte_feed_obtain(net, feed, count);
+      last = net->last;
+      if (count = rte_feed_count(net))
+      {
+	feed = alloca(count * sizeof(rte *));
+	rte_feed_obtain(net, feed, count);
+      }
     }
-    RT_UNLOCK(tab);
+
     hook->req->export_bulk(hook->req, n, rpe, last, feed, count);
   }
   else
@@ -1568,19 +1573,16 @@ rt_export_hook(void *_data)
   ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_READY);
 
   if (!c->rpe_next)
-  {
-    RT_LOCK(tab);
-    c->rpe_next = rt_next_export(c, c->table);
-
-    if (!c->rpe_next)
+    RT_LOCKED(tab, tp)
     {
-      rt_export_used(c->table, c->h.req->name, "done exporting");
-      RT_UNLOCK(tab);
-      return;
-    }
+      c->rpe_next = rt_next_export(c, c->table);
 
-    RT_UNLOCK(tab);
-  }
+      if (!c->rpe_next)
+      {
+	rt_export_used(c->table, c->h.req->name, "done exporting");
+	return;
+      }
+    }
 
   int used = 0;
   int no_next = 0;
@@ -2021,7 +2023,7 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
       req->hook->stats.withdraws_ignored++;
       if (req->trace_routes & D_ROUTES)
 	log(L_TRACE "%s > ignored %N withdraw", req->name, n);
-      RT_RETURN(tab);
+      return;
     }
 
     /* Recalculate the best route */
@@ -2363,8 +2365,12 @@ rt_table_export_stop(struct rt_export_hook *hh)
   struct rt_table_export_hook *hook = SKIP_BACK(struct rt_table_export_hook, h, hh);
   int ok = 0;
 
-  RT_LOCKED_IF_NEEDED(SKIP_BACK(rtable, priv.exporter, hook->table), tab)
+  rtable *t = SKIP_BACK(rtable, priv.exporter, hook->table);
+  if (RT_IS_LOCKED(t))
     ok = rt_table_export_stop_locked(hh);
+  else
+    RT_LOCKED(t, tab)
+      ok = rt_table_export_stop_locked(hh);
 
   if (ok)
     rt_stop_export_common(hh);
@@ -2713,13 +2719,14 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
   struct rt_flowspec_link *ln = SKIP_BACK(struct rt_flowspec_link, req, req);
   rtable *dst_pub = ln->dst;
   ASSUME(rt_is_flow(dst_pub));
-  struct rtable_private *dst = RT_LOCK(dst_pub);
+
+  RT_LOCKED(dst_pub, dst)
+  {
 
   /* No need to inspect it further if recalculation is already scheduled */
   if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY)
       || !trie_match_net(dst->flowspec_trie, net))
   {
-    RT_UNLOCK(dst_pub);
     rpe_mark_seen_all(req->hook, first, NULL, NULL);
     return;
   }
@@ -2738,7 +2745,7 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
   if (o != RTE_VALID_OR_NULL(new_best))
     rt_schedule_nhu(dst);
 
-  RT_UNLOCK(dst_pub);
+  }
 }
 
 static void
@@ -3758,10 +3765,10 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
 
       const rte *rc = &nc->routes->rte;
       if (rt_get_source_attr(rc) != RTS_BGP)
-	RT_RETURN(tip, FLOWSPEC_INVALID);
+	return FLOWSPEC_INVALID;
 
       if (rta_get_first_asn(rc->attrs) != asn_b)
-	RT_RETURN(tip, FLOWSPEC_INVALID);
+	return FLOWSPEC_INVALID;
     }
     TRIE_WALK_END;
   }
@@ -3862,18 +3869,21 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
    * is being computed. Statistically, this should almost never happen. In such
    * case, we just drop all the computed changes and do it once again.
    * */
-  RT_UNLOCK(tab);
 
   uint mod = 0;
+  RT_UNLOCKED_TEMPORARILY(tpub, tab)
+  {
+    /* DO NOT RETURN OR BREAK OUT OF THIS BLOCK */
+
   if (is_flow)
     for (uint i = 0; i < pos; i++)
-      mod += rt_flowspec_update_rte(RT_PUB(tab), &updates[i].old->rte, &updates[i].new);
+      mod += rt_flowspec_update_rte(tpub, &updates[i].old->rte, &updates[i].new);
 
   else
     for (uint i = 0; i < pos; i++)
       mod += rt_next_hop_update_rte(&updates[i].old->rte, &updates[i].new);
 
-  RT_LOCK(RT_PUB(tab));
+  }
 
   if (!mod)
     return 0;
@@ -4155,11 +4165,11 @@ rt_delete(void *tab_)
   /* We assume that nobody holds the table reference now as use_count is zero.
    * Anyway the last holder may still hold the lock. Therefore we lock and
    * unlock it the last time to be sure that nobody is there. */
-  struct rtable_private *tab = RT_LOCK((rtable *) tab_);
+  struct rtable_private *tab = RT_LOCK_SIMPLE((rtable *) tab_);
   struct config *conf = tab->deleted;
   DOMAIN(rtable) dom = tab->lock;
 
-  RT_UNLOCK(RT_PUB(tab));
+  RT_UNLOCK_SIMPLE(RT_PUB(tab));
 
   /* Everything is freed by freeing the loop */
   birdloop_free(tab->loop);
@@ -4259,21 +4269,14 @@ rt_commit(struct config *new, struct config *old)
   if (old)
     {
       WALK_LIST(o, old->tables)
+	RT_LOCKED(o->table, tab)
 	{
-	  struct rtable_private *tab = RT_LOCK(o->table);
-
 	  if (tab->deleted)
-	  {
-	    RT_UNLOCK(tab);
 	    continue;
-	  }
 
 	  r = rt_find_table_config(new, o->name);
 	  if (r && !new->shutdown && rt_reconfigure(tab, r, o))
-	  {
-	    RT_UNLOCK(tab);
 	    continue;
-	  }
 
 	  DBG("\t%s: deleted\n", o->name);
 	  tab->deleted = old;
@@ -4287,7 +4290,6 @@ rt_commit(struct config *new, struct config *old)
 
 	  /* Force one more loop run */
 	  birdloop_flag(tab->loop, RTF_DELETE);
-	  RT_UNLOCK(tab);
 	}
     }
 
@@ -4416,6 +4418,8 @@ rt_feed_by_fib(void *data)
   struct fib_iterator *fit = &c->feed_fit;
   rt_feed_block block = {};
 
+  _Bool done = 1;
+
   ASSERT(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
 
   RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
@@ -4428,10 +4432,8 @@ rt_feed_by_fib(void *data)
 	if (!rt_prepare_feed(c, n, &block))
 	{
 	  FIB_ITERATE_PUT(fit);
-	  RT_UNLOCK(tab);
-	  rt_process_feed(c, &block);
-	  rt_send_export_event(&c->h);
-	  return;
+	  done = 0;
+	  break;
 	}
       }
       else
@@ -4441,7 +4443,11 @@ rt_feed_by_fib(void *data)
   }
 
   rt_process_feed(c, &block);
-  rt_feed_done(&c->h);
+
+  if (done)
+    rt_feed_done(&c->h);
+  else
+    rt_send_export_event(&c->h);
 }
 
 static void
@@ -4467,12 +4473,9 @@ rt_feed_by_trie(void *data)
       continue;
 
     if (!rt_prepare_feed(c, n, &block))
-    {
-      RT_UNLOCK(tab);
-      rt_process_feed(c, &block);
-      rt_send_export_event(&c->h);
-      return;
-    }
+      return
+	rt_process_feed(c, &block),
+	rt_send_export_event(&c->h);
   }
   while (trie_walk_next(ws, &c->walk_last));
 
@@ -4876,12 +4879,12 @@ rt_update_hostcache(void *data)
 
   /* Shutdown shortcut */
   if (!hc->req.hook)
-    RT_RETURN(tab);
+    return;
 
   if (rt_cork_check(&hc->update))
   {
     rt_trace(tab, D_STATES, "Hostcache update corked");
-    RT_RETURN(tab);
+    return;
   }
 
   /* Destination schedule map */

From 5a916ed53fbac9efca61677aceb6be1b4681e992 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 20 Nov 2023 17:40:25 +0100
Subject: [PATCH 394/431] Locking: Dropping DEFINE_DOMAIN ugly macro

---
 lib/locking.h         | 38 +++++++++++++++++++++++++++-----------
 lib/locking_test.c    |  2 --
 lib/rcu.c             |  1 -
 lib/route.h           |  1 -
 nest/locks.c          |  1 -
 nest/route.h          | 24 ++++++++++++------------
 sysdep/unix/alloc.c   |  1 -
 sysdep/unix/io-loop.c |  1 -
 sysdep/unix/io-loop.h |  2 --
 sysdep/unix/log.c     |  1 -
 10 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/lib/locking.h b/lib/locking.h
index 6cec2ff3..86cbf72d 100644
--- a/lib/locking.h
+++ b/lib/locking.h
@@ -9,27 +9,37 @@
 #ifndef _BIRD_LOCKING_H_
 #define _BIRD_LOCKING_H_
 
+#include "lib/macro.h"
+
 struct domain_generic;
 struct pool;
 
+#define LOCK_ORDER \
+  the_bird, \
+  meta, \
+  control, \
+  proto, \
+  service, \
+  rtable, \
+  attrs, \
+  logging, \
+  resource, \
+
 /* Here define the global lock order; first to last. */
 struct lock_order {
-  struct domain_generic *the_bird;
-  struct domain_generic *meta;
-  struct domain_generic *control;
-  struct domain_generic *proto;
-  struct domain_generic *service;
-  struct domain_generic *rtable;
-  struct domain_generic *attrs;
-  struct domain_generic *logging;
-  struct domain_generic *resource;
+#define LOCK_ORDER_EXPAND(p)	struct domain_generic *p;
+  MACRO_FOREACH(LOCK_ORDER_EXPAND, LOCK_ORDER)
+#undef LOCK_ORDER_EXPAND
 };
 
+#define LOCK_ORDER_EXPAND(p)	struct domain__##p { struct domain_generic *p; };
+  MACRO_FOREACH(LOCK_ORDER_EXPAND, LOCK_ORDER)
+#undef LOCK_ORDER_EXPAND
+
 extern _Thread_local struct lock_order locking_stack;
 extern _Thread_local struct domain_generic **last_locked;
 
 #define DOMAIN(type) struct domain__##type
-#define DEFINE_DOMAIN(type) DOMAIN(type) { struct domain_generic *type; }
 #define DOMAIN_ORDER(type)  OFFSETOF(struct lock_order, type)
 
 #define DOMAIN_NEW(type)  (DOMAIN(type)) { .type = domain_new(DOMAIN_ORDER(type)) }
@@ -63,7 +73,6 @@ uint dg_order(struct domain_generic *dg);
 #define DG_UNLOCK(d)	do_unlock(d, DG_LSP(d))
 
 /* Use with care. To be removed in near future. */
-DEFINE_DOMAIN(the_bird);
 extern DOMAIN(the_bird) the_bird_domain;
 
 #define the_bird_lock()		LOCK_DOMAIN(the_bird, the_bird_domain)
@@ -273,4 +282,11 @@ extern DOMAIN(the_bird) the_bird_domain;
       _obj ? (_pobj->locked_at = NULL, LOBJ_UNLOCK_SIMPLE(_obj, _level), _obj) : NULL; \
       LOBJ_LOCK_SIMPLE(_obj, _level), _pobj->locked_at = (struct _stem##_private **) _lataux, _obj = NULL)
 
+/*
+ *  Get the locked object when the lock is already taken
+ */
+
+#define LOBJ_PRIV(_obj, _level) \
+  ({ ASSERT_DIE(DOMAIN_IS_LOCKED(_level, (_obj)->lock)); &(_obj)->priv; })
+
 #endif
diff --git a/lib/locking_test.c b/lib/locking_test.c
index 0d99b189..6c5de0cb 100644
--- a/lib/locking_test.c
+++ b/lib/locking_test.c
@@ -5,8 +5,6 @@
 #include <stdatomic.h>
 #include <pthread.h>
 
-DEFINE_DOMAIN(proto);
-
 #define FOO_PUBLIC \
   const char *name;	\
   _Atomic uint counter;	\
diff --git a/lib/rcu.c b/lib/rcu.c
index 7ea6ec9b..c4b4721b 100644
--- a/lib/rcu.c
+++ b/lib/rcu.c
@@ -23,7 +23,6 @@ static list rcu_thread_list;
 
 static struct rcu_thread main_rcu_thread;
 
-DEFINE_DOMAIN(resource);
 static DOMAIN(resource) rcu_domain;
 
 static int
diff --git a/lib/route.h b/lib/route.h
index a0446b39..f7e9c7f7 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -89,7 +89,6 @@ struct rte_owner {
   event *stop;
 };
 
-DEFINE_DOMAIN(attrs);
 extern DOMAIN(attrs) attrs_domain;
 
 #define RTA_LOCK       LOCK_DOMAIN(attrs, attrs_domain)
diff --git a/nest/locks.c b/nest/locks.c
index 66409c6d..8036a1ef 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -38,7 +38,6 @@
 
 static list olock_list;
 
-DEFINE_DOMAIN(attrs);
 static DOMAIN(attrs) olock_domain;
 #define OBJ_LOCK	LOCK_DOMAIN(attrs, olock_domain)
 #define OBJ_UNLOCK	UNLOCK_DOMAIN(attrs, olock_domain)
diff --git a/nest/route.h b/nest/route.h
index a3119c5b..d6661afc 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -98,18 +98,16 @@ struct rt_table_exporter {
 
 extern uint rtable_max_id;
 
-DEFINE_DOMAIN(rtable);
-
 /* The public part of rtable structure */
-#define RTABLE_PUBLIC										\
-  resource r;											\
-  node n;				/* Node in list of all tables */			\
-  char *name;				/* Name of this table */				\
-  uint addr_type;			/* Type of address data stored in table (NET_*) */	\
-  uint id;				/* Integer table ID for fast lookup */			\
-  DOMAIN(rtable) lock;			/* Lock to take to access the private parts */		\
-  struct rtable_config *config;		/* Configuration of this table */			\
-  struct birdloop *loop;		/* Service thread */					\
+#define RTABLE_PUBLIC \
+    resource r;											\
+    node n;				/* Node in list of all tables */			\
+    char *name;				/* Name of this table */				\
+    uint addr_type;			/* Type of address data stored in table (NET_*) */	\
+    uint id;				/* Integer table ID for fast lookup */			\
+    DOMAIN(rtable) lock;		/* Lock to take to access the private parts */		\
+    struct rtable_config *config;	/* Configuration of this table */			\
+    struct birdloop *loop;		/* Service thread */					\
 
 /* The complete rtable structure */
 struct rtable_private {
@@ -167,7 +165,9 @@ struct rtable_private {
 
 /* The final union private-public rtable structure */
 typedef union rtable {
-  struct { RTABLE_PUBLIC; };
+  struct {
+    RTABLE_PUBLIC;
+  };
   struct rtable_private priv;
 } rtable;
 
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 56e755db..341c02a2 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -120,7 +120,6 @@ long page_size = 0;
     void *pages[0];
   };
 
-  DEFINE_DOMAIN(resource);
   static DOMAIN(resource) empty_pages_domain;
   static struct empty_pages *empty_pages = NULL;
 
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 5213fdc0..0a222ba0 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -594,7 +594,6 @@ sockets_fire(struct birdloop *loop)
  *	Threads
  */
 
-DEFINE_DOMAIN(attrs);
 static void bird_thread_start_event(void *_data);
 
 struct birdloop_pickup_group {
diff --git a/sysdep/unix/io-loop.h b/sysdep/unix/io-loop.h
index d1fb4ea8..53d9f96b 100644
--- a/sysdep/unix/io-loop.h
+++ b/sysdep/unix/io-loop.h
@@ -105,8 +105,6 @@ struct bird_thread
 };
 
 
-DEFINE_DOMAIN(control);
-
 struct bird_thread_syncer {
   pool *pool;
   DOMAIN(control) lock;
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 0d6adf42..41c8f07f 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -41,7 +41,6 @@ _Thread_local uint this_thread_id;
 
 #include <pthread.h>
 
-DEFINE_DOMAIN(logging);
 static DOMAIN(logging) log_domain;
 #define log_lock()  LOCK_DOMAIN(logging, log_domain);
 #define log_unlock()  UNLOCK_DOMAIN(logging, log_domain);

From 48abd6a96332ea7e391015d7e659d642a32b263f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 23 Nov 2023 12:06:58 +0100
Subject: [PATCH 395/431] Events: create and enqueue in one macro

---
 lib/event.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/event.h b/lib/event.h
index 6fd9f31c..f89c17ba 100644
--- a/lib/event.h
+++ b/lib/event.h
@@ -71,5 +71,8 @@ ev_new_init(pool *p, void (*hook)(void *), void *data)
   return e;
 }
 
+#define ev_new_send(loop, pool, hook, data) \
+  ev_send_loop((loop), ev_new_init((pool), (hook), (data)))
+
 
 #endif

From 194ed4e6e66cab28c3b5c0226cdfe6cc382d1f5a Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Nov 2023 12:11:21 +0100
Subject: [PATCH 396/431] Macro SKIP_BACK now evaluates its argument only once.

---
 lib/birdlib.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 9e60da39..9004704c 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -26,7 +26,11 @@
 #define OFFSETOF(s, i) ((size_t) &((s *)0)->i)
 #endif
 
-#define SKIP_BACK(s, i, p) ({ s *_ptr = ((s *)((char *)p - OFFSETOF(s, i))); SAME_TYPE(&_ptr->i, p); _ptr; })
+#define SKIP_BACK(s, i, p) ({ \
+    typeof(p) _orig = p; \
+    s *_ptr = ((s *)((char *)_orig - OFFSETOF(s, i))); \
+    SAME_TYPE(&_ptr->i, _orig); \
+    _ptr; })
 #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define CPU_STRUCT_ALIGN  (MAX_(_Alignof(void*), _Alignof(u64)))
 #define BIRD_CPU_ALIGN(s) BIRD_ALIGN((s), CPU_STRUCT_ALIGN)

From 0bcbff42cacaa1ae2f234e2b5d37fd8b72c6b8c6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 23 Nov 2023 23:33:44 +0100
Subject: [PATCH 397/431] Table: nicer route validation errors

---
 nest/rt-table.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index a038b266..54a471b2 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1614,22 +1614,19 @@ rte_validate(struct channel *ch, rte *e)
   int c;
   const net_addr *n = e->net;
 
+#define IGNORING(pre, post) do { \
+    log(L_WARN "%s.%s: Ignoring " pre " %N " post, ch->proto->name, ch->name, n); \
+    return 0; \
+  } while (0)
+
   if (!net_validate(n))
-  {
-    log(L_WARN "Ignoring bogus prefix %N received via %s",
-	n, ch->proto->name);
-    return 0;
-  }
+    IGNORING("bogus prefix", "");
 
   /* FIXME: better handling different nettypes */
   c = !net_is_flow(n) ?
     net_classify(n): (IADDR_HOST | SCOPE_UNIVERSE);
   if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
-  {
-    log(L_WARN "Ignoring bogus route %N received via %s",
-	n, ch->proto->name);
-    return 0;
-  }
+    IGNORING("bogus route", "");
 
   if (net_type_match(n, NB_DEST))
   {
@@ -1637,26 +1634,14 @@ rte_validate(struct channel *ch, rte *e)
     int dest = nhea_dest(nhea);
 
     if (dest == RTD_NONE)
-    {
-      log(L_WARN "Ignoring route %N with no destination received via %s",
-	  n, ch->proto->name);
-      return 0;
-    }
+      IGNORING("route", "with no destination");
 
     if ((dest == RTD_UNICAST) &&
 	!nexthop_is_sorted((struct nexthop_adata *) nhea->u.ptr))
-    {
-      log(L_WARN "Ignoring unsorted multipath route %N received via %s",
-	  n, ch->proto->name);
-      return 0;
-    }
+      IGNORING("unsorted multipath route", "");
   }
   else if (ea_find(e->attrs, &ea_gen_nexthop))
-  {
-    log(L_WARN "Ignoring route %N having a nexthop attribute received via %s",
-	n, ch->proto->name);
-    return 0;
-  }
+    IGNORING("route", "having a superfluous nexthop attribute");
 
   return 1;
 }

From 1df615991cd9c3d457d3761475beaebb28737089 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Nov 2023 08:46:50 +0100
Subject: [PATCH 398/431] Generalized the rte_src lockfree usecount algorithm

---
 lib/bitmap.h   |   2 +
 lib/lockfree.h | 146 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/route.h    |  49 ++---------------
 nest/rt-attr.c |  10 +---
 4 files changed, 155 insertions(+), 52 deletions(-)
 create mode 100644 lib/lockfree.h

diff --git a/lib/bitmap.h b/lib/bitmap.h
index e3351ab1..01bb65b6 100644
--- a/lib/bitmap.h
+++ b/lib/bitmap.h
@@ -10,6 +10,8 @@
 #ifndef _BIRD_BITMAP_H_
 #define _BIRD_BITMAP_H_
 
+#include "lib/resource.h"
+
 struct bmap
 {
   u32 size;
diff --git a/lib/lockfree.h b/lib/lockfree.h
new file mode 100644
index 00000000..abb42676
--- /dev/null
+++ b/lib/lockfree.h
@@ -0,0 +1,146 @@
+/*
+ *	BIRD Library -- Generic lock-free structures
+ *
+ *	(c) 2023       Maria Matejka <mq@jmq.cz>
+ *	(c) 2023       CZ.NIC, z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LOCKFREE_H_
+#define _BIRD_LOCKFREE_H_
+
+#include "lib/event.h"
+#include "lib/rcu.h"
+
+#include <stdatomic.h>
+
+/**
+ * Lock-free usecounts.
+ */
+
+struct lfuc {
+  _Atomic u64 uc;
+};
+
+#define LFUC_PU_SHIFT      44
+#define LFUC_IN_PROGRESS   (1ULL << LFUC_PU_SHIFT)
+
+/**
+ * lfuc_lock - increase an atomic usecount
+ * @c: the usecount structure
+ */
+static inline void lfuc_lock(struct lfuc *c)
+{
+  /* Locking is trivial; somebody already holds the underlying data structure
+   * so we just increase the use count. Nothing can be freed underneath our hands. */
+  u64 uc = atomic_fetch_add_explicit(&c->uc, 1, memory_order_acq_rel);
+  ASSERT_DIE(uc > 0);
+}
+
+/**
+ * lfuc_lock_revive - increase an atomic usecount even if it's zero
+ * @c: the usecount structure
+ *
+ * If the caller is sure that they can't collide with the prune routine,
+ * they can call this even on structures with already zeroed usecount.
+ * Handy for situations with flapping routes. Use only from the same
+ * loop as which runs the prune routine.
+ */
+static inline void lfuc_lock_revive(struct lfuc *c)
+{
+  UNUSED u64 uc = atomic_fetch_add_explicit(&c->uc, 1, memory_order_acq_rel);
+}
+
+/**
+ * lfuc_unlock - decrease an atomic usecount
+ * @c: the usecount structure
+ * @el: prune event list
+ * @ev: prune event itself
+ *
+ * If the usecount reaches zero, a prune event is run to possibly free the object.
+ * The prune event MUST use lfuc_finished() to check the object state.
+ */
+static inline void lfuc_unlock(struct lfuc *c, event_list *el, event *ev)
+{
+  /* Unlocking is tricky. We do it lockless so at the same time, the prune
+   * event may be running, therefore if the unlock gets us to zero, it must be
+   * the last thing in this routine, otherwise the prune routine may find the
+   * source's usecount zeroed, freeing it prematurely.
+   *
+   * The usecount is split into two parts:
+   * the top 20 bits are an in-progress indicator
+   * the bottom 44 bits keep the actual usecount.
+   *
+   * Therefore at most 1 million of writers can simultaneously unlock the same
+   * structure, while at most ~17T different places can reference it. Both limits
+   * are insanely high from the 2022 point of view. Let's suppose that when 17T
+   * routes or 1M peers/tables get real, we get also 128bit atomic variables in the
+   * C norm. */
+
+  /* First, we push the in-progress indicator */
+  u64 uc = atomic_fetch_add_explicit(&c->uc, LFUC_IN_PROGRESS, memory_order_acq_rel);
+
+  /* Then we split the indicator to its parts. Remember, we got the value
+   * before the operation happened so we're re-doing the operation locally
+   * to get a view how the indicator _would_ look if nobody else was interacting.
+   */
+  u64 pending = (uc >> LFUC_PU_SHIFT) + 1;
+  uc &= LFUC_IN_PROGRESS - 1;
+
+  /* We per-use the RCU critical section indicator to make the prune event wait
+   * until we finish here in the rare case we get preempted. */
+  rcu_read_lock();
+
+  /* Obviously, there can't be more pending unlocks than the usecount itself */
+  if (uc == pending)
+    /* If we're the last unlocker (every owner is already unlocking), schedule
+     * the owner's prune event */
+    ev_send(el, ev);
+  else
+    ASSERT_DIE(uc > pending);
+
+  /* And now, finally, simultaneously pop the in-progress indicator and the
+   * usecount, possibly allowing the pruning routine to free this structure */
+  atomic_fetch_sub_explicit(&c->uc, LFUC_IN_PROGRESS + 1, memory_order_acq_rel);
+
+  /* ... and to reduce the load a bit, the pruning routine will better wait for
+   * RCU synchronization instead of a busy loop. */
+  rcu_read_unlock();
+}
+
+/**
+ * lfuc_finished - auxiliary routine for prune event
+ * @c: usecount structure
+ *
+ * This routine simply waits until all unlockers finish their job and leave
+ * the critical section of lfuc_unlock(). Then we decide whether the usecount
+ * is indeed zero or not, and therefore whether the structure is free to be freed.
+ */
+static inline _Bool
+lfuc_finished(struct lfuc *c)
+{
+  u64 uc;
+  /* Wait until all unlockers finish */
+  while ((uc = atomic_load_explicit(&c->uc, memory_order_acquire)) >> LFUC_PU_SHIFT)
+    synchronize_rcu();
+
+  /* All of them are now done and if the usecount is now zero, then we're
+   * the last place to reference the object and we can call it finished. */
+  return (uc == 0);
+}
+
+/**
+ * lfuc_init - auxiliary routine for usecount initialization
+ * @c: usecount structure
+ *
+ * Called on object initialization, sets the usecount to an initial one to make
+ * sure that the prune routine doesn't free it before somebody else references it.
+ */
+static inline void
+lfuc_init(struct lfuc *c)
+{
+  atomic_store_explicit(&c->uc, 1, memory_order_release);
+}
+
+#endif
diff --git a/lib/route.h b/lib/route.h
index f7e9c7f7..9570583b 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -16,6 +16,7 @@
 #include "lib/rcu.h"
 #include "lib/hash.h"
 #include "lib/event.h"
+#include "lib/lockfree.h"
 
 struct network;
 struct proto;
@@ -67,7 +68,7 @@ struct rte_src {
   struct rte_owner *owner;		/* Route source owner */
   u64 private_id;			/* Private ID, assigned by the protocol */
   u32 global_id;			/* Globally unique ID of the source */
-  _Atomic u64 uc;			/* Use count */
+  struct lfuc uc;			/* Use count */
 };
 
 struct rte_owner_class {
@@ -111,54 +112,12 @@ struct rte_src *rt_find_source_global(u32 id);
 
 static inline void rt_lock_source(struct rte_src *src)
 {
-  /* Locking a source is trivial; somebody already holds it so we just increase
-   * the use count. Nothing can be freed underneath our hands. */
-  u64 uc = atomic_fetch_add_explicit(&src->uc, 1, memory_order_acq_rel);
-  ASSERT_DIE(uc > 0);
+  lfuc_lock(&src->uc);
 }
 
 static inline void rt_unlock_source(struct rte_src *src)
 {
-  /* Unlocking is tricky. We do it lockless so at the same time, the prune
-   * event may be running, therefore if the unlock gets us to zero, it must be
-   * the last thing in this routine, otherwise the prune routine may find the
-   * source's usecount zeroed, freeing it prematurely.
-   *
-   * The usecount is split into two parts:
-   * the top 20 bits are an in-progress indicator
-   * the bottom 44 bits keep the actual usecount.
-   *
-   * Therefore at most 1 million of writers can simultaneously unlock the same
-   * source, while at most ~17T different routes can reference it. Both limits
-   * are insanely high from the 2022 point of view. Let's suppose that when 17T
-   * routes or 1M writers get real, we get also 128bit atomic variables in the
-   * C norm. */
-
-  /* First, we push the in-progress indicator */
-  u64 uc = atomic_fetch_add_explicit(&src->uc, RTE_SRC_IN_PROGRESS, memory_order_acq_rel);
-
-  /* Then we split the indicator to its parts. Remember, we got the value before the operation happened. */
-  u64 pending = (uc >> RTE_SRC_PU_SHIFT) + 1;
-  uc &= RTE_SRC_IN_PROGRESS - 1;
-
-  /* We per-use the RCU critical section indicator to make the prune event wait
-   * until we finish here in the rare case we get preempted. */
-  rcu_read_lock();
-
-  /* Obviously, there can't be more pending unlocks than the usecount itself */
-  if (uc == pending)
-    /* If we're the last unlocker, schedule the owner's prune event */
-    ev_send(src->owner->list, src->owner->prune);
-  else
-    ASSERT_DIE(uc > pending);
-
-  /* And now, finally, simultaneously pop the in-progress indicator and the
-   * usecount, possibly allowing the source pruning routine to free this structure */
-  atomic_fetch_sub_explicit(&src->uc, RTE_SRC_IN_PROGRESS + 1, memory_order_acq_rel);
-
-  /* ... and to reduce the load a bit, the source pruning routine will better wait for
-   * RCU synchronization instead of a busy loop. */
-  rcu_read_unlock();
+  lfuc_unlock(&src->uc, src->owner->list, src->owner->prune);
 }
 
 #ifdef RT_SOURCE_DEBUG
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 72f6487f..481b432f 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -243,7 +243,7 @@ rt_get_source_o(struct rte_owner *p, u32 id)
 
   if (src)
   {
-    UNUSED u64 uc = atomic_fetch_add_explicit(&src->uc, 1, memory_order_acq_rel);
+    lfuc_lock_revive(&src->uc);
     return src;
   }
 
@@ -253,7 +253,7 @@ rt_get_source_o(struct rte_owner *p, u32 id)
   src->private_id = id;
   src->global_id = idm_alloc(&src_ids);
 
-  atomic_store_explicit(&src->uc, 1, memory_order_release);
+  lfuc_init(&src->uc);
   p->uc++;
 
   HASH_INSERT2(p->hash, RSH, rta_pool, src);
@@ -330,11 +330,7 @@ rt_prune_sources(void *data)
 
   HASH_WALK_FILTER(o->hash, next, src, sp)
   {
-    u64 uc;
-    while ((uc = atomic_load_explicit(&src->uc, memory_order_acquire)) >> RTE_SRC_PU_SHIFT)
-      synchronize_rcu();
-
-    if (uc == 0)
+    if (lfuc_finished(&src->uc))
     {
       o->uc--;
 

From 3b31138854b539e7b777c45f02748dd8237e25e9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Dec 2023 12:15:59 +0100
Subject: [PATCH 399/431] Dropped forgotten pieces of orphaned internal API

---
 nest/iface.h    | 1 -
 nest/protocol.h | 3 ---
 nest/route.h    | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/nest/iface.h b/nest/iface.h
index 9a35ee14..a98bdf37 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -232,7 +232,6 @@ struct iface_subscription {
 void if_enqueue_notify(struct iface_notification);
 void if_enqueue_notify_to(struct iface_notification x, struct iface_subscription *s);
 
-void iface_flush_notifications(struct iface_subscription *);
 void iface_subscribe(struct iface_subscription *);
 void iface_unsubscribe(struct iface_subscription *);
 
diff --git a/nest/protocol.h b/nest/protocol.h
index f3bf6b46..a63305ac 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -60,9 +60,6 @@ struct protocol {
   uint proto_size;			/* Size of protocol data structure */
   uint config_size;			/* Size of protocol config data structure */
 
-  uint eattr_begin;			/* First ID of registered eattrs */
-  uint eattr_end;			/* End of eattr id zone */
-
   void (*preconfig)(struct protocol *, struct config *);	/* Just before configuring */
   void (*postconfig)(struct proto_config *);			/* After configuring each instance */
   struct proto * (*init)(struct proto_config *);		/* Create new instance */
diff --git a/nest/route.h b/nest/route.h
index 4b3a7426..f2df9a85 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -435,8 +435,6 @@ void rt_request_import(rtable *tab, struct rt_import_request *req);
 void rt_request_export(rtable *tab, struct rt_export_request *req);
 void rt_request_export_other(struct rt_exporter *tab, struct rt_export_request *req);
 
-void rt_export_once(struct rt_exporter *tab, struct rt_export_request *req);
-
 void rt_stop_import(struct rt_import_request *, void (*stopped)(struct rt_import_request *));
 void rt_stop_export(struct rt_export_request *, void (*stopped)(struct rt_export_request *));
 
@@ -625,7 +623,6 @@ int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *f
 rte *rt_export_merged(struct channel *c, const net_addr *n, const rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(struct rt_import_request *);
 void rt_refresh_end(struct rt_import_request *);
-void rt_modify_stale(rtable *t, struct rt_import_request *);
 void rt_schedule_prune(struct rtable_private *t);
 void rte_dump(struct rte_storage *);
 void rt_dump(rtable *);

From 6c4be8d1d3181d5736dd49f8145d607cda1b158e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Dec 2023 15:36:50 +0100
Subject: [PATCH 400/431] Kernel: Before first scan, reject exported routes
 immediately in preexport

---
 sysdep/unix/krt.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 0897198c..54355e31 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -726,6 +726,10 @@ krt_preexport(struct channel *C, rte *e)
   if (!krt_capable(e))
     return -1;
 
+  /* Before first scan we don't touch the routes */
+  if (!SKIP_BACK(struct krt_proto, p, C->proto)->ready)
+    return -1;
+
   return 0;
 }
 
@@ -747,8 +751,7 @@ krt_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *net,
     return;
 #endif
 
-  if (p->initialized)		/* Before first scan we don't touch the routes */
-    krt_replace_rte(p, net, new, old);
+  krt_replace_rte(p, net, new, old);
 }
 
 static void
@@ -813,6 +816,7 @@ krt_feed_end(struct channel *C)
   }
 
   p->ready = 1;
+  bmap_reset(&C->export_reject_map, 16);
   krt_scan_timer_kick(p);
 }
 

From 54d5e36ec0bed1226c98ddee3d34e1ae29692951 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 4 Dec 2023 10:33:30 +0100
Subject: [PATCH 401/431] Index of different net_addr values for hashing and
 bit-marking

For many reasons, it's handy to assign a contiguous range of integers to
known net_addr values. This is a data structure keeping this mapping.
---
 lib/Makefile           |   2 +-
 lib/hash.h             |   9 +-
 lib/netindex.c         | 222 +++++++++++++++++++++++++++++++++++++++++
 lib/netindex.h         |  55 ++++++++++
 lib/netindex_private.h |  47 +++++++++
 5 files changed, 332 insertions(+), 3 deletions(-)
 create mode 100644 lib/netindex.c
 create mode 100644 lib/netindex.h
 create mode 100644 lib/netindex_private.h

diff --git a/lib/Makefile b/lib/Makefile
index cd40bade..fafca6bf 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c patmatch.c printf.c rcu.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
+src := a-path.c a-set.c bitmap.c bitops.c blake2s.c blake2b.c checksum.c event.c flowspec.c idm.c ip.c lists.c mac.c md5.c mempool.c net.c netindex.c patmatch.c printf.c rcu.c resource.c sha1.c sha256.c sha512.c slab.c slists.c strtoul.c tbf.c timer.c xmalloc.c
 obj := $(src-o-files)
 $(all-daemon)
 
diff --git a/lib/hash.h b/lib/hash.h
index f46e769d..1c744af0 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -31,10 +31,15 @@
     (v) = (typeof(v)){ };						\
   })
 
-#define HASH_FIND(v,id,key...)						\
+#define HASH_FIND_CHAIN(v,id,key...)					\
   ({									\
     u32 _h = HASH_FN(v, id, key);					\
-    HASH_TYPE(v) *_n = (v).data[_h];					\
+    (v).data[_h];							\
+  })
+
+#define HASH_FIND(v,id,key...)						\
+  ({									\
+    HASH_TYPE(v) *_n = HASH_FIND_CHAIN(v, id, key);			\
     while (_n && !HASH_EQ(v, id, id##_KEY(_n), key))			\
       _n = id##_NEXT(_n);						\
     _n;									\
diff --git a/lib/netindex.c b/lib/netindex.c
new file mode 100644
index 00000000..3194c77b
--- /dev/null
+++ b/lib/netindex.c
@@ -0,0 +1,222 @@
+/*
+ *	BIRD Internet Routing Daemon -- Semi-global index of nets
+ *
+ *	(c) 2023       Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "lib/birdlib.h"
+#include "lib/netindex_private.h"
+
+#define NETINDEX_KEY(n)		(n)->hash, (n)->addr
+#define NETINDEX_NEXT(n)	(n)->next
+#define NETINDEX_EQ(h,n,i,o)	((h == i) && net_equal(n,o))
+#define NETINDEX_FN(h,n)	(h)
+#define NETINDEX_ORDER		4 /* Initial */
+
+#define NETINDEX_REHASH		netindex_rehash
+#define NETINDEX_PARAMS		/8, *1, 2, 2, 4, 28
+
+HASH_DEFINE_REHASH_FN(NETINDEX, struct netindex);
+
+static void netindex_hash_cleanup(void *netindex_hash);
+
+/*
+ * Handle for persistent or semipersistent usage
+ */
+struct netindex_handle {
+  resource r;
+  struct netindex *index;
+  netindex_hash *h;
+};
+
+static void
+net_unlock_index_persistent(resource *r)
+{
+  struct netindex_handle *nh = SKIP_BACK(struct netindex_handle, r, r);
+  net_unlock_index(nh->h, nh->index);
+}
+
+static void
+netindex_handle_dump(resource *r, unsigned indent UNUSED)
+{
+  struct netindex_handle *nh = SKIP_BACK(struct netindex_handle, r, r);
+  debug("index=%u, net=%N", nh->index->index, nh->index->addr);
+}
+
+static struct resclass netindex_handle_class = {
+  .name = "Netindex handle",
+  .size = sizeof(struct netindex_handle),
+  .free = net_unlock_index_persistent,
+  .dump = netindex_handle_dump,
+};
+
+static struct netindex *
+net_lock_index_persistent(struct netindex_hash_private *hp, struct netindex *ni, pool *p)
+{
+  if (!ni)
+    return NULL;
+
+  struct netindex_handle *nh = ralloc(p, &netindex_handle_class);
+//  log(L_TRACE "Revive index %p", ni);
+  lfuc_lock_revive(&ni->uc);
+  nh->index = ni;
+  nh->h = SKIP_BACK(netindex_hash, priv, hp);
+  return ni;
+}
+
+/*
+ * Index initialization
+ */
+netindex_hash *
+netindex_hash_new(pool *sp)
+{
+  DOMAIN(attrs) dom = DOMAIN_NEW(attrs);
+  LOCK_DOMAIN(attrs, dom);
+
+  pool *p = rp_new(sp, dom.attrs, "Network index");
+
+  struct netindex_hash_private *nh = mb_allocz(p, sizeof *nh);
+  nh->lock = dom;
+  nh->pool = p;
+
+  nh->cleanup_list = &global_event_list;
+  nh->cleanup_event = (event) { .hook = netindex_hash_cleanup, nh };
+
+  UNLOCK_DOMAIN(attrs, dom);
+  return SKIP_BACK(netindex_hash, priv, nh);
+}
+
+static void
+netindex_hash_cleanup(void *_nh)
+{
+  NH_LOCK((netindex_hash *) _nh, nh);
+
+  for (uint t = 0; t < NET_MAX; t++)
+  {
+    if (!nh->net[t].hash.data)
+      continue;
+
+    HASH_WALK_FILTER(nh->net[t].hash, next, i, ii)
+      if (lfuc_finished(&i->uc))
+      {
+	HASH_DO_REMOVE(nh->net[t].hash, NETINDEX, ii);
+	hmap_clear(&nh->net[t].id_map, i->index);
+	if (nh->net[t].slab)
+	  sl_free(i);
+	else
+	  mb_free(i);
+      }
+    HASH_WALK_DELSAFE_END;
+  }
+}
+
+
+static void
+netindex_hash_init(struct netindex_hash_private *hp, u8 type)
+{
+  ASSERT_DIE(hp->net[type].block == NULL);
+
+  hp->net[type].slab = net_addr_length[type] ? sl_new(hp->pool, sizeof (struct netindex) + net_addr_length[type]) : NULL;
+  HASH_INIT(hp->net[type].hash, hp->pool, NETINDEX_ORDER);
+  hp->net[type].block_size = 128;
+  hp->net[type].block = mb_allocz(hp->pool, hp->net[type].block_size * sizeof (struct netindex *));
+  hmap_init(&hp->net[type].id_map, hp->pool, 128);
+};
+
+/*
+ * Private index manipulation
+ */
+struct netindex *
+net_find_index_fragile_chain(struct netindex_hash_private *hp, const net_addr *n)
+{
+  ASSERT_DIE(n->type < NET_MAX);
+  if (!hp->net[n->type].block)
+    return NULL;
+
+  u32 h = net_hash(n);
+  return HASH_FIND_CHAIN(hp->net[n->type].hash, NETINDEX, h, n);
+}
+
+struct netindex *
+net_find_index_fragile(struct netindex_hash_private *hp, const net_addr *n)
+{
+  ASSERT_DIE(n->type < NET_MAX);
+  if (!hp->net[n->type].block)
+    return NULL;
+
+  u32 h = net_hash(n);
+  return HASH_FIND(hp->net[n->type].hash, NETINDEX, h, n);
+}
+
+static struct netindex *
+net_find_index_locked(struct netindex_hash_private *hp, const net_addr *n, pool *p)
+{
+  struct netindex *ni = net_find_index_fragile(hp, n);
+  return ni ? net_lock_index_persistent(hp, ni, p) : NULL;
+}
+
+static struct netindex *
+net_new_index_locked(struct netindex_hash_private *hp, const net_addr *n, pool *p)
+{
+  if (!hp->net[n->type].block)
+    netindex_hash_init(hp, n->type);
+
+  u32 i = hmap_first_zero(&hp->net[n->type].id_map);
+  hmap_set(&hp->net[n->type].id_map, i);
+
+  struct netindex *ni = hp->net[n->type].slab ?
+    sl_alloc(hp->net[n->type].slab) :
+    mb_alloc(hp->pool, n->length + sizeof *ni);
+
+  *ni = (struct netindex) {
+    .hash = net_hash(n),
+    .index = i,
+  };
+  net_copy(ni->addr, n);
+
+  HASH_INSERT2(hp->net[n->type].hash, NETINDEX, hp->pool, ni);
+
+  return net_lock_index_persistent(hp, ni, p);
+}
+
+
+/*
+ * Public entry points
+ */
+
+void net_lock_index(netindex_hash *h UNUSED, struct netindex *i)
+{
+//  log(L_TRACE "Lock index %p", i);
+  return lfuc_lock(&i->uc);
+}
+
+void net_unlock_index(netindex_hash *h, struct netindex *i)
+{
+//  log(L_TRACE "Unlock index %p", i);
+  return lfuc_unlock(&i->uc, h->cleanup_list, &h->cleanup_event);
+}
+
+struct netindex *
+net_find_index_persistent(netindex_hash *h, const net_addr *n, pool *p)
+{
+  NH_LOCK(h, hp);
+  return net_find_index_locked(hp, n, p);
+}
+
+struct netindex *
+net_get_index_persistent(netindex_hash *h, const net_addr *n, pool *p)
+{
+  NH_LOCK(h, hp);
+  return
+    net_find_index_locked(hp, n, p) ?:
+    net_new_index_locked(hp, n, p);
+}
+
+struct netindex *
+net_resolve_index_persistent(netindex_hash *h, u8 net_type, u32 i, pool *p)
+{
+  NH_LOCK(h, hp);
+  return net_lock_index_persistent(hp, hp->net[net_type].block_size > i ? hp->net[net_type].block[i] : NULL, p);
+}
diff --git a/lib/netindex.h b/lib/netindex.h
new file mode 100644
index 00000000..3a711940
--- /dev/null
+++ b/lib/netindex.h
@@ -0,0 +1,55 @@
+/*
+ *	BIRD Internet Routing Daemon -- Semi-global index of nets
+ *
+ *	(c) 2023       Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LIB_NETINDEX_H_
+#define _BIRD_LIB_NETINDEX_H_
+
+#include "lib/bitmap.h"
+#include "lib/hash.h"
+#include "lib/lockfree.h"
+#include "lib/net.h"
+#include "lib/resource.h"
+
+/* Index object */
+struct netindex {
+  struct netindex *next;	/* Next in hash chain */
+  u32 hash;			/* Cached hash value */
+  u32 index;			/* Assigned index */
+  struct lfuc uc;		/* Atomic usecount */
+  net_addr addr[0];		/* The net itself (one) */
+};
+
+/* Index hash: data structure completely opaque, use handlers */
+typedef union netindex_hash netindex_hash;
+
+/* Initialization */
+netindex_hash *netindex_hash_new(pool *);
+
+/* Find/get/resolve index and allocate its usecount to the given pool */
+struct netindex *net_find_index_persistent(netindex_hash *, const net_addr *, pool *);
+struct netindex *net_get_index_persistent(netindex_hash *, const net_addr *, pool *);
+struct netindex *net_resolve_index_persistent(netindex_hash *, u8, u32, pool *);
+
+/* Find/get/resolve index; pointer valid until end of task */ 
+static inline struct netindex *net_find_index(netindex_hash *h, const net_addr *n)
+{ return net_find_index_persistent(h, n, tmp_res.pool); }
+static inline struct netindex *net_get_index(netindex_hash *h, const net_addr *n)
+{ return net_get_index_persistent(h, n, tmp_res.pool); }
+static inline struct netindex *net_resolve_index(netindex_hash *h, u8 net_type, u32 index)
+{ return net_resolve_index_persistent(h, net_type, index, tmp_res.pool); }
+
+/* Update use-count without allocating a handle. Take same care
+ * to ensure that your locks and unlocks are always balanced. */
+void net_lock_index(netindex_hash *h, struct netindex *i);
+void net_unlock_index(netindex_hash *h, struct netindex *i);
+
+/* Retrieve the index from its addr pointer */
+#define NET_TO_INDEX(a) \
+  SKIP_BACK(struct netindex, addr, TYPE_CAST(net_addr *, net_addr (*)[0], a))
+
+#endif //_BIRD_LIB_NETINDEX_H_
diff --git a/lib/netindex_private.h b/lib/netindex_private.h
new file mode 100644
index 00000000..712a6aac
--- /dev/null
+++ b/lib/netindex_private.h
@@ -0,0 +1,47 @@
+/*
+ *	BIRD Internet Routing Daemon -- Semi-global index of nets
+ *
+ *	(c) 2023       Maria Matejka <mq@jmq.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_LIB_NETINDEX_PRIVATE_H_
+#define _BIRD_LIB_NETINDEX_PRIVATE_H_
+
+#include "lib/netindex.h"
+
+#define NETINDEX_HASH_PUBLIC \
+  DOMAIN(attrs) lock;		/* Assigned lock */		\
+  event_list *cleanup_list;	/* Cleanup event list */	\
+  event cleanup_event;		/* Cleanup event */		\
+
+struct netindex_hash_private {
+  struct { NETINDEX_HASH_PUBLIC; };
+  struct netindex_hash_private **locked_at;
+  pool *pool;
+  struct {
+    slab *slab;
+    HASH(struct netindex) hash;
+    uint block_size;
+    struct netindex **block;
+    struct hmap id_map;
+  } net[NET_MAX];
+};
+
+typedef union netindex_hash {
+  struct { NETINDEX_HASH_PUBLIC; };
+  struct netindex_hash_private priv;
+} netindex_hash;
+
+LOBJ_UNLOCK_CLEANUP(netindex_hash, attrs);
+#define NH_LOCK(h, hp)	LOBJ_LOCK(h, hp, netindex_hash, attrs)
+
+/* Find indices in a locked context with no usecounting */
+struct netindex *net_find_index_fragile(struct netindex_hash_private *hp, const net_addr *n);
+
+/* The same but instead of returning the exact match,
+ * return the first item in hash chain */
+struct netindex *net_find_index_fragile_chain(struct netindex_hash_private *hp, const net_addr *n);
+
+#endif

From 548dbb2252e80362789b8c98355f468491d47b34 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 8 Dec 2023 16:13:14 +0100
Subject: [PATCH 402/431] Replacing table FIB by netindex and simple pointer
 block

Using the netindex data structure to simplify route storage inside route
tables. This should also help with future unlocking of route import.
---
 nest/route.h      |  23 ++--
 nest/rt-table.c   | 320 ++++++++++++++++++++++++++--------------------
 sysdep/unix/krt.c |  21 +--
 3 files changed, 209 insertions(+), 155 deletions(-)

diff --git a/nest/route.h b/nest/route.h
index f2df9a85..66e1d030 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -14,6 +14,7 @@
 #include "lib/bitmap.h"
 #include "lib/resource.h"
 #include "lib/net.h"
+#include "lib/netindex.h"
 #include "lib/type.h"
 #include "lib/fib.h"
 #include "lib/route.h"
@@ -108,6 +109,7 @@ extern uint rtable_max_id;
     DOMAIN(rtable) lock;		/* Lock to take to access the private parts */		\
     struct rtable_config *config;	/* Configuration of this table */			\
     struct birdloop *loop;		/* Service thread */					\
+    netindex_hash *netindex;		/* Prefix index for this table */			\
 
 /* The complete rtable structure */
 struct rtable_private {
@@ -118,10 +120,12 @@ struct rtable_private {
   /* Here the private items not to be accessed without locking */
   pool *rp;				/* Resource pool to allocate everything from, including itself */
   struct slab *rte_slab;		/* Slab to allocate route objects */
-  struct fib fib;
+  struct network *routes;		/* Actual route objects in the table */
+  u32 routes_block_size;		/* Size of the route object pointer block */
   struct f_trie *trie;			/* Trie of prefixes defined in fib */
   int use_count;			/* Number of protocols using this table */
   u32 rt_count;				/* Number of routes in the table */
+  u32 net_count;			/* Number of nets in the table */
   u32 debug;				/* Debugging flags (D_*) */
 
   list imports;				/* Registered route importers */
@@ -152,8 +156,8 @@ struct rtable_private {
   byte export_used;			/* Pending Export pruning is scheduled */
   byte cork_active;			/* Cork has been activated */
   struct rt_cork_threshold cork_threshold;	/* Threshold for table cork */
-  struct fib_iterator prune_fit;	/* Rtable prune FIB iterator */
-  struct fib_iterator nhu_fit;		/* Next Hop Update FIB iterator */
+  u32 prune_index;			/* Rtable prune FIB iterator */
+  u32 nhu_index;			/* Next Hop Update FIB iterator */
   struct f_trie *trie_new;		/* New prefix trie defined during pruning */
   struct f_trie *trie_old;		/* Old prefix trie waiting to be freed */
   u32 trie_lock_count;			/* Prefix trie locked by walks */
@@ -228,7 +232,6 @@ static inline int rt_cork_check(event *e)
 typedef struct network {
   struct rte_storage *routes;		/* Available routes for this network */
   struct rt_pending_export *first, *last;
-  struct fib_node n;			/* FIB flags reserved for kernel syncer */
 } net;
 
 struct rte_storage {
@@ -248,6 +251,8 @@ struct rte_storage {
 
 #define RTES_WRITE(r)		(((r) != ((struct rte_storage *) 0)) ? ((struct rte *) &(r)->rte) : NULL)
 
+#define RTE_GET_NETINDEX(e) NET_TO_INDEX((e)->net)
+
 /* Table-channel connections */
 
 struct rt_prefilter {
@@ -391,7 +396,7 @@ struct rt_table_export_hook {
   };
   
   union {
-    struct fib_iterator feed_fit;		/* Routing table iterator used during feeding */
+    u32 feed_index;				/* Routing table iterator used during feeding */
     struct {
       struct f_trie_walk_state *walk_state;	/* Iterator over networks in trie */
       struct f_trie *walk_lock;			/* Locked trie for walking */
@@ -614,11 +619,9 @@ void rt_flowspec_link(rtable *src, rtable *dst);
 void rt_flowspec_unlink(rtable *src, rtable *dst);
 rtable *rt_setup(pool *, struct rtable_config *);
 
-static inline net *net_find(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_find(&tab->fib, addr); }
-static inline net *net_find_valid(struct rtable_private *tab, const net_addr *addr)
-{ net *n = net_find(tab, addr); return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL; }
-static inline net *net_get(struct rtable_private *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
-net *net_route(struct rtable_private *tab, const net_addr *n);
+static inline net *net_find(struct rtable_private *tab, const struct netindex *i)
+{ return (i->index < tab->routes_block_size) ? &(tab->routes[i->index]) : NULL; }
+
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, const net_addr *n, const rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(struct rt_import_request *);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index bb236d49..e1f6683a 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -109,6 +109,7 @@
 #include "lib/alloca.h"
 #include "lib/flowspec.h"
 #include "lib/idm.h"
+#include "lib/netindex_private.h"
 
 #ifdef CONFIG_BGP
 #include "proto/bgp/bgp.h"
@@ -121,6 +122,8 @@ pool *rt_table_pool;
 list routing_tables;
 list deleted_routing_tables;
 
+netindex_hash *rt_global_netindex_hash;
+
 struct rt_cork rt_cork;
 
 /* Data structures for export journal */
@@ -212,21 +215,41 @@ static inline rtable *rt_pub_to_pub(rtable *tab) { return tab; }
     log(L_TRACE "%s.%s: " fmt, c->proto->name, c->name, ##args);\
 } while (0)
 
-static void
-net_init_with_trie(struct fib *f, void *N)
+static inline net *
+net_find_valid(struct rtable_private *tab, struct netindex_hash_private *nh, const net_addr *addr)
 {
-  struct rtable_private *tab = SKIP_BACK(struct rtable_private, fib, f);
-  net *n = N;
+  struct netindex *i = net_find_index_fragile(nh, addr);
+  net *n = i ? net_find(tab, i) : NULL;
+  return (n && n->routes && rte_is_valid(&n->routes->rte)) ? n : NULL;
+}
+
+static inline net *
+net_get(struct rtable_private *tab, const struct netindex *i)
+{
+  /* Expand the routes block if insufficient */
+  u32 nbs = tab->routes_block_size;
+  while (i->index >= nbs)
+    nbs *= 2;
+
+  if (nbs > tab->routes_block_size)
+  {
+    struct network *nb = mb_realloc(tab->routes, sizeof (struct network) * nbs);
+    memset(&nb[tab->routes_block_size], 0, (nbs - tab->routes_block_size) * sizeof (struct network));
+    tab->routes = nb;
+    tab->routes_block_size = nbs;
+  }
 
   if (tab->trie)
-    trie_add_prefix(tab->trie, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
+    trie_add_prefix(tab->trie, i->addr, i->addr->pxlen, i->addr->pxlen);
 
   if (tab->trie_new)
-    trie_add_prefix(tab->trie_new, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
+    trie_add_prefix(tab->trie_new, i->addr, i->addr->pxlen, i->addr->pxlen);
+
+  return &tab->routes[i->index];
 }
 
 static inline void *
-net_route_ip6_sadr_trie(struct rtable_private *t, const net_addr_ip6_sadr *n0)
+net_route_ip6_sadr_trie(struct rtable_private *t, struct netindex_hash_private *nh, const net_addr_ip6_sadr *n0)
 {
   TRIE_WALK_TO_ROOT_IP6(t->trie, (const net_addr_ip6 *) n0, px)
   {
@@ -237,16 +260,21 @@ net_route_ip6_sadr_trie(struct rtable_private *t, const net_addr_ip6_sadr *n0)
     /* We need to do dst first matching. Since sadr addresses are hashed on dst
        prefix only, find the hash table chain and go through it to find the
        match with the longest matching src prefix. */
-    for (struct fib_node *fn = fib_get_chain(&t->fib, (net_addr *) &n); fn; fn = fn->next)
+    for (struct netindex *i = net_find_index_fragile_chain(nh, (net_addr *) &n); i; i = i->next)
     {
-      net_addr_ip6_sadr *a = (void *) fn->addr;
+      net_addr_ip6_sadr *a = (void *) i->addr;
 
-      if (net_equal_dst_ip6_sadr(&n, a) &&
+      if ((i->index < t->routes_block_size) &&
+	  net_equal_dst_ip6_sadr(&n, a) &&
 	  net_in_net_src_ip6_sadr(&n, a) &&
 	  (a->src_pxlen >= best_pxlen))
       {
-	best = fib_node_to_user(&t->fib, fn);
-	best_pxlen = a->src_pxlen;
+	net *cur = &t->routes[i->index];
+	if (cur->routes && rte_is_valid(&cur->routes->rte))
+	{
+	  best = cur;
+	  best_pxlen = a->src_pxlen;
+	}
       }
     }
 
@@ -260,7 +288,7 @@ net_route_ip6_sadr_trie(struct rtable_private *t, const net_addr_ip6_sadr *n0)
 
 
 static inline void *
-net_route_ip6_sadr_fib(struct rtable_private *t, const net_addr_ip6_sadr *n0)
+net_route_ip6_sadr_fib(struct rtable_private *t, struct netindex_hash_private *nh, const net_addr_ip6_sadr *n0)
 {
   net_addr_ip6_sadr n;
   net_copy_ip6_sadr(&n, n0);
@@ -273,16 +301,21 @@ net_route_ip6_sadr_fib(struct rtable_private *t, const net_addr_ip6_sadr *n0)
     /* We need to do dst first matching. Since sadr addresses are hashed on dst
        prefix only, find the hash table chain and go through it to find the
        match with the longest matching src prefix. */
-    for (struct fib_node *fn = fib_get_chain(&t->fib, (net_addr *) &n); fn; fn = fn->next)
+    for (struct netindex *i = net_find_index_fragile_chain(nh, (net_addr *) &n); i; i = i->next)
     {
-      net_addr_ip6_sadr *a = (void *) fn->addr;
+      net_addr_ip6_sadr *a = (void *) i->addr;
 
-      if (net_equal_dst_ip6_sadr(&n, a) &&
+      if ((i->index < t->routes_block_size) &&
+	  net_equal_dst_ip6_sadr(&n, a) &&
 	  net_in_net_src_ip6_sadr(&n, a) &&
 	  (a->src_pxlen >= best_pxlen))
       {
-	best = fib_node_to_user(&t->fib, fn);
-	best_pxlen = a->src_pxlen;
+	net *cur = &t->routes[i->index];
+	if (cur->routes && rte_is_valid(&cur->routes->rte))
+	{
+	  best = cur;
+	  best_pxlen = a->src_pxlen;
+	}
       }
     }
 
@@ -299,9 +332,11 @@ net_route_ip6_sadr_fib(struct rtable_private *t, const net_addr_ip6_sadr *n0)
   return NULL;
 }
 
-net *
+static net *
 net_route(struct rtable_private *tab, const net_addr *n)
 {
+  NH_LOCK(tab->netindex, nh);
+
   ASSERT(tab->addr_type == n->type);
   net_addr_union *nu = SKIP_BACK(net_addr_union, n, n);
 
@@ -319,7 +354,7 @@ net_route(struct rtable_private *tab, const net_addr *n)
 } while(0); return NULL;
 
 #define FVR_IP(ipv, var) \
-    net *r; if (r = net_find_valid(tab, (net_addr *) &var)) return r;
+    net *r; if (r = net_find_valid(tab, nh, (net_addr *) &var)) return r;
 
 #define FVR_VPN(ipv, var) \
     net_addr_vpn##ipv _var0 = NET_ADDR_VPN##ipv(var.prefix, var.pxlen, nu->vpn##ipv.rd); FVR_IP(ipv, _var0);
@@ -332,7 +367,7 @@ net_route(struct rtable_private *tab, const net_addr *n)
       case NET_VPN6:  TW(6, FVR_VPN);
 
       case NET_IP6_SADR:
-	return net_route_ip6_sadr_trie(tab, (net_addr_ip6_sadr *) n);
+	return net_route_ip6_sadr_trie(tab, nh, (net_addr_ip6_sadr *) n);
       default:
 	return NULL;
     }
@@ -344,7 +379,7 @@ net_route(struct rtable_private *tab, const net_addr *n)
       case NET_VPN6:  FW(6, FVR_VPN);
 
       case NET_IP6_SADR:
-	return net_route_ip6_sadr_fib (tab, (net_addr_ip6_sadr *) n);
+	return net_route_ip6_sadr_fib (tab, nh, (net_addr_ip6_sadr *) n);
       default:
 	return NULL;
     }
@@ -376,7 +411,6 @@ net_roa_check(rtable *tp, const net_addr *n, u32 asn)
 {
   net_addr_union *nu = SKIP_BACK(net_addr_union, n, n);
   int anything = 0;
-  struct fib_node *fn;
 
 #define TW(ipv) do {								\
   TRIE_WALK_TO_ROOT_IP##ipv(tab->trie, &(nu->ip##ipv), var) {			\
@@ -396,21 +430,24 @@ net_roa_check(rtable *tp, const net_addr *n, u32 asn)
 } while (0)
 
 #define ROA_PARTIAL_CHECK(ipv) do {						\
-  for (fn = fib_get_chain(&tab->fib, (net_addr *) &roa0); fn; fn = fn->next)	\
+  for (struct netindex *i = net_find_index_fragile_chain(nh, (net_addr *) &roa0); i; i = i->next)\
   {										\
-    net_addr_roa##ipv *roa = (void *) fn->addr;				\
-    net *r = fib_node_to_user(&tab->fib, fn);					\
-    if (net_equal_prefix_roa##ipv(roa, &roa0) && rte_is_valid(r->routes))	\
+    if (tab->routes_block_size < i->index) continue;				\
+    net_addr_roa##ipv *roa = (void *) i->addr;					\
+    if (!net_equal_prefix_roa##ipv(roa, &roa0))	continue;			\
+    net *r = &tab->routes[i->index];						\
+    if (r->routes && rte_is_valid(&r->routes->rte))				\
     {										\
       anything = 1;								\
       if (asn && (roa->asn == asn) && (roa->max_pxlen >= nu->ip##ipv.pxlen))	\
-      return ROA_VALID;							\
+      return ROA_VALID;								\
     }										\
   }										\
 } while (0)
 
   RT_LOCKED(tp, tab)
   {
+    NH_LOCK(tab->netindex, nh);
     if ((tab->addr_type == NET_ROA4) && (n->type == NET_IP4))
     {
       if (tab->trie)	TW(4);
@@ -450,13 +487,14 @@ rte_find(net *net, struct rte_src *src)
 
 
 struct rte_storage *
-rte_store(const rte *r, net *net, struct rtable_private *tab)
+rte_store(const rte *r, struct netindex *i, struct rtable_private *tab)
 {
   struct rte_storage *s = sl_alloc(tab->rte_slab);
   struct rte *e = RTES_WRITE(s);
 
   *e = *r;
-  e->net = net->n.addr;
+  e->net = i->addr;
+  net_lock_index(tab->netindex, i);
 
   rt_lock_source(e->src);
 
@@ -477,9 +515,13 @@ rte_store(const rte *r, net *net, struct rtable_private *tab)
  */
 
 void
-rte_free(struct rte_storage *e)
+rte_free(struct rte_storage *e, struct rtable_private *tab)
 {
+  struct netindex *i = RTE_GET_NETINDEX(&e->rte);
+  net_unlock_index(tab->netindex, i);
+
   rt_unlock_source(e->rte.src);
+
   rta_free(e->rte.attrs);
   sl_free(e);
 }
@@ -538,8 +580,8 @@ rte_mergable(const rte *pri, const rte *sec)
 static void
 rte_trace(const char *name, const rte *e, int dir, const char *msg)
 {
-  log(L_TRACE "%s %c %s %N src %luL %uG %uS id %u %s",
-      name, dir, msg, e->net,
+  log(L_TRACE "%s %c %s %N (%u) src %luL %uG %uS id %u %s",
+      name, dir, msg, e->net, NET_TO_INDEX(e->net)->index,
       e->src->private_id, e->src->global_id, e->stale_cycle, e->id,
       rta_dest_name(rte_dest(e)));
 }
@@ -1083,10 +1125,12 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
     uint count = 0;
     const rte **feed = NULL;
 
-    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+    const struct netindex *i = SKIP_BACK(struct netindex, addr, (net_addr (*)[0]) n);
 
     RT_LOCKED(tab, tp)
     {
+      ASSERT_DIE(i->index < tp->routes_block_size);
+      struct network *net = &tp->routes[i->index];
       last = net->last;
       if (count = rte_feed_count(net))
       {
@@ -1146,9 +1190,12 @@ ignore:
  * done outside of scope of rte_announce().
  */
 static void
-rte_announce(struct rtable_private *tab, net *net, struct rte_storage *new, struct rte_storage *old,
+rte_announce(struct rtable_private *tab, const struct netindex *i, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
+  /* Update network count */
+  tab->net_count += (!!new_best - !!old_best);
+
   int new_best_valid = rte_is_valid(RTE_OR_NULL(new_best));
   int old_best_valid = rte_is_valid(RTE_OR_NULL(old_best));
 
@@ -1167,7 +1214,7 @@ rte_announce(struct rtable_private *tab, net *net, struct rte_storage *new, stru
       return;
 
     hmap_clear(&tab->id_map, old->rte.id);
-    rte_free(old);
+    rte_free(old, tab);
     return;
   }
 
@@ -1211,7 +1258,7 @@ rte_announce(struct rtable_private *tab, net *net, struct rte_storage *new, stru
       "old=%p id %u from %s, "
       "new_best=%p id %u, "
       "old_best=%p id %u seq=%lu",
-      net->n.addr,
+      i->addr,
       new, new ? new->rte.id : 0, new ? new->rte.sender->req->name : NULL,
       old, old ? old->rte.id : 0, old ? old->rte.sender->req->name : NULL,
       new_best, new_best ? new_best->rte.id : 0,
@@ -1464,7 +1511,7 @@ rte_same(const rte *x, const rte *y)
 static inline int rte_is_ok(const rte *e) { return e && !rte_is_filtered(e); }
 
 static int
-rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net, rte *new, struct rte_src *src)
+rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, struct netindex *i, net *net, rte *new, struct rte_src *src)
 {
   struct rt_import_request *req = c->req;
   struct rt_import_stats *stats = &c->stats;
@@ -1479,7 +1526,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
   struct rte_storage *new_stored = NULL;
   if (new)
   {
-    new_stored = rte_store(new, net, table);
+    new_stored = rte_store(new, i, table);
     new = RTES_WRITE(new_stored);
   }
 
@@ -1499,10 +1546,10 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 	{
 	  if (!old->generation && !new->generation)
 	    bug("Two protocols claim to author a route with the same rte_src in table %s: %N %s/%u:%u",
-		c->table->name, net->n.addr, old->src->owner->name, old->src->private_id, old->src->global_id);
+		c->table->name, i->addr, old->src->owner->name, old->src->private_id, old->src->global_id);
 
 	  log_rl(&table->rl_pipe, L_ERR "Route source collision in table %s: %N %s/%u:%u",
-		c->table->name, net->n.addr, old->src->owner->name, old->src->private_id, old->src->global_id);
+		c->table->name, i->addr, old->src->owner->name, old->src->private_id, old->src->global_id);
 	}
 
 	  if (new && rte_same(old, &new_stored->rte))
@@ -1517,7 +1564,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
 		}
 
 	      /* We need to free the already stored route here before returning */
-	      rte_free(new_stored);
+	      rte_free(new_stored, table);
 	      return 0;
 	  }
 
@@ -1534,7 +1581,7 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
   /* If rejected by import limit, we need to pretend there is no route */
   if (req->preimport && (req->preimport(req, new, old) == 0))
   {
-    rte_free(new_stored);
+    rte_free(new_stored, table);
     new_stored = NULL;
     new = NULL;
   }
@@ -1661,10 +1708,10 @@ rte_recalculate(struct rtable_private *table, struct rt_import_hook *c, net *net
     }
   else
     if (req->trace_routes & D_ROUTES)
-      log(L_TRACE "%s > ignored %N %s->%s", req->name, net->n.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 */
-  rte_announce(table, net, new_stored, old_stored,
+  rte_announce(table, i, net, new_stored, old_stored,
       net->routes, old_best_stored);
 
   return 1;
@@ -1792,20 +1839,27 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
     return;
   }
 
+
   RT_LOCKED(hook->table, tab)
   {
+    struct netindex *i;
     net *nn;
     if (new)
     {
-      /* Use the actual struct network, not the dummy one */
-      nn = net_get(tab, n);
-      new->net = nn->n.addr;
+      /* Allocate the key structure */
+      i = net_get_index(tab->netindex, n);
+      nn = net_get(tab, i);
+      new->net = i->addr;
       new->sender = hook;
 
       /* Set the stale cycle */
       new->stale_cycle = hook->stale_set;
     }
-    else if (!(nn = net_find(tab, n)))
+    else if (i = net_find_index(tab->netindex, n))
+    {
+      nn = net_find(tab, i);
+    }
+    else
     {
       req->hook->stats.withdraws_ignored++;
       if (req->trace_routes & D_ROUTES)
@@ -1814,7 +1868,7 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
     }
 
     /* Recalculate the best route */
-    if (rte_recalculate(tab, hook, nn, new, src))
+    if (rte_recalculate(tab, hook, i, nn, new, src))
       ev_send(req->list, &hook->announce_event);
   }
 }
@@ -1827,7 +1881,8 @@ rt_examine(rtable *tp, net_addr *a, struct channel *c, const struct filter *filt
 
   RT_LOCKED(tp, t)
   {
-    net *n = net_find(t, a);
+    const struct netindex *i = net_find_index(t->netindex, a);
+    net *n = i ? net_find(t, i) : NULL;
     if (n)
       rt = RTE_COPY_VALID(n->routes);
   }
@@ -2030,7 +2085,7 @@ rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_ho
     case TE_ADDR_NONE:
     case TE_ADDR_TRIE:
     case TE_ADDR_HOOK:
-      FIB_ITERATE_INIT(&hook->feed_fit, &tab->fib);
+      hook->feed_index = 0;
       hook->h.event.hook = rt_feed_by_fib;
       break;
 
@@ -2130,8 +2185,6 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
 	case TE_ADDR_NONE:
 	case TE_ADDR_HOOK:
 	case TE_ADDR_TRIE:
-	  fit_get(&tab->fib, &hook->feed_fit);
-	  break;
 	case TE_ADDR_EQUAL:
 	case TE_ADDR_FOR:
 	  break;
@@ -2219,13 +2272,10 @@ rt_refresh_begin(struct rt_import_request *req)
     log(L_WARN "Route refresh flood in table %s (stale_set=%u, stale_pruned=%u)", hook->table->name, hook->stale_set, hook->stale_pruned);
 
     /* Forcibly set all old routes' stale cycle to zero. */
-    FIB_WALK(&tab->fib, net, n)
-      {
-       for (struct rte_storage *e = n->routes; e; e = e->next)
-         if (e->rte.sender == req->hook)
-           e->stale_cycle = 0;
-      }
-    FIB_WALK_END;
+    for (u32 i=0; i<tab->routes_block_size; i++)
+      for (struct rte_storage *e = tab->routes[i].routes; e; e = e->next)
+	if (e->rte.sender == req->hook)
+	  e->stale_cycle = 0;
 
     /* Smash the route refresh counter and zero everything. */
     tab->rr_counter -= hook->stale_set - hook->stale_pruned;
@@ -2314,15 +2364,9 @@ rt_dump(rtable *tp)
   {
 
   debug("Dump of routing table <%s>%s\n", t->name, t->deleted ? " (deleted)" : "");
-#ifdef DEBUGGING
-  fib_check(&t->fib);
-#endif
-  FIB_WALK(&t->fib, net, n)
-    {
-      for(struct rte_storage *e=n->routes; e; e=e->next)
-	rte_dump(e);
-    }
-  FIB_WALK_END;
+  for (u32 i=0; i<t->routes_block_size; i++)
+    for (struct rte_storage *e = t->routes[i].routes; e; e = e->next)
+      rte_dump(e);
   debug("\n");
 
   }
@@ -2749,14 +2793,13 @@ rt_setup(pool *pp, struct rtable_config *cf)
   if (t->id >= rtable_max_id)
     rtable_max_id = t->id + 1;
 
-  fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
+  t->netindex = rt_global_netindex_hash;
+  t->routes = mb_allocz(p, (t->routes_block_size = 128) * sizeof(net));
 
   if (cf->trie_used)
   {
     t->trie = f_new_trie(lp_new_default(p), 0);
     t->trie->ipv4 = net_val_match(t->addr_type, NB_IP4 | NB_VPN4 | NB_ROA4);
-
-    t->fib.init = net_init_with_trie;
   }
 
   init_list(&t->imports);
@@ -2819,6 +2862,25 @@ rt_init(void)
   ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release");
   rt_cork.run = (event) { .hook = rt_cork_release_hook };
   idm_init(&rtable_idm, rt_table_pool, 256);
+  rt_global_netindex_hash = netindex_hash_new(rt_table_pool);
+}
+
+static _Bool
+rt_prune_net(struct rtable_private *tab, struct network *n)
+{
+  for (struct rte_storage *e = n->routes; e; e = e->next)
+  {
+    struct rt_import_hook *s = e->rte.sender;
+    if ((s->import_state == TIS_FLUSHING) ||
+	(e->rte.stale_cycle < s->stale_valid) ||
+	(e->rte.stale_cycle > s->stale_set))
+    {
+      struct netindex *i = RTE_GET_NETINDEX(&e->rte);
+      rte_recalculate(tab, e->rte.sender, i, n, NULL, e->rte.src);
+      return 1;
+    }
+  }
+  return 0;
 }
 
 
@@ -2839,16 +2901,12 @@ rt_init(void)
 static void
 rt_prune_table(struct rtable_private *tab)
 {
-  struct fib_iterator *fit = &tab->prune_fit;
   int limit = 2000;
 
   struct rt_import_hook *ih;
   node *n, *x;
 
   rt_trace(tab, D_STATES, "Pruning");
-#ifdef DEBUGGING
-  fib_check(&tab->fib);
-#endif
 
   if (tab->prune_state == 0)
     return;
@@ -2865,7 +2923,7 @@ rt_prune_table(struct rtable_private *tab)
 	rt_refresh_trace(tab, ih, "table prune after refresh begin");
       }
 
-    FIB_ITERATE_INIT(fit, &tab->fib);
+    tab->prune_index = 0;
     tab->prune_state = 2;
 
     tab->gc_counter = 0;
@@ -2879,53 +2937,32 @@ rt_prune_table(struct rtable_private *tab)
     }
   }
 
-again:
-  FIB_ITERATE_START(&tab->fib, fit, net, n)
+  for (; tab->prune_index < tab->routes_block_size; tab->prune_index++)
     {
-    rescan:
+      net *n = &tab->routes[tab->prune_index];
+      if (!n->routes)
+	continue;
+
+      while ((limit > 0) && rt_prune_net(tab, n))
+	limit--;
+
       if (limit <= 0)
       {
-	FIB_ITERATE_PUT(fit);
 	birdloop_flag(tab->loop, RTF_CLEANUP);
 	return;
       }
 
-      for (struct rte_storage *e=n->routes; e; e=e->next)
+      if (tab->trie_new && n->routes)
       {
-	struct rt_import_hook *s = e->rte.sender;
-	if ((s->import_state == TIS_FLUSHING) ||
-	    (e->rte.stale_cycle < s->stale_valid) ||
-	    (e->rte.stale_cycle > s->stale_set))
-	  {
-	    rte_recalculate(tab, e->rte.sender, n, NULL, e->rte.src);
-	    limit--;
-
-	    goto rescan;
-	  }
-      }
-
-      if (!n->routes && !n->first)		/* Orphaned FIB entry */
-	{
-	  FIB_ITERATE_PUT(fit);
-	  fib_delete(&tab->fib, n);
-	  goto again;
-	}
-
-      if (tab->trie_new)
-      {
-	trie_add_prefix(tab->trie_new, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
+	const net_addr *a = n->routes->rte.net;
+	trie_add_prefix(tab->trie_new, a, a->pxlen, a->pxlen);
 	limit--;
       }
     }
-  FIB_ITERATE_END;
 
   rt_trace(tab, D_EVENTS, "Prune done, scheduling export timer");
   rt_kick_export_settle(tab);
 
-#ifdef DEBUGGING
-  fib_check(&tab->fib);
-#endif
-
   /* state change 2->0, 3->1 */
   if (tab->prune_state &= 1)
     birdloop_flag(tab->loop, RTF_CLEANUP);
@@ -2953,7 +2990,7 @@ again:
   else
   {
     /* Schedule prefix trie pruning */
-    if (tab->trie && !tab->trie_old && (tab->trie->prefix_count > (2 * tab->fib.entries)))
+    if (tab->trie && !tab->trie_old && (tab->trie->prefix_count > (2 * tab->net_count)))
     {
       /* state change 0->1, 2->3 */
       tab->prune_state |= 1;
@@ -3064,7 +3101,9 @@ rt_export_cleanup(struct rtable_private *tab)
     const net_addr *n = first->new ?
       first->new->rte.net :
       first->old->rte.net;
-    net *net = SKIP_BACK(struct network, n.addr, (net_addr (*)[0]) n);
+    struct netindex *i = NET_TO_INDEX(n);
+    ASSERT_DIE(i->index < tab->routes_block_size);
+    net *net = &tab->routes[i->index];
 
     ASSERT_DIE(net->first == first);
 
@@ -3082,7 +3121,7 @@ rt_export_cleanup(struct rtable_private *tab)
     {
       rt_rte_trace_in(D_ROUTES, first->old->rte.sender->req, &first->old->rte, "freed");
       hmap_clear(&tab->id_map, first->old->rte.id);
-      rte_free(first->old);
+      rte_free(first->old, tab);
     }
 
 #ifdef LOCAL_DEBUG
@@ -3224,7 +3263,7 @@ rt_unlock_trie(struct rtable_private *tab, struct f_trie *trie)
       tab->trie_old = NULL;
 
       /* Kick prefix trie pruning that was postponed */
-      if (tab->trie && (tab->trie->prefix_count > (2 * tab->fib.entries)))
+      if (tab->trie && (tab->trie->prefix_count > (2 * tab->net_count)))
       {
 	tab->prune_trie = 1;
 	rt_kick_prune_timer(tab);
@@ -3507,7 +3546,7 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
     {
       rb = RTE_COPY_VALID(nb->routes);
       rta_clone(rb.attrs);
-      net_copy(&nau.n, nb->n.addr);
+      net_copy(&nau.n, nb->routes->rte.net);
       rb.net = &nau.n;
     }
   }
@@ -3545,9 +3584,10 @@ rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, ea_list *
   /* RFC 8955 6. c) More-specific routes are from the same AS as the best-match route */
   RT_LOCKED(tab_ip, tip)
   {
+    NH_LOCK(tip->netindex, nh);
     TRIE_WALK(tip->trie, subnet, &dst)
     {
-      net *nc = net_find_valid(tip, &subnet);
+      net *nc = net_find_valid(tip, nh, &subnet);
       if (!nc)
 	continue;
 
@@ -3624,10 +3664,10 @@ rt_flowspec_resolve_rte(rte *r, struct channel *c)
 }
 
 static inline int
-rt_next_hop_update_net(struct rtable_private *tab, net *n)
+rt_next_hop_update_net(struct rtable_private *tab, struct netindex *ni, net *n)
 {
   uint count = 0;
-  int is_flow = net_is_flow(n->n.addr);
+  int is_flow = net_val_match(tab->addr_type, NB_FLOW);
 
   struct rte_storage *old_best = n->routes;
   if (!old_best)
@@ -3678,7 +3718,7 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
 
   /* Something has changed inbetween, retry NHU. */
   if (last_pending != n->last)
-    return rt_next_hop_update_net(tab, n);
+    return rt_next_hop_update_net(tab, ni, n);
 
   /* Now we reconstruct the original linked list */
   struct rte_storage **nptr = &n->routes;
@@ -3688,7 +3728,7 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
 
     struct rte_storage *put;
     if (updates[i].new.attrs)
-      put = updates[i].new_stored = rte_store(&updates[i].new, n, tab);
+      put = updates[i].new_stored = rte_store(&updates[i].new, ni, tab);
     else
       put = updates[i].old;
 
@@ -3753,7 +3793,7 @@ rt_next_hop_update_net(struct rtable_private *tab, net *n)
       { "autoupdated [+best]", "autoupdated [best]" }
     };
     rt_rte_trace_in(D_ROUTES, updates[i].new.sender->req, &updates[i].new, best_indicator[nb][ob]);
-    rte_announce(tab, n, updates[i].new_stored, updates[i].old, new, old_best);
+    rte_announce(tab, ni, n, updates[i].new_stored, updates[i].old, new, old_best);
 
     total++;
   }
@@ -3802,13 +3842,12 @@ rt_next_hop_update(struct rtable_private *tab)
     return;
   }
 
-  struct fib_iterator *fit = &tab->nhu_fit;
   int max_feed = 32;
 
   /* Initialize a new run */
   if (tab->nhu_state == NHU_SCHEDULED)
   {
-    FIB_ITERATE_INIT(fit, &tab->fib);
+    tab->nhu_index = 0;
     tab->nhu_state = NHU_RUNNING;
 
     if (tab->flowspec_trie)
@@ -3816,18 +3855,21 @@ rt_next_hop_update(struct rtable_private *tab)
   }
 
   /* Walk the fib one net after another */
-  FIB_ITERATE_START(&tab->fib, fit, net, n)
+  for (; tab->nhu_index < tab->routes_block_size; tab->nhu_index++)
     {
+      net *n = &tab->routes[tab->nhu_index];
+      if (!n->routes)
+	continue;
+
       if (max_feed <= 0)
 	{
-	  FIB_ITERATE_PUT(fit);
 	  birdloop_flag(tab->loop, RTF_NHU);
 	  return;
 	}
+
       TMP_SAVED
-	max_feed -= rt_next_hop_update_net(tab, n);
+	max_feed -= rt_next_hop_update_net(tab, RTE_GET_NETINDEX(&n->routes->rte), n);
     }
-  FIB_ITERATE_END;
 
   /* Finished NHU, cleanup */
   rt_trace(tab, D_EVENTS, "NHU done, scheduling export timer");
@@ -4204,7 +4246,6 @@ static void
 rt_feed_by_fib(void *data)
 {
   struct rt_table_export_hook *c = data;
-  struct fib_iterator *fit = &c->feed_fit;
   rt_feed_block block = {};
 
   _Bool done = 1;
@@ -4214,21 +4255,24 @@ rt_feed_by_fib(void *data)
   RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
   {
 
-  FIB_ITERATE_START(&tab->fib, fit, net, n)
+    for (; c->feed_index < tab->routes_block_size; c->feed_index++)
     {
-      if (rt_prefilter_net(&c->h.req->prefilter, n->n.addr))
+      net *n = &tab->routes[c->feed_index];
+      if (!n->routes)
+	continue;
+
+      const net_addr *a = n->routes->rte.net;
+      if (rt_prefilter_net(&c->h.req->prefilter, a))
       {
 	if (!rt_prepare_feed(c, n, &block))
 	{
-	  FIB_ITERATE_PUT(fit);
 	  done = 0;
 	  break;
 	}
       }
       else
-	req_trace(c->h.req, D_ROUTES, "Feeding %N rejected by prefilter", n->n.addr);
+	req_trace(c->h.req, D_ROUTES, "Feeding %N rejected by prefilter", a);
     }
-  FIB_ITERATE_END;
   }
 
   rt_process_feed(c, &block);
@@ -4257,7 +4301,8 @@ rt_feed_by_trie(void *data)
     if (!c->walk_last.type)
       continue;
 
-    net *n = net_find(tab, &c->walk_last);
+    const struct netindex *i = net_find_index(tab->netindex, &c->walk_last);
+    net *n = i ? net_find(tab, i) : NULL;
     if (!n)
       continue;
 
@@ -4294,7 +4339,8 @@ rt_feed_equal(void *data)
     ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
     ASSERT_DIE(c->h.req->prefilter.mode == TE_ADDR_EQUAL);
 
-    if (n = net_find(tab, c->h.req->prefilter.addr))
+    const struct netindex *i = net_find_index(tab->netindex, c->h.req->prefilter.addr);
+    if (i && (n = net_find(tab, i)))
       ASSERT_DIE(rt_prepare_feed(c, n, &block));
   }
 
@@ -4603,11 +4649,11 @@ rt_update_hostentry(struct rtable_private *tab, struct hostentry *he)
 	{
 	  /* Recursive route should not depend on another recursive route */
 	  log(L_WARN "Next hop address %I resolvable through recursive route for %N",
-	      he->addr, n->n.addr);
+	      he->addr, ee->rte.net);
 	  goto done;
 	}
 
-      pxlen = n->n.addr->pxlen;
+      pxlen = e->rte.net->pxlen;
 
       eattr *nhea = ea_find(a, &ea_gen_nexthop);
       ASSERT_DIE(nhea);
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 54355e31..54be8b05 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -369,7 +369,7 @@ rte_feed_obtain_valid(net *n, const rte **feed, uint count)
 }
 
 static struct rte *
-krt_export_net(struct krt_proto *p, net *net)
+krt_export_net(struct krt_proto *p, struct netindex *i, net *net)
 {
   /* FIXME: Here we are calling filters in table-locked context when exporting
    * to kernel. Here BIRD can crash if the user requested ROA check in kernel
@@ -389,7 +389,7 @@ krt_export_net(struct krt_proto *p, net *net)
 
     const rte **feed = alloca(count * sizeof(rte *));
     rte_feed_obtain_valid(net, feed, count);
-    return rt_export_merged(c, net->n.addr, feed, count, krt_filter_lp, 1);
+    return rt_export_merged(c, i->addr, feed, count, krt_filter_lp, 1);
   }
 
   static _Thread_local rte rt;
@@ -477,11 +477,12 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
   if (!p->ready)
     goto ignore;
 
-  net *net = net_find(tab, e->net);
+  struct netindex *i = net_find_index(tab->netindex, e->net);
+  net *net = i ? net_find(tab, i) : NULL;
   if (!net || !krt_is_installed(p, net))
     goto delete;
 
-  new = krt_export_net(p, net);
+  new = krt_export_net(p, i, net);
 
   /* Rejected by filters */
   if (!new)
@@ -542,22 +543,26 @@ krt_prune(struct krt_proto *p)
   {
 
   KRT_TRACE(p, D_EVENTS, "Pruning table %s", t->name);
-  FIB_WALK(&t->fib, net, n)
+  for (u32 i = 0; i < t->routes_block_size; i++)
   {
+    net *n = &t->routes[i];
+    if (!n->routes)
+      continue;
+
     if (p->ready && krt_is_installed(p, n) && !bmap_test(&p->seen_map, n->routes->rte.id))
     {
-      rte *new = krt_export_net(p, n);
+      struct netindex *ni = RTE_GET_NETINDEX(&n->routes->rte);
+      rte *new = krt_export_net(p, ni, n);
 
       if (new)
       {
 	krt_trace_in(p, new, "installing");
-	krt_replace_rte(p, n->n.addr, new, NULL);
+	krt_replace_rte(p, new->net, new, NULL);
       }
 
       lp_flush(krt_filter_lp);
     }
   }
-  FIB_WALK_END;
 
   if (p->ready)
     p->initialized = 1;

From e4e90c6f4d1c9bdca7d3eb2d541617db99ce22dd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 Jan 2024 12:02:25 +0100
Subject: [PATCH 403/431] Channel: Replacing refeed status trie by bitmap

This fixes a bug with reloading non-IP channels.
---
 nest/proto.c    |  9 +++------
 nest/protocol.h | 13 ++++++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 70cfad52..72d94a28 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -705,6 +705,7 @@ channel_start_export(struct channel *c)
 
   bmap_init(&c->export_map, p, 16);
   bmap_init(&c->export_reject_map, p, 16);
+  bmap_init(&c->refeed_map, p, 16);
 
   channel_reset_limit(c, &c->out_limit, PLD_OUT);
 
@@ -791,6 +792,7 @@ channel_export_stopped(struct rt_export_request *req)
 
     bmap_reset(&c->export_map, 16);
     bmap_reset(&c->export_reject_map, 16);
+    bmap_reset(&c->refeed_map, 16);
 
     rt_request_export(c->table, req);
     return;
@@ -833,7 +835,7 @@ channel_init_feeding(struct channel *c)
   /* No direct feeding, running auxiliary refeed. */
   c->refeeding = c->refeed_pending;
   c->refeed_pending = NULL;
-  c->refeed_trie = f_new_trie(lp_new(c->proto->pool), 0);
+  bmap_reset(&c->refeed_map, 16);
 
   if (no_trie)
   {
@@ -924,11 +926,6 @@ channel_feed_end(struct channel *c)
 
   /* Drop the refeed batch */
   c->refeeding = NULL;
-  if (c->refeed_trie)
-  {
-    rfree(c->refeed_trie->lp);
-    c->refeed_trie = NULL;
-  }
 
   /* Run the pending batch */
   if (c->refeed_pending)
diff --git a/nest/protocol.h b/nest/protocol.h
index a63305ac..9b8b837d 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -583,7 +583,7 @@ struct channel {
   struct rt_export_request out_req;	/* Table export connection */
 
   struct rt_export_request refeed_req;	/* Auxiliary refeed request */
-  struct f_trie *refeed_trie;		/* Auxiliary refeed trie */
+  struct bmap refeed_map;		/* Auxiliary refeed netindex bitmap */
   struct channel_feeding_request *refeeding;	/* Refeeding the channel */
   struct channel_feeding_request *refeed_pending;	/* Scheduled refeeds */
   struct channel_import_request *importing;	/* Importing the channel */
@@ -718,11 +718,12 @@ void channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_req
 static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n)
 {
   /* Not refeeding if not refeeding at all */
-  if (!c->refeeding || !c->refeed_trie)
+  if (!c->refeeding)
     return 0;
 
   /* Not refeeding if already refed */
-  if (trie_match_net(c->refeed_trie, n))
+  struct netindex *ni = NET_TO_INDEX(n);
+  if (bmap_test(&c->refeed_map, ni->index))
     return 0;
 
   /* Refeeding if matching any request */
@@ -735,8 +736,10 @@ static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n)
 }
 static inline void channel_net_mark_refed(struct channel *c, const net_addr *n)
 {
-  ASSERT_DIE(c->refeeding && c->refeed_trie);
-  trie_add_prefix(c->refeed_trie, n, n->pxlen, n->pxlen);
+  ASSERT_DIE(c->refeeding);
+
+  struct netindex *ni = NET_TO_INDEX(n);
+  bmap_set(&c->refeed_map, ni->index);
 }
 
 void channel_request_reload(struct channel *c);

From f0da632b3c406c6c39a582e7a353737d90d16117 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Nov 2023 12:19:44 +0100
Subject: [PATCH 404/431] Channels now can have external obstacles temporarily
 blocking their shutdown

---
 nest/proto.c    | 17 +++++++++++++++--
 nest/protocol.h |  5 +++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 72d94a28..6427afcd 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -745,7 +745,7 @@ channel_check_stopped(struct channel *c)
   switch (c->channel_state)
   {
     case CS_STOP:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->in_req.hook || c->reload_req.hook)
+      if (c->obstacles || !EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->in_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_DOWN);
@@ -753,7 +753,7 @@ channel_check_stopped(struct channel *c)
 
       break;
     case CS_PAUSE:
-      if (!EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->reload_req.hook)
+      if (c->obstacles || !EMPTY_LIST(c->roa_subscriptions) || c->out_req.hook || c->refeed_req.hook || c->reload_req.hook)
 	return;
 
       channel_set_state(c, CS_START);
@@ -763,6 +763,19 @@ channel_check_stopped(struct channel *c)
   DBG("%s.%s: Channel requests/hooks stopped (in state %s)\n", c->proto->name, c->name, c_states[c->channel_state]);
 }
 
+void
+channel_add_obstacle(struct channel *c)
+{
+  c->obstacles++;
+}
+
+void
+channel_del_obstacle(struct channel *c)
+{
+  if (!--c->obstacles)
+    channel_check_stopped(c);
+}
+
 void
 channel_import_stopped(struct rt_import_request *req)
 {
diff --git a/nest/protocol.h b/nest/protocol.h
index 9b8b837d..4c983ffc 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -605,6 +605,8 @@ struct channel {
   u8 gr_lock;				/* Graceful restart mechanism should wait for this channel */
   u8 gr_wait;				/* Route export to channel is postponed until graceful restart */
 
+  u32 obstacles;			/* External obstacles remaining before cleanup */
+
   btime last_state_change;		/* Time of last state transition */
 
   struct rt_export_request reload_req;	/* Feeder for import reload */
@@ -692,6 +694,9 @@ void channel_set_state(struct channel *c, uint state);
 void channel_schedule_reload(struct channel *c, struct channel_import_request *cir);
 int channel_import_request_prefilter(struct channel_import_request *cir_head, const net_addr *n);
 
+void channel_add_obstacle(struct channel *c);
+void channel_del_obstacle(struct channel *c);
+
 static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); }
 static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP); }
 static inline void channel_close(struct channel *c) { channel_set_state(c, CS_STOP); }

From 9815353c5eaff51e731cff0c8698956f2f375df4 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 23 Nov 2023 11:41:49 +0100
Subject: [PATCH 405/431] MPLS: Putting internal objects aside

---
 nest/mpls-internal.h | 60 ++++++++++++++++++++++++++++++++++++++++++++
 nest/mpls.c          |  2 +-
 nest/mpls.h          | 38 +---------------------------
 3 files changed, 62 insertions(+), 38 deletions(-)
 create mode 100644 nest/mpls-internal.h

diff --git a/nest/mpls-internal.h b/nest/mpls-internal.h
new file mode 100644
index 00000000..e5393b97
--- /dev/null
+++ b/nest/mpls-internal.h
@@ -0,0 +1,60 @@
+/*
+ *	BIRD Internet Routing Daemon -- MPLS Structures
+ *
+ *	(c) 2022 Ondrej Zajicek <santiago@crfreenet.org>
+ *	(c) 2022 CZ.NIC z.s.p.o.
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_MPLS_INTERNAL_H_
+#define _BIRD_MPLS_INTERNAL_H_
+
+#include "nest/bird.h"
+#include "lib/bitmap.h"
+#include "lib/hash.h"
+#include "nest/route.h"
+#include "nest/protocol.h"
+#include "nest/mpls.h"
+
+
+struct mpls_domain {
+  node n;				/* Node in global list of MPLS domains (mpls_domains) */
+  struct mpls_domain_config *cf;	/* Our config */
+  const char *name;
+  pool *pool;				/* Pool for the domain and associated objects */
+
+  struct lmap labels;			/* Bitmap of allocated labels */
+  uint label_count;			/* Number of allocated labels */
+  uint use_count;			/* Reference counter */
+
+  struct config *removed;		/* Deconfigured, waiting for zero use_count,
+					   while keeping config obstacle */
+
+  list ranges;				/* List of label ranges (struct mpls_range) */
+  list handles;				/* List of label handles (struct mpls_handle) */
+};
+
+struct mpls_range {
+  node n;				/* Node in mpls_domain.ranges */
+  struct mpls_range_config *cf;		/* Our config */
+  const char *name;
+
+  uint lo, hi;				/* Label range interval */
+  uint label_count;			/* Number of allocated labels */
+  uint use_count;			/* Reference counter */
+  u8 removed;				/* Deconfigured, waiting for zero use_count */
+};
+
+struct mpls_handle {
+  node n;				/* Node in mpls_domain.handles */
+
+  struct mpls_range *range;		/* Associated range, keeping reference */
+  uint label_count;			/* Number of allocated labels */
+};
+
+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_move_label(struct mpls_domain *m, struct mpls_handle *fh, struct mpls_handle *th, uint n);
+
+#endif
diff --git a/nest/mpls.c b/nest/mpls.c
index 944659f9..d384e41c 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -83,7 +83,7 @@
 
 #include "nest/bird.h"
 #include "nest/route.h"
-#include "nest/mpls.h"
+#include "nest/mpls-internal.h"
 #include "nest/cli.h"
 
 static struct mpls_range *mpls_new_range(struct mpls_domain *m, struct mpls_range_config *cf);
diff --git a/nest/mpls.h b/nest/mpls.h
index 2c1ab50f..60c38295 100644
--- a/nest/mpls.h
+++ b/nest/mpls.h
@@ -38,23 +38,6 @@ struct mpls_domain_config {
   struct mpls_range_config *dynamic_range; /* Default dynamic label range */
 };
 
-struct mpls_domain {
-  node n;				/* Node in global list of MPLS domains (mpls_domains) */
-  struct mpls_domain_config *cf;	/* Our config */
-  const char *name;
-  pool *pool;				/* Pool for the domain and associated objects */
-
-  struct lmap labels;			/* Bitmap of allocated labels */
-  uint label_count;			/* Number of allocated labels */
-  uint use_count;			/* Reference counter */
-
-  struct config *removed;		/* Deconfigured, waiting for zero use_count,
-					   while keeping config obstacle */
-
-  list ranges;				/* List of label ranges (struct mpls_range) */
-  list handles;				/* List of label handles (struct mpls_handle) */
-};
-
 struct mpls_range_config {
   node n;				/* Node in mpls_domain_config.ranges */
   struct mpls_range *range;		/* Our instance */
@@ -66,23 +49,7 @@ struct mpls_range_config {
   u8 implicit;				/* Implicitly defined range */
 };
 
-struct mpls_range {
-  node n;				/* Node in mpls_domain.ranges */
-  struct mpls_range_config *cf;		/* Our config */
-  const char *name;
-
-  uint lo, hi;				/* Label range interval */
-  uint label_count;			/* Number of allocated labels */
-  uint use_count;			/* Reference counter */
-  u8 removed;				/* Deconfigured, waiting for zero use_count */
-};
-
-struct mpls_handle {
-  node n;				/* Node in mpls_domain.handles */
-
-  struct mpls_range *range;		/* Associated range, keeping reference */
-  uint label_count;			/* Number of allocated labels */
-};
+struct mpls_handle;
 
 
 void mpls_init(void);
@@ -91,9 +58,6 @@ 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);
 void mpls_preconfig(struct config *c);
 void mpls_commit(struct config *new, struct config *old);
-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_move_label(struct mpls_domain *m, struct mpls_handle *fh, struct mpls_handle *th, uint n);
 
 static inline struct mpls_domain_config *cf_default_mpls_domain(struct config *cfg)
 { return EMPTY_LIST(cfg->mpls_domains) ? NULL : HEAD(cfg->mpls_domains); }

From 34d040a03463c1b83547da016dc7573c977d390b Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 23 Nov 2023 12:18:35 +0100
Subject: [PATCH 406/431] MPLS: Domain list locked by The BIRD Lock

---
 nest/mpls.c | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/nest/mpls.c b/nest/mpls.c
index d384e41c..8c1c4517 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -96,12 +96,26 @@ static void mpls_remove_range(struct mpls_range *r);
  *	MPLS domain
  */
 
-list mpls_domains;
+
+#define MPLS_GLOBAL_PUBLIC \
+  DOMAIN(the_bird) lock; \
+
+struct mpls_global_private {
+  struct { MPLS_GLOBAL_PUBLIC; };
+  list domains;
+};
+
+union mpls_global_public {
+  struct { MPLS_GLOBAL_PUBLIC; };
+  struct mpls_global_private priv;
+} mpls_global;
+
+#define MPLS_GLOBAL	LOBJ_PRIV(&mpls_global, the_bird)
 
 void
 mpls_init(void)
 {
-  init_list(&mpls_domains);
+  init_list(&MPLS_GLOBAL->domains);
 }
 
 struct mpls_domain_config *
@@ -203,7 +217,7 @@ mpls_new_domain(struct mpls_domain_config *cf)
   WALK_LIST(rc, cf->ranges)
     mpls_new_range(m, rc);
 
-  add_tail(&mpls_domains, &m->n);
+  add_tail(&MPLS_GLOBAL->domains, &m->n);
   cf->domain = m;
 
   return m;
@@ -313,8 +327,8 @@ mpls_commit(struct config *new, struct config *old)
 {
   list old_domains;
   init_list(&old_domains);
-  add_tail_list(&old_domains, &mpls_domains);
-  init_list(&mpls_domains);
+  add_tail_list(&old_domains, &MPLS_GLOBAL->domains);
+  init_list(&MPLS_GLOBAL->domains);
 
   struct mpls_domain_config *mc;
   WALK_LIST(mc, new->mpls_domains)
@@ -324,7 +338,7 @@ mpls_commit(struct config *new, struct config *old)
     if (m && mpls_reconfigure_domain(m, mc))
     {
       rem_node(&m->n);
-      add_tail(&mpls_domains, &m->n);
+      add_tail(&MPLS_GLOBAL->domains, &m->n);
       continue;
     }
 
@@ -335,7 +349,7 @@ mpls_commit(struct config *new, struct config *old)
   WALK_LIST_DELSAFE(m, m2, old_domains)
     mpls_remove_domain(m, old);
 
-  add_tail_list(&mpls_domains, &old_domains);
+  add_tail_list(&MPLS_GLOBAL->domains, &old_domains);
 }
 
 
@@ -1276,7 +1290,7 @@ mpls_show_ranges(struct mpls_show_ranges_cmd *cmd)
   else
   {
     struct mpls_domain *m;
-    WALK_LIST(m, mpls_domains)
+    WALK_LIST(m, MPLS_GLOBAL->domains)
       mpls_show_ranges_dom(cmd, m);
   }
 

From e711a991d4cfc8b796043c728d1da86a4acd2e6e Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 24 Nov 2023 00:05:51 +0100
Subject: [PATCH 407/431] MPLS: FEC Map moved from protocol to MPLS channel

---
 nest/mpls.c           | 21 ++++++++++----
 nest/mpls.h           | 16 ++++++++++-
 nest/proto.c          | 64 -------------------------------------------
 nest/protocol.h       |  4 ---
 nest/rt-table.c       |  4 +--
 proto/bgp/bgp.c       | 12 ++------
 proto/l3vpn/l3vpn.c   | 19 ++++++-------
 proto/static/static.c | 10 ++-----
 8 files changed, 46 insertions(+), 104 deletions(-)

diff --git a/nest/mpls.c b/nest/mpls.c
index 8c1c4517..2cc3e04e 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -565,6 +565,7 @@ mpls_channel_init(struct channel *C, struct channel_config *CC)
   c->domain = cc->domain->domain;
   c->range = cc->range->range;
   c->label_policy = cc->label_policy;
+  c->rts = cc->rts;
 }
 
 static int
@@ -575,6 +576,9 @@ mpls_channel_start(struct channel *C)
   mpls_lock_domain(c->domain);
   mpls_lock_range(c->range);
 
+  ASSERT_DIE(c->rts);
+  c->mpls_map = mpls_fec_map_new(C->proto->pool, C, c->rts);
+
   return 0;
 }
 
@@ -592,6 +596,9 @@ mpls_channel_cleanup(struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
 
+  mpls_fec_map_free(c->mpls_map);
+  c->mpls_map = NULL;
+
   mpls_unlock_range(c->range);
   mpls_unlock_domain(c->domain);
 }
@@ -623,6 +630,8 @@ mpls_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impo
     *import_changed = 1;
   }
 
+  mpls_fec_map_reconfigure(c->mpls_map, C);
+
   return 1;
 }
 
@@ -1141,8 +1150,10 @@ mpls_apply_fec(rte *r, struct mpls_fec *fec)
 
 
 int
-mpls_handle_rte(struct mpls_fec_map *m, const net_addr *n, rte *r)
+mpls_handle_rte(struct channel *c, const net_addr *n, rte *r)
 {
+  struct mpls_channel *mc = SKIP_BACK(struct mpls_channel, c, c->proto->mpls_channel);
+  struct mpls_fec_map *m = mc->mpls_map;
   struct mpls_fec *fec = NULL;
 
   /* Select FEC for route */
@@ -1214,13 +1225,13 @@ mpls_handle_rte(struct mpls_fec_map *m, const net_addr *n, rte *r)
 static inline struct mpls_fec_tmp_lock
 mpls_rte_get_fec_lock(const rte *r)
 {
-  struct mpls_fec_tmp_lock mt = {
-    .m = SKIP_BACK(struct proto, sources, r->src->owner)->mpls_map,
-  };
+  struct mpls_fec_tmp_lock mt = {};
 
-  if (!mt.m)
+  struct channel *c = SKIP_BACK(struct proto, sources, r->src->owner)->mpls_channel;
+  if (!c)
     return mt;
 
+  mt.m = SKIP_BACK(struct mpls_channel, c, c)->mpls_map;
   uint label = ea_get_int(r->attrs, &ea_gen_mpls_label, 0);
   if (label < 16)
     return mt;
diff --git a/nest/mpls.h b/nest/mpls.h
index 60c38295..f6734001 100644
--- a/nest/mpls.h
+++ b/nest/mpls.h
@@ -70,6 +70,7 @@ struct mpls_channel_config {
   struct mpls_range_config *range;
 
   uint label_policy;
+  uint rts;
 };
 
 struct mpls_channel {
@@ -79,12 +80,25 @@ struct mpls_channel {
   struct mpls_range *range;
 
   uint label_policy;
+  uint rts;
+
+  struct mpls_fec_map *mpls_map;	/* Maps protocol routes to FECs / labels */
 };
 
 
 void mpls_channel_postconfig(struct channel_config *CF);
 extern struct channel_class channel_mpls;
 
+static inline int
+proto_configure_mpls_channel(struct proto *p, struct proto_config *pc, uint rts)
+{
+  struct channel_config *cf = proto_cf_mpls_channel(pc);
+  if (cf)
+    SKIP_BACK(struct mpls_channel_config, c, cf)->rts = rts;
+
+  return proto_configure_channel(p, &p->mpls_channel, cf);
+}
+
 
 struct mpls_fec {
   u32 label;				/* Label for FEC */
@@ -134,7 +148,7 @@ struct mpls_fec *mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label);
 struct mpls_fec *mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u32 path_id);
 struct mpls_fec *mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest);
 void mpls_free_fec(struct mpls_fec_map *x, struct mpls_fec *fec);
-int mpls_handle_rte(struct mpls_fec_map *m, const net_addr *n, rte *r);
+int mpls_handle_rte(struct channel *c, const net_addr *n, rte *r);
 void mpls_rte_preimport(rte *new, const rte *old);
 
 
diff --git a/nest/proto.c b/nest/proto.c
index 6427afcd..c67a5a3a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1512,70 +1512,6 @@ proto_configure_channel(struct proto *p, struct channel **pc, struct channel_con
   return 1;
 }
 
-/**
- * proto_setup_mpls_map - automatically setup FEC map for protocol
- * @p: affected protocol
- * @rts: RTS_* value for generated MPLS routes
- * @hooks: whether to update rte_insert / rte_remove hooks
- *
- * Add, remove or reconfigure MPLS FEC map of the protocol @p, depends on
- * whether MPLS channel exists, and setup rte_insert / rte_remove hooks with
- * default MPLS handlers. It is a convenience function supposed to be called
- * from the protocol start and configure hooks, after reconfiguration of
- * channels. For shutdown, use proto_shutdown_mpls_map(). If caller uses its own
- * rte_insert / rte_remove hooks, it is possible to disable updating hooks and
- * doing that manually.
- */
-void
-proto_setup_mpls_map(struct proto *p, uint rts)
-{
-  struct mpls_fec_map *m = p->mpls_map;
-  struct channel *c = p->mpls_channel;
-
-  if (!m && c)
-  {
-    /*
-     * Note that when called from a protocol start hook, it is called before
-     * mpls_channel_start(). But FEC map locks MPLS domain internally so it does
-     * not depend on lock from MPLS channel.
-     */
-    p->mpls_map = mpls_fec_map_new(p->pool, c, rts);
-  }
-  else if (m && !c)
-  {
-    /*
-     * Note that for reconfiguration, it is called after the MPLS channel has
-     * been already removed. But removal of active MPLS channel would trigger
-     * protocol restart anyways.
-     */
-    mpls_fec_map_free(m);
-    p->mpls_map = NULL;
-  }
-  else if (m && c)
-  {
-    mpls_fec_map_reconfigure(m, c);
-  }
-}
-
-
-/**
- * proto_shutdown_mpls_map - automatically shutdown FEC map for protocol
- * @p: affected protocol
- * @hooks: whether to update rte_insert / rte_remove hooks
- *
- * Remove MPLS FEC map of the protocol @p during protocol shutdown.
- */
-void
-proto_shutdown_mpls_map(struct proto *p)
-{
-  struct mpls_fec_map *m = p->mpls_map;
-
-  if (!m)
-    return;
-
-  mpls_fec_map_free(m);
-  p->mpls_map = NULL;
-}
 
 static void
 proto_cleanup(struct proto *p)
diff --git a/nest/protocol.h b/nest/protocol.h
index 4c983ffc..aee2c08e 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -34,7 +34,6 @@ struct channel;
 struct ea_list;
 struct eattr;
 struct symbol;
-struct mpls_fec_map;
 
 
 /*
@@ -160,7 +159,6 @@ struct proto {
   TLIST_LIST(proto_neigh) neighbors;	/* List of neighbor structures */
   struct iface_subscription iface_sub;	/* Interface notification subscription */
   struct channel *mpls_channel;		/* MPLS channel, when used */
-  struct mpls_fec_map *mpls_map;	/* Maps protocol routes to FECs / labels */
 
   const char *name;			/* Name of this instance (== cf->name) */
   u32 debug;				/* Debugging flags */
@@ -687,8 +685,6 @@ struct channel *proto_find_channel_by_name(struct proto *p, const char *n);
 struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
 void proto_remove_channel(struct proto *p, struct channel *c);
 int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf);
-void proto_setup_mpls_map(struct proto *p, uint rts);
-void proto_shutdown_mpls_map(struct proto *p);
 
 void channel_set_state(struct channel *c, uint state);
 void channel_schedule_reload(struct channel *c, struct channel_import_request *cir);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index e1f6683a..29ee8bd3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1789,8 +1789,8 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	    new = NULL;
 	}
 
-      if (new && c->proto->mpls_map)
-	if (mpls_handle_rte(c->proto->mpls_map, n, new) < 0)
+      if (new && c->proto->mpls_channel)
+	if (mpls_handle_rte(c->proto->mpls_channel, n, new) < 0)
 	  {
 	    channel_rte_trace_in(D_FILTERS, c, new, "invalid");
 	    stats->updates_invalid++;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 24b952d9..c888460a 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -116,6 +116,7 @@
 #include "nest/iface.h"
 #include "nest/protocol.h"
 #include "nest/route.h"
+#include "nest/mpls.h"
 #include "nest/cli.h"
 #include "nest/locks.h"
 #include "conf/conf.h"
@@ -621,8 +622,6 @@ bgp_spawn(struct bgp_proto *pp, ip_addr remote_ip)
 void
 bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len)
 {
-  proto_shutdown_mpls_map(&p->p);
-
   proto_notify_state(&p->p, PS_STOP);
   p->uncork_ev->data = NULL;
   bgp_graceful_close_conn(&p->outgoing_conn, subcode, data, len);
@@ -1794,8 +1793,6 @@ bgp_start(struct proto *P)
   p->remote_id = 0;
   p->link_addr = IPA_NONE;
 
-  proto_setup_mpls_map(P, RTS_BGP);
-
   /* Lock all channels when in GR recovery mode */
   if (p->p.gr_recovery && p->cf->gr_mode)
   {
@@ -1966,7 +1963,7 @@ bgp_init(struct proto_config *CF)
     proto_add_channel(P, &cc->c);
 
   /* Add MPLS channel */
-  proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF));
+  proto_configure_mpls_channel(P, CF, RTS_BGP);
 
   return P;
 }
@@ -2392,15 +2389,12 @@ bgp_reconfigure(struct proto *P, struct proto_config *CF)
   }
 
   /* Reconfigure MPLS channel */
-  same = proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF)) && same;
+  same = proto_configure_mpls_channel(P, CF, RTS_BGP) && same;
 
   WALK_LIST_DELSAFE(C, C2, p->p.channels)
     if (C->stale)
       same = proto_configure_channel(P, &C, NULL) && same;
 
-  if (same)
-    proto_setup_mpls_map(P, RTS_BGP);
-
   if (same && (p->start_state > BSS_PREPARE))
     bgp_update_bfd(p, new->bfd);
 
diff --git a/proto/l3vpn/l3vpn.c b/proto/l3vpn/l3vpn.c
index a3c5de9c..c899d202 100644
--- a/proto/l3vpn/l3vpn.c
+++ b/proto/l3vpn/l3vpn.c
@@ -391,7 +391,8 @@ l3vpn_init(struct proto_config *CF)
   proto_configure_channel(P, &p->ip6_channel, proto_cf_find_channel(CF, NET_IP6));
   proto_configure_channel(P, &p->vpn4_channel, proto_cf_find_channel(CF, NET_VPN4));
   proto_configure_channel(P, &p->vpn6_channel, proto_cf_find_channel(CF, NET_VPN6));
-  proto_configure_channel(P, &P->mpls_channel, proto_cf_find_channel(CF, NET_MPLS));
+
+  proto_configure_mpls_channel(P, CF, RTS_L3VPN);
 
   P->rt_notify = l3vpn_rt_notify;
   P->preexport = l3vpn_preexport;
@@ -414,22 +415,20 @@ l3vpn_start(struct proto *P)
   l3vpn_prepare_import_targets(p);
   l3vpn_prepare_export_targets(p);
 
-  proto_setup_mpls_map(P, RTS_L3VPN);
-
-  P->mpls_map->vrf_iface = P->vrf;
+  SKIP_BACK(struct mpls_channel, c, P->mpls_channel)->mpls_map->vrf_iface = P->vrf;
 
   return PS_UP;
 }
 
+#if 0
 static int
-l3vpn_shutdown(struct proto *P)
+l3vpn_shutdown(struct proto *P UNUSED)
 {
   // struct l3vpn_proto *p = (void *) P;
 
-  proto_shutdown_mpls_map(P);
-
   return PS_DOWN;
 }
+#endif
 
 static int
 l3vpn_reconfigure(struct proto *P, struct proto_config *CF)
@@ -441,7 +440,7 @@ l3vpn_reconfigure(struct proto *P, struct proto_config *CF)
       !proto_configure_channel(P, &p->ip6_channel, proto_cf_find_channel(CF, NET_IP6)) ||
       !proto_configure_channel(P, &p->vpn4_channel, proto_cf_find_channel(CF, NET_VPN4)) ||
       !proto_configure_channel(P, &p->vpn6_channel, proto_cf_find_channel(CF, NET_VPN6)) ||
-      !proto_configure_channel(P, &P->mpls_channel, proto_cf_find_channel(CF, NET_MPLS)))
+      !proto_configure_mpls_channel(P, CF, RTS_L3VPN))
     return 0;
 
   if (p->rd != cf->rd)
@@ -454,8 +453,6 @@ l3vpn_reconfigure(struct proto *P, struct proto_config *CF)
   p->import_target = cf->import_target;
   p->export_target = cf->export_target;
 
-  proto_setup_mpls_map(P, RTS_L3VPN);
-
   if (import_changed)
   {
     TRACE(D_EVENTS, "Import target changed");
@@ -518,7 +515,7 @@ struct protocol proto_l3vpn = {
   .postconfig =		l3vpn_postconfig,
   .init =		l3vpn_init,
   .start =		l3vpn_start,
-  .shutdown =		l3vpn_shutdown,
+//  .shutdown =		l3vpn_shutdown,
   .reconfigure =	l3vpn_reconfigure,
   .copy_config = 	l3vpn_copy_config,
 };
diff --git a/proto/static/static.c b/proto/static/static.c
index 2024514f..bdccabaf 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -507,7 +507,7 @@ static_init(struct proto_config *CF)
 
   P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF));
 
-  proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF));
+  proto_configure_mpls_channel(P, CF, RTS_STATIC);
 
   P->iface_sub.neigh_notify = static_neigh_notify;
   P->reload_routes = static_reload_routes;
@@ -539,8 +539,6 @@ static_start(struct proto *P)
 
   BUFFER_INIT(p->marked, p->p.pool, 4);
 
-  proto_setup_mpls_map(P, RTS_STATIC);
-
   /* We have to go UP before routes could be installed */
   proto_notify_state(P, PS_UP);
 
@@ -558,8 +556,6 @@ static_shutdown(struct proto *P)
   struct static_config *cf = (void *) P->cf;
   struct static_route *r;
 
-  proto_shutdown_mpls_map(P);
-
   /* Just reset the flag, the routes will be flushed by the nest */
   WALK_LIST(r, cf->routes)
     static_reset_rte(p, r);
@@ -657,11 +653,9 @@ static_reconfigure(struct proto *P, struct proto_config *CF)
     return 0;
 
   if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF)) ||
-      !proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF)))
+      !proto_configure_mpls_channel(P, CF, RTS_STATIC))
     return 0;
 
-  proto_setup_mpls_map(P, RTS_STATIC);
-
   p->p.cf = CF;
 
   /* Reset route lists in neighbor entries */

From 9624ebfd9aa1304e9a2653679d2c008d37518678 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 10 Jan 2024 09:10:03 +0100
Subject: [PATCH 408/431] Lock free usecount better debuggability

---
 lib/lockfree.h | 14 +++++++++-----
 lib/netindex.c |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/lockfree.h b/lib/lockfree.h
index abb42676..23ab3523 100644
--- a/lib/lockfree.h
+++ b/lib/lockfree.h
@@ -30,12 +30,13 @@ struct lfuc {
  * lfuc_lock - increase an atomic usecount
  * @c: the usecount structure
  */
-static inline void lfuc_lock(struct lfuc *c)
+static inline u64 lfuc_lock(struct lfuc *c)
 {
   /* Locking is trivial; somebody already holds the underlying data structure
    * so we just increase the use count. Nothing can be freed underneath our hands. */
   u64 uc = atomic_fetch_add_explicit(&c->uc, 1, memory_order_acq_rel);
   ASSERT_DIE(uc > 0);
+  return uc & (LFUC_IN_PROGRESS - 1);
 }
 
 /**
@@ -47,9 +48,10 @@ static inline void lfuc_lock(struct lfuc *c)
  * Handy for situations with flapping routes. Use only from the same
  * loop as which runs the prune routine.
  */
-static inline void lfuc_lock_revive(struct lfuc *c)
+static inline u64 lfuc_lock_revive(struct lfuc *c)
 {
-  UNUSED u64 uc = atomic_fetch_add_explicit(&c->uc, 1, memory_order_acq_rel);
+  u64 uc = atomic_fetch_add_explicit(&c->uc, 1, memory_order_acq_rel);
+  return uc & (LFUC_IN_PROGRESS - 1);
 }
 
 /**
@@ -61,7 +63,7 @@ static inline void lfuc_lock_revive(struct lfuc *c)
  * If the usecount reaches zero, a prune event is run to possibly free the object.
  * The prune event MUST use lfuc_finished() to check the object state.
  */
-static inline void lfuc_unlock(struct lfuc *c, event_list *el, event *ev)
+static inline u64 lfuc_unlock(struct lfuc *c, event_list *el, event *ev)
 {
   /* Unlocking is tricky. We do it lockless so at the same time, the prune
    * event may be running, therefore if the unlock gets us to zero, it must be
@@ -102,11 +104,13 @@ static inline void lfuc_unlock(struct lfuc *c, event_list *el, event *ev)
 
   /* And now, finally, simultaneously pop the in-progress indicator and the
    * usecount, possibly allowing the pruning routine to free this structure */
-  atomic_fetch_sub_explicit(&c->uc, LFUC_IN_PROGRESS + 1, memory_order_acq_rel);
+  uc = atomic_fetch_sub_explicit(&c->uc, LFUC_IN_PROGRESS + 1, memory_order_acq_rel);
 
   /* ... and to reduce the load a bit, the pruning routine will better wait for
    * RCU synchronization instead of a busy loop. */
   rcu_read_unlock();
+
+  return uc - LFUC_IN_PROGRESS - 1;
 }
 
 /**
diff --git a/lib/netindex.c b/lib/netindex.c
index 3194c77b..b6eb07a0 100644
--- a/lib/netindex.c
+++ b/lib/netindex.c
@@ -189,13 +189,13 @@ net_new_index_locked(struct netindex_hash_private *hp, const net_addr *n, pool *
 void net_lock_index(netindex_hash *h UNUSED, struct netindex *i)
 {
 //  log(L_TRACE "Lock index %p", i);
-  return lfuc_lock(&i->uc);
+  lfuc_lock(&i->uc);
 }
 
 void net_unlock_index(netindex_hash *h, struct netindex *i)
 {
 //  log(L_TRACE "Unlock index %p", i);
-  return lfuc_unlock(&i->uc, h->cleanup_list, &h->cleanup_event);
+  lfuc_unlock(&i->uc, h->cleanup_list, &h->cleanup_event);
 }
 
 struct netindex *

From 365ea12ea1f359e2cbe838173b1d50b45ada5b47 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 23 Nov 2023 18:41:07 +0100
Subject: [PATCH 409/431] MPLS Subsystem Proper Locking

Added also some debug lines if debug is on.
---
 nest/mpls-internal.h |  90 +++++++-
 nest/mpls.c          | 481 ++++++++++++++++++++++++++++---------------
 nest/mpls.h          |  37 ++--
 nest/rt-table.c      |   9 +-
 proto/bgp/bgp.c      |   2 +-
 5 files changed, 422 insertions(+), 197 deletions(-)

diff --git a/nest/mpls-internal.h b/nest/mpls-internal.h
index e5393b97..1c6f380c 100644
--- a/nest/mpls-internal.h
+++ b/nest/mpls-internal.h
@@ -16,12 +16,18 @@
 #include "nest/route.h"
 #include "nest/protocol.h"
 #include "nest/mpls.h"
+#include "lib/tlists.h"
 
 
+#define MPLS_DOMAIN_PUBLIC \
+  node n;				/* Node in global list of MPLS domains (mpls_domains) */ \
+  const char *name;	\
+  DOMAIN(attrs) lock;	\
+
 struct mpls_domain {
-  node n;				/* Node in global list of MPLS domains (mpls_domains) */
+  MPLS_DOMAIN_PUBLIC;
+  struct mpls_domain **locked_at;
   struct mpls_domain_config *cf;	/* Our config */
-  const char *name;
   pool *pool;				/* Pool for the domain and associated objects */
 
   struct lmap labels;			/* Bitmap of allocated labels */
@@ -31,30 +37,98 @@ struct mpls_domain {
   struct config *removed;		/* Deconfigured, waiting for zero use_count,
 					   while keeping config obstacle */
 
+  struct mpls_range *static_range;	/* Direct static range pointer */
   list ranges;				/* List of label ranges (struct mpls_range) */
-  list handles;				/* List of label handles (struct mpls_handle) */
+  event range_cleanup;			/* Event for asynchronous cleanup of removed ranges */
 };
 
+struct mpls_domain_pub {
+  union {
+    struct { MPLS_DOMAIN_PUBLIC; };
+    struct mpls_domain priv;
+  };
+};
+
+#define mpls_domain_private mpls_domain
+#define MPLS_DOMAIN_LOCK(_obj, _pobj)	LOBJ_LOCK(_obj, _pobj, mpls_domain, attrs)
+#define MPLS_DOMAIN_LOCKED(_obj, _pobj)	LOBJ_LOCKED(_obj, _pobj, mpls_domain, attrs)
+LOBJ_UNLOCK_CLEANUP(mpls_domain, attrs);
+
+#define MPLS_DOMAIN_PRIV(_obj)		LOBJ_PRIV(_obj, attrs)
+#define MPLS_DOMAIN_PUB(_pobj)		SKIP_BACK(struct mpls_domain_pub, priv, (_pobj))
+
+#define MPLS_RANGE_PUBLIC \
+  node n;				/* Node in mpls_domain.ranges */  \
+  DOMAIN(attrs) lock;			/* Shared with the domain */	  \
+
 struct mpls_range {
-  node n;				/* Node in mpls_domain.ranges */
+  MPLS_RANGE_PUBLIC;
+  struct mpls_range **locked_at;
   struct mpls_range_config *cf;		/* Our config */
   const char *name;
 
+  struct mpls_domain *domain;
+  list handles;				/* List of label handles (struct mpls_handle) */
+
   uint lo, hi;				/* Label range interval */
   uint label_count;			/* Number of allocated labels */
   uint use_count;			/* Reference counter */
   u8 removed;				/* Deconfigured, waiting for zero use_count */
 };
 
+struct mpls_range_pub {
+  union {
+    struct { MPLS_RANGE_PUBLIC; };
+    struct mpls_range priv;
+  };
+};
+
+#define mpls_range_private mpls_range
+#define MPLS_RANGE_LOCK(_obj, _pobj)	LOBJ_LOCK(_obj, _pobj, mpls_range, attrs)
+#define MPLS_RANGE_LOCKED(_obj, _pobj)	LOBJ_LOCKED(_obj, _pobj, mpls_range, attrs)
+LOBJ_UNLOCK_CLEANUP(mpls_range, attrs);
+
+#define MPLS_RANGE_PRIV(_obj)		LOBJ_PRIV(_obj, attrs)
+#define MPLS_RANGE_PUB(_pobj)		SKIP_BACK(struct mpls_range_pub, priv, (_pobj))
+
+#define MPLS_HANDLE_PUBLIC \
+  node n;				/* Node in mpls_domain.handles */	\
+  const char *name;			/* Shared with the range */		\
+  DOMAIN(attrs) lock;			/* Shared with the domain */		\
+
 struct mpls_handle {
-  node n;				/* Node in mpls_domain.handles */
+  MPLS_HANDLE_PUBLIC;
+  struct mpls_handle **locked_at;
 
   struct mpls_range *range;		/* Associated range, keeping reference */
   uint label_count;			/* Number of allocated labels */
 };
 
-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_move_label(struct mpls_domain *m, struct mpls_handle *fh, struct mpls_handle *th, uint n);
+struct mpls_handle_pub {
+  union {
+    struct { MPLS_HANDLE_PUBLIC; };
+    struct mpls_handle priv;
+  };
+};
+
+#define mpls_handle_private mpls_handle
+#define MPLS_HANDLE_LOCK(_obj, _pobj)	LOBJ_LOCK(_obj, _pobj, mpls_handle, attrs)
+#define MPLS_HANDLE_LOCKED(_obj, _pobj)	LOBJ_LOCKED(_obj, _pobj, mpls_handle, attrs)
+LOBJ_UNLOCK_CLEANUP(mpls_handle, attrs);
+
+#define MPLS_HANDLE_PRIV(_obj)		LOBJ_PRIV(_obj, attrs)
+#define MPLS_HANDLE_PUB(_pobj)		SKIP_BACK(struct mpls_handle_pub, priv, (_pobj))
+
+uint mpls_new_label(struct mpls_handle *h, uint n);
+void mpls_free_label(struct mpls_handle *h, uint n);
+void mpls_move_label(struct mpls_handle *fh, struct mpls_handle *th, uint n);
+
+void mpls_lock_domain(struct mpls_domain *m);
+void mpls_unlock_domain(struct mpls_domain *m);
+
+void mpls_lock_range(struct mpls_range *m);
+void mpls_unlock_range(struct mpls_range *m);
+
+void mpls_revive_fec(struct mpls_fec *);
 
 #endif
diff --git a/nest/mpls.c b/nest/mpls.c
index 2cc3e04e..c3697a45 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -90,7 +90,10 @@ static struct mpls_range *mpls_new_range(struct mpls_domain *m, struct mpls_rang
 static struct mpls_range *mpls_find_range_(list *l, const char *name);
 static int mpls_reconfigure_range(struct mpls_domain *m, struct mpls_range *r, struct mpls_range_config *cf);
 static void mpls_remove_range(struct mpls_range *r);
+static void mpls_cleanup_ranges(void *_domain);
 
+static void mpls_free_fec(struct mpls_fec_map *m, struct mpls_fec *fec);
+static void mpls_fec_map_cleanup(void *_m);
 
 /*
  *	MPLS domain
@@ -115,6 +118,7 @@ union mpls_global_public {
 void
 mpls_init(void)
 {
+  mpls_global.lock = the_bird_domain;
   init_list(&MPLS_GLOBAL->domains);
 }
 
@@ -197,11 +201,18 @@ mpls_domain_postconfig(struct mpls_domain_config *cf UNUSED)
   }
 }
 
-static struct mpls_domain *
+static struct mpls_domain_pub *
 mpls_new_domain(struct mpls_domain_config *cf)
 {
-  struct pool *p = rp_new(&root_pool, the_bird_domain.the_bird, "MPLS domain");
-  struct mpls_domain *m = mb_allocz(p, sizeof(struct mpls_domain));
+  ASSERT_THE_BIRD_LOCKED;
+
+  DOMAIN(attrs) dom = DOMAIN_NEW(attrs);
+  LOCK_DOMAIN(attrs, dom);
+
+  struct pool *p = rp_newf(&root_pool, dom.attrs, "MPLS domain %s", cf->name);
+  struct mpls_domain_pub *mpub = mb_allocz(p, sizeof(struct mpls_domain_pub));
+  mpub->lock = dom;
+  struct mpls_domain *m = LOBJ_PRIV(mpub, attrs);
 
   m->cf = cf;
   m->name = cf->name;
@@ -211,22 +222,30 @@ mpls_new_domain(struct mpls_domain_config *cf)
   lmap_set(&m->labels, 0);
 
   init_list(&m->ranges);
-  init_list(&m->handles);
 
   struct mpls_range_config *rc;
   WALK_LIST(rc, cf->ranges)
-    mpls_new_range(m, rc);
+  {
+    struct mpls_range *r = mpls_new_range(m, rc);
+    if (rc == cf->static_range)
+      m->static_range = r;
+  }
+
+  m->range_cleanup = (event) { .hook = mpls_cleanup_ranges, .data = m };
 
   add_tail(&MPLS_GLOBAL->domains, &m->n);
-  cf->domain = m;
+  mpls_lock_domain(m);
 
-  return m;
+  UNLOCK_DOMAIN(attrs, dom);
+
+  cf->domain = mpub;
+  return mpub;
 }
 
-static struct mpls_domain *
+static struct mpls_domain_pub *
 mpls_find_domain_(list *l, const char *name)
 {
-  struct mpls_domain *m;
+  struct mpls_domain_pub *m;
 
   WALK_LIST(m, *l)
     if (!strcmp(m->name, name))
@@ -236,9 +255,12 @@ mpls_find_domain_(list *l, const char *name)
 }
 
 static int
-mpls_reconfigure_domain(struct mpls_domain *m, struct mpls_domain_config *cf)
+mpls_reconfigure_domain(struct mpls_domain_pub *mpub, struct mpls_domain_config *cf)
 {
-  cf->domain = m;
+  cf->domain = mpub;
+
+  MPLS_DOMAIN_LOCK(mpub, m);
+
   m->cf->domain = NULL;
   m->cf = cf;
   m->name = cf->name;
@@ -275,17 +297,24 @@ mpls_reconfigure_domain(struct mpls_domain *m, struct mpls_domain_config *cf)
 }
 
 static void
-mpls_free_domain(struct mpls_domain *m)
+mpls_free_domain(void *_m)
 {
+  ASSERT_THE_BIRD_LOCKED;
+
+  struct mpls_domain *m = _m;
+  DOMAIN(attrs) dom = m->lock;
+  LOCK_DOMAIN(attrs, dom);
+
   ASSERT(m->use_count == 0);
   ASSERT(m->label_count == 0);
-  ASSERT(EMPTY_LIST(m->handles));
+  ASSERT(EMPTY_LIST(m->ranges));
 
   struct config *cfg = m->removed;
 
   m->cf->domain = NULL;
   rem_node(&m->n);
   rfree(m->pool);
+  UNLOCK_DOMAIN(attrs, dom);
 
   config_del_obstacle(cfg);
 }
@@ -296,8 +325,12 @@ mpls_remove_domain(struct mpls_domain *m, struct config *cfg)
   m->removed = cfg;
   config_add_obstacle(cfg);
 
-  if (!m->use_count)
-    mpls_free_domain(m);
+  struct mpls_range *r, *rnext;
+  WALK_LIST_DELSAFE(r, rnext, m->ranges)
+    if (!r->removed)
+      mpls_remove_range(r);
+
+  mpls_unlock_domain(m);
 }
 
 void
@@ -313,7 +346,7 @@ mpls_unlock_domain(struct mpls_domain *m)
 
   m->use_count--;
   if (!m->use_count && m->removed)
-    mpls_free_domain(m);
+    ev_new_send(&main_birdloop, m->pool, mpls_free_domain, m);
 }
 
 void
@@ -333,7 +366,7 @@ mpls_commit(struct config *new, struct config *old)
   struct mpls_domain_config *mc;
   WALK_LIST(mc, new->mpls_domains)
   {
-    struct mpls_domain *m = mpls_find_domain_(&old_domains, mc->name);
+    struct mpls_domain_pub *m = mpls_find_domain_(&old_domains, mc->name);
 
     if (m && mpls_reconfigure_domain(m, mc))
     {
@@ -378,16 +411,26 @@ mpls_range_config_new(struct mpls_domain_config *mc, struct symbol *s)
 static struct mpls_range *
 mpls_new_range(struct mpls_domain *m, struct mpls_range_config *cf)
 {
-  struct mpls_range *r = mb_allocz(m->pool, sizeof(struct mpls_range));
+  struct mpls_range_pub *rpub = mb_allocz(m->pool, sizeof(struct mpls_range_pub));
+  rpub->lock = m->lock;
+
+  struct mpls_range *r = LOBJ_PRIV(rpub, attrs);
+
+  r->domain = m;
+  mpls_lock_domain(m);
 
   r->cf = cf;
   r->name = cf->name;
   r->lo = cf->start;
   r->hi = cf->start + cf->length;
 
-  add_tail(&m->ranges, &r->n);
-  cf->range = r;
+  init_list(&r->handles);
 
+  add_tail(&m->ranges, &r->n);
+  cf->range = rpub;
+
+  DBGL("Lock range %p (new)", r);
+  mpls_lock_range(r);
   return r;
 }
 
@@ -412,7 +455,7 @@ mpls_reconfigure_range(struct mpls_domain *m, struct mpls_range *r, struct mpls_
   if ((cf->start > r->lo) || (cf->start + cf->length <= last))
     return 0;
 
-  cf->range = r;
+  cf->range = MPLS_RANGE_PUB(r);
   r->cf->range = NULL;
   r->cf = cf;
   r->name = cf->name;
@@ -425,13 +468,30 @@ mpls_reconfigure_range(struct mpls_domain *m, struct mpls_range *r, struct mpls_
 static void
 mpls_free_range(struct mpls_range *r)
 {
+  /* Must always run in an asynchronous context from main loop */
+  ASSERT_THE_BIRD_LOCKED;
+
   ASSERT(r->use_count == 0);
   ASSERT(r->label_count == 0);
 
+  mpls_unlock_domain(r->domain);
+
   rem_node(&r->n);
   mb_free(r);
 }
 
+static void mpls_cleanup_ranges(void *_domain)
+{
+  MPLS_DOMAIN_LOCK((struct mpls_domain_pub *) _domain, m);
+
+  struct mpls_range *r, *rnext;
+  WALK_LIST_BACKWARDS_DELSAFE(r, rnext, m->ranges)
+    if (!r->removed)
+      return;
+    else if (!r->use_count)
+      mpls_free_range(r);
+}
+
 static void
 mpls_remove_range(struct mpls_range *r)
 {
@@ -441,8 +501,8 @@ mpls_remove_range(struct mpls_range *r)
   r->cf->range = NULL;
   r->cf = NULL;
 
-  if (!r->use_count)
-    mpls_free_range(r);
+  DBGL("Unlock range %p (remove)", r);
+  mpls_unlock_range(r);
 }
 
 void
@@ -458,7 +518,7 @@ mpls_unlock_range(struct mpls_range *r)
 
   r->use_count--;
   if (!r->use_count && r->removed)
-    mpls_free_range(r);
+    ev_send_loop(&main_birdloop, &r->domain->range_cleanup);
 }
 
 
@@ -467,23 +527,28 @@ mpls_unlock_range(struct mpls_range *r)
  */
 
 struct mpls_handle *
-mpls_new_handle(struct mpls_domain *m, struct mpls_range *r)
+mpls_new_handle(struct mpls_range *r)
 {
+  struct mpls_domain *m = r->domain;
+
   struct mpls_handle *h = mb_allocz(m->pool, sizeof(struct mpls_handle));
+  h->lock = m->lock;
 
+  DBGL("Lock range %p (new handle %p)", r, h);
+  mpls_lock_range(r);
   h->range = r;
-  mpls_lock_range(h->range);
 
-  add_tail(&m->handles, &h->n);
+  add_tail(&r->handles, &h->n);
 
   return h;
 }
 
 void
-mpls_free_handle(struct mpls_domain *m UNUSED, struct mpls_handle *h)
+mpls_free_handle(struct mpls_handle *h)
 {
   ASSERT(h->label_count == 0);
 
+  DBGL("Unlock range %p (free handle %p)", h->range, h);
   mpls_unlock_range(h->range);
   rem_node(&h->n);
   mb_free(h);
@@ -495,9 +560,10 @@ mpls_free_handle(struct mpls_domain *m UNUSED, struct mpls_handle *h)
  */
 
 uint
-mpls_new_label(struct mpls_domain *m, struct mpls_handle *h, uint n)
+mpls_new_label(struct mpls_handle *h, uint n)
 {
   struct mpls_range *r = h->range;
+  struct mpls_domain *m = r->domain;
 
   if (!n)
     n = lmap_first_zero_in_range(&m->labels, r->lo, r->hi);
@@ -514,9 +580,10 @@ 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)
+mpls_free_label(struct mpls_handle *h, uint n)
 {
   struct mpls_range *r = h->range;
+  struct mpls_domain *m = r->domain;
 
   ASSERT(lmap_test(&m->labels, n));
   lmap_clear(&m->labels, n);
@@ -532,10 +599,13 @@ mpls_free_label(struct mpls_domain *m, struct mpls_handle *h, uint n)
 }
 
 void
-mpls_move_label(struct mpls_domain *m, struct mpls_handle *fh, struct mpls_handle *th, uint n)
+mpls_move_label(struct mpls_handle *fh, struct mpls_handle *th, uint n)
 {
   struct mpls_range *fr = fh->range;
+  struct mpls_domain *m = fr->domain;
+
   struct mpls_range *tr = th->range;
+  ASSERT_DIE(tr->domain == m);
 
   ASSERT(lmap_test(&m->labels, n));
   ASSERT((n >= fr->lo) && (n < fr->hi));
@@ -562,22 +632,23 @@ mpls_channel_init(struct channel *C, struct channel_config *CC)
   struct mpls_channel *c = (void *) C;
   struct mpls_channel_config *cc = (void *) CC;
 
-  c->domain = cc->domain->domain;
-  c->range = cc->range->range;
-  c->label_policy = cc->label_policy;
-  c->rts = cc->rts;
+  if (cc->rts)
+  {
+    c->domain = cc->domain->domain;
+    c->range = cc->range->range;
+    c->label_policy = cc->label_policy;
+    c->rts = cc->rts;
+  }
 }
 
 static int
 mpls_channel_start(struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
+  if (!c->rts)
+    return 0;
 
-  mpls_lock_domain(c->domain);
-  mpls_lock_range(c->range);
-
-  ASSERT_DIE(c->rts);
-  c->mpls_map = mpls_fec_map_new(C->proto->pool, C, c->rts);
+  c->mpls_map = mpls_fec_map_new(C->proto->pool, C->proto->loop, C, c->rts);
 
   return 0;
 }
@@ -587,6 +658,8 @@ static void
 mpls_channel_shutdown(struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
+  if (!c->rts)
+    return;
 
 }
 */
@@ -595,12 +668,11 @@ static void
 mpls_channel_cleanup(struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
+  if (!c->rts)
+    return;
 
   mpls_fec_map_free(c->mpls_map);
   c->mpls_map = NULL;
-
-  mpls_unlock_range(c->range);
-  mpls_unlock_domain(c->domain);
 }
 
 static int
@@ -615,13 +687,21 @@ mpls_channel_reconfigure(struct channel *C, struct channel_config *CC, int *impo
   if (new->range->range != c->range)
   {
     if (c->c.channel_state != CS_DOWN)
-      mpls_unlock_range(c->range);
+      MPLS_RANGE_LOCKED(c->range, r)
+      {
+	DBGL("Unlock range %p (channel %p)", r, c);
+	mpls_unlock_range(r);
+      }
 
     c->range = new->range->range;
     *import_changed = 1;
 
     if (c->c.channel_state != CS_DOWN)
-      mpls_lock_range(c->range);
+      MPLS_RANGE_LOCKED(c->range, r)
+      {
+	DBGL("Lock range %p (channel %p)", r, c);
+	mpls_lock_range(r);
+      }
   }
 
   if (new->label_policy != c->label_policy)
@@ -705,19 +785,24 @@ static void mpls_withdraw_fec(struct mpls_fec_map *m, struct mpls_fec *fec);
 static struct ea_storage * mpls_get_key_attrs(struct mpls_fec_map *m, ea_list *src);
 
 struct mpls_fec_map *
-mpls_fec_map_new(pool *pp, struct channel *C, uint rts)
+mpls_fec_map_new(pool *pp, struct birdloop *loop, struct channel *C, uint rts)
 {
-  struct pool *p = rp_new(pp, the_bird_domain.the_bird, "MPLS FEC map");
+  struct pool *p = rp_new(pp, pp->domain, "MPLS FEC map");
   struct mpls_fec_map *m = mb_allocz(p, sizeof(struct mpls_fec_map));
   struct mpls_channel *c = (void *) C;
 
+  DBGL("New FEC Map %p", m);
+
   m->pool = p;
+  m->loop = loop;
+  m->cleanup_event = ev_new_init(p, mpls_fec_map_cleanup, m);
   m->channel = C;
+  channel_add_obstacle(C);
+  ev_send_loop(loop, m->cleanup_event);
 
   m->domain = c->domain;
-  mpls_lock_domain(m->domain);
-
-  m->handle = mpls_new_handle(c->domain, c->range);
+  MPLS_RANGE_LOCKED(c->range, r)
+    m->handle = MPLS_HANDLE_PUB(mpls_new_handle(r));
 
   /* net_hash and rta_hash are initialized on-demand */
   HASH_INIT(m->label_hash, m->pool, 4);
@@ -732,21 +817,28 @@ mpls_fec_map_reconfigure(struct mpls_fec_map *m, struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
 
+  MPLS_DOMAIN_LOCK(m->domain, domain);
+
+  struct mpls_handle *dh = MPLS_HANDLE_PRIV(m->handle);
+  struct mpls_handle *sh = m->static_handle ? MPLS_HANDLE_PRIV(m->static_handle) : NULL;
+
+  struct mpls_range *new_range = MPLS_RANGE_PRIV(c->range);
+
   struct mpls_handle *old_d = NULL;
   struct mpls_handle *old_s = NULL;
 
   /* Reallocate dynamic handle */
-  if (m->handle->range != c->range)
+  if (dh->range != new_range)
   {
-    old_d = m->handle;
-    m->handle = mpls_new_handle(m->domain, c->range);
+    old_d = dh;
+    m->handle = MPLS_HANDLE_PUB(mpls_new_handle(new_range));
   }
 
   /* Reallocate static handle */
-  if (m->static_handle && (m->static_handle->range != m->domain->cf->static_range->range))
+  if (sh && (sh->range != domain->static_range))
   {
-    old_s = m->static_handle;
-    m->static_handle = mpls_new_handle(m->domain, m->domain->cf->static_range->range);
+    old_s = sh;
+    m->static_handle = MPLS_HANDLE_PUB(mpls_new_handle(domain->static_range));
   }
 
   /* Skip rest if there is no change */
@@ -765,11 +857,14 @@ mpls_fec_map_reconfigure(struct mpls_fec_map *m, struct channel *C)
       continue;
 
     /* Try new handle for the FEC */
-    struct mpls_handle *new = (fec->policy != MPLS_POLICY_STATIC) ? m->handle : m->static_handle;
+    struct mpls_handle_pub *new_pub = (fec->policy != MPLS_POLICY_STATIC) ? m->handle : m->static_handle;
+    struct mpls_handle *new = MPLS_HANDLE_PRIV(new_pub);
+    struct mpls_handle *old = MPLS_HANDLE_PRIV(fec->handle);
+
     if ((fec->label >= new->range->lo) && (fec->label < new->range->hi))
     {
-      mpls_move_label(m->domain, fec->handle, new, fec->label);
-      fec->handle = new;
+      mpls_move_label(old, new, fec->label);
+      fec->handle = new_pub;
       continue;
     }
 
@@ -782,15 +877,36 @@ mpls_fec_map_reconfigure(struct mpls_fec_map *m, struct channel *C)
   /* Remove old unused handles */
 
   if (old_d && !old_d->label_count)
-    mpls_free_handle(m->domain, old_d);
+    mpls_free_handle(old_d);
 
   if (old_s && !old_s->label_count)
-    mpls_free_handle(m->domain, old_s);
+    mpls_free_handle(old_s);
+}
+
+static void
+mpls_fec_map_cleanup(void *_m)
+{
+  struct mpls_fec_map *m = _m;
+  _Bool finished = (m->channel->channel_state == CS_STOP);
+  HASH_WALK_DELSAFE(m->label_hash, next_l, fec)
+    if (lfuc_finished(&fec->uc))
+      mpls_free_fec(m, fec);
+    else
+      finished = 0;
+  HASH_WALK_DELSAFE_END;
+
+  if (finished)
+  {
+    ev_postpone(m->cleanup_event);
+    channel_del_obstacle(m->channel);
+  }
 }
 
 void
 mpls_fec_map_free(struct mpls_fec_map *m)
 {
+  DBGL("Free Whole FEC Map %p", m);
+
   /* Free stored rtas */
   if (m->attrs_hash.data)
   {
@@ -802,21 +918,24 @@ mpls_fec_map_free(struct mpls_fec_map *m)
     HASH_WALK_END;
   }
 
+  MPLS_DOMAIN_LOCK(m->domain, domain);
+
   /* Free allocated labels */
   HASH_WALK(m->label_hash, next_l, fec)
   {
-    mpls_free_label(m->domain, fec->handle, fec->label);
+    struct mpls_handle *h = MPLS_HANDLE_PRIV(fec->handle);
+    mpls_free_label(h, fec->label);
 
-    if (!fec->policy && !fec->handle->label_count)
-      mpls_free_handle(m->domain, fec->handle);
+    DBGL("Handle %p policy %d label count %d", fec->policy, h->label_count);
+    if (!fec->policy && !h->label_count)
+      mpls_free_handle(h);
   }
   HASH_WALK_END;
 
   if (m->static_handle)
-    mpls_free_handle(m->domain, m->static_handle);
+    mpls_free_handle(MPLS_HANDLE_PRIV(m->static_handle));
 
-  mpls_free_handle(m->domain, m->handle);
-  mpls_unlock_domain(m->domain);
+  mpls_free_handle(MPLS_HANDLE_PRIV(m->handle));
 
   rfree(m->pool);
 }
@@ -839,31 +958,57 @@ mpls_find_fec_by_label(struct mpls_fec_map *m, u32 label)
   return HASH_FIND(m->label_hash, LABEL, label);
 }
 
+struct mpls_fec *
+mpls_new_fec(struct mpls_fec_map *m, u8 net_type, u32 label)
+{
+  struct mpls_fec *fec = sl_allocz(mpls_slab(m, net_type));
+
+  fec->map = m;
+  fec->label = label;
+
+  HASH_INSERT2(m->label_hash, LABEL, m->pool, fec);
+
+  /* Temporarily lock FEC */
+  lfuc_init(&fec->uc);
+
+  return fec;
+}
+
 struct mpls_fec *
 mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
 {
   struct mpls_fec *fec = HASH_FIND(m->label_hash, LABEL, label);
 
   if (fec)
-    return (fec->policy == MPLS_POLICY_STATIC) ? fec : NULL;
+  {
+    if (fec->policy == MPLS_POLICY_STATIC)
+      return NULL;
 
-  if (!m->static_handle)
-    m->static_handle = mpls_new_handle(m->domain, m->domain->cf->static_range->range);
+    mpls_revive_fec(fec);
+    return fec;
+  }
 
-  label = mpls_new_label(m->domain, m->static_handle, label);
+  MPLS_DOMAIN_LOCKED(m->domain, domain)
+  {
+    struct mpls_handle *h;
 
-  if (!label)
-    return NULL;
+    if (m->static_handle)
+      h = MPLS_HANDLE_PRIV(m->static_handle);
+    else
+      m->static_handle = MPLS_HANDLE_PUB(h = mpls_new_handle(domain->static_range));
 
-  fec = sl_allocz(mpls_slab(m, 0));
+    label = mpls_new_label(h, label);
+
+    if (!label)
+      return NULL;
+  }
+
+  fec = mpls_new_fec(m, 0, label);
 
-  fec->label = label;
   fec->policy = MPLS_POLICY_STATIC;
   fec->handle = m->static_handle;
 
-  DBG("New FEC lab %u\n", fec->label);
-
-  HASH_INSERT2(m->label_hash, LABEL, m->pool, fec);
+  DBGL("New FEC lab %u", fec->label);
 
   return fec;
 }
@@ -878,27 +1023,30 @@ mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u32 path_id)
   struct mpls_fec *fec = HASH_FIND(m->net_hash, NET, net, path_id, hash);
 
   if (fec)
+  {
+    mpls_revive_fec(fec);
     return fec;
+  }
 
-  u32 label = mpls_new_label(m->domain, m->handle, 0);
+  u32 label = 0;
+  MPLS_HANDLE_LOCKED(m->handle, h)
+    label = mpls_new_label(h, 0);
 
   if (!label)
     return NULL;
 
-  fec = sl_allocz(mpls_slab(m, net->type));
+  fec = mpls_new_fec(m, net->type, label);
 
   fec->hash = hash;
   fec->path_id = path_id;
   net_copy(fec->net, net);
 
-  fec->label = label;
   fec->policy = MPLS_POLICY_PREFIX;
   fec->handle = m->handle;
 
-  DBG("New FEC net %u\n", fec->label);
+  DBGL("New FEC net %u", fec->label);
 
   HASH_INSERT2(m->net_hash, NET, m->pool, fec);
-  HASH_INSERT2(m->label_hash, LABEL, m->pool, fec);
 
   return fec;
 }
@@ -916,10 +1064,13 @@ mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest)
   if (fec)
   {
     ea_free(rta->l);
+    mpls_revive_fec(fec);
     return fec;
   }
 
-  u32 label = mpls_new_label(m->domain, m->handle, 0);
+  u32 label = 0;
+  MPLS_HANDLE_LOCKED(m->handle, h)
+    label = mpls_new_label(h, 0);
 
   if (!label)
   {
@@ -927,19 +1078,17 @@ mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest)
     return NULL;
   }
 
-  fec = sl_allocz(mpls_slab(m, 0));
+  fec = mpls_new_fec(m, 0, label);
 
   fec->hash = hash;
   fec->rta = rta;
 
-  fec->label = label;
   fec->policy = MPLS_POLICY_AGGREGATE;
   fec->handle = m->handle;
 
-  DBG("New FEC rta %u\n", fec->label);
+  DBGL("New FEC rta %u", fec->label);
 
   HASH_INSERT2(m->attrs_hash, RTA, m->pool, fec);
-  HASH_INSERT2(m->label_hash, LABEL, m->pool, fec);
 
   return fec;
 }
@@ -950,24 +1099,27 @@ mpls_get_fec_for_vrf(struct mpls_fec_map *m)
   struct mpls_fec *fec = m->vrf_fec;
 
   if (fec)
+  {
+    mpls_revive_fec(fec);
     return fec;
+  }
 
-  u32 label = mpls_new_label(m->domain, m->handle, 0);
+  u32 label = 0;
+  MPLS_HANDLE_LOCKED(m->handle, h)
+    label = mpls_new_label(h, 0);
 
   if (!label)
     return NULL;
 
-  fec = sl_allocz(mpls_slab(m, 0));
+  fec = mpls_new_fec(m, 0, label);
 
-  fec->label = label;
   fec->policy = MPLS_POLICY_VRF;
   fec->handle = m->handle;
   fec->iface = m->vrf_iface;
 
-  DBG("New FEC vrf %u\n", fec->label);
+  DBGL("New FEC vrf %u", fec->label);
 
   m->vrf_fec = fec;
-  HASH_INSERT2(m->label_hash, LABEL, m->pool, fec);
 
   return fec;
 }
@@ -1000,18 +1152,23 @@ mpls_unlink_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
   }
 }
 
-void
+static void
 mpls_free_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
 {
   if (fec->state != MPLS_FEC_DOWN)
     mpls_withdraw_fec(m, fec);
 
-  DBG("Free FEC %u\n", fec->label);
+  DBGL("Free FEC %p %u of map %p, handle %p", fec, fec->label, m, fec->handle);
 
-  mpls_free_label(m->domain, fec->handle, fec->label);
+  MPLS_DOMAIN_LOCKED(m->domain, domain)
+  {
+    struct mpls_handle *h = MPLS_HANDLE_PRIV(fec->handle);
+    mpls_free_label(h, fec->label);
 
-  if (!fec->policy && !fec->handle->label_count)
-      mpls_free_handle(m->domain, fec->handle);
+    DBGL("Handle %p policy %d label count %d", fec->handle, fec->policy, h->label_count);
+    if (!fec->policy && !h->label_count)
+      mpls_free_handle(h);
+  }
 
   HASH_REMOVE2(m->label_hash, LABEL, m->pool, fec);
 
@@ -1020,50 +1177,22 @@ mpls_free_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
   sl_free(fec);
 }
 
-static inline void mpls_lock_fec(struct mpls_fec_map *x UNUSED, struct mpls_fec *fec)
-{ if (fec) fec->uc++; }
-
-static inline void mpls_unlock_fec(struct mpls_fec_map *x, struct mpls_fec *fec)
-{ if (fec && !--fec->uc) mpls_free_fec(x, fec); }
-
-struct mpls_fec_tmp_lock {
-  resource r;
-  struct mpls_fec_map *m;
-  struct mpls_fec *fec;
-};
-
-static void
-mpls_fec_tmp_lock_free(resource *r)
+inline void mpls_revive_fec(struct mpls_fec *fec)
 {
-  struct mpls_fec_tmp_lock *l = SKIP_BACK(struct mpls_fec_tmp_lock, r, r);
-  mpls_unlock_fec(l->m, l->fec);
+  UNUSED u64 s = lfuc_lock_revive(&fec->uc);
+  DBGL("Locked FEC %p %u, was %lu (i)", fec, fec->label, s);
 }
 
-static void
-mpls_fec_tmp_lock_dump(resource *r, unsigned indent UNUSED)
+inline void mpls_lock_fec(struct mpls_fec *fec)
 {
-  struct mpls_fec_tmp_lock *l = SKIP_BACK(struct mpls_fec_tmp_lock, r, r);
-  debug("map=%p fec=%p label=%u", l->m, l->fec, l->fec->label);
+  UNUSED u64 s = lfuc_lock(&fec->uc);
+  DBGL("Locked FEC %p %u, was %lu", fec, fec->label, s);
 }
 
-static struct resclass mpls_fec_tmp_lock_class = {
-  .name = "Temporary MPLS FEC Lock",
-  .size = sizeof(struct mpls_fec_tmp_lock),
-  .free = mpls_fec_tmp_lock_free,
-  .dump = mpls_fec_tmp_lock_dump,
-};
-
-static void
-mpls_lock_fec_tmp(struct mpls_fec_map *m, struct mpls_fec *fec)
+inline void mpls_unlock_fec(struct mpls_fec *fec)
 {
-  if (!fec)
-    return;
-
-  fec->uc++;
-
-  struct mpls_fec_tmp_lock *l = ralloc(tmp_res.pool, &mpls_fec_tmp_lock_class);
-  l->m = m;
-  l->fec = fec;
+  UNUSED u64 s = lfuc_unlock(&fec->uc, birdloop_event_list(fec->map->loop), fec->map->cleanup_event);
+  DBGL("Unlocked FEC %p %u, now %lu", fec, fec->label, s);
 }
 
 static inline void
@@ -1114,6 +1243,13 @@ mpls_announce_fec(struct mpls_fec_map *m, struct mpls_fec *fec, ea_list *src)
     ea_set_hostentry(&e.attrs, m->channel->table, he->owner, he->addr, he->link,
 	HOSTENTRY_LABEL_COUNT(head), head->labels);
   }
+  else
+  {
+    const struct eattr *nhea = ea_find_by_class(src, &ea_gen_nexthop);
+    if (!nhea)
+      bug("FEC has neither a hostentry, nor a nexthop");
+    ea_set_attr(&e.attrs, *nhea);
+  }
 
   net_addr_mpls n = NET_ADDR_MPLS(fec->label);
 
@@ -1124,6 +1260,10 @@ mpls_announce_fec(struct mpls_fec_map *m, struct mpls_fec *fec, ea_list *src)
 static void
 mpls_withdraw_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
 {
+  /* The MPLS channel is already stopping */
+  if (m->channel->channel_state != CS_UP)
+    return;
+
   net_addr_mpls n = NET_ADDR_MPLS(fec->label);
 
   fec->state = MPLS_FEC_DOWN;
@@ -1150,11 +1290,11 @@ mpls_apply_fec(rte *r, struct mpls_fec *fec)
 
 
 int
-mpls_handle_rte(struct channel *c, const net_addr *n, rte *r)
+mpls_handle_rte(struct channel *c, const net_addr *n, rte *r, struct mpls_fec **fecp)
 {
   struct mpls_channel *mc = SKIP_BACK(struct mpls_channel, c, c->proto->mpls_channel);
   struct mpls_fec_map *m = mc->mpls_map;
-  struct mpls_fec *fec = NULL;
+  struct mpls_fec *fec = *fecp = NULL;
 
   /* Select FEC for route */
   uint policy = ea_get_int(r->attrs, &ea_gen_mpls_policy, 0);
@@ -1205,13 +1345,10 @@ mpls_handle_rte(struct channel *c, const net_addr *n, rte *r)
   if (!fec)
   {
     log(L_WARN "Label allocation in range %s failed for %N from %s",
-	m->handle->range->name, n, r->sender->req->name);
+	m->handle->name, n, r->sender->req->name);
     return -1;
   }
 
-  /* Temporarily lock FEC */
-  mpls_lock_fec_tmp(m, fec);
-
   /* Apply FEC label to route */
   mpls_apply_fec(r, fec);
 
@@ -1219,52 +1356,52 @@ mpls_handle_rte(struct channel *c, const net_addr *n, rte *r)
   if (fec->state != MPLS_FEC_CLEAN)
     mpls_announce_fec(m, fec, r->attrs);
 
+  /* Store the returned FEC for later unlock */
+  *fecp = fec;
   return 0;
 }
 
-static inline struct mpls_fec_tmp_lock
-mpls_rte_get_fec_lock(const rte *r)
+static inline struct mpls_fec *
+mpls_rte_get_fec(const rte *r)
 {
-  struct mpls_fec_tmp_lock mt = {};
-
   struct channel *c = SKIP_BACK(struct proto, sources, r->src->owner)->mpls_channel;
   if (!c)
-    return mt;
+    return NULL;
 
-  mt.m = SKIP_BACK(struct mpls_channel, c, c)->mpls_map;
   uint label = ea_get_int(r->attrs, &ea_gen_mpls_label, 0);
   if (label < 16)
-    return mt;
+    return NULL;
 
-  mt.fec = mpls_find_fec_by_label(mt.m, label);
-  return mt;
+  return mpls_find_fec_by_label(SKIP_BACK(struct mpls_channel, c, c)->mpls_map, label);
 }
 
 void
 mpls_rte_preimport(rte *new, const rte *old)
 {
-  struct mpls_fec_tmp_lock new_mt = {}, old_mt = {};
+  struct mpls_fec *new_fec = new ? mpls_rte_get_fec(new) : NULL;
+  struct mpls_fec *old_fec = old ? mpls_rte_get_fec(old) : NULL;
 
-  if (new)
-    new_mt = mpls_rte_get_fec_lock(new);
 
-  if (old)
-    old_mt = mpls_rte_get_fec_lock(old);
-
-  if (new_mt.fec == old_mt.fec)
+  if (new_fec == old_fec)
     return;
 
-  if (new_mt.fec)
-    mpls_lock_fec(new_mt.m, new_mt.fec);
+  if (new_fec)
+  {
+    DBGL("Lock FEC %p (preimport %p)", new_fec, new);
+    mpls_lock_fec(new_fec);
+  }
 
-  if (old_mt.fec)
-    mpls_unlock_fec(old_mt.m, old_mt.fec);
+  if (old_fec)
+  {
+    mpls_unlock_fec(old_fec);
+    DBGL("Unlock FEC %p (preimport %p)", old_fec, old);
+  }
 }
 
 static void
-mpls_show_ranges_rng(struct mpls_show_ranges_cmd *cmd, struct mpls_range *r)
+mpls_show_ranges_rng(struct mpls_show_ranges_cmd *cmd UNUSED, struct mpls_range *r)
 {
-  uint last = lmap_last_one_in_range(&cmd->dom->labels, r->lo, r->hi);
+  uint last = lmap_last_one_in_range(&r->domain->labels, r->lo, r->hi);
   if (last == r->hi) last = 0;
 
   cli_msg(-1026, "%-11s %7u %7u %7u %7u %7u",
@@ -1272,18 +1409,16 @@ mpls_show_ranges_rng(struct mpls_show_ranges_cmd *cmd, struct mpls_range *r)
 }
 
 void
-mpls_show_ranges_dom(struct mpls_show_ranges_cmd *cmd, struct mpls_domain *m)
+mpls_show_ranges_dom(struct mpls_show_ranges_cmd *cmd, struct mpls_domain_pub *mpub)
 {
-  if (cmd->dom)
-    cli_msg(-1026, "");
+  MPLS_DOMAIN_LOCK(mpub, m);
 
-  cmd->dom = m;
   cli_msg(-1026, "MPLS domain %s:", m->name);
   cli_msg(-1026, "%-11s %7s %7s %7s %7s %7s",
 	  "Range", "Start", "Length", "End", "Labels", "Last");
 
   if (cmd->range)
-    mpls_show_ranges_rng(cmd, cmd->range->range);
+    mpls_show_ranges_rng(cmd, MPLS_RANGE_PRIV(cmd->range->range));
   else
   {
     struct mpls_range *r;
@@ -1300,9 +1435,17 @@ mpls_show_ranges(struct mpls_show_ranges_cmd *cmd)
     mpls_show_ranges_dom(cmd, cmd->domain->domain);
   else
   {
-    struct mpls_domain *m;
+    struct mpls_domain_pub *m;
+    _Bool first = 1;
     WALK_LIST(m, MPLS_GLOBAL->domains)
+    {
+      if (first)
+	first = 0;
+      else
+	cli_msg(-1026, "");
+
       mpls_show_ranges_dom(cmd, m);
+    }
   }
 
   cli_msg(0, "");
diff --git a/nest/mpls.h b/nest/mpls.h
index f6734001..79c3a6e3 100644
--- a/nest/mpls.h
+++ b/nest/mpls.h
@@ -30,7 +30,7 @@
 
 struct mpls_domain_config {
   node n;				/* Node in config.mpls_domains */
-  struct mpls_domain *domain;		/* Our instance */
+  struct mpls_domain_pub *domain;	/* Our instance */
   const char *name;
 
   list ranges;				/* List of label ranges (struct mpls_range_config) */
@@ -40,7 +40,7 @@ struct mpls_domain_config {
 
 struct mpls_range_config {
   node n;				/* Node in mpls_domain_config.ranges */
-  struct mpls_range *range;		/* Our instance */
+  struct mpls_range_pub *range;		/* Our instance */
   struct mpls_domain_config *domain;	/* Parent MPLS domain */
   const char *name;
 
@@ -49,9 +49,6 @@ struct mpls_range_config {
   u8 implicit;				/* Implicitly defined range */
 };
 
-struct mpls_handle;
-
-
 void mpls_init(void);
 struct mpls_domain_config * mpls_domain_config_new(struct symbol *s);
 void mpls_domain_postconfig(struct mpls_domain_config *cf);
@@ -76,8 +73,8 @@ struct mpls_channel_config {
 struct mpls_channel {
   struct channel c;
 
-  struct mpls_domain *domain;
-  struct mpls_range *range;
+  struct mpls_domain_pub *domain;
+  struct mpls_range_pub *range;
 
   uint label_policy;
   uint rts;
@@ -103,7 +100,6 @@ proto_configure_mpls_channel(struct proto *p, struct proto_config *pc, uint rts)
 struct mpls_fec {
   u32 label;				/* Label for FEC */
   u32 hash;				/* Hash for primary key (net / rta) */
-  u32 uc;				/* Number of LSPs for FEC */
   union {				/* Extension part of key */
     u32 path_id;			/* Source path_id */
   };
@@ -111,7 +107,10 @@ struct mpls_fec {
   u8 state;				/* FEC state (MPLS_FEC_*) */
   u8 policy;				/* Label policy (MPLS_POLICY_*) */
 
-  struct mpls_handle *handle;		/* Handle holding the label */
+  struct lfuc uc;			/* Number of LSPs for FEC */
+
+  struct mpls_handle_pub *handle;	/* Handle holding the label */
+  struct mpls_fec_map *map;		/* Belonging to this map */
 
   struct mpls_fec *next_k;		/* Next in mpls_fec.net_hash/rta_hash */
   struct mpls_fec *next_l;		/* Next in mpls_fec.label_hash */
@@ -124,6 +123,8 @@ struct mpls_fec {
 
 struct mpls_fec_map {
   pool *pool;				/* Pool for FEC map */
+  struct birdloop *loop;		/* Owner's loop for sending events */
+  event *cleanup_event;			/* Event for unlocked FEC cleanup */
   slab *slabs[4];			/* Slabs for FEC allocation */
   HASH(struct mpls_fec) net_hash;	/* Hash table for MPLS_POLICY_PREFIX FECs */
   HASH(struct mpls_fec) attrs_hash;	/* Hash table for MPLS_POLICY_AGGREGATE FECs */
@@ -131,33 +132,33 @@ struct mpls_fec_map {
   struct mpls_fec *vrf_fec;		/* Single FEC for MPLS_POLICY_VRF */
 
   struct channel *channel;		/* MPLS channel for FEC announcement */
-  struct mpls_domain *domain;		/* MPLS domain, keeping reference */
-  struct mpls_handle *handle;		/* Handle for dynamic allocation of labels */
-  struct mpls_handle *static_handle;	/* Handle for static label allocations, optional */
+  struct mpls_domain_pub *domain;	/* MPLS domain, keeping reference */
+  struct mpls_handle_pub *handle;	/* Handle for dynamic allocation of labels */
+  struct mpls_handle_pub *static_handle;/* Handle for static label allocations, optional */
   struct iface *vrf_iface;
 
   u8 mpls_rts;				/* Source value used for MPLS routes (RTS_*) */
 };
 
 
-struct mpls_fec_map *mpls_fec_map_new(pool *p, struct channel *c, uint rts);
+struct mpls_fec_map *mpls_fec_map_new(pool *p, struct birdloop *loop, struct channel *c, uint rts);
 void mpls_fec_map_reconfigure(struct mpls_fec_map *m, struct channel *C);
 void mpls_fec_map_free(struct mpls_fec_map *m);
 struct mpls_fec *mpls_find_fec_by_label(struct mpls_fec_map *x, u32 label);
 struct mpls_fec *mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label);
 struct mpls_fec *mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u32 path_id);
 struct mpls_fec *mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest);
-void mpls_free_fec(struct mpls_fec_map *x, struct mpls_fec *fec);
-int mpls_handle_rte(struct channel *c, const net_addr *n, rte *r);
+
+void mpls_lock_fec(struct mpls_fec *fec);
+void mpls_unlock_fec(struct mpls_fec *fec);
+
+int mpls_handle_rte(struct channel *c, const net_addr *n, rte *r, struct mpls_fec **fecp);
 void mpls_rte_preimport(rte *new, const rte *old);
 
 
 struct mpls_show_ranges_cmd {
   struct mpls_domain_config *domain;
   struct mpls_range_config *range;
-
-  /* Runtime */
-  struct mpls_domain *dom;
 };
 
 void mpls_show_ranges(struct mpls_show_ranges_cmd *cmd);
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 29ee8bd3..84454831 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1769,6 +1769,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   const struct filter *filter = c->in_filter;
   struct channel_import_stats *stats = &c->import_stats;
+  struct mpls_fec *fec = NULL;
 
   if (new)
     {
@@ -1790,7 +1791,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	}
 
       if (new && c->proto->mpls_channel)
-	if (mpls_handle_rte(c->proto->mpls_channel, n, new) < 0)
+	if (mpls_handle_rte(c->proto->mpls_channel, n, new, &fec) < 0)
 	  {
 	    channel_rte_trace_in(D_FILTERS, c, new, "invalid");
 	    stats->updates_invalid++;
@@ -1815,6 +1816,12 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   rte_import(&c->in_req, n, new, src);
 
+  if (fec)
+  {
+    mpls_unlock_fec(fec);
+    DBGL( "Unlock FEC %p (rte_update %N)", fec, n);
+  }
+
   /* Now the route attributes are kept by the in-table cached version
    * and we may drop the local handle */
   if (new && (c->in_keep & RIK_PREFILTER))
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index c888460a..1bce53de 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -628,7 +628,7 @@ bgp_stop(struct bgp_proto *p, int subcode, byte *data, uint len)
   bgp_graceful_close_conn(&p->incoming_conn, subcode, data, len);
 
   struct bgp_channel *c;
-  WALK_LIST(c, p->p.channels)
+  BGP_WALK_CHANNELS(p, c)
     if (c->ptx)
       bgp_free_pending_tx(c);
 

From 2379ed40bea517ba6c9fd901b600f187371cb337 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 24 Jan 2024 17:39:37 +0100
Subject: [PATCH 410/431] Linux: Not binding the default-vrf socket to the
 (nonexistent) vrf device

---
 sysdep/unix/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 11dfb2e4..b4f00107 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1049,7 +1049,7 @@ sk_setup(sock *s)
   }
 #endif
 
-  if (s->vrf && !s->iface)
+  if (s->vrf && (s->vrf != &default_vrf) && !s->iface)
   {
     /* Bind socket to associated VRF interface.
        This is Linux-specific, but so is SO_BINDTODEVICE. */

From 25e20485ae8d414c27674f47647dd643f7c9bc6c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 26 Jan 2024 14:42:11 +0100
Subject: [PATCH 411/431] Fixed route table attribute caching

---
 nest/rt-table.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 84454831..ea0ab99b 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1760,12 +1760,14 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
   ASSERT(c->channel_state == CS_UP);
 
+  ea_list *ea_tmp[2] = {};
+
   /* The import reloader requires prefilter routes to be the first layer */
   if (new && (c->in_keep & RIK_PREFILTER))
-    if (ea_is_cached(new->attrs) && !new->attrs->next)
-      new->attrs = ea_clone(new->attrs);
-    else
-      new->attrs = ea_lookup(new->attrs, 0);
+    ea_tmp[0] = new->attrs =
+      (ea_is_cached(new->attrs) && !new->attrs->next) ?
+      ea_clone(new->attrs) :
+      ea_lookup(new->attrs, 0);
 
   const struct filter *filter = c->in_filter;
   struct channel_import_stats *stats = &c->import_stats;
@@ -1799,10 +1801,15 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 	  }
 
       if (new)
+      {
+	ea_tmp[1] = new->attrs =
+	  ea_is_cached(new->attrs) ? ea_clone(new->attrs) : ea_lookup(new->attrs, !!ea_tmp[0]);
+
 	if (net_is_flow(n))
 	  rt_flowspec_resolve_rte(new, c);
 	else
 	  rt_next_hop_resolve_rte(new);
+      }
 
       if (new && !rte_validate(c, new))
 	{
@@ -1823,17 +1830,10 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   }
 
   /* Now the route attributes are kept by the in-table cached version
-   * and we may drop the local handle */
-  if (new && (c->in_keep & RIK_PREFILTER))
-  {
-    /* There may be some updates on top of the original attribute block */
-    ea_list *a = new->attrs;
-    while (a->next)
-      a = a->next;
-
-    ea_free(a);
-  }
-
+   * and we may drop the local handles */
+  for (uint k = 0; k < ARRAY_SIZE(ea_tmp); k++)
+    if (ea_tmp[k])
+      ea_free(ea_tmp[k]);
 }
 
 void

From 8fb1f098d1003784391c6e7fa4f5f797477c0d35 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 26 Jan 2024 14:50:36 +0100
Subject: [PATCH 412/431] Fixes for CLang

---
 filter/decl.m4      | 2 ++
 nest/rt-attr.c      | 2 +-
 sysdep/unix/alloc.c | 8 +++++---
 sysdep/unix/log.c   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/filter/decl.m4 b/filter/decl.m4
index e24ee94d..dcb24f8c 100644
--- a/filter/decl.m4
+++ b/filter/decl.m4
@@ -622,6 +622,8 @@ FID_WR_PUT(11)
 #pragma GCC diagnostic ignored "-Woverride-init"
 #endif
 
+#pragma clang diagnostic ignored "-Winitializer-overrides"
+
 static struct sym_scope f_type_method_scopes[] = {
 FID_WR_PUT(12)
 };
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index c8c2c0bb..d8a91e39 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -383,7 +383,7 @@ rt_dump_sources(struct rte_owner *o)
 	(splitting % 8) ? ',' : '\n',
 	(splitting % 8) ? ' ' : '\t',
 	src->private_id, src->global_id,
-	atomic_load_explicit(&src->uc, memory_order_relaxed));
+	atomic_load_explicit(&src->uc.uc, memory_order_relaxed));
 
     splitting++;
   }
diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 341c02a2..6a279993 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -105,7 +105,7 @@ long page_size = 0;
 #   define ajlog(...)
 
     struct free_page {
-      struct free_page *next;
+      struct free_page * _Atomic next;
     };
 
 # endif
@@ -259,7 +259,8 @@ free_page(void *ptr)
   struct free_page *fp = ptr;
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
-    UNUSED struct free_page *next = fp->next = local_page_stack;
+    struct free_page *next = local_page_stack;
+    atomic_store_explicit(&fp->next, next, memory_order_relaxed);
     PROTECT_PAGE(fp);
     local_page_stack = fp;
 
@@ -270,7 +271,8 @@ free_page(void *ptr)
   }
 
   /* If there are too many local pages, we add the free page to the global hot-free-page list */
-  UNUSED struct free_page *next = fp->next = PAGE_STACK_GET;
+  struct free_page *next = PAGE_STACK_GET;
+  atomic_store_explicit(&fp->next, next, memory_order_relaxed);
   PROTECT_PAGE(fp);
 
   /* Unblock the stack with the page being freed */
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 41c8f07f..bbe1bd8e 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -36,7 +36,7 @@ static pool *log_pool;
 static struct rfile *dbg_rf;
 static char *current_syslog_name = NULL; /* NULL -> syslog closed */
 
-_Atomic uint max_thread_id = ATOMIC_VAR_INIT(1);
+_Atomic uint max_thread_id = 1;
 _Thread_local uint this_thread_id;
 
 #include <pthread.h>

From f9d3112d015c2466248525fd8dac2d25070fb333 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sat, 27 Jan 2024 19:01:34 +0100
Subject: [PATCH 413/431] Interfaces: fixed locking when address is deleted
 implicitly

---
 nest/iface.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/nest/iface.c b/nest/iface.c
index 5f42bac8..c6251d90 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -50,6 +50,8 @@ struct iface default_vrf;
 
 static void if_recalc_preferred(struct iface *i);
 
+static void ifa_delete_locked(struct ifa *a);
+
 static void ifa_dump_locked(struct ifa *);
 static void if_dump_locked(struct iface *);
 
@@ -545,7 +547,7 @@ if_end_update(void)
 	{
 	  WALK_LIST_DELSAFE(a, b, i->addrs)
 	    if (!(a->flags & IA_UPDATED))
-	      ifa_delete(a);
+	      ifa_delete_locked(a);
 	  if_end_partial_update_locked(i);
 	}
     }
@@ -891,7 +893,7 @@ ifa_update(struct ifa *a)
 	    IFACE_UNLOCK;
 	    return b;
 	  }
-	ifa_delete(b);
+	ifa_delete_locked(b);
 	break;
       }
 
@@ -924,11 +926,19 @@ ifa_update(struct ifa *a)
 void
 ifa_delete(struct ifa *a)
 {
+  IFACE_LOCK;
+  ifa_delete_locked(a);
+  IFACE_UNLOCK;
+}
+
+static void
+ifa_delete_locked(struct ifa *a)
+{
+  IFACE_ASSERT_LOCKED;
+
   struct iface *i = a->iface;
   struct ifa *b;
 
-  IFACE_LOCK;
-
   WALK_LIST(b, i->addrs)
     if (ifa_same(b, a))
       {
@@ -953,11 +963,8 @@ ifa_delete(struct ifa *a)
 	  ifa_notify_change(IF_CHANGE_DOWN, b);
 
 	ifa_unlink(b);
-	IFACE_UNLOCK;
 	return;
       }
-
-  IFACE_UNLOCK;
 }
 
 u32

From ea0f2c61942db57d75f18972253433182345f6bf Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 13:09:48 +0100
Subject: [PATCH 414/431] Fixed attributes normalization with underlays in
 place

---
 nest/rt-attr.c  | 126 +++++++++++++++++++++++++++++++++++++++++-------
 nest/rt-table.c |  17 ++++++-
 2 files changed, 124 insertions(+), 19 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index d8a91e39..e6f70ad8 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -899,6 +899,8 @@ ea_do_sort(ea_list *e)
   while (ss);
 }
 
+static _Bool eattr_same_value(const eattr *a, const eattr *b);
+
 /**
  * In place discard duplicates and undefs in sorted ea_list. We use stable sort
  * for this reason.
@@ -909,6 +911,30 @@ ea_do_prune(ea_list *e)
   eattr *s, *d, *l, *s0;
   int i = 0;
 
+#if 0
+  debug("[[prune]] ");
+  ea_dump(e);
+  debug(" ----> ");
+#endif
+
+  /* Prepare underlay stepper */
+  uint ulc = 0;
+  for (ea_list *u = e->next; u; u = u->next)
+    ulc++;
+
+  struct { eattr *cur, *end; } uls[ulc];
+  {
+    ea_list *u = e->next;
+    for (uint i = 0; i < ulc; i++)
+    {
+      ASSERT_DIE(u->flags & EALF_SORTED);
+      uls[i].cur = u->attrs;
+      uls[i].end = u->attrs + u->count;
+      u = u->next;
+      /* debug(" [[prev %d: %p to %p]] ", i, uls[i].cur, uls[i].end); */
+    }
+  }
+
   s = d = e->attrs;	    /* Beginning of the list. @s is source, @d is destination. */
   l = e->attrs + e->count;  /* End of the list */
 
@@ -919,11 +945,38 @@ ea_do_prune(ea_list *e)
       /* Find a consecutive block of the same attribute */
       while (s < l && s->id == s[-1].id)
 	s++;
-
       /* Now s0 is the most recent version, s[-1] the oldest one */
-      /* Drop undefs unless this is a true overlay */
-      if (s0->undef && (s[-1].undef || !e->next))
+
+      /* Find the attribute's underlay version */
+      eattr *prev = NULL;
+      for (uint i = 0; i < ulc; i++)
+      {
+	while ((uls[i].cur < uls[i].end) && (uls[i].cur->id < s0->id))
+	{
+	  uls[i].cur++;
+	  /* debug(" [[prev %d: %p (%s/%d)]] ", i, uls[i].cur, ea_class_global[uls[i].cur->id]->name, uls[i].cur->id); */
+	}
+
+	if ((uls[i].cur >= uls[i].end) || (uls[i].cur->id > s0->id))
+	  continue;
+
+	prev = uls[i].cur;
+	break;
+      }
+
+      /* Drop identicals */
+      if (prev && eattr_same_value(s0, prev))
+      {
+	/* debug(" [[drop identical %s]] ", ea_class_global[s0->id]->name); */
 	continue;
+      }
+
+      /* Drop undefs (identical undefs already dropped before) */
+      if (!prev && s0->undef)
+      {
+	/* debug(" [[drop undef %s]] ", ea_class_global[s0->id]->name); */
+	continue;
+      }
 
       /* Copy the newest version to destination */
       *d = *s0;
@@ -1027,13 +1080,52 @@ ea_merge(ea_list *e, ea_list *t, int overlay)
 ea_list *
 ea_normalize(ea_list *e, int overlay)
 {
+#if 0
+  debug("(normalize)");
+  ea_dump(e);
+  debug(" ----> ");
+#endif
   ea_list *t = tmp_alloc(ea_scan(e, overlay));
   ea_merge(e, t, overlay);
   ea_sort(t);
+#if 0
+  ea_dump(t);
+  debug("\n");
+#endif
 
   return t->count ? t : t->next;
 }
 
+static _Bool
+eattr_same_value(const eattr *a, const eattr *b)
+{
+  if (
+      a->id != b->id ||
+      a->flags != b->flags ||
+      a->type != b->type ||
+      a->undef != b->undef
+    )
+    return 0;
+
+  if (a->undef)
+    return 1;
+
+  if (a->type & EAF_EMBEDDED)
+    return a->u.data == b->u.data;
+  else
+    return adata_same(a->u.ptr, b->u.ptr);
+}
+
+static _Bool
+eattr_same(const eattr *a, const eattr *b)
+{
+  return
+    eattr_same_value(a, b) &&
+    a->originated == b->originated &&
+    a->fresh == b->fresh;
+}
+
+
 /**
  * ea_same - compare two &ea_list's
  * @x: attribute list
@@ -1054,19 +1146,8 @@ ea_same(ea_list *x, ea_list *y)
   if (x->count != y->count)
     return 0;
   for(c=0; c<x->count; c++)
-    {
-      eattr *a = &x->attrs[c];
-      eattr *b = &y->attrs[c];
-
-      if (a->id != b->id ||
-	  a->flags != b->flags ||
-	  a->type != b->type ||
-	  a->originated != b->originated ||
-	  a->fresh != b->fresh ||
-	  a->undef != b->undef ||
-	  ((a->type & EAF_EMBEDDED) ? a->u.data != b->u.data : !adata_same(a->u.ptr, b->u.ptr)))
-	return 0;
-    }
+    if (!eattr_same(&x->attrs[c], &y->attrs[c]))
+      return 0;
   return 1;
 }
 
@@ -1421,14 +1502,22 @@ ea_dump(ea_list *e)
       for(i=0; i<e->count; i++)
 	{
 	  eattr *a = &e->attrs[i];
-	  debug(" %04x.%02x", a->id, a->flags);
+	  struct ea_class *clp = (a->id < ea_class_max) ? ea_class_global[a->id] : NULL;
+	  if (clp)
+	    debug(" %s", clp->name);
+	  else
+	    debug(" 0x%x", a->id);
+
+	  debug(".%02x", a->flags);
 	  debug("=%c",
 	      "?iO?IRP???S??pE?"
 	      "??L???N?????????"
 	      "?o???r??????????" [a->type]);
 	  if (a->originated)
 	    debug("o");
-	  if (a->type & EAF_EMBEDDED)
+	  if (a->undef)
+	    debug(":undef");
+	  else if (a->type & EAF_EMBEDDED)
 	    debug(":%08x", a->u.data);
 	  else if (a->id == ea_gen_nexthop.id)
 	    nexthop_dump(a->u.ptr);
@@ -1439,6 +1528,7 @@ ea_dump(ea_list *e)
 	      for(j=0; j<len; j++)
 		debug("%02x", a->u.ptr->data[j]);
 	    }
+	  debug(" ");
 	}
       if (e = e->next)
 	debug(" | ");
diff --git a/nest/rt-table.c b/nest/rt-table.c
index ea0ab99b..ec1cd71c 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -503,6 +503,12 @@ rte_store(const rte *r, struct netindex *i, struct rtable_private *tab)
   else
     e->attrs = rta_lookup(e->attrs, 1);
 
+#if 0
+  debug("(store) %N ", i->addr);
+  ea_dump(e->attrs);
+  debug("\n");
+#endif
+
   return s;
 }
 
@@ -1769,6 +1775,13 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
       ea_clone(new->attrs) :
       ea_lookup(new->attrs, 0);
 
+#if 0
+  debug("%s.%s -(prefilter)-> %s: %N ", c->proto->name, c->name, c->table->name, n);
+  if (new) ea_dump(new->attrs);
+  else debug("withdraw");
+  debug("\n");
+#endif
+
   const struct filter *filter = c->in_filter;
   struct channel_import_stats *stats = &c->import_stats;
   struct mpls_fec *fec = NULL;
@@ -2351,7 +2364,9 @@ rt_refresh_trace(struct rtable_private *tab, struct rt_import_hook *ih, const ch
 void
 rte_dump(struct rte_storage *e)
 {
-  debug("%-1N ", e->rte.net);
+  debug("(%u) %-1N", NET_TO_INDEX(e->rte.net)->index, e->rte.net);
+  debug("ID=%d ", e->rte.id);
+  debug("SENDER=%s ", e->rte.sender->req->name);
   debug("PF=%02x ", e->rte.pflags);
   debug("SRC=%uG ", e->rte.src->global_id);
   ea_dump(e->rte.attrs);

From 6a80214fb381426e1ed2603831a89a97f893f875 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 13:14:58 +0100
Subject: [PATCH 415/431] BGP: fixed MPLS label stack receiving bug

Introduced in 515df18da742442323047a13b04ecc2bd97b0855 while merging v2 to v3.
---
 proto/bgp/bgp.h     | 2 --
 proto/bgp/packets.c | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 075882b5..b59b02d8 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -505,8 +505,6 @@ struct bgp_parse_state {
   uint err_subcode;
   jmp_buf err_jmpbuf;
 
-  adata *mpls_labels;
-
   /* Cached state for bgp_rte_update() */
   u32 last_id;
   struct rte_src *last_src;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index b2228db7..624cabc1 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1077,6 +1077,8 @@ bgp_apply_next_hop(struct bgp_parse_state *s, ea_list **to, ip_addr gw, ip_addr
 static void
 bgp_apply_mpls_labels(struct bgp_parse_state *s, ea_list **to, u32 lnum, u32 labels[lnum])
 {
+  bgp_set_attr_data(to, BA_MPLS_LABEL_STACK, 0, labels, lnum * sizeof labels[0]);
+
   if (lnum > MPLS_MAX_LABEL_STACK)
   {
     REPORT("Too many MPLS labels ($u)", lnum);
@@ -1087,7 +1089,7 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, ea_list **to, u32 lnum, u32 lab
 
   /* Handle implicit NULL as empty MPLS stack */
   if ((lnum == 1) && (labels[0] == BGP_MPLS_NULL))
-    lnum = s->mpls_labels->length = 0;
+    lnum = 0;
 
   if (s->channel->cf->gw_mode == GW_DIRECT)
   {

From 86ba37d8f17faf7f8a0149d98732d59699ae369c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 21:42:39 +0100
Subject: [PATCH 416/431] Logging: uses writev instead of in-buffer magic

---
 lib/birdlib.h        |  12 ++++-
 sysdep/unix/config.Y |   2 +-
 sysdep/unix/io.c     |  84 ++++++++++++++++++++++++++-------
 sysdep/unix/log.c    | 109 +++++++++++++++++++++++++++----------------
 sysdep/unix/unix.h   |   4 +-
 5 files changed, 150 insertions(+), 61 deletions(-)

diff --git a/lib/birdlib.h b/lib/birdlib.h
index 9004704c..214b49bf 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -163,10 +163,18 @@ typedef struct buffer {
 
 #define LOG_BUFFER_SIZE 2560
 
+enum log_buffer_pos {
+  LBP_TIMESTAMP = 0,
+  LBP_THREAD_ID,
+  LBP_CLASS,
+  LBP_MSG,
+  LBP__MAX,
+  LBPP_TERMINAL,
+};
+
 typedef struct log_buffer {
   struct buffer buf;
-  byte *tm_pos;
-  byte *msg_pos;
+  byte *pos[LBP__MAX+1];
   int class;
   char block[LOG_BUFFER_SIZE];
 } log_buffer;
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y
index a4aed847..ee58b21b 100644
--- a/sysdep/unix/config.Y
+++ b/sysdep/unix/config.Y
@@ -66,7 +66,7 @@ log_file:
      this_log->filename = $2;
    }
  | SYSLOG syslog_name { this_log->rf = NULL; new_config->syslog_name = $2; }
- | STDERR { this_log->rf = &rf_stderr; }
+ | STDERR { this_log->rf = &rf_stderr; this_log->terminal_flag = 1; }
  ;
 
 log_mask:
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index ce5a3d63..f2f99fdd 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -192,36 +192,88 @@ rf_same(struct rfile *a, struct rfile *b)
     (a->stat.st_ino == b->stat.st_ino);
 }
 
-int
-rf_write(struct rfile *r, const void *buf, size_t _count)
+void
+rf_write_crude(struct rfile *r, const char *buf, int sz)
 {
-  off_t count = _count;
+  if (r->mapping)
+    memcpy(r->mapping, buf, sz);
+  else
+    write(r->fd, buf, sz);
+}
+
+
+int
+rf_writev(struct rfile *r, struct iovec *iov, int iov_count)
+{
+  off_t size = 0;
+  for (int i = 0; i < iov_count; i++)
+    size += iov[i].iov_len;
 
   if (r->mapping)
   {
     /* Update the pointer */
-    off_t target = atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) % r->limit;
-
-    /* Take care of wrapping */
-    if (target + count > r->limit)
-    {
-      memcpy(r->mapping, buf + (r->limit - target), target + count - r->limit);
-      count = r->limit - target;
-    }
+    off_t target = atomic_fetch_add_explicit(&r->pos, size, memory_order_relaxed) % r->limit;
 
     /* Write the line */
-    memcpy(r->mapping + target, buf, count);
+    for (int i = 0; i < iov_count; i++)
+    {
+      /* Take care of wrapping; this should really happen only once */
+      off_t rsz;
+      while ((rsz = r->limit - target) < (off_t) iov[i].iov_len)
+      {
+	memcpy(r->mapping + target, iov[i].iov_base, rsz);
+	iov[i].iov_base += rsz;
+	iov[i].iov_len -= rsz;
+	target = 0;
+      }
+
+      memcpy(r->mapping + target, iov[i].iov_base, iov[i].iov_len);
+      target += iov[i].iov_len;
+    }
     return 1;
   }
-  else if (r->limit && (atomic_fetch_add_explicit(&r->pos, count, memory_order_relaxed) + count > r->limit))
+  else if (r->limit && (atomic_fetch_add_explicit(&r->pos, size, memory_order_relaxed) + size > r->limit))
   {
-    atomic_fetch_sub_explicit(&r->pos, count, memory_order_relaxed);
+    atomic_fetch_sub_explicit(&r->pos, size, memory_order_relaxed);
     return 0;
   }
   else
   {
-    while ((write(r->fd, buf, count) < 0) && (errno == EINTR))
-      ;
+    while (size > 0)
+    {
+      /* Try to write */
+      ssize_t e = writev(r->fd, iov, iov_count);
+      if (e < 0)
+	if (errno == EINTR)
+	  continue;
+	else
+	  return 1; /* FIXME: What should we do when we suddenly can't write? */
+
+      /* It is expected that we always write the whole bunch at once */
+      if (e == size)
+	return 1;
+
+      /* Block split should not happen (we write small enough messages)
+       * but if it happens, let's try to write the rest of the log */
+      size -= e;
+      while (e > 0)
+      {
+	if ((ssize_t) iov[0].iov_len > e)
+	{
+	  /* Some bytes are remaining in the first chunk */
+	  iov[0].iov_len -= e;
+	  iov[0].iov_base += e;
+	  break;
+	}
+
+	/* First chunk written completely, get rid of it */
+	e -= iov[0].iov_len;
+	iov++;
+	iov_count--;
+	ASSERT_DIE(iov_count > 0);
+      }
+    }
+
     return 1;
   }
 }
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index bbe1bd8e..6119b952 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -48,8 +48,6 @@ static DOMAIN(logging) log_domain;
 static struct log_channel * _Atomic global_logs;
 
 /* Logging flags to validly prepare logging messages */
-#define LOGGING_TO_TERMINAL   0x1
-#define LOGGING_TO_FILE	      0x2
 
 static _Atomic uint logging_flags;
 static _Atomic uint logging_mask;
@@ -92,7 +90,7 @@ struct log_channel {
   off_t limit;				/* Log size limit */
   _Atomic uint mask;			/* Classes to log */
   uint new_mask;			/* Pending new mask */
-  uint terminal:1;			/* Is terminal */
+  uint prepare;				/* Which message parts to prepare */
 };
 
 struct log_thread_syncer {
@@ -174,6 +172,10 @@ log_rotate(struct log_channel *lc)
 void
 log_commit(log_buffer *buf)
 {
+  /* Store the last pointer */
+  buf->pos[LBP__MAX] = buf->buf.pos;
+
+  /* Append the too-long message if too long */
   if (buf->buf.pos == buf->buf.end)
 #define TOO_LONG " ... <too long>"
     memcpy(buf->buf.end - sizeof TOO_LONG, TOO_LONG, sizeof TOO_LONG);
@@ -190,18 +192,44 @@ log_commit(log_buffer *buf)
 	continue;
 
       struct rfile *rf = atomic_load_explicit(&l->rf, memory_order_acquire);
-      if (rf && buf->tm_pos)
+      if (rf)
 	{
-	  *buf->buf.pos = '\n';
-	  byte *begin = l->terminal ? buf->buf.start : buf->tm_pos;
-	  off_t msg_len = buf->buf.pos - begin + 1;
+	  /* Construct the iovec */
+	  static char terminal_prefix[] = "bird: ",
+		      newline[] = "\n";
+	  STATIC_ASSERT(sizeof newline == 2);
+
+	  struct iovec iov[LBP__MAX+2];
+	  uint iov_count = 0;
+	  if (BIT32_TEST(&l->prepare, LBPP_TERMINAL))
+	    iov[iov_count++] = (struct iovec) {
+	      .iov_base = terminal_prefix,
+	      .iov_len = sizeof terminal_prefix - 1,
+	    };
+
+	  for (uint p = 0; p < LBP__MAX; p++)
+	    if (BIT32_TEST(&l->prepare, p))
+	    {
+	      off_t sz = buf->pos[p+1] - buf->pos[p];
+	      if (sz > 0)
+		iov[iov_count++] = (struct iovec) {
+		  .iov_base = buf->pos[p],
+		  .iov_len = sz,
+		};
+	    }
+
+	  iov[iov_count++] = (struct iovec) {
+	    .iov_base = newline,
+	    .iov_len = sizeof newline - 1,
+	  };
+
 	  do {
-	    if (rf_write(rf, begin, msg_len))
+	    if (rf_writev(rf, iov, iov_count))
 	      break;
 
 	    log_lock();
 	    rf = atomic_load_explicit(&l->rf, memory_order_acquire);
-	    if (rf_write(rf, begin, msg_len))
+	    if (rf_writev(rf, iov, iov_count))
 	    {
 	      log_unlock();
 	      break;
@@ -211,18 +239,15 @@ log_commit(log_buffer *buf)
 	    log_unlock();
 
 	    rf = atomic_load_explicit(&l->rf, memory_order_relaxed);
-	  } while (!rf_write(rf, begin, msg_len));
+	  } while (!rf_writev(rf, iov, iov_count));
 	}
 #ifdef HAVE_SYSLOG_H
       else
       {
-	*buf->buf.pos = '\0';
-	syslog(syslog_priorities[buf->class], "%s", buf->msg_pos);
+	syslog(syslog_priorities[buf->class], "%s", buf->pos[LBP_MSG]);
       }
 #endif
     }
-
-  buf->msg_pos = buf->tm_pos = NULL;
 }
 
 int buffer_vprint(buffer *buf, const char *fmt, va_list args);
@@ -230,31 +255,35 @@ int buffer_vprint(buffer *buf, const char *fmt, va_list args);
 void
 log_prepare(log_buffer *buf, int class)
 {
+  buf->class = class;
+
   buf->buf.start = buf->buf.pos = buf->block;
   buf->buf.end = buf->block + sizeof buf->block;
 
   int lf = atomic_load_explicit(&logging_flags, memory_order_acquire);
-  if (lf & LOGGING_TO_TERMINAL)
-    buffer_puts(&buf->buf, "bird: ");
 
-  if (lf & LOGGING_TO_FILE)
+  buf->pos[LBP_TIMESTAMP] = buf->buf.pos;
+  if (BIT32_TEST(&lf, LBP_TIMESTAMP))
   {
     const char *fmt = config ? config->tf_log.fmt1 : "%F %T.%3f";
-
-    buf->tm_pos = buf->buf.pos;
     int t = tm_format_real_time(buf->buf.pos, buf->buf.end - buf->buf.pos, fmt, current_real_time());
     if (t)
       buf->buf.pos += t;
     else
       buffer_puts(&buf->buf, "<time format error>");
 
-    buffer_print(&buf->buf, " [%04x] <%s> ", THIS_THREAD_ID, class_names[class]);
+    *(buf->buf.pos++) = ' ';
   }
-  else
-    buf->tm_pos = NULL;
 
-  buf->msg_pos = buf->buf.pos;
-  buf->class = class;
+  buf->pos[LBP_THREAD_ID] = buf->buf.pos;
+  if (BIT32_TEST(&lf, LBP_THREAD_ID))
+    buffer_print(&buf->buf, "[%04x] ", THIS_THREAD_ID);
+
+  buf->pos[LBP_CLASS] = buf->buf.pos;
+  if (BIT32_TEST(&lf, LBP_CLASS))
+    buffer_print(&buf->buf, "<%s> ", class_names[class]);
+
+  buf->pos[LBP_MSG] = buf->buf.pos;
 }
 
 static void
@@ -374,7 +403,11 @@ debug(const char *msg, ...)
       if (s < 0)
 	bug("Extremely long debug output, split it.");
 
-      rf_write(dbg_rf, buf, s);
+      struct iovec i = {
+	.iov_base = buf,
+	.iov_len = s,
+      };
+      rf_writev(dbg_rf, &i, 1);
     }
   va_end(args);
 }
@@ -391,7 +424,7 @@ void
 debug_safe(const char *msg)
 {
   if (dbg_rf)
-    rf_write(dbg_rf, msg, strlen(msg));
+    rf_write_crude(dbg_rf, msg, strlen(msg));
 }
 
 static list *
@@ -406,7 +439,7 @@ default_log_list(int initial, const char **syslog_name)
     {
       static struct log_config lc_syslog;
       lc_syslog = (struct log_config){
-	.mask = ~0
+	.mask = ~0,
       };
 
       add_tail(&log_list, &lc_syslog.n);
@@ -453,7 +486,9 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
     /* Create syslog channel */
     struct log_channel *lc = mb_alloc(log_pool, sizeof *lc);
 
-    *lc = (struct log_channel) {};
+    *lc = (struct log_channel) {
+      .prepare = BIT32_ALL(LBP_MSG),
+    };
     ASSERT_DIE(NULL == atomic_exchange_explicit(&global_logs, lc, memory_order_release));
 #endif
 
@@ -503,12 +538,7 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
 	  total_mask |= l->mask;
 
 	  /* Merge flags */
-	  flags |= LOGGING_TO_FILE;
-	  if (l->terminal_flag)
-	  {
-	    flags |= LOGGING_TO_TERMINAL;
-	    ol->terminal = 1;
-	  }
+	  flags |= ol->prepare;
 
 	  /* The filehandle is no longer needed */
 	  if ((l->rf != &rf_stderr ) && (l->rf != dbg_rf))
@@ -552,18 +582,15 @@ log_switch(int initial, list *logs, const char *new_syslog_name)
       .rf = l->rf,
       .limit = l->limit,
       .new_mask = l->mask,
-      .terminal = l->terminal_flag,
+      .prepare = BIT32_ALL(LBP_TIMESTAMP, LBP_THREAD_ID, LBP_CLASS, LBP_MSG) |
+	(l->terminal_flag ? BIT32_VAL(LBPP_TERMINAL) : 0),
     };
 
+    /* Mask union */
     total_mask |= l->mask;
 
     /* Message preparation flags */
-    flags |= LOGGING_TO_FILE;
-    if (l->terminal_flag)
-    {
-      flags |= LOGGING_TO_TERMINAL;
-      lc->terminal = 1;
-    }
+    flags |= lc->prepare;
 
     /* Now the file handle ownership is transferred to the log channel */
     l->rf = NULL;
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 7e1ef97c..0ea8446c 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -13,6 +13,7 @@
 #include "lib/io-loop.h"
 
 #include <sys/socket.h>
+#include <sys/uio.h>
 #include <signal.h>
 
 struct pool;
@@ -123,7 +124,8 @@ enum rf_mode {
 struct rfile *rf_open(struct pool *, const char *name, enum rf_mode mode, off_t limit);
 off_t rf_size(struct rfile *);
 int rf_same(struct rfile *, struct rfile *);
-int rf_write(struct rfile *, const void *, size_t);
+int rf_writev(struct rfile *, struct iovec *, int);
+void rf_write_crude(struct rfile *, const char *, int);
 
 extern struct rfile rf_stderr;
 

From b7400f73a47b220378ef4bd1923d09f19cf7ffbd Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 23:03:54 +0100
Subject: [PATCH 417/431] Config: Moved hostname check before any other commit
 is done

This was sending <none> hostname via UDP while reconfiguring.
---
 conf/conf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/conf.c b/conf/conf.c
index c17358c1..c5ce6f5a 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -246,14 +246,6 @@ config_del_obstacle(struct config *c)
 static int
 global_commit(struct config *new, struct config *old)
 {
-  if (!new->hostname)
-    {
-      new->hostname = get_hostname(new->mem);
-
-      if (!new->hostname)
-        log(L_WARN "Cannot determine hostname");
-    }
-
   if (!old)
     return 0;
 
@@ -289,6 +281,14 @@ config_do_commit(struct config *c, int type)
   old_cftype = type;
   config = c;
 
+  if (!c->hostname)
+    {
+      c->hostname = get_hostname(c->mem);
+
+      if (!c->hostname)
+        log(L_WARN "Cannot determine hostname");
+    }
+
   configuring = 1;
   if (old_config && !config->shutdown)
     log(L_INFO "Reconfiguring");

From 2e5cf618ef823db4e414bd7960265d84479bf718 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 23:37:08 +0100
Subject: [PATCH 418/431] Hack-fix of IPv6 SADR literal parsing

This should be probably once done better, not by ad-hoc disabling
the attribute symbol table when parsing SADR literals.
---
 conf/cf-lex.l   | 18 ++++++++++++++++--
 conf/conf.h     |  2 ++
 conf/confbase.Y | 45 ++++++++++++++++++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 72582083..b7ecfb7b 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -893,8 +893,15 @@ cf_swap_soft_scope(struct config *conf)
 void
 cf_enter_filters(void)
 {
-  ASSERT_DIE(!new_config->allow_attributes);
+  ASSERT_DIE(!cf_maybe_enter_filters());
+}
+
+int
+cf_maybe_enter_filters(void)
+{
+  int o = new_config->allow_attributes;
   new_config->allow_attributes = 1;
+  return o;
 }
 
 /**
@@ -903,8 +910,15 @@ cf_enter_filters(void)
 void
 cf_exit_filters(void)
 {
-  ASSERT_DIE(new_config->allow_attributes);
+  ASSERT_DIE(cf_maybe_exit_filters());
+}
+
+int
+cf_maybe_exit_filters(void)
+{
+  int o = new_config->allow_attributes;
   new_config->allow_attributes = 0;
+  return o;
 }
 
 
diff --git a/conf/conf.h b/conf/conf.h
index f6e9069d..ea4aac35 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -159,6 +159,8 @@ struct sym_scope {
 
 void cf_enter_filters(void);
 void cf_exit_filters(void);
+int cf_maybe_enter_filters(void);
+int cf_maybe_exit_filters(void);
 
 extern pool *global_root_scope_pool;
 extern linpool *global_root_scope_linpool;
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 9324c559..845070b2 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -28,6 +28,8 @@ CF_HDR
 
 CF_DEFINES
 
+static _Bool this_sadr_from_hack_active;
+
 static void
 check_u16(uint val)
 {
@@ -119,7 +121,7 @@ CF_DECLS
 %type <i> expr bool pxlen4
 %type <time> expr_us time
 %type <settle> settle
-%type <a> ipa
+%type <a> ipa net_ip6_slash
 %type <net> net_ip4_ net_ip4 net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
 %type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_ net_ip6_sadr_ net_mpls_
 %type <ad> label_stack_start label_stack
@@ -235,12 +237,24 @@ net_ip4_: IP4 pxlen4
 	     n->prefix, n->pxlen, ip4_and(n->prefix, ip4_mkmask(n->pxlen)), n->pxlen);
 };
 
-net_ip6_: IP6 '/' NUM
+net_ip6_slash: IP6 '/'
 {
-  if ($3 > IP6_MAX_PREFIX_LENGTH)
-    cf_error("Invalid prefix length %u", $3);
+  this_sadr_from_hack_active = cf_maybe_exit_filters();
+  $$ = $1;
+}
 
-  net_fill_ip6(&($$), $1, $3);
+net_ip6_: net_ip6_slash NUM
+{
+  if (this_sadr_from_hack_active)
+  {
+    cf_enter_filters();
+    this_sadr_from_hack_active = 0;
+  }
+
+  if ($2 > IP6_MAX_PREFIX_LENGTH)
+    cf_error("Invalid prefix length %u", $2);
+
+  net_fill_ip6(&($$), $1, $2);
 
   net_addr_ip6 *n = (void *) &($$);
   if (!net_validate_ip6(n))
@@ -248,16 +262,25 @@ net_ip6_: IP6 '/' NUM
 	     n->prefix, n->pxlen, ip6_and(n->prefix, ip6_mkmask(n->pxlen)), n->pxlen);
 };
 
-net_ip6_sadr_: IP6 '/' NUM FROM IP6 '/' NUM
+net_ip6_sadr_: net_ip6_slash NUM FROM IP6 '/' NUM
 {
-  if ($3 > IP6_MAX_PREFIX_LENGTH)
-    cf_error("Invalid prefix length %u", $3);
+  if (this_sadr_from_hack_active)
+  {
+    cf_enter_filters();
+    this_sadr_from_hack_active = 0;
+  }
 
-  if ($7 > IP6_MAX_PREFIX_LENGTH)
-    cf_error("Invalid prefix length %u", $7);
+  if (($3->class != SYM_KEYWORD) || ($3->keyword->value != FROM))
+    cf_error("Expected FROM after %I6/%d", $1, $2);
+
+  if ($2 > IP6_MAX_PREFIX_LENGTH)
+    cf_error("Invalid prefix length %u", $2);
+
+  if ($6 > IP6_MAX_PREFIX_LENGTH)
+    cf_error("Invalid prefix length %u", $6);
 
   $$ = cfg_alloc(sizeof(net_addr_ip6_sadr));
-  net_fill_ip6_sadr($$, $1, $3, $5, $7);
+  net_fill_ip6_sadr($$, $1, $2, $4, $6);
 
   net_addr_ip6_sadr *n = (void *) $$;
   if (!net_validate_ip6_sadr(n))

From 058984bc861e938bd274262b939013ae428b38eb Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 29 Jan 2024 13:58:23 +0100
Subject: [PATCH 419/431] BGP: fixed MPLS setting in nexthops

bug introduced somewhere during conversion of nexthops to eattrs
---
 lib/route.h         |  6 ++++++
 proto/bgp/packets.c | 44 ++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/lib/route.h b/lib/route.h
index f9702931..61f7f342 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -162,6 +162,12 @@ struct nexthop_adata {
   };
 };
 
+/* For MPLS label stack generation */
+struct nexthop_adata_mpls {
+  struct nexthop_adata nhad;
+  u32 label_space[MPLS_MAX_LABEL_STACK];
+};
+
 #define NEXTHOP_DEST_SIZE	(OFFSETOF(struct nexthop_adata, dest) + sizeof(uint) - OFFSETOF(struct adata, data))
 #define NEXTHOP_DEST_LITERAL(x)	((struct nexthop_adata) { \
       .ad.length = NEXTHOP_DEST_SIZE, .dest = (x), })
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 180c0b73..ce722645 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1104,16 +1104,18 @@ bgp_apply_next_hop(struct bgp_parse_state *s, ea_list **to, ip_addr gw, ip_addr
 
     ea_set_attr_u32(to, &ea_gen_igp_metric, 0, c->cf->cost);
 
-    struct nexthop_adata nhad = {
-      .nh = {
-	.gw = nbr->addr,
-	.iface = nbr->iface,
-      },
-      .ad = {
-	.length = sizeof nhad - sizeof nhad.ad,
+    struct nexthop_adata_mpls nam = {
+      .nhad = {
+	.nh = {
+	  .gw = nbr->addr,
+	  .iface = nbr->iface,
+	},
+	.ad = {
+	  .length = NEXTHOP_NEXT(&nam.nhad.nh) - (void *) nam.nhad.ad.data,
+	},
       },
     };
-    ea_set_attr_data(to, &ea_gen_nexthop, 0, nhad.ad.data, nhad.ad.length);
+    ea_set_attr_data(to, &ea_gen_nexthop, 0, nam.nhad.ad.data, nam.nhad.ad.length);
   }
   else /* GW_RECURSIVE */
   {
@@ -1153,23 +1155,20 @@ bgp_apply_mpls_labels(struct bgp_parse_state *s, ea_list **to, u32 lnum, u32 lab
   if (s->channel->cf->gw_mode == GW_DIRECT)
   {
     eattr *e = ea_find(*to, &ea_gen_nexthop);
-    struct {
-      struct nexthop_adata nhad;
-      u32 labels[MPLS_MAX_LABEL_STACK];
-    } nh;
-    
-    memcpy(&nh.nhad, e->u.ptr, sizeof(struct adata) + e->u.ptr->length);
-    nh.nhad.nh.labels = lnum;
-    memcpy(nh.labels, labels, lnum * sizeof(u32));
-    nh.nhad.ad.length = sizeof nh.nhad + lnum * sizeof(u32);
+    struct nexthop_adata_mpls *namp = SKIP_BACK(struct nexthop_adata_mpls, nhad.ad, e->u.ptr);
+
+    namp->nhad.nh.labels = lnum;
+    memcpy(namp->nhad.nh.label, labels, lnum * sizeof(u32));
+    namp->nhad.ad.length = NEXTHOP_NEXT(&namp->nhad.nh) - (void *) namp->nhad.ad.data;
   }
   else /* GW_RECURSIVE */
   {
     eattr *e = ea_find(*to, &ea_gen_hostentry);
     ASSERT_DIE(e);
     struct hostentry_adata *head = (void *) e->u.ptr;
-    memcpy(&head->labels, labels, lnum * sizeof(u32));
+    memcpy(head->labels, labels, lnum * sizeof(u32));
     head->ad.length = (void *)(&head->labels[lnum]) - (void *) head->ad.data;
+    debug("he %p apply mpls labels (%u): %u\n", head->he, lnum, labels[0]);
   }
 }
 
@@ -1527,9 +1526,6 @@ bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, ea_lis
 
     s->last_src = rt_get_source(&s->proto->p, path_id);
     s->last_id = path_id;
-
-    ea_free(s->cached_ea);
-    s->cached_ea = NULL;
   }
 
   if (!a0)
@@ -1544,11 +1540,11 @@ bgp_rte_update(struct bgp_parse_state *s, const net_addr *n, u32 path_id, ea_lis
   }
 
   /* Prepare cached route attributes */
-  if (s->cached_ea == NULL)
-    s->cached_ea = ea_lookup(a0, 0);
+  if (!s->mpls && (s->cached_ea == NULL))
+    a0 = s->cached_ea = ea_lookup(a0, 0);
 
   rte e0 = {
-    .attrs = s->cached_ea,
+    .attrs = a0,
     .src = s->last_src,
   };
 

From 29e7cd4a7cdfecefcb851b815d073f5577804b07 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 29 Jan 2024 16:56:22 +0100
Subject: [PATCH 420/431] Showing MPLS labels in hostentry display

---
 nest/rt-attr.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index e6f70ad8..546c67db 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1373,10 +1373,20 @@ ea_show_hostentry(const struct adata *ad, byte *buf, uint size)
 {
   const struct hostentry_adata *had = (const struct hostentry_adata *) ad;
 
+  uint s = 0;
+
   if (ipa_nonzero(had->he->link) && !ipa_equal(had->he->link, had->he->addr))
-    bsnprintf(buf, size, "via %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
+    s = bsnprintf(buf, size, "via %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
   else
-    bsnprintf(buf, size, "via %I table %s", had->he->addr, had->he->tab->name);
+    s = bsnprintf(buf, size, "via %I table %s", had->he->addr, had->he->tab->name);
+
+  uint lc = HOSTENTRY_LABEL_COUNT(had);
+  if (!lc)
+    return;
+
+  s = bsnprintf((buf += s), (size -= s), " labels");
+  for (uint i=0; i < lc; i++)
+    s = bsnprintf((buf += s), (size -= s), " %u", had->labels[i]);
 }
 
 /**

From 000dbf737c6821501f3909cb656be9a73e367186 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 29 Jan 2024 22:59:49 +0100
Subject: [PATCH 421/431] Temporarily disabling L3VPN netlab test, has no data
 for v3

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b84ce8f..57180aa1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -470,10 +470,10 @@ test-mpls-bgp:
   variables:
     TEST_NAME: cf-mpls-bgp
 
-test-mpls-bgp-l3vpn:
-  <<: *test-base
-  variables:
-    TEST_NAME: cf-mpls-bgp-l3vpn
+#test-mpls-bgp-l3vpn:
+#  <<: *test-base
+#  variables:
+#    TEST_NAME: cf-mpls-bgp-l3vpn
 
 
 .build-birdlab-base: &build-birdlab-base

From 95adf7b0fa0c0c764f34d064797c5b3f25680b98 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Jan 2024 21:29:00 +0100
Subject: [PATCH 422/431] Fixed regression in route feeding.

We were, once again, forgetting to mark empty-net journal entries as
processed, as was fixed in 32bb548c116b40f79d077c10356c037770ed1005.

Introduced in 548dbb2252e80362789b8c98355f468491d47b34.
Caught by cf-ebgp-graceful.
---
 nest/rt-table.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index ec1cd71c..80a1c225 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -4280,10 +4280,16 @@ rt_feed_by_fib(void *data)
     for (; c->feed_index < tab->routes_block_size; c->feed_index++)
     {
       net *n = &tab->routes[c->feed_index];
-      if (!n->routes)
+      const net_addr *a;
+      if (n->routes)
+	a = n->routes->rte.net;
+      else if (!n->first)
 	continue;
+      else if (n->first->old)
+	a = n->first->old->rte.net;
+      else
+	a = n->first->new->rte.net;
 
-      const net_addr *a = n->routes->rte.net;
       if (rt_prefilter_net(&c->h.req->prefilter, a))
       {
 	if (!rt_prepare_feed(c, n, &block))

From 06030d8bf0921bcf333c2d3398f4a9f41ba21e2f Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 30 Jan 2024 23:13:49 +0100
Subject: [PATCH 423/431] Hostentry eattrs are now properly zeroed

---
 nest/rt-table.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 80a1c225..addab2b2 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -3336,15 +3336,19 @@ rt_postconfig(struct config *c)
 void
 ea_set_hostentry(ea_list **to, rtable *dep, rtable *src, ip_addr gw, ip_addr ll, u32 lnum, u32 labels[lnum])
 {
-  struct hostentry_adata *head = (struct hostentry_adata *) tmp_alloc_adata(
-      sizeof *head + sizeof(u32) * lnum - sizeof(struct adata));
+  struct {
+    struct hostentry_adata head;
+    u32 label_space[lnum];
+  } h;
+
+  memset(&h, 0, sizeof h);
 
   RT_LOCKED(src, tab)
-    head->he = rt_get_hostentry(tab, gw, ll, dep);
-  memcpy(head->labels, labels, lnum * sizeof(u32));
+    h.head.he = rt_get_hostentry(tab, gw, ll, dep);
 
-  ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
-	&ea_gen_hostentry, 0, &head->ad));
+  memcpy(h.head.labels, labels, lnum * sizeof(u32));
+
+  ea_set_attr_data(to, &ea_gen_hostentry, 0, h.head.ad.data, (byte *) &h.head.labels[lnum] - h.head.ad.data);
 }
 
 

From 3b217f29843a68638fba52e873b6bfde52258b53 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 23 Jan 2024 20:25:48 +0100
Subject: [PATCH 424/431] Fixed L3VPN after merge to v3.

Semantics of rt_get_source() has changed between v2 and v3. Also other
minor fixes were needed to make it run.
---
 nest/mpls.c         | 29 ++++++++++++++++-------------
 nest/rt-table.c     |  6 +++++-
 proto/l3vpn/l3vpn.c | 14 +++++++-------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/nest/mpls.c b/nest/mpls.c
index 7ffcad60..bf7caab7 100644
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@ -649,20 +649,21 @@ mpls_channel_start(struct channel *C)
     return 0;
 
   c->mpls_map = mpls_fec_map_new(C->proto->pool, C->proto->loop, C, c->rts);
+  c->mpls_map->vrf_iface = C->proto->vrf;
 
   return 0;
 }
 
-/*
 static void
 mpls_channel_shutdown(struct channel *C)
 {
   struct mpls_channel *c = (void *) C;
+
   if (!c->rts)
     return;
 
+  ev_send_loop(c->mpls_map->loop, c->mpls_map->cleanup_event);
 }
-*/
 
 static void
 mpls_channel_cleanup(struct channel *C)
@@ -738,7 +739,7 @@ struct channel_class channel_mpls = {
   .config_size =	sizeof(struct mpls_channel_config),
   .init =		mpls_channel_init,
   .start =		mpls_channel_start,
-//  .shutdown =		mpls_channel_shutdown,
+  .shutdown =		mpls_channel_shutdown,
   .cleanup =		mpls_channel_cleanup,
   .reconfigure =	mpls_channel_reconfigure,
 };
@@ -798,7 +799,6 @@ mpls_fec_map_new(pool *pp, struct birdloop *loop, struct channel *C, uint rts)
   m->cleanup_event = ev_new_init(p, mpls_fec_map_cleanup, m);
   m->channel = C;
   channel_add_obstacle(C);
-  ev_send_loop(loop, m->cleanup_event);
 
   m->domain = c->domain;
   MPLS_RANGE_LOCKED(c->range, r)
@@ -895,6 +895,8 @@ mpls_fec_map_cleanup(void *_m)
       finished = 0;
   HASH_WALK_DELSAFE_END;
 
+  DBGL("FEC Map %p Cleanup: %sfinished", m, finished ? "" : "not ");
+
   if (finished)
   {
     ev_postpone(m->cleanup_event);
@@ -981,7 +983,8 @@ mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
 
   if (fec)
   {
-    if (fec->policy == MPLS_POLICY_STATIC)
+    DBGL("FEC %p found for lab %u in %p, policy %u", fec, label, m, fec->policy);
+    if (fec->policy != MPLS_POLICY_STATIC)
       return NULL;
 
     mpls_revive_fec(fec);
@@ -1008,7 +1011,7 @@ mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
   fec->policy = MPLS_POLICY_STATIC;
   fec->handle = m->static_handle;
 
-  DBGL("New FEC lab %u", fec->label);
+  DBGL("New FEC lab %u map %p", fec->label, m);
 
   return fec;
 }
@@ -1044,7 +1047,7 @@ mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u64 path_id)
   fec->policy = MPLS_POLICY_PREFIX;
   fec->handle = m->handle;
 
-  DBGL("New FEC net %u", fec->label);
+  DBGL("New FEC net %u map %p", fec->label, m);
 
   HASH_INSERT2(m->net_hash, NET, m->pool, fec);
 
@@ -1086,7 +1089,7 @@ mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest)
   fec->policy = MPLS_POLICY_AGGREGATE;
   fec->handle = m->handle;
 
-  DBGL("New FEC rta %u", fec->label);
+  DBGL("New FEC rta %u map %p", fec->label, m);
 
   HASH_INSERT2(m->attrs_hash, RTA, m->pool, fec);
 
@@ -1117,7 +1120,7 @@ mpls_get_fec_for_vrf(struct mpls_fec_map *m)
   fec->handle = m->handle;
   fec->iface = m->vrf_iface;
 
-  DBGL("New FEC vrf %u", fec->label);
+  DBGL("New FEC vrf %u map %p", fec->label, m);
 
   m->vrf_fec = fec;
 
@@ -1134,12 +1137,14 @@ mpls_unlink_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
     break;
 
   case MPLS_POLICY_PREFIX:
+    DBGL("Unlink FEC %p %u from net_hash");
     HASH_REMOVE2(m->net_hash, NET, m->pool, fec);
     break;
 
   case MPLS_POLICY_AGGREGATE:
-    ea_free(fec->rta->l);
+    DBGL("Unlink FEC %p %u from attrs_hash (%d) at %p", fec, fec->label, m->attrs_hash.count, m);
     HASH_REMOVE2(m->attrs_hash, RTA, m->pool, fec);
+    ea_free(fec->rta->l);
     break;
 
   case MPLS_POLICY_VRF:
@@ -1205,9 +1210,7 @@ mpls_damage_fec(struct mpls_fec_map *m UNUSED, struct mpls_fec *fec)
 static struct ea_storage *
 mpls_get_key_attrs(struct mpls_fec_map *m, ea_list *src)
 {
-  EA_LOCAL_LIST(4) ea = {
-    .l.flags = EALF_SORTED,
-  };
+  EA_LOCAL_LIST(4) ea = {};
 
   uint last_id = 0;
   #define PUT_ATTR(cls)	do { \
diff --git a/nest/rt-table.c b/nest/rt-table.c
index addab2b2..79f74d24 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -596,7 +596,10 @@ static inline void
 channel_rte_trace_in(uint flag, struct channel *c, const rte *e, const char *msg)
 {
   if ((c->debug & flag) || (c->proto->debug & flag))
-    rte_trace(c->in_req.name, e, '>', msg);
+    log(L_TRACE "%s > %s %N (-) src %luL %uG %uS id %u %s",
+	c->in_req.name, msg, e->net,
+	e->src->private_id, e->src->global_id, e->stale_cycle, e->id,
+	rta_dest_name(rte_dest(e)));
 }
 
 static inline void
@@ -1789,6 +1792,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
   if (new)
     {
       new->net = n;
+      new->sender = c->in_req.hook;
 
       int fr;
 
diff --git a/proto/l3vpn/l3vpn.c b/proto/l3vpn/l3vpn.c
index f2e8bf0f..19e3b389 100644
--- a/proto/l3vpn/l3vpn.c
+++ b/proto/l3vpn/l3vpn.c
@@ -161,14 +161,14 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
   {
   case NET_IP4:
     net_fill_vpn4(n, net4_prefix(n0), net4_pxlen(n0), p->rd);
-    src = p->p.main_source;
+    rt_lock_source(src = p->p.main_source);
     dst = p->vpn4_channel;
     export = 1;
     break;
 
   case NET_IP6:
     net_fill_vpn6(n, net6_prefix(n0), net6_pxlen(n0), p->rd);
-    src = p->p.main_source;
+    rt_lock_source(src = p->p.main_source);
     dst = p->vpn6_channel;
     export = 1;
     break;
@@ -191,11 +191,11 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
     return;
   }
 
-  const struct adata *ecad = ea_get_adata(new->attrs, ea_bgp_ext_community);
-  struct nexthop_adata *nhad_orig = rte_get_nexthops(new);
-
   if (new)
   {
+    const struct adata *ecad = ea_get_adata(new->attrs, ea_bgp_ext_community);
+    struct nexthop_adata *nhad_orig = rte_get_nexthops(new);
+
     new->src = src;
 
     ea_set_attr_u32(&new->attrs, &ea_gen_source, 0, RTS_L3VPN);
@@ -241,6 +241,8 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
   {
     rte_update(dst, n, NULL, src);
   }
+
+  rt_unlock_source(src);
 }
 
 
@@ -410,8 +412,6 @@ l3vpn_start(struct proto *P)
   l3vpn_prepare_import_targets(p);
   l3vpn_prepare_export_targets(p);
 
-  SKIP_BACK(struct mpls_channel, c, P->mpls_channel)->mpls_map->vrf_iface = P->vrf;
-
   return PS_UP;
 }
 

From eadebc287b88b4c6accc9dc0f00292d844f69dcc Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 27 Mar 2024 23:16:51 +0100
Subject: [PATCH 425/431] Nest: Fix printing of hostentry table

When hostentry is printed, it should show the table in which the nexthop
is resolved, not the dependend one.
---
 nest/rt-attr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 546c67db..0a74cd3d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1376,9 +1376,9 @@ ea_show_hostentry(const struct adata *ad, byte *buf, uint size)
   uint s = 0;
 
   if (ipa_nonzero(had->he->link) && !ipa_equal(had->he->link, had->he->addr))
-    s = bsnprintf(buf, size, "via %I %I table %s", had->he->addr, had->he->link, had->he->tab->name);
+    s = bsnprintf(buf, size, "via %I %I table %s", had->he->addr, had->he->link, had->he->owner->name);
   else
-    s = bsnprintf(buf, size, "via %I table %s", had->he->addr, had->he->tab->name);
+    s = bsnprintf(buf, size, "via %I table %s", had->he->addr, had->he->owner->name);
 
   uint lc = HOSTENTRY_LABEL_COUNT(had);
   if (!lc)

From 468f1d6547437e0640cb84f7ac144c32574cc020 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 27 Mar 2024 23:26:25 +0100
Subject: [PATCH 426/431] Nest: Improve printing of hostentries with MPLS
 labels

MPLS labels in hostentry should be printed with 'mpls' keyword instead of
'labels' to be consistent with the rest of the 'show route' output.
---
 nest/rt-attr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 0a74cd3d..e29ded29 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1384,7 +1384,7 @@ ea_show_hostentry(const struct adata *ad, byte *buf, uint size)
   if (!lc)
     return;
 
-  s = bsnprintf((buf += s), (size -= s), " labels");
+  s = bsnprintf((buf += s), (size -= s), " mpls");
   for (uint i=0; i < lc; i++)
     s = bsnprintf((buf += s), (size -= s), " %u", had->labels[i]);
 }

From d2a531a92bb3015f2b6582e77c516f7eec05ae39 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 28 Mar 2024 00:55:19 +0100
Subject: [PATCH 427/431] L3VPN: Fix missing rte_owner_class registration

---
 proto/l3vpn/l3vpn.c | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/proto/l3vpn/l3vpn.c b/proto/l3vpn/l3vpn.c
index 19e3b389..8b9fb9f4 100644
--- a/proto/l3vpn/l3vpn.c
+++ b/proto/l3vpn/l3vpn.c
@@ -338,6 +338,23 @@ l3vpn_rte_better(const rte *new, const rte *old)
   return rt_get_igp_metric(new) < rt_get_igp_metric(old);
 }
 
+static void
+l3vpn_get_route_info(const rte *rte, byte *buf)
+{
+  u32 pref = rt_get_preference(rte);
+  u32 metric = rt_get_igp_metric(rte);
+
+  if (metric < IGP_METRIC_UNKNOWN)
+    bsprintf(buf, " (%u/%u)", pref, metric);
+  else
+    bsprintf(buf, " (%u/?)", pref);
+}
+
+static struct rte_owner_class l3vpn_rte_owner_class = {
+  .get_route_info =	l3vpn_get_route_info,
+  .rte_better =		l3vpn_rte_better,
+};
+
 static void
 l3vpn_postconfig(struct proto_config *CF)
 {
@@ -395,6 +412,8 @@ l3vpn_init(struct proto_config *CF)
   P->preexport = l3vpn_preexport;
   P->reload_routes = l3vpn_reload_routes;
 
+  P->sources.class = &l3vpn_rte_owner_class;
+
   return P;
 }
 
@@ -483,23 +502,6 @@ l3vpn_copy_config(struct proto_config *dest UNUSED, struct proto_config *src UNU
   /* Just a shallow copy, not many items here */
 }
 
-static void
-l3vpn_get_route_info(const rte *rte, byte *buf)
-{
-  u32 metric = rt_get_igp_metric(rte);
-  u32 pref = rt_get_preference(rte);
-
-  if (metric < IGP_METRIC_UNKNOWN)
-    bsprintf(buf, " (%u/%u)", pref, metric);
-  else
-    bsprintf(buf, " (%u/?)", pref);
-}
-
-struct rte_owner_class l3vpn_rte_owner_class = {
-  .get_route_info =	l3vpn_get_route_info,
-  .rte_better =		l3vpn_rte_better,
-};
-
 struct protocol proto_l3vpn = {
   .name =		"L3VPN",
   .template =		"l3vpn%d",

From df0dee54b0cf776c09bd135f804f90ee38e07f8d Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 28 Mar 2024 01:01:33 +0100
Subject: [PATCH 428/431] Revert "Temporarily disabling L3VPN netlab test, has
 no data for v3"

This reverts commit 000dbf737c6821501f3909cb656be9a73e367186.
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57180aa1..1b84ce8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -470,10 +470,10 @@ test-mpls-bgp:
   variables:
     TEST_NAME: cf-mpls-bgp
 
-#test-mpls-bgp-l3vpn:
-#  <<: *test-base
-#  variables:
-#    TEST_NAME: cf-mpls-bgp-l3vpn
+test-mpls-bgp-l3vpn:
+  <<: *test-base
+  variables:
+    TEST_NAME: cf-mpls-bgp-l3vpn
 
 
 .build-birdlab-base: &build-birdlab-base

From 1beafe3eea05bc17387d0ec56ad6c7108d702a68 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 28 Mar 2024 17:46:24 +0100
Subject: [PATCH 429/431] Fix merge commit
 c195c7a0d50cd80656fc3cabc692a0464dd0cb2d

---
 filter/f-inst.c |  2 +-
 lib/type.h      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 2a6ef6cf..6a0cdfde 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -923,7 +923,7 @@
 
       case T_STRING:
 	a = ea_set_attr(&fs->rte->attrs,
-	    EA_LITERAL_STORE_ADATA(da, 0, &v1.val.s, strlen(v1.val.s) + 1));
+	    EA_LITERAL_STORE_ADATA(da, 0, v1.val.s, strlen(v1.val.s) + 1));
 	break;
 
       default:
diff --git a/lib/type.h b/lib/type.h
index e07c98ec..2edaa2e4 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -72,10 +72,11 @@ enum btype {
   T_CLIST = 0x0a,		/* Set of u32's (e.g., a community list) */
   T_ECLIST = 0x0e,		/* Set of pairs of u32's - ext. community list */
   T_LCLIST = 0x08,		/* Set of triplets of u32's - large community list */
+  T_STRING = 0x10,
 
-  T_ENUM_BGP_ORIGIN = 0x11,	/* BGP Origin enum */
-  T_ENUM_RA_PREFERENCE = 0x13,	/* RA Preference enum */
-  T_ENUM_FLOWSPEC_VALID = 0x15,	/* Flowspec validation result */
+  T_ENUM_BGP_ORIGIN = 0x13,	/* BGP Origin enum */
+  T_ENUM_RA_PREFERENCE = 0x15,	/* RA Preference enum */
+  T_ENUM_FLOWSPEC_VALID = 0x17,	/* Flowspec validation result */
 
 #define EAF_TYPE__MAX 0x1f
 #define EAF_EMBEDDED 0x01		/* Data stored in eattr.u.data (part of type spec) */
@@ -86,7 +87,7 @@ enum btype {
   T_PAIR = 0xa4,  /*	Notice that pair is stored as integer: first << 16 | second */
 
 /* Put enumerational types in 0x20..0x3f range */
-  T_ENUM_LO = 0x10,
+  T_ENUM_LO = 0x12,
   T_ENUM_HI = 0x3f,
 
   T_ENUM_RTS = 0x31,
@@ -103,7 +104,6 @@ enum btype {
 
 /* Bigger ones */
   T_NET = 0xb0,
-  T_STRING = 0xb4,
   T_PATH_MASK = 0xb8,	/* mask for BGP path */
   T_EC = 0xbc,		/* Extended community value, u64 */
   T_LC = 0xc0,		/* Large community value, lcomm */

From 4036da3732220a5cd268e77f9505dfd5506cedb1 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 28 Mar 2024 19:46:24 +0100
Subject: [PATCH 430/431] Nest: Fix bitfield attributes

Fix missing route lookup, causing crash when accessing route attribute.

Also fix additional space in bitfield formatting.
---
 nest/rt-attr.c         | 9 +++++++--
 sysdep/linux/netlink.Y | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 468b279d..1df1f96d 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1248,6 +1248,7 @@ ea_list_unref(ea_list *l)
 void
 ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max)
 {
+  byte *start = buf;
   byte *bound = buf + bufsize - 32;
   u32 data = a->u.data;
   int i;
@@ -1261,13 +1262,17 @@ ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **n
 	return;
       }
 
-      buf += bsprintf(buf, " %s", names[i]);
+      buf += bsprintf(buf, "%s ", names[i]);
       data &= ~(1u << i);
     }
 
   if (data)
-    bsprintf(buf, " %08x", data);
+    bsprintf(buf, "%08x ", data);
 
+  if (buf != start)
+    buf--;
+
+  *buf = 0;
   return;
 }
 
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 8e1c1921..bf5f8b3b 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -54,7 +54,7 @@ attr_bit: KRT_FEATURE_ECN	{ $$ = f_new_dynamic_attr_bit(0, "krt_features"); } ;
 attr_bit: KRT_FEATURE_ALLFRAG { $$ = f_new_dynamic_attr_bit(3, "krt_features"); } ;
 
 /* Using attribute bits in filters (moved here to not confuse Bison on *BSD) */
-lvalue: attr_bit { $$ = (struct f_lval) { .type = F_LVAL_ATTR_BIT, .fab = $1 }; };
+lvalue: attr_bit { $$ = (struct f_lval) { .type = F_LVAL_ATTR_BIT, .fab = $1, .rte = f_new_inst(FI_CURRENT_ROUTE), }; };
 
 CF_CODE
 

From 07757b8a0c192f116afba3e846a01d10657efdc2 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 1 Apr 2024 02:53:25 +0200
Subject: [PATCH 431/431] Filter: Initialize route attribute flags properly

Move 'flags' field back to ea_class, so filtering code can use it to
initialize route attribute flags when set by filters.
---
 filter/f-inst.c   | 6 +++---
 lib/route.h       | 1 +
 proto/bgp/attrs.c | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 6a0cdfde..2fed0543 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -918,17 +918,17 @@
 
       case T_IP:
 	a = ea_set_attr(&fs->rte->attrs,
-	    EA_LITERAL_STORE_ADATA(da, 0, &v1.val.ip, sizeof(ip_addr)));
+	    EA_LITERAL_STORE_ADATA(da, da->flags, &v1.val.ip, sizeof(ip_addr)));
 	break;
 
       case T_STRING:
 	a = ea_set_attr(&fs->rte->attrs,
-	    EA_LITERAL_STORE_ADATA(da, 0, v1.val.s, strlen(v1.val.s) + 1));
+	    EA_LITERAL_STORE_ADATA(da, da->flags, v1.val.s, strlen(v1.val.s) + 1));
 	break;
 
       default:
 	a = ea_set_attr(&fs->rte->attrs,
-	    EA_LITERAL_GENERIC(da->id, da->type, 0, .u = v1.val.bval));
+	    EA_LITERAL_GENERIC(da->id, da->type, da->flags, .u = v1.val.bval));
 	break;
       }
 
diff --git a/lib/route.h b/lib/route.h
index 61f7f342..07ef898f 100644
--- a/lib/route.h
+++ b/lib/route.h
@@ -259,6 +259,7 @@ struct ea_class {
   uint id;				/* Autoassigned attribute ID */ \
   uint uc;				/* Reference count */ \
   btype type;				/* Data type ID */ \
+  u16 flags;				/* Protocol-dependent flags */ \
   uint readonly:1;			/* This attribute can't be changed by filters */ \
   uint conf:1;				/* Requested by config */ \
   uint hidden:1;			/* Technical attribute, do not show, do not expose to filters */ \
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 6c4d9dcd..78acfc69 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -70,7 +70,6 @@ union bgp_attr_desc {
   struct ea_class class;
   struct {
     EA_CLASS_INSIDE;
-    uint flags;
     void (*export)(struct bgp_export_state *s, eattr *a);
     int  (*encode)(struct bgp_write_state *s, eattr *a, byte *buf, uint size);
     void (*decode)(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to);