From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 70C5745965;
Wed, 18 Sep 2024 06:59:44 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 04C3A42DAC;
Wed, 18 Sep 2024 06:58:55 +0200 (CEST)
Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com
[209.85.214.172])
by mails.dpdk.org (Postfix) with ESMTP id DEAC2427C7
for <dev@dpdk.org>; Wed, 18 Sep 2024 06:58:46 +0200 (CEST)
Received: by mail-pl1-f172.google.com with SMTP id
d9443c01a7336-2053a0bd0a6so66970065ad.3
for <dev@dpdk.org>; Tue, 17 Sep 2024 21:58:46 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1726635526;
x=1727240326; darn=dpdk.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ZPE+pPdfYCg6Sf+d9oIkSn8+8O4tA2VgLsJZvUjRk8I=;
b=QZoVMZ6TpXsmuoWPIENbDd4G9x90uT0Sl7XB3UsF4YVEjqpUTtJ0KGon/hlsyvw3/7
vs/kpb/mWF4oy5PJ5OqadOjcaFiF+mKiGA7Mj6dP0of8Z7GV7n7VYm+gfZXuidaRl7Ty
u2qcPjlHVLTaMizXQVivusKUO+nuvaBV5InRc5vcgcISMn5bbKqcj2c6pO9cqQMSZk7F
VptcMsctrK7Ob2pK+VKIOo8ApN5q1L2ULBV8jYTscsi41iCcqFzGQ9EAA8DV+8FymHeO
wlzC2zCH0bAgiI5xd9p5Z6iNtaTlUiGXGiJeQ18wKtTi8XfEGQj7Y3GgPJlZVpDLJd6a
pj5A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1726635526; x=1727240326;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ZPE+pPdfYCg6Sf+d9oIkSn8+8O4tA2VgLsJZvUjRk8I=;
b=lBl94w6Ge/aBGK8qTog0kE3iR5pcn7Kn2u5XFvCJTJwvdXZN01YSbnOtJkrFg+JqVr
kT8dGBT23X1dIXwzclsQKuZc8WLnR/0/25hAbz+NUf2wUQaUR4QNw/eA1FWbhg57BRRg
Ujuq6HilBqKJo0gwC50lxcfDbivFy0HZsj0eYJZi1zBv7Si0jdoi1r5Sq4WPzafE4fwC
Ez1SkhL1qJQSRLY/20SHMPns3ykMFEkBgSEhFfv8XbgoZo4bdzFx+PoX1MKK+zK3V7Wk
MTP+m3gI+57kbB4UrzPYuEe/wrFlZcU9FEYQObV2VvYmBybvegYKK1Jy5JzIOhCeTUiP
GUOw==
X-Gm-Message-State: AOJu0YzbkUhOMojNmgZrkux3kapUja95+0hczKenAS0tnlqskQPEhBtg
8E5za0/Midj0kktnPtPSyp9aeNK0bPSOmxzLSH/H662xpwMQyGOzhKw5tiAlr+823g5epfa1mYw
J
X-Google-Smtp-Source: AGHT+IEuu1idYin4O1n1Re3UX2kyHSGXxmNk6GBDay1q316aiOEeNRvmZ/elA7JqMq8+imRUglVPIw==
X-Received: by 2002:a17:903:32c3:b0:205:8212:1f2f with SMTP id
d9443c01a7336-2076e315789mr335510835ad.10.1726635525988;
Tue, 17 Sep 2024 21:58:45 -0700 (PDT)
Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-20794746d76sm57179245ad.292.2024.09.17.21.58.45
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Sep 2024 21:58:45 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Tyler Retzlaff <roretzla@linux.microsoft.com>,
=?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>
Subject: [PATCH v23 08/15] eal: initialize log before everything else
Date: Tue, 17 Sep 2024 21:56:13 -0700
Message-ID: <20240918045830.3798-9-stephen@networkplumber.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240918045830.3798-1-stephen@networkplumber.org>
References: <20200814173441.23086-1-stephen@networkplumber.org>
<20240918045830.3798-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
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
In order for all log messages (including CPU mismatch) to
come out through the logging library, it must be initialized
as early in rte_eal_init() as possible on all platforms.
Where it was done before was likely historical based on
the support of non-OS isolated CPU's which required a shared
memory buffer; that support was dropped before DPDK was
publicly released.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/eal/freebsd/eal.c | 12 +++++++++---
lib/eal/linux/eal.c | 19 +++++++++----------
lib/eal/windows/eal.c | 8 ++++++--
lib/log/log_freebsd.c | 3 +--
lib/log/log_internal.h | 2 +-
lib/log/log_linux.c | 14 ++++++--------
lib/log/log_windows.c | 4 +---
7 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index a609d40ee0..118c1f593b 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -52,6 +52,7 @@
#include "eal_options.h"
#include "eal_memcfg.h"
#include "eal_trace.h"
+#include "log_internal.h"
#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -546,6 +547,14 @@ rte_eal_init(int argc, char **argv)
bool has_phys_addr;
enum rte_iova_mode iova_mode;
+ /* setup log as early as possible */
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
+ eal_log_init(getprogname());
+
/* checks if the machine is adequate */
if (!rte_cpu_is_supported()) {
rte_eal_init_alert("unsupported cpu type.");
@@ -572,9 +581,6 @@ rte_eal_init(int argc, char **argv)
/* clone argv to report out later in telemetry */
eal_save_args(argc, argv);
- /* set log level as early as possible */
- eal_log_level_parse(argc, argv);
-
if (rte_eal_cpu_init() < 0) {
rte_eal_init_alert("Cannot detect lcores.");
rte_errno = ENOTSUP;
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 5aedd348d1..fab633976d 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -936,6 +936,15 @@ rte_eal_init(int argc, char **argv)
struct internal_config *internal_conf =
eal_get_internal_configuration();
+ /* setup log as early as possible */
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ eal_log_init(program_invocation_short_name);
+
/* checks if the machine is adequate */
if (!rte_cpu_is_supported()) {
rte_eal_init_alert("unsupported cpu type.");
@@ -959,9 +968,6 @@ rte_eal_init(int argc, char **argv)
eal_reset_internal_config(internal_conf);
- /* set log level as early as possible */
- eal_log_level_parse(argc, argv);
-
/* clone argv to report out later in telemetry */
eal_save_args(argc, argv);
@@ -1113,13 +1119,6 @@ rte_eal_init(int argc, char **argv)
#endif
}
- if (eal_log_init(program_invocation_short_name) < 0) {
- rte_eal_init_alert("Cannot init logging.");
- rte_errno = ENOMEM;
- rte_atomic_store_explicit(&run_once, 0, rte_memory_order_relaxed);
- return -1;
- }
-
#ifdef VFIO_PRESENT
if (rte_eal_vfio_setup() < 0) {
rte_eal_init_alert("Cannot init VFIO");
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index 69a8fc8d80..c9648b7da7 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -250,9 +250,13 @@ rte_eal_init(int argc, char **argv)
char cpuset[RTE_CPU_AFFINITY_STR_LEN];
char thread_name[RTE_THREAD_NAME_SIZE];
- eal_log_init(NULL);
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
- eal_log_level_parse(argc, argv);
+ eal_log_init(NULL);
if (eal_create_cpu_map() < 0) {
rte_eal_init_alert("Cannot discover CPU and NUMA.");
diff --git a/lib/log/log_freebsd.c b/lib/log/log_freebsd.c
index 953e371bee..33a0925c43 100644
--- a/lib/log/log_freebsd.c
+++ b/lib/log/log_freebsd.c
@@ -5,8 +5,7 @@
#include <rte_common.h>
#include "log_internal.h"
-int
+void
eal_log_init(__rte_unused const char *id)
{
- return 0;
}
diff --git a/lib/log/log_internal.h b/lib/log/log_internal.h
index cb15cdff08..d5fabd7ef7 100644
--- a/lib/log/log_internal.h
+++ b/lib/log/log_internal.h
@@ -14,7 +14,7 @@
* Initialize the default log stream.
*/
__rte_internal
-int eal_log_init(const char *id);
+void eal_log_init(const char *id);
/*
* Determine where log data is written when no call to rte_openlog_stream.
diff --git a/lib/log/log_linux.c b/lib/log/log_linux.c
index 47aa074da2..6d7dc8f3ab 100644
--- a/lib/log/log_linux.c
+++ b/lib/log/log_linux.c
@@ -87,18 +87,16 @@ static cookie_io_functions_t console_log_func = {
* set the log to default function, called during eal init process,
* once memzones are available.
*/
-int
+void
eal_log_init(const char *id)
{
FILE *log_stream;
- log_stream = fopencookie(NULL, "w+", console_log_func);
- if (log_stream == NULL)
- return -1;
-
openlog(id, LOG_NDELAY | LOG_PID, log_facility);
- eal_log_set_default(log_stream);
-
- return 0;
+ log_stream = fopencookie(NULL, "w+", console_log_func);
+ if (log_stream != NULL)
+ eal_log_set_default(log_stream);
+ else
+ eal_log_set_default(stderr);
}
diff --git a/lib/log/log_windows.c b/lib/log/log_windows.c
index a3a756351d..d7c30e4cfa 100644
--- a/lib/log/log_windows.c
+++ b/lib/log/log_windows.c
@@ -13,12 +13,10 @@ eal_log_syslog(const char *name __rte_unused)
}
/* set the log to default function, called during eal init process. */
-int
+void
eal_log_init(__rte_unused const char *id)
{
rte_openlog_stream(stderr);
eal_log_set_default(stderr);
-
- return 0;
}
--
2.45.2