增加Tunnat有上下文发包流程中选最近专用设备的功能；修正Service线程绑定设置。

- 原实现在处理有上下文发包流程中，根据二元组查找session失败时，直接丢弃。现改为选择最近的专用设备session。
- 修正service辅助线程绑定在master线程的Bug。

6 files changed, 65 insertions, 5 deletions

diff --git a/service/include/sc_common.h b/service/include/sc_common.h
index fc076e2..e47d81b 100644
--- a/service/include/sc_common.h
+++ b/service/include/sc_common.h
@@ -51,6 +51,11 @@ struct sc_main
 	char local_monitfile[MR_STRING_MAX];
 	/* CPU掩码，本进程在这个CPU上运行 */
 	cpu_mask_t cpu_mask;
+    /* Master线程的CPU亲和性设置（EAL之前） */
+    cpu_set_t cpu_set_before_eal;
+    /* Master线程的CPU亲和性设置（EAL之后） */
+    cpu_set_t cpu_set_after_eal;
+    
     /* RX方向 Burst数量 */
     unsigned int nr_rx_burst;
     /* TX方向 Burst数量 */
diff --git a/service/src/core.c b/service/src/core.c
index dc9f98b..e9816f1 100644
--- a/service/src/core.c
+++ b/service/src/core.c
@@ -344,6 +344,10 @@ static void sc_eal_init(struct sc_main * sc, const char * cmd)
 
     MR_INFO("EAL Parameters: %s", str_eal_cmdline);
 
+    /* EAL初始化前的线程亲和性 */
+    ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &sc->cpu_set_before_eal);
+    MR_VERIFY_2(ret >= 0, "Cannot get init thread affinity: %s", strerror(errno));
+
     ret = rte_eal_init(eal_argc, eal_argv);
     if (ret < 0)
     {
@@ -359,6 +363,15 @@ static void sc_eal_init(struct sc_main * sc, const char * cmd)
     }
 
     sc->nr_serv_thread = mask_popcnt(sc->cpu_mask);
+
+    /* EAL初始化后的线程亲和性 */
+    ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &sc->cpu_set_after_eal);
+    MR_VERIFY_2(ret >= 0, "Cannot get init thread affinity: %s", strerror(errno));
+
+    /* 恢复CPU亲和性设置 */
+    ret = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &sc->cpu_set_before_eal);
+    MR_VERIFY_2(ret >= 0, "Cannot set init thread affinity: %s", strerror(errno));
+
     return;
 }
 
@@ -785,6 +798,10 @@ int main(int argc, char * argv[])
         if (sc->keepalive) rte_keepalive_register_core(sc->keepalive, lcore_id);
     }
 
+    /* 恢复CPU亲和性设置为EAL后的线程绑定参数 */
+    ret = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &sc->cpu_set_after_eal);
+    MR_VERIFY_2(ret >= 0, "Cannot set init thread affinity: %s", strerror(errno));
+
     rte_eal_mp_remote_launch(sc_dataplane_thread, sc, CALL_MASTER);
     RTE_LCORE_FOREACH_SLAVE(lcore_id)
     {
diff --git a/tunnat/include/session.h b/tunnat/include/session.h
index 01353d2..1fa47da 100644
--- a/tunnat/include/session.h
+++ b/tunnat/include/session.h
@@ -35,6 +35,8 @@ class SessionTable
 public:
     SessionEntry * Query(SessionKey & key);
     SessionEntry * QueryDualDirect(SessionKey & key);
+    SessionEntry * QueryRecent();
+
     int Add(SessionKey & key, SessionEntry & entry);
     int Init(unsigned int nr_max_sessions, unsigned int nr_slots, unsigned int expire_time);
 
@@ -43,4 +45,5 @@ protected:
     static int htable_comp_fun_cb(const uchar * key1, uint size1, const uchar * key2, uint size2);
     static int htable_free_fun_cb(void *data);
     static int htable_expire_notify_cb(void *data, int eliminate_type);
+    static int htable_iterate_recent(const uchar * key, uint size, void * data, void *user);
 };
\ No newline at end of file
diff --git a/tunnat/include/tunnat.h b/tunnat/include/tunnat.h
index 5a2fcfd..ff07d43 100644
--- a/tunnat/include/tunnat.h
+++ b/tunnat/include/tunnat.h
@@ -96,6 +96,7 @@ public:
         TUNNAT_STAT_SESSION_REMOVE,
         /* 统计，关键失败事件 */
         TUNNAT_STAT_ENCAP_FAIL_NO_SESSION,
+        TUNNAT_STAT_ENCAP_USE_RECENT_SESSION,
         /* 最大表项 */
         TUNNAT_STAT_MAX
     };
@@ -159,13 +160,14 @@ public:
             [TUNNAT_STAT_INNER_PPP_INPUT] = "TUNNAT_STAT_INNER_PPP_INPUT",
             [TUNNAT_STAT_FORWARD_OUTPUT] = "TUNNAT_STAT_FORWARD_OUTPUT",
             [TUNNAT_STAT_ENCAP_OUTPUT] ="TUNNAT_STAT_ENCAP_OUTPUT",
-            [TUNNAT_STAT_DIRECT_OUTPUT] ="TUNNAT_STAT_DROP_OUTPUT",
+            [TUNNAT_STAT_DIRECT_OUTPUT] ="TUNNAT_STAT_DIRECT_OUTPUT",
             [TUNNAT_STAT_FORWARD_RAW_OUTPUT] = "TUNNAT_STAT_FORWARD_RAW_OUTPUT",
             [TUNNAT_STAT_FORWARD_TUNNEL_OUTPUT] = "TUNNAT_STAT_FORWARD_TUNNEL_OUTPUT",
             [TUNNAT_STAT_NO_SESSION_OUTPUT] = "TUNNAT_STAT_NO_SESSION_OUTPUT",
             [TUNNAT_STAT_SESSION_ADD] = "TUNNAT_STAT_SESSION_ADD",
             [TUNNAT_STAT_SESSION_REMOVE] = "TUNNAT_STAT_SESSION_REMOVE",
             [TUNNAT_STAT_ENCAP_FAIL_NO_SESSION] = "TUNNAT_STAT_ENCAP_FAIL_NO_SESSION",
+            [TUNNAT_STAT_ENCAP_USE_RECENT_SESSION] = "TUNNAT_STAT_ENCAP_USE_RECENT_SESSION",
             [TUNNAT_STAT_MAX] = "TUNNAT_STAT_MAX"
         };
         
diff --git a/tunnat/src/runtime.cc b/tunnat/src/runtime.cc
index 8edc2cf..28672d1 100644
--- a/tunnat/src/runtime.cc
+++ b/tunnat/src/runtime.cc
@@ -266,12 +266,23 @@ static int __virt_to_phy_pkt_encap(TunnatInstance * instance, TunnatThreadInstan
 
     /* 双向查询 */
     SessionEntry * ss_entry = th_instance->ss_table->QueryDualDirect(ss_key);
-    if (ss_entry == NULL)
+    if (ss_entry != NULL) goto session_realy;
+    
+    /* 没有查询到，使用最近的一次隧道数据，随便找到一个专用设备回注 */
+    ss_entry = th_instance->ss_table->QueryRecent();
+    if (ss_entry != NULL)
     {
-        TUNNAT_THREAD_STAT_ADD(TUNNAT_STAT_ENCAP_FAIL_NO_SESSION, 1);
-        return RT_ERR;
+        TUNNAT_THREAD_STAT_ADD(TUNNAT_STAT_ENCAP_USE_RECENT_SESSION, 1);
+        goto session_realy;
     }
-    
+
+    /* 还没有查询到，报告失败 */
+    TUNNAT_THREAD_STAT_ADD(TUNNAT_STAT_ENCAP_FAIL_NO_SESSION, 1);
+    return RT_ERR;
+
+session_realy:
+
+    /* 已经查找到隧道上下文，构建隧道报文 */
     TunnelContainerArray & tun_array = ss_entry->tun_array;
 
     /* 逆序构建报文隧道，最内层隧道不构建 */
diff --git a/tunnat/src/session.cc b/tunnat/src/session.cc
index bcd76ee..4924b72 100644
--- a/tunnat/src/session.cc
+++ b/tunnat/src/session.cc
@@ -27,6 +27,18 @@ reverse_dir:
     }
 
     return ss_entry;
+}

+

+SessionEntry * SessionTable::QueryRecent()

+{
+    SessionEntry * ss_entry = NULL;
+    
+    /* 查找最近使用的隧道配置 */
+    MESA_htable_iterate_bytime(ht_table_, ITERATE_TYPE_NEWEST_FIRST, 
+        htable_iterate_recent, (void *)ss_entry);
+
+    if (ss_entry == NULL) return NULL;

+    return ss_entry;

 }
 
 int SessionTable::Add(SessionKey & key, SessionEntry & entry)
@@ -114,4 +126,14 @@ int SessionTable::htable_free_fun_cb(void * data)
 int SessionTable::htable_expire_notify_cb(void *data, int eliminate_type)
 {
     return 1;
+}

+

+int SessionTable::htable_iterate_recent(const uchar * key, uint size, void * data, void * user)

+{
+    (void)key;
+    (void)size;
+
+    SessionEntry ** __entry_ret = (SessionEntry **)user;
+    *__entry_ret = (SessionEntry *)data;

+    return ITERATE_CB_RET_BREAK_FLAG;

 }
\ No newline at end of file