mm: move __remove_vm_area out of va_remove_mappings

__remove_vm_area is the only part of va_remove_mappings that requires a
vmap_area.  Move the call out to the caller and only pass the vm_struct to
va_remove_mappings.

Link: https://lkml.kernel.org/r/20230121071051.1143058-7-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 0c0267b..003e49d 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2599,18 +2599,15 @@ static inline void set_area_direct_map(const struct vm_struct *area,
                        set_direct_map(area->pages[i]);
 }
 
-/* Handle removing and resetting vm mappings related to the VA's vm_struct. */
-static void va_remove_mappings(struct vmap_area *va, int deallocate_pages)
+/* Handle removing and resetting vm mappings related to the vm_struct. */
+static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages)
 {
-       struct vm_struct *area = va->vm;
        unsigned long start = ULONG_MAX, end = 0;
        unsigned int page_order = vm_area_page_order(area);
        int flush_reset = area->flags & VM_FLUSH_RESET_PERMS;
        int flush_dmap = 0;
        int i;
 
-       __remove_vm_area(va);
-
        /* If this is not VM_FLUSH_RESET_PERMS memory, no need for the below. */
        if (!flush_reset)
                return;
@@ -2676,7 +2673,8 @@ static void __vunmap(const void *addr, int deallocate_pages)
 
        kasan_poison_vmalloc(area->addr, get_vm_area_size(area));
 
-       va_remove_mappings(va, deallocate_pages);
+       __remove_vm_area(va);
+       vm_remove_mappings(area, deallocate_pages);
 
        if (deallocate_pages) {
                int i;