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

Merge branch 'akpm' (patches from Andrew Morton) 

Merge more patches from Andrew Morton:
 "The rest of MM.  Plus one misc cleanup"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
  mm/Kconfig: add MMU dependency for MIGRATION.
  kernel: replace strict_strto*() with kstrto*()
  mm, thp: count thp_fault_fallback anytime thp fault fails
  thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page()
  thp: do_huge_pmd_anonymous_page() cleanup
  thp: move maybe_pmd_mkwrite() out of mk_huge_pmd()
  mm: cleanup add_to_page_cache_locked()
  thp: account anon transparent huge pages into NR_ANON_PAGES
  truncate: drop 'oldsize' truncate_pagecache() parameter
  mm: make lru_add_drain_all() selective
  memcg: document cgroup dirty/writeback memory statistics
  memcg: add per cgroup writeback pages accounting
  memcg: check for proper lock held in mem_cgroup_update_page_stat
  memcg: remove MEMCG_NR_FILE_MAPPED
  memcg: reduce function dereference
  memcg: avoid overflow caused by PAGE_ALIGN
  memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
  memcg: correct RESOURCE_MAX to ULLONG_MAX
  mm: memcg: do not trap chargers with full callstack on OOM
  mm: memcg: rework and document OOM waiting and wakeup
  ...
parents 26935fb0 de32a817

Documentation/cgroups/memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ pgpgin - # of charging events to the memory cgroup. The charging 
pgpgout		- # of uncharging events to the memory cgroup. The uncharging

		event happens each time a page is unaccounted from the cgroup.

swap		- # of bytes of swap usage

writeback	- # of bytes of file/anon cache that are queued for syncing to

		disk.

inactive_anon	- # of bytes of anonymous and swap cache memory on inactive

		LRU list.

active_anon	- # of bytes of anonymous and swap cache memory on active

arch/alpha/mm/fault.c

+4 −3
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	const struct exception_table_entry *fixup;

	int fault, si_code = SEGV_MAPERR;

	siginfo_t info;

	unsigned int flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |

			      (cause > 0 ? FAULT_FLAG_WRITE : 0));

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	/* As of EV6, a load into $31/$f31 is a prefetch, and never faults

	   (or is suppressed by the PALcode).  Support that for older CPUs
@@ -115,7 +114,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	if (address >= TASK_SIZE)

		goto vmalloc_fault;

#endif



	if (user_mode(regs))

		flags |= FAULT_FLAG_USER;

retry:

	down_read(&mm->mmap_sem);

	vma = find_vma(mm, address);
@@ -142,6 +142,7 @@ retry: 
	} else {

		if (!(vma->vm_flags & VM_WRITE))

			goto bad_area;

		flags |= FAULT_FLAG_WRITE;

	}



	/* If for any reason at all we couldn't handle the fault,

arch/arc/mm/fault.c

+4 −7
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address) 
	siginfo_t info;

	int fault, ret;

	int write = regs->ecr_cause & ECR_C_PROTV_STORE;  /* ST/EX */

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |

				(write ? FAULT_FLAG_WRITE : 0);

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	/*

	 * We fault-in kernel-space virtual memory on-demand. The
@@ -89,6 +88,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address) 
	if (in_atomic() || !mm)

		goto no_context;



	if (user_mode(regs))

		flags |= FAULT_FLAG_USER;

retry:

	down_read(&mm->mmap_sem);

	vma = find_vma(mm, address);
@@ -117,12 +118,12 @@ good_area: 
	if (write) {

		if (!(vma->vm_flags & VM_WRITE))

			goto bad_area;

		flags |= FAULT_FLAG_WRITE;

	} else {

		if (!(vma->vm_flags & (VM_READ | VM_EXEC)))

			goto bad_area;

	}



survive:

	/*

	 * If for any reason at all we couldn't handle the fault,

	 * make sure we exit gracefully rather than endlessly redo
@@ -201,10 +202,6 @@ no_context: 
	die("Oops", regs, address);



out_of_memory:

	if (is_global_init(tsk)) {

		yield();

		goto survive;

	}

	up_read(&mm->mmap_sem);



	if (user_mode(regs)) {

arch/arm/mm/fault.c

+13 −10
Original line number Diff line number Diff line
@@ -261,9 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	struct task_struct *tsk;

	struct mm_struct *mm;

	int fault, sig, code;

	int write = fsr & FSR_WRITE;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |

				(write ? FAULT_FLAG_WRITE : 0);

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	if (notify_page_fault(regs, fsr))

		return 0;
@@ -282,6 +280,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	if (in_atomic() || !mm)

		goto no_context;



	if (user_mode(regs))

		flags |= FAULT_FLAG_USER;

	if (fsr & FSR_WRITE)

		flags |= FAULT_FLAG_WRITE;



	/*

	 * As per x86, we may deadlock here.  However, since the kernel only

	 * validly references user space from well defined areas of the code,
@@ -349,6 +352,13 @@ retry: 
	if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))

		return 0;



	/*

	 * If we are in kernel mode at this point, we

	 * have no context to handle this fault with.

	 */

	if (!user_mode(regs))

		goto no_context;



	if (fault & VM_FAULT_OOM) {

		/*

		 * We ran out of memory, call the OOM killer, and return to
@@ -359,13 +369,6 @@ retry: 
		return 0;

	}



	/*

	 * If we are in kernel mode at this point, we

	 * have no context to handle this fault with.

	 */

	if (!user_mode(regs))

		goto no_context;



	if (fault & VM_FAULT_SIGBUS) {

		/*

		 * We had some memory, but were unable to

arch/arm64/mm/fault.c

+17 −14
Original line number Diff line number Diff line
@@ -199,13 +199,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
	unsigned long vm_flags = VM_READ | VM_WRITE | VM_EXEC;

	unsigned int mm_flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	if (esr & ESR_LNX_EXEC) {

		vm_flags = VM_EXEC;

	} else if ((esr & ESR_WRITE) && !(esr & ESR_CM)) {

		vm_flags = VM_WRITE;

		mm_flags |= FAULT_FLAG_WRITE;

	}



	tsk = current;

	mm  = tsk->mm;
@@ -220,6 +213,16 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
	if (in_atomic() || !mm)

		goto no_context;



	if (user_mode(regs))

		mm_flags |= FAULT_FLAG_USER;



	if (esr & ESR_LNX_EXEC) {

		vm_flags = VM_EXEC;

	} else if ((esr & ESR_WRITE) && !(esr & ESR_CM)) {

		vm_flags = VM_WRITE;

		mm_flags |= FAULT_FLAG_WRITE;

	}



	/*

	 * As per x86, we may deadlock here. However, since the kernel only

	 * validly references user space from well defined areas of the code,
@@ -288,6 +291,13 @@ retry: 
			      VM_FAULT_BADACCESS))))

		return 0;



	/*

	 * If we are in kernel mode at this point, we have no context to

	 * handle this fault with.

	 */

	if (!user_mode(regs))

		goto no_context;



	if (fault & VM_FAULT_OOM) {

		/*

		 * We ran out of memory, call the OOM killer, and return to
@@ -298,13 +308,6 @@ retry: 
		return 0;

	}



	/*

	 * If we are in kernel mode at this point, we have no context to

	 * handle this fault with.

	 */

	if (!user_mode(regs))

		goto no_context;



	if (fault & VM_FAULT_SIGBUS) {

		/*

		 * We had some memory, but were unable to successfully fix up

CRA Git | Maintained and supported by SUSTech CRA and CCSE