From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37E3E38910F; Sat, 23 May 2026 11:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779536773; cv=none; b=DltdINihxCBn4TWtmlaBZ22a/CE58A+z5eRKQkX6W6EduYoCd/5MJUGXMP0KDFdi5LbJApRaOmQuy9F58W/xR0aA/3CJuZZDd2YqiBvByWc+JE/K8qrXWEdRaC0QIQQJYUylz9jG6MUdB7o1aoP4XF076q5+/l4iP4xe4UAU36w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779536773; c=relaxed/simple; bh=HZKfzmWjRGorERRkuT5kXwyliaVrjDjxu0qiAutxypw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ejh5+8aTyOTPPiIsSqArPGHZtPZYfFzsBDmC8XZBdyty+NPWY/MDkvEf66x0tIvsyn7gdfWqr8HLGBr2ONI/Lwl4lFsoU9GhXgohr0vUkaKNJyDk+fr1HDf+lguK3wajdPG2pUEzuB6vObQi7EeVG8P13Jhe2UMZib3NHbLqXi0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=l9lYrtGF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="l9lYrtGF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 677451F000E9; Sat, 23 May 2026 11:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779536769; bh=tWfd1r/djn+owR9OF/Bl1NBb7QSHI8p1vbttMJoU9AE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=l9lYrtGFlWdjz7RdB5JQuLiP+Q1t4rIeYC+trz5dcn+trnXgeCYujzAVsDY/d3cE2 Z+nDR8tk7Jkfhhre8vLVCDGt2C3yTr4tZQY3H5emujYSdaOh6x3PogxCnsWNhDEHU+ BRGveR2sNlllHZPBFch8CZYzW7s0bTH6BMYEqNGo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, jslaby@suse.cz, Greg Kroah-Hartman Subject: Re: Linux 6.1.174 Date: Sat, 23 May 2026 13:46:06 +0200 Message-ID: <2026052306-wow-external-9dad@gregkh> X-Mailer: git-send-email 2.54.0 In-Reply-To: <2026052306-gallantly-record-0015@gregkh> References: <2026052306-gallantly-record-0015@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit diff --git a/Makefile b/Makefile index 749922b15525..2c70f9f7d570 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 1 -SUBLEVEL = 173 +SUBLEVEL = 174 EXTRAVERSION = NAME = Curry Ramen diff --git a/net/core/gro.c b/net/core/gro.c index 52b91cfb3bf1..ea6571c01faa 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -281,10 +281,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) p->data_len += len; p->truesize += delta_truesize; p->len += len; + skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; if (lp != p) { lp->data_len += len; lp->truesize += delta_truesize; lp->len += len; + skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; } NAPI_GRO_CB(skb)->same_flow = 1; return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ef24911af05a..8bc4b26de5e5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1798,6 +1798,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, skb_frag_ref(skb, i); } skb_shinfo(n)->nr_frags = i; + skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; } if (skb_has_frag_list(skb)) { @@ -3789,6 +3790,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen) tgt->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL; + skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + skb_len_add(skb, -shiftlen); skb_len_add(tgt, shiftlen); @@ -4362,7 +4365,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, skb_copy_from_linear_data_offset(head_skb, offset, skb_put(nskb, hsize), hsize); - skb_shinfo(nskb)->flags |= skb_shinfo(head_skb)->flags & + skb_shinfo(nskb)->flags |= (skb_shinfo(head_skb)->flags | + skb_shinfo(frag_skb)->flags) & SKBFL_SHARED_FRAG; if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC)) @@ -4379,6 +4383,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, nfrags = skb_shinfo(list_skb)->nr_frags; frag = skb_shinfo(list_skb)->frags; frag_skb = list_skb; + + skb_shinfo(nskb)->flags |= skb_shinfo(frag_skb)->flags & SKBFL_SHARED_FRAG; + if (!skb_headlen(list_skb)) { BUG_ON(!nfrags); } else { @@ -5512,6 +5519,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, from_shinfo->frags, from_shinfo->nr_frags * sizeof(skb_frag_t)); to_shinfo->nr_frags += from_shinfo->nr_frags; + if (from_shinfo->nr_frags) + to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG; if (!skb_cloned(from)) from_shinfo->nr_frags = 0; diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 58cabb2bb32a..35c014e10f24 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -546,6 +546,8 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb) p->truesize += skb->truesize; p->len += skb->len; + skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + NAPI_GRO_CB(skb)->same_flow = 1; return 0;