zebra: print unknown rule family as number

[mirror_frr.git] / zebra / zebra_dplane.c

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index e4002252d3a173bf0478d17ebd98ccbdf8ecd69e..bf1ba522a37fb6ead27900b5e5a34ec2f3bc37b7 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -73,7 +73,7 @@ struct dplane_nexthop_info {
        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];
@@ -1023,6 +1023,11 @@ uint8_t dplane_ctx_get_old_distance(const struct zebra_dplane_ctx *ctx)
        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);
@@ -1031,7 +1036,7 @@ void dplane_ctx_set_nexthops(struct zebra_dplane_ctx *ctx, struct nexthop *nh)
                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(
@@ -1077,10 +1082,10 @@ vrf_id_t dplane_ctx_get_nhe_vrf_id(const struct zebra_dplane_ctx *ctx)
        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 *
@@ -1161,7 +1166,8 @@ zebra_nhlfe_t *dplane_ctx_add_nhlfe(struct zebra_dplane_ctx *ctx,
                                    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;
 
@@ -1169,7 +1175,7 @@ zebra_nhlfe_t *dplane_ctx_add_nhlfe(struct zebra_dplane_ctx *ctx,
 
        nhlfe = zebra_mpls_lsp_add_nhlfe(&(ctx->u.lsp),
                                         lsp_type, nh_type, gate,
-                                        ifindex, out_label);
+                                        ifindex, num_labels, out_labels);
 
        return nhlfe;
 }
@@ -1507,7 +1513,8 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx,
        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))
@@ -1526,7 +1533,7 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx,
        dplane_ctx_ns_init(ctx, zns, (op == DPLANE_OP_ROUTE_UPDATE));
 
 #ifdef HAVE_NETLINK
-       if (re->nhe_id && zns->supports_nh) {
+       if (re->nhe_id) {
                struct nhg_hash_entry *nhe =
                        zebra_nhg_resolve(zebra_nhg_lookup_id(re->nhe_id));
 
@@ -1534,8 +1541,13 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx,
                /*
                 * 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 (!CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED)
+               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;
@@ -1568,6 +1580,7 @@ static int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
                                   enum dplane_op_e op,
                                   struct nhg_hash_entry *nhe)
 {
+       struct zebra_vrf *zvrf = NULL;
        struct zebra_ns *zns = NULL;
 
        int ret = EINVAL;
@@ -1582,7 +1595,7 @@ static int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
        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);
 
@@ -1592,12 +1605,13 @@ static int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
                ctx->u.rinfo.nhe.nh_grp_count = zebra_nhg_nhe2grp(
                        ctx->u.rinfo.nhe.nh_grp, nhe, MULTIPATH_NUM);
 
-       zns = ((struct zebra_vrf *)vrf_info_lookup(nhe->vrf_id))->zns;
+       zvrf = vrf_info_lookup(nhe->vrf_id);
 
-       if (!zns->supports_nh) {
-               ret = EOPNOTSUPP;
-               goto done;
-       }
+       /*
+        * 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
@@ -1653,7 +1667,8 @@ static int dplane_ctx_lsp_init(struct zebra_dplane_ctx *ctx,
                                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;
@@ -1739,7 +1754,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx,
 
                        if (re)
                                copy_nexthops(&(ctx->u.pw.nhg.nexthop),
-                                             re->ng->nexthop, NULL);
+                                             re->nhe->nhg->nexthop, NULL);
 
                        route_unlock_node(rn);
                }
@@ -1835,7 +1850,7 @@ dplane_route_update_internal(struct route_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 */
                }
 
@@ -1896,12 +1911,8 @@ done:
        if (ret == AOK)
                result = ZEBRA_DPLANE_REQUEST_QUEUED;
        else {
-               if (ret == EOPNOTSUPP)
-                       result = ZEBRA_DPLANE_REQUEST_SUCCESS;
-               else
-                       atomic_fetch_add_explicit(
-                               &zdplane_info.dg_nexthop_errors, 1,
-                               memory_order_relaxed);
+               atomic_fetch_add_explicit(&zdplane_info.dg_nexthop_errors, 1,
+                                         memory_order_relaxed);
                if (ctx)
                        dplane_ctx_free(&ctx);
        }
@@ -2078,6 +2089,8 @@ enum zebra_dplane_result dplane_nexthop_add(struct nhg_hash_entry *nhe)
 
 /*
  * 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)
 {
@@ -2500,7 +2513,7 @@ enum zebra_dplane_result dplane_neigh_add(const struct interface *ifp,
        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;
 }
@@ -2806,6 +2819,7 @@ int dplane_provider_register(const char *name,
        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;
@@ -3747,7 +3761,9 @@ void zebra_dplane_shutdown(void)
 
        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);