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 539DC46211 for ; Thu, 13 Feb 2025 11:00:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F49040287; Thu, 13 Feb 2025 11:00:56 +0100 (CET) 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 9B45542EDB for ; Thu, 13 Feb 2025 11:00:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440854; 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=8FDBNBKNHFA0fGMGhSiHGnv1gtcoSCvMsomGdSxZXkQ=; b=YuV5ULl8Hcoy3xVhRGdVkIZd71TgYyI5usB59KISHpXYGd/KbegwVIVszd3SM88C5T6Qnd 2IW4+6EkGuoKL8GJLRWXovgFfbr1pM2gyRI82jQxF7RH3vtfbDd5UXa4JbJU8a9M9C5N0s 5vOp9+umWzwdffXc8JmIk3QbjG7GkAE= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-427-PrUsh3qRP-yd6g_bvPT7RQ-1; Thu, 13 Feb 2025 05:00:52 -0500 X-MC-Unique: PrUsh3qRP-yd6g_bvPT7RQ-1 X-Mimecast-MFC-AGG-ID: PrUsh3qRP-yd6g_bvPT7RQ Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F9A7180036F; Thu, 13 Feb 2025 10:00:51 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 03DC91800265; Thu, 13 Feb 2025 10:00:49 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix memory leak in scalar Rx' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:56 +0000 Message-ID: <20250213095933.362078-29-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: p19-zCP-F8wLFLL6umCV5Us19uSsUzcMJWpEreFmr_Y_1739440851 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 24.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 02/17/25. 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/0409230b3f71e6ccf5d6d387f7992f284cc1b10a Thanks. Kevin --- >From 0409230b3f71e6ccf5d6d387f7992f284cc1b10a Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Fri, 17 Jan 2025 17:52:05 +0000 Subject: [PATCH] net/ice: fix memory leak in scalar Rx [ upstream commit 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 ] If the buffer splitting feature is configured and the payload mbuf allocation fails, the previously allocated header mbuf may be returned not fully initialized or a memory leak may occur. This patch handles this case correctly by freeing the corresponding header buffer. Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx") Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- drivers/net/ice/ice_rxtx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 0c7106c7e0..f58df9bdfe 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -485,4 +485,5 @@ ice_alloc_rx_queue_mbufs(struct ice_rx_queue *rxq) mbuf_pay = rte_mbuf_raw_alloc(rxq->rxseg[1].mp); if (unlikely(!mbuf_pay)) { + rte_pktmbuf_free(mbuf); PMD_DRV_LOG(ERR, "Failed to allocate payload mbuf for RX"); return -ENOMEM; @@ -1901,4 +1902,6 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq) (void *)mbufs_pay, rxq->rx_free_thresh); if (unlikely(diag_pay != 0)) { + rte_mempool_put_bulk(rxq->mp, (void *)rxep, + rxq->rx_free_thresh); PMD_RX_LOG(ERR, "Failed to get payload mbufs in bulk"); return -ENOMEM; @@ -2608,4 +2611,11 @@ ice_recv_pkts(void *rx_queue, if (unlikely(!nmb_pay)) { rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed++; + rxe->mbuf = NULL; + nb_hold--; + if (unlikely(rx_id == 0)) + rx_id = rxq->nb_rx_desc; + + rx_id--; + rte_pktmbuf_free(nmb); break; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:37.735482228 +0000 +++ 0029-net-ice-fix-memory-leak-in-scalar-Rx.patch 2025-02-12 17:29:34.292945584 +0000 @@ -1 +1 @@ -From 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 Mon Sep 17 00:00:00 2001 +From 0409230b3f71e6ccf5d6d387f7992f284cc1b10a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org