Commit 8be4d46e authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Andrew Morton

mm: vmalloc: refactor vmalloc_dump_obj() function

This patch tends to simplify the function in question, by removing an
extra stack "objp" variable, returning back to an early exit approach if
spin_trylock() fails or VA was not found.

Link: https://lkml.kernel.org/r/20240124180920.50725-2-urezki@gmail.comSigned-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: default avatarLorenzo Stoakes <lstoakes@gmail.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sony.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 15e02a39
...@@ -4696,34 +4696,35 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms) ...@@ -4696,34 +4696,35 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
#ifdef CONFIG_PRINTK #ifdef CONFIG_PRINTK
bool vmalloc_dump_obj(void *object) bool vmalloc_dump_obj(void *object)
{ {
void *objp = (void *)PAGE_ALIGN((unsigned long)object);
const void *caller; const void *caller;
struct vm_struct *vm;
struct vmap_area *va; struct vmap_area *va;
struct vmap_node *vn; struct vmap_node *vn;
unsigned long addr; unsigned long addr;
unsigned int nr_pages; unsigned int nr_pages;
bool success = false;
vn = addr_to_node((unsigned long)objp);
if (spin_trylock(&vn->busy.lock)) { addr = PAGE_ALIGN((unsigned long) object);
va = __find_vmap_area((unsigned long)objp, &vn->busy.root); vn = addr_to_node(addr);
if (va && va->vm) { if (!spin_trylock(&vn->busy.lock))
addr = (unsigned long)va->vm->addr; return false;
caller = va->vm->caller;
nr_pages = va->vm->nr_pages;
success = true;
}
va = __find_vmap_area(addr, &vn->busy.root);
if (!va || !va->vm) {
spin_unlock(&vn->busy.lock); spin_unlock(&vn->busy.lock);
return false;
} }
if (success) vm = va->vm;
pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n", addr = (unsigned long) vm->addr;
nr_pages, addr, caller); caller = vm->caller;
nr_pages = vm->nr_pages;
spin_unlock(&vn->busy.lock);
return success; pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n",
nr_pages, addr, caller);
return true;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment