Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull mm hotfixes from Andrew Morton:
"Fixups for various recently-added and longer-term issues and a few
minor tweaks:
- fixes for material merged during this merge window
- cc:stable fixes for more longstanding issues
- minor mailmap and MAINTAINERS updates"
* tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery
x86/kexec: fix memory leak of elf header buffer
mm/memremap: fix missing call to untrack_pfn() in pagemap_range()
mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock()
mm: hugetlb_vmemmap: fix CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON
MAINTAINERS: add maintainer information for z3fold
mailmap: update Josh Poimboeuf's email
+50
-35
+2
.mailmap
+2
.mailmap
···
201
201
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
202
202
<josh@joshtriplett.org> <josht@us.ibm.com>
203
203
<josh@joshtriplett.org> <josht@vnet.ibm.com>
204
+
Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@redhat.com>
205
+
Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@us.ibm.com>
204
206
Juha Yrjola <at solidboot.com>
205
207
Juha Yrjola <juha.yrjola@nokia.com>
206
208
Juha Yrjola <juha.yrjola@solidboot.com>
+7
MAINTAINERS
+7
MAINTAINERS
···
22002
22002
S: Maintained
22003
22003
F: mm/zbud.c
22004
22004
22005
+
Z3FOLD COMPRESSED PAGE ALLOCATOR
22006
+
M: Vitaly Wool <vitaly.wool@konsulko.com>
22007
+
R: Miaohe Lin <linmiaohe@huawei.com>
22008
+
L: linux-mm@kvack.org
22009
+
S: Maintained
22010
+
F: mm/z3fold.c
22011
+
22005
22012
ZD1211RW WIRELESS DRIVER
22006
22013
M: Ulrich Kunitz <kune@deine-taler.de>
22007
22014
L: linux-wireless@vger.kernel.org
+9
-3
arch/x86/kernel/machine_kexec_64.c
+9
-3
arch/x86/kernel/machine_kexec_64.c
···
376
376
#ifdef CONFIG_KEXEC_FILE
377
377
void *arch_kexec_kernel_image_load(struct kimage *image)
378
378
{
379
-
vfree(image->elf_headers);
380
-
image->elf_headers = NULL;
381
-
382
379
if (!image->fops || !image->fops->load)
383
380
return ERR_PTR(-ENOEXEC);
384
381
···
510
513
pr_err("Overflow in relocation type %d value 0x%lx\n",
511
514
(int)ELF64_R_TYPE(rel[i].r_info), value);
512
515
return -ENOEXEC;
516
+
}
517
+
518
+
int arch_kimage_file_post_load_cleanup(struct kimage *image)
519
+
{
520
+
vfree(image->elf_headers);
521
+
image->elf_headers = NULL;
522
+
image->elf_headers_sz = 0;
523
+
524
+
return kexec_image_post_load_cleanup_default(image);
513
525
}
514
526
#endif /* CONFIG_KEXEC_FILE */
515
527
+1
-1
mm/hugetlb_vmemmap.c
+1
-1
mm/hugetlb_vmemmap.c
···
33
33
EXPORT_SYMBOL(hugetlb_optimize_vmemmap_key);
34
34
35
35
static enum vmemmap_optimize_mode vmemmap_optimize_mode =
36
-
IS_ENABLED(CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON);
36
+
IS_ENABLED(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON);
37
37
38
38
static void vmemmap_optimize_mode_switch(enum vmemmap_optimize_mode to)
39
39
{
+1
-1
mm/memremap.c
+1
-1
mm/memremap.c
+29
-29
mm/oom_kill.c
+29
-29
mm/oom_kill.c
···
56
56
static int sysctl_oom_kill_allocating_task;
57
57
static int sysctl_oom_dump_tasks = 1;
58
58
59
-
#ifdef CONFIG_SYSCTL
60
-
static struct ctl_table vm_oom_kill_table[] = {
61
-
{
62
-
.procname = "panic_on_oom",
63
-
.data = &sysctl_panic_on_oom,
64
-
.maxlen = sizeof(sysctl_panic_on_oom),
65
-
.mode = 0644,
66
-
.proc_handler = proc_dointvec_minmax,
67
-
.extra1 = SYSCTL_ZERO,
68
-
.extra2 = SYSCTL_TWO,
69
-
},
70
-
{
71
-
.procname = "oom_kill_allocating_task",
72
-
.data = &sysctl_oom_kill_allocating_task,
73
-
.maxlen = sizeof(sysctl_oom_kill_allocating_task),
74
-
.mode = 0644,
75
-
.proc_handler = proc_dointvec,
76
-
},
77
-
{
78
-
.procname = "oom_dump_tasks",
79
-
.data = &sysctl_oom_dump_tasks,
80
-
.maxlen = sizeof(sysctl_oom_dump_tasks),
81
-
.mode = 0644,
82
-
.proc_handler = proc_dointvec,
83
-
},
84
-
{}
85
-
};
86
-
#endif
87
-
88
59
/*
89
60
* Serializes oom killer invocations (out_of_memory()) from all contexts to
90
61
* prevent from over eager oom killing (e.g. when the oom killer is invoked
···
699
728
tsk->oom_reaper_timer.expires = jiffies + OOM_REAPER_DELAY;
700
729
add_timer(&tsk->oom_reaper_timer);
701
730
}
731
+
732
+
#ifdef CONFIG_SYSCTL
733
+
static struct ctl_table vm_oom_kill_table[] = {
734
+
{
735
+
.procname = "panic_on_oom",
736
+
.data = &sysctl_panic_on_oom,
737
+
.maxlen = sizeof(sysctl_panic_on_oom),
738
+
.mode = 0644,
739
+
.proc_handler = proc_dointvec_minmax,
740
+
.extra1 = SYSCTL_ZERO,
741
+
.extra2 = SYSCTL_TWO,
742
+
},
743
+
{
744
+
.procname = "oom_kill_allocating_task",
745
+
.data = &sysctl_oom_kill_allocating_task,
746
+
.maxlen = sizeof(sysctl_oom_kill_allocating_task),
747
+
.mode = 0644,
748
+
.proc_handler = proc_dointvec,
749
+
},
750
+
{
751
+
.procname = "oom_dump_tasks",
752
+
.data = &sysctl_oom_dump_tasks,
753
+
.maxlen = sizeof(sysctl_oom_dump_tasks),
754
+
.mode = 0644,
755
+
.proc_handler = proc_dointvec,
756
+
},
757
+
{}
758
+
};
759
+
#endif
702
760
703
761
static int __init oom_init(void)
704
762
{
+1
-1
mm/page_isolation.c
+1
-1
mm/page_isolation.c
···
385
385
* above do the rest. If migration is not possible, just fail.
386
386
*/
387
387
if (PageCompound(page)) {
388
-
unsigned long nr_pages = compound_nr(page);
389
388
struct page *head = compound_head(page);
390
389
unsigned long head_pfn = page_to_pfn(head);
390
+
unsigned long nr_pages = compound_nr(head);
391
391
392
392
if (head_pfn + nr_pages <= boundary_pfn) {
393
393
pfn = head_pfn + nr_pages;