IPv6 routing cache configuration update (#2056)

Arto Kinnunen · web-flow · commit 7d8dab4bf10b · 2019-04-11T11:42:06.000+03:00
Add new API to allow IPv6 routing and destination cache
to be configured separately.
diff --git a/nanostack/net_ipv6_api.h b/nanostack/net_ipv6_api.h
@@ -51,6 +51,40 @@ int8_t arm_nwk_ipv6_frag_mru(uint16_t frag_mru);
  */
 int8_t arm_nwk_ipv6_max_cache_entries(uint16_t max_entries);
 
+/**
+ * \brief Configure destination cache.
+ *
+ * Set destination cache maximum entry count, thresholds where amount of entries is kept during operation and lifetime.
+ *
+ * Note: This must be called before arm_nwk_interface_lowpan_init()
+ *
+ * \param max_entries Maximum number of entries allowed in destination cache at any time.
+ * \param short_term_threshold Amount of cache entries kept in memory in short term. Must be less than max_entries.
+ * \param long_term_threshold Amount of entries kept in memory over long period of time. Must be less than short_term_threshold.
+ * \param lifetime Lifetime of cache entry, must be over 120 seconds
+ *
+ * \return 0 Change OK.
+ * \return <0 Change invalid - unable to change the maximum for cache.
+ */
+int8_t arm_nwk_ipv6_destination_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime);
+
+/**
+ * \brief Configure neighbour cache.
+ *
+ * Set neighbour cache maximum entry count, thresholds where amount of entries is kept during operation and lifetime.
+ *
+ * Note: This must be called before arm_nwk_interface_lowpan_init()
+ *
+ * \param max_entries Maximum number of entries allowed in neighbour cache at any time.
+ * \param short_term_threshold Amount of cache entries kept in memory in short term. Must be less than max_entries.
+ * \param long_term_threshold Amount of entries kept in memory over long period of time. Must be less than short_term_threshold.
+ * \param lifetime Lifetime of cache entry, must be over 120 seconds
+ *
+ * \return 0 Change OK.
+ * \return <0 Change invalid - unable to change the maximum for cache.
+ */
+int8_t arm_nwk_ipv6_neighbour_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime);
+
 /**
  * \brief Configure automatic flow label calculation.
  *
diff --git a/source/ipv6_stack/ipv6_routing_table.c b/source/ipv6_stack/ipv6_routing_table.c
@@ -52,14 +52,40 @@
 #define NCACHE_GC_PERIOD    20  /* seconds */
 #define DCACHE_GC_PERIOD    20  /* seconds */
 
-static uint16_t current_max_cache = 64;
+/* Neighbour Cache garbage collection parameters (per interface) */
+/* Parameters only for garbage-collectible entries; registered entries counted separately */
+#define NCACHE_MAX_LONG_TERM    8   /* Target for basic GC - expire old entries if more than this */
+#define NCACHE_MAX_SHORT_TERM   32  /* Expire stale entries if more than this */
+#define NCACHE_MAX_ABSOLUTE     64  /* Never have more than this */
+#define NCACHE_GC_AGE           600 /* 10 minutes (1s units - decremented every slow timer call) */
+
+/* Destination Cache garbage collection parameters (system-wide) */
+#define DCACHE_MAX_LONG_TERM    16
+#define DCACHE_MAX_SHORT_TERM   40
+#define DCACHE_MAX_ABSOLUTE     64 /* Never have more than this */
+#define DCACHE_GC_AGE           (30 * DCACHE_GC_PERIOD)    /* 10 minutes */
+
+typedef struct destination_cache_configuration_s {
+    uint16_t max_entries;  // Never have more than this
+    uint16_t short_term_entries; // Expire stale entries if more than this
+    uint16_t long_term_entries; // Target for basic GC - expire old entries if more than this
+    uint16_t entry_lifetime;  // 20s units - decremented once per periodic GC
+} destination_cache_config_t;
+
+typedef struct neighbour_cache_configuration_s {
+    uint16_t max_entries; // Never have more than this
+    uint16_t short_term_entries; // Expire stale entries if more than this
+    uint16_t long_term_entries; // Target for basic GC - expire old entries if more than this
+    uint16_t entry_lifetime; // 1s units - decremented every slow timer call
+} neighbour_cache_config_t;
+
+static destination_cache_config_t destination_cache_config = {DCACHE_MAX_ABSOLUTE, DCACHE_MAX_SHORT_TERM, DCACHE_MAX_LONG_TERM, DCACHE_GC_AGE};
+static neighbour_cache_config_t neighbour_cache_config = {NCACHE_MAX_ABSOLUTE, NCACHE_MAX_SHORT_TERM, NCACHE_MAX_LONG_TERM, NCACHE_GC_AGE};
 
 /* We track "lifetime" of garbage-collectible entries, resetting
  * when used. Entries with lifetime 0 are favoured
  * for garbage-collection. */
-#define NCACHE_GC_AGE 600   /* 10 minutes (1s units - decremented every slow timer call) */
-#define DCACHE_GC_AGE 30    /* 10 minutes (20s units - decremented once per periodic GC) */
-#define DCACHE_GC_AGE_LL 6  /* 2 minutes for link-local destinations */
+#define DCACHE_GC_AGE_LL (120 / DCACHE_GC_PERIOD)  /* 2 minutes for link-local destinations, in DCACHE_GC_PERIOD intervals */
 
 /* For probable routers, consider them unreachable if ETX is greater than this */
 #define ETX_REACHABILITY_THRESHOLD 0x200    /* 8.8 fixed-point, so 2 */
@@ -79,27 +105,6 @@ static uint8_t ipv6_route_table_get_max_entries(int8_t interface_id, ipv6_route_
 
 static uint16_t dcache_gc_timer;
 
-static uint16_t cache_long_term(bool is_destination)
-{
-    uint16_t value = current_max_cache / 8;
-    if (is_destination) {
-        value *= 2;
-    }
-    if (value < 4) {
-        value = 4;
-    }
-    return value;
-}
-
-static uint16_t cache_short_term(bool is_destination)
-{
-    uint16_t value = current_max_cache / 2;
-    if (value < cache_long_term(is_destination)) {
-        return cache_long_term(is_destination);
-    }
-    return value;
-}
-
 static uint32_t next_probe_time(ipv6_neighbour_cache_t *cache, uint_fast8_t retrans_num)
 {
     uint32_t t = cache->retrans_timer;
@@ -120,7 +125,57 @@ int8_t ipv6_neighbour_set_current_max_cache(uint16_t max_cache)
     if (max_cache < 4) {
         return -1;
     }
-    current_max_cache = max_cache;
+
+    // adjust destination cache
+    destination_cache_config.max_entries = max_cache;
+    destination_cache_config.long_term_entries = max_cache / 4;
+    if (destination_cache_config.long_term_entries < 4) {
+        destination_cache_config.long_term_entries = 4;
+    }
+    destination_cache_config.short_term_entries = max_cache / 2;
+    if (destination_cache_config.short_term_entries < destination_cache_config.long_term_entries) {
+        destination_cache_config.short_term_entries = destination_cache_config.long_term_entries;
+    }
+
+    // adjust neighbour cache
+    neighbour_cache_config.max_entries = max_cache;
+    neighbour_cache_config.long_term_entries = max_cache / 8;
+    if (neighbour_cache_config.long_term_entries < 4) {
+        neighbour_cache_config.long_term_entries = 4;
+    }
+    neighbour_cache_config.short_term_entries = max_cache / 4;
+    if (neighbour_cache_config.short_term_entries < neighbour_cache_config.long_term_entries) {
+        neighbour_cache_config.short_term_entries = neighbour_cache_config.long_term_entries;
+    }
+
+    return 0;
+}
+
+int8_t ipv6_destination_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime)
+{
+    if ((max_entries < 4) || (short_term_threshold >= max_entries) || (long_term_threshold >= short_term_threshold) || (lifetime < 120)) {
+        return -1;
+    }
+
+    destination_cache_config.max_entries = max_entries;
+    destination_cache_config.short_term_entries = short_term_threshold;
+    destination_cache_config.long_term_entries = long_term_threshold;
+    destination_cache_config.entry_lifetime = lifetime;
+
+    return 0;
+}
+
+int8_t ipv6_neighbour_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime)
+{
+    if ((max_entries < 4) || (short_term_threshold >= max_entries) || (long_term_threshold >= short_term_threshold) || (lifetime < 120)) {
+        return -1;
+    }
+
+    neighbour_cache_config.max_entries = max_entries;
+    neighbour_cache_config.short_term_entries = short_term_threshold;
+    neighbour_cache_config.long_term_entries = long_term_threshold;
+    neighbour_cache_config.entry_lifetime = lifetime;
+
     return 0;
 }
 
@@ -260,7 +315,7 @@ ipv6_neighbour_t *ipv6_neighbour_lookup_or_create(ipv6_neighbour_cache_t *cache,
         }
     }
 
-    if (count >= current_max_cache) {
+    if (count >= neighbour_cache_config.max_entries) {
         entry = ns_list_get_last(&cache->list);
         ipv6_neighbour_entry_remove(cache, entry);
     }
@@ -311,7 +366,7 @@ ipv6_neighbour_t *ipv6_neighbour_used(ipv6_neighbour_cache_t *cache, ipv6_neighb
 {
     /* Reset the GC life, if it's a GC entry */
     if (entry->type == IP_NEIGHBOUR_GARBAGE_COLLECTIBLE) {
-        entry->lifetime = NCACHE_GC_AGE;
+        entry->lifetime = neighbour_cache_config.entry_lifetime;
     }
 
     /* Move it to the front of the list */
@@ -653,7 +708,7 @@ static void ipv6_neighbour_cache_gc_periodic(ipv6_neighbour_cache_t *cache)
         }
     }
 
-    if (gc_count <= cache_long_term(false)) {
+    if (gc_count <= neighbour_cache_config.long_term_entries) {
         return;
     }
 
@@ -669,9 +724,9 @@ static void ipv6_neighbour_cache_gc_periodic(ipv6_neighbour_cache_t *cache)
             continue;
         }
 
-        if (entry->lifetime == 0 || gc_count > cache_short_term(false)) {
+        if (entry->lifetime == 0 || gc_count > neighbour_cache_config.short_term_entries) {
             ipv6_neighbour_entry_remove(cache, entry);
-            if (--gc_count <= cache_long_term(false)) {
+            if (--gc_count <= neighbour_cache_config.long_term_entries) {
                 break;
             }
         }
@@ -876,7 +931,7 @@ ipv6_destination_t *ipv6_destination_lookup_or_create(const uint8_t *address, in
 
 
     if (!entry) {
-        if (count > current_max_cache) {
+        if (count > destination_cache_config.max_entries) {
             entry = ns_list_get_last(&ipv6_destination_cache);
             ns_list_remove(&ipv6_destination_cache, entry);
             ipv6_destination_release(entry);
@@ -915,7 +970,7 @@ ipv6_destination_t *ipv6_destination_lookup_or_create(const uint8_t *address, in
     if (addr_ipv6_scope(address, NULL) <= IPV6_SCOPE_LINK_LOCAL) {
         entry->lifetime = DCACHE_GC_AGE_LL;
     } else {
-        entry->lifetime = DCACHE_GC_AGE;
+        entry->lifetime = destination_cache_config.entry_lifetime / DCACHE_GC_PERIOD;
     }
 
     return entry;
@@ -1048,7 +1103,7 @@ static void ipv6_destination_cache_gc_periodic(void)
 #endif
     }
 
-    if (gc_count <= cache_long_term(true)) {
+    if (gc_count <= destination_cache_config.long_term_entries) {
         return;
     }
 
@@ -1058,10 +1113,10 @@ static void ipv6_destination_cache_gc_periodic(void)
      * MAX_LONG_TERM.
      */
     ns_list_foreach_reverse_safe(ipv6_destination_t, entry, &ipv6_destination_cache) {
-        if (entry->lifetime == 0 || gc_count > cache_short_term(true)) {
+        if (entry->lifetime == 0 || gc_count > destination_cache_config.short_term_entries) {
             ns_list_remove(&ipv6_destination_cache, entry);
             ipv6_destination_release(entry);
-            if (--gc_count <= cache_long_term(true)) {
+            if (--gc_count <= destination_cache_config.long_term_entries) {
                 break;
             }
         }
diff --git a/source/ipv6_stack/ipv6_routing_table.h b/source/ipv6_stack/ipv6_routing_table.h
@@ -171,8 +171,9 @@ extern void ipv6_neighbour_cache_fast_timer(ipv6_neighbour_cache_t *cache, uint1
 extern void ipv6_neighbour_cache_slow_timer(ipv6_neighbour_cache_t *cache, uint8_t seconds);
 extern void ipv6_neighbour_cache_print(const ipv6_neighbour_cache_t *cache, route_print_fn_t *print_fn);
 extern void ipv6_router_gone(ipv6_neighbour_cache_t *cache, ipv6_neighbour_t *entry);
-
 extern int8_t ipv6_neighbour_set_current_max_cache(uint16_t max_cache);
+extern int8_t ipv6_destination_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime);
+extern int8_t ipv6_neighbour_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime);
 
 /* Backwards compatibility with test app */
 #define ROUTE_RPL_UP ROUTE_RPL_DIO
diff --git a/source/libNET/src/net_ipv6.c b/source/libNET/src/net_ipv6.c
@@ -43,6 +43,16 @@ int8_t arm_nwk_ipv6_max_cache_entries(uint16_t max_entries)
     return ipv6_neighbour_set_current_max_cache(max_entries);
 }
 
+int8_t arm_nwk_ipv6_destination_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime)
+{
+    return ipv6_destination_cache_configure(max_entries, short_term_threshold, long_term_threshold, lifetime);
+}
+
+int8_t arm_nwk_ipv6_neighbour_cache_configure(uint16_t max_entries, uint16_t short_term_threshold, uint16_t long_term_threshold, uint16_t lifetime)
+{
+    return ipv6_neighbour_cache_configure(max_entries, short_term_threshold, long_term_threshold, lifetime);
+}
+
 void arm_nwk_ipv6_auto_flow_label(bool auto_flow_label)
 {
     ipv6_flow_auto_label = auto_flow_label;
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp
@@ -35,3 +35,18 @@ TEST(ipv6_routing_table, test_ipv6_route_table_set_max_entries)
 {
     CHECK(test_ipv6_route_table_set_max_entries());
 }
+
+TEST(ipv6_routing_table, test_ipv6_neighbour_set_current_max_cache)
+{
+    CHECK(test_ipv6_neighbour_set_current_max_cache());
+}
+
+TEST(ipv6_routing_table, test_ipv6_destination_cache_configure)
+{
+    CHECK(test_ipv6_destination_cache_configure());
+}
+
+TEST(ipv6_routing_table, test_ipv6_neighbour_cache_configure)
+{
+    CHECK(test_ipv6_neighbour_cache_configure());
+}
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c
@@ -70,3 +70,96 @@ bool test_ipv6_route_table_set_max_entries()
 
     return true;
 }
+
+bool test_ipv6_neighbour_set_current_max_cache()
+{
+    int8_t ret_val;
+
+    // max_cache invalid
+    ret_val = ipv6_neighbour_set_current_max_cache(0);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    ret_val = ipv6_neighbour_set_current_max_cache(4);
+    if (ret_val != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool test_ipv6_destination_cache_configure()
+{
+    int8_t ret_val;
+
+    // max_entries invalid
+    ret_val = ipv6_destination_cache_configure(0, 20, 10, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // short term > max_entries
+    ret_val = ipv6_destination_cache_configure(100, 120, 10, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // long_term > short term
+    ret_val = ipv6_destination_cache_configure(100, 20, 30, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // invalid lifetime
+    ret_val = ipv6_destination_cache_configure(100, 20, 10, 0);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // OK case
+    ret_val = ipv6_destination_cache_configure(100, 20, 10, 600);
+    if (ret_val != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+bool test_ipv6_neighbour_cache_configure()
+{
+    int8_t ret_val;
+
+    // max_entries invalid
+    ret_val = ipv6_neighbour_cache_configure(0, 20, 10, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // short term > max_entries
+    ret_val = ipv6_destination_cache_configure(100, 120, 10, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // long_term > short term
+    ret_val = ipv6_neighbour_cache_configure(100, 20, 30, 200);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // invalid lifetime
+    ret_val = ipv6_neighbour_cache_configure(100, 20, 10, 0);
+    if (ret_val == 0) {
+        return false;
+    }
+
+    // OK case
+    ret_val = ipv6_neighbour_cache_configure(100, 20, 10, 600);
+    if (ret_val != 0) {
+        return false;
+    }
+
+    return true;
+}
+
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h
diff --git a/test/nanostack/unittest/stub/ipv6_routing_table_stub.c b/test/nanostack/unittest/stub/ipv6_routing_table_stub.c
