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 6351FA0093 for ; Thu, 28 May 2020 18:25:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5AFBB1DC30; Thu, 28 May 2020 18:25:05 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id C8D111DC2F for ; Thu, 28 May 2020 18:25:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683103; 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=m7s15KvICxM84EnyVBzPfLuDOLMSOUNMV9RcZYseKxc=; b=CTwmGCwD906unLJ9SsrqvHMXkt6ipDEwlwZDjo/9C6SMqS6LTCEo0fD+1wk6ua40MEDWHc MwBxa8WTGim7BaSeto+fon3iPXXSYOOAe/2CMCGYLjTobGmmQ9eO3EpPsfQudHjyWoL6y2 Yq11it6O1vt+AqRbUfR2scoarLjCCyw= 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-8-QHuxOQxrOtSpHNY1sPQhJA-1; Thu, 28 May 2020 12:25:00 -0400 X-MC-Unique: QHuxOQxrOtSpHNY1sPQhJA-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 98E5C1005510; Thu, 28 May 2020 16:24:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF85260C05; Thu, 28 May 2020 16:24:58 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: dpdk stable Date: Thu, 28 May 2020 17:22:19 +0100 Message-Id: <20200528162322.7863-32-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=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'log: fix level picked with globbing on type register' 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/df1c0724ff3d2e6d65fe93df5e80db73882557e8 Thanks. Kevin. --- >From df1c0724ff3d2e6d65fe93df5e80db73882557e8 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 8 Apr 2020 00:47:58 +0200 Subject: [PATCH] log: fix level picked with globbing on type register [ upstream commit b2a6d7e0484b8460374b2f058ac78bd4536b3e83 ] When a log type is registered, the level can be picked by matching saved options. The check of fnmatch globbing result was reversed. The same bug was already fixed in a similar function. This one is acting in log type register function. Note: this function rte_log_register_type_and_pick_level() is not used a lot and could be merged with rte_log_register(). Fixes: 6ff0f81d0ef7 ("log: fix pattern matching") Signed-off-by: Thomas Monjalon --- lib/librte_eal/common/eal_common_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index 2c1200310d..9453fa3e9a 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -285,5 +285,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) if (opt_ll->pattern) { - if (fnmatch(opt_ll->pattern, name, 0)) + if (fnmatch(opt_ll->pattern, name, 0) == 0) level = opt_ll->level; } else { -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:00.815670365 +0100 +++ 0032-log-fix-level-picked-with-globbing-on-type-register.patch 2020-05-28 17:12:59.092556604 +0100 @@ -1 +1 @@ -From b2a6d7e0484b8460374b2f058ac78bd4536b3e83 Mon Sep 17 00:00:00 2001 +From df1c0724ff3d2e6d65fe93df5e80db73882557e8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b2a6d7e0484b8460374b2f058ac78bd4536b3e83 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 7647a916ef..d7a5f9b641 100644 +index 2c1200310d..9453fa3e9a 100644 @@ -28 +29 @@ -@@ -321,5 +321,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) +@@ -285,5 +285,5 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def)