diff --git a/Patchlist.changelog b/Patchlist.changelog index a3373bc1b..50f470051 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/2dd4102a953ba3020914a47e6984d2f462deebc4 + 2dd4102a953ba3020914a47e6984d2f462deebc4 net: skbuff: preserve shared-frag marker during coalescing + https://gitlab.com/cki-project/kernel-ark/-/commit/2c1c0335d00d83e2487cced3cb0c36544079b03e 2c1c0335d00d83e2487cced3cb0c36544079b03e xfrm: esp: restore combined single-frag length gate diff --git a/kernel.changelog b/kernel.changelog index 94baf628d..d39fd065b 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,4 +1,5 @@ * Thu May 21 2026 Justin M. Forbes [7.0.9-5] +- net: skbuff: preserve shared-frag marker during coalescing (William Bowling) - xfrm: esp: restore combined single-frag length gate (Jingguo Tan) - rxrpc: Fix RESPONSE packet verification to extract skb to a linear buffer (David Howells) - rxrpc: Fix DATA decrypt vs splice() by copying data to buffer in recvmsg (David Howells) diff --git a/kernel.spec b/kernel.spec index 25b284763..ffeed612b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4826,6 +4826,7 @@ fi\ # %changelog * Thu May 21 2026 Justin M. Forbes [7.0.9-5] +- net: skbuff: preserve shared-frag marker during coalescing (William Bowling) - xfrm: esp: restore combined single-frag length gate (Jingguo Tan) - rxrpc: Fix RESPONSE packet verification to extract skb to a linear buffer (David Howells) - rxrpc: Fix DATA decrypt vs splice() by copying data to buffer in recvmsg (David Howells) diff --git a/patch-7.0-redhat.patch b/patch-7.0-redhat.patch index 14b68f743..7724e59a8 100644 --- a/patch-7.0-redhat.patch +++ b/patch-7.0-redhat.patch @@ -71,7 +71,7 @@ include/trace/events/rxrpc.h | 1 + kernel/module/signing.c | 9 +- net/core/gro.c | 7 + - net/core/skbuff.c | 9 +- + net/core/skbuff.c | 11 +- net/ipv4/esp4.c | 5 +- net/ipv4/tcp_output.c | 1 + net/ipv6/esp6.c | 5 +- @@ -97,7 +97,7 @@ sound/soc/codecs/rt722-sdca.h | 4 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - - 99 files changed, 5890 insertions(+), 893 deletions(-) + 99 files changed, 5892 insertions(+), 893 deletions(-) diff --git a/Documentation/admin-guide/media/amdisp4-1.rst b/Documentation/admin-guide/media/amdisp4-1.rst new file mode 100644 @@ -7734,7 +7734,7 @@ index 31d21de5b15a..c7b8eab61e02 100644 return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 43ee86dcf2ea..7fe42c558736 100644 +index 43ee86dcf2ea..d0ad034c911f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2258,6 +2258,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, @@ -7774,6 +7774,15 @@ index 43ee86dcf2ea..7fe42c558736 100644 if (!skb_headlen(list_skb)) { BUG_ON(!nfrags); } else { +@@ -6226,6 +6233,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/esp4.c b/net/ipv4/esp4.c index 6a5febbdbee4..2d7daca8516c 100644 --- a/net/ipv4/esp4.c diff --git a/sources b/sources index daf492b8f..623e55b98 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-7.0.9.tar.xz) = 40a5553bcccd34216c4925a2e1e19abea1dbb5e33b4aa1608024f96615ba05b0bb3d063d038891f828fc2dd5c8500030a8336a7db83ef0bf1a5e082d7fb92334 -SHA512 (kernel-abi-stablelists-7.0.9.tar.xz) = 6d71b6d4e268d39245c081be1cb2b9e57c664e79acddb2d760912b6066c893ee1209f826360a753d27afc4d74a6115a6120685b471e74f5b46e89bcbb33ed118 +SHA512 (kernel-abi-stablelists-7.0.9.tar.xz) = 97963d090454411e75c5d81040e6172b2f4f25c6149f63165314505804622cb6aad0d3f13c88f3fb7c4a725ed099f32390cd032e2239235683f9354291b5c67e SHA512 (kernel-kabi-dw-7.0.9.tar.xz) = 4b459c9674e5a4d0539895898daaafd0006c6af4153839ef9695c753fcc7514f7a5f63fa499ef18de4fca2b2837288b506ceae6d4608aa4e0a25a76850c5a424