Vlastimil Babka
258f669e7e
mm: /proc/pid/smaps_rollup: convert to single value seq_file ...
The /proc/pid/smaps_rollup file is currently implemented via the
m_start/m_next/m_stop seq_file iterators shared with the other maps files,
that iterate over vma's. However, the rollup file doesn't print anything
for each vma, only accumulate the stats.
There are some issues with the current code as reported in [1] - the
accumulated stats can get skewed if seq_file start()/stop() op is called
multiple times, if show() is called multiple times, and after seeks to
non-zero position.
Patch [1] fixed those within existing design, but I believe it is
fundamentally wrong to expose the vma iterators to the seq_file mechanism
when smaps_rollup shows logically a single set of values for the whole
address space.
This patch thus refactors the code to provide a single "value" at offset
0, with vma iteration to gather the stats done internally. This fixes the
situations where results are skewed, and simplifies the code, especially
in show_smap(), at the expense of somewhat less code reuse.
[1] https://marc.info/?l=linux-mm&m=151927723128134&w=2
[vbabka@suse.c: use seq_file infrastructure]
Link: http://lkml.kernel.org/r/bf4525b0-fd5b-4c4c-2cb3-adee3dd95a48@suse.cz
Link: http://lkml.kernel.org/r/20180723111933.15443-5-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reported-by: Daniel Colascione <dancol@google.com>
Reviewed-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-08-22 10:52:44 -07:00
Pull request for inclusion in 4.19, take two
2018-08-17 17:27:58 -07:00
adfs: don't put inodes into icache
2018-08-03 16:03:33 -04:00
affs: fix potential memory leak when parsing option 'prefix'
2018-05-28 12:36:41 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-08-15 15:04:25 -07:00
autofs: fix autofs_sbi() does not check super block type
2018-08-22 10:52:43 -07:00
fix a series of Documentation/ broken file name references
2018-06-15 18:10:01 -03:00
bfs_add_entry: pass name/len as qstr pointer
2018-05-22 14:27:50 -04:00
btrfs: readpages() should submit IO as read-ahead
2018-08-17 16:20:29 -07:00
cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
2018-07-25 14:49:00 +01:00
The main things are support for cephx v2 authentication protocol and
2018-08-20 18:26:55 -07:00
Merge branch 'linus/master' into rdma.git for-next
2018-08-16 14:21:29 -06:00
vfs: change inode times to use struct timespec64
2018-06-05 16:57:31 -07:00
configfs: fix registered group removal
2018-07-17 06:14:07 -07:00
vfs/y2038: inode timestamps conversion to timespec64
2018-06-15 07:31:07 +09:00
f2fs-for-4.18-rc1
2018-06-11 10:16:13 -07:00
Revert "debugfs: inode: debugfs_create_dir uses mode permission from parent"
2018-06-12 20:52:16 -07:00
devpts: comment devpts_mntget()
2018-03-14 13:31:23 +01:00
treewide: Use array_size() in vmalloc()
2018-06-12 16:19:22 -07:00
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into aio-base
2018-05-26 09:16:25 +02:00
efivars: Call guid_parse() against guid_t type of variable
2018-07-22 14:13:44 +02:00
exofs: use bio_clone_fast in _write_mirror
2018-07-24 14:43:20 -06:00
ovl: do not try to reconnect a disconnected origin dentry
2018-04-12 12:04:49 +02:00
Merge branch 'akpm' (patches from Andrew)
2018-08-17 16:49:31 -07:00
ext4: readpages() should submit IO as read-ahead
2018-08-17 16:20:29 -07:00
mpage: mpage_readpages() should submit IO as read-ahead
2018-08-17 16:20:29 -07:00
fat: fix memory allocation failure handling of match_strdup()
2018-07-21 12:50:46 -07:00
freevxfs_lookup(): use d_splice_alias()
2018-05-22 14:27:51 -04:00
fscache: Fix reference overput in fscache_attach_object() error handling
2018-07-25 14:49:00 +01:00
Merge branch 'work.mkdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 20:25:58 -07:00
gfs2 4.19 merge
2018-08-15 22:40:03 -07:00
new helper: inode_fake_hash()
2018-08-03 16:03:32 -04:00
vfs/y2038: inode timestamps conversion to timespec64
2018-06-15 07:31:07 +09:00
vfs: discard ATTR_ATTR_FLAG
2018-08-17 16:20:28 -07:00
fs/hpfs: extend gmt_to_local() conversion to 64-bit times
2018-08-17 16:20:27 -07:00
Merge branch 'work.open3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 19:58:36 -07:00
isofs: fix potential memory leak in mount option parsing
2018-04-16 09:47:41 +02:00
jbd2: replace current_kernel_time64 with ktime equivalent
2018-07-29 15:51:47 -04:00
jffs2: use unsigned 32-bit timstamps consistently
2018-07-18 16:44:01 +02:00
Just one jfs patch for 4.19
2018-08-15 22:47:23 -07:00
Driver core patches for 4.19-rc1
2018-08-18 11:44:53 -07:00
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
minix_lookup: use d_splice_alias()
2018-05-22 14:27:52 -04:00
Merge branch 'work.mkdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 20:25:58 -07:00
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
IMA: don't propagate opened through the entire thing
2018-07-12 10:04:19 -04:00
do d_instantiate/unlock_new_inode combinations safely
2018-05-11 15:36:37 -04:00
Merge branch 'akpm' (patches from Andrew)
2018-08-17 16:49:31 -07:00
ntfs: mft: remove VLA usage
2018-08-17 16:20:27 -07:00
ocfs2: make several functions and variables static (and some const)
2018-08-17 16:20:28 -07:00
omfs_lookup(): report IO errors, use d_splice_alias()
2018-05-22 14:27:58 -04:00
openpromfs: switch to d_splice_alias()
2018-05-22 14:27:57 -04:00
orangefs: remove redundant pointer orangefs_inode
2018-08-14 12:07:14 -04:00
vfs/y2038: inode timestamps conversion to timespec64
2018-06-15 07:31:07 +09:00
mm: /proc/pid/smaps_rollup: convert to single value seq_file
2018-08-22 10:52:44 -07:00
pstore: add zstd compression support
2018-08-03 18:12:18 -07:00
qnx4_lookup: use d_splice_alias()
2018-05-22 14:27:52 -04:00
qnx6_lookup: switch to d_splice_alias()
2018-05-22 14:27:54 -04:00
quota: Cleanup list iteration in dqcache_shrink_scan()
2018-06-20 11:04:26 +02:00
reiserfs: fix buffer overflow with long warning messages
2018-07-14 11:11:10 -07:00
romfs_lookup: switch to d_splice_alias()
2018-05-22 14:27:55 -04:00
Squashfs: Compute expected length from inode size rather than block length
2018-08-02 09:34:02 -07:00
Driver core patches for 4.19-rc1
2018-08-18 11:44:53 -07:00
sysv_lookup: use d_splice_alias()
2018-05-22 14:27:53 -04:00
tracefs: Annotate tracefs_ops with __ro_after_init
2018-07-31 11:32:44 -04:00
vfs/y2038: inode timestamps conversion to timespec64
2018-06-15 07:31:07 +09:00
\n
2018-08-17 09:38:39 -07:00
fs/ufs: use ktime_get_real_seconds for sb and cg timestamps
2018-08-17 16:20:27 -07:00
dax: remove VM_MIXEDMAP for fsdax and device dax
2018-08-17 16:20:27 -07:00
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 20:56:23 -07:00
anon_inode_getfile(): switch to alloc_file_pseudo()
2018-07-12 10:04:27 -04:00
fs: Fix attr.c kernel-doc
2018-07-03 16:44:45 -04:00
get rid of 'opened' argument of ->atomic_open() - part 3
2018-07-12 10:04:20 -04:00
exec: introduce finalize_exec() before start_thread()
2018-04-11 10:28:37 -07:00
Here are the main MIPS changes for 4.19.
2018-08-13 19:24:32 -07:00
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
exec: introduce finalize_exec() before start_thread()
2018-04-11 10:28:37 -07:00
turn filp_clone_open() into inline wrapper for dentry_open()
2018-07-10 23:29:03 -04:00
for-4.19/block-20180812
2018-08-14 10:23:25 -07:00
fs, mm: account buffer_head to kmemcg
2018-08-17 16:20:30 -07:00
block, char_dev: Use correct format specifier for unsigned ints
2018-03-15 17:59:24 +01:00
ncpfs: remove compat functionality
2018-06-05 19:23:26 +02:00
media: dvb/audio.h: get rid of unused APIs
2018-07-30 16:21:49 -04:00
split d_path() and friends into a separate file
2018-03-29 15:07:46 -04:00
dax: dax_layout_busy_page() warn on !exceptional
2018-07-29 16:59:16 -04:00
fs/dcache.c: fix kmemcheck splat at take_dentry_name_snapshot()
2018-08-17 16:20:28 -07:00
fs: add do_lookup_dcookie() helper; remove in-kernel call to syscall
2018-04-02 20:15:39 +02:00
block: consistently use GFP_NOIO instead of __GFP_NORECLAIM
2018-05-14 08:55:18 -06:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
mm: fix vma_is_anonymous() false-positives
2018-07-26 19:38:03 -07:00
mm: restructure memfd code
2018-06-07 17:34:35 -07:00
fs: add ksys_close() wrapper; remove in-kernel calls to sys_close()
2018-04-02 20:16:00 +02:00
make alloc_file() static
2018-07-12 10:04:29 -04:00
proc: introduce proc_create_single{,_data}
2018-05-16 07:23:35 +02:00
bdi: Fix oops in wb_workfn()
2018-05-03 16:11:37 -06:00
Merge branch 'work.mkdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 20:25:58 -07:00
Merge branch 'iomap-4.19-merge' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
2018-08-13 22:29:03 -07:00
fs: Allow CAP_SYS_ADMIN in s_user_ns to freeze and thaw filesystems
2018-05-24 12:04:28 -05:00
Changes for 4.19:
2018-08-14 08:56:02 -07:00
autofs: remove left-over autofs4 stubs
2018-06-11 08:22:34 -07:00
kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt
2018-08-02 08:06:55 +09:00
fs, dax: prepare for dax-specific address_space_operations
2018-03-30 11:34:55 -07:00
File locking fixes and enhancements for v4.19
2018-08-13 21:56:50 -07:00
autofs: remove left-over autofs4 stubs
2018-06-11 08:22:34 -07:00
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
mpage: mpage_readpages() should submit IO as read-ahead
2018-08-17 16:20:29 -07:00
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 21:28:25 -07:00
fix __legitimize_mnt()/mntput() race
2018-08-09 17:51:32 -04:00
net: Export open_related_ns()
2018-02-15 15:34:42 -05:00
->atomic_open(): return 0 in all success cases
2018-07-12 10:04:21 -04:00
Merge branch 'work.open3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 19:58:36 -07:00
vfs: do bulk POLL* -> EPOLL* replacement
2018-02-11 14:34:03 -08:00
treewide: kmalloc() -> kmalloc_array()
2018-06-12 16:19:22 -07:00
fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64()
2018-04-02 20:16:02 +02:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
fs/seq_file.c: simplify seq_file iteration code and interface
2018-08-17 16:20:28 -07:00
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:21:50 +09:00
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-06-16 16:21:50 +09:00
fs: add do_readlinkat() helper; remove internal call to sys_readlinkat()
2018-04-02 20:15:34 +02:00
kernel: add kcompat_sys_{f,}statfs64()
2018-07-12 14:49:48 +01:00
mm: add SHRINK_EMPTY shrinker methods return value
2018-08-17 16:20:31 -07:00
Changes for this release:
2018-04-04 12:44:02 -07:00
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-08-13 20:56:23 -07:00
fs/userfaultfd.c: remove redundant pointer uwq
2018-08-17 16:20:32 -07:00
fs: add do_compat_futimesat() helper; remove in-kernel call to compat syscall
2018-04-02 20:15:44 +02:00
vfs: delete unnecessary assignment in vfs_listxattr
2018-05-29 13:22:41 -04:00
258f669e7e