commit 5a6508d7269266b4a3ecacdd197ea3514a0c0e28
author John Lo <loj@cisco.com> Tue Oct 03 13:13:47 2017 -0400
committer Florin Coras <florin.coras@gmail.com> Tue Oct 03 18:59:25 2017 +0000
tree 35631094986aaccf4927da10963dea16887aaf2d
parent c6038c91ad0d12945877cdcd451ce27da06a40e9

Update L2FIB entry timestamp only if BD aging enabled (VPP-1002)

Change L2 learning path so it update stale timestamp in MAC entry
only if aging is enabled on the BD for the MAC entry.

Change-Id: I7babe986ceef3c030d8ef9185076c42b405f7b0f
Signed-off-by: John Lo <loj@cisco.com>

src/vnet/buffer.h

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 7dfc6b9..fbefe7c 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -173,6 +173,7 @@
       u8 l2_len;		/* ethernet header length */
       u8 shg;			/* split-horizon group */
       u16 l2fib_sn;		/* l2fib bd/int seq_num */
+      u8 bd_age;		/* aging enabled */
     } l2;
 
     /* l2tpv3 softwire encap, only valid there */

src/vnet/l2/l2_input.c

diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index faed7c7..e556b14 100644
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -225,6 +225,7 @@
       };
       /* *INDENT-ON* */
       vnet_buffer (b0)->l2.l2fib_sn = sn.as_u16;;
+      vnet_buffer (b0)->l2.bd_age = bd_config->mac_age;
 
       /*
        * Process bridge domain feature enables.

src/vnet/l2/l2_learn.c

diff --git a/src/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c
index 066bb54..fddab82 100644
--- a/src/vnet/l2/l2_learn.c
+++ b/src/vnet/l2/l2_learn.c
@@ -126,7 +126,7 @@
       /* Entry in L2FIB with matching sw_if_index matched - normal fast path */
       u32 dtime = timestamp - result0->fields.timestamp;
       u32 dsn = result0->fields.sn.as_u16 - vnet_buffer (b0)->l2.l2fib_sn;
-      u32 check = dtime | dsn;
+      u32 check = (dtime && vnet_buffer (b0)->l2.bd_age) || dsn;
 
       if (PREDICT_TRUE (check == 0))
 	return;			/* MAC entry up to date */
@@ -136,8 +136,9 @@
 	return;			/* Above learn limit - do not update */
 
       /* Limit updates per l2-learn node call to avoid prolonged update burst
-       * as dtime advance over 1 minute mark, unless more than 1 min behind */
-      if ((*count > 2) && (dtime == 1))
+       * as dtime advance over 1 minute mark, unless more than 1 min behind
+       * or SN obsolete */
+      if ((*count > 2) && (dtime == 1) && (dsn == 0))
 	return;
 
       counter_base[L2LEARN_ERROR_HIT_UPDATE] += 1;