Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3dd0130

Browse files
committed
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
2 parents5b697f8 +4aab2be commit3dd0130

File tree

7 files changed

+33
-9
lines changed

7 files changed

+33
-9
lines changed

‎.mailmap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
4141
Andrew Vasquez <andrew.vasquez@qlogic.com>
4242
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4343
Andy Adamson <andros@citi.umich.edu>
44-
Antoine Tenart <antoine.tenart@free-electrons.com>
44+
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
45+
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
4546
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
4647
Archit Taneja <archit@ti.com>
4748
Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
@@ -188,6 +189,7 @@ Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
188189
Linas Vepstas <linas@austin.ibm.com>
189190
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
190191
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
192+
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
191193
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
192194
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
193195
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

‎MAINTAINERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ N:meson
16281628

16291629
ARM/Annapurna Labs ALPINE ARCHITECTURE
16301630
M:Tsahee Zidenberg <tsahee@annapurnalabs.com>
1631-
M:Antoine Tenart <antoine.tenart@bootlin.com>
1631+
M:Antoine Tenart <atenart@kernel.org>
16321632
L:linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
16331633
S:Maintained
16341634
F:arch/arm/boot/dts/alpine*
@@ -7240,7 +7240,7 @@ F:drivers/staging/gasket/
72407240
GCC PLUGINS
72417241
M:Kees Cook <keescook@chromium.org>
72427242
R:Emese Revfy <re.emese@gmail.com>
7243-
L:kernel-hardening@lists.openwall.com
7243+
L:linux-hardening@vger.kernel.org
72447244
S:Maintained
72457245
F:Documentation/kbuild/gcc-plugins.rst
72467246
F:scripts/Makefile.gcc-plugins
@@ -8678,7 +8678,7 @@ F:drivers/input/input-mt.c
86788678
K:\b(ABS|SYN)_MT_
86798679

86808680
INSIDE SECURE CRYPTO DRIVER
8681-
M:Antoine Tenart <antoine.tenart@bootlin.com>
8681+
M:Antoine Tenart <atenart@kernel.org>
86828682
L:linux-crypto@vger.kernel.org
86838683
S:Maintained
86848684
F:drivers/crypto/inside-secure/
@@ -9802,7 +9802,7 @@ F:drivers/scsi/53c700*
98029802
LEAKING_ADDRESSES
98039803
M:Tobin C. Harding <me@tobin.cc>
98049804
M:Tycho Andersen <tycho@tycho.pizza>
9805-
L:kernel-hardening@lists.openwall.com
9805+
L:linux-hardening@vger.kernel.org
98069806
S:Maintained
98079807
T:git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
98089808
F:scripts/leaking_addresses.pl

‎include/linux/khugepaged.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ extern int __khugepaged_enter(struct mm_struct *mm);
1515
externvoid__khugepaged_exit(structmm_struct*mm);
1616
externintkhugepaged_enter_vma_merge(structvm_area_struct*vma,
1717
unsigned longvm_flags);
18+
externvoidkhugepaged_min_free_kbytes_update(void);
1819
#ifdefCONFIG_SHMEM
1920
externvoidcollapse_pte_mapped_thp(structmm_struct*mm,unsigned longaddr);
2021
#else
@@ -85,6 +86,10 @@ static inline void collapse_pte_mapped_thp(struct mm_struct *mm,
8586
unsigned longaddr)
8687
{
8788
}
89+
90+
staticinlinevoidkhugepaged_min_free_kbytes_update(void)
91+
{
92+
}
8893
#endif/* CONFIG_TRANSPARENT_HUGEPAGE */
8994

9095
#endif/* _LINUX_KHUGEPAGED_H */

‎include/linux/pagemap.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ static inline void mapping_set_error(struct address_space *mapping, int error)
5454
__filemap_set_wb_err(mapping,error);
5555

5656
/* Record it in superblock */
57-
errseq_set(&mapping->host->i_sb->s_wb_err,error);
57+
if (mapping->host)
58+
errseq_set(&mapping->host->i_sb->s_wb_err,error);
5859

5960
/* Record it in flags for now, for legacy callers */
6061
if (error==-ENOSPC)

‎mm/khugepaged.c‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ enum scan_result {
5656
#defineCREATE_TRACE_POINTS
5757
#include<trace/events/huge_memory.h>
5858

59+
staticstructtask_struct*khugepaged_thread__read_mostly;
60+
staticDEFINE_MUTEX(khugepaged_mutex);
61+
5962
/* default scan 8*512 pte (or vmas) every 30 second */
6063
staticunsignedintkhugepaged_pages_to_scan__read_mostly;
6164
staticunsignedintkhugepaged_pages_collapsed;
@@ -2304,8 +2307,6 @@ static void set_recommended_min_free_kbytes(void)
23042307

23052308
intstart_stop_khugepaged(void)
23062309
{
2307-
staticstructtask_struct*khugepaged_thread__read_mostly;
2308-
staticDEFINE_MUTEX(khugepaged_mutex);
23092310
interr=0;
23102311

23112312
mutex_lock(&khugepaged_mutex);
@@ -2332,3 +2333,11 @@ int start_stop_khugepaged(void)
23322333
mutex_unlock(&khugepaged_mutex);
23332334
returnerr;
23342335
}
2336+
2337+
voidkhugepaged_min_free_kbytes_update(void)
2338+
{
2339+
mutex_lock(&khugepaged_mutex);
2340+
if (khugepaged_enabled()&&khugepaged_thread)
2341+
set_recommended_min_free_kbytes();
2342+
mutex_unlock(&khugepaged_mutex);
2343+
}

‎mm/mmap.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,11 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
17811781
merge=vma_merge(mm,prev,vma->vm_start,vma->vm_end,vma->vm_flags,
17821782
NULL,vma->vm_file,vma->vm_pgoff,NULL,NULL_VM_UFFD_CTX);
17831783
if (merge) {
1784-
fput(file);
1784+
/* ->mmap() can change vma->vm_file and fput the original file. So
1785+
* fput the vma->vm_file here or we would add an extra fput for file
1786+
* and cause general protection fault ultimately.
1787+
*/
1788+
fput(vma->vm_file);
17851789
vm_area_free(vma);
17861790
vma=merge;
17871791
/* Update vm_flags and possible addr to pick up the change. We don't

‎mm/page_alloc.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
#include<linux/nmi.h>
7070
#include<linux/psi.h>
7171
#include<linux/padata.h>
72+
#include<linux/khugepaged.h>
7273

7374
#include<asm/sections.h>
7475
#include<asm/tlbflush.h>
@@ -7904,6 +7905,8 @@ int __meminit init_per_zone_wmark_min(void)
79047905
setup_min_slab_ratio();
79057906
#endif
79067907

7908+
khugepaged_min_free_kbytes_update();
7909+
79077910
return0;
79087911
}
79097912
postcore_initcall(init_per_zone_wmark_min)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp