From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4E699A051F;
Wed, 10 Jun 2020 16:46:48 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 7AB131C05C;
Wed, 10 Jun 2020 16:46:06 +0200 (CEST)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
[207.211.31.120]) by dpdk.org (Postfix) with ESMTP id E19341C027
for <dev@dpdk.org>; Wed, 10 Jun 2020 16:46:03 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1591800363;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=knJUZyC/ntiqw8GDcULqvzgooU7U/Izm6C6BNwpdyoM=;
b=GIt9q6cHjhP715wfkvVuaK1OLC2So49FvEMpoia+Wx+ngVkbjDwgjD51Y7V+7q8R7vXDa2
87u5qd2ppcnKDqcsHzlMgjnQ65O0J7Bvrf5iN6lTfMiJwRlNDYF+A0Wc6nQzacDSgE5HnY
nIN1udkAJvZwbotKjkQsOm2G6diz5Pw=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-353-XfCMvN9WOcKrRypqSEPkWg-1; Wed, 10 Jun 2020 10:46:01 -0400
X-MC-Unique: XfCMvN9WOcKrRypqSEPkWg-1
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08B98107ACF4;
Wed, 10 Jun 2020 14:45:58 +0000 (UTC)
Received: from dmarchan.remote.csb (unknown [10.40.192.116])
by smtp.corp.redhat.com (Postfix) with ESMTP id C3A5560BF3;
Wed, 10 Jun 2020 14:45:56 +0000 (UTC)
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>
Date: Wed, 10 Jun 2020 16:45:05 +0200
Message-Id: <20200610144506.30505-7-david.marchand@redhat.com>
In-Reply-To: <20200610144506.30505-1-david.marchand@redhat.com>
References: <20200610144506.30505-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 6/7] eal: dump lcores
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Add a little helper to dump all lcores.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/librte_eal/common/eal_common_lcore.c | 32 +++++++++++++++++++++++
lib/librte_eal/common/eal_common_thread.c | 16 ++++++++----
lib/librte_eal/common/eal_thread.h | 13 +++++++--
lib/librte_eal/freebsd/eal.c | 2 +-
lib/librte_eal/freebsd/eal_thread.c | 2 +-
lib/librte_eal/include/rte_lcore.h | 10 +++++++
lib/librte_eal/linux/eal.c | 2 +-
lib/librte_eal/linux/eal_thread.c | 2 +-
lib/librte_eal/rte_eal_version.map | 1 +
9 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c
index 35d6c1295e..6aca1b2fee 100644
--- a/lib/librte_eal/common/eal_common_lcore.c
+++ b/lib/librte_eal/common/eal_common_lcore.c
@@ -245,3 +245,35 @@ eal_lcore_external_release(unsigned int lcore_id)
}
rte_spinlock_unlock(&external_lcore_lock);
}
+
+void
+rte_lcore_dump(FILE *f)
+{
+ char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+ unsigned int lcore_id;
+ const char *role;
+ int ret;
+
+ rte_spinlock_lock(&external_lcore_lock);
+ for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+ switch (rte_eal_lcore_role(lcore_id)) {
+ case ROLE_RTE:
+ role = "RTE";
+ break;
+ case ROLE_SERVICE:
+ role = "SERVICE";
+ break;
+ case ROLE_EXTERNAL:
+ role = "EXTERNAL";
+ break;
+ default:
+ continue;
+ }
+
+ ret = eal_thread_dump_affinity(&lcore_config[lcore_id].cpuset,
+ cpuset, sizeof(cpuset));
+ fprintf(f, "lcore %u, role %s, cpuset %s%s\n", lcore_id, role,
+ cpuset, ret == 0 ? "" : "...");
+ }
+ rte_spinlock_unlock(&external_lcore_lock);
+}
diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/librte_eal/common/eal_common_thread.c
index d57a6ec797..a81b192ff3 100644
--- a/lib/librte_eal/common/eal_common_thread.c
+++ b/lib/librte_eal/common/eal_common_thread.c
@@ -118,17 +118,14 @@ rte_thread_get_affinity(rte_cpuset_t *cpusetp)
}
int
-eal_thread_dump_affinity(char *str, unsigned size)
+eal_thread_dump_affinity(rte_cpuset_t *cpuset, char *str, unsigned int size)
{
- rte_cpuset_t cpuset;
unsigned cpu;
int ret;
unsigned int out = 0;
- rte_thread_get_affinity(&cpuset);
-
for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
- if (!CPU_ISSET(cpu, &cpuset))
+ if (!CPU_ISSET(cpu, cpuset))
continue;
ret = snprintf(str + out,
@@ -151,6 +148,15 @@ eal_thread_dump_affinity(char *str, unsigned size)
return ret;
}
+int
+eal_thread_dump_current_affinity(char *str, unsigned int size)
+{
+ rte_cpuset_t cpuset;
+
+ rte_thread_get_affinity(&cpuset);
+ return eal_thread_dump_affinity(&cpuset, str, size);
+}
+
void
rte_thread_init(unsigned int lcore_id, rte_cpuset_t *cpuset)
{
diff --git a/lib/librte_eal/common/eal_thread.h b/lib/librte_eal/common/eal_thread.h
index 4ecd8fd53a..13ec252e01 100644
--- a/lib/librte_eal/common/eal_thread.h
+++ b/lib/librte_eal/common/eal_thread.h
@@ -47,13 +47,15 @@ unsigned eal_cpu_socket_id(unsigned cpu_id);
#define RTE_CPU_AFFINITY_STR_LEN 256
/**
- * Dump the current pthread cpuset.
+ * Dump the cpuset as a human readable string.
* This function is private to EAL.
*
* Note:
* If the dump size is greater than the size of given buffer,
* the string will be truncated and with '\0' at the end.
*
+ * @param cpuset
+ * The CPU affinity object to dump.
* @param str
* The string buffer the cpuset will dump to.
* @param size
@@ -62,6 +64,13 @@ unsigned eal_cpu_socket_id(unsigned cpu_id);
* 0 for success, -1 if truncation happens.
*/
int
-eal_thread_dump_affinity(char *str, unsigned size);
+eal_thread_dump_affinity(rte_cpuset_t *cpuset, char *str, unsigned int size);
+
+/**
+ * Dump the current thread cpuset.
+ * This is a wrapper on eal_thread_dump_affinity().
+ */
+int
+eal_thread_dump_current_affinity(char *str, unsigned int size);
#endif /* EAL_THREAD_H */
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index b5ea11df16..69a6f7d8c4 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -886,7 +886,7 @@ rte_eal_init(int argc, char **argv)
rte_thread_init(rte_config.master_lcore,
&lcore_config[rte_config.master_lcore].cpuset);
- ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+ ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset));
RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
rte_config.master_lcore, thread_id, cpuset,
diff --git a/lib/librte_eal/freebsd/eal_thread.c b/lib/librte_eal/freebsd/eal_thread.c
index c1fb8eb2d8..b1a3619f51 100644
--- a/lib/librte_eal/freebsd/eal_thread.c
+++ b/lib/librte_eal/freebsd/eal_thread.c
@@ -92,7 +92,7 @@ eal_thread_loop(__rte_unused void *arg)
rte_thread_init(lcore_id, &lcore_config[lcore_id].cpuset);
- ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+ ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset));
RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
lcore_id, thread_id, cpuset, ret == 0 ? "" : "...");
diff --git a/lib/librte_eal/include/rte_lcore.h b/lib/librte_eal/include/rte_lcore.h
index d59c4edc67..9cf34efef4 100644
--- a/lib/librte_eal/include/rte_lcore.h
+++ b/lib/librte_eal/include/rte_lcore.h
@@ -228,6 +228,16 @@ unsigned int rte_get_next_lcore(unsigned int i, int skip_master, int wrap);
i<RTE_MAX_LCORE; \
i = rte_get_next_lcore(i, 1, 0))
+/**
+ * List all lcores.
+ *
+ * @param f
+ * The output stream where the dump should be sent.
+ */
+__rte_experimental
+void
+rte_lcore_dump(FILE *f);
+
/**
* Set core affinity of the current thread.
* Support both EAL and non-EAL thread and update TLS.
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 8638376b8a..2f0efd7cd3 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -1214,7 +1214,7 @@ rte_eal_init(int argc, char **argv)
rte_thread_init(rte_config.master_lcore,
&lcore_config[rte_config.master_lcore].cpuset);
- ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+ ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset));
RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%zx;cpuset=[%s%s])\n",
rte_config.master_lcore, (uintptr_t)thread_id, cpuset,
ret == 0 ? "" : "...");
diff --git a/lib/librte_eal/linux/eal_thread.c b/lib/librte_eal/linux/eal_thread.c
index 07aec0c44d..22d9bc8c01 100644
--- a/lib/librte_eal/linux/eal_thread.c
+++ b/lib/librte_eal/linux/eal_thread.c
@@ -92,7 +92,7 @@ eal_thread_loop(__rte_unused void *arg)
rte_thread_init(lcore_id, &lcore_config[lcore_id].cpuset);
- ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+ ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset));
RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%zx;cpuset=[%s%s])\n",
lcore_id, (uintptr_t)thread_id, cpuset, ret == 0 ? "" : "...");
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index f5b68d2815..6754d52543 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -395,6 +395,7 @@ EXPERIMENTAL {
rte_trace_save;
# added in 20.08
+ rte_lcore_dump;
rte_thread_register;
rte_thread_unregister;
};
--
2.23.0