test/mem: disable ASan when accessing unallocated memory

[dpdk.git] / lib / eal / common / eal_common_proc.c

diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
index dc4a2ef..3130605 100644 (file)
--- a/lib/eal/common/eal_common_proc.c
+++ b/lib/eal/common/eal_common_proc.c
@@ -15,7 +15,6 @@
 #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>
@@ -27,7 +26,6 @@
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
-#include <rte_tailq.h>
 
 #include "eal_memcfg.h"
 #include "eal_private.h"
@@ -35,6 +33,7 @@
 #include "eal_internal_cfg.h"
 
 static int mp_fd = -1;
+static pthread_t mp_handle_tid;
 static char mp_filter[PATH_MAX];   /* Filter for secondary process sockets */
 static char mp_dir_path[PATH_MAX]; /* The directory path for all mp sockets */
 static pthread_mutex_t mp_mutex_action = PTHREAD_MUTEX_INITIALIZER;
@@ -281,8 +280,17 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
        msgh.msg_control = control;
        msgh.msg_controllen = sizeof(control);
 
+retry:
        msglen = recvmsg(mp_fd, &msgh, 0);
+
+       /* zero length message means socket was closed */
+       if (msglen == 0)
+               return 0;
+
        if (msglen < 0) {
+               if (errno == EINTR)
+                       goto retry;
+
                RTE_LOG(ERR, EAL, "recvmsg failed, %s\n", strerror(errno));
                return -1;
        }
@@ -310,7 +318,7 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
                RTE_LOG(ERR, EAL, "invalid received data length\n");
                return -1;
        }
-       return 0;
+       return msglen;
 }
 
 static void
@@ -383,9 +391,14 @@ mp_handle(void *arg __rte_unused)
        struct mp_msg_internal msg;
        struct sockaddr_un sa;
 
-       while (1) {
-               if (read_msg(&msg, &sa) == 0)
-                       process_msg(&msg, &sa);
+       while (mp_fd >= 0) {
+               int ret;
+
+               ret = read_msg(&msg, &sa);
+               if (ret <= 0)
+                       break;
+
+               process_msg(&msg, &sa);
        }
 
        return NULL;
@@ -567,14 +580,11 @@ open_socket_fd(void)
 }
 
 static void
-close_socket_fd(void)
+close_socket_fd(int fd)
 {
        char path[PATH_MAX];
 
-       if (mp_fd < 0)
-               return;
-
-       close(mp_fd);
+       close(fd);
        create_socket_path(peer_name, path, sizeof(path));
        unlink(path);
 }
@@ -584,7 +594,6 @@ rte_mp_channel_init(void)
 {
        char path[PATH_MAX];
        int dir_fd;
-       pthread_t mp_handle_tid;
        const struct internal_config *internal_conf =
                eal_get_internal_configuration();
 
@@ -645,7 +654,16 @@ rte_mp_channel_init(void)
 void
 rte_mp_channel_cleanup(void)
 {
-       close_socket_fd();
+       int fd;
+
+       if (mp_fd < 0)
+               return;
+
+       fd = mp_fd;
+       mp_fd = -1;
+       pthread_cancel(mp_handle_tid);
+       pthread_join(mp_handle_tid, NULL);
+       close_socket_fd(fd);
 }
 
 /**