eal: register non-EAL threads as lcores

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

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index 7195d57..7e11565 100644 (file)
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -29,6 +29,7 @@
 #include <rte_log.h>
 #include <rte_tailq.h>
 
+#include "eal_memcfg.h"
 #include "eal_private.h"
 #include "eal_filesystem.h"
 #include "eal_internal_cfg.h"
@@ -197,15 +198,17 @@ validate_action_name(const char *name)
        return 0;
 }
 
-int __rte_experimental
+int
 rte_mp_action_register(const char *name, rte_mp_t action)
 {
        struct action_entry *entry;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        if (validate_action_name(name) != 0)
                return -1;
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                rte_errno = ENOTSUP;
                return -1;
@@ -231,15 +234,17 @@ rte_mp_action_register(const char *name, rte_mp_t action)
        return 0;
 }
 
-void __rte_experimental
+void
 rte_mp_action_unregister(const char *name)
 {
        struct action_entry *entry;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        if (validate_action_name(name) != 0)
                return;
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                return;
        }
@@ -283,7 +288,7 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
        }
 
        if (msglen != buflen || (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC))) {
-               RTE_LOG(ERR, EAL, "truncted msg\n");
+               RTE_LOG(ERR, EAL, "truncated msg\n");
                return -1;
        }
 
@@ -315,6 +320,8 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
        struct action_entry *entry;
        struct rte_mp_msg *msg = &m->msg;
        rte_mp_t action = NULL;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        RTE_LOG(DEBUG, EAL, "msg: %s\n", msg->name);
 
@@ -350,7 +357,7 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
        pthread_mutex_unlock(&mp_mutex_action);
 
        if (!action) {
-               if (m->type == MP_REQ && !internal_config.init_complete) {
+               if (m->type == MP_REQ && !internal_conf->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
@@ -581,11 +588,13 @@ 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();
 
        /* in no shared files mode, we do not have secondary processes support,
         * so no need to initialize IPC.
         */
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC will be disabled\n");
                rte_errno = ENOTSUP;
                return -1;
@@ -801,13 +810,16 @@ check_input(const struct rte_mp_msg *msg)
        return 0;
 }
 
-int __rte_experimental
+int
 rte_mp_sendmsg(struct rte_mp_msg *msg)
 {
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
+
        if (check_input(msg) != 0)
                return -1;
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                rte_errno = ENOTSUP;
                return -1;
@@ -948,7 +960,7 @@ mp_request_sync(const char *dst, struct rte_mp_msg *req,
        return 0;
 }
 
-int __rte_experimental
+int
 rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                const struct timespec *ts)
 {
@@ -957,6 +969,8 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        struct dirent *ent;
        struct timeval now;
        struct timespec end;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
 
@@ -967,7 +981,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        if (check_input(req) != 0)
                goto end;
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                rte_errno = ENOTSUP;
                return -1;
@@ -1044,7 +1058,7 @@ end:
        return ret;
 }
 
-int __rte_experimental
+int
 rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
                rte_mp_async_reply_t clb)
 {
@@ -1058,19 +1072,22 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts,
        struct timeval now;
        struct timespec *end;
        bool dummy_used = false;
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
 
        if (check_input(req) != 0)
                return -1;
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
-               return 0;
+               rte_errno = ENOTSUP;
+               return -1;
        }
 
        if (gettimeofday(&now, NULL) < 0) {
-               RTE_LOG(ERR, EAL, "Faile to get current time\n");
+               RTE_LOG(ERR, EAL, "Failed to get current time\n");
                rte_errno = errno;
                return -1;
        }
@@ -1193,10 +1210,12 @@ fail:
        return -1;
 }
 
-int __rte_experimental
+int
 rte_mp_reply(struct rte_mp_msg *msg, const char *peer)
 {
        RTE_LOG(DEBUG, EAL, "reply: %s\n", msg->name);
+       const struct internal_config *internal_conf =
+               eal_get_internal_configuration();
 
        if (check_input(msg) != 0)
                return -1;
@@ -1207,10 +1226,50 @@ rte_mp_reply(struct rte_mp_msg *msg, const char *peer)
                return -1;
        }
 
-       if (internal_config.no_shconf) {
+       if (internal_conf->no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                return 0;
        }
 
        return mp_send(msg, peer, MP_REP);
 }
+
+/* Internally, the status of the mp feature is represented as a three-state:
+ * - "unknown" as long as no secondary process attached to a primary process
+ *   and there was no call to __rte_mp_disable yet,
+ * - "enabled" as soon as a secondary process attaches to a primary process,
+ * - "disabled" when a primary process successfully called __rte_mp_disable,
+ */
+enum mp_status {
+       MP_STATUS_UNKNOWN,
+       MP_STATUS_DISABLED,
+       MP_STATUS_ENABLED,
+};
+
+static bool
+set_mp_status(enum mp_status status)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       uint8_t expected;
+       uint8_t desired;
+
+       expected = MP_STATUS_UNKNOWN;
+       desired = status;
+       if (__atomic_compare_exchange_n(&mcfg->mp_status, &expected, desired,
+                       false, __ATOMIC_RELAXED, __ATOMIC_RELAXED))
+               return true;
+
+       return __atomic_load_n(&mcfg->mp_status, __ATOMIC_RELAXED) == desired;
+}
+
+bool
+__rte_mp_disable(void)
+{
+       return set_mp_status(MP_STATUS_DISABLED);
+}
+
+bool
+__rte_mp_enable(void)
+{
+       return set_mp_status(MP_STATUS_ENABLED);
+}