#include "if.h"
#include "log.h"
#include "sockunion.h"
+#include "linklist.h"
+#include "thread.h"
+#include "workqueue.h"
#include "zebra/rib.h"
#include "zebra/rt.h"
{ZEBRA_ROUTE_ISIS, 115},
{ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */}
};
+
+struct zebra_queue_node_t
+{
+ struct route_node *node;
+ struct rib *del;
+};
\f
/* Vector for routing table. */
vector vrf_vector;
#define RIB_SYSTEM_ROUTE(R) \
((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
-void
-newrib_free (struct rib *rib)
+static struct rib *
+rib_lock (struct rib *rib)
+{
+ assert (rib->lock >= 0);
+
+ rib->lock++;
+ return rib;
+}
+
+static struct rib *
+rib_unlock (struct rib *rib)
{
struct nexthop *nexthop;
struct nexthop *next;
+
+ assert (rib->lock > 0);
+ rib->lock--;
- for (nexthop = rib->nexthop; nexthop; nexthop = next)
+ if (rib->lock == 0)
{
- next = nexthop->next;
- nexthop_free (nexthop);
+ for (nexthop = rib->nexthop; nexthop; nexthop = next)
+ {
+ next = nexthop->next;
+ nexthop_free (nexthop);
+ }
+ XFREE (MTYPE_RIB, rib);
+ return NULL;
}
- XFREE (MTYPE_RIB, rib);
+ return rib;
}
void
}
/* Core function for processing routing information base. */
-void
-rib_process (struct route_node *rn, struct rib *del)
+wq_item_status
+rib_process (struct zebra_queue_node_t *qnode)
{
struct rib *rib;
struct rib *next;
struct rib *fib = NULL;
struct rib *select = NULL;
+ struct rib *del = qnode->del;
+ struct route_node *rn = qnode->node;
int installed = 0;
struct nexthop *nexthop = NULL;
-
+
+ assert (rn);
+
+ /* possibly should lock and unlock rib on each iteration. however, for
+ * now, we assume called functions are synchronous and dont delete RIBs
+ * (as the work-queue deconstructor for this function is supposed to be
+ * the canonical 'delete' path for RIBs). Further if called functions
+ * below were to made asynchronous they should themselves acquire any
+ * locks/refcounts as needed and not depend on this caller to do it for
+ * them
+ */
for (rib = rn->info; rib; rib = next)
{
next = rib->next;
/* Currently installed rib. */
if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))
fib = rib;
-
+
/* Skip unreachable nexthop. */
if (! nexthop_active_update (rn, rib, 0))
continue;
|| rib->type == ZEBRA_ROUTE_CONNECT)
select = rib;
}
-
+
/* Deleted route check. */
if (del && CHECK_FLAG (del->flags, ZEBRA_FLAG_SELECTED))
fib = del;
-
+
+ /* We possibly should lock fib and select here However, all functions
+ * below are 'inline' and not asynchronous And if any were to be
+ * converted, they should manage references themselves really.. See
+ * previous comment above.
+ */
+
/* Same route is selected. */
if (select && select == fib)
{
if (CHECK_FLAG (select->flags, ZEBRA_FLAG_CHANGED))
- {
- redistribute_delete (&rn->p, select);
- if (! RIB_SYSTEM_ROUTE (select))
- rib_uninstall_kernel (rn, select);
+ {
+ redistribute_delete (&rn->p, select);
+ if (! RIB_SYSTEM_ROUTE (select))
+ rib_uninstall_kernel (rn, select);
- /* Set real nexthop. */
- nexthop_active_update (rn, select, 1);
+ /* Set real nexthop. */
+ nexthop_active_update (rn, select, 1);
- if (! RIB_SYSTEM_ROUTE (select))
- rib_install_kernel (rn, select);
- redistribute_add (&rn->p, select);
- }
+ if (! RIB_SYSTEM_ROUTE (select))
+ rib_install_kernel (rn, select);
+ redistribute_add (&rn->p, select);
+ }
else if (! RIB_SYSTEM_ROUTE (select))
- {
- /* Housekeeping code to deal with
- race conditions in kernel with linux
- netlink reporting interface up before IPv4 or IPv6 protocol
- is ready to add routes.
- This makes sure the routes are IN the kernel.
- */
-
- for (nexthop = select->nexthop; nexthop; nexthop = nexthop->next)
- {
- if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
- installed = 1;
- }
- if (! installed) rib_install_kernel (rn, select);
- }
- return;
+ {
+ /* Housekeeping code to deal with
+ race conditions in kernel with linux
+ netlink reporting interface up before IPv4 or IPv6 protocol
+ is ready to add routes.
+ This makes sure the routes are IN the kernel.
+ */
+
+ for (nexthop = select->nexthop; nexthop; nexthop = nexthop->next)
+ {
+ if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
+ installed = 1;
+ }
+ if (! installed)
+ rib_install_kernel (rn, select);
+ }
+ return WQ_SUCCESS;
}
/* Uninstall old rib from forwarding table. */
nexthop_active_update (rn, select, 1);
if (! RIB_SYSTEM_ROUTE (select))
- rib_install_kernel (rn, select);
+ rib_install_kernel (rn, select);
SET_FLAG (select->flags, ZEBRA_FLAG_SELECTED);
redistribute_add (&rn->p, select);
}
+
+ return WQ_SUCCESS;
+
+}
+
+/* Add work queue item to work queue and schedule processing */
+void
+rib_queue_add_qnode (struct zebra_t *zebra, struct zebra_queue_node_t *qnode)
+{
+ route_lock_node (qnode->node);
+
+ if (IS_ZEBRA_DEBUG_EVENT)
+ zlog_info ("rib_queue_add_qnode: work queue added");
+
+ assert (zebra && qnode && qnode->node);
+
+ if (qnode->del)
+ rib_lock (qnode->del);
+
+ if (zebra->ribq == NULL)
+ {
+ zlog_err ("rib_queue_add_qnode: ribq work_queue does not exist!");
+ route_unlock_node (qnode->node);
+ return;
+ }
+
+ work_queue_add (zebra->ribq, qnode);
+
+ return;
+}
+
+/* Add route node and rib to work queue and schedule processing */
+void
+rib_queue_add (struct zebra_t *zebra, struct route_node *rn, struct rib *del)
+{
+ struct zebra_queue_node_t *qnode;
+
+ assert (zebra && rn);
+
+ qnode = (struct zebra_queue_node_t *)
+ XCALLOC (MTYPE_RIB_QUEUE, sizeof (struct zebra_queue_node_t));
+
+ if (qnode == NULL)
+ {
+ zlog_err ("rib_queue_add: failed to allocate queue node memory, %s",
+ strerror (errno));
+ return;
+ }
+
+ qnode->node = rn;
+ qnode->del = del;
+
+ rib_queue_add_qnode (zebra, qnode);
+
+ return;
+}
+
+/* free zebra_queue_node_t */
+void
+rib_queue_qnode_del (struct zebra_queue_node_t *qnode)
+{
+ route_unlock_node (qnode->node);
+
+ if (qnode->del)
+ rib_unlock (qnode->del);
+
+ XFREE (MTYPE_RIB_QUEUE, qnode);
+}
+
+/* initialise zebra rib work queue */
+void
+rib_queue_init (struct zebra_t *zebra)
+{
+ assert (zebra);
+
+ if (! (zebra->ribq = work_queue_new (zebra->master,
+ "zebra_rib_work_queue")))
+ {
+ zlog_err ("rib_queue_init: could not initialise work queue!");
+ return;
+ }
+
+ /* fill in the work queue spec */
+ zebra->ribq->spec.workfunc = (wq_item_status (*) (void *))&rib_process;
+ zebra->ribq->spec.errorfunc = NULL;
+ zebra->ribq->spec.del_item_data = (void (*) (void *)) &rib_queue_qnode_del;
+ /* XXX: TODO: These should be runtime configurable via vty */
+ zebra->ribq->spec.max_retries = 3;
+ zebra->ribq->spec.hold = 500;
+ zebra->ribq->spec.delay = 10;
+
+ return;
}
/* Add RIB to head of the route node. */
rib_addnode (struct route_node *rn, struct rib *rib)
{
struct rib *head;
-
+
+ assert (rib && rn);
+
+ rib_lock (rib);
+ route_lock_node (rn);
+
head = rn->info;
if (head)
head->prev = rib;
void
rib_delnode (struct route_node *rn, struct rib *rib)
{
+ assert (rn && rib);
+
if (rib->next)
rib->next->prev = rib->prev;
if (rib->prev)
rib->prev->next = rib->next;
else
rn->info = rib->next;
+
+ rib_unlock (rib);
+ route_unlock_node (rn);
}
int
for (rib = rn->info; rib; rib = rib->next)
{
if (rib->type == ZEBRA_ROUTE_CONNECT)
- {
- nexthop = rib->nexthop;
+ {
+ nexthop = rib->nexthop;
- /* Duplicate connected route comes in. */
- if (rib->type == type
- && nexthop && nexthop->type == NEXTHOP_TYPE_IFINDEX
- && nexthop->ifindex == ifindex)
- {
- rib->refcnt++;
- return 0 ;
- }
- }
+ /* Duplicate connected route comes in. */
+ if (rib->type == type
+ && nexthop && nexthop->type == NEXTHOP_TYPE_IFINDEX
+ && nexthop->ifindex == ifindex)
+ {
+ rib->refcnt++;
+ return 0 ;
+ }
+ }
else if (rib->type == type)
- {
- same = rib;
- rib_delnode (rn, same);
- route_unlock_node (rn);
- break;
- }
+ {
+ same = rib;
+ break;
+ }
}
/* Allocate new rib structure. */
- rib = XMALLOC (MTYPE_RIB, sizeof (struct rib));
- memset (rib, 0, sizeof (struct rib));
+ rib = XCALLOC (MTYPE_RIB, sizeof (struct rib));
rib->type = type;
rib->distance = distance;
rib->flags = flags;
/* Link new rib to node.*/
rib_addnode (rn, rib);
-
+
/* Process this route node. */
- rib_process (rn, same);
-
+ rib_queue_add (&zebrad, rn, same);
+
/* Free implicit route.*/
if (same)
- newrib_free (same);
-
+ rib_delnode (rn, same);
+
+ route_unlock_node (rn);
return 0;
}
struct route_node *rn;
struct rib *same;
struct nexthop *nexthop;
-
+
/* Lookup table. */
table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
if (! table)
return 0;
-
/* Make it sure prefixlen is applied to the prefix. */
apply_mask_ipv4 (p);
{
if (same->type == rib->type && same->table == rib->table
&& same->type != ZEBRA_ROUTE_CONNECT)
- {
- rib_delnode (rn, same);
- route_unlock_node (rn);
- break;
- }
+ break;
}
-
+
/* If this route is kernel route, set FIB flag to the route. */
if (rib->type == ZEBRA_ROUTE_KERNEL || rib->type == ZEBRA_ROUTE_CONNECT)
for (nexthop = rib->nexthop; nexthop; nexthop = nexthop->next)
rib_addnode (rn, rib);
/* Process this route node. */
- rib_process (rn, same);
+ rib_queue_add (&zebrad, rn, same);
/* Free implicit route.*/
if (same)
- newrib_free (same);
-
+ rib_delnode (rn, same);
+
+ route_unlock_node (rn);
return 0;
}
return ZEBRA_ERR_RTNOEXIST;
}
}
-
- if (same)
- rib_delnode (rn, same);
-
+
/* Process changes. */
- rib_process (rn, same);
+ rib_queue_add (&zebrad, rn, same);
if (same)
- {
- newrib_free (same);
- route_unlock_node (rn);
- }
-
+ rib_delnode (rn, same);
+
route_unlock_node (rn);
-
return 0;
}
\f
case STATIC_IPV4_BLACKHOLE:
nexthop_blackhole_add (rib);
break;
- }
- rib_process (rn, NULL);
+ }
+ rib_queue_add (&zebrad, rn, NULL);
}
else
{
/* This is new static route. */
- rib = XMALLOC (MTYPE_RIB, sizeof (struct rib));
- memset (rib, 0, sizeof (struct rib));
-
+ rib = XCALLOC (MTYPE_RIB, sizeof (struct rib));
+
rib->type = ZEBRA_ROUTE_STATIC;
rib->distance = si->distance;
rib->metric = 0;
rib_addnode (rn, rib);
/* Process this prefix. */
- rib_process (rn, NULL);
+ rib_queue_add (&zebrad, rn, NULL);
}
}
table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
if (! table)
return;
-
+
/* Lookup existing route with type and distance. */
rn = route_node_lookup (table, p);
if (! rn)
/* Check nexthop. */
if (rib->nexthop_num == 1)
{
+ rib_queue_add (&zebrad, rn, rib);
rib_delnode (rn, rib);
- rib_process (rn, rib);
- newrib_free (rib);
- route_unlock_node (rn);
}
else
{
if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
rib_uninstall (rn, rib);
- nexthop_delete (rib, nexthop);
- nexthop_free (nexthop);
- rib_process (rn, rib);
+ rib_queue_add (&zebrad, rn, rib);
}
-
/* Unlock node. */
route_unlock_node (rn);
}
else if (rib->type == type)
{
same = rib;
- rib_delnode (rn, same);
- route_unlock_node (rn);
break;
}
}
/* Allocate new rib structure. */
- rib = XMALLOC (MTYPE_RIB, sizeof (struct rib));
- memset (rib, 0, sizeof (struct rib));
+ rib = XCALLOC (MTYPE_RIB, sizeof (struct rib));
+
rib->type = type;
rib->distance = distance;
rib->flags = flags;
rib_addnode (rn, rib);
/* Process this route node. */
- rib_process (rn, same);
-
+ rib_queue_add (&zebrad, rn, same);
+
/* Free implicit route.*/
if (same)
- newrib_free (same);
-
+ rib_delnode (rn, same);
+
+ route_unlock_node (rn);
return 0;
}
table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
if (! table)
return 0;
-
+
/* Lookup route node. */
rn = route_node_lookup (table, (struct prefix *) p);
if (! rn)
}
}
- if (same)
- rib_delnode (rn, same);
-
/* Process changes. */
- rib_process (rn, same);
+ rib_queue_add (&zebrad, rn, same);
if (same)
- {
- newrib_free (same);
- route_unlock_node (rn);
- }
-
+ rib_delnode (rn, same);
+
route_unlock_node (rn);
-
return 0;
}
\f
nexthop_ipv6_ifname_add (rib, &si->ipv6, si->ifname);
break;
}
- rib_process (rn, NULL);
+ rib_queue_add (&zebrad, rn, NULL);
}
else
{
/* This is new static route. */
- rib = XMALLOC (MTYPE_RIB, sizeof (struct rib));
- memset (rib, 0, sizeof (struct rib));
-
+ rib = XCALLOC (MTYPE_RIB, sizeof (struct rib));
+
rib->type = ZEBRA_ROUTE_STATIC;
rib->distance = si->distance;
rib->metric = 0;
rib_addnode (rn, rib);
/* Process this prefix. */
- rib_process (rn, NULL);
+ rib_queue_add (&zebrad, rn, NULL);
}
}
if (rib->nexthop_num == 1)
{
rib_delnode (rn, rib);
- rib_process (rn, rib);
- newrib_free (rib);
- route_unlock_node (rn);
+ rib_queue_add (&zebrad, rn, rib);
}
else
{
if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
rib_uninstall (rn, rib);
- nexthop_delete (rib, nexthop);
- nexthop_free (nexthop);
- rib_process (rn, rib);
+ rib_queue_add (&zebrad, rn, rib);
}
-
/* Unlock node. */
route_unlock_node (rn);
}
{
struct route_node *rn;
struct route_table *table;
-
+
table = vrf_table (AFI_IP, SAFI_UNICAST, 0);
if (table)
for (rn = route_top (table); rn; rn = route_next (rn))
- rib_process (rn, NULL);
+ if (rn->info)
+ rib_queue_add (&zebrad, rn, NULL);
table = vrf_table (AFI_IP6, SAFI_UNICAST, 0);
if (table)
for (rn = route_top (table); rn; rn = route_next (rn))
- rib_process (rn, NULL);
+ if (rn->info)
+ rib_queue_add (&zebrad, rn, NULL);
}
/* Interface goes up. */
if (rib->table != zebrad.rtm_table_default &&
rib->table != RT_TABLE_MAIN)
- {
- rib_delnode (rn, rib);
- newrib_free (rib);
- route_unlock_node (rn);
- }
+ rib_delnode (rn, rib);
}
}
{
ret = rib_uninstall_kernel (rn, rib);
if (! ret)
- {
- rib_delnode (rn, rib);
- newrib_free (rib);
- route_unlock_node (rn);
- }
+ rib_delnode (rn, rib);
}
}
}
void
rib_init ()
{
+ rib_queue_init (&zebrad);
/* VRF initialization. */
vrf_init ();
}
projects / matthieu / frr.git / commitdiff