Prioritise thread control messages (ARMmbed#1984)

Author: deepakvenugopal

source/6LoWPAN/Thread/thread_config.h

@@ -247,7 +247,7 @@
  * value for better performance.
  */
 #define THREAD_INDIRECT_BIG_PACKETS_TOTAL 10
-#define THREAD_INDIRECT_SMALL_PACKETS_PER_CHILD 2
+#define THREAD_INDIRECT_SMALL_PACKETS_PER_CHILD 3
 
 /**
  * Maximum number of MTD children, default 16

source/6LoWPAN/adaptation_interface.c

@@ -40,6 +40,8 @@
 #include "6LoWPAN/IPHC_Decode/iphc_decompress.h"
 #include "lowpan_adaptation_interface.h"
 #include "MLE/mle.h"
+#include "Service_Libs/mle_service/mle_service_api.h"
+#include "Common_Protocols/icmpv6.h"
 #ifdef HAVE_RPL
 #include "RPL/rpl_data.h"
 #endif
@@ -787,49 +789,110 @@ static fragmenter_tx_entry_t *lowpan_adaptation_indirect_first_cached_request_ge
     return NULL;
 }
 
-static void lowpan_adaptation_make_room_for_small_packet(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, mac_neighbor_table_entry_t *neighbour_to_count)
+static bool lowpan_adaptation_is_priority_message(buffer_t *buf)
+{
+    // Mle messages
+    if (buf->dst_sa.port == MLE_ALLOCATED_PORT || buf->src_sa.port == MLE_ALLOCATED_PORT) {
+        return true;
+    }
+
+    // Management messages: address solicit, response, query, notification
+    if (buf->dst_sa.port  == THREAD_MANAGEMENT_PORT || buf->src_sa.port == THREAD_MANAGEMENT_PORT) {
+        return true;
+    }
+
+    // dhcp messages
+    if (buf->dst_sa.port == DHCPV6_SERVER_PORT || buf->src_sa.port == DHCPV6_SERVER_PORT) {
+        return true;
+    }
+
+    if (buf->dst_sa.port == DHCPV6_CLIENT_PORT || buf->src_sa.port == DHCPV6_CLIENT_PORT) {
+        return true;
+    }
+
+    // ICMPv6 messages
+    if (buf->options.type == ICMPV6_TYPE_ERROR_DESTINATION_UNREACH ||
+            buf->options.type == ICMPV6_TYPE_ERROR_PACKET_TOO_BIG ||
+            buf->options.type == ICMPV6_TYPE_ERROR_TIME_EXCEEDED ||
+            buf->options.type == ICMPV6_TYPE_ERROR_PARAMETER_PROBLEM) {
+        return true;
+    }
+    return false;
+}
+
+static bool lowpan_adaptation_make_room_for_small_packet(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, mac_neighbor_table_entry_t *neighbour_to_count, fragmenter_tx_entry_t *new_entry)
 {
     if (interface_ptr->max_indirect_small_packets_per_child == 0) {
-        return;
+        return false;
     }
 
     uint_fast16_t count = 0;
+    fragmenter_tx_entry_t *low_priority_msg_ptr = NULL;
 
     ns_list_foreach_reverse_safe(fragmenter_tx_entry_t, tx_entry, &interface_ptr->indirect_tx_queue) {
         mac_neighbor_table_entry_t *tx_neighbour = mac_neighbor_table_address_discover(mac_neighbor_info(cur), tx_entry->buf->dst_sa.address + 2, tx_entry->buf->dst_sa.addr_type);
         if (tx_neighbour == neighbour_to_count && buffer_data_length(tx_entry->buf) <= interface_ptr->indirect_big_packet_threshold) {
+            if (!lowpan_adaptation_is_priority_message(tx_entry->buf)) {
+                // if there is sub priorities inside message example age here you could compare
+                low_priority_msg_ptr = tx_entry;
+            }
             if (++count >= interface_ptr->max_indirect_small_packets_per_child) {
-                tr_debug_extra("Purge seq: %d", tx_entry->buf->seq);
-                if (lowpan_adaptation_indirect_queue_free_message(cur, interface_ptr, tx_entry) == false) {
+                if (!low_priority_msg_ptr) {
+                    // take last entry if no low priority entry found
+                    if (lowpan_adaptation_is_priority_message(new_entry->buf)) {
+                        low_priority_msg_ptr = tx_entry;
+                    } else {
+                        return false;
+                    }
+                }
+                tr_debug_extra("Purge seq: %d", low_priority_msg_ptr->buf->seq);
+                if (lowpan_adaptation_indirect_queue_free_message(cur, interface_ptr, low_priority_msg_ptr) == false) {
                     /* entry could not be purged from mac, try next entry */
                     tr_debug_extra("Purge failed, try next");
                     count--;
                 }
+                low_priority_msg_ptr = NULL;
             }
         }
     }
+    return true;
 }
 
-static void lowpan_adaptation_make_room_for_big_packet(struct protocol_interface_info_entry *cur, fragmenter_interface_t *interface_ptr)
+static bool lowpan_adaptation_make_room_for_big_packet(struct protocol_interface_info_entry *cur, fragmenter_interface_t *interface_ptr, fragmenter_tx_entry_t *new_entry)
 {
     if (interface_ptr->max_indirect_big_packets_total == 0) {
-        return;
+        return false;
     }
 
     uint_fast16_t count = 0;
+    fragmenter_tx_entry_t *low_priority_msg_ptr = NULL;
 
     ns_list_foreach_reverse_safe(fragmenter_tx_entry_t, tx_entry, &interface_ptr->indirect_tx_queue) {
         if (buffer_data_length(tx_entry->buf) > interface_ptr->indirect_big_packet_threshold) {
+            if (!lowpan_adaptation_is_priority_message(tx_entry->buf)) {
+                // if there is sub priorities inside message example age here you could compare
+                low_priority_msg_ptr = tx_entry;
+            }
             if (++count >= interface_ptr->max_indirect_big_packets_total) {
-                tr_debug_extra("Purge seq: %d", tx_entry->buf->seq);
-                if (lowpan_adaptation_indirect_queue_free_message(cur, interface_ptr, tx_entry) == false) {
-                    tr_debug("Purge failed, try next entry");
+                if (!low_priority_msg_ptr) {
+                    // take last entry if no low priority entry found
+                    if (lowpan_adaptation_is_priority_message(new_entry->buf)) {
+                        low_priority_msg_ptr = tx_entry;
+                    } else {
+                        return false;
+                    }
+                }
+                tr_debug_extra("Purge seq: %d", low_priority_msg_ptr->buf->seq);
+                if (lowpan_adaptation_indirect_queue_free_message(cur, interface_ptr, low_priority_msg_ptr) == false) {
+                    tr_debug_extra("Purge failed, try next entry");
                     /* entry could not be purged from mac, try next entry */
                     count--;
                 }
+                low_priority_msg_ptr = NULL;
             }
         }
     }
+    return true;
 }
 
 static void lowpan_data_request_to_mac(protocol_interface_info_entry_t *cur, buffer_t *buf, fragmenter_tx_entry_t *tx_ptr, fragmenter_interface_t *interface_ptr)
@@ -868,6 +931,7 @@ static void lowpan_data_request_to_mac(protocol_interface_info_entry_t *cur, buf
 
 int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buffer_t *buf)
 {
+    bool is_room_for_new_message;
     if (!buf) {
         return -1;
     }
@@ -940,9 +1004,9 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
 
         // Make room for new message if needed */
         if (buffer_data_length(buf) <= interface_ptr->indirect_big_packet_threshold) {
-            lowpan_adaptation_make_room_for_small_packet(cur, interface_ptr, neigh_entry_ptr);
+            is_room_for_new_message = lowpan_adaptation_make_room_for_small_packet(cur, interface_ptr, neigh_entry_ptr, tx_ptr);
         } else {
-            lowpan_adaptation_make_room_for_big_packet(cur, interface_ptr);
+            is_room_for_new_message = lowpan_adaptation_make_room_for_big_packet(cur, interface_ptr, tx_ptr);
         }
 
         if (lowpan_adaptation_indirect_mac_data_request_active(interface_ptr, tx_ptr)) {
@@ -951,7 +1015,15 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
             tx_ptr->indirect_data_cached = true;
         }
 
-        ns_list_add_to_end(&interface_ptr->indirect_tx_queue, tx_ptr);
+        if (is_room_for_new_message) {
+            ns_list_add_to_end(&interface_ptr->indirect_tx_queue, tx_ptr);
+        } else {
+            if (tx_ptr->fragmenter_buf) {
+                ns_dyn_mem_free(tx_ptr->fragmenter_buf);
+            }
+            ns_dyn_mem_free(tx_ptr);
+            goto tx_error_handler;
+        }
 
         // Check if current message can be delivered to MAC or should some cached message be delivered first
         tx_ptr_cached = lowpan_adaptation_indirect_first_cached_request_get(interface_ptr, tx_ptr);

test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c

@@ -134,13 +134,19 @@ bool test_lowpan_adaptation_interface_reset()
     buf.buf_ptr = 10;
     buf.buf_end = 80;
 
+
     if (-1 != lowpan_adaptation_interface_reset(0)) {
         return false;
     }
 
     nsdynmemlib_stub.returnCounter = 2;
     lowpan_adaptation_interface_init(0, 127);
 
+    // Set small and big buffer size to 2
+    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
+        return false;
+    }
+
     //Set 2 direct and 2 indirect buffer
     buf.link_specific.ieee802_15_4.indirectTxProcess = false;
     lowpan_adaptation_interface_tx(&entry, &buf);
@@ -297,10 +303,17 @@ bool test_lowpan_adaptation_indirect_purge()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
+
+
     //Test Indirect data allocation fail
     nsdynmemlib_stub.returnCounter = 2;
     lowpan_adaptation_interface_init(0, 127);
 
+    // Set small and big buffer size to 2
+    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
+        return false;
+    }
+
     test_buf->link_specific.ieee802_15_4.indirectTxProcess = true;
     nsdynmemlib_stub.returnCounter = 2;
     if (0 != lowpan_adaptation_interface_tx(&entry, test_buf)) {
@@ -784,6 +797,7 @@ bool test_lowpan_adaptation_interface_tx_confirm()
     buffer_t *test_buf = malloc(sizeof(buffer_t) + 2100);
     memset(test_buf, 0, sizeof(buffer_t) + 2100);
 
+
     entry.mac_parameters->mac_in_direct_entry_timeout = 14000;
     test_buf->link_specific.ieee802_15_4.useDefaultPanId = true;
     test_buf->dst_sa.addr_type = ADDR_802_15_4_SHORT;
@@ -819,6 +833,7 @@ bool test_lowpan_adaptation_interface_tx_confirm()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
+
     if (-1 != lowpan_adaptation_interface_tx_confirm(NULL, &data_confirm)) {
         lowpan_adaptation_interface_free(0);
         free(test_buf);
@@ -853,6 +868,10 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
     test_buf2->ip_routed_up = true;
+    // Set small and big buffer size to 2
+    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
+        return false;
+    }
 
     lowpan_adaptation_interface_tx(&entry, test_buf);
     lowpan_adaptation_interface_tx(&entry, test_buf2);
@@ -868,6 +887,7 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
 
+
     data_confirm.msduHandle = test_buf->seq;
     data_confirm.status = MLME_SUCCESS;
     if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
@@ -898,6 +918,7 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
 
+
     data_confirm.msduHandle = test_buf3->seq;
     data_confirm.status = MLME_TRANSACTION_EXPIRED;
     if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
@@ -1324,6 +1345,11 @@ bool test_lowpan_adaptation_interface_mpx_register()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
+    // Set small and big buffer size to 2
+    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
+        return false;
+    }
+
     test_buf2->ip_routed_up = true;
     protocol_core_stub.entry_ptr = &entry;
     lowpan_adaptation_interface_tx(&entry, test_buf);