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 03F0348A44 for ; Fri, 31 Oct 2025 15:36:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F108640150; Fri, 31 Oct 2025 15:36:26 +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 3337C40150 for ; Fri, 31 Oct 2025 15:36:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921384; 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=Js1TXffADU1WsrzJfXQwGqlzlqTUU22npooTY5p1xmI=; b=ReG0iagHYXpKJ1eHq1eyEy0B8Q5756lTxuqFIQl91HJ9UXYi5iQQ2JZwGgny+uyVp4ZYtb HX+/Gc8+M0++4IqKOmrYvVsbDEdMUkkxpsaXUvg6Kle6r7qAmgsbYoMZZy7MklG2IdAJK4 05bSLbJk+hsKIT8lDjbl4i2rBQAylZs= 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-369-LX499NR3M8yiEK3OQ4vzlA-1; Fri, 31 Oct 2025 10:36:22 -0400 X-MC-Unique: LX499NR3M8yiEK3OQ4vzlA-1 X-Mimecast-MFC-AGG-ID: LX499NR3M8yiEK3OQ4vzlA_1761921381 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 17AD518002DD; Fri, 31 Oct 2025 14:36:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0723C180044F; Fri, 31 Oct 2025 14:36:18 +0000 (UTC) From: Kevin Traynor To: Joshua Washington Cc: Ankit Garg , Ziwei Xiao , dpdk stable Subject: patch 'net/gve: free Rx mbufs if allocation fails on ring setup' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:31 +0000 Message-ID: <20251031143421.324432-29-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: AS8SJ8A3AnorkDoc-tifF4nEwxhsYoV6WVeatRl17XU_1761921381 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/ea57f0b441d375770a72e3cd74660d13166bb78f Thanks. Kevin --- >From ea57f0b441d375770a72e3cd74660d13166bb78f Mon Sep 17 00:00:00 2001 From: Joshua Washington Date: Mon, 25 Aug 2025 17:03:34 -0700 Subject: [PATCH] net/gve: free Rx mbufs if allocation fails on ring setup [ upstream commit fa48f964253ba018b4a3054246a6e26b31b5c8b0 ] When creating new RX rings, one less than the number of buffers in the ring need to be allocated. It is possible that only a part of the allocation is successful, resulting in a failure to create the rings. In this case, the driver should free the buffers which were successfully allocated to avoid a memory leak in case the application does not automatically exit. Fixes: 265daac8a53a ("net/gve: fix mbuf allocation memory leak for DQ Rx") Signed-off-by: Joshua Washington Reviewed-by: Ankit Garg Reviewed-by: Ziwei Xiao --- drivers/net/gve/gve_rx_dqo.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/gve/gve_rx_dqo.c b/drivers/net/gve/gve_rx_dqo.c index 0103add985..cd85d90bb6 100644 --- a/drivers/net/gve/gve_rx_dqo.c +++ b/drivers/net/gve/gve_rx_dqo.c @@ -377,12 +377,11 @@ gve_rxq_mbufs_alloc_dqo(struct gve_rx_queue *rxq) for (i = 0; i < rx_mask; i++) { nmb = rte_pktmbuf_alloc(rxq->mpool); - if (!nmb) - break; + if (!nmb) { + rxq->stats.no_mbufs++; + gve_release_rxq_mbufs_dqo(rxq); + return -ENOMEM; + } rxq->sw_ring[i] = nmb; } - if (i < rxq->nb_rx_desc - 1) { - rxq->stats.no_mbufs += rx_mask - i; - return -ENOMEM; - } } -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:53.148028684 +0000 +++ 0029-net-gve-free-Rx-mbufs-if-allocation-fails-on-ring-se.patch 2025-10-31 13:53:52.057523434 +0000 @@ -1 +1 @@ -From fa48f964253ba018b4a3054246a6e26b31b5c8b0 Mon Sep 17 00:00:00 2001 +From ea57f0b441d375770a72e3cd74660d13166bb78f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fa48f964253ba018b4a3054246a6e26b31b5c8b0 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org