x86/execmem: fix ROX cache usage in Xen PV guests
Subsystems (4)
PATCH 1/1 x86/execmem: fix ROX cache usage in Xen PV guests
The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported.
Fix that by testing the X86_FEATURE_PSE capability when deciding whether to enable the ROX cache.
--- arch/x86/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/mm/init.c +2 -1
@@ -1080,7 +1080,8 @@ 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 {
Signature · 1 line
2.43.0
Borislav Petkov
maintainerAdding the author in Fixes to Cc
Quoted 33 lines · Juergen Gross
The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported.
Fix that by testing the
X86_FEATURE_PSEcapability when deciding whether to enable the ROX cache.Fixes 2e45474ab14f ("execmem: add support for cache of large ROX pages")Reported-by Marek Marczykowski-Górecki <[email protected]>Signed-off-by Juergen Gross <[email protected]>--- arch/x86/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/mm/init.c +2
-1@@ -1080,7 +1080,8 @@ 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 {Signature · 1 line
2.43.0
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteMike Rapoport
maintainerQuoted 1 line · Borislav Petkov
Adding the author in Fixes to Cc
Thanks, Boris!
Quoted 5 lines · Juergen Gross
Quoted 4 lines
The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported.
The ROX cache does not assume support for large pages, it just had a bug when dealing with base pages and the patch below should fix it.
Restricting ROX cache only for configurations that support large pages makes sense on it's own because there's no real benefit from the cache on such systems, but it does not fix the issue but rather covers it up.
mm/execmem.c +3 -1
@@ -266,6 +266,7 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)unsigned long vm_flags =VM_ALLOW_HUGE_VMAP ;struct execmem_area *area;unsigned long start, end; +unsigned int page_shift;struct vm_struct *vm;size_t alloc_size;int err = -ENOMEM ;
@@ -296,8 +297,9 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)if (err) goto err_free_mem; + page_shift =get_vm_area_page_order (vm) +PAGE_SHIFT ; err =vmap_pages_range_noflush (start, end, range->pgprot, vm->pages, -PMD_SHIFT ); + page_shift);if (err) goto err_free_mem;
Signature · 1 line
2.45.2
Quoted 34 lines
Quoted 28 lines
Fix that by testing the
X86_FEATURE_PSEcapability when deciding whether to enable the ROX cache.Fixes 2e45474ab14f ("execmem: add support for cache of large ROX pages")Reported-by Marek Marczykowski-Górecki <[email protected]>Signed-off-by Juergen Gross <[email protected]>--- arch/x86/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/mm/init.c +2
-1@@ -1080,7 +1080,8 @@ 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 {Signature · 1 line
2.43.0Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Signature · 2 lines
Sincerely yours, Mike.
Borislav Petkov
maintainerQuoted 32 lines · Mike Rapoport
Quoted 1 line · Borislav Petkov
Adding the author in Fixes to Cc
Thanks, Boris!
Quoted 5 lines · Juergen Gross
Quoted 4 lines
The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported.
The ROX cache does not assume support for large pages, it just had a bug when dealing with base pages and the patch below should fix it.
Restricting ROX cache only for configurations that support large pages makes sense on it's own because there's no real benefit from the cache on such systems, but it does not fix the issue but rather covers it up.
mm/execmem.c +1
-0@@ -266,6 +266,7 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)unsigned long vm_flags =VM_ALLOW_HUGE_VMAP ;struct execmem_area *area;unsigned long start, end; +unsigned int page_shift;struct vm_struct *vm;size_t alloc_size;int err = -ENOMEM ;
mm/execmem.c static int execmem_cache_populate(struct execmem_range *range, size_t size) · line 305
Quoted 10 lines
mm/execmem.c +2
-1@@ -296,8 +297,9 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)if (err) goto err_free_mem; + page_shift =get_vm_area_page_order (vm) +PAGE_SHIFT ; err =vmap_pages_range_noflush (start, end, range->pgprot, vm->pages, -PMD_SHIFT ); + page_shift);if (err) goto err_free_mem;
So this patch is still being discussed here.
akpm has already picked up the original fix from Jürgen:
59f59108475e ("x86/execmem: fix ROX cache usage in Xen PV guests")
and the patch is already in Linus' tree.
How much of a fiasco is this execmem thing going to become?
Andrew, is there any chance we can synchronize on what you pick up for arch/x86/ or?
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 48 lines · Borislav Petkov
Quoted 32 lines · Mike Rapoport
Quoted 1 line · Borislav Petkov
Adding the author in Fixes to Cc
Thanks, Boris!
Quoted 5 lines · Juergen Gross
Quoted 4 lines
The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported.
The ROX cache does not assume support for large pages, it just had a bug when dealing with base pages and the patch below should fix it.
Restricting ROX cache only for configurations that support large pages makes sense on it's own because there's no real benefit from the cache on such systems, but it does not fix the issue but rather covers it up.
mm/execmem.c +1
-0@@ -266,6 +266,7 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)unsigned long vm_flags =VM_ALLOW_HUGE_VMAP ;struct execmem_area *area;unsigned long start, end; +unsigned int page_shift;struct vm_struct *vm;size_t alloc_size;int err = -ENOMEM ;mm/execmem.c static int execmem_cache_populate(struct execmem_range *range, size_t size) · line 305
Quoted 10 lines
mm/execmem.c +2
-1@@ -296,8 +297,9 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)if (err) goto err_free_mem; + page_shift =get_vm_area_page_order (vm) +PAGE_SHIFT ; err =vmap_pages_range_noflush (start, end, range->pgprot, vm->pages, -PMD_SHIFT ); + page_shift);if (err) goto err_free_mem;So this patch is still being discussed here.
akpm has already picked up the original fix from Jürgen:
Quoted 8 lines
59f59108475e("x86/execmem: fix ROX cache usage in Xen PV guests")and the patch is already in Linus' tree.
How much of a fiasco is this execmem thing going to become?
Andrew, is there any chance we can synchronize on what you pick up for
arch/x86/or?
I was running some tests today with the above patch on top of -rc7 (and without Jürgen's one). Some tests are still running, and there are still some crashes I need to take a look at (could be completely unrelated), but generally it looks _much_ better, especially I don't see the wall of crashes in HVM domU that I've seen before
(https://lore.kernel.org/xen-devel/Z3cyhdKu6M1vdBe_@mail-itl/).
The latter could be an effect of the above fix, or could be some other fix that happened between -rc5 and -rc7. If that would be interesting, I can also re-test with -rc5 + the above patch, or something else. Let me know.
Signature · 3 lines
Best Regards, Marek Marczykowski-Górecki Invisible Things Lab
Borislav Petkov
maintainerQuoted 10 lines · Marek Marczykowski-Górecki
I was running some tests today with the above patch on top of -rc7 (and without Jürgen's one). Some tests are still running, and there are still some crashes I need to take a look at (could be completely unrelated), but generally it looks _much_ better, especially I don't see the wall of crashes in HVM domU that I've seen before
(https://lore.kernel.org/xen-devel/Z3cyhdKu6M1vdBe_@mail-itl/).
The latter could be an effect of the above fix, or could be some other fix that happened between -rc5 and -rc7. If that would be interesting, I can also re-test with -rc5 + the above patch, or something else. Let me know.
Yeah, we disabled that EXECMEM_ROX thing for now on x86, that close to the merge window to avoid the fiasco:
https://git.kernel.org/tip/a9bbe341333109465605e8733bab0b573cddcc8c
and so this should fix all issues for you, I presume.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette