Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b37a05c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "18 fixes"

[ The 18 fixes turned into 17 commits, because one of the fixes was a
  fix for another patch in the series that I just folded in by editing
  the patch manually - hopefully correctly     - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix memory leak in copy_huge_pmd()
  drivers/hwspinlock: fix race between radix tree insertion and lookup
  radix-tree: fix race in gang lookup
  mm/vmpressure.c: fix subtree pressure detection
  mm: polish virtual memory accounting
  mm: warn about VmData over RLIMIT_DATA
  Documentation: cgroup-v2: add memory.stat::sock description
  mm: memcontrol: drop superfluous entry in the per-memcg stats array
  drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration
  proc: revert /proc/<pid>/maps [stack:TID] annotation
  numa: fix /proc/<pid>/numa_maps for hugetlbfs on s390
  MAINTAINERS: update Seth email
  ocfs2/cluster: fix memory leak in o2hb_region_release
  lib/test-string_helpers.c: fix and improve string_get_size() tests
  thp: limit number of object to scan on deferred_split_scan()
  thp: change deferred_split_count() to return number of THP in queue
  thp: make split_queue per-node
parents d5bfb96b 12c9d70b

Documentation/cgroup-v2.txt

+4 −0
Original line number Diff line number Diff line
@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back. 
		Amount of memory used to cache filesystem data,

		including tmpfs and shared memory.



	  sock



		Amount of memory used in network transmission buffers



	  file_mapped



		Amount of cached filesystem data mapped with mmap()

Documentation/filesystems/proc.txt

+5 −8
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ Table 1-2: Contents of the status files (as of 4.1) 
 RssFile                     size of resident file mappings

 RssShmem                    size of resident shmem memory (includes SysV shm,

                             mapping of tmpfs and shared anonymous mappings)

 VmData                      size of data, stack, and text segments

 VmStk                       size of data, stack, and text segments

 VmData                      size of private data segments

 VmStk                       size of stack segments

 VmExe                       size of text segment

 VmLib                       size of shared library code

 VmPTE                       size of page table entries
@@ -356,7 +356,7 @@ address perms offset dev inode pathname 
a7cb1000-a7cb2000 ---p 00000000 00:00 0

a7cb2000-a7eb2000 rw-p 00000000 00:00 0

a7eb2000-a7eb3000 ---p 00000000 00:00 0

a7eb3000-a7ed5000 rw-p 00000000 00:00 0          [stack:1001]

a7eb3000-a7ed5000 rw-p 00000000 00:00 0

a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6

a8008000-a800a000 r--p 00133000 03:00 4222       /lib/libc.so.6

a800a000-a800b000 rw-p 00135000 03:00 4222       /lib/libc.so.6
@@ -388,7 +388,6 @@ is not associated with a file: 


 [heap]                   = the heap of the program

 [stack]                  = the stack of the main process

 [stack:1001]             = the stack of the thread with tid 1001

 [vdso]                   = the "virtual dynamic shared object",

                            the kernel system call handler
@@ -396,10 +395,8 @@ is not associated with a file: 


The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint

of the individual tasks of a process. In this file you will see a mapping marked

as [stack] if that task sees it as a stack. This is a key difference from the

content of /proc/PID/maps, where you will see all mappings that are being used

as stack by all of those tasks. Hence, for the example above, the task-level

map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:

as [stack] if that task sees it as a stack. Hence, for the example above, the

task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:



08048000-08049000 r-xp 00000000 03:00 8312       /opt/test

08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			could change it dynamically, usually by

			/sys/module/printk/parameters/ignore_loglevel.



	ignore_rlimit_data

			Ignore RLIMIT_DATA setting for data mappings,

			print warning at first misuse.  Can be changed via

			/sys/module/kernel/parameters/ignore_rlimit_data.



	ihash_entries=	[KNL]

			Set number of hash buckets for inode cache.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -12150,7 +12150,7 @@ F: drivers/net/hamradio/*scc.c 
F:	drivers/net/hamradio/z8530.h



ZBUD COMPRESSED PAGE ALLOCATOR

M:	Seth Jennings <sjennings@variantweb.net>

M:	Seth Jennings <sjenning@redhat.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zbud.c
@@ -12205,7 +12205,7 @@ F: include/linux/zsmalloc.h 
F:	Documentation/vm/zsmalloc.txt



ZSWAP COMPRESSED SWAP CACHING

M:	Seth Jennings <sjennings@variantweb.net>

M:	Seth Jennings <sjenning@redhat.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zswap.c

drivers/hwspinlock/hwspinlock_core.c

+4 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ int of_hwspin_lock_get_id(struct device_node *np, int index) 
		hwlock = radix_tree_deref_slot(slot);

		if (unlikely(!hwlock))

			continue;

		if (radix_tree_is_indirect_ptr(hwlock)) {

			slot = radix_tree_iter_retry(&iter);

			continue;

		}



		if (hwlock->bank->dev->of_node == args.np) {

			ret = 0;