mm-vmallocc-return-explicit-error-value-in-alloc_vmap_area.patch removed from -mm tree
The quilt patch titled
Subject: mm/vmalloc.c: return explicit error value in alloc_vmap_area()
has been removed from the -mm tree. Its filename was
mm-vmallocc-return-explicit-error-value-in-alloc_vmap_area.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Baoquan He <[email protected]>
Subject: mm/vmalloc.c: return explicit error value in alloc_vmap_area()
Date: Sat, 19 Apr 2025 06:36:53 +0800
In codes of alloc_vmap_area(), it returns the upper bound 'vend' to indicate if the allocation is successful or failed. That is not very clear.
Here change to return explicit error values and check them to judge if allocation is successful.
---
mm/vmalloc.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-vmallocc-return-explicit-error-value-in-alloc_vmap_area +13 -14
@@ -1716,7 +1716,7 @@ va_clip(struct rb_root *root, struct lis*/ lva =kmem_cache_alloc (vmap_area_cachep,GFP_NOWAIT );if (!lva) -return -1 ; +return -ENOMEM ; }/*
@@ -1730,7 +1730,7 @@ va_clip(struct rb_root *root, struct lis*/ va->va_start = nva_start_addr + size; }else { -return -1 ; +return -EINVAL ; }if (type !=FL_FIT_TYPE ) {
@@ -1759,19 +1759,19 @@ va_alloc(struct vmap_area *va,/* Check the "vend" restriction. */ if (nva_start_addr + size > vend) -return vend; +return -ERANGE ;/* Update the free vmap_area. */ ret =va_clip (root, head, va, nva_start_addr, size);if (WARN_ON_ONCE (ret)) -return vend; +return ret;return nva_start_addr; }/* * Returns a start address of the newly allocated area, if success. -* Otherwise a vend is returned that indicates failure. +* Otherwise an error value is returned that indicates failure. */ static __always_inline unsigned long __alloc_vmap_area(struct rb_root *root, struct list_head *head,
@@ -1796,14 +1796,13 @@ __alloc_vmap_area(struct rb_root *root, va =find_vmap_lowest_match (root, size, align, vstart, adjust_search_size);if (unlikely (!va)) -return vend; +return -ENOENT ; nva_start_addr =va_alloc (va, root, head, size, align, vstart, vend); -if (nva_start_addr == vend) -return vend;#if DEBUG_AUGMENT_LOWEST_MATCH_CHECK -find_vmap_lowest_match_check (root, head, size, align); +if (!IS_ERR_VALUE (nva_start_addr)) +find_vmap_lowest_match_check (root, head, size, align);#endif return nva_start_addr;
@@ -1933,7 +1932,7 @@ node_alloc(unsigned long size, unsignedstruct vmap_area *va; *vn_id =0 ; - *addr = vend; + *addr = -EINVAL ;/* * Fallback to a global heap if not vmalloc or there
@@ -2013,20 +2012,20 @@ static struct vmap_area *alloc_vmap_area } retry: -if (addr == vend) { +if (IS_ERR_VALUE (addr)) {preload_this_cpu_lock (&free_vmap_area_lock, gfp_mask, node); addr =__alloc_vmap_area (&free_vmap_area_root, &free_vmap_area_list, size, align, vstart, vend);spin_unlock (&free_vmap_area_lock); } -trace_alloc_vmap_area (addr, size, align, vstart, vend, addr == vend); +trace_alloc_vmap_area (addr, size, align, vstart, vend,IS_ERR_VALUE (addr));/* -* If an allocation fails, the "vend" address is +* If an allocation fails, the error value is * returned. Therefore trigger the overflow path. */ -if (unlikely (addr == vend)) +if (IS_ERR_VALUE (addr)) goto overflow; va->va_start = addr;
_
Patches currently in -mm which might be from [email protected] are