Skip to content

Commit 32a2026

Browse files
committed
execmem: don't remove ROX cache from the direct map
jira LE-4694 Rebuild_History Non-Buildable kernel-6.12.0-55.43.1.el10_0 commit-author Mike Rapoport (Microsoft) <rppt@kernel.org> commit 925f426 The memory allocated for the ROX cache was removed from the direct map to reduce amount of direct map updates, however this cannot be tolerated by /proc/kcore that accesses module memory using vread_iter() and the latter does vmalloc_to_page() and copy_page_to_iter_nofault(). Instead of removing ROX cache memory from the direct map and mapping it as ROX in vmalloc space, simply call set_memory_rox() that will take care of proper permissions on both vmalloc and in the direct map. Signed-off-by: "Mike Rapoport (Microsoft)" <rppt@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20250126074733.1384926-5-rppt@kernel.org (cherry picked from commit 925f426) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 1faef9b commit 32a2026

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

mm/execmem.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ static void *__execmem_cache_alloc(struct execmem_range *range, size_t size)
241241
static int execmem_cache_populate(struct execmem_range *range, size_t size)
242242
{
243243
unsigned long vm_flags = VM_ALLOW_HUGE_VMAP;
244-
unsigned long start, end;
245244
struct vm_struct *vm;
246245
size_t alloc_size;
247246
int err = -ENOMEM;
@@ -259,26 +258,18 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size)
259258
/* fill memory with instructions that will trap */
260259
execmem_fill_trapping_insns(p, alloc_size, /* writable = */ true);
261260

262-
start = (unsigned long)p;
263-
end = start + alloc_size;
264-
265-
vunmap_range(start, end);
266-
267-
err = execmem_set_direct_map_valid(vm, false);
268-
if (err)
269-
goto err_free_mem;
270-
271-
err = vmap_pages_range_noflush(start, end, range->pgprot, vm->pages,
272-
PMD_SHIFT);
261+
err = set_memory_rox((unsigned long)p, vm->nr_pages);
273262
if (err)
274263
goto err_free_mem;
275264

276265
err = execmem_cache_add(p, alloc_size);
277266
if (err)
278-
goto err_free_mem;
267+
goto err_reset_direct_map;
279268

280269
return 0;
281270

271+
err_reset_direct_map:
272+
execmem_set_direct_map_valid(vm, true);
282273
err_free_mem:
283274
vfree(p);
284275
return err;

0 commit comments

Comments
 (0)