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

Merge branch 'akpm' (patches from Andrew) 

Merge misc VM fixes from Andrew Morton:
 "A bunch of hotfixes, all affecting mm/.

  The two-patch series from Andrea may be controversial. This restores
  patches which were reverted in Dec 2018 due to a regression report [*].

  After extensive discussion it is evident that the problems which these
  patches solved were significantly more serious than the problems they
  introduced. I am told that major distros are already carrying these
  two patches for this reason"

[*] See

      https://lore.kernel.org/lkml/alpine.DEB.2.21.1812061343240.144733@chino.kir.corp.google.com/
      https://lore.kernel.org/lkml/alpine.DEB.2.21.1812031545560.161134@chino.kir.corp.google.com/

  for the google-specific issues brought up by David Rijentes. And as
  Andrew says:

    "I'm unaware of anyone else who will be adversely affected by this,
     and google already carries over a thousand kernel patches - another
     won't kill them.

     There has been sporadic discussion about fixing these things for
     real but it's clear that nobody apart from David is particularly
     motivated"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  hugetlbfs: fix hugetlb page migration/fault race causing SIGBUS
  mm, vmscan: do not special-case slab reclaim when watermarks are boosted
  Revert "mm, thp: restore node-local hugepage allocations"
  Revert "Revert "mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask""
  include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used
  seq_file: fix problem when seeking mid-record
  mm: workingset: fix vmstat counters for shadow nodes
  mm/usercopy: use memory range to be accessed for wraparound check
  mm: kmemleak: disable early logging in case of error
  mm/vmalloc.c: fix percpu free VM area search criteria
  mm/memcontrol.c: fix use after free in mem_cgroup_iter()
  mm/z3fold.c: fix z3fold_destroy_pool() race condition
  mm/z3fold.c: fix z3fold_destroy_pool() ordering
  mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind
  mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified
  mm/hmm: fix bad subpage pointer in try_to_unmap_one
  mm/hmm: fix ZONE_DEVICE anon page mapping reuse
  mm: document zone device struct page field usage
parents ee1c7bd3 4643d67e

fs/seq_file.c

+1 −1
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static int traverse(struct seq_file *m, loff_t offset) 
		}

		if (seq_has_overflowed(m))

			goto Eoverflow;

		p = m->op->next(m, p, &m->index);

		if (pos + m->count > offset) {

			m->from = offset - pos;

			m->count -= m->from;
@@ -126,7 +127,6 @@ static int traverse(struct seq_file *m, loff_t offset) 
		}

		pos += m->count;

		m->count = 0;

		p = m->op->next(m, p, &m->index);

		if (pos == offset)

			break;

	}

include/asm-generic/5level-fixup.h

+18 −3
Original line number Diff line number Diff line
@@ -19,9 +19,24 @@ 


#define p4d_alloc(mm, pgd, address)	(pgd)

#define p4d_offset(pgd, start)		(pgd)

#define p4d_none(p4d)			0

#define p4d_bad(p4d)			0

#define p4d_present(p4d)		1



#ifndef __ASSEMBLY__

static inline int p4d_none(p4d_t p4d)

{

	return 0;

}



static inline int p4d_bad(p4d_t p4d)

{

	return 0;

}



static inline int p4d_present(p4d_t p4d)

{

	return 1;

}

#endif



#define p4d_ERROR(p4d)			do { } while (0)

#define p4d_clear(p4d)			pgd_clear(p4d)

#define p4d_val(p4d)			pgd_val(p4d)

include/linux/gfp.h

+4 −8
Original line number Diff line number Diff line
@@ -510,22 +510,18 @@ alloc_pages(gfp_t gfp_mask, unsigned int order) 
}

extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,

			struct vm_area_struct *vma, unsigned long addr,

			int node, bool hugepage);

#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \

	alloc_pages_vma(gfp_mask, order, vma, addr, numa_node_id(), true)

			int node);

#else

#define alloc_pages(gfp_mask, order) \

		alloc_pages_node(numa_node_id(), gfp_mask, order)

#define alloc_pages_vma(gfp_mask, order, vma, addr, node, false)\

	alloc_pages(gfp_mask, order)

#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \

#define alloc_pages_vma(gfp_mask, order, vma, addr, node)\

	alloc_pages(gfp_mask, order)

#endif

#define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)

#define alloc_page_vma(gfp_mask, vma, addr)			\

	alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id(), false)

	alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id())

#define alloc_page_vma_node(gfp_mask, vma, addr, node)		\

	alloc_pages_vma(gfp_mask, 0, vma, addr, node, false)

	alloc_pages_vma(gfp_mask, 0, vma, addr, node)



extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);

extern unsigned long get_zeroed_page(gfp_t gfp_mask);

include/linux/memcontrol.h

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


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

			int val);

void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val);



static inline void mod_lruvec_state(struct lruvec *lruvec,

				    enum node_stat_item idx, int val)
@@ -1072,6 +1073,14 @@ static inline void mod_lruvec_page_state(struct page *page, 
	mod_node_page_state(page_pgdat(page), idx, val);

}



static inline void __mod_lruvec_slab_state(void *p, enum node_stat_item idx,

					   int val)

{

	struct page *page = virt_to_head_page(p);



	__mod_node_page_state(page_pgdat(page), idx, val);

}



static inline

unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,

					    gfp_t gfp_mask,
@@ -1159,6 +1168,16 @@ static inline void __dec_lruvec_page_state(struct page *page, 
	__mod_lruvec_page_state(page, idx, -1);

}



static inline void __inc_lruvec_slab_state(void *p, enum node_stat_item idx)

{

	__mod_lruvec_slab_state(p, idx, 1);

}



static inline void __dec_lruvec_slab_state(void *p, enum node_stat_item idx)

{

	__mod_lruvec_slab_state(p, idx, -1);

}



/* idx can be of type enum memcg_stat_item or node_stat_item */

static inline void inc_memcg_state(struct mem_cgroup *memcg,

				   int idx)

include/linux/mempolicy.h

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ struct mempolicy *mpol_shared_policy_lookup(struct shared_policy *sp, 
struct mempolicy *get_task_policy(struct task_struct *p);

struct mempolicy *__get_vma_policy(struct vm_area_struct *vma,

		unsigned long addr);

struct mempolicy *get_vma_policy(struct vm_area_struct *vma,

						unsigned long addr);

bool vma_policy_mof(struct vm_area_struct *vma);



extern void numa_default_policy(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE