fix typos using codespell utility

[dpdk.git] / lib / librte_kni / rte_kni.c

diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index d88a70d..40288a1 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -119,7 +119,7 @@ struct rte_kni_memzone_pool {
 
        uint32_t max_ifaces;                /**< Max. num of KNI ifaces */
        struct rte_kni_memzone_slot *slots;        /**< Pool slots */
-       rte_spinlock_t mutex;               /**< alloc/relase mutex */
+       rte_spinlock_t mutex;               /**< alloc/release mutex */
 
        /* Free memzone slots linked-list */
        struct rte_kni_memzone_slot *free;         /**< First empty slot */
@@ -416,14 +416,6 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
        dev_info.sync_va = mz->addr;
        dev_info.sync_phys = mz->phys_addr;
 
-
-       /* MBUF mempool */
-       /* KNI currently requires to have only one memory chunk */
-       if (pktmbuf_pool->nb_mem_chunks != 1)
-               goto kni_fail;
-
-       dev_info.mbuf_va = STAILQ_FIRST(&pktmbuf_pool->mem_list)->addr;
-       dev_info.mbuf_phys = STAILQ_FIRST(&pktmbuf_pool->mem_list)->phys_addr;
        ctx->pktmbuf_pool = pktmbuf_pool;
        ctx->group_id = conf->group_id;
        ctx->slot_id = slot->id;
@@ -459,11 +451,44 @@ kni_free_fifo(struct rte_kni_fifo *fifo)
        } while (ret);
 }
 
+static void *
+va2pa(struct rte_mbuf *m)
+{
+       return (void *)((unsigned long)m -
+                       ((unsigned long)m->buf_addr -
+                        (unsigned long)m->buf_physaddr));
+}
+
+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)
 {
        struct rte_kni_device_info dev_info;
        uint32_t slot_id;
+       uint32_t retry = 5;
 
        if (!kni || !kni->in_use)
                return -1;
@@ -475,9 +500,16 @@ rte_kni_release(struct rte_kni *kni)
        }
 
        /* mbufs in all fifo should be released, except request/response */
+
+       /* wait until all rxq packets processed by kernel */
+       while (kni_fifo_count(kni->rx_q) && retry--)
+               usleep(1000);
+
+       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->tx_q);
-       kni_free_fifo(kni->rx_q);
-       kni_free_fifo(kni->alloc_q);
        kni_free_fifo(kni->free_q);
 
        slot_id = kni->slot_id;
@@ -546,7 +578,14 @@ rte_kni_handle_request(struct rte_kni *kni)
 unsigned
 rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
 {
-       unsigned ret = kni_fifo_put(kni->rx_q, (void **)mbufs, num);
+       void *phy_mbufs[num];
+       unsigned int ret;
+       unsigned int i;
+
+       for (i = 0; i < num; i++)
+               phy_mbufs[i] = va2pa(mbufs[i]);
+
+       ret = kni_fifo_put(kni->rx_q, phy_mbufs, num);
 
        /* Get mbufs from free_q and then free them */
        kni_free_mbufs(kni);
@@ -584,6 +623,7 @@ kni_allocate_mbufs(struct rte_kni *kni)
 {
        int i, ret;
        struct rte_mbuf *pkts[MAX_MBUF_BURST_NUM];
+       void *phys[MAX_MBUF_BURST_NUM];
 
        RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pool) !=
                         offsetof(struct rte_kni_mbuf, pool));
@@ -613,13 +653,14 @@ kni_allocate_mbufs(struct rte_kni *kni)
                        RTE_LOG(ERR, KNI, "Out of memory\n");
                        break;
                }
+               phys[i] = va2pa(pkts[i]);
        }
 
        /* No pkt mbuf alocated */
        if (i <= 0)
                return;
 
-       ret = kni_fifo_put(kni->alloc_q, (void **)pkts, i);
+       ret = kni_fifo_put(kni->alloc_q, phys, i);
 
        /* Check if any mbufs not put into alloc_q, and then free them */
        if (ret >= 0 && ret < i && ret < MAX_MBUF_BURST_NUM) {