mm-remove-vmap_page_range_noflush-and-vunmap_page_range.patch removed from -mm tree
The patch titled
Subject: mm: remove vmap_page_range_noflush and vunmap_page_range
has been removed from the -mm tree. Its filename was
mm-remove-vmap_page_range_noflush-and-vunmap_page_range.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: remove vmap_page_range_noflush and vunmap_page_range
These have non-static aliases called map_kernel_range_noflush and unmap_kernel_range_noflush that just differ slightly in the calling conventions that pass addr + size instead of an end.
---
mm/vmalloc.c | 98 ++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 58 deletions(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-remove-vmap_page_range_noflush-and-vunmap_page_range +40 -58
@@ -128,10 +128,24 @@ static void vunmap_p4d_range(pgd_t *pgd, }while (p4d++, addr = next, addr != end); } -static void vunmap_page_range (unsigned long addr,unsigned long end) +/** +* unmap_kernel_range_noflush - unmap kernel VM area +* @addr: start of the VM area to unmap +* @size: size of the VM area to unmap +* +* Unmap PFN_UP(@size) pages at @addr. The VM area @addr and @size specify +* should have been allocated using get_vm_area() and its friends. +* +* NOTE: +* This function does NOT do any cache flushing. The caller is responsible +* for calling flush_cache_vunmap() on to-be-mapped areas before calling this +* function and flush_tlb_kernel_range() after. +*/ +void unmap_kernel_range_noflush (unsigned long addr,unsigned long size) { -pgd_t *pgd; +unsigned long end = addr + size;unsigned long next; +pgd_t *pgd;BUG_ON (addr >= end); pgd =pgd_offset_k (addr);
@@ -220,18 +234,30 @@ static int vmap_p4d_range(pgd_t *pgd, unreturn 0 ; } -/* -* Set up page tables in kva (addr, end). The ptes shall have prot "prot", and -* will have pfns corresponding to the "pages" array. +/** +* map_kernel_range_noflush - map kernel VM area with the specified pages +* @addr: start of the VM area to map +* @size: size of the VM area to map +* @prot: page protection flags to use +* @pages: pages to map * -* Ie. pte at addr+N*PAGE_SIZE shall point to pfn corresponding to pages[N] +* Map PFN_UP(@size) pages at @addr. The VM area @addr and @size specify should +* have been allocated using get_vm_area() and its friends. +* +* NOTE: +* This function does NOT do any cache flushing. The caller is responsible for +* calling flush_cache_vmap() on to-be-mapped areas before calling this +* function. +* +* RETURNS: +* The number of pages mapped on success, -errno on failure. */ -static int vmap_page_range_noflush (unsigned long start,unsigned long end, -pgprot_t prot,struct page **pages) +int map_kernel_range_noflush (unsigned long addr,unsigned long size, +pgprot_t prot,struct page **pages) { -pgd_t *pgd; +unsigned long end = addr + size;unsigned long next; -unsigned long addr = start; +pgd_t *pgd;int err =0 ;int nr =0 ;
@@ -252,7 +278,7 @@ static int vmap_page_range(unsigned long {int ret; - ret =vmap_page_range_noflush (start, end, prot, pages); + ret =map_kernel_range_noflush (start, end - start, prot, pages);flush_cache_vmap (start, end);return ret; }
@@ -1227,7 +1253,7 @@ EXPORT_SYMBOL_GPL(unregister_vmap_purge_*/ static void unmap_vmap_area (struct vmap_area *va) { -vunmap_page_range (va->va_start, va->va_end); +unmap_kernel_range_noflush (va->va_start, va->va_end - va->va_start); }/*
@@ -1687,7 +1713,7 @@ static void vb_free(unsigned long addr,rcu_read_unlock ();BUG_ON (!vb); -vunmap_page_range (addr, addr + size); +unmap_kernel_range_noflush (addr, size);if (debug_pagealloc_enabled_static ())flush_tlb_kernel_range (addr, addr + size);
@@ -1986,50 +2012,6 @@ void __init vmalloc_init(void) }/** -* map_kernel_range_noflush - map kernel VM area with the specified pages -* @addr: start of the VM area to map -* @size: size of the VM area to map -* @prot: page protection flags to use -* @pages: pages to map -* -* Map PFN_UP(@size) pages at @addr. The VM area @addr and @size -* specify should have been allocated using get_vm_area() and its -* friends. -* -* NOTE: -* This function does NOT do any cache flushing. The caller is -* responsible for calling flush_cache_vmap() on to-be-mapped areas -* before calling this function. -* -* RETURNS: -* The number of pages mapped on success, -errno on failure. -*/ -int map_kernel_range_noflush (unsigned long addr,unsigned long size, -pgprot_t prot,struct page **pages) -{ -return vmap_page_range_noflush (addr, addr + size, prot, pages); -} - -/** -* unmap_kernel_range_noflush - unmap kernel VM area -* @addr: start of the VM area to unmap -* @size: size of the VM area to unmap -* -* Unmap PFN_UP(@size) pages at @addr. The VM area @addr and @size -* specify should have been allocated using get_vm_area() and its -* friends. -* -* NOTE: -* This function does NOT do any cache flushing. The caller is -* responsible for calling flush_cache_vunmap() on to-be-mapped areas -* before calling this function and flush_tlb_kernel_range() after. -*/ -void unmap_kernel_range_noflush (unsigned long addr,unsigned long size) -{ -vunmap_page_range (addr, addr + size); -} - -/** * unmap_kernel_range - unmap kernel VM area and flush cache and TLB * @addr: start of the VM area to unmap * @size: size of the VM area to unmap
@@ -2042,7 +2024,7 @@ void unmap_kernel_range(unsigned long adunsigned long end = addr + size;flush_cache_vunmap (addr, end); -vunmap_page_range (addr, end); +unmap_kernel_range_noflush (addr, size);flush_tlb_kernel_range (addr, end); }
_
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