From e279b6673b22d113823214db9ff74896892bcb35 Mon Sep 17 00:00:00 2001
From: Xiaozhou Liu <lxz1983@gmail.com>
Date: Sun, 10 Jun 2018 20:48:48 +0800
Subject: [PATCH] make use of numa when setting up rx/tx queues

---
 lib/ff_dpdk_if.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/ff_dpdk_if.c b/lib/ff_dpdk_if.c
index 4f517e52..d1ee467a 100644
--- a/lib/ff_dpdk_if.c
+++ b/lib/ff_dpdk_if.c
@@ -573,8 +573,8 @@ static int
 init_port_start(void)
 {
     int nb_ports = ff_global_cfg.dpdk.nb_ports;
-    unsigned socketid = rte_lcore_to_socket_id(rte_lcore_id());
-    struct rte_mempool *mbuf_pool = pktmbuf_pool[socketid];
+    unsigned socketid = 0;
+    struct rte_mempool *mbuf_pool;
     uint16_t i;
 
     for (i = 0; i < nb_ports; i++) {
@@ -710,6 +710,12 @@ init_port_start(void)
         }
         uint16_t q;
         for (q = 0; q < nb_queues; q++) {
+            if (numa_on) {
+                uint16_t lcore_id = lcore_conf.port_cfgs[port_id].lcore_list[q];
+                socketid = rte_lcore_to_socket_id(lcore_id);
+            }
+            mbuf_pool = pktmbuf_pool[socketid];
+
             ret = rte_eth_tx_queue_setup(port_id, q, TX_QUEUE_SIZE,
                 socketid, &dev_info.default_txconf);
             if (ret < 0) {