New upstream version 18.08
[deb_dpdk.git] / lib / librte_eal / common / eal_common_proc.c
index caa8774..9fcb912 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/file.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
+#include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_eal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
+#include <rte_tailq.h>
 
 #include "eal_private.h"
 #include "eal_filesystem.h"
@@ -51,6 +54,7 @@ enum mp_type {
        MP_MSG, /* Share message with peers, will not block */
        MP_REQ, /* Request for information, Will block for a reply */
        MP_REP, /* Response to previously-received request */
+       MP_IGN, /* Response telling requester to ignore this response */
 };
 
 struct mp_msg_internal {
@@ -58,31 +62,66 @@ struct mp_msg_internal {
        struct rte_mp_msg msg;
 };
 
-struct sync_request {
-       TAILQ_ENTRY(sync_request) next;
-       int reply_received;
+struct async_request_param {
+       rte_mp_async_reply_t clb;
+       struct rte_mp_reply user_reply;
+       struct timespec end;
+       int n_responses_processed;
+};
+
+struct pending_request {
+       TAILQ_ENTRY(pending_request) next;
+       enum {
+               REQUEST_TYPE_SYNC,
+               REQUEST_TYPE_ASYNC
+       } type;
        char dst[PATH_MAX];
        struct rte_mp_msg *request;
        struct rte_mp_msg *reply;
-       pthread_cond_t cond;
+       int reply_received;
+       RTE_STD_C11
+       union {
+               struct {
+                       struct async_request_param *param;
+               } async;
+               struct {
+                       pthread_cond_t cond;
+               } sync;
+       };
 };
 
-TAILQ_HEAD(sync_request_list, sync_request);
+TAILQ_HEAD(pending_request_list, pending_request);
 
 static struct {
-       struct sync_request_list requests;
+       struct pending_request_list requests;
        pthread_mutex_t lock;
-} sync_requests = {
-       .requests = TAILQ_HEAD_INITIALIZER(sync_requests.requests),
-       .lock = PTHREAD_MUTEX_INITIALIZER
+} pending_requests = {
+       .requests = TAILQ_HEAD_INITIALIZER(pending_requests.requests),
+       .lock = PTHREAD_MUTEX_INITIALIZER,
+       /**< used in async requests only */
 };
 
-static struct sync_request *
-find_sync_request(const char *dst, const char *act_name)
+/* forward declarations */
+static int
+mp_send(struct rte_mp_msg *msg, const char *peer, int type);
+
+/* for use with alarm callback */
+static void
+async_reply_handle(void *arg);
+
+/* for use with process_msg */
+static struct pending_request *
+async_reply_handle_thread_unsafe(void *arg);
+
+static void
+trigger_async_action(struct pending_request *req);
+
+static struct pending_request *
+find_pending_request(const char *dst, const char *act_name)
 {
-       struct sync_request *r;
+       struct pending_request *r;
 
-       TAILQ_FOREACH(r, &sync_requests.requests, next) {
+       TAILQ_FOREACH(r, &pending_requests.requests, next) {
                if (!strcmp(r->dst, dst) &&
                    !strcmp(r->request->name, act_name))
                        break;
@@ -91,6 +130,17 @@ find_sync_request(const char *dst, const char *act_name)
        return r;
 }
 
+static void
+create_socket_path(const char *name, char *buf, int len)
+{
+       const char *prefix = eal_mp_socket_path();
+
+       if (strlen(name) > 0)
+               snprintf(buf, len, "%s_%s", prefix, name);
+       else
+               strlcpy(buf, prefix, len);
+}
+
 int
 rte_eal_primary_proc_alive(const char *config_file_path)
 {
@@ -159,7 +209,7 @@ rte_mp_action_register(const char *name, rte_mp_t action)
                rte_errno = ENOMEM;
                return -1;
        }
-       strcpy(entry->action_name, name);
+       strlcpy(entry->action_name, name, sizeof(entry->action_name));
        entry->action = action;
 
        pthread_mutex_lock(&mp_mutex_action);
@@ -241,23 +291,35 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
 static void
 process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
 {
-       struct sync_request *sync_req;
+       struct pending_request *pending_req;
        struct action_entry *entry;
        struct rte_mp_msg *msg = &m->msg;
        rte_mp_t action = NULL;
 
        RTE_LOG(DEBUG, EAL, "msg: %s\n", msg->name);
 
-       if (m->type == MP_REP) {
-               pthread_mutex_lock(&sync_requests.lock);
-               sync_req = find_sync_request(s->sun_path, msg->name);
-               if (sync_req) {
-                       memcpy(sync_req->reply, msg, sizeof(*msg));
-                       sync_req->reply_received = 1;
-                       pthread_cond_signal(&sync_req->cond);
+       if (m->type == MP_REP || m->type == MP_IGN) {
+               struct pending_request *req = NULL;
+
+               pthread_mutex_lock(&pending_requests.lock);
+               pending_req = find_pending_request(s->sun_path, msg->name);
+               if (pending_req) {
+                       memcpy(pending_req->reply, msg, sizeof(*msg));
+                       /* -1 indicates that we've been asked to ignore */
+                       pending_req->reply_received =
+                               m->type == MP_REP ? 1 : -1;
+
+                       if (pending_req->type == REQUEST_TYPE_SYNC)
+                               pthread_cond_signal(&pending_req->sync.cond);
+                       else if (pending_req->type == REQUEST_TYPE_ASYNC)
+                               req = async_reply_handle_thread_unsafe(
+                                               pending_req);
                } else
                        RTE_LOG(ERR, EAL, "Drop mp reply: %s\n", msg->name);
-               pthread_mutex_unlock(&sync_requests.lock);
+               pthread_mutex_unlock(&pending_requests.lock);
+
+               if (req != NULL)
+                       trigger_async_action(req);
                return;
        }
 
@@ -267,10 +329,25 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
                action = entry->action;
        pthread_mutex_unlock(&mp_mutex_action);
 
-       if (!action)
-               RTE_LOG(ERR, EAL, "Cannot find action: %s\n", msg->name);
-       else if (action(msg, s->sun_path) < 0)
+       if (!action) {
+               if (m->type == MP_REQ && !internal_config.init_complete) {
+                       /* if this is a request, and init is not yet complete,
+                        * and callback wasn't registered, we should tell the
+                        * requester to ignore our existence because we're not
+                        * yet ready to process this request.
+                        */
+                       struct rte_mp_msg dummy;
+
+                       memset(&dummy, 0, sizeof(dummy));
+                       strlcpy(dummy.name, msg->name, sizeof(dummy.name));
+                       mp_send(&dummy, s->sun_path, MP_IGN);
+               } else {
+                       RTE_LOG(ERR, EAL, "Cannot find action: %s\n",
+                               msg->name);
+               }
+       } else if (action(msg, s->sun_path) < 0) {
                RTE_LOG(ERR, EAL, "Fail to handle message: %s\n", msg->name);
+       }
 }
 
 static void *
@@ -287,11 +364,159 @@ mp_handle(void *arg __rte_unused)
        return NULL;
 }
 
+static int
+timespec_cmp(const struct timespec *a, const struct timespec *b)
+{
+       if (a->tv_sec < b->tv_sec)
+               return -1;
+       if (a->tv_sec > b->tv_sec)
+               return 1;
+       if (a->tv_nsec < b->tv_nsec)
+               return -1;
+       if (a->tv_nsec > b->tv_nsec)
+               return 1;
+       return 0;
+}
+
+enum async_action {
+       ACTION_FREE, /**< free the action entry, but don't trigger callback */
+       ACTION_TRIGGER /**< trigger callback, then free action entry */
+};
+
+static enum async_action
+process_async_request(struct pending_request *sr, const struct timespec *now)
+{
+       struct async_request_param *param;
+       struct rte_mp_reply *reply;
+       bool timeout, last_msg;
+
+       param = sr->async.param;
+       reply = &param->user_reply;
+
+       /* did we timeout? */
+       timeout = timespec_cmp(&param->end, now) <= 0;
+
+       /* if we received a response, adjust relevant data and copy mesasge. */
+       if (sr->reply_received == 1 && sr->reply) {
+               struct rte_mp_msg *msg, *user_msgs, *tmp;
+
+               msg = sr->reply;
+               user_msgs = reply->msgs;
+
+               tmp = realloc(user_msgs, sizeof(*msg) *
+                               (reply->nb_received + 1));
+               if (!tmp) {
+                       RTE_LOG(ERR, EAL, "Fail to alloc reply for request %s:%s\n",
+                               sr->dst, sr->request->name);
+                       /* this entry is going to be removed and its message
+                        * dropped, but we don't want to leak memory, so
+                        * continue.
+                        */
+               } else {
+                       user_msgs = tmp;
+                       reply->msgs = user_msgs;
+                       memcpy(&user_msgs[reply->nb_received],
+                                       msg, sizeof(*msg));
+                       reply->nb_received++;
+               }
+
+               /* mark this request as processed */
+               param->n_responses_processed++;
+       } else if (sr->reply_received == -1) {
+               /* we were asked to ignore this process */
+               reply->nb_sent--;
+       } else if (timeout) {
+               /* count it as processed response, but don't increment
+                * nb_received.
+                */
+               param->n_responses_processed++;
+       }
+
+       free(sr->reply);
+
+       last_msg = param->n_responses_processed == reply->nb_sent;
+
+       return last_msg ? ACTION_TRIGGER : ACTION_FREE;
+}
+
+static void
+trigger_async_action(struct pending_request *sr)
+{
+       struct async_request_param *param;
+       struct rte_mp_reply *reply;
+
+       param = sr->async.param;
+       reply = &param->user_reply;
+
+       param->clb(sr->request, reply);
+
+       /* clean up */
+       free(sr->async.param->user_reply.msgs);
+       free(sr->async.param);
+       free(sr->request);
+       free(sr);
+}
+
+static struct pending_request *
+async_reply_handle_thread_unsafe(void *arg)
+{
+       struct pending_request *req = (struct pending_request *)arg;
+       enum async_action action;
+       struct timespec ts_now;
+       struct timeval now;
+
+       if (gettimeofday(&now, NULL) < 0) {
+               RTE_LOG(ERR, EAL, "Cannot get current time\n");
+               goto no_trigger;
+       }
+       ts_now.tv_nsec = now.tv_usec * 1000;
+       ts_now.tv_sec = now.tv_sec;
+
+       action = process_async_request(req, &ts_now);
+
+       TAILQ_REMOVE(&pending_requests.requests, req, next);
+
+       if (rte_eal_alarm_cancel(async_reply_handle, req) < 0) {
+               /* if we failed to cancel the alarm because it's already in
+                * progress, don't proceed because otherwise we will end up
+                * handling the same message twice.
+                */
+               if (rte_errno == EINPROGRESS) {
+                       RTE_LOG(DEBUG, EAL, "Request handling is already in progress\n");
+                       goto no_trigger;
+               }
+               RTE_LOG(ERR, EAL, "Failed to cancel alarm\n");
+       }
+
+       if (action == ACTION_TRIGGER)
+               return req;
+no_trigger:
+       free(req);
+       return NULL;
+}
+
+static void
+async_reply_handle(void *arg)
+{
+       struct pending_request *req;
+
+       pthread_mutex_lock(&pending_requests.lock);
+       req = async_reply_handle_thread_unsafe(arg);
+       pthread_mutex_unlock(&pending_requests.lock);
+
+       if (req != NULL)
+               trigger_async_action(req);
+}
+
 static int
 open_socket_fd(void)
 {
+       char peer_name[PATH_MAX] = {0};
        struct sockaddr_un un;
-       const char *prefix = eal_mp_socket_path();
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+               snprintf(peer_name, sizeof(peer_name),
+                               "%d_%"PRIx64, getpid(), rte_rdtsc());
 
        mp_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
        if (mp_fd < 0) {
@@ -301,13 +526,11 @@ open_socket_fd(void)
 
        memset(&un, 0, sizeof(un));
        un.sun_family = AF_UNIX;
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               snprintf(un.sun_path, sizeof(un.sun_path), "%s", prefix);
-       else {
-               snprintf(un.sun_path, sizeof(un.sun_path), "%s_%d_%"PRIx64,
-                        prefix, getpid(), rte_rdtsc());
-       }
+
+       create_socket_path(peer_name, un.sun_path, sizeof(un.sun_path));
+
        unlink(un.sun_path); /* May still exist since last run */
+
        if (bind(mp_fd, (struct sockaddr *)&un, sizeof(un)) < 0) {
                RTE_LOG(ERR, EAL, "failed to bind %s: %s\n",
                        un.sun_path, strerror(errno));
@@ -342,54 +565,70 @@ unlink_sockets(const char *filter)
        return 0;
 }
 
-static void
-unlink_socket_by_path(const char *path)
-{
-       char *filename;
-       char *fullpath = strdup(path);
-
-       if (!fullpath)
-               return;
-       filename = basename(fullpath);
-       unlink_sockets(filename);
-       free(fullpath);
-       RTE_LOG(INFO, EAL, "Remove socket %s\n", path);
-}
-
 int
 rte_mp_channel_init(void)
 {
-       char thread_name[RTE_MAX_THREAD_NAME_LEN];
-       char *path;
-       pthread_t tid;
+       char path[PATH_MAX];
+       int dir_fd;
+       pthread_t mp_handle_tid;
+
+       /* in no shared files mode, we do not have secondary processes support,
+        * so no need to initialize IPC.
+        */
+       if (internal_config.no_shconf) {
+               RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC will be disabled\n");
+               return 0;
+       }
 
-       snprintf(mp_filter, PATH_MAX, ".%s_unix_*",
-                internal_config.hugefile_prefix);
+       /* create filter path */
+       create_socket_path("*", path, sizeof(path));
+       strlcpy(mp_filter, basename(path), sizeof(mp_filter));
 
-       path = strdup(eal_mp_socket_path());
-       snprintf(mp_dir_path, PATH_MAX, "%s", dirname(path));
-       free(path);
+       /* path may have been modified, so recreate it */
+       create_socket_path("*", path, sizeof(path));
+       strlcpy(mp_dir_path, dirname(path), sizeof(mp_dir_path));
+
+       /* lock the directory */
+       dir_fd = open(mp_dir_path, O_RDONLY);
+       if (dir_fd < 0) {
+               RTE_LOG(ERR, EAL, "failed to open %s: %s\n",
+                       mp_dir_path, strerror(errno));
+               return -1;
+       }
+
+       if (flock(dir_fd, LOCK_EX)) {
+               RTE_LOG(ERR, EAL, "failed to lock %s: %s\n",
+                       mp_dir_path, strerror(errno));
+               close(dir_fd);
+               return -1;
+       }
 
        if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
-           unlink_sockets(mp_filter)) {
+                       unlink_sockets(mp_filter)) {
                RTE_LOG(ERR, EAL, "failed to unlink mp sockets\n");
+               close(dir_fd);
                return -1;
        }
 
-       if (open_socket_fd() < 0)
+       if (open_socket_fd() < 0) {
+               close(dir_fd);
                return -1;
+       }
 
-       if (pthread_create(&tid, NULL, mp_handle, NULL) < 0) {
+       if (rte_ctrl_thread_create(&mp_handle_tid, "rte_mp_handle",
+                       NULL, mp_handle, NULL) < 0) {
                RTE_LOG(ERR, EAL, "failed to create mp thead: %s\n",
                        strerror(errno));
                close(mp_fd);
+               close(dir_fd);
                mp_fd = -1;
                return -1;
        }
 
-       /* try best to set thread name */
-       snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "rte_mp_handle");
-       rte_thread_setname(tid, thread_name);
+       /* unlock the directory */
+       flock(dir_fd, LOCK_UN);
+       close(dir_fd);
+
        return 0;
 }
 
@@ -416,7 +655,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
 
        memset(&dst, 0, sizeof(dst));
        dst.sun_family = AF_UNIX;
-       snprintf(dst.sun_path, sizeof(dst.sun_path), "%s", dst_path);
+       strlcpy(dst.sun_path, dst_path, sizeof(dst.sun_path));
 
        memset(&msgh, 0, sizeof(msgh));
        memset(control, 0, sizeof(control));
@@ -444,13 +683,12 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
        if (snd < 0) {
                rte_errno = errno;
                /* Check if it caused by peer process exits */
-               if (errno == -ECONNREFUSED) {
-                       /* We don't unlink the primary's socket here */
-                       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-                               unlink_socket_by_path(dst_path);
+               if (errno == ECONNREFUSED &&
+                               rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       unlink(dst_path);
                        return 0;
                }
-               if (errno == -ENOBUFS) {
+               if (errno == ENOBUFS) {
                        RTE_LOG(ERR, EAL, "Peer cannot receive message %s\n",
                                dst_path);
                        return 0;
@@ -466,7 +704,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
 static int
 mp_send(struct rte_mp_msg *msg, const char *peer, int type)
 {
-       int ret = 0;
+       int dir_fd, ret = 0;
        DIR *mp_dir;
        struct dirent *ent;
 
@@ -488,14 +726,32 @@ mp_send(struct rte_mp_msg *msg, const char *peer, int type)
                rte_errno = errno;
                return -1;
        }
+
+       dir_fd = dirfd(mp_dir);
+       /* lock the directory to prevent processes spinning up while we send */
+       if (flock(dir_fd, LOCK_SH)) {
+               RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
+                       mp_dir_path);
+               rte_errno = errno;
+               closedir(mp_dir);
+               return -1;
+       }
+
        while ((ent = readdir(mp_dir))) {
+               char path[PATH_MAX];
+
                if (fnmatch(mp_filter, ent->d_name, 0) != 0)
                        continue;
 
-               if (send_msg(ent->d_name, msg, type) < 0)
+               snprintf(path, sizeof(path), "%s/%s", mp_dir_path,
+                        ent->d_name);
+               if (send_msg(path, msg, type) < 0)
                        ret = -1;
        }
+       /* unlock the dir */
+       flock(dir_fd, LOCK_UN);
 
+       /* dir_fd automatically closed on closedir */
        closedir(mp_dir);
        return ret;
 }
@@ -539,25 +795,82 @@ rte_mp_sendmsg(struct rte_mp_msg *msg)
 }
 
 static int
-mp_request_one(const char *dst, struct rte_mp_msg *req,
+mp_request_async(const char *dst, struct rte_mp_msg *req,
+               struct async_request_param *param, const struct timespec *ts)
+{
+       struct rte_mp_msg *reply_msg;
+       struct pending_request *pending_req, *exist;
+       int ret;
+
+       pending_req = calloc(1, sizeof(*pending_req));
+       reply_msg = calloc(1, sizeof(*reply_msg));
+       if (pending_req == NULL || reply_msg == NULL) {
+               RTE_LOG(ERR, EAL, "Could not allocate space for sync request\n");
+               rte_errno = ENOMEM;
+               ret = -1;
+               goto fail;
+       }
+
+       pending_req->type = REQUEST_TYPE_ASYNC;
+       strlcpy(pending_req->dst, dst, sizeof(pending_req->dst));
+       pending_req->request = req;
+       pending_req->reply = reply_msg;
+       pending_req->async.param = param;
+
+       /* queue already locked by caller */
+
+       exist = find_pending_request(dst, req->name);
+       if (exist) {
+               RTE_LOG(ERR, EAL, "A pending request %s:%s\n", dst, req->name);
+               rte_errno = EEXIST;
+               ret = -1;
+               goto fail;
+       }
+
+       ret = send_msg(dst, req, MP_REQ);
+       if (ret < 0) {
+               RTE_LOG(ERR, EAL, "Fail to send request %s:%s\n",
+                       dst, req->name);
+               ret = -1;
+               goto fail;
+       } else if (ret == 0) {
+               ret = 0;
+               goto fail;
+       }
+       TAILQ_INSERT_TAIL(&pending_requests.requests, pending_req, next);
+
+       param->user_reply.nb_sent++;
+
+       if (rte_eal_alarm_set(ts->tv_sec * 1000000 + ts->tv_nsec / 1000,
+                             async_reply_handle, pending_req) < 0) {
+               RTE_LOG(ERR, EAL, "Fail to set alarm for request %s:%s\n",
+                       dst, req->name);
+               rte_panic("Fix the above shit to properly free all memory\n");
+       }
+
+       return 0;
+fail:
+       free(pending_req);
+       free(reply_msg);
+       return ret;
+}
+
+static int
+mp_request_sync(const char *dst, struct rte_mp_msg *req,
               struct rte_mp_reply *reply, const struct timespec *ts)
 {
        int ret;
-       struct timeval now;
        struct rte_mp_msg msg, *tmp;
-       struct sync_request sync_req, *exist;
-
-       sync_req.reply_received = 0;
-       strcpy(sync_req.dst, dst);
-       sync_req.request = req;
-       sync_req.reply = &msg;
-       pthread_cond_init(&sync_req.cond, NULL);
-
-       pthread_mutex_lock(&sync_requests.lock);
-       exist = find_sync_request(dst, req->name);
-       if (!exist)
-               TAILQ_INSERT_TAIL(&sync_requests.requests, &sync_req, next);
-       pthread_mutex_unlock(&sync_requests.lock);
+       struct pending_request pending_req, *exist;
+
+       pending_req.type = REQUEST_TYPE_SYNC;
+       pending_req.reply_received = 0;
+       strlcpy(pending_req.dst, dst, sizeof(pending_req.dst));
+       pending_req.request = req;
+       pending_req.reply = &msg;
+       pthread_cond_init(&pending_req.sync.cond, NULL);
+
+       exist = find_pending_request(dst, req->name);
        if (exist) {
                RTE_LOG(ERR, EAL, "A pending request %s:%s\n", dst, req->name);
                rte_errno = EEXIST;
@@ -572,33 +885,31 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
        } else if (ret == 0)
                return 0;
 
+       TAILQ_INSERT_TAIL(&pending_requests.requests, &pending_req, next);
+
        reply->nb_sent++;
 
-       pthread_mutex_lock(&sync_requests.lock);
        do {
-               pthread_cond_timedwait(&sync_req.cond, &sync_requests.lock, ts);
-               /* Check spurious wakeups */
-               if (sync_req.reply_received == 1)
-                       break;
-               /* Check if time is out */
-               if (gettimeofday(&now, NULL) < 0)
-                       break;
-               if (now.tv_sec < ts->tv_sec)
-                       break;
-               else if (now.tv_sec == ts->tv_sec &&
-                        now.tv_usec * 1000 < ts->tv_nsec)
-                       break;
-       } while (1);
-       /* We got the lock now */
-       TAILQ_REMOVE(&sync_requests.requests, &sync_req, next);
-       pthread_mutex_unlock(&sync_requests.lock);
+               ret = pthread_cond_timedwait(&pending_req.sync.cond,
+                               &pending_requests.lock, ts);
+       } while (ret != 0 && ret != ETIMEDOUT);
+
+       TAILQ_REMOVE(&pending_requests.requests, &pending_req, next);
 
-       if (sync_req.reply_received == 0) {
+       if (pending_req.reply_received == 0) {
                RTE_LOG(ERR, EAL, "Fail to recv reply for request %s:%s\n",
                        dst, req->name);
                rte_errno = ETIMEDOUT;
                return -1;
        }
+       if (pending_req.reply_received == -1) {
+               RTE_LOG(DEBUG, EAL, "Asked to ignore response\n");
+               /* not receiving this message is not an error, so decrement
+                * number of sent messages
+                */
+               reply->nb_sent--;
+               return 0;
+       }
 
        tmp = realloc(reply->msgs, sizeof(msg) * (reply->nb_received + 1));
        if (!tmp) {
@@ -614,10 +925,10 @@ mp_request_one(const char *dst, struct rte_mp_msg *req,
 }
 
 int __rte_experimental
-rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
+rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                const struct timespec *ts)
 {
-       int ret = 0;
+       int dir_fd, ret = 0;
        DIR *mp_dir;
        struct dirent *ent;
        struct timeval now;
@@ -627,6 +938,12 @@ rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 
        if (check_input(req) == false)
                return -1;
+
+       if (internal_config.no_shconf) {
+               RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
+               return 0;
+       }
+
        if (gettimeofday(&now, NULL) < 0) {
                RTE_LOG(ERR, EAL, "Faile to get current time\n");
                rte_errno = errno;
@@ -642,8 +959,12 @@ rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        reply->msgs = NULL;
 
        /* for secondary process, send request to the primary process only */
-       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-               return mp_request_one(eal_mp_socket_path(), req, reply, &end);
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+               pthread_mutex_lock(&pending_requests.lock);
+               ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
+               pthread_mutex_unlock(&pending_requests.lock);
+               return ret;
+       }
 
        /* for primary process, broadcast request, and collect reply 1 by 1 */
        mp_dir = opendir(mp_dir_path);
@@ -653,22 +974,193 @@ rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                return -1;
        }
 
+       dir_fd = dirfd(mp_dir);
+       /* lock the directory to prevent processes spinning up while we send */
+       if (flock(dir_fd, LOCK_SH)) {
+               RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
+                       mp_dir_path);
+               closedir(mp_dir);
+               rte_errno = errno;
+               return -1;
+       }
+
+       pthread_mutex_lock(&pending_requests.lock);
        while ((ent = readdir(mp_dir))) {
+               char path[PATH_MAX];
+
                if (fnmatch(mp_filter, ent->d_name, 0) != 0)
                        continue;
 
-               if (mp_request_one(ent->d_name, req, reply, &end))
+               snprintf(path, sizeof(path), "%s/%s", mp_dir_path,
+                        ent->d_name);
+
+               /* unlocks the mutex while waiting for response,
+                * locks on receive
+                */
+               if (mp_request_sync(path, req, reply, &end))
                        ret = -1;
        }
+       pthread_mutex_unlock(&pending_requests.lock);
+       /* unlock the directory */
+       flock(dir_fd, LOCK_UN);
 
+       /* dir_fd automatically closed on closedir */
        closedir(mp_dir);
        return ret;
 }
 
 int __rte_experimental
-rte_mp_reply(struct rte_mp_msg *msg, const char *peer)
+rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
+               rte_mp_async_reply_t clb)
 {
+       struct rte_mp_msg *copy;
+       struct pending_request *dummy;
+       struct async_request_param *param;
+       struct rte_mp_reply *reply;
+       int dir_fd, ret = 0;
+       DIR *mp_dir;
+       struct dirent *ent;
+       struct timeval now;
+       struct timespec *end;
+       bool dummy_used = false;
+
+       RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
+
+       if (check_input(req) == false)
+               return -1;
+
+       if (internal_config.no_shconf) {
+               RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
+               return 0;
+       }
+
+       if (gettimeofday(&now, NULL) < 0) {
+               RTE_LOG(ERR, EAL, "Faile to get current time\n");
+               rte_errno = errno;
+               return -1;
+       }
+       copy = calloc(1, sizeof(*copy));
+       dummy = calloc(1, sizeof(*dummy));
+       param = calloc(1, sizeof(*param));
+       if (copy == NULL || dummy == NULL || param == NULL) {
+               RTE_LOG(ERR, EAL, "Failed to allocate memory for async reply\n");
+               rte_errno = ENOMEM;
+               goto fail;
+       }
+
+       /* copy message */
+       memcpy(copy, req, sizeof(*copy));
+
+       param->n_responses_processed = 0;
+       param->clb = clb;
+       end = &param->end;
+       reply = &param->user_reply;
+
+       end->tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000;
+       end->tv_sec = now.tv_sec + ts->tv_sec +
+                       (now.tv_usec * 1000 + ts->tv_nsec) / 1000000000;
+       reply->nb_sent = 0;
+       reply->nb_received = 0;
+       reply->msgs = NULL;
+
+       /* we have to lock the request queue here, as we will be adding a bunch
+        * of requests to the queue at once, and some of the replies may arrive
+        * before we add all of the requests to the queue.
+        */
+       pthread_mutex_lock(&pending_requests.lock);
+
+       /* we have to ensure that callback gets triggered even if we don't send
+        * anything, therefore earlier we have allocated a dummy request. fill
+        * it, and put it on the queue if we don't send any requests.
+        */
+       dummy->type = REQUEST_TYPE_ASYNC;
+       dummy->request = copy;
+       dummy->reply = NULL;
+       dummy->async.param = param;
+       dummy->reply_received = 1; /* short-circuit the timeout */
+
+       /* for secondary process, send request to the primary process only */
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+               ret = mp_request_async(eal_mp_socket_path(), copy, param, ts);
+
+               /* if we didn't send anything, put dummy request on the queue */
+               if (ret == 0 && reply->nb_sent == 0) {
+                       TAILQ_INSERT_TAIL(&pending_requests.requests, dummy,
+                                       next);
+                       dummy_used = true;
+               }
+
+               pthread_mutex_unlock(&pending_requests.lock);
+
+               /* if we couldn't send anything, clean up */
+               if (ret != 0)
+                       goto fail;
+               return 0;
+       }
+
+       /* for primary process, broadcast request */
+       mp_dir = opendir(mp_dir_path);
+       if (!mp_dir) {
+               RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
+               rte_errno = errno;
+               goto unlock_fail;
+       }
+       dir_fd = dirfd(mp_dir);
 
+       /* lock the directory to prevent processes spinning up while we send */
+       if (flock(dir_fd, LOCK_SH)) {
+               RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
+                       mp_dir_path);
+               rte_errno = errno;
+               goto closedir_fail;
+       }
+
+       while ((ent = readdir(mp_dir))) {
+               char path[PATH_MAX];
+
+               if (fnmatch(mp_filter, ent->d_name, 0) != 0)
+                       continue;
+
+               snprintf(path, sizeof(path), "%s/%s", mp_dir_path,
+                        ent->d_name);
+
+               if (mp_request_async(path, copy, param, ts))
+                       ret = -1;
+       }
+       /* if we didn't send anything, put dummy request on the queue */
+       if (ret == 0 && reply->nb_sent == 0) {
+               TAILQ_INSERT_HEAD(&pending_requests.requests, dummy, next);
+               dummy_used = true;
+       }
+
+       /* finally, unlock the queue */
+       pthread_mutex_unlock(&pending_requests.lock);
+
+       /* unlock the directory */
+       flock(dir_fd, LOCK_UN);
+
+       /* dir_fd automatically closed on closedir */
+       closedir(mp_dir);
+
+       /* if dummy was unused, free it */
+       if (!dummy_used)
+               free(dummy);
+
+       return ret;
+closedir_fail:
+       closedir(mp_dir);
+unlock_fail:
+       pthread_mutex_unlock(&pending_requests.lock);
+fail:
+       free(dummy);
+       free(param);
+       free(copy);
+       return -1;
+}
+
+int __rte_experimental
+rte_mp_reply(struct rte_mp_msg *msg, const char *peer)
+{
        RTE_LOG(DEBUG, EAL, "reply: %s\n", msg->name);
 
        if (check_input(msg) == false)
@@ -680,5 +1172,10 @@ rte_mp_reply(struct rte_mp_msg *msg, const char *peer)
                return -1;
        }
 
+       if (internal_config.no_shconf) {
+               RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
+               return 0;
+       }
+
        return mp_send(msg, peer, MP_REP);
 }