The quilt patch titled
Subject: mm: vmalloc: refactor vmalloc_dump_obj() function
has been removed from the -mm tree. Its filename was
mm-vmalloc-refactor-vmalloc_dump_obj-function.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: "Uladzislau Rezki (Sony)" <urezki@xxxxxxxxx>
Subject: mm: vmalloc: refactor vmalloc_dump_obj() function
Date: Wed, 24 Jan 2024 19:09:20 +0100
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@xxxxxxxxx
Signed-off-by: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx>
Reviewed-by: Lorenzo Stoakes <lstoakes@xxxxxxxxx>
Cc: Baoquan He <bhe@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmalloc.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
--- a/mm/vmalloc.c~mm-vmalloc-refactor-vmalloc_dump_obj-function
+++ a/mm/vmalloc.c
@@ -4696,34 +4696,35 @@ void pcpu_free_vm_areas(struct vm_struct
#ifdef CONFIG_PRINTK
bool vmalloc_dump_obj(void *object)
{
- void *objp = (void *)PAGE_ALIGN((unsigned long)object);
const void *caller;
+ struct vm_struct *vm;
struct vmap_area *va;
struct vmap_node *vn;
unsigned long addr;
unsigned int nr_pages;
- bool success = false;
- vn = addr_to_node((unsigned long)objp);
+ addr = PAGE_ALIGN((unsigned long) object);
+ vn = addr_to_node(addr);
- if (spin_trylock(&vn->busy.lock)) {
- va = __find_vmap_area((unsigned long)objp, &vn->busy.root);
-
- if (va && va->vm) {
- addr = (unsigned long)va->vm->addr;
- caller = va->vm->caller;
- nr_pages = va->vm->nr_pages;
- success = true;
- }
+ if (!spin_trylock(&vn->busy.lock))
+ return false;
+ va = __find_vmap_area(addr, &vn->busy.root);
+ if (!va || !va->vm) {
spin_unlock(&vn->busy.lock);
+ return false;
}
- if (success)
- pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n",
- nr_pages, addr, caller);
+ vm = va->vm;
+ addr = (unsigned long) vm->addr;
+ caller = vm->caller;
+ nr_pages = vm->nr_pages;
+ spin_unlock(&vn->busy.lock);
+
+ pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n",
+ nr_pages, addr, caller);
- return success;
+ return true;
}
#endif
_
Patches currently in -mm which might be from urezki@xxxxxxxxx are
