On Wed, Oct 23, 2024 at 07:27:11PM +0300, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <rppt@xxxxxxxxxx>
>
> Enable execmem's cache of PMD_SIZE'ed pages mapped as ROX for module
> text allocations on 64 bit.
Hi,
This breaks resume from hibernation on my Alderlake laptop.
Fortunately this still reverts cleanly.
pstore managed to catch the following oops (seems to blow up on
bringing up the second ht of the second pcore for whatever reason):
<6>[ 33.993727] PM: hibernation: hibernation entry
<6>[ 34.154410] Filesystems sync: 0.006 seconds
<6>[ 34.154418] Freezing user space processes
<6>[ 34.156019] Freezing user space processes completed (elapsed 0.001 seconds)
<6>[ 34.156026] OOM killer disabled.
<6>[ 34.160470] PM: hibernation: Preallocating image memory
<6>[ 34.330327] PM: hibernation: Allocated 387861 pages for snapshot
<6>[ 34.330328] PM: hibernation: Allocated 1551444 kbytes in 0.16 seconds (9696.52 MB/s)
<6>[ 34.330330] Freezing remaining freezable tasks
<6>[ 34.331499] Freezing remaining freezable tasks completed (elapsed 0.001 seconds)
<6>[ 34.351602] printk: Suspending console(s) (use no_console_suspend to debug)
<6>[ 34.836184] ACPI: EC: interrupt blocked
<6>[ 34.858903] ACPI: PM: Preparing to enter system sleep state S4
<6>[ 34.868434] ACPI: EC: event blocked
<6>[ 34.868434] ACPI: EC: EC stopped
<6>[ 34.868435] ACPI: PM: Saving platform NVS memory
<6>[ 34.872538] Disabling non-boot CPUs ...
<6>[ 34.874012] smpboot: CPU 15 is now offline
<6>[ 34.875511] smpboot: CPU 14 is now offline
<6>[ 34.877209] smpboot: CPU 13 is now offline
<6>[ 34.879173] smpboot: CPU 12 is now offline
<6>[ 34.881117] smpboot: CPU 11 is now offline
<6>[ 34.882952] smpboot: CPU 10 is now offline
<6>[ 34.885175] smpboot: CPU 9 is now offline
<6>[ 34.886844] smpboot: CPU 8 is now offline
<6>[ 34.889056] smpboot: CPU 7 is now offline
<6>[ 34.891866] smpboot: CPU 6 is now offline
<6>[ 34.893685] smpboot: CPU 5 is now offline
<6>[ 34.896856] smpboot: CPU 4 is now offline
<6>[ 34.900015] smpboot: CPU 3 is now offline
<6>[ 34.902355] smpboot: CPU 2 is now offline
<6>[ 34.906162] smpboot: CPU 1 is now offline
<6>[ 34.914835] PM: hibernation: Creating image:
<6>[ 35.074645] PM: hibernation: Need to copy 348072 pages
<6>[ 34.915076] ACPI: PM: Restoring platform NVS memory
<6>[ 34.916499] ACPI: EC: EC started
<6>[ 34.918228] Enabling non-boot CPUs ...
<6>[ 34.918248] smpboot: Booting Node 0 Processor 1 APIC 0x1
<6>[ 34.920121] CPU1 is up
<6>[ 34.920132] smpboot: Booting Node 0 Processor 2 APIC 0x8
<6>[ 34.923737] CPU2 is up
<6>[ 34.923746] smpboot: Booting Node 0 Processor 3 APIC 0x9
<1>[ 34.927019] BUG: kernel NULL pointer dereference, address: 0000000000000008
<1>[ 34.927023] #PF: supervisor write access in kernel mode
<1>[ 34.927024] #PF: error_code(0x0002) - not-present page
<6>[ 34.927026] PGD 0 P4D 0
<4>[ 34.927028] Oops: Oops: 0002 [#1] PREEMPT SMP NOPTI
<4>[ 34.927030] CPU: 3 UID: 0 PID: 93 Comm: cpuhp/3 Not tainted 6.13.0-rc5+ #406
<4>[ 34.927033] Hardware name: LENOVO 21AJS29M0Q/21AJS29M0Q, BIOS N3MET18W (1.17 ) 10/24/2023
<4>[ 34.927033] RIP: 0010:__rmqueue_pcplist+0x1c9/0x6f0
<4>[ 34.927039] Code: 00 00 48 39 f0 0f 84 7c 01 00 00 49 89 c6 49 83 ee 08 0f 84 6f 01 00 00 48 8b 78 08 41 b8 01 00 00 00 89 ce 4c 8b 08 41 d3 e0 <49> 89 79 08 4c 89 0f 48 bf 00 01 00 00 00 00 ad de 48 89 38 48 83
<4>[ 34.927041] RSP: 0000:ffffc90000457840 EFLAGS: 00010082
<4>[ 34.927042] RAX: ffffea000427af48 RBX: ffff88844e2f0720 RCX: 0000000000000000
<4>[ 34.927043] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffff827f0f00
<4>[ 34.927043] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000000
<4>[ 34.927044] R10: ffff88844e2f0700 R11: 0000000000000001 R12: 0000000000000000
<4>[ 34.927044] R13: ffffffff827f0e40 R14: ffffea000427af40 R15: ffffffffffffffff
<4>[ 34.927045] FS: 0000000000000000(0000) GS:ffff88844e2c0000(0000) knlGS:0000000000000000
<4>[ 34.927046] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4>[ 34.927046] CR2: 0000000000000008 CR3: 000000000402e001 CR4: 0000000000372ef0
<4>[ 34.927047] Call Trace:
<4>[ 34.927048] <TASK>
<4>[ 34.927049] ? __die+0x1a/0x60
<4>[ 34.927053] ? page_fault_oops+0x157/0x440
<4>[ 34.927055] ? exc_page_fault+0x444/0x710
<4>[ 34.927058] ? asm_exc_page_fault+0x22/0x30
<4>[ 34.927060] ? __rmqueue_pcplist+0x1c9/0x6f0
<4>[ 34.927061] get_page_from_freelist+0x20f/0xf00
<4>[ 34.927063] __alloc_pages_noprof+0x111/0x240
<4>[ 34.927065] allocate_slab+0x24f/0x3c0
<4>[ 34.927066] ? get_page_from_freelist+0x21a/0xf00
<4>[ 34.927067] ___slab_alloc+0x42a/0xb80
<4>[ 34.927069] ? __kernfs_new_node.isra.0+0x59/0x1e0
<4>[ 34.927071] ? get_nohz_timer_target+0x29/0x140
<4>[ 34.927073] ? timerqueue_add+0x62/0xb0
<4>[ 34.927074] kmem_cache_alloc_noprof+0x17a/0x220
<4>[ 34.927076] __kernfs_new_node.isra.0+0x59/0x1e0
<4>[ 34.927077] ? dl_server_stop+0x26/0x30
<4>[ 34.927079] ? dequeue_entities+0x33b/0x5f0
<4>[ 34.927080] kernfs_new_node+0x3b/0x60
<4>[ 34.927081] kernfs_create_dir_ns+0x22/0x80
<4>[ 34.927083] sysfs_create_dir_ns+0x6b/0xd0
<4>[ 34.927085] kobject_add_internal+0x9e/0x270
<4>[ 34.927087] kobject_add+0x79/0xe0
<4>[ 34.927088] ? __kmalloc_cache_noprof+0x105/0x240
<4>[ 34.927090] device_add+0xb7/0x7d0
<4>[ 34.927092] ? complete_all+0x1b/0x80
<4>[ 34.927095] cpu_device_create+0xea/0x100
<4>[ 34.927097] ? __pfx_smpboot_thread_fn+0x10/0x10
<4>[ 34.927099] ? __set_cpus_allowed_ptr+0x47/0x90
<4>[ 34.927100] ? detect_cache_attributes+0xd2/0x330
<4>[ 34.927102] ? __pfx_cacheinfo_cpu_online+0x10/0x10
<4>[ 34.927104] cacheinfo_cpu_online+0x94/0x270
<4>[ 34.927105] ? __pfx_cacheinfo_cpu_online+0x10/0x10
<4>[ 34.927107] ? __pfx_smpboot_thread_fn+0x10/0x10
<4>[ 34.927108] cpuhp_invoke_callback+0x10e/0x4b0
<4>[ 34.927110] ? __pfx_smpboot_thread_fn+0x10/0x10
<4>[ 34.927111] cpuhp_thread_fun+0xcf/0x150
<4>[ 34.927112] smpboot_thread_fn+0xd1/0x1c0
<4>[ 34.927113] kthread+0xc6/0x100
<4>[ 34.927115] ? __pfx_kthread+0x10/0x10
<4>[ 34.927115] ret_from_fork+0x28/0x40
<4>[ 34.927117] ? __pfx_kthread+0x10/0x10
<4>[ 34.927118] ret_from_fork_asm+0x1a/0x30
<4>[ 34.927120] </TASK>
<4>[ 34.927120] Modules linked in: fuse ctr ccm sch_fq_codel cmac xt_multiport xt_tcpudp xt_state iptable_filter xt_MASQUERADE iptable_nat nf_nat nf_conntrack nf_defrag_ipv4 ip_tables x_tables bnep btusb uvcvideo btrtl btintel videobuf2_vmalloc btbcm videobuf2_memops btmtk uvc videobuf2_v4l2 bluetooth videodev videobuf2_common ecdh_generic mc ecc binfmt_misc snd_hda_codec_hdmi mousedev snd_hda_codec_realtek snd_hda_codec_generic snd_hda_scodec_component snd_ctl_led iwlmvm mac80211 libarc4 i915 snd_hda_intel snd_intel_dspcfg i2c_algo_bit snd_hda_codec drm_buddy xhci_pci intel_tcc_cooling mei_hdcp snd_hwdep ttm mei_pxp mei_wdt processor_thermal_device_pci snd_hda_core x86_pkg_temp_thermal processor_thermal_device xhci_hcd thinkpad_acpi intel_powerclamp 8250_pci processor_thermal_wt_hint drm_display_helper snd_pcm processor_thermal_rfim i2c_hid_acpi coretemp 8250 processor_thermal_rapl nvram i2c_hid iwlwifi kvm_intel drm_kms_helper usbcore intel_rapl_msr 8250_base iTCO_wdt intel_rapl_common platform_profile hid snd_timer
<4>[ 34.927180] intel_gtt mei_me serial_mctrl_gpio led_class processor_thermal_wt_req cfg80211 kvm thunderbolt e1000e snd efi_pstore intel_lpss_pci serial_base usb_common agpgart processor_thermal_power_floor spi_intel_pci i2c_i801 intel_lpss mei soundcore processor_thermal_mbox drm rfkill pstore spi_intel mfd_core tpm_tis i2c_smbus psmouse tpm_tis_core zlib_deflate pcspkr evdev tpm think_lmi video intel_pmc_core firmware_attributes_class intel_hid sparse_keymap int3403_thermal intel_vsec pinctrl_tigerlake int3400_thermal wmi int340x_thermal_zone pmt_telemetry i2c_core backlight pinctrl_intel pmt_class acpi_thermal_rel efivarfs
<4>[ 34.927209] CR2: 0000000000000008
<4>[ 34.927210] ---[ end trace 0000000000000000 ]---
>
> Signed-off-by: Mike Rapoport (Microsoft) <rppt@xxxxxxxxxx>
> Reviewed-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
> Tested-by: kdevops <kdevops@xxxxxxxxxxxxxxx>
> ---
> arch/x86/Kconfig | 1 +
> arch/x86/mm/init.c | 37 ++++++++++++++++++++++++++++++++++++-
> 2 files changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 2852fcd82cbd..ff71d18253ba 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -83,6 +83,7 @@ config X86
> select ARCH_HAS_DMA_OPS if GART_IOMMU || XEN
> select ARCH_HAS_EARLY_DEBUG if KGDB
> select ARCH_HAS_ELF_RANDOMIZE
> + select ARCH_HAS_EXECMEM_ROX if X86_64
> select ARCH_HAS_FAST_MULTIPLIER
> select ARCH_HAS_FORTIFY_SOURCE
> select ARCH_HAS_GCOV_PROFILE_ALL
> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
> index eb503f53c319..c2e4f389f47f 100644
> --- a/arch/x86/mm/init.c
> +++ b/arch/x86/mm/init.c
> @@ -1053,18 +1053,53 @@ unsigned long arch_max_swapfile_size(void)
> #ifdef CONFIG_EXECMEM
> static struct execmem_info execmem_info __ro_after_init;
>
> +#ifdef CONFIG_ARCH_HAS_EXECMEM_ROX
> +void execmem_fill_trapping_insns(void *ptr, size_t size, bool writeable)
> +{
> + /* fill memory with INT3 instructions */
> + if (writeable)
> + memset(ptr, INT3_INSN_OPCODE, size);
> + else
> + text_poke_set(ptr, INT3_INSN_OPCODE, size);
> +}
> +#endif
> +
> struct execmem_info __init *execmem_arch_setup(void)
> {
> unsigned long start, offset = 0;
> + enum execmem_range_flags flags;
> + pgprot_t pgprot;
>
> if (kaslr_enabled())
> offset = get_random_u32_inclusive(1, 1024) * PAGE_SIZE;
>
> start = MODULES_VADDR + offset;
>
> + if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX)) {
> + pgprot = PAGE_KERNEL_ROX;
> + flags = EXECMEM_KASAN_SHADOW | EXECMEM_ROX_CACHE;
> + } else {
> + pgprot = PAGE_KERNEL;
> + flags = EXECMEM_KASAN_SHADOW;
> + }
> +
> execmem_info = (struct execmem_info){
> .ranges = {
> - [EXECMEM_DEFAULT] = {
> + [EXECMEM_MODULE_TEXT] = {
> + .flags = flags,
> + .start = start,
> + .end = MODULES_END,
> + .pgprot = pgprot,
> + .alignment = MODULE_ALIGN,
> + },
> + [EXECMEM_KPROBES ... EXECMEM_BPF] = {
> + .flags = EXECMEM_KASAN_SHADOW,
> + .start = start,
> + .end = MODULES_END,
> + .pgprot = PAGE_KERNEL,
> + .alignment = MODULE_ALIGN,
> + },
> + [EXECMEM_MODULE_DATA] = {
> .flags = EXECMEM_KASAN_SHADOW,
> .start = start,
> .end = MODULES_END,
> --
> 2.43.0
>
--
Ville Syrjälä
Intel
