kni: remove panic exits from library

[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 3028fd4..d88a70d 100644 (file)
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -210,14 +210,18 @@ rte_kni_init(unsigned int max_kni_ifaces)
        if (max_kni_ifaces == 0) {
                RTE_LOG(ERR, KNI, "Invalid number of max_kni_ifaces %d\n",
                                                        max_kni_ifaces);
-               rte_panic("Unable to initialize KNI\n");
+               RTE_LOG(ERR, KNI, "Unable to initialize KNI\n");
+               return;
        }
 
        /* Check FD and open */
        if (kni_fd < 0) {
                kni_fd = open("/dev/" KNI_DEVICE, O_RDWR);
-               if (kni_fd < 0)
-                       rte_panic("Can not open /dev/%s\n", KNI_DEVICE);
+               if (kni_fd < 0) {
+                       RTE_LOG(ERR, KNI,
+                               "Can not open /dev/%s\n", KNI_DEVICE);
+                       return;
+               }
        }
 
        /* Allocate slot objects */
@@ -307,8 +311,8 @@ rte_kni_init(unsigned int max_kni_ifaces)
        return;
 
 kni_fail:
-       rte_panic("Unable to allocate memory for max_kni_ifaces:%d. Increase the amount of hugepages memory\n",
-                        max_kni_ifaces);
+       RTE_LOG(ERR, KNI, "Unable to allocate memory for max_kni_ifaces:%d."
+               "Increase the amount of hugepages memory\n", max_kni_ifaces);
 }
 
 
@@ -321,9 +325,7 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
        struct rte_kni_device_info dev_info;
        struct rte_kni *ctx;
        char intf_name[RTE_KNI_NAMESIZE];
-       char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
-       const struct rte_mempool *mp;
        struct rte_kni_memzone_slot *slot = NULL;
 
        if (!pktmbuf_pool || !conf || !conf->name[0])
@@ -416,17 +418,12 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
 
 
        /* MBUF mempool */
-       snprintf(mz_name, sizeof(mz_name), RTE_MEMPOOL_MZ_FORMAT,
-               pktmbuf_pool->name);
-       mz = rte_memzone_lookup(mz_name);
-       KNI_MEM_CHECK(mz == NULL);
-       mp = (struct rte_mempool *)mz->addr;
        /* KNI currently requires to have only one memory chunk */
-       if (mp->nb_mem_chunks != 1)
+       if (pktmbuf_pool->nb_mem_chunks != 1)
                goto kni_fail;
 
-       dev_info.mbuf_va = STAILQ_FIRST(&mp->mem_list)->addr;
-       dev_info.mbuf_phys = STAILQ_FIRST(&mp->mem_list)->phys_addr;
+       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;
@@ -490,8 +487,9 @@ rte_kni_release(struct rte_kni *kni)
 
        /* Release memzone */
        if (slot_id > kni_memzone_pool.max_ifaces) {
-               rte_panic("KNI pool: corrupted slot ID: %d, max: %d\n",
+               RTE_LOG(ERR, KNI, "KNI pool: corrupted slot ID: %d, max: %d\n",
                        slot_id, kni_memzone_pool.max_ifaces);
+               return -1;
        }
        kni_memzone_pool_release(&kni_memzone_pool.slots[slot_id]);
 
@@ -513,7 +511,8 @@ rte_kni_handle_request(struct rte_kni *kni)
                return 0; /* It is OK of can not getting the request mbuf */
 
        if (req != kni->sync_addr) {
-               rte_panic("Wrong req pointer %p\n", req);
+               RTE_LOG(ERR, KNI, "Wrong req pointer %p\n", req);
+               return -1;
        }
 
        /* Analyze the request and call the relevant actions for it */