iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/mm
History
Miaohe Lin 882e1180c8 mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled 
commit 1983184c22dd84a4d95a71e5c6775c2638557dc7 upstream.

When I did hard offline test with hugetlb pages, below deadlock occurs:

======================================================
WARNING: possible circular locking dependency detected
6.8.0-11409-gf6cef5f8c37f #1 Not tainted
------------------------------------------------------
bash/46904 is trying to acquire lock:
ffffffffabe68910 (cpu_hotplug_lock){++++}-{0:0}, at: static_key_slow_dec+0x16/0x60

but task is already holding lock:
ffffffffabf92ea8 (pcp_batch_high_lock){+.+.}-{3:3}, at: zone_pcp_disable+0x16/0x40

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #1 (pcp_batch_high_lock){+.+.}-{3:3}:
       __mutex_lock+0x6c/0x770
       page_alloc_cpu_online+0x3c/0x70
       cpuhp_invoke_callback+0x397/0x5f0
       __cpuhp_invoke_callback_range+0x71/0xe0
       _cpu_up+0xeb/0x210
       cpu_up+0x91/0xe0
       cpuhp_bringup_mask+0x49/0xb0
       bringup_nonboot_cpus+0xb7/0xe0
       smp_init+0x25/0xa0
       kernel_init_freeable+0x15f/0x3e0
       kernel_init+0x15/0x1b0
       ret_from_fork+0x2f/0x50
       ret_from_fork_asm+0x1a/0x30

-> #0 (cpu_hotplug_lock){++++}-{0:0}:
       __lock_acquire+0x1298/0x1cd0
       lock_acquire+0xc0/0x2b0
       cpus_read_lock+0x2a/0xc0
       static_key_slow_dec+0x16/0x60
       __hugetlb_vmemmap_restore_folio+0x1b9/0x200
       dissolve_free_huge_page+0x211/0x260
       __page_handle_poison+0x45/0xc0
       memory_failure+0x65e/0xc70
       hard_offline_page_store+0x55/0xa0
       kernfs_fop_write_iter+0x12c/0x1d0
       vfs_write+0x387/0x550
       ksys_write+0x64/0xe0
       do_syscall_64+0xca/0x1e0
       entry_SYSCALL_64_after_hwframe+0x6d/0x75

other info that might help us debug this:

 Possible unsafe locking scenario:

       CPU0                    CPU1
       ----                    ----
  lock(pcp_batch_high_lock);
                               lock(cpu_hotplug_lock);
                               lock(pcp_batch_high_lock);
  rlock(cpu_hotplug_lock);

 *** DEADLOCK ***

5 locks held by bash/46904:
 #0: ffff98f6c3bb23f0 (sb_writers#5){.+.+}-{0:0}, at: ksys_write+0x64/0xe0
 #1: ffff98f6c328e488 (&of->mutex){+.+.}-{3:3}, at: kernfs_fop_write_iter+0xf8/0x1d0
 #2: ffff98ef83b31890 (kn->active#113){.+.+}-{0:0}, at: kernfs_fop_write_iter+0x100/0x1d0
 #3: ffffffffabf9db48 (mf_mutex){+.+.}-{3:3}, at: memory_failure+0x44/0xc70
 #4: ffffffffabf92ea8 (pcp_batch_high_lock){+.+.}-{3:3}, at: zone_pcp_disable+0x16/0x40

stack backtrace:
CPU: 10 PID: 46904 Comm: bash Kdump: loaded Not tainted 6.8.0-11409-gf6cef5f8c37f #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014
Call Trace:
 <TASK>
 dump_stack_lvl+0x68/0xa0
 check_noncircular+0x129/0x140
 __lock_acquire+0x1298/0x1cd0
 lock_acquire+0xc0/0x2b0
 cpus_read_lock+0x2a/0xc0
 static_key_slow_dec+0x16/0x60
 __hugetlb_vmemmap_restore_folio+0x1b9/0x200
 dissolve_free_huge_page+0x211/0x260
 __page_handle_poison+0x45/0xc0
 memory_failure+0x65e/0xc70
 hard_offline_page_store+0x55/0xa0
 kernfs_fop_write_iter+0x12c/0x1d0
 vfs_write+0x387/0x550
 ksys_write+0x64/0xe0
 do_syscall_64+0xca/0x1e0
 entry_SYSCALL_64_after_hwframe+0x6d/0x75
RIP: 0033:0x7fc862314887
Code: 10 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24
RSP: 002b:00007fff19311268 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007fc862314887
RDX: 000000000000000c RSI: 000056405645fe10 RDI: 0000000000000001
RBP: 000056405645fe10 R08: 00007fc8623d1460 R09: 000000007fffffff
R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000000c
R13: 00007fc86241b780 R14: 00007fc862417600 R15: 00007fc862416a00

In short, below scene breaks the lock dependency chain:

 memory_failure
  __page_handle_poison
   zone_pcp_disable -- lock(pcp_batch_high_lock)
   dissolve_free_huge_page
    __hugetlb_vmemmap_restore_folio
     static_key_slow_dec
      cpus_read_lock -- rlock(cpu_hotplug_lock)

Fix this by calling drain_all_pages() instead.

This issue won't occur until commit a6b40850c442 ("mm: hugetlb: replace
hugetlb_free_vmemmap_enabled with a static_key").  As it introduced
rlock(cpu_hotplug_lock) in dissolve_free_huge_page() code path while
lock(pcp_batch_high_lock) is already in the __page_handle_poison().

[linmiaohe@huawei.com: extend comment per Oscar]
[akpm@linux-foundation.org: reflow block comment]
Link: https://lkml.kernel.org/r/20240407085456.2798193-1-linmiaohe@huawei.com
Fixes: a6b40850c442 ("mm: hugetlb: replace hugetlb_free_vmemmap_enabled with a static_key")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Jane Chu <jane.chu@oracle.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-04-27 17:11:42 +02:00
..
damon
mm/damon/reclaim: fix quota stauts loss due to online tunings
2024-03-01 13:35:00 +01:00
kasan
kasan/test: avoid gcc warning for intentional overflow
2024-04-03 15:28:20 +02:00
kfence
LoongArch changes for v6.6
2023-09-08 12:16:52 -07:00
kmsan
mm: kmsan: use helper macros PAGE_ALIGN and PAGE_ALIGN_DOWN
2023-08-21 13:37:29 -07:00
backing-dev.c
blk-wbt: Fix detection of dirty-throttled tasks
2024-02-23 09:25:16 +01:00
balloon_compaction.c
…
bootmem_info.c
…
cma_debug.c
…
cma_sysfs.c
mm: cma: make kobj_type structure constant
2023-03-28 16:20:06 -07:00
cma.c
mm/cma: use nth_page() in place of direct struct page manipulation
2023-11-28 17:20:06 +00:00
cma.h
…
compaction.c
mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
2024-04-03 15:28:44 +02:00
debug_page_alloc.c
mm: page_alloc: split out DEBUG_PAGEALLOC
2023-06-09 16:25:23 -07:00
debug_page_ref.c
…
debug_vm_pgtable.c
mm/debug_vm_pgtable: fix BUG_ON with pud advanced test
2024-03-06 14:48:41 +00:00
debug.c
mm: update validate_mm() to use vma iterator
2023-06-09 16:25:31 -07:00
dmapool_test.c
dmapool: add alloc/free performance test
2023-04-05 19:42:38 -07:00
dmapool.c
dmapool: create/destroy cleanup
2023-06-09 16:25:17 -07:00
early_ioremap.c
mm/early_ioremap.c: improve the execution efficiency of early_ioremap_setup()
2023-06-09 16:25:56 -07:00
fadvise.c
mm: remove unnecessary pagevec includes
2023-06-23 16:59:31 -07:00
fail_page_alloc.c
mm: page_alloc: split out FAIL_PAGE_ALLOC
2023-06-09 16:25:23 -07:00
failslab.c
…
filemap.c
mm: cachestat: fix two shmem bugs
2024-04-03 15:28:55 +02:00
folio-compat.c
filemap: Add fgf_t typedef
2023-07-24 18:04:30 -04:00
gup_test.c
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
2023-06-23 16:58:19 -07:00
gup_test.h
…
gup.c
Add x86 shadow stack support
2023-08-31 12:20:12 -07:00
highmem.c
mm: ptep_get() conversion
2023-06-19 16:19:25 -07:00
hmm.c
mm: enable page walking API to lock vmas during the walk
2023-08-21 13:07:20 -07:00
huge_memory.c
mm: fix for negative counter: nr_file_hugepages
2023-11-28 17:20:13 +00:00
hugetlb_cgroup.c
mm/hugetlb: increase use of folios in alloc_huge_page()
2023-02-13 15:54:27 -08:00
hugetlb_vmemmap.c
mm: hugetlb_vmemmap: fix a race between vmemmap pmd split
2023-08-18 10:12:14 -07:00
hugetlb_vmemmap.h
…
hugetlb.c
mm/userfaultfd: allow hugetlb change protection upon poison entry
2024-04-27 17:11:42 +02:00
hwpoison-inject.c
…
init-mm.c
mm: move dummy_vm_ops out of a header
2023-08-21 13:37:46 -07:00
internal.h
Add x86 shadow stack support
2023-08-31 12:20:12 -07:00
interval_tree.c
…
io-mapping.c
…
ioremap.c
mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed
2023-08-18 10:12:36 -07:00
Kconfig
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
Kconfig.debug
mm: page_table_check: Make it dependent on EXCLUSIVE_SYSTEM_RAM
2023-05-29 16:14:28 +01:00
khugepaged.c
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
kmemleak.c
mm/kmemleak: move up cond_resched() call in page scanning loop
2023-09-02 15:17:34 -07:00
ksm.c
mm: memory-failure: use rcu lock instead of tasklist_lock when collect_procs()
2023-09-05 11:11:52 -07:00
list_lru.c
…
maccess.c
mm: Fix copy_from_user_nofault().
2023-04-12 17:36:23 -07:00
madvise.c
swap: remove remnants of polling from read_swap_cache_async
2023-08-24 16:20:16 -07:00
Makefile
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
mapping_dirty_helpers.c
mm: fix clean_record_shared_mapping_range kernel-doc
2023-08-24 16:20:30 -07:00
memblock.c
x86/numa: Fix the address overlap check in numa_fill_memblks()
2024-03-01 13:35:06 +01:00
memcontrol.c
mm: memcontrol: clarify swapaccount=0 deprecation warning
2024-03-01 13:35:00 +01:00
memfd.c
revert "memfd: improve userspace warnings for missing exec-related flags".
2023-09-05 11:11:52 -07:00
memory_hotplug.c
mm/memory_hotplug: fix memmap_on_memory sysfs value retrieval
2024-01-20 11:51:49 +01:00
memory-failure.c
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
2024-04-27 17:11:42 +02:00
memory-tiers.c
memory tier: use helper macro __ATTR_RW()
2023-08-18 10:12:38 -07:00
memory.c
x86/mm/pat: fix VM_PAT handling in COW mappings
2024-04-10 16:36:03 +02:00
mempolicy.c
numa: Generalize numa_map_to_online_node()
2023-11-20 11:58:51 +01:00
mempool.c
…
memremap.c
mm/memremap.c: fix outdated comment in devm_memremap_pages
2023-02-09 16:51:46 -08:00
memtest.c
memtest: use {READ,WRITE}_ONCE in memory scanning
2024-04-03 15:28:33 +02:00
migrate_device.c
Add x86 shadow stack support
2023-08-31 12:20:12 -07:00
migrate.c
mm/vmscan: fix a bug calling wakeup_kswapd() with a wrong zone index
2024-03-15 10:48:14 -04:00
mincore.c
mm: enable page walking API to lock vmas during the walk
2023-08-21 13:07:20 -07:00
mlock.c
merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes
2023-08-21 14:26:20 -07:00
mm_init.c
efi: disable mirror feature during crashkernel
2024-01-31 16:18:56 -08:00
mm_slot.h
…
mmap_lock.c
…
mmap.c
mm, mmap: fix vma_merge() case 7 with vma_ops->close
2024-04-03 15:28:40 +02:00
mmu_gather.c
mm: fix kernel-doc warning from tlb_flush_rmaps()
2023-08-24 16:20:30 -07:00
mmu_notifier.c
mmu_notifiers: rename invalidate_range notifier
2023-08-18 10:12:41 -07:00
mmzone.c
…
mprotect.c
Add x86 shadow stack support
2023-08-31 12:20:12 -07:00
mremap.c
vm: fix move_vma() memory accounting being off
2023-09-16 15:23:31 -07:00
msync.c
…
nommu.c
Add x86 shadow stack support
2023-08-31 12:20:12 -07:00
oom_kill.c
mm: remove redundant K() macro definition
2023-08-21 13:37:44 -07:00
page_alloc.c
mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
2024-04-03 15:28:44 +02:00
page_counter.c
…
page_ext.c
mm/page_ext: move functions around for minor cleanups to page_ext
2023-08-18 10:12:31 -07:00
page_idle.c
mm: page_idle: convert page idle to use a folio
2023-01-18 17:12:52 -08:00
page_io.c
zswap: make zswap_load() take a folio
2023-08-21 13:37:27 -07:00
page_isolation.c
mm/hugetlb: get rid of page_hstate()
2023-08-18 10:12:39 -07:00
page_owner.c
mm/page_ext: use page_ext_data helper in page_owner
2023-08-21 13:37:27 -07:00
page_poison.c
mm/page_poison: remove unused page_ext.h from page_poison
2023-08-21 13:37:30 -07:00
page_reporting.c
mm, treewide: redefine MAX_ORDER sanely
2023-04-05 19:42:46 -07:00
page_reporting.h
…
page_table_check.c
mm: convert page_table_check_pte_set() to page_table_check_ptes_set()
2023-08-24 16:20:18 -07:00
page_vma_mapped.c
mm: correct stale comment of function check_pte
2023-08-18 10:12:13 -07:00
page-writeback.c
blk-wbt: Fix detection of dirty-throttled tasks
2024-02-23 09:25:16 +01:00
pagewalk.c
mm/pagewalk: fix bootstopping regression from extra pte_unmap()
2023-09-02 08:39:21 -07:00
percpu-internal.h
percpu-internal/pcpu_chunk: re-layout pcpu_chunk structure to reduce false sharing
2023-06-19 16:19:29 -07:00
percpu-km.c
…
percpu-stats.c
…
percpu-vm.c
…
percpu.c
mm: Introduce flush_cache_vmap_early()
2024-02-16 19:10:52 +01:00
pgalloc-track.h
…
pgtable-generic.c
mm/pgtable: notes on pte_offset_map[_lock]()
2023-08-18 10:12:25 -07:00
process_vm_access.c
mm/gup: remove unused vmas parameter from pin_user_pages_remote()
2023-06-09 16:25:25 -07:00
ptdump.c
mm: ptdump should use ptep_get_lockless()
2023-06-19 16:19:24 -07:00
readahead.c
readahead: avoid multiple marked readahead pages
2024-03-15 10:48:21 -04:00
rmap.c
mm: hugetlb: add huge page size param to set_huge_pte_at()
2023-09-29 17:20:47 -07:00
rodata_test.c
…
secretmem.c
mm/secretmem: use a folio in secretmem_fault()
2023-08-21 13:38:02 -07:00
shmem_quota.c
tmpfs: fix race on handling dquot rbtree
2024-04-03 15:28:54 +02:00
shmem.c
quota: Properly annotate i_dquot arrays with __rcu
2024-03-26 18:19:46 -04:00
show_mem.c
mm,thp: no space after colon in Mem-Info fields
2023-08-21 13:38:01 -07:00
shrinker_debug.c
Revert "mm: shrinkers: make count and scan in shrinker debugfs lockless"
2023-06-19 13:19:34 -07:00
shuffle.c
…
shuffle.h
mm, treewide: redefine MAX_ORDER sanely
2023-04-05 19:42:46 -07:00
slab_common.c
mm: slab: Do not create kmalloc caches smaller than arch_slab_minalign()
2023-10-11 15:24:49 +02:00
slab.c
Randomized slab caches for kmalloc()
2023-07-18 10:07:47 +02:00
slab.h
Randomized slab caches for kmalloc()
2023-07-18 10:07:47 +02:00
slub.c
mm/slub: remove freelist_dereference()
2023-07-14 09:57:21 +02:00
sparse-vmemmap.c
mm/vmemmap: allow architectures to override how vmemmap optimization works
2023-08-18 10:12:53 -07:00
sparse.c
mm/sparsemem: fix race in accessing memory_section->usage
2024-01-31 16:18:56 -08:00
swap_cgroup.c
…
swap_slots.c
…
swap_state.c
mm/swap: inline folio_set_swap_entry() and folio_swap_entry()
2023-08-24 16:20:28 -07:00
swap.c
mm: remove references to pagevec
2023-06-23 16:59:30 -07:00
swap.h
mm/swap: fix race when skipping swapcache
2024-03-01 13:35:00 +01:00
swapfile.c
mm: swap: fix race between free_swap_and_cache() and swapoff()
2024-04-03 15:28:27 +02:00
truncate.c
- Some swap cleanups from Ma Wupeng ("fix WARN_ON in add_to_avail_list")
2023-08-29 14:25:26 -07:00
usercopy.c
mm: Fix copy_from_user_nofault().
2023-04-12 17:36:23 -07:00
userfaultfd.c
userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb
2024-02-23 09:24:53 +01:00
util.c
parisc: fix mmap_base calculation when stack grows upwards
2023-11-28 17:20:08 +00:00
vmalloc.c
mm: hugetlb: add huge page size param to set_huge_pte_at()
2023-09-29 17:20:47 -07:00
vmpressure.c
net-memcg: Fix scope of sockmem pressure indicators
2023-08-16 12:21:32 +01:00
vmscan.c
mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
2024-04-03 15:28:44 +02:00
vmstat.c
mm/vmstat: remove unused page_ext.h from vmstat
2023-08-21 13:37:30 -07:00
workingset.c
mm/mglru: fix underprotected page cache
2023-12-20 17:02:02 +01:00
z3fold.c
mm/z3fold: remove obsolete comment for struct z3fold_pool
2023-08-21 13:37:51 -07:00
zbud.c
mm: zswap: remove shrink from zpool interface
2023-06-19 16:19:27 -07:00
zpool.c
mm: zswap: remove shrink from zpool interface
2023-06-19 16:19:27 -07:00
zsmalloc.c
merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes
2023-08-21 14:26:20 -07:00
zswap.c
mm: zswap: fix missing folio cleanup in writeback race path
2024-03-01 13:35:10 +01:00