From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7DCBDA0093 for ; Thu, 28 May 2020 18:24:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B1961DC1B; Thu, 28 May 2020 18:24:20 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id A895D1D996 for ; Thu, 28 May 2020 18:24:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683058; 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=FKSQUZ+mHs2v6COQpKdHxel4XXlQCOzSuVlX2XCFPSo=; b=BHmZd9v8qMrFUePX+ab1ju4ZMlW6nmOPOZbEmdpy7Jyc5XocI/P/veFchcHACBADla7lka 9VuJk8x4EzNpVZ6yKkk7Bj/lSUDsR9yKQeKifpU+a9HycfZPxLhMMnNX0kN/y6Jet/RCka p71SCGGAFEi0B6TDjicFyWExw1e+vAc= 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-72-w__gZf1SOUyKGRvbfNRIPg-1; Thu, 28 May 2020 12:24:15 -0400 X-MC-Unique: w__gZf1SOUyKGRvbfNRIPg-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 610011B2C9A6; Thu, 28 May 2020 16:24:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F2F1610F2; Thu, 28 May 2020 16:24:13 +0000 (UTC) From: Kevin Traynor To: Sunil Kumar Kori Cc: David Marchand , Jerin Jacob , dpdk stable Date: Thu, 28 May 2020 17:21:51 +0100 Message-Id: <20200528162322.7863-4-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@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=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix log message print for regex' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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@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 Acked-by: David Marchand Reviewed-by: Jerin Jacob --- 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@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)