zebra: Modify lsp processing to be invoked as needed

LSP processing was a zvrf flag based upon a connected route
coming or going.  But this did not allow us to know
that we should do lsp processing other than after the meta-queue
processing was finished.

Eventually we moved meta-queue processing of do_nht_processing
to after the dataplane sent the main pthread some results.
This of course left us with a timing hole where if a connected
route came in and we received a data plane response *before*
the meta queue was processed we would not do the work as necessary.

Move the lsp processing to a flag off of the rib_dest_t. If it
is marked then we need to process lsps.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

1 files changed, 23 insertions, 10 deletions

diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h
index f8c6c794a..3a131e1aa 100644
--- a/zebra/zebra_mpls.h
+++ b/zebra/zebra_mpls.h
@@ -510,28 +510,41 @@ static inline const char *nhlfe_type2str(enum lsp_types_t lsp_type)
 	return "Unknown";
 }
 
-static inline void mpls_mark_lsps_for_processing(struct zebra_vrf *zvrf)
+static inline void mpls_mark_lsps_for_processing(struct zebra_vrf *zvrf,
+						 struct prefix *p)
 {
+	struct route_table *table;
+	struct route_node *rn;
+	rib_dest_t *dest;
+
 	if (!zvrf)
 		return;
 
-	zvrf->mpls_flags |= MPLS_FLAG_SCHEDULE_LSPS;
+	table = zvrf->table[family2afi(p->family)][SAFI_UNICAST];
+	if (!table)
+		return;
+
+	rn = route_node_match(table, p);
+	if (!rn)
+		return;
+
+
+	dest = rib_dest_from_rnode(rn);
+	SET_FLAG(dest->flags, RIB_DEST_UPDATE_LSPS);
 }
 
-static inline void mpls_unmark_lsps_for_processing(struct zebra_vrf *zvrf)
+static inline void mpls_unmark_lsps_for_processing(struct route_node *rn)
 {
-	if (!zvrf)
-		return;
+	rib_dest_t *dest = rib_dest_from_rnode(rn);
 
-	zvrf->mpls_flags &= ~MPLS_FLAG_SCHEDULE_LSPS;
+	UNSET_FLAG(dest->flags, RIB_DEST_UPDATE_LSPS);
 }
 
-static inline int mpls_should_lsps_be_processed(struct zebra_vrf *zvrf)
+static inline int mpls_should_lsps_be_processed(struct route_node *rn)
 {
-	if (!zvrf)
-		return 0;
+	rib_dest_t *dest = rib_dest_from_rnode(rn);
 
-	return ((zvrf->mpls_flags & MPLS_FLAG_SCHEDULE_LSPS) ? 1 : 0);
+	return !!CHECK_FLAG(dest->flags, RIB_DEST_UPDATE_LSPS);
 }
 
 /* Global variables. */