FAILED: patch "[PATCH] gve: fix zero-length skb frag with header-split" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 6bf14575c65569dcded90ef78afb8a6d57323f04
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082058-encrypt-lividly-0296@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6bf14575c65569dcded90ef78afb8a6d57323f04 Mon Sep 17 00:00:00 2001
From: Jordan Rhee <[email protected]>
Date: Fri, 7 Aug 2026 22:43:14 +0000
Subject: [PATCH] gve: fix zero-length skb frag with header-split
When header split is enabled and a header-only packet is received such as a pure TCP ACK, GVE will indicate an RX SKB with a zero-length fragment. If this SKB is then hairpinned and sent back out, the GVE TX path will emit a zero-length descriptor. Hardware considers this an illegal descriptor and stops the queue, causing a TX timeout and interface reset.
Fix it by not adding the zero-length skb frag.
drivers/net/ethernet/google/gve/gve_rx_dqo.c +5 -0
@@ -886,6 +886,11 @@ static int gve_rx_dqo(struct napi_struct *napi, struct gve_rx_ring *rx, rx->rx_hsplit_unsplit_pkt += unsplit; rx->rx_hsplit_bytes += hdr_len;u64_stats_update_end (&rx->statss); + +if (!buf_len) { +gve_free_buffer (rx, buf_state); +return 0 ; + } }else if (!rx->ctx.skb_head && rx->dqo.page_pool &&netmem_is_net_iov (buf_state->page_info.netmem)) {/* when header split is disabled, the header went to the packet
Harshitha Ramamurthy
maintainerPATCH 1/1 gve: fix zero-length skb frag with header-split
From: Jordan Rhee <[email protected]>
When header split is enabled and a header-only packet is received such as a pure TCP ACK, GVE will indicate an RX SKB with a zero-length fragment. If this SKB is then hairpinned and sent back out, the GVE TX path will emit a zero-length descriptor. Hardware considers this an illegal descriptor and stops the queue, causing a TX timeout and interface reset.
Fix it by not adding the zero-length skb frag.
--- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/google/gve/gve_rx_dqo.c +6 -0
@@ -850,6 +850,12 @@ static int gve_rx_dqo(struct napi_struct *napi, struct gve_rx_ring *rx, rx->rx_hsplit_unsplit_pkt += unsplit; rx->rx_hsplit_bytes += hdr_len;u64_stats_update_end (&rx->statss); + +if (!buf_len) { +gve_enqueue_buf_state (rx, &rx->dqo.recycled_buf_states, + buf_state); +return 0 ; + } }/* Sync the portion of dma buffer for CPU to read. */
Signature · 1 line
2.55.0.766.g2966f0265a-goog