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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Five fixes.

  Subsystems affected by this patch series: MAINTAINERS, mm/pagemap,
  mm/swap, and mm/hugetlb"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
  mm: validate inode in mapping_set_error()
  mm: mmap: Fix general protection fault in unlink_file_vma()
  MAINTAINERS: Antoine Tenart's email address
  MAINTAINERS: change hardening mailing list
parents 5b697f86 4aab2be0

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com> 
Andrew Vasquez <andrew.vasquez@qlogic.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <antoine.tenart@free-electrons.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
@@ -188,6 +189,7 @@ Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com> 
Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ N: meson 








ARM/Annapurna Labs ALPINE ARCHITECTURE









M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>









M:	Antoine Tenart <antoine.tenart@bootlin.com>









M:	Antoine Tenart <atenart@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	arch/arm/boot/dts/alpine*








@@ -7240,7 +7240,7 @@ F:	drivers/staging/gasket/







GCC PLUGINS









M:	Kees Cook <keescook@chromium.org>









R:	Emese Revfy <re.emese@gmail.com>









L:	kernel-hardening@lists.openwall.com









L:	linux-hardening@vger.kernel.org









S:	Maintained









F:	Documentation/kbuild/gcc-plugins.rst









F:	scripts/Makefile.gcc-plugins








@@ -8678,7 +8678,7 @@ F:	drivers/input/input-mt.c







K:	\b(ABS|SYN)_MT_

















INSIDE SECURE CRYPTO DRIVER









M:	Antoine Tenart <antoine.tenart@bootlin.com>









M:	Antoine Tenart <atenart@kernel.org>









L:	linux-crypto@vger.kernel.org









S:	Maintained









F:	drivers/crypto/inside-secure/








@@ -9802,7 +9802,7 @@ F:	drivers/scsi/53c700*







LEAKING_ADDRESSES









M:	Tobin C. Harding <me@tobin.cc>









M:	Tycho Andersen <tycho@tycho.pizza>









L:	kernel-hardening@lists.openwall.com









L:	linux-hardening@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git









F:	scripts/leaking_addresses.pl
































include/linux/khugepaged.h



+5
−0






























Original line number
Diff line number
Diff line







@@ -15,6 +15,7 @@ extern int __khugepaged_enter(struct mm_struct *mm);







extern void __khugepaged_exit(struct mm_struct *mm);









extern int khugepaged_enter_vma_merge(struct vm_area_struct *vma,









				      unsigned long vm_flags);









extern void khugepaged_min_free_kbytes_update(void);









#ifdef CONFIG_SHMEM









extern void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr);









#else








@@ -85,6 +86,10 @@ static inline void collapse_pte_mapped_thp(struct mm_struct *mm,







					   unsigned long addr)









{









}



















static inline void khugepaged_min_free_kbytes_update(void)









{









}









#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



















#endif /* _LINUX_KHUGEPAGED_H */
























include/linux/pagemap.h



+2
−1






























Original line number
Diff line number
Diff line







@@ -54,6 +54,7 @@ static inline void mapping_set_error(struct address_space *mapping, int error)







	__filemap_set_wb_err(mapping, error);



















	/* Record it in superblock */









	if (mapping->host)









		errseq_set(&mapping->host->i_sb->s_wb_err, error);



















	/* Record it in flags for now, for legacy callers */
































mm/khugepaged.c



+11
−2






























Original line number
Diff line number
Diff line







@@ -56,6 +56,9 @@ enum scan_result {







#define CREATE_TRACE_POINTS









#include <trace/events/huge_memory.h>



















static struct task_struct *khugepaged_thread __read_mostly;









static DEFINE_MUTEX(khugepaged_mutex);



















/* default scan 8*512 pte (or vmas) every 30 second */









static unsigned int khugepaged_pages_to_scan __read_mostly;









static unsigned int khugepaged_pages_collapsed;








@@ -2304,8 +2307,6 @@ static void set_recommended_min_free_kbytes(void)

















int start_stop_khugepaged(void)









{









	static struct task_struct *khugepaged_thread __read_mostly;









	static DEFINE_MUTEX(khugepaged_mutex);









	int err = 0;



















	mutex_lock(&khugepaged_mutex);








@@ -2332,3 +2333,11 @@ int start_stop_khugepaged(void)







	mutex_unlock(&khugepaged_mutex);









	return err;









}



















void khugepaged_min_free_kbytes_update(void)









{









	mutex_lock(&khugepaged_mutex);









	if (khugepaged_enabled() && khugepaged_thread)









		set_recommended_min_free_kbytes();









	mutex_unlock(&khugepaged_mutex);









}