Commit 281b9d9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 patches.

  Subsystems affected by this patch series: mm (memory-failure, memcg,
  userfaultfd, hugetlbfs, mremap, oom-kill, kasan, hmm), and kcov"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove()
  kcov: don't generate a warning on vm_insert_page()'s failure
  MAINTAINERS: add Vincenzo Frascino to KASAN reviewers
  oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup
  selftest/vm: add skip support to mremap_test
  selftest/vm: support xfail in mremap_test
  selftest/vm: verify remap destination address in mremap_test
  selftest/vm: verify mmap addr in mremap_test
  mm, hugetlb: allow for "high" userspace addresses
  userfaultfd: mark uffd_wp regardless of VM_WRITE flag
  memcg: sync flush only if periodic flush is delayed
  mm/memory-failure.c: skip huge_zero_page in memory_failure()
  mm/hwpoison: fix race between hugetlb free/demotion and memory_failure_hugetlb()
parents 3b8000ae 31956166

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10547,6 +10547,7 @@ M: Andrey Ryabinin <ryabinin.a.a@gmail.com> 
R:	Alexander Potapenko <glider@google.com>

R:	Andrey Konovalov <andreyknvl@gmail.com>

R:	Dmitry Vyukov <dvyukov@google.com>

R:	Vincenzo Frascino <vincenzo.frascino@arm.com>

L:	kasan-dev@googlegroups.com

S:	Maintained

F:	Documentation/dev-tools/kasan.rst

fs/hugetlbfs/inode.c

+5 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, 
	info.flags = 0;

	info.length = len;

	info.low_limit = current->mm->mmap_base;

	info.high_limit = TASK_SIZE;

	info.high_limit = arch_get_mmap_end(addr);

	info.align_mask = PAGE_MASK & ~huge_page_mask(h);

	info.align_offset = 0;

	return vm_unmapped_area(&info);
@@ -222,7 +222,7 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr, 
	info.flags = VM_UNMAPPED_AREA_TOPDOWN;

	info.length = len;

	info.low_limit = max(PAGE_SIZE, mmap_min_addr);

	info.high_limit = current->mm->mmap_base;

	info.high_limit = arch_get_mmap_base(addr, current->mm->mmap_base);

	info.align_mask = PAGE_MASK & ~huge_page_mask(h);

	info.align_offset = 0;

	addr = vm_unmapped_area(&info);
@@ -237,7 +237,7 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr, 
		VM_BUG_ON(addr != -ENOMEM);

		info.flags = 0;

		info.low_limit = current->mm->mmap_base;

		info.high_limit = TASK_SIZE;

		info.high_limit = arch_get_mmap_end(addr);

		addr = vm_unmapped_area(&info);

	}
@@ -251,6 +251,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
	struct mm_struct *mm = current->mm;

	struct vm_area_struct *vma;

	struct hstate *h = hstate_file(file);

	const unsigned long mmap_end = arch_get_mmap_end(addr);



	if (len & ~huge_page_mask(h))

		return -EINVAL;
@@ -266,7 +267,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
	if (addr) {

		addr = ALIGN(addr, huge_page_size(h));

		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

		if (mmap_end - len >= addr &&

		    (!vma || addr + len <= vm_start_gap(vma)))

			return addr;

	}

include/linux/hugetlb.h

+6 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ long hugetlb_unreserve_pages(struct inode *inode, long start, long end, 
						long freed);

bool isolate_huge_page(struct page *page, struct list_head *list);

int get_hwpoison_huge_page(struct page *page, bool *hugetlb);

int get_huge_page_for_hwpoison(unsigned long pfn, int flags);

void putback_active_hugepage(struct page *page);

void move_hugetlb_state(struct page *oldpage, struct page *newpage, int reason);

void free_huge_page(struct page *page);
@@ -378,6 +379,11 @@ static inline int get_hwpoison_huge_page(struct page *page, bool *hugetlb) 
	return 0;

}



static inline int get_huge_page_for_hwpoison(unsigned long pfn, int flags)

{

	return 0;

}



static inline void putback_active_hugepage(struct page *page)

{

}

include/linux/memcontrol.h

+5 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, 
}



void mem_cgroup_flush_stats(void);

void mem_cgroup_flush_stats_delayed(void);



void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,

			      int val);
@@ -1455,6 +1456,10 @@ static inline void mem_cgroup_flush_stats(void) 
{

}



static inline void mem_cgroup_flush_stats_delayed(void)

{

}



static inline void __mod_memcg_lruvec_state(struct lruvec *lruvec,

					    enum node_stat_item idx, int val)

{

include/linux/mm.h

+8 −0
Original line number Diff line number Diff line
@@ -3197,6 +3197,14 @@ extern int sysctl_memory_failure_recovery; 
extern void shake_page(struct page *p);

extern atomic_long_t num_poisoned_pages __read_mostly;

extern int soft_offline_page(unsigned long pfn, int flags);

#ifdef CONFIG_MEMORY_FAILURE

extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags);

#else

static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags)

{

	return 0;

}

#endif



#ifndef arch_memory_failure

static inline int arch_memory_failure(unsigned long pfn, int flags)