From ea02cbaf2db5df7446cce07d0c6587a7f8052790 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Wed, 7 Oct 2026 20:39:38 +0000 Subject: [PATCH 1/3] kernel-6.12: revert "xarray:honor XA_FLAGS_ACCOUNT in xas_split_alloc()" Signed-off-by: Shikha Vyaghra --- ...onor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch | 29 +++++++++++++++++++ packages/kernel-6.12/kernel-6.12.spec | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 packages/kernel-6.12/1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch diff --git a/packages/kernel-6.12/1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch b/packages/kernel-6.12/1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch new file mode 100644 index 00000000..df622973 --- /dev/null +++ b/packages/kernel-6.12/1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch @@ -0,0 +1,29 @@ +From ad812805fea7108d9f8efc240e4810b513b46754 Mon Sep 17 00:00:00 2001 +From: Nathan Gao +Date: Mon, 5 Oct 2026 22:47:13 +0000 +Subject: [PATCH] Revert "xarray: honor XA_FLAGS_ACCOUNT in xas_split_alloc()" + +This reverts commit ad812805fea7108d9f8efc240e4810b513b46754. + +Signed-off-by: Nathan Gao +Signed-off-by: Shikha Vyaghra +--- + lib/xarray.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/xarray.c b/lib/xarray.c +--- a/lib/xarray.c ++++ b/lib/xarray.c +@@ -1027,9 +1027,6 @@ void xas_split_alloc(struct xa_state *xas, void *entry, unsigned int order, + if (xas->xa_shift + XA_CHUNK_SHIFT > order) + return; + +- if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT) +- gfp |= __GFP_ACCOUNT; +- + do { + unsigned int i; + void *sibling = NULL; +-- +2.40.0 + diff --git a/packages/kernel-6.12/kernel-6.12.spec b/packages/kernel-6.12/kernel-6.12.spec index c92f1873..7c4486c7 100644 --- a/packages/kernel-6.12/kernel-6.12.spec +++ b/packages/kernel-6.12/kernel-6.12.spec @@ -81,6 +81,8 @@ Patch1009: 1009-nitro_enclaves-fix-use-after-free-on-SLOT_ALLOC-fail.patch Patch1010: 1010-erofs-disable-LZ4-rolling-decompression-for-now.patch # Reserve blocks for XFS parent pointer updates to avoid a filesystem shutdown Patch1011: 1011-xfs-initialise-args-total-for-parent-pointer-updates.patch +# Revert accounting change that triggers a NULL-deref panic during memcg reclaim of split xarray nodes. +Patch1012: 1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch BuildRequires: bc BuildRequires: elfutils-devel From e84d796414c23826a3837d5b24241235a11c9d5c Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Wed, 7 Oct 2026 21:03:22 +0000 Subject: [PATCH 2/3] twoliter: bump kernel-kit version to v9.4.1 Signed-off-by: Shikha Vyaghra --- Twoliter.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Twoliter.toml b/Twoliter.toml index 694c6518..69616bd6 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -1,5 +1,5 @@ schema-version = 2 -release-version = "9.4.0" +release-version = "9.4.1" project-vendor = "Bottlerocket" [vendor.bottlerocket] From 90ffcac44dc0201b5e8a5d230473869db53fa687 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Wed, 7 Oct 2026 21:03:51 +0000 Subject: [PATCH 3/3] changelog: update for v9.4.1 Signed-off-by: Shikha Vyaghra --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c227b3f..8d5afbe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v9.4.1 (2026-10-07) + +## OS Changes + +* Add patch to revert "xarray: honor XA_FLAGS_ACCOUNT in xas_split_alloc()" to Kernel 6.12 ([#584]) + +[#584]: https://github.com/bottlerocket-os/bottlerocket-kernel-kit/pull/584 + # v9.4.0 (2026-10-01) ## OS Changes