diff --git a/Makefile.rhelver b/Makefile.rhelver index 7a1b11223..0cbaa380b 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 7 +RHEL_RELEASE = 8 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 400c06994..b2495f7a3 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/493305c2357a5ddd38d730723b49b78edbcbeadb + 493305c2357a5ddd38d730723b49b78edbcbeadb net: skbuff: preserve shared-frag marker during coalescing + +https://gitlab.com/cki-project/kernel-ark/-/commit/f14083fec5d7e0aef263fef4293211a5887349e7 + f14083fec5d7e0aef263fef4293211a5887349e7 xfrm: esp: restore combined single-frag length gate + https://gitlab.com/cki-project/kernel-ark/-/commit/8e25c27f95f8634e71e3f2dced3423b9a89198db 8e25c27f95f8634e71e3f2dced3423b9a89198db net: gro: don't copy frags between mixed zcopy skbs diff --git a/kernel.changelog b/kernel.changelog index 875926dc3..283513133 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,13 @@ +* Thu May 21 2026 Justin M. Forbes [6.19.14-8] +- net: skbuff: preserve shared-frag marker during coalescing (William Bowling) +- xfrm: esp: restore combined single-frag length gate (Jingguo Tan) +- Just disable the UKI DTB bits for the 6.19 repository (Justin M. Forbes) +- Revert "redhat/kernel.spec.template: Fix indentation of uki-virt generation code" (Justin M. Forbes) +- Revert "redhat/kernel.spec.template: Simplify uki-virt signing" (Justin M. Forbes) +- Revert "redhat/kernel.spec.template: Add kernel-uki-dtbloader sub-package" (Justin M. Forbes) +- Revert "redhat/kernel.spec.template: Make -uki-dtbloader provide kernel-core-uname-r" (Justin M. Forbes) +Resolves: + * Tue May 19 2026 Justin M. Forbes [6.19.14-7] - net: gro: don't copy frags between mixed zcopy skbs (Sabrina Dubroca) - Turn on auto bumping for remainder of F42 (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 5d10992b7..b94da80e1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -187,13 +187,13 @@ Summary: The Linux kernel %define specrpmversion 6.19.14 %define specversion 6.19.14 %define patchversion 6.19 -%define pkgrelease 107 +%define pkgrelease 108 %define kversion 6 %define tarfile_release 6.19.14 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 107%{?buildid}%{?dist} +%define specrelease 108%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.19.14 @@ -4695,7 +4695,10 @@ fi\ # # %changelog -* Tue May 19 2026 Justin M. Forbes [6.19.14-107] +* Thu May 21 2026 Justin M. Forbes [6.19.14-8] +- net: skbuff: preserve shared-frag marker during coalescing (William Bowling) +- xfrm: esp: restore combined single-frag length gate (Jingguo Tan) +- Just disable the UKI DTB bits for the 6.19 repository (Justin M. Forbes) - Revert "redhat/kernel.spec.template: Fix indentation of uki-virt generation code" (Justin M. Forbes) - Revert "redhat/kernel.spec.template: Simplify uki-virt signing" (Justin M. Forbes) - Revert "redhat/kernel.spec.template: Add kernel-uki-dtbloader sub-package" (Justin M. Forbes) diff --git a/patch-6.19-redhat.patch b/patch-6.19-redhat.patch index 01127d2ea..79edbb5b6 100644 --- a/patch-6.19-redhat.patch +++ b/patch-6.19-redhat.patch @@ -59,11 +59,11 @@ kernel/module/signing.c | 9 +- kernel/ptrace.c | 22 +- net/core/gro.c | 7 + - net/core/skbuff.c | 9 +- - net/ipv4/esp4.c | 3 +- + net/core/skbuff.c | 11 +- + net/ipv4/esp4.c | 8 +- net/ipv4/ip_output.c | 2 + net/ipv4/tcp_output.c | 1 + - net/ipv6/esp6.c | 3 +- + net/ipv6/esp6.c | 8 +- net/ipv6/ip6_output.c | 2 + net/rxrpc/ar-internal.h | 1 - net/rxrpc/call_event.c | 20 +- @@ -80,7 +80,7 @@ security/lockdown/lockdown.c | 11 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - - 82 files changed, 2099 insertions(+), 576 deletions(-) + 82 files changed, 2107 insertions(+), 580 deletions(-) diff --git a/Documentation/hid/intel-ish-hid.rst b/Documentation/hid/intel-ish-hid.rst index 2adc174fb576..068a5906b177 100644 @@ -3936,7 +3936,7 @@ index ef61695fbdbb..9f77ac895aed 100644 return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index a95dc0638836..eb893e27b93f 100644 +index a95dc0638836..537131f4402d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2226,6 +2226,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, @@ -3976,11 +3976,39 @@ index a95dc0638836..eb893e27b93f 100644 if (!skb_headlen(list_skb)) { BUG_ON(!nfrags); } else { +@@ -6191,6 +6198,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 6dfc0bcdef65..6a5febbdbee4 100644 +index 6dfc0bcdef65..2d7daca8516c 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c -@@ -873,7 +873,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) +@@ -410,6 +410,7 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * + struct page *page; + struct sk_buff *trailer; + int tailen = esp->tailen; ++ unsigned int allocsize; + + /* this is non-NULL only with TCP/UDP Encapsulation */ + if (x->encap) { +@@ -419,8 +420,8 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * + return err; + } + +- if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE || +- ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE) ++ allocsize = ALIGN(skb->data_len + tailen, L1_CACHE_BYTES); ++ if (allocsize > PAGE_SIZE) + goto cow; + + if (!skb_cloned(skb)) { +@@ -873,7 +874,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) nfrags = 1; goto skip_cow; @@ -4016,10 +4044,29 @@ index 479afb714bdf..968c5db581a3 100644 skb_frag_page(fragfrom) == skb_frag_page(lastfrag) && skb_frag_off(fragfrom) == skb_frag_off(lastfrag) + diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c -index 9f75313734f8..9c06c5a1419d 100644 +index 9f75313734f8..0fad1dc558b8 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c -@@ -915,7 +915,8 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) +@@ -440,6 +440,7 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info + struct page *page; + struct sk_buff *trailer; + int tailen = esp->tailen; ++ unsigned int allocsize; + + if (x->encap) { + int err = esp6_output_encap(x, skb, esp); +@@ -448,8 +449,8 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info + return err; + } + +- if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE || +- ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE) ++ allocsize = ALIGN(skb->data_len + tailen, L1_CACHE_BYTES); ++ if (allocsize > PAGE_SIZE) + goto cow; + + if (!skb_cloned(skb)) { +@@ -915,7 +916,8 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) nfrags = 1; goto skip_cow; diff --git a/sources b/sources index 47aea7f45..f27f57b93 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.19.14.tar.xz) = d9e52522dba3d8727265668b458d6e0231663f113f74aff4ab17328dee6689bf2a2865dca168c3ff47c3575f981c8fcc497297743859353462c3e0ebd314332c -SHA512 (kernel-abi-stablelists-6.19.14.tar.xz) = af0315a94b5b0643d747aac5cf34d4b59bbf92dfe989a84debbdc60d83505ed9be8a6ada7d3a3ccfc7e3302a390a9aad6f7b21d681e27ca3f2d4473afcbf8294 -SHA512 (kernel-kabi-dw-6.19.14.tar.xz) = 9bb7d49af2456c7b09e7336a6fb6e78b2924dcb9006d3df6c1dd13033bf54ff2caf3f32de145caba3c81e14513b53e282253898fadefd2361441ea96370fe9e9 +SHA512 (kernel-abi-stablelists-6.19.14.tar.xz) = 7136971d0cf880c97ea8ac6ad4a8df9216ca56448b1f521c3c202617ce18ffc78ab9383b8072a69d7510ac4fb2e0d411a95fe31b28ba7b2b7eafb15653011932 +SHA512 (kernel-kabi-dw-6.19.14.tar.xz) = 4b459c9674e5a4d0539895898daaafd0006c6af4153839ef9695c753fcc7514f7a5f63fa499ef18de4fca2b2837288b506ceae6d4608aa4e0a25a76850c5a424