[dpdk-stable] patch 'eal: fix log message print for regex' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:21:51 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2f498474f00939ebe9827eaebb6278df709fc7c8

Thanks.

Kevin.

---
>From 2f498474f00939ebe9827eaebb6278df709fc7c8 Mon Sep 17 00:00:00 2001
From: Sunil Kumar Kori <skori at marvell.com>
Date: Mon, 9 Mar 2020 11:47:23 +0530
Subject: [PATCH] eal: fix log message print for regex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 2299c8d8e7319035819904e4ba99ca6e279018a6 ]

If user passes log-level eal parameter to enable log level based on regex
then in case of error message is being printed for pattern match instead of
regex. Following is the warning message thrown:

Compiling C object 'lib/76b5a35@@rte_eal at sta/librte_eal_common_eal_common_options.c.o'.
In function ‘eal_parse_log_level’,
   inlined from ‘eal_parse_common_option’ at ../lib/librte_eal/common/eal_common_options.c:1418:7:
../lib/librte_eal/common/eal_common_options.c:1053:4: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
 1053 |    fprintf(stderr, "cannot set log level %s,%d\n",
      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1054 |     pattern, priority);
      |     ~~~~~~~~~~~~~~~~~~

Fixes: 7f0bb634a140 ("log: add ability to match log type with globbing")

Signed-off-by: Sunil Kumar Kori <skori at marvell.com>
Acked-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Jerin Jacob <jerinj at marvell.com>
---
 lib/librte_eal/common/eal_common_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index f742d4d384..f38888edf3 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1037,5 +1037,5 @@ eal_parse_log_level(const char *arg)
 		if (rte_log_set_level_regexp(regex, priority) < 0) {
 			fprintf(stderr, "cannot set log level %s,%d\n",
-				pattern, priority);
+				regex, priority);
 			goto fail;
 		}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:12:59.395636094 +0100
+++ 0004-eal-fix-log-message-print-for-regex.patch	2020-05-28 17:12:59.028558052 +0100
@@ -1 +1 @@
-From 2299c8d8e7319035819904e4ba99ca6e279018a6 Mon Sep 17 00:00:00 2001
+From 2f498474f00939ebe9827eaebb6278df709fc7c8 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 2299c8d8e7319035819904e4ba99ca6e279018a6 ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org
@@ -33 +34 @@
-index 75974dd5ba..525e51e7de 100644
+index f742d4d384..f38888edf3 100644
@@ -36 +37 @@
-@@ -1047,5 +1047,5 @@ eal_parse_log_level(const char *arg)
+@@ -1037,5 +1037,5 @@ eal_parse_log_level(const char *arg)



More information about the stable mailing list