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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "18 patches.

  Subsystems affected by this patch series: mm (memory-failure, swap,
  slub, hugetlb, memory-failure, slub, thp, sparsemem), and coredump"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/sparse: fix check_usemap_section_nr warnings
  mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split
  mm/thp: unmap_mapping_page() to fix THP truncate_cleanup_page()
  mm/thp: fix page_address_in_vma() on file THP tails
  mm/thp: fix vma_address() if virtual address below file offset
  mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
  mm/thp: make is_huge_zero_pmd() safe and quicker
  mm/thp: fix __split_huge_pmd_locked() on shmem migration entry
  mm, thp: use head page in __migration_entry_wait()
  mm/slub.c: include swab.h
  crash_core, vmcoreinfo: append 'SECTION_SIZE_BITS' to vmcoreinfo
  mm/memory-failure: make sure wait for page writeback in memory_failure
  mm/hugetlb: expand restore_reserve_on_error functionality
  mm/slub: actually fix freelist pointer vs redzoning
  mm/slub: fix redzoning for small allocations
  mm/slub: clarify verification reporting
  mm/swap: fix pte_same_as_swp() not removing uffd-wp bit when compare
  mm,hwpoison: fix race with hugetlb page allocation
parents 6b00bc63 ccbd6283

Documentation/vm/slub.rst

+5 −5
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ SLUB Debug output 
Here is a sample of slub debug output::



 ====================================================================

 BUG kmalloc-8: Redzone overwritten

 BUG kmalloc-8: Right Redzone overwritten

 --------------------------------------------------------------------



 INFO: 0xc90f6d28-0xc90f6d2b. First byte 0x00 instead of 0xcc
@@ -189,10 +189,10 @@ Here is a sample of slub debug output:: 
 INFO: Object 0xc90f6d20 @offset=3360 fp=0xc90f6d58

 INFO: Allocated in get_modalias+0x61/0xf5 age=53 cpu=1 pid=554



 Bytes b4 0xc90f6d10:  00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ

   Object 0xc90f6d20:  31 30 31 39 2e 30 30 35                         1019.005

  Redzone 0xc90f6d28:  00 cc cc cc                                     .

  Padding 0xc90f6d50:  5a 5a 5a 5a 5a 5a 5a 5a                         ZZZZZZZZ

 Bytes b4 (0xc90f6d10): 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ

 Object   (0xc90f6d20): 31 30 31 39 2e 30 30 35                         1019.005

 Redzone  (0xc90f6d28): 00 cc cc cc                                     .

 Padding  (0xc90f6d50): 5a 5a 5a 5a 5a 5a 5a 5a                         ZZZZZZZZ



   [<c010523d>] dump_trace+0x63/0x1eb

   [<c01053df>] show_trace_log_lvl+0x1a/0x2f

fs/hugetlbfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, 
		__SetPageUptodate(page);

		error = huge_add_to_page_cache(page, mapping, index);

		if (unlikely(error)) {

			restore_reserve_on_error(h, &pseudo_vma, addr, page);

			put_page(page);

			mutex_unlock(&hugetlb_fault_mutex_table[hash]);

			goto out;

include/linux/huge_mm.h

+7 −1
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long addr, 
vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf, pmd_t orig_pmd);



extern struct page *huge_zero_page;

extern unsigned long huge_zero_pfn;



static inline bool is_huge_zero_page(struct page *page)

{
@@ -294,7 +295,7 @@ static inline bool is_huge_zero_page(struct page *page) 


static inline bool is_huge_zero_pmd(pmd_t pmd)

{

	return is_huge_zero_page(pmd_page(pmd));

	return READ_ONCE(huge_zero_pfn) == pmd_pfn(pmd) && pmd_present(pmd);

}



static inline bool is_huge_zero_pud(pud_t pud)
@@ -440,6 +441,11 @@ static inline bool is_huge_zero_page(struct page *page) 
	return false;

}



static inline bool is_huge_zero_pmd(pmd_t pmd)

{

	return false;

}



static inline bool is_huge_zero_pud(pud_t pud)

{

	return false;

include/linux/hugetlb.h

+8 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ bool hugetlb_reserve_pages(struct inode *inode, long from, long to, 
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);

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);
@@ -339,6 +340,11 @@ static inline bool isolate_huge_page(struct page *page, struct list_head *list) 
	return false;

}



static inline int get_hwpoison_huge_page(struct page *page, bool *hugetlb)

{

	return 0;

}



static inline void putback_active_hugepage(struct page *page)

{

}
@@ -604,6 +610,8 @@ struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, 
				unsigned long address);

int huge_add_to_page_cache(struct page *page, struct address_space *mapping,

			pgoff_t idx);

void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma,

				unsigned long address, struct page *page);



/* arch callback */

int __init __alloc_bootmem_huge_page(struct hstate *h);

include/linux/mm.h

+3 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,7 @@ struct zap_details { 
	struct address_space *check_mapping;	/* Check page->mapping if set */

	pgoff_t	first_index;			/* Lowest page->index to unmap */

	pgoff_t last_index;			/* Highest page->index to unmap */

	struct page *single_page;		/* Locked page to be unmapped */

};



struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
@@ -1766,6 +1767,7 @@ extern vm_fault_t handle_mm_fault(struct vm_area_struct *vma, 
extern int fixup_user_fault(struct mm_struct *mm,

			    unsigned long address, unsigned int fault_flags,

			    bool *unlocked);

void unmap_mapping_page(struct page *page);

void unmap_mapping_pages(struct address_space *mapping,

		pgoff_t start, pgoff_t nr, bool even_cows);

void unmap_mapping_range(struct address_space *mapping,
@@ -1786,6 +1788,7 @@ static inline int fixup_user_fault(struct mm_struct *mm, unsigned long address, 
	BUG();

	return -EFAULT;

}

static inline void unmap_mapping_page(struct page *page) { }

static inline void unmap_mapping_pages(struct address_space *mapping,

		pgoff_t start, pgoff_t nr, bool even_cows) { }

static inline void unmap_mapping_range(struct address_space *mapping,