kni: fix kernel crash with multi-segments

[dpdk.git] / lib / librte_eal / common / malloc_mp.c

diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c
index 931c14b..1f212f8 100644 (file)
--- a/lib/librte_eal/common/malloc_mp.c
+++ b/lib/librte_eal/common/malloc_mp.c
@@ -10,6 +10,7 @@
 #include <rte_string_fns.h>
 
 #include "eal_memalloc.h"
+#include "eal_memcfg.h"
 
 #include "malloc_elem.h"
 #include "malloc_mp.h"
@@ -194,13 +195,11 @@ handle_alloc_request(const struct malloc_mp_req *m,
 
        /* we can't know in advance how many pages we'll need, so we malloc */
        ms = malloc(sizeof(*ms) * n_segs);
-
-       memset(ms, 0, sizeof(*ms) * n_segs);
-
        if (ms == NULL) {
                RTE_LOG(ERR, EAL, "Couldn't allocate memory for request state\n");
                goto fail;
        }
+       memset(ms, 0, sizeof(*ms) * n_segs);
 
        elem = alloc_pages_on_heap(heap, ar->page_sz, ar->elt_size, ar->socket,
                        ar->flags, ar->align, ar->bound, ar->contig, ms,
@@ -211,6 +210,8 @@ handle_alloc_request(const struct malloc_mp_req *m,
 
        map_addr = ms[0]->addr;
 
+       eal_memalloc_mem_event_notify(RTE_MEM_EVENT_ALLOC, map_addr, alloc_sz);
+
        /* we have succeeded in allocating memory, but we still need to sync
         * with other processes. however, since DPDK IPC is single-threaded, we
         * send an asynchronous request and exit this callback.
@@ -260,6 +261,9 @@ handle_request(const struct rte_mp_msg *msg, const void *peer __rte_unused)
        if (m->t == REQ_TYPE_ALLOC) {
                ret = handle_alloc_request(m, entry);
        } else if (m->t == REQ_TYPE_FREE) {
+               eal_memalloc_mem_event_notify(RTE_MEM_EVENT_FREE,
+                               m->free_req.addr, m->free_req.len);
+
                ret = malloc_heap_free_pages(m->free_req.addr,
                                m->free_req.len);
        } else {
@@ -438,6 +442,9 @@ handle_sync_response(const struct rte_mp_msg *request,
                memset(&rb_msg, 0, sizeof(rb_msg));
 
                /* we've failed to sync, so do a rollback */
+               eal_memalloc_mem_event_notify(RTE_MEM_EVENT_FREE,
+                               state->map_addr, state->map_len);
+
                rollback_expand_heap(state->ms, state->ms_len, state->elem,
                                state->map_addr, state->map_len);
 
@@ -495,7 +502,7 @@ handle_rollback_response(const struct rte_mp_msg *request,
        /* lock the request */
        pthread_mutex_lock(&mp_request_list.lock);
 
-       memset(&msg, 0, sizeof(0));
+       memset(&msg, 0, sizeof(msg));
 
        entry = find_request_by_id(mpreq->id);
        if (entry == NULL) {
@@ -567,7 +574,7 @@ request_sync(void)
        struct rte_mp_reply reply;
        struct malloc_mp_req *req = (struct malloc_mp_req *)msg.param;
        struct timespec ts;
-       int i, ret;
+       int i, ret = -1;
 
        memset(&msg, 0, sizeof(msg));
        memset(&reply, 0, sizeof(reply));
@@ -590,14 +597,16 @@ request_sync(void)
                ret = rte_mp_request_sync(&msg, &reply, &ts);
        } while (ret != 0 && rte_errno == EEXIST);
        if (ret != 0) {
-               RTE_LOG(ERR, EAL, "Could not send sync request to secondary process\n");
-               ret = -1;
+               /* if IPC is unsupported, behave as if the call succeeded */
+               if (rte_errno != ENOTSUP)
+                       RTE_LOG(ERR, EAL, "Could not send sync request to secondary process\n");
+               else
+                       ret = 0;
                goto out;
        }
 
        if (reply.nb_received != reply.nb_sent) {
                RTE_LOG(ERR, EAL, "Not all secondaries have responded\n");
-               ret = -1;
                goto out;
        }
 
@@ -606,17 +615,14 @@ request_sync(void)
                                (struct malloc_mp_req *)reply.msgs[i].param;
                if (resp->t != REQ_TYPE_SYNC) {
                        RTE_LOG(ERR, EAL, "Unexpected response from secondary\n");
-                       ret = -1;
                        goto out;
                }
                if (resp->id != req->id) {
                        RTE_LOG(ERR, EAL, "Wrong request ID\n");
-                       ret = -1;
                        goto out;
                }
                if (resp->result != REQ_RESULT_SUCCESS) {
                        RTE_LOG(ERR, EAL, "Secondary process failed to synchronize\n");
-                       ret = -1;
                        goto out;
                }
        }
@@ -716,7 +722,9 @@ int
 register_mp_requests(void)
 {
        if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               if (rte_mp_action_register(MP_ACTION_REQUEST, handle_request)) {
+               /* it's OK for primary to not support IPC */
+               if (rte_mp_action_register(MP_ACTION_REQUEST, handle_request) &&
+                               rte_errno != ENOTSUP) {
                        RTE_LOG(ERR, EAL, "Couldn't register '%s' action\n",
                                MP_ACTION_REQUEST);
                        return -1;