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 607BAA0555 for ; Thu, 9 Jun 2022 13:37:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B9974069C; Thu, 9 Jun 2022 13:37:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AA340406B4 for ; Thu, 9 Jun 2022 13:37:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774668; 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=x9xSM+bBMuN1/Xwr7HbUvTJieKazvscSh60bMnFvlgk=; b=YgqdvzCT5RHlRbzrAxeWjq6/pogz4idrZxQ2iG38ml+Qyc+K55PP30V//ns0ezSqFxVR8P TyGMuTp0q04K2kWGOKMqDHnPw6UeLgKxmBKAPhGaOFm/+BCX9v0zCB5HSt/3mVtrXKyNuV dRary/ype8jFVlTiNM/IAHYDHCPI6s0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-321-ooWgj-hGPNqrw8EVsDvFRA-1; Thu, 09 Jun 2022 07:37:45 -0400 X-MC-Unique: ooWgj-hGPNqrw8EVsDvFRA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 835F085A585; Thu, 9 Jun 2022 11:37:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8480518EA3; Thu, 9 Jun 2022 11:37:44 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , dpdk stable Subject: patch 'ethdev: fix memory leak in xstats telemetry' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:12 +0100 Message-Id: <20220609113701.386938-25-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.2 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/13/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b132a5c8172eb9c7a916ba16e7fc5d027e6fbbc5 Thanks. Kevin --- >From b132a5c8172eb9c7a916ba16e7fc5d027e6fbbc5 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:55 +0800 Subject: [PATCH] ethdev: fix memory leak in xstats telemetry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ] The 'eth_xstats' should be freed after telemetry dictionary setup. Fixes: c190daedb9b1 ("ethdev: add telemetry callbacks") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- lib/ethdev/rte_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 0ab5a3470d..5846e35804 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6276,4 +6276,5 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, rte_tel_data_add_dict_u64(d, xstat_names[i].name, eth_xstats[i].value); + free(eth_xstats); return 0; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.360966852 +0100 +++ 0025-ethdev-fix-memory-leak-in-xstats-telemetry.patch 2022-06-09 12:34:29.681980531 +0100 @@ -1 +1 @@ -From 2d00e2b4382d6538d305fc6f3606ecea72011f5b Mon Sep 17 00:00:00 2001 +From b132a5c8172eb9c7a916ba16e7fc5d027e6fbbc5 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 10db76c1a6..dc47543e6b 100644 +index 0ab5a3470d..5846e35804 100644 @@ -25 +26 @@ -@@ -5596,4 +5596,5 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, +@@ -6276,4 +6276,5 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,