vmcore-convert-copy_oldmem_page-to-take-an-iov_iter.patch removed from -mm tree
The quilt patch titled
Subject: vmcore: convert copy_oldmem_page() to take an iov_iter
has been removed from the -mm tree. Its filename was
vmcore-convert-copy_oldmem_page-to-take-an-iov_iter.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <[email protected]>
Subject: vmcore: convert copy_oldmem_page() to take an iov_iter
Patch series "Convert vmcore to use an iov_iter", v5.
For some reason several people have been sending bad patches to fix compiler warnings in vmcore recently. Here's how it should be done. Compile-tested only on x86. As noted in the first patch, s390 should take this conversion a bit further, but I'm not inclined to do that work myself.
This patch (of 3):
Instead of passing in a 'buf' and 'userbuf' argument, pass in an iov_iter. s390 needs more work to pass the iov_iter down further, or refactor, but I'd be more comfortable if someone who can test on s390 did that work.
It's more convenient to convert the whole of read_from_oldmem() to take an iov_iter at the same time, so rename it to read_from_oldmem_iter() and add a temporary read_from_oldmem() wrapper that creates an iov_iter.
---
arch/arm/kernel/crash_dump.c | 27 ++------------ arch/arm64/kernel/crash_dump.c | 29 ++------------- arch/ia64/kernel/crash_dump.c | 32 ++--------------- arch/mips/kernel/crash_dump.c | 27 ++------------ arch/powerpc/kernel/crash_dump.c | 35 ++---------------- arch/riscv/kernel/crash_dump.c | 26 ++----------- arch/s390/kernel/crash_dump.c | 13 ++++-- arch/sh/kernel/crash_dump.c | 29 ++------------- arch/x86/kernel/crash_dump_32.c | 29 ++------------- arch/x86/kernel/crash_dump_64.c | 41 +++++----------------- fs/proc/vmcore.c | 54 ++++++++++++++++++----------- include/linux/crash_dump.h | 9 ++-- 12 files changed, 91 insertions(+), 260 deletions(-)
arch/arm64/kernel/crash_dump.c renamed from arch/arm64/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -25
@@ -9,25 +9,11 @@#include <linux/crash_dump.h> #include <linux/errno.h> #include <linux/io.h> -#include <linux/memblock.h> -#include <linux/uaccess.h> +#include <linux/uio.h> #include <asm/memory.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is in a user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -38,14 +24,7 @@ ssize_t copy_oldmem_page(unsigned long pif (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user ((char __user *)buf, vaddr + offset, csize)) { -memunmap (vaddr); -return -EFAULT ; - } - }else { -memcpy (buf, vaddr + offset, csize); - } + csize =copy_to_iter (vaddr + offset, csize, iter);memunmap (vaddr);
arch/arm/kernel/crash_dump.c renamed from arch/arm/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -23
@@ -14,22 +14,10 @@#include <linux/crash_dump.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/uio.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is int he user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -40,14 +28,7 @@ ssize_t copy_oldmem_page(unsigned long pif (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user (buf, vaddr + offset, csize)) { -iounmap (vaddr); -return -EFAULT ; - } - }else { -memcpy (buf, vaddr + offset, csize); - } + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr);return csize;
arch/ia64/kernel/crash_dump.c renamed from arch/ia64/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -28
@@ -10,42 +10,18 @@#include <linux/errno.h> #include <linux/types.h> #include <linux/crash_dump.h> - +#include <linux/uio.h> #include <asm/page.h> -#include <linux/uaccess.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -* -* Calling copy_to_user() in atomic context is not desirable. Hence first -* copying the data to a pre-allocated kernel page and then copying to user -* space in non-atomic context. -*/ -ssize_t -copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;if (!csize)return 0 ; vaddr =__va (pfn<<PAGE_SHIFT ); -if (userbuf) { -if (copy_to_user (buf, (vaddr + offset), csize)) { -return -EFAULT ; - } - }else -memcpy (buf, (vaddr + offset), csize); + csize =copy_to_iter (vaddr + offset, csize, iter);return csize; }
arch/mips/kernel/crash_dump.c renamed from arch/mips/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -23
@@ -1,22 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/highmem.h> #include <linux/crash_dump.h> +#include <linux/uio.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -24,14 +12,7 @@ ssize_t copy_oldmem_page(unsigned long preturn 0 ; vaddr =kmap_local_pfn (pfn); - -if (!userbuf) { -memcpy (buf, vaddr + offset, csize); - }else { -if (copy_to_user (buf, vaddr + offset, csize)) - csize = -EFAULT ; - } - + csize =copy_to_iter (vaddr + offset, csize, iter);kunmap_local (vaddr);return csize;
arch/powerpc/kernel/crash_dump.c renamed from arch/powerpc/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +5 -30
@@ -16,7 +16,7 @@#include <asm/kdump.h> #include <asm/prom.h> #include <asm/firmware.h> -#include <linux/uaccess.h> +#include <linux/uio.h> #include <asm/rtas.h> #include <asm/inst.h>
@@ -68,33 +68,8 @@ void __init setup_kdump_trampoline(void) }#endif /* CONFIG_NONSTATIC_KERNEL */ -static size_t copy_oldmem_vaddr (void *vaddr,char *buf,size_t csize, -unsigned long offset,int userbuf) -{ -if (userbuf) { -if (copy_to_user ((char __user *)buf, (vaddr + offset), csize)) -return -EFAULT ; - }else -memcpy (buf, (vaddr + offset), csize); - -return csize; -} - -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;phys_addr_t paddr;
@@ -107,10 +82,10 @@ ssize_t copy_oldmem_page(unsigned long pif (memblock_is_region_memory (paddr, csize)) { vaddr =__va (paddr); - csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); + csize =copy_to_iter (vaddr + offset, csize, iter); }else { vaddr =ioremap_cache (paddr,PAGE_SIZE ); - csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr); }
arch/riscv/kernel/crash_dump.c renamed from arch/riscv/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -22
@@ -7,22 +7,10 @@#include <linux/crash_dump.h> #include <linux/io.h> +#include <linux/uio.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is in a user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -33,13 +21,7 @@ ssize_t copy_oldmem_page(unsigned long pif (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user ((char __user *)buf, vaddr + offset, csize)) { -memunmap (vaddr); -return -EFAULT ; - } - }else -memcpy (buf, vaddr + offset, csize); + csize =copy_to_iter (vaddr + offset, csize, iter);memunmap (vaddr);return csize;
arch/s390/kernel/crash_dump.c renamed from arch/s390/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +8 -5
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/memblock.h> #include <linux/elf.h> +#include <linux/uio.h> #include <asm/asm-offsets.h> #include <asm/os_info.h> #include <asm/elf.h>
@@ -212,8 +213,8 @@ static int copy_oldmem_user(void __user/* * Copy one page from "oldmem" */ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf,size_t csize, -unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn,size_t csize, +unsigned long offset) {unsigned long src;int rc;
@@ -221,10 +222,12 @@ ssize_t copy_oldmem_page(unsigned long pif (!csize)return 0 ; src =pfn_to_phys (pfn) + offset; -if (userbuf) - rc =copy_oldmem_user ((void __force __user *) buf, src, csize); + +/* XXX: pass the iov_iter down to a common function */ +if (iter_is_iovec (iter)) + rc =copy_oldmem_user (iter->iov->iov_base, src, csize);else - rc =copy_oldmem_kernel ((void *) buf, src, csize); + rc =copy_oldmem_kernel (iter->kvec->iov_base, src, csize);return rc; }
arch/sh/kernel/crash_dump.c renamed from arch/sh/kernel/crash_dump.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +5 -24
@@ -8,23 +8,11 @@#include <linux/errno.h> #include <linux/crash_dump.h> #include <linux/io.h> +#include <linux/uio.h> #include <linux/uaccess.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void __iomem *vaddr;
@@ -32,15 +20,8 @@ ssize_t copy_oldmem_page(unsigned long preturn 0 ; vaddr =ioremap (pfn <<PAGE_SHIFT ,PAGE_SIZE ); - -if (userbuf) { -if (copy_to_user ((void __user *)buf, (vaddr + offset), csize)) { -iounmap (vaddr); -return -EFAULT ; - } - }else -memcpy (buf, (vaddr + offset), csize); - + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr); +return csize; }
arch/x86/kernel/crash_dump_32.c renamed from arch/x86/kernel/crash_dump_32.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -25
@@ -10,8 +10,7 @@#include <linux/errno.h> #include <linux/highmem.h> #include <linux/crash_dump.h> - -#include <linux/uaccess.h> +#include <linux/uio.h> static inline bool is_crashed_pfn_valid (unsigned long pfn) {
@@ -29,21 +28,8 @@ static inline bool is_crashed_pfn_valid(#endif } -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there might be no pte mapped -* in the current kernel. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf,size_t csize, -unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn,size_t csize, +unsigned long offset) {void *vaddr;
@@ -54,14 +40,7 @@ ssize_t copy_oldmem_page(unsigned long preturn -EFAULT ; vaddr =kmap_local_pfn (pfn); - -if (!userbuf) { -memcpy (buf, vaddr + offset, csize); - }else { -if (copy_to_user (buf, vaddr + offset, csize)) - csize = -EFAULT ; - } - + csize =copy_to_iter (vaddr + offset, csize, iter);kunmap_local (vaddr);return csize;
arch/x86/kernel/crash_dump_64.c renamed from arch/x86/kernel/crash_dump_64.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +11 -30
69 lines not on this page · raw message
fs/proc/vmcore.c renamed from fs/proc/vmcore.c~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +34 -20
95 lines not on this page · raw message
include/linux/crash_dump.h renamed from include/linux/crash_dump.h~vmcore-convert-copy_oldmem_page-to-take-an-iov_iter +4 -5
@@ -24,11 +24,10 @@ extern int remap_oldmem_pfn_range(struct unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); -extern ssize_t copy_oldmem_page (unsigned long ,char *,size_t , -unsigned long ,int ); -extern ssize_t copy_oldmem_page_encrypted (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf); +ssize_t copy_oldmem_page (struct iov_iter *i,unsigned long pfn,size_t csize, +unsigned long offset); +ssize_t copy_oldmem_page_encrypted (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset);void vmcore_cleanup (void );
_
Patches currently in -mm which might be from [email protected] are
shmem-convert-shmem_alloc_hugepage-to-use-vma_alloc_folio.patch mm-huge_memory-convert-do_huge_pmd_anonymous_page-to-use-vma_alloc_folio.patch alpha-fix-alloc_zeroed_user_highpage_movable.patch mm-remove-alloc_pages_vma.patch vmscan-use-folio_mapped-in-shrink_page_list.patch vmscan-convert-the-writeback-handling-in-shrink_page_list-to-folios.patch swap-turn-get_swap_page-into-folio_alloc_swap.patch swap-convert-add_to_swap-to-take-a-folio.patch vmscan-convert-dirty-page-handling-to-folios.patch vmscan-convert-page-buffer-handling-to-use-folios.patch vmscan-convert-lazy-freeing-to-folios.patch vmscan-move-initialisation-of-mapping-down.patch vmscan-convert-the-activate_locked-portion-of-shrink_page_list-to-folios.patch mm-allow-can_split_folio-to-be-called-when-thp-are-disabled.patch vmscan-remove-remaining-uses-of-page-in-shrink_page_list.patch mm-shmem-use-a-folio-in-shmem_unused_huge_shrink.patch mm-swap-add-folio_throttle_swaprate.patch mm-shmem-convert-shmem_add_to_page_cache-to-take-a-folio.patch mm-shmem-turn-shmem_should_replace_page-into-shmem_should_replace_folio.patch mm-shmem-add-shmem_alloc_folio.patch mm-shmem-convert-shmem_alloc_and_acct_page-to-use-a-folio.patch mm-shmem-convert-shmem_getpage_gfp-to-use-a-folio.patch mm-shmem-convert-shmem_swapin_page-to-shmem_swapin_folio.patch mm-add-folio_mapping_flags.patch
mm-add-folio_test_movable.patch mm-migrate-convert-move_to_new_page-into-move_to_new_folio.patch mm-add-vma-iterator.patch mmap-use-the-vma-iterator-in-count_vma_pages_range.patch proc-remove-vma-rbtree-use-from-nommu.patch arm64-remove-mmap-linked-list-from-vdso.patch parisc-remove-mmap-linked-list-from-cache-handling.patch powerpc-remove-mmap-linked-list-walks.patch s390-remove-vma-linked-list-walks.patch x86-remove-vma-linked-list-walks.patch xtensa-remove-vma-linked-list-walks.patch cxl-remove-vma-linked-list-walk.patch optee-remove-vma-linked-list-walk.patch um-remove-vma-linked-list-walk.patch coredump-remove-vma-linked-list-walk.patch exec-use-vma-iterator-instead-of-linked-list.patch fs-proc-task_mmu-stop-using-linked-list-and-highest_vm_end.patch acct-use-vma-iterator-instead-of-linked-list.patch perf-use-vma-iterator.patch sched-use-maple-tree-iterator-to-walk-vmas.patch fork-use-vma-iterator.patch mm-khugepaged-stop-using-vma-linked-list.patch mm-ksm-use-vma-iterators-instead-of-vma-linked-list.patch mm-mlock-use-vma-iterator-and-maple-state-instead-of-vma-linked-list.patch mm-pagewalk-use-vma_find-instead-of-vma-linked-list.patch i915-use-the-vma-iterator.patch nommu-remove-uses-of-vma-linked-list.patch