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

Commit 1c88e19b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "The rest of MM"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (101 commits)
  mm, compaction: simplify contended compaction handling
  mm, compaction: introduce direct compaction priority
  mm, thp: remove __GFP_NORETRY from khugepaged and madvised allocations
  mm, page_alloc: make THP-specific decisions more generic
  mm, page_alloc: restructure direct compaction handling in slowpath
  mm, page_alloc: don't retry initial attempt in slowpath
  mm, page_alloc: set alloc_flags only once in slowpath
  lib/stackdepot.c: use __GFP_NOWARN for stack allocations
  mm, kasan: switch SLUB to stackdepot, enable memory quarantine for SLUB
  mm, kasan: account for object redzone in SLUB's nearest_obj()
  mm: fix use-after-free if memory allocation failed in vma_adjust()
  zsmalloc: Delete an unnecessary check before the function call "iput"
  mm/memblock.c: fix index adjustment error in __next_mem_range_rev()
  mem-hotplug: alloc new page from a nearest neighbor node when mem-offline
  mm: optimize copy_page_to/from_iter_iovec
  mm: add cond_resched() to generic_swapfile_activate()
  Revert "mm, mempool: only set __GFP_NOMEMALLOC if there are free elements"
  mm, compaction: don't isolate PageWriteback pages in MIGRATE_SYNC_LIGHT mode
  mm: hwpoison: remove incorrect comments
  make __section_nr() more efficient
  ...
parents 6039b80e c3486f53

Documentation/cgroup-v1/memcg_test.txt

+2 −2
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. 


8. LRU

        Each memcg has its own private LRU. Now, its handling is under global

	VM's control (means that it's handled under global zone->lru_lock).

	VM's control (means that it's handled under global zone_lru_lock).

	Almost all routines around memcg's LRU is called by global LRU's

	list management functions under zone->lru_lock().

	list management functions under zone_lru_lock().



	A special function is mem_cgroup_isolate_pages(). This scans

	memcg's private LRU and call __isolate_lru_page() to extract a page

Documentation/cgroup-v1/memory.txt

+2 −2
Original line number Diff line number Diff line
@@ -267,11 +267,11 @@ When oom event notifier is registered, event will be delivered. 
   Other lock order is following:

   PG_locked.

   mm->page_table_lock

       zone->lru_lock

       zone_lru_lock

	  lock_page_cgroup.

  In many cases, just lock_page_cgroup() is called.

  per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by

  zone->lru_lock, it has no lock of its own.

  zone_lru_lock, it has no lock of its own.



2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void __init arm64_memblock_init(void) 
	 * via the linear mapping.

	 */

	if (memory_limit != (phys_addr_t)ULLONG_MAX) {

		memblock_enforce_memory_limit(memory_limit);

		memblock_mem_limit_remove_map(memory_limit);

		memblock_add(__pa(_text), (u64)(_end - _text));

	}

arch/s390/appldata/appldata_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void appldata_get_mem_data(void *data) 
	mem_data->totalhigh = P2K(val.totalhigh);

	mem_data->freehigh  = P2K(val.freehigh);

	mem_data->bufferram = P2K(val.bufferram);

	mem_data->cached    = P2K(global_page_state(NR_FILE_PAGES)

	mem_data->cached    = P2K(global_node_page_state(NR_FILE_PAGES)

				- val.bufferram);



	si_swapinfo(&val);

arch/tile/mm/pgtable.c

+9 −9
Original line number Diff line number Diff line
@@ -45,20 +45,20 @@ void show_mem(unsigned int filter) 
	struct zone *zone;



	pr_err("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu free:%lu\n slab:%lu mapped:%lu pagetables:%lu bounce:%lu pagecache:%lu swap:%lu\n",

	       (global_page_state(NR_ACTIVE_ANON) +

		global_page_state(NR_ACTIVE_FILE)),

	       (global_page_state(NR_INACTIVE_ANON) +

		global_page_state(NR_INACTIVE_FILE)),

	       global_page_state(NR_FILE_DIRTY),

	       global_page_state(NR_WRITEBACK),

	       global_page_state(NR_UNSTABLE_NFS),

	       (global_node_page_state(NR_ACTIVE_ANON) +

		global_node_page_state(NR_ACTIVE_FILE)),

	       (global_node_page_state(NR_INACTIVE_ANON) +

		global_node_page_state(NR_INACTIVE_FILE)),

	       global_node_page_state(NR_FILE_DIRTY),

	       global_node_page_state(NR_WRITEBACK),

	       global_node_page_state(NR_UNSTABLE_NFS),

	       global_page_state(NR_FREE_PAGES),

	       (global_page_state(NR_SLAB_RECLAIMABLE) +

		global_page_state(NR_SLAB_UNRECLAIMABLE)),

	       global_page_state(NR_FILE_MAPPED),

	       global_node_page_state(NR_FILE_MAPPED),

	       global_page_state(NR_PAGETABLE),

	       global_page_state(NR_BOUNCE),

	       global_page_state(NR_FILE_PAGES),

	       global_node_page_state(NR_FILE_PAGES),

	       get_nr_swap_pages());



	for_each_zone(zone) {