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 2B0FD45804 for ; Fri, 23 Aug 2024 18:20:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24B5B43381; Fri, 23 Aug 2024 18:20:05 +0200 (CEST) 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 83A5740295 for ; Fri, 23 Aug 2024 18:20:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430003; 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=EU4j2Tn9z70RAbQn6OIETxd39GtF3ipJirU7haP5usg=; b=IBoVNobNJXvs3ST26olHKd1Uk4iHFKXNMqqfOMMpnvyOdju2OzD0X7fVOqAsJGWg3vYHvG lGbccmbJ8GGwGJrQwzdqcb1UQ0n5CtoQP3yKhF/7pSxHiqJ5FgXeuXUu/mSTDWdOomymcG mnY6/NUjfwfQhLuTButUX2BAC7WN0G8= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-108-jvfmmg64MkOU8jNLpyp7xQ-1; Fri, 23 Aug 2024 12:19:59 -0400 X-MC-Unique: jvfmmg64MkOU8jNLpyp7xQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A528E1955BF8; Fri, 23 Aug 2024 16:19:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BD6A1956053; Fri, 23 Aug 2024 16:19:56 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix double free for Rx/Tx queue' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:17 +0100 Message-ID: <20240823161929.1004778-9-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.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 08/28/24. 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/46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f Thanks. Kevin --- >From 46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:21 +0800 Subject: [PATCH] net/hns3: fix double free for Rx/Tx queue [ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ] The Pointers to some resources on the Rx/Tx queue need to be set to NULL after free inside the hns3_rx/tx_queue_release(), as this function is called from multiple threads (reset thread, device config thread, etc), leading to double memory free error. Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index deda150a5b..cbd09e69d0 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -87,8 +87,12 @@ hns3_rx_queue_release(void *queue) if (rxq) { hns3_rx_queue_release_mbufs(rxq); - if (rxq->mz) + if (rxq->mz) { rte_memzone_free(rxq->mz); - if (rxq->sw_ring) + rxq->mz = NULL; + } + if (rxq->sw_ring) { rte_free(rxq->sw_ring); + rxq->sw_ring = NULL; + } rte_free(rxq); } @@ -101,10 +105,16 @@ hns3_tx_queue_release(void *queue) if (txq) { hns3_tx_queue_release_mbufs(txq); - if (txq->mz) + if (txq->mz) { rte_memzone_free(txq->mz); - if (txq->sw_ring) + txq->mz = NULL; + } + if (txq->sw_ring) { rte_free(txq->sw_ring); - if (txq->free) + txq->sw_ring = NULL; + } + if (txq->free) { rte_free(txq->free); + txq->free = NULL; + } rte_free(txq); } -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.303464061 +0100 +++ 0009-net-hns3-fix-double-free-for-Rx-Tx-queue.patch 2024-08-23 17:18:09.622429763 +0100 @@ -1 +1 @@ -From bbf6fcc0cc62031a26517608a471873339423d8c Mon Sep 17 00:00:00 2001 +From 46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/hns3/hns3_rxtx.c | 23 ++++++++++++++++++----- - 1 file changed, 18 insertions(+), 5 deletions(-) + drivers/net/hns3/hns3_rxtx.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) @@ -21 +22 @@ -index 55311402fe..bf10da1928 100644 +index deda150a5b..cbd09e69d0 100644 @@ -24 +25 @@ -@@ -87,7 +87,12 @@ hns3_rx_queue_release(void *queue) +@@ -87,8 +87,12 @@ hns3_rx_queue_release(void *queue) @@ -30 +31 @@ -- rte_free(rxq->sw_ring); +- if (rxq->sw_ring) @@ -34 +35 @@ -+ rte_free(rxq->sw_ring); + rte_free(rxq->sw_ring); @@ -39 +40 @@ -@@ -100,8 +105,16 @@ hns3_tx_queue_release(void *queue) +@@ -101,10 +105,16 @@ hns3_tx_queue_release(void *queue) @@ -45,2 +46 @@ -- rte_free(txq->sw_ring); -- rte_free(txq->free); +- if (txq->sw_ring) @@ -50 +50,2 @@ -+ rte_free(txq->sw_ring); + rte_free(txq->sw_ring); +- if (txq->free) @@ -54 +55 @@ -+ rte_free(txq->free); + rte_free(txq->free);