diff mbox series

[098/166] proc: use ppos instead of m->version

Message ID	20200407030914.n_79Kob4c%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=tmHZ=5X=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 807D3212CC Date: Mon, 06 Apr 2020 20:09:14 -0700 From: Andrew Morton <akpm@linux-foundation.org> To: adobriyan@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 098/166] proc: use ppos instead of m->version Message-ID: <20200407030914.n_79Kob4c%akpm@linux-foundation.org> In-Reply-To: <20200406200254.a69ebd9e08c4074e41ddebaf@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[001/166] mm, memcg: bypass high reclaim iteration for cgroup hierarchy root \| expand [001/166] mm, memcg: bypass high reclaim iteration for cgroup hierarchy root [002/166] mm: don't prepare anon_vma if vma has VM_WIPEONFORK [003/166] Revert "mm/rmap.c: reuse mergeable anon_vma as parent when fork" [004/166] mm: set vm_next and vm_prev to NULL in vm_area_dup() [005/166] mm/vma: add missing VMA flag readable name for VM_SYNC [006/166] mm/vma: make vma_is_accessible() available for general use [007/166] mm/vma: replace all remaining open encodings with is_vm_hugetlb_page() [008/166] mm/vma: replace all remaining open encodings with vma_is_anonymous() [009/166] mm/vma: append unlikely() while testing VMA access permissions [010/166] mm/vmalloc: fix a typo in comment [011/166] mm: make it clear that gfp reclaim modifiers are valid only for sleepable allocations [012/166] mm/migrate.c: no need to check for i > start in do_pages_move() [013/166] mm/migrate.c: wrap do_move_pages_to_node() and store_status() [014/166] mm/migrate.c: check pagelist in move_pages_and_store_status() [015/166] mm/migrate.c: unify "not queued for migration" handling in do_pages_move() [016/166] mm/migrate.c: migrate PG_readahead flag [017/166] mm, shmem: add vmstat for hugepage fallback [018/166] mm, thp: track fallbacks due to failed memcg charges separately [019/166] include/linux/pagemap.h: optimise find_subpage for !THP [020/166] mm: remove CONFIG_TRANSPARENT_HUGE_PAGECACHE [021/166] mm/ksm.c: update get_user_pages() argument in comment [022/166] mm: code cleanup for MADV_FREE [023/166] mm: adjust shuffle code to allow for future coalescing [024/166] mm: use zone and order instead of free area in free_list manipulators [025/166] mm: add function __putback_isolated_page [026/166] mm: introduce Reported pages [027/166] virtio-balloon: pull page poisoning config out of free page hinting [028/166] virtio-balloon: add support for providing free page reports to host [029/166] mm/page_reporting: rotate reported pages to the tail of the list [030/166] mm/page_reporting: add budget limit on how many pages can be reported per pass [031/166] mm/page_reporting: add free page reporting documentation [032/166] virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM [033/166] userfaultfd: wp: add helper for writeprotect check [034/166] userfaultfd: wp: hook userfault handler to write protection fault [035/166] userfaultfd: wp: add WP pagetable tracking to x86 [036/166] userfaultfd: wp: userfaultfd_pte/huge_pmd_wp() helpers [037/166] userfaultfd: wp: add UFFDIO_COPY_MODE_WP [038/166] mm: merge parameters for change_protection() [039/166] userfaultfd: wp: apply _PAGE_UFFD_WP bit [040/166] userfaultfd: wp: drop _PAGE_UFFD_WP properly when fork [041/166] userfaultfd: wp: add pmd_swp_uffd_wp() helpers [042/166] userfaultfd: wp: support swap and page migration [043/166] khugepaged: skip collapse if uffd-wp detected [044/166] userfaultfd: wp: support write protection for userfault vma range [045/166] userfaultfd: wp: add the writeprotect API to userfaultfd ioctl [046/166] userfaultfd: wp: enabled write protection in userfaultfd API [047/166] userfaultfd: wp: don't wake up when doing write protect [048/166] userfaultfd: wp: UFFDIO_REGISTER_MODE_WP documentation update [049/166] userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally [050/166] userfaultfd: selftests: refactor statistics [051/166] userfaultfd: selftests: add write-protect test [052/166] drivers/base/memory.c: drop section_count [053/166] drivers/base/memory.c: drop pages_correctly_probed() [054/166] mm/page_ext.c: drop pfn_present() check when onlining [055/166] mm/memory_hotplug.c: only respect mem= parameter during boot stage [056/166] mm/memory_hotplug.c: simplify calculation of number of pages in __remove_pages() [057/166] mm/memory_hotplug.c: cleanup __add_pages() [058/166] mm/sparse.c: introduce new function fill_subsection_map() [059/166] mm/sparse.c: introduce a new function clear_subsection_map() [060/166] mm/sparse.c: only use subsection map in VMEMMAP case [061/166] mm/sparse.c: add note about only VMEMMAP supporting sub-section hotplug [062/166] mm/sparse.c: move subsection_map related functions together [063/166] drivers/base/memory: rename MMOP_ONLINE_KEEP to MMOP_ONLINE [064/166] drivers/base/memory: map MMOP_OFFLINE to 0 [065/166] drivers/base/memory: store mapping between MMOP_ and string in an array [066/166] powernv/memtrace: always online added memory blocks [067/166] hv_balloon: don't check for memhp_auto_online manually [068/166] mm/memory_hotplug: unexport memhp_auto_online [069/166] mm/memory_hotplug: convert memhp_auto_online to store an online_type [070/166] mm/memory_hotplug: allow to specify a default online_type [071/166] mm/memory_hotplug.c: use __pfn_to_section() instead of open-coding [072/166] mm/shmem.c: distribute switch variables for initialization [073/166] mm/shmem.c: clean code by removing unnecessary assignment [074/166] mm: huge tmpfs: try to split_huge_page() when punching hole [075/166] mm: prevent a warning when casting void* -> enum [076/166] mm/zswap: allow setting default status, compressor and allocator in Kconfig [077/166] mm/compaction: add missing annotation for compact_lock_irqsave [078/166] mm/hugetlb: add missing annotation for gather_surplus_pages() [079/166] mm/mempolicy: add missing annotation for queue_pages_pmd() [080/166] mm/slub: add missing annotation for get_map() [081/166] mm/slub: add missing annotation for put_map() [082/166] mm/zsmalloc: add missing annotation for migrate_read_lock() [083/166] mm/zsmalloc: add missing annotation for migrate_read_unlock() [084/166] mm/zsmalloc: add missing annotation for pin_tag() [085/166] mm/zsmalloc: add missing annotation for unpin_tag() [086/166] mm: fix ambiguous comments for better code readability [087/166] mm/mm_init.c: clean code. Use BUILD_BUG_ON when comparing compile time constant [088/166] mm: use fallthrough; [089/166] include/linux/swapops.h: correct guards for non_swap_entry() [090/166] include/linux/memremap.h: remove stale comments [091/166] mm/dmapool.c: micro-optimisation remove unnecessary branch [092/166] mm: remove dummy struct bootmem_data/bootmem_data_t [093/166] fs/proc/inode.c: annotate close_pdeo() for sparse [094/166] proc: faster open/read/close with "permanent" files [095/166] proc: speed up /proc//statm [096/166] proc: inline vma_stop into m_stop [097/166] proc: remove m_cache_vma [098/166] proc: use ppos instead of m->version [099/166] seq_file: remove m->version [100/166] proc: inline m_next_vma into m_next [101/166] asm-generic: fix unistd_32.h generation format [102/166] kernel/extable.c: use address-of operator on section symbols [103/166] sparc,x86: vdso: remove meaningless undefining CONFIG_OPTIMIZE_INLINING [104/166] compiler: remove CONFIG_OPTIMIZE_INLINING entirely [105/166] compiler.h: fix error in BUILD_BUG_ON() reporting [106/166] MAINTAINERS: list the section entries in the preferred order [107/166] bitops: always inline sign extension helpers [108/166] lib/test_lockup: test module to generate lockups [109/166] lib/test_lockup.c: fix spelling mistake "iteraions" -> "iterations" [110/166] lib/test_lockup.c: add parameters for locking generic vfs locks [111/166] lib/bch.c: replace zero-length array with flexible-array member [112/166] lib/ts_bm.c: replace zero-length array with flexible-array member [113/166] lib/ts_fsm.c: replace zero-length array with flexible-array member [114/166] lib/ts_kmp.c: replace zero-length array with flexible-array member [115/166] lib/scatterlist: fix sg_copy_buffer() kerneldoc [116/166] lib: test_stackinit.c: XFAIL switch variable init tests [117/166] lib/stackdepot.c: check depot_index before accessing the stack slab [118/166] lib/stackdepot.c: build with -fno-builtin [119/166] kasan: stackdepot: move filter_irq_stacks() to stackdepot.c [120/166] percpu_counter: fix a data race at vm_committed_as [121/166] lib/test_bitmap.c: make use of EXP2_IN_BITS [122/166] lib/rbtree: fix coding style of assignments [123/166] lib/test_kmod.c: remove a NULL test [124/166] linux/bits.h: add compile time sanity check of GENMASK inputs [125/166] lib/list: prevent compiler reloads inside 'safe' list iteration [126/166] lib/dynamic_debug.c: use address-of operator on section symbols [127/166] checkpatch: remove email address comment from email address comparisons [128/166] checkpatch: check SPDX tags in YAML files [129/166] checkpatch: support "base-commit:" format [130/166] checkpatch: prefer fallthrough; over fallthrough comments [131/166] checkpatch: fix minor typo and mixed space+tab in indentation [132/166] checkpatch: fix multiple const types [133/166] checkpatch: add command-line option for TAB size [134/166] checkpatch: improve Gerrit Change-Id: test [135/166] checkpatch: check proper licensing of Devicetree bindings [136/166] checkpatch: avoid warning about uninitialized_var() [137/166] kselftest: introduce new epoll test case [138/166] fs/epoll: make nesting accounting safe for -rt kernel [139/166] fs/binfmt_elf.c: delete "loc" variable [140/166] fs/binfmt_elf.c: allocate less for static executable [141/166] fs/binfmt_elf.c: don't free interpreter's ELF pheaders on common path [142/166] samples/hw_breakpoint: drop HW_BREAKPOINT_R when reporting writes [143/166] samples/hw_breakpoint: drop use of kallsyms_lookup_name() [144/166] kallsyms: unexport kallsyms_lookup_name() and kallsyms_on_each_symbol() [145/166] reiserfs: clean up several indentation issues [146/166] kernel/kmod.c: fix a typo "assuems" -> "assumes" [147/166] gcov: gcc_4_7: replace zero-length array with flexible-array member [148/166] gcov: gcc_3_4: replace zero-length array with flexible-array member [149/166] kernel/gcov/fs.c: replace zero-length array with flexible-array member [150/166] init/Kconfig: clean up ANON_INODES and old IO schedulers options [151/166] kcov: cleanup debug messages [152/166] kcov: fix potential use-after-free in kcov_remote_start [153/166] kcov: move t->kcov assignments into kcov_start/stop [154/166] kcov: move t->kcov_sequence assignment [155/166] kcov: use t->kcov_mode as enabled indicator [156/166] kcov: collect coverage from interrupts [157/166] usb: core: kcov: collect coverage from usb complete callback [158/166] ubsan: add trap instrumentation option [159/166] ubsan: split "bounds" checker from other options [160/166] drivers/misc/lkdtm/bugs.c: add arithmetic overflow and array bounds checks [161/166] ubsan: check panic_on_warn [162/166] kasan: unset panic_on_warn before calling panic() [163/166] ubsan: include bug type in report header [164/166] lib/Kconfig.debug: fix a typo "capabilitiy" -> "capability" [165/166] ipc/mqueue.c: fix a brace coding style issue [166/166] ipc/shm.c: make compat_ksys_shmctl() static

Commit Message

Andrew Morton April 7, 2020, 3:09 a.m. UTC

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: proc: use ppos instead of m->version

The ppos is a private cursor, just like m->version.  Use the canonical
cursor, not a special one.

Link: http://lkml.kernel.org/r/20200317193201.9924-3-adobriyan@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/task_mmu.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff mbox series

Patch

--- a/fs/proc/task_mmu.c~proc-use-ppos-instead-of-m-version
+++ a/fs/proc/task_mmu.c
@@ -134,7 +134,7 @@  m_next_vma(struct proc_maps_private *pri
 static void *m_start(struct seq_file *m, loff_t *ppos)
 {
 	struct proc_maps_private *priv = m->private;
-	unsigned long last_addr = m->version;
+	unsigned long last_addr = *ppos;
 	struct mm_struct *mm;
 	struct vm_area_struct *vma;
 
@@ -170,14 +170,13 @@  static void *m_start(struct seq_file *m,
 	return priv->tail_vma;
 }
 
-static void *m_next(struct seq_file *m, void *v, loff_t *pos)
+static void *m_next(struct seq_file *m, void *v, loff_t *ppos)
 {
 	struct proc_maps_private *priv = m->private;
 	struct vm_area_struct *next;
 
-	(*pos)++;
 	next = m_next_vma(priv, v);
-	m->version = next ? next->vm_start : -1UL;
+	*ppos = next ? next->vm_start : -1UL;
 
 	return next;
 }