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

Commit 9f45efb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:

 - a few hotfixes

 - various misc updates

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (108 commits)
  mm, memory_hotplug: move movable_node to the hotplug proper
  mm, memory_hotplug: drop CONFIG_MOVABLE_NODE
  mm, memory_hotplug: drop artificial restriction on online/offline
  mm: memcontrol: account slab stats per lruvec
  mm: memcontrol: per-lruvec stats infrastructure
  mm: memcontrol: use generic mod_memcg_page_state for kmem pages
  mm: memcontrol: use the node-native slab memory counters
  mm: vmstat: move slab statistics from zone to node counters
  mm/zswap.c: delete an error message for a failed memory allocation in zswap_dstmem_prepare()
  mm/zswap.c: improve a size determination in zswap_frontswap_init()
  mm/zswap.c: delete an error message for a failed memory allocation in zswap_pool_create()
  mm/swapfile.c: sort swap entries before free
  mm/oom_kill: count global and memory cgroup oom kills
  mm: per-cgroup memory reclaim stats
  mm: kmemleak: treat vm_struct as alternative reference to vmalloc'ed objects
  mm: kmemleak: factor object reference updating out of scan_block()
  mm: kmemleak: slightly reduce the size of some structures on 64-bit architectures
  mm, mempolicy: don't check cpuset seqlock where it doesn't matter
  mm, cpuset: always use seqlock when changing task's nodemask
  mm, mempolicy: simplify rebinding mempolicies when updating cpusets
  ...
parents dc502142 4932381e
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -2315,8 +2315,11 @@
			that the amount of memory usable for all allocations
			is not too small.

	movable_node	[KNL] Boot-time switch to enable the effects
			of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
	movable_node	[KNL] Boot-time switch to make hotplugable memory
			NUMA nodes to be movable. This means that the memory
			of such nodes will be usable only for movable
			allocations which rules out almost all kernel
			allocations. Use with caution!

	MTD_Partition=	[MTD]
			Format: <name>,<region-number>,<size>,<offset>
@@ -3772,8 +3775,14 @@
	slab_nomerge	[MM]
			Disable merging of slabs with similar size. May be
			necessary if there is some reason to distinguish
			allocs to different slabs. Debug options disable
			merging on their own.
			allocs to different slabs, especially in hardened
			environments where the risk of heap overflows and
			layout control by attackers can usually be
			frustrated by disabling merging. This will reduce
			most of the exposure of a heap attack to a single
			cache (risks via metadata attacks are mostly
			unchanged). Debug options disable merging on their
			own.
			For more information see Documentation/vm/slub.txt.

	slab_max_order=	[MM, SLAB]
+44 −4
Original line number Diff line number Diff line
@@ -852,13 +852,25 @@ PAGE_SIZE multiple when read back.

		The number of times the cgroup's memory usage was
		about to go over the max boundary.  If direct reclaim
		fails to bring it down, the OOM killer is invoked.
		fails to bring it down, the cgroup goes to OOM state.

	  oom

		The number of times the OOM killer has been invoked in
		the cgroup.  This may not exactly match the number of
		processes killed but should generally be close.
		The number of time the cgroup's memory usage was
		reached the limit and allocation was about to fail.

		Depending on context result could be invocation of OOM
		killer and retrying allocation or failing alloction.

		Failed allocation in its turn could be returned into
		userspace as -ENOMEM or siletly ignored in cases like
		disk readahead.	 For now OOM in memory cgroup kills
		tasks iff shortage has happened inside page fault.

	  oom_kill

		The number of processes belonging to this cgroup
		killed by any kind of OOM killer.

  memory.stat

@@ -956,6 +968,34 @@ PAGE_SIZE multiple when read back.

		Number of times a shadow node has been reclaimed

	  pgrefill

		Amount of scanned pages (in an active LRU list)

	  pgscan

		Amount of scanned pages (in an inactive LRU list)

	  pgsteal

		Amount of reclaimed pages

	  pgactivate

		Amount of pages moved to the active LRU list

	  pgdeactivate

		Amount of pages moved to the inactive LRU lis

	  pglazyfree

		Amount of pages postponed to be freed under memory pressure

	  pglazyfreed

		Amount of reclaimed lazyfree pages

  memory.swap.current

	A read-only single value file which exists on non-root
+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ See the include/linux/kmemleak.h header for the functions prototype.
- ``kmemleak_init``		 - initialize kmemleak
- ``kmemleak_alloc``		 - notify of a memory block allocation
- ``kmemleak_alloc_percpu``	 - notify of a percpu memory block allocation
- ``kmemleak_vmalloc``		 - notify of a vmalloc() memory allocation
- ``kmemleak_free``		 - notify of a memory block freeing
- ``kmemleak_free_part``	 - notify of a partial memory block freeing
- ``kmemleak_free_percpu``	 - notify of a percpu memory block freeing
+63 −0
Original line number Diff line number Diff line
@@ -98,6 +98,50 @@ use_zero_pages - specifies whether empty pages (i.e. allocated pages
                   it is only effective for pages merged after the change.
                   Default: 0 (normal KSM behaviour as in earlier releases)

max_page_sharing - Maximum sharing allowed for each KSM page. This
                   enforces a deduplication limit to avoid the virtual
                   memory rmap lists to grow too large. The minimum
                   value is 2 as a newly created KSM page will have at
                   least two sharers. The rmap walk has O(N)
                   complexity where N is the number of rmap_items
                   (i.e. virtual mappings) that are sharing the page,
                   which is in turn capped by max_page_sharing. So
                   this effectively spread the the linear O(N)
                   computational complexity from rmap walk context
                   over different KSM pages. The ksmd walk over the
                   stable_node "chains" is also O(N), but N is the
                   number of stable_node "dups", not the number of
                   rmap_items, so it has not a significant impact on
                   ksmd performance. In practice the best stable_node
                   "dup" candidate will be kept and found at the head
                   of the "dups" list. The higher this value the
                   faster KSM will merge the memory (because there
                   will be fewer stable_node dups queued into the
                   stable_node chain->hlist to check for pruning) and
                   the higher the deduplication factor will be, but
                   the slowest the worst case rmap walk could be for
                   any given KSM page. Slowing down the rmap_walk
                   means there will be higher latency for certain
                   virtual memory operations happening during
                   swapping, compaction, NUMA balancing and page
                   migration, in turn decreasing responsiveness for
                   the caller of those virtual memory operations. The
                   scheduler latency of other tasks not involved with
                   the VM operations doing the rmap walk is not
                   affected by this parameter as the rmap walks are
                   always schedule friendly themselves.

stable_node_chains_prune_millisecs - How frequently to walk the whole
                   list of stable_node "dups" linked in the
                   stable_node "chains" in order to prune stale
                   stable_nodes. Smaller milllisecs values will free
                   up the KSM metadata with lower latency, but they
                   will make ksmd use more CPU during the scan. This
                   only applies to the stable_node chains so it's a
                   noop if not a single KSM page hit the
                   max_page_sharing yet (there would be no stable_node
                   chains in such case).

The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:

pages_shared     - how many shared pages are being used
@@ -106,10 +150,29 @@ pages_unshared - how many pages unique but repeatedly checked for merging
pages_volatile   - how many pages changing too fast to be placed in a tree
full_scans       - how many times all mergeable areas have been scanned

stable_node_chains - number of stable node chains allocated, this is
		     effectively the number of KSM pages that hit the
		     max_page_sharing limit
stable_node_dups   - number of stable node dups queued into the
		     stable_node chains

A high ratio of pages_sharing to pages_shared indicates good sharing, but
a high ratio of pages_unshared to pages_sharing indicates wasted effort.
pages_volatile embraces several different kinds of activity, but a high
proportion there would also indicate poor use of madvise MADV_MERGEABLE.

The maximum possible page_sharing/page_shared ratio is limited by the
max_page_sharing tunable. To increase the ratio max_page_sharing must
be increased accordingly.

The stable_node_dups/stable_node_chains ratio is also affected by the
max_page_sharing tunable, and an high ratio may indicate fragmentation
in the stable_node dups, which could be solved by introducing
fragmentation algorithms in ksmd which would refile rmap_items from
one stable_node dup to another stable_node dup, in order to freeup
stable_node "dups" with few rmap_items in them, but that may increase
the ksmd CPU usage and possibly slowdown the readonly computations on
the KSM pages of the applications.

Izik Eidus,
Hugh Dickins, 17 Nov 2009
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config ARM64
	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
	select ARCH_HAS_ELF_RANDOMIZE
	select ARCH_HAS_GCOV_PROFILE_ALL
	select ARCH_HAS_GIGANTIC_PAGE
	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
	select ARCH_HAS_KCOV
	select ARCH_HAS_SET_MEMORY
	select ARCH_HAS_SG_CHAIN
Loading