The quilt patch titled
Subject: arch/um: fix forward declaration for vmalloc
has been removed from the -mm tree. Its filename was
mm-vmalloc-enable-memory-allocation-profiling-fix.patch
This patch was dropped because it was folded into mm-vmalloc-enable-memory-allocation-profiling.patch
------------------------------------------------------
From: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Subject: arch/um: fix forward declaration for vmalloc
Date: Tue, 26 Mar 2024 00:37:50 -0700
Patch [1] replaced vmalloc() function with a new definition but it did not
adjust the forward declaration used in UML architecture. Change it to act
as before.
Note that this prevents the vmalloc() allocations in __wrap_malloc() from
being accounted. If accounting here is critical, we will have to remove
this forward declaration and include vmalloc.h, however that would pull in
more dependencies and would require introducing more architecture-specific
headers, like asm/bug.h, asm/rwonce.h, etc. This is likely the reason why
this forward declaration was introduced in the first place.
[1] https://lore.kernel.org/all/20240321163705.3067592-31-surenb@xxxxxxxxxx/
Link: https://lkml.kernel.org/r/20240326073750.726636-1-surenb@xxxxxxxxxx
Fixes: 576477564ede ("mm: vmalloc: enable memory allocation profiling")
Signed-off-by: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Reported-by: SeongJae Park <sj@xxxxxxxxxx>
Closes: https://lore.kernel.org/all/20240323180506.195396-1-sj@xxxxxxxxxx/
Tested-by: SeongJae Park <sj@xxxxxxxxxx>
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx
Acked-by: Richard Weinberger <richard@xxxxxx>
Tested-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/include/shared/um_malloc.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/arch/um/include/shared/um_malloc.h~mm-vmalloc-enable-memory-allocation-profiling-fix
+++ a/arch/um/include/shared/um_malloc.h
@@ -11,7 +11,8 @@
extern void *uml_kmalloc(int size, int flags);
extern void kfree(const void *ptr);
-extern void *vmalloc(unsigned long size);
+extern void *vmalloc_noprof(unsigned long size);
+#define vmalloc(...) vmalloc_noprof(__VA_ARGS__)
extern void vfree(void *ptr);
#endif /* __UM_MALLOC_H__ */
_
Patches currently in -mm which might be from surenb@xxxxxxxxxx are
mm-introduce-slabobj_ext-to-support-slab-object-extensions.patch
mm-introduce-__gfp_no_obj_ext-flag-to-selectively-prevent-slabobj_ext-creation.patch
mm-slab-introduce-slab_no_obj_ext-to-avoid-obj_ext-creation.patch
slab-objext-introduce-objext_flags-as-extension-to-page_memcg_data_flags.patch
lib-code-tagging-framework.patch
lib-code-tagging-module-support.patch
lib-prevent-module-unloading-if-memory-is-not-freed.patch
lib-add-allocation-tagging-support-for-memory-allocation-profiling.patch
lib-introduce-support-for-page-allocation-tagging.patch
lib-introduce-early-boot-parameter-to-avoid-page_ext-memory-overhead.patch
mm-percpu-increase-percpu_module_reserve-to-accommodate-allocation-tags.patch
change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch
mm-enable-page-allocation-tagging.patch
mm-create-new-codetag-references-during-page-splitting.patch
mm-fix-non-compound-multi-order-memory-accounting-in-__free_pages.patch
mm-page_ext-enable-early_page_ext-when-config_mem_alloc_profiling_debug=y.patch
lib-add-codetag-reference-into-slabobj_ext.patch
mm-slab-add-allocation-accounting-into-slab-allocation-and-free-paths.patch
mm-slab-enable-slab-allocation-tagging-for-kmalloc-and-friends.patch
mm-percpu-enable-per-cpu-allocation-tagging.patch
mm-vmalloc-enable-memory-allocation-profiling.patch
mm-vmalloc-enable-memory-allocation-profiling-fix-2.patch
rhashtable-plumb-through-alloc-tag-fix.patch
lib-add-memory-allocations-report-in-show_mem.patch
codetag-debug-skip-objext-checking-when-its-for-objext-itself.patch
codetag-debug-mark-codetags-for-reserved-pages-as-empty.patch
codetag-debug-introduce-objexts_alloc_fail-to-mark-failed-slab_ext-allocations.patch
mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch
userfaultfd-remove-write_once-when-setting-folio-index-during-uffdio_move.patch
