dma-mapping-use-vmap-insted-of-reimplementing-it.patch removed from -mm tree
The patch titled
Subject: dma-mapping: use vmap insted of reimplementing it
has been removed from the -mm tree. Its filename was
dma-mapping-use-vmap-insted-of-reimplementing-it.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: dma-mapping: use vmap insted of reimplementing it
Replace the open coded instance of vmap with the actual function. In the non-contiguous (IOMMU) case this requires an extra find_vm_area, but given that this isn't a fast path function that is a small price to pay.
---
kernel/dma/remap.c | 48 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-)
kernel/dma/remap.c renamed from kernel/dma/remap.c~dma-mapping-use-vmap-insted-of-reimplementing-it +12 -36
@@ -20,23 +20,6 @@ struct page **dma_common_find_pages(voidreturn area->pages; } -static struct vm_struct *__dma_common_pages_remap (struct page **pages, -size_t size,pgprot_t prot,const void *caller) -{ -struct vm_struct *area; - - area =get_vm_area_caller (size,VM_DMA_COHERENT , caller); -if (!area) -return NULL ; - -if (map_vm_area (area, prot, pages)) { -vunmap (area->addr); -return NULL ; - } - -return area; -} -/* * Remaps an array of PAGE_SIZE pages into another vm_area. * Cannot be used in non-sleeping contexts
@@ -44,15 +27,12 @@ static struct vm_struct *__dma_common_pavoid *dma_common_pages_remap (struct page **pages,size_t size,pgprot_t prot,const void *caller) { -struct vm_struct *area; +void *vaddr; - area =__dma_common_pages_remap (pages, size, prot, caller); -if (!area) -return NULL ; - - area->pages = pages; - -return area->addr; + vaddr =vmap (pages, size >>PAGE_SHIFT ,VM_DMA_COHERENT , prot); +if (vaddr) +find_vm_area (vaddr)->pages = pages; +return vaddr; }/*
@@ -62,24 +42,20 @@ void *dma_common_pages_remap(struct pagevoid *dma_common_contiguous_remap (struct page *page,size_t size,pgprot_t prot,const void *caller) { -int i; +int count = size >>PAGE_SHIFT ;struct page **pages; -struct vm_struct *area; +void *vaddr; +int i; - pages =kmalloc (sizeof (struct page *) <<get_order (size),GFP_KERNEL ); + pages =kmalloc_array (count,sizeof (struct page *),GFP_KERNEL );if (!pages)return NULL ; - -for (i =0 ; i < (size >>PAGE_SHIFT ); i++) +for (i =0 ; i < count; i++) pages[i] =nth_page (page, i); - - area =__dma_common_pages_remap (pages, size, prot, caller); - + vaddr =vmap (pages, count,VM_DMA_COHERENT , prot);kfree (pages); -if (!area) -return NULL ; -return area->addr; +return vaddr; }/*
_
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