Skip to content

Commit

Permalink
Test boot crash on 6.13-rc
Browse files Browse the repository at this point in the history
  • Loading branch information
marmarek committed Jan 2, 2025
1 parent b6f7be5 commit 4fe7db5
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
2 changes: 2 additions & 0 deletions kernel.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ Patch61: xen-events-Add-wakeup-support-to-xen-pirq.patch
Patch62: xen-pm-use-suspend.patch
Patch63: xen-pciback-pm-suspend.patch

Patch99: test.patch

%description
Qubes Dom0 kernel.

Expand Down
22 changes: 22 additions & 0 deletions test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Seems I was right.

For me the following diff fixes the issue. Marek, can you please confirm
it fixes your crashes, too?

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index c6d29f283001..b5b7964b34b0 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -1080,7 +1080,7 @@ struct execmem_info __init *execmem_arch_setup(void)

start = MODULES_VADDR + offset;

- if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX)) {
+ if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) && cpu_feature_enabled(X86_FEATURE_PSE)) {
pgprot = PAGE_KERNEL_ROX;
flags = EXECMEM_KASAN_SHADOW | EXECMEM_ROX_CACHE;
} else {


Juergen

0 comments on commit 4fe7db5

Please sign in to comment.