Commit 3f1f9a9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "11 mm fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE
  mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid
  mm/page-writeback.c: improve arithmetic divisions
  mm/page-writeback.c: use div64_ul() for u64-by-unsigned-long divide
  mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio()
  mm, debug_pagealloc: don't rely on static keys too early
  mm: memcg/slab: fix percpu slab vmstats flushing
  mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment
  mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment
  mm/memory_hotplug: don't free usage map when removing a re-added early section
  mm, thp: tweak reclaim/compaction effort of local-only and all-node allocations
parents 63d264fe 554913f6

include/linux/mm.h

+15 −3
Original line number Diff line number Diff line
@@ -2658,13 +2658,25 @@ static inline bool want_init_on_free(void) 
	       !page_poisoning_enabled();

}



#ifdef CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT

DECLARE_STATIC_KEY_TRUE(_debug_pagealloc_enabled);

#ifdef CONFIG_DEBUG_PAGEALLOC

extern void init_debug_pagealloc(void);

#else

DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);

static inline void init_debug_pagealloc(void) {}

#endif

extern bool _debug_pagealloc_enabled_early;

DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled);



static inline bool debug_pagealloc_enabled(void)

{

	return IS_ENABLED(CONFIG_DEBUG_PAGEALLOC) &&

		_debug_pagealloc_enabled_early;

}



/*

 * For use in fast paths after init_debug_pagealloc() has run, or when a

 * false negative result is not harmful when called too early.

 */

static inline bool debug_pagealloc_enabled_static(void)

{

	if (!IS_ENABLED(CONFIG_DEBUG_PAGEALLOC))

		return false;

include/linux/mmzone.h

+2 −3
Original line number Diff line number Diff line
@@ -215,9 +215,8 @@ enum node_stat_item { 
	NR_INACTIVE_FILE,	/*  "     "     "   "       "         */

	NR_ACTIVE_FILE,		/*  "     "     "   "       "         */

	NR_UNEVICTABLE,		/*  "     "     "   "       "         */

	NR_SLAB_RECLAIMABLE,	/* Please do not reorder this item */

	NR_SLAB_UNRECLAIMABLE,	/* and this one without looking at

				 * memcg_flush_percpu_vmstats() first. */

	NR_SLAB_RECLAIMABLE,

	NR_SLAB_UNRECLAIMABLE,

	NR_ISOLATED_ANON,	/* Temporary isolated pages from anon lru */

	NR_ISOLATED_FILE,	/* Temporary isolated pages from file lru */

	WORKINGSET_NODES,

include/trace/events/huge_memory.h

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
	EM( SCAN_ALLOC_HUGE_PAGE_FAIL,	"alloc_huge_page_failed")	\

	EM( SCAN_CGROUP_CHARGE_FAIL,	"ccgroup_charge_failed")	\

	EM( SCAN_EXCEED_SWAP_PTE,	"exceed_swap_pte")		\

	EMe(SCAN_TRUNCATED,		"truncated")			\

	EM( SCAN_TRUNCATED,		"truncated")			\

	EMe(SCAN_PAGE_HAS_PRIVATE,	"page_has_private")		\



#undef EM

#undef EMe

init/main.c

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ static void __init mm_init(void) 
	 * bigger than MAX_ORDER unless SPARSEMEM.

	 */

	page_ext_init_flatmem();

	init_debug_pagealloc();

	report_meminit();

	mem_init();

	kmem_cache_init();

mm/huge_memory.c

+24 −14
Original line number Diff line number Diff line
@@ -527,13 +527,13 @@ void prep_transhuge_page(struct page *page) 
	set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);

}



static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long len,

static unsigned long __thp_get_unmapped_area(struct file *filp,

		unsigned long addr, unsigned long len,

		loff_t off, unsigned long flags, unsigned long size)

{

	unsigned long addr;

	loff_t off_end = off + len;

	loff_t off_align = round_up(off, size);

	unsigned long len_pad;

	unsigned long len_pad, ret;



	if (off_end <= off_align || (off_end - off_align) < size)

		return 0;
@@ -542,29 +542,39 @@ static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long le 
	if (len_pad < len || (off + len_pad) < off)

		return 0;



	addr = current->mm->get_unmapped_area(filp, 0, len_pad,

	ret = current->mm->get_unmapped_area(filp, addr, len_pad,

					      off >> PAGE_SHIFT, flags);

	if (IS_ERR_VALUE(addr))



	/*

	 * The failure might be due to length padding. The caller will retry

	 * without the padding.

	 */

	if (IS_ERR_VALUE(ret))

		return 0;



	addr += (off - addr) & (size - 1);

	/*

	 * Do not try to align to THP boundary if allocation at the address

	 * hint succeeds.

	 */

	if (ret == addr)

		return addr;



	ret += (off - ret) & (size - 1);

	return ret;

}



unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,

		unsigned long len, unsigned long pgoff, unsigned long flags)

{

	unsigned long ret;

	loff_t off = (loff_t)pgoff << PAGE_SHIFT;



	if (addr)

		goto out;

	if (!IS_DAX(filp->f_mapping->host) || !IS_ENABLED(CONFIG_FS_DAX_PMD))

		goto out;



	addr = __thp_get_unmapped_area(filp, len, off, flags, PMD_SIZE);

	if (addr)

		return addr;



	ret = __thp_get_unmapped_area(filp, addr, len, off, flags, PMD_SIZE);

	if (ret)

		return ret;

out:

	return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE