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 4E117A0093 for ; Tue, 19 May 2020 14:58:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 21E111D625; Tue, 19 May 2020 14:58:42 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 3F84F1D5DE for ; Tue, 19 May 2020 14:58:41 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id z72so3455178wmc.2 for ; Tue, 19 May 2020 05:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/hcqNSptfE0pGlSN/oHsb/tOFLNmx+wHmwWLIES/wnc=; b=mJmZv3oW+HCgymXXTKjubnpZCstQy2GJsYd7BaCIA/s2g4wp28S7RlWpJmmi/wKU7O BVNzzUs7sZ0JPt0qSmjg15kU3VyrB/a8OZllyeQS/uTwLH4qPXbS/KdiUZRHzE0Tt6eT EKGK7jPI8/QjXt3bABFG4n/N1IahzL83EPihIclthowR/ZdVrahH8YdpvbfNLm+h0nA2 vgRqUYZYfwFUukXt0zdKEG4RB5lxLtMt3JUJq9KNLM82FgQo8yaAm1vQ83o2TvlPqJUV kEwNJPnUGnKNnsP3sfsIZ9jfjSGHfnT8qPzl4J5Z4O+BmyGikQxgtiFN0u9vN5dyaWBg 191w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/hcqNSptfE0pGlSN/oHsb/tOFLNmx+wHmwWLIES/wnc=; b=fdKaPv8MqtVSEjMvthmKZ+N2cjctFsmUv7ZewM0YN9OsWssNlOrU0xNoXjLicV6tiE u9FFvyE6HNRTq9bD+EWfTGGEiJgPuIDJnMN8+cFyBUhNs6dXqdbiL8gkb5HuBllt+b/H S8qFLAWK7PMxbm70ir4J48Ls+gDWG4wtrnCW0tRRyoAWJPloqw13Zwv+JyztkIVa5e1E C4MOeOlm79jUUBEyoZsUI6fIIC1o3i27CLbr2OJdMG/OAHFbKqmi+QEGwX+Kpn6+G/OY 422c2BCPhNckFM9OR9Ci9cLBMw4tUfn0rF6OMqx9YfRoUFuMY0roPH+DRhD38xYSguKX q+/A== X-Gm-Message-State: AOAM5331NPccKVNT/zdo5Bdx3xDguyitvBf0pRMIORnDhjpBIrM9i6F8 AGJagi22KIv2OE2KcsNWSwk= X-Google-Smtp-Source: ABdhPJw4MfcU5YDGSakk4cXIRhO+y8+F3QPwaTc6wQfxVcdbK91k7TcGNxyWYa7oTX4gYp1rmspZfg== X-Received: by 2002:a1c:6204:: with SMTP id w4mr5401750wmb.55.1589893121006; Tue, 19 May 2020 05:58:41 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q17sm4033600wmk.36.2020.05.19.05.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Sunil Kumar Kori Cc: David Marchand , Jerin Jacob , dpdk stable Date: Tue, 19 May 2020 13:53:19 +0100 Message-Id: <20200519125804.104349-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 40a7c85881a9710d3402102974bb0810e647f73f 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 a7f9c5f9bd..f791e9671d 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -1039,7 +1039,7 @@ eal_parse_log_level(const char *arg) if (regex) { if (rte_log_set_level_regexp(regex, priority) < 0) { fprintf(stderr, "cannot set log level %s,%d\n", - pattern, priority); + regex, priority); goto fail; } if (rte_log_save_regexp(regex, priority) < 0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.199442978 +0100 +++ 0009-eal-fix-log-message-print-for-regex.patch 2020-05-19 13:56:18.175501026 +0100 @@ -1,4 +1,4 @@ -From 2299c8d8e7319035819904e4ba99ca6e279018a6 Mon Sep 17 00:00:00 2001 +From 40a7c85881a9710d3402102974bb0810e647f73f 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 @@ -6,6 +6,8 @@ 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: @@ -20,7 +22,6 @@ | ~~~~~~~~~~~~~~~~~~ Fixes: 7f0bb634a140 ("log: add ability to match log type with globbing") -Cc: stable@dpdk.org Signed-off-by: Sunil Kumar Kori Acked-by: David Marchand @@ -30,10 +31,10 @@ 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 75974dd5ba..525e51e7de 100644 +index a7f9c5f9bd..f791e9671d 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c -@@ -1046,7 +1046,7 @@ eal_parse_log_level(const char *arg) +@@ -1039,7 +1039,7 @@ eal_parse_log_level(const char *arg) if (regex) { if (rte_log_set_level_regexp(regex, priority) < 0) { fprintf(stderr, "cannot set log level %s,%d\n",