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 BBA00A0351 for ; Mon, 21 Feb 2022 16:39:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5168410F6; Mon, 21 Feb 2022 16:39:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6003A4068C for ; Mon, 21 Feb 2022 16:39:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457969; 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=uv0V1KPeb+8A74H9KOR4Kv/1wDkCwRK08Ghbayc2Iqo=; b=cHPtLEXXx5wTLMueCHbo/r7H/VI3kmWLKCuG4aqTUecNREYXxKwnPAdQLtaEaWATtlNfFa 5nsmkCyoTRdLOt26oMToFM49Yl/tw5EIlS7Cc2jXOT/l0EsRemAQLd+H5p6WBEMvOoxYYO +kWX7gS7Uw1TNJgvtvPR/BX4bgocyMM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-k69XJzlzOWyL2AKj2KG2pQ-1; Mon, 21 Feb 2022 10:39:25 -0500 X-MC-Unique: k69XJzlzOWyL2AKj2KG2pQ-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 75FA58143E5; Mon, 21 Feb 2022 15:39:24 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 518BB7E133; Mon, 21 Feb 2022 15:39:23 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , dpdk stable Subject: patch 'ethdev: fix Rx queue telemetry memory leak on failure' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:38 +0000 Message-Id: <20220221153625.152324-89-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.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/26/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/c935f2719dd828b22c0b2cd40eec2d65074cda28 Thanks. Kevin --- >From c935f2719dd828b22c0b2cd40eec2d65074cda28 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 8 Jan 2022 15:51:57 +0800 Subject: [PATCH] ethdev: fix Rx queue telemetry memory leak on failure [ upstream commit 52b49ea06ffb2cfbef8fe9578149f1e2dba99e89 ] In eth_dev_handle_port_info() allocated memory for rxq_state, we should free it when error happens, otherwise it will lead to memory leak. Fixes: 58b43c1ddfd1 ("ethdev: add telemetry endpoint for device info") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit --- lib/ethdev/rte_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index a1d475a292..29e21ad580 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6321,6 +6321,8 @@ eth_dev_handle_port_info(const char *cmd __rte_unused, txq_state = rte_tel_data_alloc(); - if (!txq_state) + if (!txq_state) { + rte_tel_data_free(rxq_state); return -ENOMEM; + } rte_tel_data_start_dict(d); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.555178033 +0000 +++ 0089-ethdev-fix-Rx-queue-telemetry-memory-leak-on-failure.patch 2022-02-21 15:22:44.184704335 +0000 @@ -1 +1 @@ -From 52b49ea06ffb2cfbef8fe9578149f1e2dba99e89 Mon Sep 17 00:00:00 2001 +From c935f2719dd828b22c0b2cd40eec2d65074cda28 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 52b49ea06ffb2cfbef8fe9578149f1e2dba99e89 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org