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 201E9A0093 for ; Tue, 19 May 2020 15:00:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E92331D5DE; Tue, 19 May 2020 15:00:28 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 9FA4B1D5DE for ; Tue, 19 May 2020 15:00:27 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id 50so15760979wrc.11 for ; Tue, 19 May 2020 06:00:27 -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=swIwteHt4DPu5fK3LT2JTdGdEBvnWOUSvja7Z4ubvHE=; b=PYTL7QERysLGvnqersbfbEdNRk2hdpMGDo2l8vsCHrYaLFq7U656MONrZLckf8j6N4 EppmThge3WgM4qDkb2xf+BVZ+YbndF7n3yJYeuXjoz7azDSL8obMczZKA249bWjR7P7h USZaUZeO0DqgY2S357y38PDpeye7o0ZM9sYg08OiRe1g+7vy9XfxSS/fIQmTdNdumDif HkbjfI84x5wVWpUlZPmhlzCio5uMOhb3pHSQw99v5i1+yg/ORnb5v47homuMpJQDB/fk wCcf+mj0XHxxEnHAazts21p22gZtnM0N5qe2cU6r++zajTzjQgCnqAeboBGiqDrJ+/g/ Boyw== 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=swIwteHt4DPu5fK3LT2JTdGdEBvnWOUSvja7Z4ubvHE=; b=dvSRKgLG20IkwLF3G8m6eOHLBHPIBC945e9AWb9Oj1A/LWL70eeB3U60nBiP77/sfW gJUuE+T4LYHMp8Z3GfQ6ntblF6XEUq0FnGK+FvP7dtClkM/ECOhgaS3Rtl+q8YWXkKHg ekxfkbJJxeHWZmoj8EH8nmPnejGQ7aRj9BN6GyyeGmw4A5AzipwH/p+9T1GfjIXW6o+5 YniXi5ZVjBpq56n3Aet3aCC7KfcTbE7KZOQO3ygQuMQESabNBloGO0RLNoDyxvvXvgjN Ni/5cEqdaJIam46RpiID7Zbxjm2xIgf9cHgot6dDZ0GbLYi5FmGZo0JmcbrhCmuGU4dx J05g== X-Gm-Message-State: AOAM530u8UFovJxPtX48Haitf8Y0Q69IRvrzhOtGpsjF4Yxej000s0Il o1wKLcXRWcCuKIGU69izf88= X-Google-Smtp-Source: ABdhPJxsIx/lK/EId3eE1gyzeM7hSZPKJnE1Orizke7CECXUjvKP9c2tByebZtxIezR+j4hYw8AcIA== X-Received: by 2002:adf:f783:: with SMTP id q3mr25376585wrp.348.1589893227329; Tue, 19 May 2020 06:00:27 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q9sm3667982wmb.34.2020.05.19.06.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:26 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Date: Tue, 19 May 2020 13:54:20 +0100 Message-Id: <20200519125804.104349-70-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-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'log: fix level picked with globbing on type register' 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 da57576513a010ee80923a6cad70addc197422ea 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 c0efd5214f..975aea90db 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -302,7 +302,7 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) continue; if (opt_ll->pattern) { - if (fnmatch(opt_ll->pattern, name, 0)) + if (fnmatch(opt_ll->pattern, name, 0) == 0) level = opt_ll->level; } else { if (regexec(&opt_ll->re_match, name, 0, NULL, 0) == 0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:21.659162208 +0100 +++ 0070-log-fix-level-picked-with-globbing-on-type-register.patch 2020-05-19 13:56:18.299503260 +0100 @@ -1,8 +1,10 @@ -From b2a6d7e0484b8460374b2f058ac78bd4536b3e83 Mon Sep 17 00:00:00 2001 +From da57576513a010ee80923a6cad70addc197422ea 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. @@ -14,7 +16,6 @@ is not used a lot and could be merged with rte_log_register(). Fixes: 6ff0f81d0ef7 ("log: fix pattern matching") -Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- @@ -22,10 +23,10 @@ 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 7647a916ef..d7a5f9b641 100644 +index c0efd5214f..975aea90db 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c -@@ -320,7 +320,7 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) +@@ -302,7 +302,7 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) continue; if (opt_ll->pattern) {