mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node.patch removed from -mm tree
The patch titled
Subject: mm: switch the test_vmalloc module to use __vmalloc_node
has been removed from the -mm tree. Its filename was
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: switch the test_vmalloc module to use __vmalloc_node
No need to export the very low-level __vmalloc_node_range when the test module can use a slightly higher level variant.
---
arch/riscv/include/asm/pgtable.h | 4 ++-- lib/test_vmalloc.c | 26 +++++++------------------- mm/vmalloc.c | 17 ++++++++--------- 3 files changed, 17 insertions(+), 30 deletions(-)
arch/riscv/include/asm/pgtable.h renamed from arch/riscv/include/asm/pgtable.h~mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node +2 -2
@@ -473,9 +473,9 @@ static inline int ptep_clear_flush_young#define PAGE_SHARED __pgprot(0)#define PAGE_KERNEL __pgprot(0)#define swapper_pg_dir NULL +#define TASK_SIZE 0xffffffffUL#define VMALLOC_START 0 - -#define TASK_SIZE 0xffffffffUL +#define VMALLOC_END TASK_SIZEstatic inline void __kernel_map_pages (struct page *page,int numpages,int enable) {}
lib/test_vmalloc.c renamed from lib/test_vmalloc.c~mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node +7 -19
@@ -91,12 +91,8 @@ static int random_size_align_alloc_test(*/ size = ((rnd %10 ) +1 ) *PAGE_SIZE ; - ptr =__vmalloc_node_range (size, align, -VMALLOC_START ,VMALLOC_END , -GFP_KERNEL | __GFP_ZERO, -PAGE_KERNEL , -0 ,0 ,__builtin_return_address (0 )); - + ptr =__vmalloc_node (size, align,GFP_KERNEL | __GFP_ZERO,0 , +__builtin_return_address (0 ));if (!ptr)return -1 ;
@@ -118,12 +114,8 @@ static int align_shift_alloc_test(void)for (i =0 ; i <BITS_PER_LONG ; i++) { align = ((unsigned long )1 ) << i; - ptr =__vmalloc_node_range (PAGE_SIZE , align, -VMALLOC_START ,VMALLOC_END , -GFP_KERNEL | __GFP_ZERO, -PAGE_KERNEL , -0 ,0 ,__builtin_return_address (0 )); - + ptr =__vmalloc_node (PAGE_SIZE , align,GFP_KERNEL |__GFP_ZERO,0 , +__builtin_return_address (0 ));if (!ptr)return -1 ;
@@ -139,13 +131,9 @@ static int fix_align_alloc_test(void)int i;for (i =0 ; i < test_loop_count; i++) { - ptr =__vmalloc_node_range (5 *PAGE_SIZE , -THREAD_ALIGN <<1 , -VMALLOC_START ,VMALLOC_END , -GFP_KERNEL | __GFP_ZERO, -PAGE_KERNEL , -0 ,0 ,__builtin_return_address (0 )); - + ptr =__vmalloc_node (5 *PAGE_SIZE ,THREAD_ALIGN <<1 , +GFP_KERNEL | __GFP_ZERO,0 , +__builtin_return_address (0 ));if (!ptr)return -1 ;
mm/vmalloc.c renamed from mm/vmalloc.c~mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node +8 -9
@@ -2523,15 +2523,6 @@ fail:return NULL ; } -/* -* This is only for performance analysis of vmalloc and stress purpose. -* It is required by vmalloc test module, therefore do not use it other -* than that. -*/ -#ifdef CONFIG_TEST_VMALLOC_MODULE -EXPORT_SYMBOL_GPL (__vmalloc_node_range); -#endif -/** * __vmalloc_node - allocate virtually contiguous memory * @size: allocation size
@@ -2557,6 +2548,14 @@ void *__vmalloc_node(unsigned long size,return __vmalloc_node_range (size, align,VMALLOC_START ,VMALLOC_END , gfp_mask,PAGE_KERNEL ,0 , node, caller); } +/* +* This is only for performance analysis of vmalloc and stress purpose. +* It is required by vmalloc test module, therefore do not use it other +* than that. +*/ +#ifdef CONFIG_TEST_VMALLOC_MODULE +EXPORT_SYMBOL_GPL (__vmalloc_node); +#endif void *__vmalloc (unsigned long size,gfp_t gfp_mask) {
_
Patches currently in -mm which might be from [email protected] are
exec-simplify-the-copy_strings_kernel-calling-convention.patch exec-open-code-copy_string_kernel.patch amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch arm-fix-the-flush_icache_range-arguments-in-set_fiq_handler.patch nds32-unexport-flush_icache_page.patch powerpc-unexport-flush_icache_user_range.patch unicore32-remove-flush_cache_user_range.patch asm-generic-fix-the-inclusion-guards-for-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh-fix.patch asm-generic-improve-the-flush_dcache_page-stub.patch alpha-use-asm-generic-cacheflushh.patch arm64-use-asm-generic-cacheflushh.patch c6x-use-asm-generic-cacheflushh.patch hexagon-use-asm-generic-cacheflushh.patch ia64-use-asm-generic-cacheflushh.patch microblaze-use-asm-generic-cacheflushh.patch m68knommu-use-asm-generic-cacheflushh.patch openrisc-use-asm-generic-cacheflushh.patch powerpc-use-asm-generic-cacheflushh.patch riscv-use-asm-generic-cacheflushh.patch armsparcunicore32-remove-flush_icache_user_range.patch mm-rename-flush_icache_user_range-to-flush_icache_user_page.patch asm-generic-add-a-flush_icache_user_range-stub.patch sh-implement-flush_icache_user_range.patch xtensa-implement-flush_icache_user_range.patch arm-rename-flush_cache_user_range-to-flush_icache_user_range.patch m68k-implement-flush_icache_user_range.patch exec-only-build-read_code-when-needed.patch exec-use-flush_icache_user_range-in-read_code.patch binfmt_flat-use-flush_icache_user_range.patch nommu-use-flush_icache_user_range-in-brk-and-mmap.patch module-move-the-set_fs-hack-for-flush_icache_range-to-m68k.patch maccess-unexport-probe_kernel_write-and-probe_user_write.patch maccess-remove-various-unused-weak-aliases.patch maccess-remove-duplicate-kerneldoc-comments.patch maccess-clarify-kerneldoc-comments.patch maccess-update-the-top-of-file-comment.patch maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch maccess-rename-strncpy_from_unsafe_strict-to-strncpy_from_kernel_nofault.patch maccess-rename-strnlen_unsafe_user-to-strnlen_user_nofault.patch maccess-remove-probe_read_common-and-probe_write_common.patch maccess-unify-the-probe-kernel-arch-hooks.patch bpf-factor-out-a-bpf_trace_copy_string-helper.patch bpf-handle-the-compat-string-in-bpf_trace_copy_string-better.patch bpf-rework-the-compat-kernel-probe-handling.patch tracing-kprobes-handle-mixed-kernel-userspace-probes-better.patch maccess-remove-strncpy_from_unsafe.patch maccess-always-use-strict-semantics-for-probe_kernel_read.patch maccess-move-user-access-routines-together.patch maccess-allow-architectures-to-provide-kernel-probing-directly.patch x86-use-non-set_fs-based-maccess-routines.patch maccess-return-erange-when-copy_from_kernel_nofault_allowed-fails.patch