Vlastimil Babka e70cc2bd57 fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps* ...

Thomas reports:
 "While looking around in /proc on my v4.14.52 system I noticed that all
  processes got a lot of "Locked" memory in /proc/*/smaps. A lot more
  memory than a regular user can usually lock with mlock().

  Commit 493b0e9d94 (in v4.14-rc1) seems to have changed the behavior
  of "Locked".

  Before that commit the code was like this. Notice the VM_LOCKED check.

           (vma->vm_flags & VM_LOCKED) ?
                (unsigned long)(mss.pss >> (10 + PSS_SHIFT)) : 0);

  After that commit Locked is now the same as Pss:

	  (unsigned long)(mss->pss >> (10 + PSS_SHIFT)));

  This looks like a mistake."

Indeed, the commit has added mss->pss_locked with the correct value that
depends on VM_LOCKED, but forgot to actually use it.  Fix it.

Link: http://lkml.kernel.org/r/[email protected]
Fixes: 493b0e9d94 ("mm: add /proc/pid/smaps_rollup")
Signed-off-by: Vlastimil Babka <[email protected]>
Reported-by: Thomas Lindroth <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: Daniel Colascione <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

2018-07-14 11:11:09 -07:00

..

array.c

proc: use "unsigned int" for sigqueue length

2018-06-07 17:34:38 -07:00

base.c

proc: fix missing final NUL in get_mm_cmdline() rewrite

2018-06-20 15:38:28 +09:00

cmdline.c

proc: introduce proc_create_single{,_data}

2018-05-16 07:23:35 +02:00

consoles.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

cpuinfo.c

…

devices.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

fd.c

proc: use "unsigned int" in proc_fill_cache()

2018-06-07 17:34:38 -07:00

fd.h

…

generic.c

proc: add proc_seq_release

2018-06-27 20:44:38 -04:00

inode.c

proc: Make inline name size calculation automatic

2018-06-15 00:48:57 -04:00

internal.h

Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2018-06-16 16:32:04 +09:00

interrupts.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

Kconfig

…

kcore.c

…

kmsg.c

…

loadavg.c

proc: introduce proc_create_single{,_data}

2018-05-16 07:23:35 +02:00

Makefile

…

meminfo.c

proc: introduce proc_create_single{,_data}

2018-05-16 07:23:35 +02:00

namespaces.c

procfs: switch instantiate_t to d_splice_alias()

2018-05-26 14:20:50 -04:00

nommu.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

page.c

mm: mark pages in use for page tables

2018-06-07 17:34:37 -07:00

proc_net.c

proc: Add a way to make network proc files writable

2018-05-18 11:46:15 +01:00

proc_sysctl.c

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

proc_tty.c

tty: replace ->proc_fops with ->proc_show

2018-05-16 07:24:30 +02:00

root.c

proc: Make inline name size calculation automatic

2018-06-15 00:48:57 -04:00

self.c

…

softirqs.c

proc: introduce proc_create_single{,_data}

2018-05-16 07:23:35 +02:00

stat.c

…

task_mmu.c

fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps*

2018-07-14 11:11:09 -07:00

task_nommu.c

…

thread_self.c

…

uptime.c

Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

2018-06-15 07:31:07 +09:00

util.c

…

version.c

proc: introduce proc_create_single{,_data}

2018-05-16 07:23:35 +02:00

vmcore.c

vmcore: move get_vmcore_size out of __init

2018-05-21 12:34:22 -04:00