From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>
Subject: [dpdk-dev] [PATCH 7/7] eal: add lcore hotplug notifications
Date: Wed, 10 Jun 2020 16:45:06 +0200 [thread overview]
Message-ID: <20200610144506.30505-8-david.marchand@redhat.com> (raw)
In-Reply-To: <20200610144506.30505-1-david.marchand@redhat.com>
Now that lcores can be dynamically allocated/freed, we will have to
notify DPDK components and applications of such events for cases where
per lcore context must be allocated/initialised.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/librte_eal/common/eal_common_lcore.c | 91 +++++++++++++++++++++++
lib/librte_eal/common/eal_common_thread.c | 11 ++-
lib/librte_eal/common/eal_private.h | 26 +++++++
lib/librte_eal/include/rte_lcore.h | 49 ++++++++++++
lib/librte_eal/rte_eal_version.map | 2 +
5 files changed, 178 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c
index 6aca1b2fee..3a997d8115 100644
--- a/lib/librte_eal/common/eal_common_lcore.c
+++ b/lib/librte_eal/common/eal_common_lcore.c
@@ -212,6 +212,47 @@ rte_socket_id_by_idx(unsigned int idx)
return config->numa_nodes[idx];
}
+struct lcore_notifier {
+ TAILQ_ENTRY(lcore_notifier) next;
+ rte_lcore_notifier_cb cb;
+ void *arg;
+};
+static TAILQ_HEAD(lcore_notifiers_head, lcore_notifier) lcore_notifiers =
+ TAILQ_HEAD_INITIALIZER(lcore_notifiers);
+static rte_spinlock_t lcore_notifiers_lock = RTE_SPINLOCK_INITIALIZER;
+
+void *
+rte_lcore_notifier_register(rte_lcore_notifier_cb cb, void *arg)
+{
+ struct lcore_notifier *notifier;
+
+ if (cb == NULL)
+ return NULL;
+
+ notifier = calloc(1, sizeof(*notifier));
+ if (notifier == NULL)
+ return NULL;
+
+ notifier->cb = cb;
+ notifier->arg = arg;
+ rte_spinlock_lock(&lcore_notifiers_lock);
+ TAILQ_INSERT_TAIL(&lcore_notifiers, notifier, next);
+ rte_spinlock_unlock(&lcore_notifiers_lock);
+
+ return notifier;
+}
+
+void
+rte_lcore_notifier_unregister(void *handle)
+{
+ struct lcore_notifier *notifier = handle;
+
+ rte_spinlock_lock(&lcore_notifiers_lock);
+ TAILQ_REMOVE(&lcore_notifiers, notifier, next);
+ rte_spinlock_unlock(&lcore_notifiers_lock);
+ free(notifier);
+}
+
rte_spinlock_t external_lcore_lock = RTE_SPINLOCK_INITIALIZER;
unsigned int
@@ -277,3 +318,53 @@ rte_lcore_dump(FILE *f)
}
rte_spinlock_unlock(&external_lcore_lock);
}
+
+int
+eal_lcore_external_notify_allocated(unsigned int lcore_id)
+{
+ struct lcore_notifier *notifier;
+ int ret = 0;
+
+ RTE_LOG(DEBUG, EAL, "New lcore %u.\n", lcore_id);
+ rte_spinlock_lock(&lcore_notifiers_lock);
+ TAILQ_FOREACH(notifier, &lcore_notifiers, next) {
+ if (notifier->cb(lcore_id, RTE_LCORE_EVENT_NEW_EXTERNAL,
+ notifier->arg) == 0)
+ continue;
+
+ /* Some notifier refused the new lcore, inform all notifiers
+ * that acked it.
+ */
+ RTE_LOG(DEBUG, EAL, "A lcore notifier refused new lcore %u.\n",
+ lcore_id);
+
+ notifier = TAILQ_PREV(notifier, lcore_notifiers_head, next);
+ while (notifier != NULL) {
+ notifier->cb(lcore_id,
+ RTE_LCORE_EVENT_RELEASE_EXTERNAL,
+ notifier->arg);
+ notifier = TAILQ_PREV(notifier, lcore_notifiers_head,
+ next);
+ }
+ ret = -1;
+ break;
+ }
+ rte_spinlock_unlock(&lcore_notifiers_lock);
+
+ return ret;
+}
+
+void
+eal_lcore_external_notify_removed(unsigned int lcore_id)
+{
+ struct lcore_notifier *notifier;
+
+ RTE_LOG(DEBUG, EAL, "Released lcore %u.\n", lcore_id);
+ rte_spinlock_lock(&lcore_notifiers_lock);
+ TAILQ_FOREACH_REVERSE(notifier, &lcore_notifiers, lcore_notifiers_head,
+ next) {
+ notifier->cb(lcore_id, RTE_LCORE_EVENT_RELEASE_EXTERNAL,
+ notifier->arg);
+ }
+ rte_spinlock_unlock(&lcore_notifiers_lock);
+}
diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/librte_eal/common/eal_common_thread.c
index a81b192ff3..f66d1ccaef 100644
--- a/lib/librte_eal/common/eal_common_thread.c
+++ b/lib/librte_eal/common/eal_common_thread.c
@@ -285,6 +285,12 @@ rte_thread_register(void)
rte_thread_init(lcore_id, &cpuset);
+ if (lcore_id != LCORE_ID_ANY &&
+ eal_lcore_external_notify_allocated(lcore_id) < 0) {
+ eal_lcore_external_release(lcore_id);
+ RTE_PER_LCORE(_lcore_id) = lcore_id = LCORE_ID_ANY;
+ }
+
RTE_LOG(DEBUG, EAL, "Registered thread as lcore %u.\n", lcore_id);
RTE_PER_LCORE(thread_registered) = true;
}
@@ -298,8 +304,11 @@ rte_thread_unregister(void)
return;
lcore_id = RTE_PER_LCORE(_lcore_id);
- if (lcore_id != LCORE_ID_ANY)
+ if (lcore_id != LCORE_ID_ANY) {
+ eal_lcore_external_notify_removed(lcore_id);
eal_lcore_external_release(lcore_id);
+ RTE_PER_LCORE(_lcore_id) = LCORE_ID_ANY;
+ }
rte_thread_uninit();
diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h
index 8dd850f68a..649697c368 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -283,6 +283,21 @@ uint64_t get_tsc_freq_arch(void);
*/
unsigned int eal_lcore_external_reserve(void);
+/**
+ * Evaluate all lcore notifiers with a RTE_LCORE_EVENT_NEW_EXTERNAL event for
+ * the passed lcore.
+ * If an error is returned by one of them, then this change is rolled back:
+ * all previous lcore notifiers that had acked the RTE_LCORE_EVENT_NEW_EXTERNAL
+ * event receive a RTE_LCORE_EVENT_RELEASE_EXTERNAL event for the passed lcore.
+ *
+ * @param lcore_id
+ * The lcore to consider.
+ * @return
+ * - 0 if all notifiers agreed on the new lcore
+ * - -1 if one of them refused
+ */
+int eal_lcore_external_notify_allocated(unsigned int lcore_id);
+
/**
* Release an external lcore.
*
@@ -291,6 +306,17 @@ unsigned int eal_lcore_external_reserve(void);
*/
void eal_lcore_external_release(unsigned int lcore_id);
+/**
+ * Evaluate all lcore notifiers with a RTE_LCORE_EVENT_RELEASE_EXTERNAL event
+ * for the passed lcore.
+ * This function must be called with a lcore that successfully passed
+ * eal_lcore_external_notify_allocated().
+ *
+ * @param lcore_id
+ * The lcore with role ROLE_EXTERNAL to release.
+ */
+void eal_lcore_external_notify_removed(unsigned int lcore_id);
+
/**
* Prepare physical memory mapping
* i.e. hugepages on Linux and
diff --git a/lib/librte_eal/include/rte_lcore.h b/lib/librte_eal/include/rte_lcore.h
index 9cf34efef4..e0fec33d5a 100644
--- a/lib/librte_eal/include/rte_lcore.h
+++ b/lib/librte_eal/include/rte_lcore.h
@@ -238,6 +238,55 @@ __rte_experimental
void
rte_lcore_dump(FILE *f);
+enum rte_lcore_event_type {
+ RTE_LCORE_EVENT_NEW_EXTERNAL,
+ RTE_LCORE_EVENT_RELEASE_EXTERNAL,
+};
+
+/**
+ * Callback prototype for getting lcore events.
+ *
+ * @param lcore_id
+ * The lcore to consider for this event.
+ * @param event
+ * The type of event on the lcore.
+ * @param arg
+ * An opaque pointer passed at notifier registration.
+ * @return
+ * - -1 when refusing this event,
+ * - 0 otherwise.
+ */
+typedef int (*rte_lcore_notifier_cb)(unsigned int lcore_id,
+ enum rte_lcore_event_type event, void *arg);
+
+/**
+ * Register a lcore notifier.
+ *
+ * @param cb
+ * The callback invoked for each lcore event with the arg argument.
+ * See rte_lcore_notifier_cb description.
+ * @param arg
+ * An optional argument that gets passed to the callback when it gets
+ * invoked.
+ * @return
+ * On success, returns an opaque pointer for the created notifier.
+ * NULL on failure.
+ */
+__rte_experimental
+void *
+rte_lcore_notifier_register(rte_lcore_notifier_cb cb, void *arg);
+
+/**
+ * Unregister a lcore notifier.
+ *
+ * @param handle
+ * The handle pointer returned by a former successful call to
+ * rte_lcore_notifier_register.
+ */
+__rte_experimental
+void
+rte_lcore_notifier_unregister(void *handle);
+
/**
* Set core affinity of the current thread.
* Support both EAL and non-EAL thread and update TLS.
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index 6754d52543..1e6f2aaacc 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -396,6 +396,8 @@ EXPERIMENTAL {
# added in 20.08
rte_lcore_dump;
+ rte_lcore_notifier_register;
+ rte_lcore_notifier_unregister;
rte_thread_register;
rte_thread_unregister;
};
--
2.23.0
next prev parent reply other threads:[~2020-06-10 14:46 UTC|newest]
Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 14:44 [dpdk-dev] [PATCH 0/7] Register external threads as lcore David Marchand
2020-06-10 14:45 ` [dpdk-dev] [PATCH 1/7] eal: relocate per thread symbols to common David Marchand
2020-06-10 14:45 ` [dpdk-dev] [PATCH 2/7] eal: fix multiple definition of per lcore thread id David Marchand
2020-06-15 6:46 ` Kinsella, Ray
2020-06-10 14:45 ` [dpdk-dev] [PATCH 3/7] eal: introduce thread init helper David Marchand
2020-06-10 14:45 ` [dpdk-dev] [PATCH 4/7] eal: introduce thread uninit helper David Marchand
2020-06-10 14:45 ` [dpdk-dev] [PATCH 5/7] eal: register non-EAL threads as lcore David Marchand
2020-06-15 6:43 ` Kinsella, Ray
2020-06-10 14:45 ` [dpdk-dev] [PATCH 6/7] eal: dump lcores David Marchand
2020-06-15 6:40 ` Kinsella, Ray
2020-06-10 14:45 ` David Marchand [this message]
2020-06-15 6:34 ` [dpdk-dev] [PATCH 7/7] eal: add lcore hotplug notifications Kinsella, Ray
2020-06-15 7:13 ` David Marchand
2020-06-10 15:09 ` [dpdk-dev] [PATCH 0/7] Register external threads as lcore Jerin Jacob
2020-06-10 15:13 ` Bruce Richardson
2020-06-10 15:18 ` David Marchand
2020-06-10 15:33 ` Jerin Jacob
2020-06-15 7:11 ` David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 0/9] Register non-EAL " David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 1/9] eal: relocate per thread symbols to common David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 2/9] eal: fix multiple definition of per lcore thread id David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 3/9] eal: introduce thread init helper David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 4/9] eal: introduce thread uninit helper David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 5/9] eal: move lcore role code David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 6/9] eal: register non-EAL threads as lcores David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 7/9] eal: add lcore init callbacks David Marchand
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 8/9] eal: add lcore iterators David Marchand
2020-06-20 2:21 ` Stephen Hemminger
2020-06-19 16:22 ` [dpdk-dev] [PATCH v2 9/9] mempool/bucket: handle non-EAL lcores David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 0/9] Register non-EAL threads as lcore David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 1/9] eal: relocate per thread symbols to common David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 2/9] eal: fix multiple definition of per lcore thread id David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 3/9] eal: introduce thread init helper David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 4/9] eal: introduce thread uninit helper David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 5/9] eal: move lcore role code David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 6/9] eal: register non-EAL threads as lcores David Marchand
2020-06-22 15:49 ` Ananyev, Konstantin
2020-06-22 16:37 ` Ananyev, Konstantin
2020-06-23 7:49 ` David Marchand
2020-06-23 9:14 ` Bruce Richardson
2020-06-23 12:49 ` David Marchand
2020-06-23 13:15 ` Ananyev, Konstantin
2020-06-24 9:23 ` David Marchand
2020-06-24 9:56 ` Bruce Richardson
2020-06-24 10:08 ` Thomas Monjalon
2020-06-24 10:45 ` Ananyev, Konstantin
2020-06-24 10:39 ` Ananyev, Konstantin
2020-06-24 10:48 ` David Marchand
2020-06-24 11:59 ` Ananyev, Konstantin
2020-06-26 14:43 ` David Marchand
2020-06-30 10:35 ` Thomas Monjalon
2020-06-30 12:07 ` Ananyev, Konstantin
2020-06-30 12:44 ` Olivier Matz
2020-06-30 14:37 ` Thomas Monjalon
2020-06-30 19:02 ` Ananyev, Konstantin
2020-06-30 14:35 ` Thomas Monjalon
2020-06-30 18:57 ` Ananyev, Konstantin
2020-07-01 7:48 ` David Marchand
2020-07-01 11:58 ` Ananyev, Konstantin
2020-07-02 13:06 ` David Marchand
2020-07-03 15:15 ` Thomas Monjalon
2020-07-03 16:40 ` Ananyev, Konstantin
2020-07-04 15:00 ` David Marchand
2020-07-04 21:24 ` Ananyev, Konstantin
2020-06-23 17:02 ` Andrew Rybchenko
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 7/9] eal: add lcore init callbacks David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 8/9] eal: add lcore iterators David Marchand
2020-06-22 13:25 ` [dpdk-dev] [PATCH v3 9/9] mempool/bucket: handle non-EAL lcores David Marchand
2020-06-23 17:28 ` Andrew Rybchenko
2020-06-26 14:13 ` David Marchand
2020-06-26 14:34 ` Andrew Rybchenko
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 0/9] Register non-EAL threads as lcore David Marchand
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 1/9] eal: relocate per thread symbols to common David Marchand
2020-06-30 9:33 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 2/9] eal: fix multiple definition of per lcore thread id David Marchand
2020-06-30 9:34 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 3/9] eal: introduce thread init helper David Marchand
2020-06-30 9:37 ` Olivier Matz
2020-06-30 12:04 ` David Marchand
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 4/9] eal: introduce thread uninit helper David Marchand
2020-06-26 15:00 ` Jerin Jacob
2020-06-29 9:07 ` David Marchand
2020-06-29 8:59 ` [dpdk-dev] [EXT] " Sunil Kumar Kori
2020-06-29 9:25 ` David Marchand
2020-06-30 9:42 ` [dpdk-dev] " Olivier Matz
2020-07-01 8:00 ` David Marchand
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 5/9] eal: move lcore role code David Marchand
2020-06-30 9:45 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 6/9] eal: register non-EAL threads as lcores David Marchand
2020-06-29 14:27 ` Ananyev, Konstantin
2020-06-30 10:07 ` Olivier Matz
2020-07-01 7:13 ` David Marchand
2020-07-01 9:11 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 7/9] eal: add lcore init callbacks David Marchand
2020-06-29 12:46 ` Ananyev, Konstantin
2020-06-30 10:09 ` Olivier Matz
2020-06-30 10:15 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 8/9] eal: add lcore iterators David Marchand
2020-06-30 10:11 ` Olivier Matz
2020-06-26 14:47 ` [dpdk-dev] [PATCH v4 9/9] mempool/bucket: handle non-EAL lcores David Marchand
2020-06-26 14:52 ` Andrew Rybchenko
2020-07-06 14:15 ` [dpdk-dev] [PATCH v5 00/10] Register non-EAL threads as lcore David Marchand
2020-07-06 14:15 ` [dpdk-dev] [PATCH v5 01/10] eal: relocate per thread symbols to common David Marchand
2020-07-06 14:15 ` [dpdk-dev] [PATCH v5 02/10] eal: fix multiple definition of per lcore thread id David Marchand
2020-07-06 14:15 ` [dpdk-dev] [PATCH v5 03/10] eal: introduce thread init helper David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 04/10] eal: introduce thread uninit helper David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 05/10] eal: move lcore role code David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 06/10] eal: register non-EAL threads as lcores David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 07/10] eal: add lcore init callbacks David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 08/10] eal: add lcore iterators David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 09/10] mempool/bucket: handle non-EAL lcores David Marchand
2020-07-06 14:16 ` [dpdk-dev] [PATCH v5 10/10] eal: add multiprocess disable API David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 00/10] Register non-EAL threads as lcore David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 01/10] eal: relocate per thread symbols to common David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 02/10] eal: fix multiple definition of per lcore thread id David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 03/10] eal: introduce thread init helper David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 04/10] eal: introduce thread uninit helper David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 05/10] eal: move lcore role code David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 06/10] eal: register non-EAL threads as lcores David Marchand
2022-11-03 9:02 ` Morten Brørup
2022-11-03 10:15 ` Thomas Monjalon
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 07/10] eal: add lcore init callbacks David Marchand
2022-12-15 9:05 ` Morten Brørup
2022-12-15 9:09 ` David Marchand
2022-12-15 10:21 ` Morten Brørup
2022-12-16 8:09 ` David Marchand
2022-12-16 9:55 ` Morten Brørup
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 08/10] eal: add lcore iterators David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 09/10] mempool/bucket: handle non-EAL lcores David Marchand
2020-07-06 20:52 ` [dpdk-dev] [PATCH v6 10/10] eal: add multiprocess disable API David Marchand
2020-07-06 23:22 ` [dpdk-dev] [PATCH v6 00/10] Register non-EAL threads as lcore Ananyev, Konstantin
2020-07-08 13:05 ` David Marchand
2020-07-08 13:06 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200610144506.30505-8-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=mdr@ashroe.eu \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).