app/testpmd: add command to display queue info

[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 ab5ca38..ea9baf4 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -201,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);
@@ -305,31 +311,6 @@ kni_fail:
                         max_kni_ifaces);
 }
 
-/* It is deprecated and just for backward compatibility */
-struct rte_kni *
-rte_kni_create(uint8_t port_id,
-              unsigned mbuf_size,
-              struct rte_mempool *pktmbuf_pool,
-              struct rte_kni_ops *ops)
-{
-       struct rte_kni_conf conf;
-       struct rte_eth_dev_info info;
-
-       memset(&info, 0, sizeof(info));
-       memset(&conf, 0, sizeof(conf));
-       rte_eth_dev_info_get(port_id, &info);
-
-       snprintf(conf.name, sizeof(conf.name), "vEth%u", port_id);
-       conf.addr = info.pci_dev->addr;
-       conf.id = info.pci_dev->id;
-       conf.group_id = (uint16_t)port_id;
-       conf.mbuf_size = mbuf_size;
-
-       /* Save the port id for request handling */
-       ops->port_id = port_id;
-
-       return rte_kni_alloc(pktmbuf_pool, &conf, ops);
-}
 
 struct rte_kni *
 rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
@@ -450,6 +431,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:
@@ -570,8 +554,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;
 }
@@ -595,6 +580,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");
@@ -625,16 +625,6 @@ kni_allocate_mbufs(struct rte_kni *kni)
        }
 }
 
-/* It is deprecated and just for backward compatibility */
-uint8_t
-rte_kni_get_port_id(struct rte_kni *kni)
-{
-       if (!kni)
-               return ~0x0;
-
-       return kni->ops.port_id;
-}
-
 struct rte_kni *
 rte_kni_get(const char *name)
 {
@@ -655,20 +645,10 @@ rte_kni_get(const char *name)
        return NULL;
 }
 
-/*
- * It is deprecated and just for backward compatibility.
- */
-struct rte_kni *
-rte_kni_info_get(uint8_t port_id)
+const char *
+rte_kni_get_name(const struct rte_kni *kni)
 {
-       char name[RTE_MEMZONE_NAMESIZE];
-
-       if (port_id >= RTE_MAX_ETHPORTS)
-               return NULL;
-
-       snprintf(name, RTE_MEMZONE_NAMESIZE, "vEth%u", port_id);
-
-       return rte_kni_get(name);
+       return kni->name;
 }
 
 static enum kni_ops_status