Skip to content

Commit 919f862

Browse files
covanamgregkh
authored andcommitted
riscv: rewrite __kernel_map_pages() to fix sleeping in invalid context
commit fb1cf08 upstream. __kernel_map_pages() is a debug function which clears the valid bit in page table entry for deallocated pages to detect illegal memory accesses to freed pages. This function set/clear the valid bit using __set_memory(). __set_memory() acquires init_mm's semaphore, and this operation may sleep. This is problematic, because __kernel_map_pages() can be called in atomic context, and thus is illegal to sleep. An example warning that this causes: BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:1578 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2, name: kthreadd preempt_count: 2, expected: 0 CPU: 0 PID: 2 Comm: kthreadd Not tainted 6.9.0-g1d4c6d784ef6 #37 Hardware name: riscv-virtio,qemu (DT) Call Trace: [<ffffffff800060dc>] dump_backtrace+0x1c/0x24 [<ffffffff8091ef6e>] show_stack+0x2c/0x38 [<ffffffff8092baf8>] dump_stack_lvl+0x5a/0x72 [<ffffffff8092bb24>] dump_stack+0x14/0x1c [<ffffffff8003b7ac>] __might_resched+0x104/0x10e [<ffffffff8003b7f4>] __might_sleep+0x3e/0x62 [<ffffffff8093276a>] down_write+0x20/0x72 [<ffffffff8000cf00>] __set_memory+0x82/0x2fa [<ffffffff8000d324>] __kernel_map_pages+0x5a/0xd4 [<ffffffff80196cca>] __alloc_pages_bulk+0x3b2/0x43a [<ffffffff8018ee82>] __vmalloc_node_range+0x196/0x6ba [<ffffffff80011904>] copy_process+0x72c/0x17ec [<ffffffff80012ab4>] kernel_clone+0x60/0x2fe [<ffffffff80012f62>] kernel_thread+0x82/0xa0 [<ffffffff8003552c>] kthreadd+0x14a/0x1be [<ffffffff809357de>] ret_from_fork+0xe/0x1c Rewrite this function with apply_to_existing_page_range(). It is fine to not have any locking, because __kernel_map_pages() works with pages being allocated/deallocated and those pages are not changed by anyone else in the meantime. Fixes: 5fde3db ("riscv: add ARCH_SUPPORTS_DEBUG_PAGEALLOC support") Signed-off-by: Nam Cao <[email protected]> Cc: [email protected] Reviewed-by: Alexandre Ghiti <[email protected]> Link: https://lore.kernel.org/r/1289ecba9606a19917bc12b6c27da8aa23e1e5ae.1715750938.git.namcao@linutronix.de Signed-off-by: Palmer Dabbelt <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent dd5042e commit 919f862

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

arch/riscv/mm/pageattr.c

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,17 +386,33 @@ int set_direct_map_default_noflush(struct page *page)
386386
}
387387

388388
#ifdef CONFIG_DEBUG_PAGEALLOC
389+
static int debug_pagealloc_set_page(pte_t *pte, unsigned long addr, void *data)
390+
{
391+
int enable = *(int *)data;
392+
393+
unsigned long val = pte_val(ptep_get(pte));
394+
395+
if (enable)
396+
val |= _PAGE_PRESENT;
397+
else
398+
val &= ~_PAGE_PRESENT;
399+
400+
set_pte(pte, __pte(val));
401+
402+
return 0;
403+
}
404+
389405
void __kernel_map_pages(struct page *page, int numpages, int enable)
390406
{
391407
if (!debug_pagealloc_enabled())
392408
return;
393409

394-
if (enable)
395-
__set_memory((unsigned long)page_address(page), numpages,
396-
__pgprot(_PAGE_PRESENT), __pgprot(0));
397-
else
398-
__set_memory((unsigned long)page_address(page), numpages,
399-
__pgprot(0), __pgprot(_PAGE_PRESENT));
410+
unsigned long start = (unsigned long)page_address(page);
411+
unsigned long size = PAGE_SIZE * numpages;
412+
413+
apply_to_existing_page_range(&init_mm, start, size, debug_pagealloc_set_page, &enable);
414+
415+
flush_tlb_kernel_range(start, start + size);
400416
}
401417
#endif
402418

0 commit comments

Comments
 (0)