# git rev-parse -q --verify 61307b7be41a1f1039d1d1368810a1d92cb97b44^{commit} 61307b7be41a1f1039d1d1368810a1d92cb97b44 already have revision, skipping fetch # git checkout -q -f -B kisskb 61307b7be41a1f1039d1d1368810a1d92cb97b44 # git clean -qxdf # < git log -1 # commit 61307b7be41a1f1039d1d1368810a1d92cb97b44 # Merge: 0450d2083be6 76edc534cc28 # Author: Linus Torvalds # Date: Sun May 19 09:21:03 2024 -0700 # # Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm # # Pull mm updates from Andrew Morton: # "The usual shower of singleton fixes and minor series all over MM, # documented (hopefully adequately) in the respective changelogs. # Notable series include: # # - Lucas Stach has provided some page-mapping cleanup/consolidation/ # maintainability work in the series "mm/treewide: Remove pXd_huge() # API". # # - In the series "Allow migrate on protnone reference with # MPOL_PREFERRED_MANY policy", Donet Tom has optimized mempolicy's # MPOL_PREFERRED_MANY mode, yielding almost doubled performance in # one test. # # - In their series "Memory allocation profiling" Kent Overstreet and # Suren Baghdasaryan have contributed a means of determining (via # /proc/allocinfo) whereabouts in the kernel memory is being # allocated: number of calls and amount of memory. # # - Matthew Wilcox has provided the series "Various significant MM # patches" which does a number of rather unrelated things, but in # largely similar code sites. # # - In his series "mm: page_alloc: freelist migratetype hygiene" # Johannes Weiner has fixed the page allocator's handling of # migratetype requests, with resulting improvements in compaction # efficiency. # # - In the series "make the hugetlb migration strategy consistent" # Baolin Wang has fixed a hugetlb migration issue, which should # improve hugetlb allocation reliability. # # - Liu Shixin has hit an I/O meltdown caused by readahead in a # memory-tight memcg. Addressed in the series "Fix I/O high when # memory almost met memcg limit". # # - In the series "mm/filemap: optimize folio adding and splitting" # Kairui Song has optimized pagecache insertion, yielding ~10% # performance improvement in one test. # # - Baoquan He has cleaned up and consolidated the early zone # initialization code in the series "mm/mm_init.c: refactor # free_area_init_core()". # # - Baoquan has also redone some MM initializatio code in the series # "mm/init: minor clean up and improvement". # # - MM helper cleanups from Christoph Hellwig in his series "remove # follow_pfn". # # - More cleanups from Matthew Wilcox in the series "Various # page->flags cleanups". # # - Vlastimil Babka has contributed maintainability improvements in the # series "memcg_kmem hooks refactoring". # # - More folio conversions and cleanups in Matthew Wilcox's series: # "Convert huge_zero_page to huge_zero_folio" # "khugepaged folio conversions" # "Remove page_idle and page_young wrappers" # "Use folio APIs in procfs" # "Clean up __folio_put()" # "Some cleanups for memory-failure" # "Remove page_mapping()" # "More folio compat code removal" # # - David Hildenbrand chipped in with "fs/proc/task_mmu: convert # hugetlb functions to work on folis". # # - Code consolidation and cleanup work related to GUP's handling of # hugetlbs in Peter Xu's series "mm/gup: Unify hugetlb, part 2". # # - Rick Edgecombe has developed some fixes to stack guard gaps in the # series "Cover a guard gap corner case". # # - Jinjiang Tu has fixed KSM's behaviour after a fork+exec in the # series "mm/ksm: fix ksm exec support for prctl". # # - Baolin Wang has implemented NUMA balancing for multi-size THPs. # This is a simple first-cut implementation for now. The series is # "support multi-size THP numa balancing". # # - Cleanups to vma handling helper functions from Matthew Wilcox in # the series "Unify vma_address and vma_pgoff_address". # # - Some selftests maintenance work from Dev Jain in the series # "selftests/mm: mremap_test: Optimizations and style fixes". # # - Improvements to the swapping of multi-size THPs from Ryan Roberts # in the series "Swap-out mTHP without splitting". # # - Kefeng Wang has significantly optimized the handling of arm64's # permission page faults in the series # "arch/mm/fault: accelerate pagefault when badaccess" # "mm: remove arch's private VM_FAULT_BADMAP/BADACCESS" # # - GUP cleanups from David Hildenbrand in "mm/gup: consistently call # it GUP-fast". # # - hugetlb fault code cleanups from Vishal Moola in "Hugetlb fault # path to use struct vm_fault". # # - selftests build fixes from John Hubbard in the series "Fix # selftests/mm build without requiring "make headers"". # # - Memory tiering fixes/improvements from Ho-Ren (Jack) Chuang in the # series "Improved Memory Tier Creation for CPUless NUMA Nodes". # Fixes the initialization code so that migration between different # memory types works as intended. # # - David Hildenbrand has improved follow_pte() and fixed an errant # driver in the series "mm: follow_pte() improvements and acrn # follow_pte() fixes". # # - David also did some cleanup work on large folio mapcounts in his # series "mm: mapcount for large folios + page_mapcount() cleanups". # # - Folio conversions in KSM in Alex Shi's series "transfer page to # folio in KSM". # # - Barry Song has added some sysfs stats for monitoring multi-size # THP's in the series "mm: add per-order mTHP alloc and swpout # counters". # # - Some zswap cleanups from Yosry Ahmed in the series "zswap # same-filled and limit checking cleanups". # # - Matthew Wilcox has been looking at buffer_head code and found the # documentation to be lacking. The series is "Improve buffer head # documentation". # # - Multi-size THPs get more work, this time from Lance Yang. His # series "mm/madvise: enhance lazyfreeing with mTHP in madvise_free" # optimizes the freeing of these things. # # - Kemeng Shi has added more userspace-visible writeback # instrumentation in the series "Improve visibility of writeback". # # - Kemeng Shi then sent some maintenance work on top in the series # "Fix and cleanups to page-writeback". # # - Matthew Wilcox reduces mmap_lock traffic in the anon vma code in # the series "Improve anon_vma scalability for anon VMAs". Intel's # test bot reported an improbable 3x improvement in one test. # # - SeongJae Park adds some DAMON feature work in the series # "mm/damon: add a DAMOS filter type for page granularity access recheck" # "selftests/damon: add DAMOS quota goal test" # # - Also some maintenance work in the series # "mm/damon/paddr: simplify page level access re-check for pageout" # "mm/damon: misc fixes and improvements" # # - David Hildenbrand has disabled some known-to-fail selftests ni the # series "selftests: mm: cow: flag vmsplice() hugetlb tests as # XFAIL". # # - memcg metadata storage optimizations from Shakeel Butt in "memcg: # reduce memory consumption by memcg stats". # # - DAX fixes and maintenance work from Vishal Verma in the series # "dax/bus.c: Fixups for dax-bus locking"" # # * tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (426 commits) # memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order # selftests/mm: hugetlb_madv_vs_map: avoid test skipping by querying hugepage size at runtime # mm/hugetlb: add missing VM_FAULT_SET_HINDEX in hugetlb_wp # mm/hugetlb: add missing VM_FAULT_SET_HINDEX in hugetlb_fault # selftests: cgroup: add tests to verify the zswap writeback path # mm: memcg: make alloc_mem_cgroup_per_node_info() return bool # mm/damon/core: fix return value from damos_wmark_metric_value # mm: do not update memcg stats for NR_{FILE/SHMEM}_PMDMAPPED # selftests: cgroup: remove redundant enabling of memory controller # Docs/mm/damon/maintainer-profile: allow posting patches based on damon/next tree # Docs/mm/damon/maintainer-profile: change the maintainer's timezone from PST to PT # Docs/mm/damon/design: use a list for supported filters # Docs/admin-guide/mm/damon/usage: fix wrong schemes effective quota update command # Docs/admin-guide/mm/damon/usage: fix wrong example of DAMOS filter matching sysfs file # selftests/damon: classify tests for functionalities and regressions # selftests/damon/_damon_sysfs: use 'is' instead of '==' for 'None' # selftests/damon/_damon_sysfs: find sysfs mount point from /proc/mounts # selftests/damon/_damon_sysfs: check errors from nr_schemes file reads # mm/damon/core: initialize ->esz_bp from damos_quota_init_priv() # selftests/damon: add a test for DAMOS quota goal # ... # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 61307b7be41a1f1039d1d1368810a1d92cb97b44 # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 defconfig # < make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 9 | void foo(void) | ^~~ /kisskb/src/arch/x86/um/fault.c:18:5: warning: no previous prototype for ‘arch_fixup’ [-Wmissing-prototypes] 18 | int arch_fixup(unsigned long address, struct uml_pt_regs *regs) | ^~~~~~~~~~ /kisskb/src/arch/x86/um/bugs_64.c:9:6: warning: no previous prototype for ‘arch_check_bugs’ [-Wmissing-prototypes] 9 | void arch_check_bugs(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/bugs_64.c:13:6: warning: no previous prototype for ‘arch_examine_signal’ [-Wmissing-prototypes] 13 | void arch_examine_signal(int sig, struct uml_pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/vdso/um_vdso.c:16:5: warning: no previous prototype for ‘__vdso_clock_gettime’ [-Wmissing-prototypes] 16 | int __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) | ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/vdso/um_vdso.c:30:5: warning: no previous prototype for ‘__vdso_gettimeofday’ [-Wmissing-prototypes] 30 | int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/vdso/um_vdso.c:44:21: warning: no previous prototype for ‘__vdso_time’ [-Wmissing-prototypes] 44 | __kernel_old_time_t __vdso_time(__kernel_old_time_t *t) | ^~~~~~~~~~~ /kisskb/src/arch/x86/um/vdso/um_vdso.c:57:1: warning: no previous prototype for ‘__vdso_getcpu’ [-Wmissing-prototypes] 57 | __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused) | ^~~~~~~~~~~~~ /kisskb/src/arch/x86/um/os-Linux/registers.c:146:15: warning: no previous prototype for ‘get_thread_reg’ [-Wmissing-prototypes] 146 | unsigned long get_thread_reg(int reg, jmp_buf *buf) | ^~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/os-Linux/mcontext.c:7:6: warning: no previous prototype for ‘get_regs_from_mc’ [-Wmissing-prototypes] 7 | void get_regs_from_mc(struct uml_pt_regs *regs, mcontext_t *mc) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/skas/process.c:107:6: warning: no previous prototype for ‘wait_stub_done’ [-Wmissing-prototypes] 107 | void wait_stub_done(int pid) | ^~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/skas/process.c:683:6: warning: no previous prototype for ‘__switch_mm’ [-Wmissing-prototypes] 683 | void __switch_mm(struct mm_id *mm_idp) | ^~~~~~~~~~~ /kisskb/src/arch/x86/um/ptrace_64.c:111:5: warning: no previous prototype for ‘poke_user’ [-Wmissing-prototypes] 111 | int poke_user(struct task_struct *child, long addr, long data) | ^~~~~~~~~ /kisskb/src/arch/x86/um/ptrace_64.c:171:5: warning: no previous prototype for ‘peek_user’ [-Wmissing-prototypes] 171 | int peek_user(struct task_struct *child, long addr, long data) | ^~~~~~~~~ /kisskb/src/arch/um/kernel/skas/mmu.c:17:5: warning: no previous prototype for ‘init_new_context’ [-Wmissing-prototypes] 17 | int init_new_context(struct task_struct *task, struct mm_struct *mm) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/skas/mmu.c:60:6: warning: no previous prototype for ‘destroy_context’ [-Wmissing-prototypes] 60 | void destroy_context(struct mm_struct *mm) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/skas/process.c:36:12: warning: no previous prototype for ‘start_uml’ [-Wmissing-prototypes] 36 | int __init start_uml(void) | ^~~~~~~~~ /kisskb/src/arch/um/os-Linux/drivers/ethertap_kern.c:66:5: warning: no previous prototype for ‘ethertap_setup’ [-Wmissing-prototypes] 66 | int ethertap_setup(char *str, char **mac_out, void *data) | ^~~~~~~~~~~~~~ /kisskb/src/arch/x86/um/signal.c:560:6: warning: no previous prototype for ‘sys_rt_sigreturn’ [-Wmissing-prototypes] 560 | long sys_rt_sigreturn(void) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/drivers/tuntap_kern.c:56:5: warning: no previous prototype for ‘tuntap_setup’ [-Wmissing-prototypes] 56 | int tuntap_setup(char *str, char **mac_out, void *data) | ^~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/main.c:187:7: warning: no previous prototype for ‘__wrap_malloc’ [-Wmissing-prototypes] 187 | void *__wrap_malloc(int size) | ^~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/main.c:208:7: warning: no previous prototype for ‘__wrap_calloc’ [-Wmissing-prototypes] 208 | void *__wrap_calloc(int n, int size) | ^~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/main.c:222:6: warning: no previous prototype for ‘__wrap_free’ [-Wmissing-prototypes] 222 | void __wrap_free(void *ptr) | ^~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/mem.c:28:6: warning: no previous prototype for ‘kasan_map_memory’ [-Wmissing-prototypes] 28 | void kasan_map_memory(void *start, size_t len) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/mem.c:212:13: warning: no previous prototype for ‘check_tmpexec’ [-Wmissing-prototypes] 212 | void __init check_tmpexec(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/signal.c:75:6: warning: no previous prototype for ‘sig_handler’ [-Wmissing-prototypes] 75 | void sig_handler(int sig, struct siginfo *si, mcontext_t *mc) | ^~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/signal.c:111:6: warning: no previous prototype for ‘timer_alarm_handler’ [-Wmissing-prototypes] 111 | void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/os-Linux/start_up.c:301:12: warning: no previous prototype for ‘parse_iomem’ [-Wmissing-prototypes] 301 | int __init parse_iomem(char *str, int *add) | ^~~~~~~~~~~ /kisskb/src/arch/um/kernel/mem.c:202:8: warning: no previous prototype for ‘pgd_alloc’ [-Wmissing-prototypes] 202 | pgd_t *pgd_alloc(struct mm_struct *mm) | ^~~~~~~~~ /kisskb/src/arch/um/kernel/mem.c:215:7: warning: no previous prototype for ‘uml_kmalloc’ [-Wmissing-prototypes] 215 | void *uml_kmalloc(int size, int flags) | ^~~~~~~~~~~ /kisskb/src/arch/x86/um/syscalls_64.c:48:6: warning: no previous prototype for ‘arch_switch_to’ [-Wmissing-prototypes] 48 | void arch_switch_to(struct task_struct *to) | ^~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/reboot.c:45:6: warning: no previous prototype for ‘machine_restart’ [-Wmissing-prototypes] 45 | void machine_restart(char * __unused) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/reboot.c:51:6: warning: no previous prototype for ‘machine_power_off’ [-Wmissing-prototypes] 51 | void machine_power_off(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/reboot.c:57:6: warning: no previous prototype for ‘machine_halt’ [-Wmissing-prototypes] 57 | void machine_halt(void) | ^~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:51:5: warning: no previous prototype for ‘pid_to_processor_id’ [-Wmissing-prototypes] 51 | int pid_to_processor_id(int pid) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:87:7: warning: no previous prototype for ‘__switch_to’ [-Wmissing-prototypes] 87 | void *__switch_to(struct task_struct *from, struct task_struct *to) | ^~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:140:6: warning: no previous prototype for ‘fork_handler’ [-Wmissing-prototypes] 140 | void fork_handler(void) | ^~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:217:6: warning: no previous prototype for ‘arch_cpu_idle’ [-Wmissing-prototypes] 217 | void arch_cpu_idle(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:253:5: warning: no previous prototype for ‘copy_to_user_proc’ [-Wmissing-prototypes] 253 | int copy_to_user_proc(void __user *to, void *from, int size) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:263:5: warning: no previous prototype for ‘clear_user_proc’ [-Wmissing-prototypes] 263 | int clear_user_proc(void __user *buf, int size) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:271:6: warning: no previous prototype for ‘set_using_sysemu’ [-Wmissing-prototypes] 271 | void set_using_sysemu(int value) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:278:5: warning: no previous prototype for ‘get_using_sysemu’ [-Wmissing-prototypes] 278 | int get_using_sysemu(void) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:316:12: warning: no previous prototype for ‘make_proc_sysemu’ [-Wmissing-prototypes] 316 | int __init make_proc_sysemu(void) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/process.c:348:15: warning: no previous prototype for ‘arch_align_stack’ [-Wmissing-prototypes] 348 | unsigned long arch_align_stack(unsigned long sp) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/um_arch.c:408:19: warning: no previous prototype for ‘read_initrd’ [-Wmissing-prototypes] 408 | int __init __weak read_initrd(void) | ^~~~~~~~~~~ /kisskb/src/arch/um/kernel/um_arch.c:461:7: warning: no previous prototype for ‘text_poke’ [-Wmissing-prototypes] 461 | void *text_poke(void *addr, const void *opcode, size_t len) | ^~~~~~~~~ /kisskb/src/arch/um/kernel/um_arch.c:473:6: warning: no previous prototype for ‘text_poke_sync’ [-Wmissing-prototypes] 473 | void text_poke_sync(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/tlb.c:579:6: warning: no previous prototype for ‘flush_tlb_mm_range’ [-Wmissing-prototypes] 579 | void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, | ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/tlb.c:594:6: warning: no previous prototype for ‘force_flush_all’ [-Wmissing-prototypes] 594 | void force_flush_all(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/um/kernel/kmsg_dump.c:60:12: warning: no previous prototype for ‘kmsg_dumper_stdout_init’ [-Wmissing-prototypes] 60 | int __init kmsg_dumper_stdout_init(void) | ^~~~~~~~~~~~~~~~~~~~~~~ LINK linux Completed OK # rm -rf /kisskb/build/linus_defconfig_um-x86_64-gcc12 # Build took: 0:00:36.328420