doc: announce legacy 7-tuple acl rule removal

[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 f64a0a8..08155db 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -131,7 +131,9 @@ static void kni_free_mbufs(struct rte_kni *kni);
 static void kni_allocate_mbufs(struct rte_kni *kni);
 
 static volatile int kni_fd = -1;
-static struct rte_kni_memzone_pool kni_memzone_pool = {0};
+static struct rte_kni_memzone_pool kni_memzone_pool = {
+       .initialized = 0,
+};
 
 static const struct rte_memzone *
 kni_memzone_reserve(const char *name, size_t len, int socket_id,
@@ -199,6 +201,12 @@ rte_kni_init(unsigned int max_kni_ifaces)
        char obj_name[OBJNAMSIZ];
        char mz_name[RTE_MEMZONE_NAMESIZE];
 
+       /* Immediately return if KNI is already initialized */
+       if (kni_memzone_pool.initialized) {
+               RTE_LOG(WARNING, KNI, "Double call to rte_kni_init()");
+               return;
+       }
+
        if (max_kni_ifaces == 0) {
                RTE_LOG(ERR, KNI, "Invalid number of max_kni_ifaces %d\n",
                                                        max_kni_ifaces);
@@ -224,6 +232,7 @@ rte_kni_init(unsigned int max_kni_ifaces)
        kni_memzone_pool.initialized = 1;
        kni_memzone_pool.max_ifaces = max_kni_ifaces;
        kni_memzone_pool.free = &kni_memzone_pool.slots[0];
+       rte_spinlock_init(&kni_memzone_pool.mutex);
 
        /* Pre-allocate all memzones of all the slots; panic on error */
        for (i = 0; i < max_kni_ifaces; i++) {
@@ -447,6 +456,9 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
 
        ctx->in_use = 1;
 
+       /* Allocate mbufs and then put them into alloc_q */
+       kni_allocate_mbufs(ctx);
+
        return ctx;
 
 kni_fail:
@@ -567,8 +579,9 @@ rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
 {
        unsigned ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num);
 
-       /* Allocate mbufs and then put them into alloc_q */
-       kni_allocate_mbufs(kni);
+       /* If buffers removed, allocate mbufs and then put them into alloc_q */
+       if (ret)
+               kni_allocate_mbufs(kni);
 
        return ret;
 }
@@ -592,6 +605,21 @@ kni_allocate_mbufs(struct rte_kni *kni)
        int i, ret;
        struct rte_mbuf *pkts[MAX_MBUF_BURST_NUM];
 
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pool) !=
+                        offsetof(struct rte_kni_mbuf, pool));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, buf_addr) !=
+                        offsetof(struct rte_kni_mbuf, buf_addr));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, next) !=
+                        offsetof(struct rte_kni_mbuf, next));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) !=
+                        offsetof(struct rte_kni_mbuf, data_off));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
+                        offsetof(struct rte_kni_mbuf, data_len));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=
+                        offsetof(struct rte_kni_mbuf, pkt_len));
+       RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=
+                        offsetof(struct rte_kni_mbuf, ol_flags));
+
        /* Check if pktmbuf pool has been configured */
        if (kni->pktmbuf_pool == NULL) {
                RTE_LOG(ERR, KNI, "No valid mempool for allocating mbufs\n");
@@ -652,6 +680,12 @@ rte_kni_get(const char *name)
        return NULL;
 }
 
+const char *
+rte_kni_get_name(const struct rte_kni *kni)
+{
+       return kni->name;
+}
+
 /*
  * It is deprecated and just for backward compatibility.
  */