Revert "vmalloc: Optimize vfree"

This reverts commit d511c6d.

Signed-off-by: Eric Naim <dnaim@cachyos.org>

Author: 1Naim

include/linux/gfp.h

@@ -239,8 +239,6 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,
 				struct page **page_array);
 #define __alloc_pages_bulk(...)			alloc_hooks(alloc_pages_bulk_noprof(__VA_ARGS__))
 
-void free_pages_bulk(struct page **page_array, unsigned long nr_pages);
-
 unsigned long alloc_pages_bulk_mempolicy_noprof(gfp_t gfp,
 				unsigned long nr_pages,
 				struct page **page_array);

mm/page_alloc.c

@@ -5214,44 +5214,6 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,
 }
 EXPORT_SYMBOL_GPL(alloc_pages_bulk_noprof);
 
-/*
- * free_pages_bulk - Free an array of order-0 pages
- * @page_array: Array of pages to free
- * @nr_pages: The number of pages in the array
- *
- * Free the order-0 pages. Adjacent entries whose PFNs form a contiguous
- * run are released with a single __free_contig_range() call.
- *
- * This assumes page_array is sorted in ascending PFN order. Without that,
- * the function still frees all pages, but contiguous runs may not be
- * detected and the freeing pattern can degrade to freeing one page at a
- * time.
- *
- * Context: Sleepable process context only; calls cond_resched()
- */
-void free_pages_bulk(struct page **page_array, unsigned long nr_pages)
-{
-	unsigned long start_pfn = 0, pfn;
-	unsigned long i, nr_contig = 0;
-
-	for (i = 0; i < nr_pages; i++) {
-		pfn = page_to_pfn(page_array[i]);
-		if (!nr_contig) {
-			start_pfn = pfn;
-			nr_contig = 1;
-		} else if (start_pfn + nr_contig != pfn) {
-			__free_contig_range(start_pfn, nr_contig);
-			start_pfn = pfn;
-			nr_contig = 1;
-			cond_resched();
-		} else {
-			nr_contig++;
-		}
-	}
-	if (nr_contig)
-		__free_contig_range(start_pfn, nr_contig);
-}
-
 /*
  * This is the 'heart' of the zoned buddy allocator.
  */

mm/vmalloc.c

@@ -3468,12 +3468,17 @@ void vfree(const void *addr)
 	/* All pages of vm should be charged to same memcg, so use first one. */
 	if (vm->nr_pages && !(vm->flags & VM_MAP_PUT_PAGES))
 		mod_memcg_page_state(vm->pages[0], MEMCG_VMALLOC, -vm->nr_pages);
-	if (!(vm->flags & VM_MAP_PUT_PAGES)) {
-		for (i = 0; i < vm->nr_pages; i++)
-			mod_lruvec_page_state(vm->pages[i], NR_VMALLOC, -1);
-	}
-	free_pages_bulk(vm->pages, vm->nr_pages);
+	for (i = 0; i < vm->nr_pages; i++) {
+		struct page *page = vm->pages[i];
 
+		BUG_ON(!page);
+		/*
+		 * High-order allocs for huge vmallocs are split, so
+		 * can be freed as an array of order-0 allocations
+		 */
+		__free_page(page);
+		cond_resched();
+	}
 	if (!(vm->flags & VM_MAP_PUT_PAGES))
 		atomic_long_sub(vm->nr_pages, &nr_vmalloc_pages);
 	kvfree(vm->pages);