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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "10 patches.

  Subsystems affected by this patch series: ipc, MAINTAINERS, and mm
  (vmscan, debug, pagemap, kmemleak, and selftests)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kselftest/vm: revert "tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner"
  MAINTAINERS: update rppt's email
  mm/kmemleak: avoid scanning potential huge holes
  ipc/sem: do not sleep with a spin lock held
  mm/pgtable: define pte_index so that preprocessor could recognize it
  mm/page_table_check: check entries at pmd levels
  mm/khugepaged: unify collapse pmd clear, flush and free
  mm/page_table_check: use unsigned long for page counters and cleanup
  mm/debug_vm_pgtable: remove pte entry from the page table
  Revert "mm/page_isolation: unset migratetype directly for non Buddy page"
parents cff7f223 07d2505b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12399,7 +12399,7 @@ F: include/uapi/linux/membarrier.h 
F:	kernel/sched/membarrier.c









MEMBLOCK









M:	Mike Rapoport <rppt@linux.ibm.com>









M:	Mike Rapoport <rppt@kernel.org>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/core-api/boot-time-mm.rst
































include/linux/page_table_check.h



+19
−0






























Original line number
Diff line number
Diff line







@@ -26,6 +26,9 @@ void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,







				pmd_t *pmdp, pmd_t pmd);









void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,









				pud_t *pudp, pud_t pud);









void __page_table_check_pte_clear_range(struct mm_struct *mm,









					unsigned long addr,









					pmd_t pmd);



















static inline void page_table_check_alloc(struct page *page, unsigned int order)









{








@@ -100,6 +103,16 @@ static inline void page_table_check_pud_set(struct mm_struct *mm,







	__page_table_check_pud_set(mm, addr, pudp, pud);









}



















static inline void page_table_check_pte_clear_range(struct mm_struct *mm,









						    unsigned long addr,









						    pmd_t pmd)









{









	if (static_branch_likely(&page_table_check_disabled))









		return;



















	__page_table_check_pte_clear_range(mm, addr, pmd);









}



















#else



















static inline void page_table_check_alloc(struct page *page, unsigned int order)








@@ -143,5 +156,11 @@ static inline void page_table_check_pud_set(struct mm_struct *mm,







{









}



















static inline void page_table_check_pte_clear_range(struct mm_struct *mm,









						    unsigned long addr,









						    pmd_t pmd)









{









}



















#endif /* CONFIG_PAGE_TABLE_CHECK */









#endif /* __LINUX_PAGE_TABLE_CHECK_H */
























include/linux/pgtable.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -62,6 +62,7 @@ static inline unsigned long pte_index(unsigned long address)







{









	return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);









}









#define pte_index pte_index



















#ifndef pmd_index









static inline unsigned long pmd_index(unsigned long address)
































ipc/sem.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1964,6 +1964,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)







	 */









	un = lookup_undo(ulp, semid);









	if (un) {









		spin_unlock(&ulp->lock);









		kvfree(new);









		goto success;









	}








@@ -1976,9 +1977,8 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)







	ipc_assert_locked_object(&sma->sem_perm);









	list_add(&new->list_id, &sma->list_id);









	un = new;



















success:









	spin_unlock(&ulp->lock);









success:









	sem_unlock(sma, -1);









out:









	return un;
































mm/debug_vm_pgtable.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -171,6 +171,8 @@ static void __init pte_advanced_tests(struct pgtable_debug_args *args)







	ptep_test_and_clear_young(args->vma, args->vaddr, args->ptep);









	pte = ptep_get(args->ptep);









	WARN_ON(pte_young(pte));



















	ptep_get_and_clear_full(args->mm, args->vaddr, args->ptep, 1);









}



















static void __init pte_savedwrite_tests(struct pgtable_debug_args *args)