From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6EA4FA0524 for ; Fri, 5 Feb 2021 12:20:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 686D41606BF; Fri, 5 Feb 2021 12:20:05 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 1C3804067B for ; Fri, 5 Feb 2021 12:20:04 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id 7so7333297wrz.0 for ; Fri, 05 Feb 2021 03:20:04 -0800 (PST) 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=xuhx9k1yqmUfxdA31afGYly1cEB93svXG16sw0q92bM=; b=XDooMSbAanp2DQp/AaSvddudItE8hNH7GpV0l3yqMMY/CvdulX72JeNPU+qimgB6KJ Zt5Z4Y6iB1Y7tP3o3wdFUWycWnUwGLZSqk+QQeAtX5+7L0QDmjI7e/5sQEbx3uX7F6yp WRpHrwryH8kNe1ScU9bPXZTn0kvmkb1VZfAnFGRFEJKAjEvIO6N21ajePnKV0mOpVA3w UmDYM7CxufMQLUTna6QuSXqowOYKwkfRVDZSB6mvYck+PNmsxlzVPjzVSkb/oAyTIQzV kyb9lE6hFQIByv/2Xjlpq9QSAWEVBE/bnsJBW4HRswJbFe2Si5OEiU6QANC5k6ihRHsA FNlw== 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=xuhx9k1yqmUfxdA31afGYly1cEB93svXG16sw0q92bM=; b=TBaQi0fwmaRopjd/vmQ0pyyzs5Zyg8LvlJJSn/ed5FZHKaGzBiEtYYTd1zjyHGMZnX 6qyJIujipOjhZXa2+b+Xa1EEv1D8+qK8NI37Not95tsdPcJpsGw88mJtkjGHj6UBt6a2 Ccv2yRMW0sMnwiz0F2oUkYYVt9Dzz1eJadzdfdENEgLjnaHCJYF8WR9lWc4PyE+uj4Rd qXgTb06TD1CABabdXJD29V9HBMjmySAOx6zJA7TSCgVCm0Xns49JJcA+V6IkgQVFjSn2 O9KKpULBLvVslG9fAo93kBfRpjh9S1Ggw22dYcEnJNXs9r/euTSlx3GfGtx7QUwDM8i/ Wo6w== X-Gm-Message-State: AOAM533mX9ro5aQxfpfcRcoair4yDKyeOL4iahY0WTMWEWZI5QIaN8vk JXd2Z6S3C2wXleGErLiVrBs= X-Google-Smtp-Source: ABdhPJwrgimRik9r0vGNxu97dSgyKJkQdqYp5uprTjZNAra+xbvG9oSUULYY6Jz9a1v3hUdBLtu3PQ== X-Received: by 2002:adf:e4c4:: with SMTP id v4mr4260862wrm.376.1612524003859; Fri, 05 Feb 2021 03:20:03 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h1sm11588724wrr.73.2021.02.05.03.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:20:03 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Fri, 5 Feb 2021 11:14:58 +0000 Message-Id: <20210205111920.1272063-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/procinfo: fix _filters stats reporting' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cba55caf4b1b7b556e74e689ed4de0e8ace98dc4 Thanks. Luca Boccassi --- >From cba55caf4b1b7b556e74e689ed4de0e8ace98dc4 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 19 Nov 2020 11:58:51 +0000 Subject: [PATCH] app/procinfo: fix _filters stats reporting [ upstream commit f7605e24baba5c614352ed3db0bf48d7f06e59b0 ] '_filters' is compared twice, second one will be always false, removing it using the message more relevant to the '_filters'. Fixes: 2deb6b5246d7 ("app/procinfo: add collectd format and host id") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand --- app/proc-info/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index d743209f0d..35e5b596eb 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -420,11 +420,9 @@ static void collectd_resolve_cnt_type(char *cnt_type, size_t cnt_type_len, } else if ((type_end != NULL) && (strncmp(cnt_name, "flow_", strlen("flow_"))) == 0) { if (strncmp(type_end, "_filters", strlen("_filters")) == 0) - strlcpy(cnt_type, "operations", cnt_type_len); - else if (strncmp(type_end, "_errors", strlen("_errors")) == 0) - strlcpy(cnt_type, "errors", cnt_type_len); - else if (strncmp(type_end, "_filters", strlen("_filters")) == 0) strlcpy(cnt_type, "filter_result", cnt_type_len); + else if (strncmp(type_end, "_errors", strlen("_errors")) == 0) + strlcpy(cnt_type, "errors", cnt_type_len); } else if ((type_end != NULL) && (strncmp(cnt_name, "mac_", strlen("mac_"))) == 0) { if (strncmp(type_end, "_errors", strlen("_errors")) == 0) -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:29.869284685 +0000 +++ 0012-app-procinfo-fix-_filters-stats-reporting.patch 2021-02-05 11:18:28.594687075 +0000 @@ -1 +1 @@ -From f7605e24baba5c614352ed3db0bf48d7f06e59b0 Mon Sep 17 00:00:00 2001 +From cba55caf4b1b7b556e74e689ed4de0e8ace98dc4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f7605e24baba5c614352ed3db0bf48d7f06e59b0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org