From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zyc-PC.local (unknown [119.61.11.228]) by dpdk.org (Postfix) with SMTP id CED5D1B656 for ; Tue, 6 Feb 2018 11:33:35 +0100 (CET) Date: Tue, 6 Feb 2018 18:33:22 +0800 From: zhouyangchao CC: dev@dpdk.org; Sender: zhouyangchao To: ferruh.yigit@intel.com; Message-ID: X-Mailer: TortoiseGit MIME-Version: 1.0 Content-Type: text/plain; Subject: [dpdk-dev] [PATCH] kni: optimize the kni release speed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Feb 2018 10:33:36 -0000 Physical addresses in the fifo named alloc_q need to be traversed to release in user space. The physical address to the virtual address conversion in kernel space is much better. Signed-off-by: Yangchao Zhou --- lib/librte_eal/linuxapp/kni/kni_dev.h | 1 + lib/librte_eal/linuxapp/kni/kni_misc.c | 1 + lib/librte_eal/linuxapp/kni/kni_net.c | 15 +++++++++++++++ lib/librte_kni/rte_kni.c | 26 +------------------------- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h index c9393d8..7cd9bf8 100644 --- a/lib/librte_eal/linuxapp/kni/kni_dev.h +++ b/lib/librte_eal/linuxapp/kni/kni_dev.h @@ -92,6 +92,7 @@ struct kni_dev { void *alloc_va[MBUF_BURST_SZ]; }; +void kni_net_fifo_pa2va(struct kni_dev *kni); void kni_net_rx(struct kni_dev *kni); void kni_net_init(struct net_device *dev); void kni_net_config_lo_mode(char *lo_str); diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c index 01574ec..668488b 100644 --- a/lib/librte_eal/linuxapp/kni/kni_misc.c +++ b/lib/librte_eal/linuxapp/kni/kni_misc.c @@ -507,6 +507,7 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num, dev->pthread = NULL; } + kni_net_fifo_pa2va(dev); kni_dev_remove(dev); list_del(&dev->list); ret = 0; diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c index 9f9b798..662a527 100644 --- a/lib/librte_eal/linuxapp/kni/kni_net.c +++ b/lib/librte_eal/linuxapp/kni/kni_net.c @@ -73,6 +73,21 @@ va2pa(void *va, struct rte_kni_mbuf *m) return pa; } +/* convert physical addresses to virtual addresses in fifo for kni release */ +void +kni_net_fifo_pa2va(struct kni_dev *kni) +{ + void *fifo = kni->alloc_q; + int i, count = kni_fifo_count(fifo); + void *pa = NULL, *kva, *va; + for (i = 0; i < count; ++i) { + (void)kni_fifo_get(fifo, &pa, 1); + kva = pa2kva(pa); + va = pa2va(pa, kva); + (void)kni_fifo_put(fifo, &va, 1); + } +} + /* * It can be called to process the request. */ diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c index 2867411..f8398a9 100644 --- a/lib/librte_kni/rte_kni.c +++ b/lib/librte_kni/rte_kni.c @@ -435,30 +435,6 @@ va2pa(struct rte_mbuf *m) (unsigned long)m->buf_iova)); } -static void -obj_free(struct rte_mempool *mp __rte_unused, void *opaque, void *obj, - unsigned obj_idx __rte_unused) -{ - struct rte_mbuf *m = obj; - void *mbuf_phys = opaque; - - if (va2pa(m) == mbuf_phys) - rte_pktmbuf_free(m); -} - -static void -kni_free_fifo_phy(struct rte_mempool *mp, struct rte_kni_fifo *fifo) -{ - void *mbuf_phys; - int ret; - - do { - ret = kni_fifo_get(fifo, &mbuf_phys, 1); - if (ret) - rte_mempool_obj_iter(mp, obj_free, mbuf_phys); - } while (ret); -} - int rte_kni_release(struct rte_kni *kni) { @@ -484,7 +460,7 @@ rte_kni_release(struct rte_kni *kni) if (kni_fifo_count(kni->rx_q)) RTE_LOG(ERR, KNI, "Fail to free all Rx-q items\n"); - kni_free_fifo_phy(kni->pktmbuf_pool, kni->alloc_q); + kni_free_fifo(kni->alloc_q); kni_free_fifo(kni->tx_q); kni_free_fifo(kni->free_q); -- 2.9.0.windows.1