uint32_t id;
afi_t afi;
vrf_id_t vrf_id;
- bool is_kernel_nh;
+ int type;
struct nexthop_group ng;
struct nh_grp nh_grp[MULTIPATH_NUM];
return ctx->u.rinfo.zd_old_distance;
}
+/*
+ * Set the nexthops associated with a context: note that processing code
+ * may well expect that nexthops are in canonical (sorted) order, so we
+ * will enforce that here.
+ */
void dplane_ctx_set_nexthops(struct zebra_dplane_ctx *ctx, struct nexthop *nh)
{
DPLANE_CTX_VALID(ctx);
nexthops_free(ctx->u.rinfo.zd_ng.nexthop);
ctx->u.rinfo.zd_ng.nexthop = NULL;
}
- copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop), nh, NULL);
+ nexthop_group_copy_nh_sorted(&(ctx->u.rinfo.zd_ng), nh);
}
const struct nexthop_group *dplane_ctx_get_ng(
return ctx->u.rinfo.nhe.vrf_id;
}
-bool dplane_ctx_get_nhe_is_kernel_nh(const struct zebra_dplane_ctx *ctx)
+int dplane_ctx_get_nhe_type(const struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
- return ctx->u.rinfo.nhe.is_kernel_nh;
+ return ctx->u.rinfo.nhe.type;
}
const struct nexthop_group *
enum nexthop_types_t nh_type,
union g_addr *gate,
ifindex_t ifindex,
- mpls_label_t out_label)
+ uint8_t num_labels,
+ mpls_label_t out_labels[])
{
zebra_nhlfe_t *nhlfe;
nhlfe = zebra_mpls_lsp_add_nhlfe(&(ctx->u.lsp),
lsp_type, nh_type, gate,
- ifindex, out_label);
+ ifindex, num_labels, out_labels);
return nhlfe;
}
ctx->u.rinfo.zd_safi = info->safi;
/* Copy nexthops; recursive info is included too */
- copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop), re->ng->nexthop, NULL);
+ copy_nexthops(&(ctx->u.rinfo.zd_ng.nexthop),
+ re->nhe->nhg->nexthop, NULL);
/* Ensure that the dplane's nexthops flags are clear. */
for (ALL_NEXTHOPS(ctx->u.rinfo.zd_ng, nexthop))
zns = zvrf->zns;
dplane_ctx_ns_init(ctx, zns, (op == DPLANE_OP_ROUTE_UPDATE));
- if (re->nhe_id && zns->supports_nh)
- ctx->u.rinfo.nhe.id = re->nhe_id;
+#ifdef HAVE_NETLINK
+ if (re->nhe_id) {
+ struct nhg_hash_entry *nhe =
+ zebra_nhg_resolve(zebra_nhg_lookup_id(re->nhe_id));
+
+ ctx->u.rinfo.nhe.id = nhe->id;
+ /*
+ * Check if the nhe is installed/queued before doing anything
+ * with this route.
+ *
+ * If its a delete we only use the prefix anyway, so this only
+ * matters for INSTALL/UPDATE.
+ */
+ if (((op == DPLANE_OP_ROUTE_INSTALL)
+ || (op == DPLANE_OP_ROUTE_UPDATE))
+ && !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED)
+ && !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_QUEUED)) {
+ ret = ENOENT;
+ goto done;
+ }
+ }
+#endif /* HAVE_NETLINK */
/* Trying out the sequence number idea, so we can try to detect
* when a result is stale.
enum dplane_op_e op,
struct nhg_hash_entry *nhe)
{
+ struct zebra_vrf *zvrf = NULL;
struct zebra_ns *zns = NULL;
int ret = EINVAL;
ctx->u.rinfo.nhe.id = nhe->id;
ctx->u.rinfo.nhe.afi = nhe->afi;
ctx->u.rinfo.nhe.vrf_id = nhe->vrf_id;
- ctx->u.rinfo.nhe.is_kernel_nh = nhe->is_kernel_nh;
+ ctx->u.rinfo.nhe.type = nhe->type;
nexthop_group_copy(&(ctx->u.rinfo.nhe.ng), nhe->nhg);
- if (!zebra_nhg_depends_is_empty(nhe)) {
- struct nhg_connected *rb_node_dep = NULL;
- uint8_t i = 0;
+ /* If its a group, convert it to a grp array of ids */
+ if (!zebra_nhg_depends_is_empty(nhe)
+ && !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_RECURSIVE))
+ ctx->u.rinfo.nhe.nh_grp_count = zebra_nhg_nhe2grp(
+ ctx->u.rinfo.nhe.nh_grp, nhe, MULTIPATH_NUM);
- // TODO: This doesn't work with depends being recursive
- // resolved nh's as well. Yea, good luck future stephen
- // this one...
+ zvrf = vrf_info_lookup(nhe->vrf_id);
- RB_FOREACH (rb_node_dep, nhg_connected_head,
- &nhe->nhg_depends) {
- ctx->u.rinfo.nhe.nh_grp[i].id = rb_node_dep->nhe->id;
- /* We aren't using weights for anything right now */
- ctx->u.rinfo.nhe.nh_grp[i].weight = 0;
- i++;
- }
- ctx->u.rinfo.nhe.nh_grp_count = i;
- }
-
- /* Extract ns info - can't use pointers to 'core'
- structs */
- zns = ((struct zebra_vrf *)vrf_info_lookup(nhe->vrf_id))->zns;
+ /*
+ * Fallback to default namespace if the vrf got ripped out from under
+ * us.
+ */
+ zns = zvrf ? zvrf->zns : zebra_ns_lookup(NS_DEFAULT);
- // TODO: Might not need to mark this as an update, since
- // it probably won't require two messages
+ /*
+ * TODO: Might not need to mark this as an update, since
+ * it probably won't require two messages
+ */
dplane_ctx_ns_init(ctx, zns, (op == DPLANE_OP_NH_UPDATE));
ret = AOK;
nhlfe->nexthop->type,
&(nhlfe->nexthop->gate),
nhlfe->nexthop->ifindex,
- nhlfe->nexthop->nh_label->label[0]);
+ nhlfe->nexthop->nh_label->num_labels,
+ nhlfe->nexthop->nh_label->label);
if (new_nhlfe == NULL || new_nhlfe->nexthop == NULL) {
ret = ENOMEM;
if (re)
copy_nexthops(&(ctx->u.pw.nhg.nexthop),
- re->ng->nexthop, NULL);
+ re->nhe->nhg->nexthop, NULL);
route_unlock_node(rn);
}
* We'll need these to do per-nexthop deletes.
*/
copy_nexthops(&(ctx->u.rinfo.zd_old_ng.nexthop),
- old_re->ng.nexthop, NULL);
+ old_re->nhe->nhg->nexthop, NULL);
#endif /* !HAVE_NETLINK */
}
if (ret == AOK)
result = ZEBRA_DPLANE_REQUEST_QUEUED;
else {
- atomic_fetch_add_explicit(&zdplane_info.dg_route_errors, 1,
- memory_order_relaxed);
+ if (ret == ENOENT)
+ result = ZEBRA_DPLANE_REQUEST_SUCCESS;
+ else
+ atomic_fetch_add_explicit(&zdplane_info.dg_route_errors,
+ 1, memory_order_relaxed);
if (ctx)
dplane_ctx_free(&ctx);
}
}
ret = dplane_ctx_nexthop_init(ctx, op, nhe);
- if (ret == AOK) {
+ if (ret == AOK)
ret = dplane_update_enqueue(ctx);
- }
+
done:
/* Update counter */
atomic_fetch_add_explicit(&zdplane_info.dg_nexthops_in, 1,
/*
* Enqueue a nexthop update for the dataplane.
+ *
+ * Might not need this func since zebra's nexthop objects should be immutable?
*/
enum zebra_dplane_result dplane_nexthop_update(struct nhg_hash_entry *nhe)
{
enum zebra_dplane_result result = ZEBRA_DPLANE_REQUEST_FAILURE;
result = neigh_update_internal(DPLANE_OP_NEIGH_INSTALL,
- ifp, mac, ip, flags, 0);
+ ifp, mac, ip, flags, DPLANE_NUD_NOARP);
return result;
}
TAILQ_INIT(&(p->dp_ctx_in_q));
TAILQ_INIT(&(p->dp_ctx_out_q));
+ p->dp_flags = flags;
p->dp_priority = prio;
p->dp_fp = fp;
p->dp_start = start_fp;
zdplane_info.dg_run = false;
- THREAD_OFF(zdplane_info.dg_t_update);
+ if (zdplane_info.dg_t_update)
+ thread_cancel_async(zdplane_info.dg_t_update->master,
+ &zdplane_info.dg_t_update, NULL);
frr_pthread_stop(zdplane_info.dg_pthread, NULL);
projects / mirror_frr.git / blobdiff