From nobody Thu Apr 2 22:29:01 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7920E19D093 for ; Fri, 20 Feb 2026 21:53:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771624416; cv=none; b=UJ2Rrba34gulHzLF6M4bSUBT7YsSYfxFRkCSdzr7wC1zDyJbsNA6Z/IhWC/2fZdRb7dM13TL9UtFkhzcD5mbKzIUytBXedipXXlSlZUL8tRKpn/0HfgI8d54EoqOeKPyRc7UBp8uO1SbkELpyx2TtGOZRhbkThQTLuSZsKaz6m0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771624416; c=relaxed/simple; bh=2W8xM0Ob3ienbz8oe2WhVPLywE7WqUXP/3asHzkIZ0E=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=eVKHJitpYbYV9+L/JXTJKxUrC37MP0l033tBeT6WtprOgkYV8paWZYeI7i2Xd1EwqFVR2m4LlrP3fUZlnFwWHhBB2Gd9c3IUeReidRMOEcJvKs6COczJtRwG9tFXV6dadhQd7bPOy3/PiaXMBcze4p64F1gbJz+TQ8wff36aCog= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=W2piBnNs; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="W2piBnNs" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a90510a6d1so25753585ad.0 for ; Fri, 20 Feb 2026 13:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771624414; x=1772229214; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=zNnXU2rQFrrZwDNDExXkVvTwmDaf1Rl3je1sHwkbBVo=; b=W2piBnNs4xXjKoJ7PPq7PtHE8SRKTGVZaimudBR7dtj0drfTG3jxsykvbGBd+/jF6e kYHnU83VozqSHRw9lF87DvTQTGstucIqsyxRIvlDOb3I1MZCdavRS1grdrQp+E9ZJZnB 3DsDXRTb8SOu1EPL3PR/hF8gYBq8fEZttps2YcYLrCEPd7ZM5xkV+acYIW4NTBMclWXg o9UEckqB1ASLxD45m1pX7j3T2wb0iWqqe1NvTSM0IQdmzdFgRCysTnMrTIRZ6ssAErZG 1J5pHm6dOqIjNCNTDPjo8XG885CDN9KSX8GR73NAOi+m7xUpptcpEDBm/h1L968mKosA RETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771624414; x=1772229214; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zNnXU2rQFrrZwDNDExXkVvTwmDaf1Rl3je1sHwkbBVo=; b=S9QSj3e0Tz4INp37OMcFHYQ745Hyy7v1/jHMiR5vnu/7LeNok6GVMTYAYV2FVxHrMr uQ1Jm0UQHUJDjBhj+V3/huXC+lsRC9jYkIboo2F8t2C0TOIYFQnyMV9NJSDcu7FfHrrL XpcImE0ABpCd5GpeQc0ktbR5nYS4wbu4MfpDViUSwtqQuCp/WP9wEJhw498bTrjD6J74 nX+3S8Ym9i9tma+Up3Y3sxoYvIkPI1o/BZJ/SKcHX+hxjQBEtnzAFzLJYK1hwttM69OL 78bvePfq0KYDbMwK5eva9/9kk1lSUUxyBIicjhaFSCaT/TDaqyAbKwYsoitK0KOh6+c5 iKMg== X-Forwarded-Encrypted: i=1; AJvYcCWZ1u8QKN42+SngB+2Db57P5gXNCXLUwAbbKXeEBLg3u5TVFSItFQpxjShdBdRsWWWHnw84dWtXLUeB76A=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr5LnyDac0pX/FNaGzXQRai+przdg2WLCvCm1Bp0SyvmBqlD3g u1qRw6U3eUOe30M62oLimiJf8x7DECam/QHZdcStS/1FYuz/igB5/O9dgJVSVK4EbjPMcK2C/x8 J0QmUGyb2g0Kp7w== X-Received: from pglc4.prod.google.com ([2002:a63:d04:0:b0:c6e:1f6a:ef71]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:b45:b0:2a0:9934:a3f3 with SMTP id d9443c01a7336-2ad5f7a4e05mr59737705ad.24.1771624413654; Fri, 20 Feb 2026 13:53:33 -0800 (PST) Date: Fri, 20 Feb 2026 13:53:24 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.53.0.345.g96ddfc5eaa-goog Message-ID: <20260220215324.1631350-1-joshwash@google.com> Subject: [PATCH net v2] gve: fix incorrect buffer cleanup in gve_tx_clean_pending_packets for QPL From: Joshua Washington To: netdev@vger.kernel.org Cc: Joshua Washington , Harshitha Ramamurthy , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , Praveen Kaligineedi , Rushil Gupta , Bailey Forrest , linux-kernel@vger.kernel.org, Ankit Garg , stable@vger.kernel.org, Jordan Rhee Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ankit Garg In DQ-QPL mode, gve_tx_clean_pending_packets() incorrectly uses the RDA buffer cleanup path. It iterates num_bufs times and attempts to unmap entries in the dma array. This leads to two issues: 1. The dma array shares storage with tx_qpl_buf_ids (union). Interpreting buffer IDs as DMA addresses results in attempting to unmap incorrect memory locations. 2. num_bufs in QPL mode (counting 2K chunks) can significantly exceed the size of the dma array, causing out-of-bounds access warnings (trace below is how we noticed this issue). UBSAN: array-index-out-of-bounds in drivers/net/ethernet/drivers/net/ethernet/google/gve/gve_tx_dqo.c:178:5 ind= ex 18 is out of range for type 'dma_addr_t[18]' (aka 'unsigned long long[18]') Workqueue: gve gve_service_task [gve] Call Trace: dump_stack_lvl+0x33/0xa0 __ubsan_handle_out_of_bounds+0xdc/0x110 gve_tx_stop_ring_dqo+0x182/0x200 [gve] gve_close+0x1be/0x450 [gve] gve_reset+0x99/0x120 [gve] gve_service_task+0x61/0x100 [gve] process_scheduled_works+0x1e9/0x380 Fix this by properly checking for QPL mode and delegating to gve_free_tx_qpl_bufs() to reclaim the buffers. Cc: stable@vger.kernel.org Fixes: a6fb8d5a8b69 ("gve: Tx path for DQO-QPL") Signed-off-by: Ankit Garg Reviewed-by: Jordan Rhee Reviewed-by: Harshitha Ramamurthy Signed-off-by: Joshua Washington Reviewed-by: Simon Horman --- Changes in v2: * Moved gve_unmap_packet up instead of forward declaration (Jakub Kicinski) --- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 56 ++++++++++++++++++------= ----------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/eth= ernet/google/gve/gve_tx_dqo.c index 40b89b3e..e5e33966 100644 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c @@ -167,6 +167,25 @@ gve_free_pending_packet(struct gve_tx_ring *tx, } } =20 +static void gve_unmap_packet(struct device *dev, + struct gve_tx_pending_packet_dqo *pkt) +{ + int i; + + if (!pkt->num_bufs) + return; + + /* SKB linear portion is guaranteed to be mapped */ + dma_unmap_single(dev, dma_unmap_addr(pkt, dma[0]), + dma_unmap_len(pkt, len[0]), DMA_TO_DEVICE); + for (i =3D 1; i < pkt->num_bufs; i++) { + netmem_dma_unmap_page_attrs(dev, dma_unmap_addr(pkt, dma[i]), + dma_unmap_len(pkt, len[i]), + DMA_TO_DEVICE, 0); + } + pkt->num_bufs =3D 0; +} + /* gve_tx_free_desc - Cleans up all pending tx requests and buffers. */ static void gve_tx_clean_pending_packets(struct gve_tx_ring *tx) @@ -176,21 +195,12 @@ static void gve_tx_clean_pending_packets(struct gve_t= x_ring *tx) for (i =3D 0; i < tx->dqo.num_pending_packets; i++) { struct gve_tx_pending_packet_dqo *cur_state =3D &tx->dqo.pending_packets[i]; - int j; - - for (j =3D 0; j < cur_state->num_bufs; j++) { - if (j =3D=3D 0) { - dma_unmap_single(tx->dev, - dma_unmap_addr(cur_state, dma[j]), - dma_unmap_len(cur_state, len[j]), - DMA_TO_DEVICE); - } else { - dma_unmap_page(tx->dev, - dma_unmap_addr(cur_state, dma[j]), - dma_unmap_len(cur_state, len[j]), - DMA_TO_DEVICE); - } - } + + if (tx->dqo.qpl) + gve_free_tx_qpl_bufs(tx, cur_state); + else + gve_unmap_packet(tx->dev, cur_state); + if (cur_state->skb) { dev_consume_skb_any(cur_state->skb); cur_state->skb =3D NULL; @@ -1160,22 +1170,6 @@ static void remove_from_list(struct gve_tx_ring *tx, } } =20 -static void gve_unmap_packet(struct device *dev, - struct gve_tx_pending_packet_dqo *pkt) -{ - int i; - - /* SKB linear portion is guaranteed to be mapped */ - dma_unmap_single(dev, dma_unmap_addr(pkt, dma[0]), - dma_unmap_len(pkt, len[0]), DMA_TO_DEVICE); - for (i =3D 1; i < pkt->num_bufs; i++) { - netmem_dma_unmap_page_attrs(dev, dma_unmap_addr(pkt, dma[i]), - dma_unmap_len(pkt, len[i]), - DMA_TO_DEVICE, 0); - } - pkt->num_bufs =3D 0; -} - /* Completion types and expected behavior: * No Miss compl + Packet compl =3D Packet completed normally. * Miss compl + Re-inject compl =3D Packet completed normally. --=20 2.53.0.335.g19a08e0c02-goog