#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"
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))
+ if (validate_action_name(name) != 0)
return -1;
+ if (internal_conf->no_shconf) {
+ RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
+ rte_errno = ENOTSUP;
+ return -1;
+ }
+
entry = malloc(sizeof(struct action_entry));
if (entry == NULL) {
rte_errno = ENOMEM;
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 (validate_action_name(name))
+ if (internal_conf->no_shconf) {
+ RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
return;
+ }
pthread_mutex_lock(&mp_mutex_action);
entry = find_action_entry_by_name(name);
}
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;
}
break;
}
}
-
+ /* sanity-check the response */
+ if (m->msg.num_fds < 0 || m->msg.num_fds > RTE_MP_MAX_FD_NUM) {
+ RTE_LOG(ERR, EAL, "invalid number of fd's received\n");
+ return -1;
+ }
+ if (m->msg.len_param < 0 || m->msg.len_param > RTE_MP_MAX_PARAM_LEN) {
+ RTE_LOG(ERR, EAL, "invalid received data length\n");
+ return -1;
+ }
return 0;
}
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);
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
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");
- return 0;
+ rte_errno = ENOTSUP;
+ return -1;
}
/* create filter path */
return ret;
}
-static bool
+static int
check_input(const struct rte_mp_msg *msg)
{
if (msg == NULL) {
RTE_LOG(ERR, EAL, "Msg cannot be NULL\n");
rte_errno = EINVAL;
- return false;
+ return -1;
}
- if (validate_action_name(msg->name))
- return false;
+ if (validate_action_name(msg->name) != 0)
+ return -1;
+
+ if (msg->len_param < 0) {
+ RTE_LOG(ERR, EAL, "Message data length is negative\n");
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ if (msg->num_fds < 0) {
+ RTE_LOG(ERR, EAL, "Number of fd's is negative\n");
+ rte_errno = EINVAL;
+ return -1;
+ }
if (msg->len_param > RTE_MP_MAX_PARAM_LEN) {
RTE_LOG(ERR, EAL, "Message data is too long\n");
rte_errno = E2BIG;
- return false;
+ return -1;
}
if (msg->num_fds > RTE_MP_MAX_FD_NUM) {
RTE_LOG(ERR, EAL, "Cannot send more than %d FDs\n",
RTE_MP_MAX_FD_NUM);
rte_errno = E2BIG;
- return false;
+ return -1;
}
- return true;
+ return 0;
}
-int __rte_experimental
+int
rte_mp_sendmsg(struct rte_mp_msg *msg)
{
- if (!check_input(msg))
+ const struct internal_config *internal_conf =
+ eal_get_internal_configuration();
+
+ if (check_input(msg) != 0)
+ return -1;
+
+ if (internal_conf->no_shconf) {
+ RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
+ rte_errno = ENOTSUP;
return -1;
+ }
RTE_LOG(DEBUG, EAL, "sendmsg: %s\n", msg->name);
return mp_send(msg, NULL, MP_MSG);
return 0;
}
-int __rte_experimental
+int
rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
const struct timespec *ts)
{
- int dir_fd, ret = 0;
+ int dir_fd, ret = -1;
DIR *mp_dir;
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);
reply->nb_received = 0;
reply->msgs = NULL;
- if (check_input(req) == false)
- goto err;
+ 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");
- return 0;
+ rte_errno = ENOTSUP;
+ return -1;
}
if (gettimeofday(&now, NULL) < 0) {
RTE_LOG(ERR, EAL, "Failed to get current time\n");
rte_errno = errno;
- goto err;
+ goto end;
}
end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000;
pthread_mutex_lock(&pending_requests.lock);
ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
pthread_mutex_unlock(&pending_requests.lock);
- if (ret)
- goto err;
- return ret;
+ goto end;
}
/* for primary process, broadcast request, and collect reply 1 by 1 */
if (!mp_dir) {
RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
rte_errno = errno;
- goto err;
+ goto end;
}
dir_fd = dirfd(mp_dir);
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;
- goto err;
+ goto close_end;
}
pthread_mutex_lock(&pending_requests.lock);
* locks on receive
*/
if (mp_request_sync(path, req, reply, &end))
- goto err;
+ goto unlock_end;
}
+ ret = 0;
+
+unlock_end:
pthread_mutex_unlock(&pending_requests.lock);
/* unlock the directory */
flock(dir_fd, LOCK_UN);
+close_end:
/* dir_fd automatically closed on closedir */
closedir(mp_dir);
- return ret;
-err:
- free(reply->msgs);
- reply->nb_received = 0;
- reply->msgs = NULL;
- return -1;
+end:
+ if (ret) {
+ free(reply->msgs);
+ reply->nb_received = 0;
+ reply->msgs = NULL;
+ }
+ 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)
{
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) == false)
+ 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;
}
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) == false)
+ if (check_input(msg) != 0)
return -1;
if (peer == NULL) {
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);
+}
git.droids-corp.org / dpdk.git / blobdiff