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 E297741D4F for ; Thu, 23 Feb 2023 10:38:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF0764316E; Thu, 23 Feb 2023 10:38:46 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id EEAF643164 for ; Thu, 23 Feb 2023 10:38:44 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id l1so9854503wry.10 for ; Thu, 23 Feb 2023 01:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5+YpMWXwh3jGWE/0Ne7YqZH6XKhczSmEhIBVobnq6ms=; b=jWHggMmreAEsm9UGe0CNPArNgEpkmcui+wNxtG7V0GzVANKvVZ+wpSZR70rlvWWtXa z4gI7w0kOADeQOks4eXahIm/2+nsiPpRxMfP5SxOkRMBalGLKJr+asaAQRYtWC2TunLw reyoMOxxDzyWIPwhXgRqCXe1TDVtxXoXMt5L3RkbCWMekbu9LAye7O5+Xzu7pY7LmPR1 9/Z1u6DdokfAAXH8k8cKob4Rna6GRa/0Ht8N+eb8TUGPgx7nO0kHPV0lVDmlQlWvm5vQ CsJiT/uZ/RAM/Ea01Zbgs1mAFCoi4ZHPW3nyQoZJhh0P5KxGDzNMIqhAYv3lWQ7ZmlBE M+vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5+YpMWXwh3jGWE/0Ne7YqZH6XKhczSmEhIBVobnq6ms=; b=BXOZmdFb6tF2duMPws7uPhJYr+MxdMhMsV2DZBCH2HiALmbaOqE16s6z9v0lAhvNDc 0tS1EPb+Jw1BkG/L6Qk1XcQnHcghqJEhw7YpNyKqoaU8dhrBNk+tkirOpmByrYXlXw3a yPI/ICBCVM9HdOebC2sQIvy/hNsst7ufV+LprEmmYHdaL5WFKhxFbE/SVnNsP0qvUkf3 YUFcWQUXjyeNXxjAqZ4Jt5zucht05gw74Or3B3h7khTz0kxWKLfCqHLZI6sjwqKh//RF sZpg0zvviyl2vWDCWSrHtpQeJ7xJxT3tvs6c7oCMJqOqVOJ8jt0Ns0A4aypC6D+/MHed Lbtw== X-Gm-Message-State: AO0yUKWfRhNczeZrRYsILjaMPPRg3mvBgt8b6sAYQwKzHEa5RvyVR2bq n7X98kJscB9tegJkwCLfIGY= X-Google-Smtp-Source: AK7set8J6E2p6c2QgYHvCSDcMy6xmJtzNomQ3s/8Jt6AaYGKGTC2PJHrvcphUaXEIwfkCOzpx3oJgw== X-Received: by 2002:a5d:500f:0:b0:2c5:58b9:d76e with SMTP id e15-20020a5d500f000000b002c558b9d76emr10239629wrt.40.1677145124602; Thu, 23 Feb 2023 01:38:44 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id c4-20020adffb04000000b002c54241b4fesm335987wrr.80.2023.02.23.01.38.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:38:44 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Bruce Richardson , dpdk stable Subject: patch 'telemetry: fix repeat display when callback don't init dict' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:32 +0000 Message-Id: <20230223093715.3926893-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.8 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/25/23. 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/9d07f1d80f32a31d8fded7a84e2be080f0400682 Thanks. Luca Boccassi --- >From 9d07f1d80f32a31d8fded7a84e2be080f0400682 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 9 Feb 2023 01:25:33 +0000 Subject: [PATCH] telemetry: fix repeat display when callback don't init dict [ upstream commit ff50c4f9136781bae9089c596e0a12d113e1d474 ] When a telemetry callback doesn't initialize the telemetry data structure and returns a non-negative number, the telemetry will repeat to display the last result. This patch zero the data structure to avoid the problem. Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality") Signed-off-by: Chengwen Feng Reviewed-by: Bruce Richardson --- lib/librte_telemetry/telemetry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c index c3522b7173..ed00c17d9f 100644 --- a/lib/librte_telemetry/telemetry.c +++ b/lib/librte_telemetry/telemetry.c @@ -281,7 +281,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) static void perform_command(telemetry_cb fn, const char *cmd, const char *param, int s) { - struct rte_tel_data data; + struct rte_tel_data data = {0}; int ret = fn(cmd, param, &data); if (ret < 0) { -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:29.384233750 +0000 +++ 0028-telemetry-fix-repeat-display-when-callback-don-t-ini.patch 2023-02-23 09:36:28.222169866 +0000 @@ -1 +1 @@ -From ff50c4f9136781bae9089c596e0a12d113e1d474 Mon Sep 17 00:00:00 2001 +From 9d07f1d80f32a31d8fded7a84e2be080f0400682 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff50c4f9136781bae9089c596e0a12d113e1d474 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/telemetry/telemetry.c | 2 +- + lib/librte_telemetry/telemetry.c | 2 +- @@ -20,5 +21,5 @@ -diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c -index 655191bcf1..7bceadcee7 100644 ---- a/lib/telemetry/telemetry.c -+++ b/lib/telemetry/telemetry.c -@@ -333,7 +333,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) +diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c +index c3522b7173..ed00c17d9f 100644 +--- a/lib/librte_telemetry/telemetry.c ++++ b/lib/librte_telemetry/telemetry.c +@@ -281,7 +281,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s)