github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mm/execmem: use cleanup infrastructure in ROX cache functions

Browse Source 
After splitting out execmem_alloc_rox() from
execmem_cache_populate_alloc(), the error paths of both functions became
less complex and can be easily switched to use the cleanup infrastructure.

Use __free(vfree) to free allocated memory on the error paths and
guard(mutex) for synchronization in ROX cache functions.

Link: https://lore.kernel.org/20260903-execmem-rox-cache-pmd-v1-v1-5-11beb2a3d249@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Tissoires <bentiss@kernel.org>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Luis Chamberalin <mcgrof@kernel.org>
Cc: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
This commit is contained in:
Mike Rapoport (Microsoft) 2026-09-03 18:50:02 +03:00 committed by Andrew Morton
parent 254e7a129e
commit c188936fc9
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mm/execmem.c
View File

@ -138,11 +138,10 @@ int execmem_restore_rox(void *ptr, size_t size)
static void execmem_cache_clean(struct work_struct *work)
{
struct maple_tree *free_areas = &execmem_cache.free_areas;
struct mutex *mutex = &execmem_cache.mutex;
MA_STATE(mas, free_areas, 0, ULONG_MAX);
void *area;
mutex_lock(mutex);
guard(mutex)(&execmem_cache.mutex);
mas_for_each(&mas, area, ULONG_MAX) {
struct vm_struct *vm = find_vm_area(area);
size_t size = mas_range_len(&mas);
@ -163,7 +162,6 @@ static void execmem_cache_clean(struct work_struct *work)
vfree(area);
}
}
mutex_unlock(mutex);
}
static DECLARE_WORK(execmem_cache_clean_work, execmem_cache_clean);
@ -269,7 +267,7 @@ static void *__execmem_cache_alloc(struct execmem_range *range, size_t size)
static void *execmem_vmalloc_rox(struct execmem_range *range, size_t size,
unsigned long vm_flags)
{
void *p = execmem_vmalloc(range, size, PAGE_KERNEL, vm_flags);
void *p __free(vfree) = execmem_vmalloc(range, size, PAGE_KERNEL, vm_flags);
int err;
if (!p)
@ -280,22 +278,17 @@ static void *execmem_vmalloc_rox(struct execmem_range *range, size_t size,
set_vm_flush_reset_perms(p);
err = set_memory_rox((unsigned long)p, size >> PAGE_SHIFT);
if (err)
goto err_free_mem;
return NULL;
return p;
err_free_mem:
vfree(p);
return NULL;
return no_free_ptr(p);
}
static void *execmem_cache_populate_alloc(struct execmem_range *range, size_t size)
{
unsigned long vm_flags = VM_REQUIRE_HUGE_VMAP;
size_t alloc_size = round_up(size, PMD_SIZE);
struct mutex *mutex = &execmem_cache.mutex;
void *p __free(vfree) = NULL;
int err;
void *p;
p = execmem_vmalloc_rox(range, alloc_size, vm_flags);
if (!p)
@ -306,20 +299,15 @@ static void *execmem_cache_populate_alloc(struct execmem_range *range, size_t si
* as an atomic operation, otherwise they may be consumed
* by a parallel call to the execmem_cache_alloc function.
*/
mutex_lock(mutex);
guard(mutex)(&execmem_cache.mutex);
err = execmem_cache_add_locked(p, alloc_size, GFP_KERNEL);
if (!err)
p = execmem_cache_alloc_locked(range, size);
mutex_unlock(mutex);
if (err)
goto err_free_mem;
return NULL;
return p;
/* the chunk belongs to the cache now */
retain_and_null_ptr(p);
err_free_mem:
vfree(p);
return NULL;
return execmem_cache_alloc_locked(range, size);
}
static void *execmem_alloc_rox(struct execmem_range *range, size_t size)