72655c8488
Catch the -lts branch up with all of the updates and kmi break that happened in the android16-6.12 branch. Changes included in here are: *147b27e8d6ANDROID: nvmet: Use the bdev_is_zone_start() function *392bbaffdcANDROID: scsi: ufs: Support I/O tracing for zoned block devices *e395d18c8bANDROID: scsi: scsi_debug: Support npo2 zone sizes *497ca126ddANDROID: scsi/sd_zbc: Support npo2 zone sizes *355dfccf9dANDROID: dm-table: allow zoned devices with non power-of-2 zone sizes *d6f0f66569ANDROID: block: Do not set the I/O priority for zoned writes *30ce6652eeANDROID: block: Support npo2 zone sizes *4a77dbe5c5UPSTREAM: loop: fix queue freeze vs limits lock order *d2eefa734fUPSTREAM: loop: refactor queue limits updates *b0477a0759UPSTREAM: loop: Fix ABBA locking race *49d8530dfeUPSTREAM: loop: Simplify discard granularity calc *f1aac3cfafUPSTREAM: loop: Use bdev limit helpers for configuring discard *02cf51391eUPSTREAM: usb-storage: fix queue freeze vs limits lock order *96dfef3be8UPSTREAM: nbd: fix queue freeze vs limits lock order *1bf8be0b4eUPSTREAM: nvme: fix queue freeze vs limits lock order *32ab5e2dd9UPSTREAM: block: fix queue freeze vs limits lock order in sysfs store methods *e4eb47a3ecBACKPORT: block: add a store_limit operations for sysfs entries *574e0848d2UPSTREAM: block: add a queue_limits_commit_update_frozen helper *65ad590076FROMGIT: genirq: Retain depth for managed IRQs across CPU hotplug *1bc40b53aaFROMGIT: ufs: core: support updating device command timeout *5e97c36004ANDROID: Build Rust Binder as a GKI module *daae469749ANDROID: rust_binder: handle read/write_consumed > read/write_size *b23e338263ANDROID: rust_binder: add Rust Binder to Makefile *7163533526ANDROID: rust_binder: fixups for 6.12.19 LTS *bf40001347ANDROID: rust_binder: add back tracepoints *dac7c66bc9ANDROID: rust_binder: move Rust Binder in preparation for GKI module *8313296331FROMGIT: rust: alloc: add Vec::insert_within_capacity *c28afde01dFROMGIT: rust: alloc: add Vec::remove *e1da60354aFROMGIT: rust: alloc: add Vec::retain *1e01dcf3beFROMGIT: rust: alloc: add Vec::drain_all *1a17ca097dFROMGIT: rust: alloc: add Vec::push_within_capacity *75c0948156FROMGIT: rust: alloc: add Vec::pop *ed2019e2c4FROMGIT: rust: alloc: add Vec::clear *04d685ecf9FROMGIT: rust: alloc: replace `Vec::set_len` with `inc_len` *597ebe7c32FROMGIT: rust: alloc: refactor `Vec::truncate` using `dec_len` *8a1546ee71FROMGIT: rust: alloc: add `Vec::dec_len` *48080570b0FROMGIT: rust: alloc: add Vec::len() <= Vec::capacity invariant *7907fdcba6FROMGIT: rust: alloc: allow coercion from `Box<T>` to `Box<dyn U>` if T implements U *9de29f7183FROMGIT: rust: alloc: use `spare_capacity_mut` to reduce unsafe *c40401d665FROMGIT: rust: alloc: add Vec::resize method *9d37907c65FROMGIT: rust: alloc: add Vec::truncate method *f037ab7a73FROMGIT: rust: alloc: add missing invariant in Vec::set_len() *025e0fc417UPSTREAM: rust: kunit: allow to know if we are in a test *86603276f4UPSTREAM: rust: macros: add macro to easily run KUnit tests *f8c704efd6BACKPORT: rust: kunit: add KUnit case and suite macros *1b461575a8UPSTREAM: rust: add kunitconfig *615a5b6d7eUPSTREAM: rust: uaccess: generalize userSliceReader to support any Vec *0690b3438bANDROID: 2025/05/15 KMI update *daf75d7717FROMLIST: mmc: sdhci-msm: Enable force hw reset during cqe recovery *794391e0e8FROMLIST: mmc: core: Introduce new flag to force hardware reset *84e14946ebANDROID: GKI: add ANDROID_OEM_DATA in struct bio *e7b9281897ANDROID: rust: allow zero init for KABI members *9027c8ec43ANDROID: 16K: Add VMA padding size to smaps output *307be4b887ANDROID: 16K: Don't copy data vma for maps/smaps output *d378f3ab39ANDROID: 16K: Fixup padding vm_flags bits on VMA splits *c0d7f9802aANDROID: 16K: Introduce pgsize_migration_inline.h *6fd1ed47f5ANDROID: 16K: Fix vm_flags conflicts from mseal *2a651ea884ANDROID: 16K: Don't set padding vm_flags on 32-bit archs *81734e02c6ANDROID: 16K: Avoid mmap lock assertions for padding VMAs *4199eaf23eANDROID: 16K: Only check basename of linker context *6050c4b129ANDROID: 16K: Avoid and document padding madvise lock warning *6e64e9ce1fANDROID: 16K: Fix show maps CFI failure *95d0b11a65ANDROID: 16K: Handle pad VMA splits and merges *29dc8b580bANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check *bcbb9d3c85ANDROID: 16K: Only madvise padding from dynamic linker context *2feb999649ANDROID: 16K: Separate padding from ELF LOAD segment mappings *092ff7e5b4ANDROID: 16K: Exclude ELF padding for fault around range *a3b4e8f698ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages. *0d793cde88ANDROID: 16K: Introduce ELF padding representation for VMAs *918c98f267ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_migration/enabled *e9420a4582ANDROID: 16K: rust: ashmem: __page_align VMA size check *d44ff7a3edANDROID: 16K: Introduce rust __page_*() helpers *e39fcef01cANDROID: 16K: Duplicate command line for parsing page_shift *44a6882cc7ANDROID: 16K: Init page_shift param in a pure_initcall() *68ba0f4dfbANDROID: 16K: __PAGE_ALIGN() virtio gpu dumb buffers *1022438243ANDROID: 16K: Avoid conflicting __PAGE_SIZE in bpf/core *778a447513ANDROID: 16K: Emulate cachestat counters *0d44e1eb0eANDROID: 16K: Disable kernel APIs indexed by PFNs *d684b3125eANDROID: 16K: Emulate pread() for pagemap *669f0c4355ANDROID: 16K: Emulate /proc/pid/pagemap *3c9a39c770ANDROID: 16K: Fix mincore emulation *8aab407984ANDROID: 16K: Emulate mincore() syscall *596774b15cANDROID: 16K: x86_64: Disable userfaultfd *c94c31e526ANDROID: 16K: Update sysctl_perf_event_mlock if PERF_EVENTS enabled *13ba0aec9cANDROID: 16K: Fixup perf_mmap check for metadata page *03ce5534fcANDROID: 16K: Fix swapfile header *53ab86eb55ANDROID: 16K: Fix SIGBUS semantics and document __filemap_fixup() *50a96587afANDROID: 16K: [s]maps: Fold fixup entries into the parent entry *57bbcef534ANDROID: 16K: Ensure mseal start and len are 16kB multiples *5c1d7ef671ANDROID: 16K: Handle pgoff > file_size for shmem and file backed VMAs *cd48f9a1f7ANDROID: 16K: Ensure stack expansion size is __PAGE_SIZE multiple *a8df614576ANDROID: 16K: Only support page size emulation for x86_64 *ac98b230dbANDROID: 16K: Use bit 59 for __VM_NO_COMPAT *eb54f19663ANDROID: 16K: Fix __MAP_NO_COMPAT overflow *36157a52cdANDROID: 16K: __PAGE_ALIGN dma-bufs size from heap allocations *65df6a39b7ANDROID: 16K: Align vsyscall mapping size to a 16kB multiple *4395898bf5ANDROID: 16K: Align vdso mapping size to a 16kB multiple *37ebd01b5aANDROID: 16K: Make the x86 vdso layout 16kB compatible *c64a15a595ANDROID: 16K: Introduce __MAX_PAGE_SIZE macros *60b3135822ANDROID: 16K: Remove androidboot from page_shift kernel param *5e32ba9023ANDROID: 16K: Remove unescessary err log in randomize_page() *1ae0864980ANDROID: 16K Prevent non-__PAGE_ALIGNED() VMA splits by anon names *68e0528b38ANDROID: 16K: Remove anon name for fixup VMA *f7f25a5b1aANDROID: 16K: Add page_compat[_enabled] to symbol list *93bfe702cdANDROID: 16K: Export page compat symbols *181bc19befANDROID: 16K: x86_64: Allow stack randomization of twice page-size *f51703f4c1ANDROID: 16K: x86_64: __PAGE_ALIGN mmap randomization *4daa4c1fecANDROID: 16K: brk: __PAGE_ALIGN brk *7852452429ANDROID: 16K: mlock: __PAGE_ALIGN addr and len *4956d7c6c4ANDROID: 16K: msync: __PAGE_ALIGN addr and len *5d8eb7f9e0ANDROID: 16K: madvise: __PAGE_ALIGN addr and len *a52b76b874ANDROID: 16K: mremap: __PAGE_ALIGN addr and len *2d3fed3a43ANDROID: 16K: mprotect: __PAGE_ALIGN addr and len *397425965fANDROID: 16K: munmap: __PAGE_ALIGN addr and len *a9e38ff89aANDROID: 16K: __PAGE_ALIGN stack_[top|base] *ba166bce2cANDROID: 16K: __PAGE_ALIGN randomize_stack_top() address *9ba9a0891bANDROID: 16K: __PAGE_ALIGN randomize_page() address *81e0928547ANDROID: 16K: __PAGE_ALIGN mmap hint address *a1e630ea0dANDROID: 16K: ashmem: Fix size check *df9123472fANDROID: 16K: Fix selinux mmap size check *7dea17008fANDROID: 16K: procfs: maps: Don't show fixup VMAs *e076e9ff2cANDROID: 16K: Handle filemap faults *a9ccc1128eANDROID: 16K: Introduce __VM_NO_COMPAT vma flag *e7f83d4d4bANDROID: 16K: Ensure unmapped_area returns a __PAGE_ALIGNED address *796be8fd27ANDROID: 16K: Reduce mmap rand bits *80e2a42d97ANDROID: 16K: x86_64: Set ELF_EXEC_PAGESIZE to __PAGE_SIZE *58e2fa4ec4ANDROID: 16K: Remove build time dependencies on ELF_EXEC_PAGESIZE *d09cd43b3fANDROID: 16K: Log unaligned operations *1fb2de0c3dANDROID: 16K: Add page-compat helper macros *a052d19e1cANDROID: GKI: Pad vendor properties to power_supply_property enum *61de19b772ANDROID: drivers/iommu: Pad iommu structs *6cb1db877dANDROID: KVM: arm64: Pad more pKVM structs *b3c31c9b21ANDROID: KVM: arm64: Drop struct pkvm_mapping from KMI *ef10b442e4ANDROID: KVM: arm64: Remove struct kvm_cpu_context from the KMI *15bf9aa274ANDROID: GKI: Add ABI padding for kcompressd feature *e80ed6bcfbANDROID: GKI: Add memory reclaim ABI padding *9e96103d83ANDROID: GKI: Add dmabuf ABI padding *4bd97e7a02ANDROID: GKI: Add cgroup ABI padding *b209d55c0eANDROID: GKI: Add cpuset ABI padding *060da33ae4ANDROID: GKI: Add memcg ABI padding *d48d0d0892FROMLIST: scsi: core: Implement reserved command handling *26febb7cdeUPSTREAM: block: track queue dying state automatically for modeling queue freeze lockdep *df5f9ab297UPSTREAM: block: don't verify queue freeze manually in elevator_init_mq() *752dff69aeUPSTREAM: block: track disk DEAD state automatically for modeling queue freeze lockdep *225f2e16adUPSTREAM: block: don't reorder requests in blk_mq_add_to_batch *bdcd6a28fdUPSTREAM: block: don't reorder requests in blk_add_rq_to_plug *24f685a927UPSTREAM: block: add a rq_list type *bbce2aa253UPSTREAM: block: remove rq_list_move *128144da22ANDROID: KVM: arm64: Add smc64 trap handling for protected guests *2c1385ae0eANDROID: Modify android_rvh_find_lowest_rq hook *bad3ca6c52ANDROID: GKI: add vendor padding variable in struct nf_conn *ef3d16e0e0ANDROID: vendor_hooks: add a field in pglist_data *0dd21f133bANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE *75adb09e2fANDROID: GKI: the "reusachtig" padding sync with android16-6.12 *20159aa0acUPSTREAM: PCI: Check BAR index for validity *46f484fa4dUPSTREAM: perf: Fix hang while freeing sigtrap event *f295287ed4UPSTREAM: perf/core: Simplify the perf_event_alloc() error path *748bd1ca17UPSTREAM: perf/core: Add aux_pause, aux_resume, aux_start_paused *887fb3f16cANDROID: KVM: arm64: Add __pkvm_host_donate_sglist_hyp *a7667808d9UPSTREAM: tools/selftests: add guard region test for /proc/$pid/pagemap *dd6e353d71UPSTREAM: fs/proc/task_mmu: add guard region bit to pagemap *df3e8432faUPSTREAM: tools/selftests: add file/shmem-backed mapping guard region tests *bc91eb889eUPSTREAM: tools/selftests: expand all guard region tests to file-backed *458e4dbd0bUPSTREAM: selftests/mm: rename guard-pages to guard-regions *8261d30079UPSTREAM: mm: allow guard regions in file-backed and read-only mappings *ca6b245e10UPSTREAM: selftests/mm: use PIDFD_SELF in guard pages test *99b3bb2022BACKPORT: selftests/pidfd: add tests for PIDFD_SELF_* *7a879200c9UPSTREAM: selftests/pidfd: add new PIDFD_SELF* defines *1734a4ad6bBACKPORT: pidfd: add PIDFD_SELF* sentinels to refer to own thread/process *b00dca6fb7UPSTREAM: selftests/mm: add fork CoW guard page test *5367c0eaccBACKPORT: selftests/mm: add self tests for guard page feature *86f861b42eUPSTREAM: tools: testing: update tools UAPI header for mman-common.h *b9ee6db5a8BACKPORT: mm: madvise: implement lightweight guard page mechanism *c14f85307dUPSTREAM: mm: add PTE_MARKER_GUARD PTE marker *c5be90ae70UPSTREAM: mm: pagewalk: add the ability to install PTEs *3306eb50a4FROMGIT: docs: core-api: document the IOVA-based API *26405baef4FROMGIT: dma-mapping: add a dma_need_unmap helper *66bc206d64FROMGIT: dma-mapping: Implement link/unlink ranges API *59a15e3bf1FROMGIT: iommu/dma: Factor out a iommu_dma_map_swiotlb helper *0f2253b2b1FROMGIT: dma-mapping: Provide an interface to allow allocate IOVA *c64f83e1d6FROMGIT: iommu: add kernel-doc for iommu_unmap_fast *5c59ff3809FROMGIT: iommu: generalize the batched sync after map interface *15ad0760b8FROMGIT: dma-mapping: move the PCI P2PDMA mapping helpers to pci-p2pdma.h *661e6bda0eFROMGIT: PCI/P2PDMA: Refactor the p2pdma mapping helpers *e44dfa62dfReapply "ANDROID: enable memory allocation profiling configs" *60372b88d2ANDROID: binder: add OEM data to struct binder_alloc *31f62a008eANDROID: Limit vfs-only namespace to GKI builds *e2c81a7fa3ANDROID: Fix incorrect namespacing for ANDROID_GKI_VFS_EXPORT_ONLY *7af261fc12ANDROID: KVM: arm64: Use smccc 1.2 for direct FF-A calls *996a35040aFROMLIST: dm-zone: Use bdev_*() helper functions where applicable *1d1b2e8d63FROMGIT: perf/aux: Allocate non-contiguous AUX pages by default *6e0b046d59UPSTREAM: wifi: cfg80211: fix out-of-bounds access during multi-link element defragmentation *617a8cdb8dANDROID: GKI: add OEM data to struct scan_control for XM OGKI *acc91ef94bFROMGIT: dma-buf: insert memory barrier before updating num_fences *85856ec8b2ANDROID: gunyah: Fix potential use-after-free in gunyah_rm_notifier_register *e48193bfcfANDROID: KVM: arm64: Reserve all args for req_mmio *42cfdfb46cANDROID: GKI: Add reservation and use macros for non-LTS backports *e1cdedc5dbFROMGIT: mm/memcg: use kmem_cache when alloc memcg pernode info *65c043e1caFROMGIT: mm/memcg: use kmem_cache when alloc memcg *434e2d5481FROMGIT: mm/memcg: move mem_cgroup_init() ahead of cgroup_init() *4e16895056ANDROID: GKI: Update oplus symbol list *28cbf47bbaANDROID: GKI: Export css_task_iter_start() *84849bc819Revert "ANDROID: arm64: Forcefully disable SME at runtime" *0aaf2786faFROMGIT: arm64/fpsimd: ptrace: Gracefully handle errors *a51c741bb6FROMGIT: arm64/fpsimd: ptrace: Mandate SVE payload for streaming-mode state *1d05f8264aFROMGIT: arm64/fpsimd: ptrace: Do not present register data for inactive mode *958a94681fFROMGIT: arm64/fpsimd: ptrace: Save task state before generating SVE header *3baa9071c3FROMGIT: arm64/fpsimd: ptrace/prctl: Ensure VL changes leave task in a valid state *ccf055346eFROMGIT: arm64/fpsimd: ptrace/prctl: Ensure VL changes do not resurrect stale data *e18a498a2fFROMGIT: BACKPORT: arm64/fpsimd: Make clone() compatible with ZA lazy saving *a6267d4bf5FROMGIT: arm64/fpsimd: Clear PSTATE.SM during clone() *370e80e212FROMGIT: arm64/fpsimd: Consistently preserve FPSIMD state during clone() *f5db1f9a3bFROMGIT: arm64/fpsimd: Remove redundant task->mm check *57f5b387c4FROMGIT: arm64/fpsimd: signal: Use SMSTOP behaviour in setup_return() *f940d322b6FROMGIT: arm64/fpsimd: Add task_smstop_sm() *73106ecef5FROMGIT: arm64/fpsimd: Factor out {sve,sme}_state_size() helpers *f0f4be3921FROMGIT: arm64/fpsimd: Clarify sve_sync_*() functions *49bba8e1e8FROMGIT: arm64/fpsimd: ptrace: Consistently handle partial writes to NT_ARM_(S)SVE *b2853208b1FROMGIT: arm64/fpsimd: signal: Consistently read FPSIMD context *bed5006f4aFROMGIT: arm64/fpsimd: signal: Mandate SVE payload for streaming-mode state *63897a249fFROMGIT: arm64/fpsimd: signal: Clear PSTATE.SM when restoring FPSIMD frame only *37749ff2f7FROMGIT: arm64/fpsimd: Do not discard modified SVE state *f01e49470aFROMGIT: arm64/fpsimd: Avoid warning when sve_to_fpsimd() is unused *787c2bf09bFROMGIT: arm64/fpsimd: signal: Clear TPIDR2 when delivering signals *dd9f8f02e9FROMGIT: arm64/fpsimd: signal: Simplify preserve_tpidr2_context() *9592e13c60FROMGIT: arm64/fpsimd: signal: Always save+flush state early *14383c6162FROMGIT: arm64/fpsimd: signal32: Always save+flush state early *0c377582f6FROMGIT: arm64/fpsimd: Add fpsimd_save_and_flush_current_state() *acd59f18f3FROMGIT: arm64/fpsimd: Fix merging of FPSIMD state during signal return *f78acfcc31FROMGIT: arm64/fpsimd: Reset FPMR upon exec() *32dbf4add0FROMGIT: arm64/fpsimd: Avoid clobbering kernel FPSIMD state with SMSTOP *2d33087d98FROMGIT: arm64/fpsimd: Don't corrupt FPMR when streaming mode changes *c757f1bcc8FROMGIT: arm64/fpsimd: Discard stale CPU state when handling SME traps *64c0feb892FROMGIT: arm64/fpsimd: Remove opportunistic freeing of SME state *f55fc6340bFROMGIT: arm64/fpsimd: Remove redundant SVE trap manipulation *2ccf10f4a6FROMGIT: arm64/fpsimd: Remove unused fpsimd_force_sync_to_sve() *1e380d1c0eFROMGIT: arm64/fpsimd: Avoid RES0 bits in the SME trap handler *6cf85d6ca1BACKPORT: KVM: arm64: Eagerly switch ZCR_EL{1,2} *6c0394f0efBACKPORT: KVM: arm64: Mark some header functions as inline *66762de87fBACKPORT: KVM: arm64: Refactor exit handlers *d09c293b5bBACKPORT: KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN *5f2af6c19eBACKPORT: KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN *f012246148BACKPORT: KVM: arm64: Remove host FPSIMD saving for non-protected KVM *3aa13c0fd1BACKPORT: KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state *5f1b9561a1ANDROID: KVM: arm64: Eagerly restore host ZCR_EL2 after vcpu run in pKVM *86622b5452ANDROID: ABI: update symbol list for honor *5addce7b33ANDROID: GKI:Add VendorHook for ProbeTimeout *e8df77b867ANDROID: GKI: Update symbol list for qcom *6c6bf93463ANDROID: GKI: update symbol list for xiaomi *e8da2c8c48ANDROID: Export cgroup function to allow module to remove control files *f2c750c9f8ANDROID: Update symbols list for imx *c206f26b28ANDROID: Update symbols to oplus symbol list. *55ac0abda4ANDROID: Export the necessary symbols for the implementation of the BPF scheduler. *de6714dc48ANDROID: Drop tests_zip_arm64 from TV target. *7f12a7bda3ANDROID: GKI: Update RTK STB KMI symbol list *ba364a2340ANDROID: vendor_hooks: add vendor hook in cma_alloc() *21de8f00f4ANDROID: vendor hooks: use DECLARE_RESTRICTED_HOOK for android_rvh *d574cb3cc1ANDROID: GKI: update symbol list for xiaomi *41763ef33dANDROID: GKI: Update symbols list file for oplus *b62718ba86ANDROID: vendor_hooks: add hook in __alloc_workqueue() *c7b71fcb6fFROMLIST: xfrm: Migrate offload configuration *564d5ceda6ANDROID: KVM: arm64: Fix relinquish filtering *d9d550aef0Revert "ANDROID: Revert^2 "KVM: arm64: iommu: Allow to boot without IOMMU driver"" *8d139a5479ANDROID: GKI: Update symbols list file for honor *f3b22c7868ANDROID: fs/proc: Perform priority inheritance around access_remote_vm() *06a574beb9ANDROID: fix incorrect #ifdef for CONFIG_ANDROID_VENDOR_OEM_DATA *d52356998bFROMLIST: scsi: ufs: core: Increase the UIC command timeout further *17f5bd09eeANDROID: sched/psi: disable the privilege check if CONFIG_DEFAULT_SECURITY_SELINUX is enabled *ad2761e088ANDROID: ABI: Update pixel symbol list *86f6711a2dANDROID: scsi: ufs: add complete init vendor hook *273b99c30aANDROID: scsi: ufs: add vendor hook to override key reprogramming *05c9b03f4cFROMGIT: dm-verity: use softirq context only when !need_resched() *a8027abd1eANDROID: KVM: arm64: Redirect modprobe to /dev/kmsg *078ef75fa4ANDROID: gki_defconfig: Enable CONFIG_ARM_SDE_INTERFACE *f982a6b573ANDROID: arm64: SDEI: Export SDEI related symbols *b145782bbdFROMGIT: firmware: SDEI: Allow sdei initialization without ACPI_APEI_GHES *cbd7c4caa9ANDROID: KVM: arm64: Do not pkvm_init_devices() when no registered devices *1fad370b9eANDROID: KVM: arm64: iommu: Do not remap on iommu_atomic_pool reclaim *890428fb57ANDROID: Update symbols list for imx *776eedb13cANDROID: ABI: Update symbol list for mtk *ac8b302ab0ANDROID: mm: Add vendor hook before rmqueue_bulk *34fe71fe24ANDROID: GKI: Update symbol list file for xiaomi *88cb3505ebANDROID: mm: export __pte_offset_map/unuse_swap_pte/read_swap_cache_async *46aa903098ANDROID: Disable check_defconfig for kernel_aarch64_tv. *88680fe19eANDROID: fuse-bpf: Fix recursion in fuse_copy_file_range *5838b5ac0aANDROID: turn off KMI strict mode for TV builds *e680506fe0ANDROID: KVM: iommu: Allow IOMMU mapping in carveouts *4089d8be3fANDROID: GKI: Update symbol list file for xiaomi *20adcab29cUPSTREAM: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() *4e4b0bdf85ANDROID: GKI: Update QCOM symbol list *b791ce76d1ANDROID: GKI: Update the ABI symbol list for qcom *6690013277FROMLIST: mm: add nr_free_highatomic in show_free_areas *cedbc9e5ecANDROID: GKI: Update qcom symbol list *2145149a38ANDROID: implement wrapper for reverse migration *dfc83778aaANDROID: GKI: Update symbols list file for honor *1213a4027aANDROID: ABI: Update pixel symbol list *a546b31e53BACKPORT: FROMGIT: coresight: core: Disable helpers for devices that fail to enable *bdda915529FROMGIT: coresight: catu: Introduce refcount and spinlock for enabling/disabling *2366a0bf75UPSTREAM: firmware: arm_ffa: Upgrade FF-A version to v1.2 in the driver *e5ea70aa2dANDROID: gki_defconfig: do not use FineIBT on x86 *b73e9bfc92FROMGIT: sched/core: Tweak wait_task_inactive() to force dequeue sched_delayed tasks Change-Id: Ie76eebb5d135e428f1c0986639fca0d1ead2aa51 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1234 lines
33 KiB
C
1234 lines
33 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* mm/mremap.c
|
|
*
|
|
* (C) Copyright 1996 Linus Torvalds
|
|
*
|
|
* Address space accounting code <alan@lxorguk.ukuu.org.uk>
|
|
* (C) Copyright 2002 Red Hat Inc, All Rights Reserved
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/mm_inline.h>
|
|
#include <linux/hugetlb.h>
|
|
#include <linux/shm.h>
|
|
#include <linux/ksm.h>
|
|
#include <linux/mman.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/capability.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/swapops.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/security.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/mmu_notifier.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/userfaultfd_k.h>
|
|
#include <linux/mempolicy.h>
|
|
#include <linux/page_size_compat.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/tlb.h>
|
|
#include <asm/pgalloc.h>
|
|
|
|
#include "internal.h"
|
|
|
|
static pud_t *get_old_pud(struct mm_struct *mm, unsigned long addr)
|
|
{
|
|
pgd_t *pgd;
|
|
p4d_t *p4d;
|
|
pud_t *pud;
|
|
|
|
pgd = pgd_offset(mm, addr);
|
|
if (pgd_none_or_clear_bad(pgd))
|
|
return NULL;
|
|
|
|
p4d = p4d_offset(pgd, addr);
|
|
if (p4d_none_or_clear_bad(p4d))
|
|
return NULL;
|
|
|
|
pud = pud_offset(p4d, addr);
|
|
if (pud_none_or_clear_bad(pud))
|
|
return NULL;
|
|
|
|
return pud;
|
|
}
|
|
|
|
static pmd_t *get_old_pmd(struct mm_struct *mm, unsigned long addr)
|
|
{
|
|
pud_t *pud;
|
|
pmd_t *pmd;
|
|
|
|
pud = get_old_pud(mm, addr);
|
|
if (!pud)
|
|
return NULL;
|
|
|
|
pmd = pmd_offset(pud, addr);
|
|
if (pmd_none(*pmd))
|
|
return NULL;
|
|
|
|
return pmd;
|
|
}
|
|
|
|
static pud_t *alloc_new_pud(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
unsigned long addr)
|
|
{
|
|
pgd_t *pgd;
|
|
p4d_t *p4d;
|
|
|
|
pgd = pgd_offset(mm, addr);
|
|
p4d = p4d_alloc(mm, pgd, addr);
|
|
if (!p4d)
|
|
return NULL;
|
|
|
|
return pud_alloc(mm, p4d, addr);
|
|
}
|
|
|
|
static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
unsigned long addr)
|
|
{
|
|
pud_t *pud;
|
|
pmd_t *pmd;
|
|
|
|
pud = alloc_new_pud(mm, vma, addr);
|
|
if (!pud)
|
|
return NULL;
|
|
|
|
pmd = pmd_alloc(mm, pud, addr);
|
|
if (!pmd)
|
|
return NULL;
|
|
|
|
VM_BUG_ON(pmd_trans_huge(*pmd));
|
|
|
|
return pmd;
|
|
}
|
|
|
|
static void take_rmap_locks(struct vm_area_struct *vma)
|
|
{
|
|
if (vma->vm_file)
|
|
i_mmap_lock_write(vma->vm_file->f_mapping);
|
|
if (vma->anon_vma)
|
|
anon_vma_lock_write(vma->anon_vma);
|
|
}
|
|
|
|
static void drop_rmap_locks(struct vm_area_struct *vma)
|
|
{
|
|
if (vma->anon_vma)
|
|
anon_vma_unlock_write(vma->anon_vma);
|
|
if (vma->vm_file)
|
|
i_mmap_unlock_write(vma->vm_file->f_mapping);
|
|
}
|
|
|
|
static pte_t move_soft_dirty_pte(pte_t pte)
|
|
{
|
|
/*
|
|
* Set soft dirty bit so we can notice
|
|
* in userspace the ptes were moved.
|
|
*/
|
|
#ifdef CONFIG_MEM_SOFT_DIRTY
|
|
if (pte_present(pte))
|
|
pte = pte_mksoft_dirty(pte);
|
|
else if (is_swap_pte(pte))
|
|
pte = pte_swp_mksoft_dirty(pte);
|
|
#endif
|
|
return pte;
|
|
}
|
|
|
|
static int move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
|
|
unsigned long old_addr, unsigned long old_end,
|
|
struct vm_area_struct *new_vma, pmd_t *new_pmd,
|
|
unsigned long new_addr, bool need_rmap_locks)
|
|
{
|
|
bool need_clear_uffd_wp = vma_has_uffd_without_event_remap(vma);
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
pte_t *old_pte, *new_pte, pte;
|
|
pmd_t dummy_pmdval;
|
|
spinlock_t *old_ptl, *new_ptl;
|
|
bool force_flush = false;
|
|
unsigned long len = old_end - old_addr;
|
|
int err = 0;
|
|
|
|
/*
|
|
* When need_rmap_locks is true, we take the i_mmap_rwsem and anon_vma
|
|
* locks to ensure that rmap will always observe either the old or the
|
|
* new ptes. This is the easiest way to avoid races with
|
|
* truncate_pagecache(), page migration, etc...
|
|
*
|
|
* When need_rmap_locks is false, we use other ways to avoid
|
|
* such races:
|
|
*
|
|
* - During exec() shift_arg_pages(), we use a specially tagged vma
|
|
* which rmap call sites look for using vma_is_temporary_stack().
|
|
*
|
|
* - During mremap(), new_vma is often known to be placed after vma
|
|
* in rmap traversal order. This ensures rmap will always observe
|
|
* either the old pte, or the new pte, or both (the page table locks
|
|
* serialize access to individual ptes, but only rmap traversal
|
|
* order guarantees that we won't miss both the old and new ptes).
|
|
*/
|
|
if (need_rmap_locks)
|
|
take_rmap_locks(vma);
|
|
|
|
/*
|
|
* We don't have to worry about the ordering of src and dst
|
|
* pte locks because exclusive mmap_lock prevents deadlock.
|
|
*/
|
|
old_pte = pte_offset_map_lock(mm, old_pmd, old_addr, &old_ptl);
|
|
if (!old_pte) {
|
|
err = -EAGAIN;
|
|
goto out;
|
|
}
|
|
/*
|
|
* Now new_pte is none, so hpage_collapse_scan_file() path can not find
|
|
* this by traversing file->f_mapping, so there is no concurrency with
|
|
* retract_page_tables(). In addition, we already hold the exclusive
|
|
* mmap_lock, so this new_pte page is stable, so there is no need to get
|
|
* pmdval and do pmd_same() check.
|
|
*/
|
|
new_pte = pte_offset_map_rw_nolock(mm, new_pmd, new_addr, &dummy_pmdval,
|
|
&new_ptl);
|
|
if (!new_pte) {
|
|
pte_unmap_unlock(old_pte, old_ptl);
|
|
err = -EAGAIN;
|
|
goto out;
|
|
}
|
|
if (new_ptl != old_ptl)
|
|
spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
|
|
flush_tlb_batched_pending(vma->vm_mm);
|
|
arch_enter_lazy_mmu_mode();
|
|
|
|
for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
|
|
new_pte++, new_addr += PAGE_SIZE) {
|
|
if (pte_none(ptep_get(old_pte)))
|
|
continue;
|
|
|
|
pte = ptep_get_and_clear(mm, old_addr, old_pte);
|
|
/*
|
|
* If we are remapping a valid PTE, make sure
|
|
* to flush TLB before we drop the PTL for the
|
|
* PTE.
|
|
*
|
|
* NOTE! Both old and new PTL matter: the old one
|
|
* for racing with folio_mkclean(), the new one to
|
|
* make sure the physical page stays valid until
|
|
* the TLB entry for the old mapping has been
|
|
* flushed.
|
|
*/
|
|
if (pte_present(pte))
|
|
force_flush = true;
|
|
pte = move_pte(pte, old_addr, new_addr);
|
|
pte = move_soft_dirty_pte(pte);
|
|
|
|
if (need_clear_uffd_wp && pte_marker_uffd_wp(pte))
|
|
pte_clear(mm, new_addr, new_pte);
|
|
else {
|
|
if (need_clear_uffd_wp) {
|
|
if (pte_present(pte))
|
|
pte = pte_clear_uffd_wp(pte);
|
|
else if (is_swap_pte(pte))
|
|
pte = pte_swp_clear_uffd_wp(pte);
|
|
}
|
|
set_pte_at(mm, new_addr, new_pte, pte);
|
|
}
|
|
}
|
|
|
|
arch_leave_lazy_mmu_mode();
|
|
if (force_flush)
|
|
flush_tlb_range(vma, old_end - len, old_end);
|
|
if (new_ptl != old_ptl)
|
|
spin_unlock(new_ptl);
|
|
pte_unmap(new_pte - 1);
|
|
pte_unmap_unlock(old_pte - 1, old_ptl);
|
|
out:
|
|
if (need_rmap_locks)
|
|
drop_rmap_locks(vma);
|
|
return err;
|
|
}
|
|
|
|
#ifndef arch_supports_page_table_move
|
|
#define arch_supports_page_table_move arch_supports_page_table_move
|
|
static inline bool arch_supports_page_table_move(void)
|
|
{
|
|
return IS_ENABLED(CONFIG_HAVE_MOVE_PMD) ||
|
|
IS_ENABLED(CONFIG_HAVE_MOVE_PUD);
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_HAVE_MOVE_PMD
|
|
static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
|
|
unsigned long new_addr, pmd_t *old_pmd, pmd_t *new_pmd)
|
|
{
|
|
spinlock_t *old_ptl, *new_ptl;
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
bool res = false;
|
|
pmd_t pmd;
|
|
|
|
if (!arch_supports_page_table_move())
|
|
return false;
|
|
/*
|
|
* The destination pmd shouldn't be established, free_pgtables()
|
|
* should have released it.
|
|
*
|
|
* However, there's a case during execve() where we use mremap
|
|
* to move the initial stack, and in that case the target area
|
|
* may overlap the source area (always moving down).
|
|
*
|
|
* If everything is PMD-aligned, that works fine, as moving
|
|
* each pmd down will clear the source pmd. But if we first
|
|
* have a few 4kB-only pages that get moved down, and then
|
|
* hit the "now the rest is PMD-aligned, let's do everything
|
|
* one pmd at a time", we will still have the old (now empty
|
|
* of any 4kB pages, but still there) PMD in the page table
|
|
* tree.
|
|
*
|
|
* Warn on it once - because we really should try to figure
|
|
* out how to do this better - but then say "I won't move
|
|
* this pmd".
|
|
*
|
|
* One alternative might be to just unmap the target pmd at
|
|
* this point, and verify that it really is empty. We'll see.
|
|
*/
|
|
if (WARN_ON_ONCE(!pmd_none(*new_pmd)))
|
|
return false;
|
|
|
|
/* If this pmd belongs to a uffd vma with remap events disabled, we need
|
|
* to ensure that the uffd-wp state is cleared from all pgtables. This
|
|
* means recursing into lower page tables in move_page_tables(), and we
|
|
* can reuse the existing code if we simply treat the entry as "not
|
|
* moved".
|
|
*/
|
|
if (vma_has_uffd_without_event_remap(vma))
|
|
return false;
|
|
|
|
/*
|
|
* We don't have to worry about the ordering of src and dst
|
|
* ptlocks because exclusive mmap_lock prevents deadlock.
|
|
*/
|
|
old_ptl = pmd_lock(vma->vm_mm, old_pmd);
|
|
new_ptl = pmd_lockptr(mm, new_pmd);
|
|
if (new_ptl != old_ptl)
|
|
spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
|
|
|
|
pmd = *old_pmd;
|
|
|
|
/* Racing with collapse? */
|
|
if (unlikely(!pmd_present(pmd) || pmd_leaf(pmd)))
|
|
goto out_unlock;
|
|
/* Clear the pmd */
|
|
pmd_clear(old_pmd);
|
|
res = true;
|
|
|
|
VM_BUG_ON(!pmd_none(*new_pmd));
|
|
|
|
pmd_populate(mm, new_pmd, pmd_pgtable(pmd));
|
|
flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE);
|
|
out_unlock:
|
|
if (new_ptl != old_ptl)
|
|
spin_unlock(new_ptl);
|
|
spin_unlock(old_ptl);
|
|
|
|
return res;
|
|
}
|
|
#else
|
|
static inline bool move_normal_pmd(struct vm_area_struct *vma,
|
|
unsigned long old_addr, unsigned long new_addr, pmd_t *old_pmd,
|
|
pmd_t *new_pmd)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#if CONFIG_PGTABLE_LEVELS > 2 && defined(CONFIG_HAVE_MOVE_PUD)
|
|
static bool move_normal_pud(struct vm_area_struct *vma, unsigned long old_addr,
|
|
unsigned long new_addr, pud_t *old_pud, pud_t *new_pud)
|
|
{
|
|
spinlock_t *old_ptl, *new_ptl;
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
pud_t pud;
|
|
|
|
if (!arch_supports_page_table_move())
|
|
return false;
|
|
/*
|
|
* The destination pud shouldn't be established, free_pgtables()
|
|
* should have released it.
|
|
*/
|
|
if (WARN_ON_ONCE(!pud_none(*new_pud)))
|
|
return false;
|
|
|
|
/* If this pud belongs to a uffd vma with remap events disabled, we need
|
|
* to ensure that the uffd-wp state is cleared from all pgtables. This
|
|
* means recursing into lower page tables in move_page_tables(), and we
|
|
* can reuse the existing code if we simply treat the entry as "not
|
|
* moved".
|
|
*/
|
|
if (vma_has_uffd_without_event_remap(vma))
|
|
return false;
|
|
|
|
/*
|
|
* We don't have to worry about the ordering of src and dst
|
|
* ptlocks because exclusive mmap_lock prevents deadlock.
|
|
*/
|
|
old_ptl = pud_lock(vma->vm_mm, old_pud);
|
|
new_ptl = pud_lockptr(mm, new_pud);
|
|
if (new_ptl != old_ptl)
|
|
spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
|
|
|
|
/* Clear the pud */
|
|
pud = *old_pud;
|
|
pud_clear(old_pud);
|
|
|
|
VM_BUG_ON(!pud_none(*new_pud));
|
|
|
|
pud_populate(mm, new_pud, pud_pgtable(pud));
|
|
flush_tlb_range(vma, old_addr, old_addr + PUD_SIZE);
|
|
if (new_ptl != old_ptl)
|
|
spin_unlock(new_ptl);
|
|
spin_unlock(old_ptl);
|
|
|
|
return true;
|
|
}
|
|
#else
|
|
static inline bool move_normal_pud(struct vm_area_struct *vma,
|
|
unsigned long old_addr, unsigned long new_addr, pud_t *old_pud,
|
|
pud_t *new_pud)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)
|
|
static bool move_huge_pud(struct vm_area_struct *vma, unsigned long old_addr,
|
|
unsigned long new_addr, pud_t *old_pud, pud_t *new_pud)
|
|
{
|
|
spinlock_t *old_ptl, *new_ptl;
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
pud_t pud;
|
|
|
|
/*
|
|
* The destination pud shouldn't be established, free_pgtables()
|
|
* should have released it.
|
|
*/
|
|
if (WARN_ON_ONCE(!pud_none(*new_pud)))
|
|
return false;
|
|
|
|
/*
|
|
* We don't have to worry about the ordering of src and dst
|
|
* ptlocks because exclusive mmap_lock prevents deadlock.
|
|
*/
|
|
old_ptl = pud_lock(vma->vm_mm, old_pud);
|
|
new_ptl = pud_lockptr(mm, new_pud);
|
|
if (new_ptl != old_ptl)
|
|
spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
|
|
|
|
/* Clear the pud */
|
|
pud = *old_pud;
|
|
pud_clear(old_pud);
|
|
|
|
VM_BUG_ON(!pud_none(*new_pud));
|
|
|
|
/* Set the new pud */
|
|
/* mark soft_ditry when we add pud level soft dirty support */
|
|
set_pud_at(mm, new_addr, new_pud, pud);
|
|
flush_pud_tlb_range(vma, old_addr, old_addr + HPAGE_PUD_SIZE);
|
|
if (new_ptl != old_ptl)
|
|
spin_unlock(new_ptl);
|
|
spin_unlock(old_ptl);
|
|
|
|
return true;
|
|
}
|
|
#else
|
|
static bool move_huge_pud(struct vm_area_struct *vma, unsigned long old_addr,
|
|
unsigned long new_addr, pud_t *old_pud, pud_t *new_pud)
|
|
{
|
|
WARN_ON_ONCE(1);
|
|
return false;
|
|
|
|
}
|
|
#endif
|
|
|
|
enum pgt_entry {
|
|
NORMAL_PMD,
|
|
HPAGE_PMD,
|
|
NORMAL_PUD,
|
|
HPAGE_PUD,
|
|
};
|
|
|
|
/*
|
|
* Returns an extent of the corresponding size for the pgt_entry specified if
|
|
* valid. Else returns a smaller extent bounded by the end of the source and
|
|
* destination pgt_entry.
|
|
*/
|
|
static __always_inline unsigned long get_extent(enum pgt_entry entry,
|
|
unsigned long old_addr, unsigned long old_end,
|
|
unsigned long new_addr)
|
|
{
|
|
unsigned long next, extent, mask, size;
|
|
|
|
switch (entry) {
|
|
case HPAGE_PMD:
|
|
case NORMAL_PMD:
|
|
mask = PMD_MASK;
|
|
size = PMD_SIZE;
|
|
break;
|
|
case HPAGE_PUD:
|
|
case NORMAL_PUD:
|
|
mask = PUD_MASK;
|
|
size = PUD_SIZE;
|
|
break;
|
|
default:
|
|
BUILD_BUG();
|
|
break;
|
|
}
|
|
|
|
next = (old_addr + size) & mask;
|
|
/* even if next overflowed, extent below will be ok */
|
|
extent = next - old_addr;
|
|
if (extent > old_end - old_addr)
|
|
extent = old_end - old_addr;
|
|
next = (new_addr + size) & mask;
|
|
if (extent > next - new_addr)
|
|
extent = next - new_addr;
|
|
return extent;
|
|
}
|
|
|
|
/*
|
|
* Attempts to speedup the move by moving entry at the level corresponding to
|
|
* pgt_entry. Returns true if the move was successful, else false.
|
|
*/
|
|
static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma,
|
|
unsigned long old_addr, unsigned long new_addr,
|
|
void *old_entry, void *new_entry, bool need_rmap_locks)
|
|
{
|
|
bool moved = false;
|
|
|
|
/* See comment in move_ptes() */
|
|
if (need_rmap_locks)
|
|
take_rmap_locks(vma);
|
|
|
|
switch (entry) {
|
|
case NORMAL_PMD:
|
|
moved = move_normal_pmd(vma, old_addr, new_addr, old_entry,
|
|
new_entry);
|
|
break;
|
|
case NORMAL_PUD:
|
|
moved = move_normal_pud(vma, old_addr, new_addr, old_entry,
|
|
new_entry);
|
|
break;
|
|
case HPAGE_PMD:
|
|
moved = IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) &&
|
|
move_huge_pmd(vma, old_addr, new_addr, old_entry,
|
|
new_entry);
|
|
break;
|
|
case HPAGE_PUD:
|
|
moved = IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) &&
|
|
move_huge_pud(vma, old_addr, new_addr, old_entry,
|
|
new_entry);
|
|
break;
|
|
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
|
|
if (need_rmap_locks)
|
|
drop_rmap_locks(vma);
|
|
|
|
return moved;
|
|
}
|
|
|
|
/*
|
|
* A helper to check if aligning down is OK. The aligned address should fall
|
|
* on *no mapping*. For the stack moving down, that's a special move within
|
|
* the VMA that is created to span the source and destination of the move,
|
|
* so we make an exception for it.
|
|
*/
|
|
static bool can_align_down(struct vm_area_struct *vma, unsigned long addr_to_align,
|
|
unsigned long mask, bool for_stack)
|
|
{
|
|
unsigned long addr_masked = addr_to_align & mask;
|
|
|
|
/*
|
|
* If @addr_to_align of either source or destination is not the beginning
|
|
* of the corresponding VMA, we can't align down or we will destroy part
|
|
* of the current mapping.
|
|
*/
|
|
if (!for_stack && vma->vm_start != addr_to_align)
|
|
return false;
|
|
|
|
/* In the stack case we explicitly permit in-VMA alignment. */
|
|
if (for_stack && addr_masked >= vma->vm_start)
|
|
return true;
|
|
|
|
/*
|
|
* Make sure the realignment doesn't cause the address to fall on an
|
|
* existing mapping.
|
|
*/
|
|
return find_vma_intersection(vma->vm_mm, addr_masked, vma->vm_start) == NULL;
|
|
}
|
|
|
|
/* Opportunistically realign to specified boundary for faster copy. */
|
|
static void try_realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma,
|
|
unsigned long *new_addr, struct vm_area_struct *new_vma,
|
|
unsigned long mask, bool for_stack)
|
|
{
|
|
/* Skip if the addresses are already aligned. */
|
|
if ((*old_addr & ~mask) == 0)
|
|
return;
|
|
|
|
/* Only realign if the new and old addresses are mutually aligned. */
|
|
if ((*old_addr & ~mask) != (*new_addr & ~mask))
|
|
return;
|
|
|
|
/* Ensure realignment doesn't cause overlap with existing mappings. */
|
|
if (!can_align_down(old_vma, *old_addr, mask, for_stack) ||
|
|
!can_align_down(new_vma, *new_addr, mask, for_stack))
|
|
return;
|
|
|
|
*old_addr = *old_addr & mask;
|
|
*new_addr = *new_addr & mask;
|
|
}
|
|
|
|
unsigned long move_page_tables(struct vm_area_struct *vma,
|
|
unsigned long old_addr, struct vm_area_struct *new_vma,
|
|
unsigned long new_addr, unsigned long len,
|
|
bool need_rmap_locks, bool for_stack)
|
|
{
|
|
unsigned long extent, old_end;
|
|
struct mmu_notifier_range range;
|
|
pmd_t *old_pmd, *new_pmd;
|
|
pud_t *old_pud, *new_pud;
|
|
|
|
if (!len)
|
|
return 0;
|
|
|
|
old_end = old_addr + len;
|
|
|
|
if (is_vm_hugetlb_page(vma))
|
|
return move_hugetlb_page_tables(vma, new_vma, old_addr,
|
|
new_addr, len);
|
|
|
|
/*
|
|
* If possible, realign addresses to PMD boundary for faster copy.
|
|
* Only realign if the mremap copying hits a PMD boundary.
|
|
*/
|
|
if (len >= PMD_SIZE - (old_addr & ~PMD_MASK))
|
|
try_realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK,
|
|
for_stack);
|
|
|
|
flush_cache_range(vma, old_addr, old_end);
|
|
mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma->vm_mm,
|
|
old_addr, old_end);
|
|
mmu_notifier_invalidate_range_start(&range);
|
|
|
|
for (; old_addr < old_end; old_addr += extent, new_addr += extent) {
|
|
cond_resched();
|
|
/*
|
|
* If extent is PUD-sized try to speed up the move by moving at the
|
|
* PUD level if possible.
|
|
*/
|
|
extent = get_extent(NORMAL_PUD, old_addr, old_end, new_addr);
|
|
|
|
old_pud = get_old_pud(vma->vm_mm, old_addr);
|
|
if (!old_pud)
|
|
continue;
|
|
new_pud = alloc_new_pud(vma->vm_mm, vma, new_addr);
|
|
if (!new_pud)
|
|
break;
|
|
if (pud_trans_huge(*old_pud) || pud_devmap(*old_pud)) {
|
|
if (extent == HPAGE_PUD_SIZE) {
|
|
move_pgt_entry(HPAGE_PUD, vma, old_addr, new_addr,
|
|
old_pud, new_pud, need_rmap_locks);
|
|
/* We ignore and continue on error? */
|
|
continue;
|
|
}
|
|
} else if (IS_ENABLED(CONFIG_HAVE_MOVE_PUD) && extent == PUD_SIZE) {
|
|
|
|
if (move_pgt_entry(NORMAL_PUD, vma, old_addr, new_addr,
|
|
old_pud, new_pud, true))
|
|
continue;
|
|
}
|
|
|
|
extent = get_extent(NORMAL_PMD, old_addr, old_end, new_addr);
|
|
old_pmd = get_old_pmd(vma->vm_mm, old_addr);
|
|
if (!old_pmd)
|
|
continue;
|
|
new_pmd = alloc_new_pmd(vma->vm_mm, vma, new_addr);
|
|
if (!new_pmd)
|
|
break;
|
|
again:
|
|
if (is_swap_pmd(*old_pmd) || pmd_trans_huge(*old_pmd) ||
|
|
pmd_devmap(*old_pmd)) {
|
|
if (extent == HPAGE_PMD_SIZE &&
|
|
move_pgt_entry(HPAGE_PMD, vma, old_addr, new_addr,
|
|
old_pmd, new_pmd, need_rmap_locks))
|
|
continue;
|
|
split_huge_pmd(vma, old_pmd, old_addr);
|
|
} else if (IS_ENABLED(CONFIG_HAVE_MOVE_PMD) &&
|
|
extent == PMD_SIZE) {
|
|
/*
|
|
* If the extent is PMD-sized, try to speed the move by
|
|
* moving at the PMD level if possible.
|
|
*/
|
|
if (move_pgt_entry(NORMAL_PMD, vma, old_addr, new_addr,
|
|
old_pmd, new_pmd, true))
|
|
continue;
|
|
}
|
|
if (pmd_none(*old_pmd))
|
|
continue;
|
|
if (pte_alloc(new_vma->vm_mm, new_pmd))
|
|
break;
|
|
if (move_ptes(vma, old_pmd, old_addr, old_addr + extent,
|
|
new_vma, new_pmd, new_addr, need_rmap_locks) < 0)
|
|
goto again;
|
|
}
|
|
|
|
mmu_notifier_invalidate_range_end(&range);
|
|
|
|
/*
|
|
* Prevent negative return values when {old,new}_addr was realigned
|
|
* but we broke out of the above loop for the first PMD itself.
|
|
*/
|
|
if (old_addr < old_end - len)
|
|
return 0;
|
|
|
|
return len + old_addr - old_end; /* how much done */
|
|
}
|
|
|
|
static unsigned long move_vma(struct vm_area_struct *vma,
|
|
unsigned long old_addr, unsigned long old_len,
|
|
unsigned long new_len, unsigned long new_addr,
|
|
bool *locked, unsigned long flags,
|
|
struct vm_userfaultfd_ctx *uf, struct list_head *uf_unmap)
|
|
{
|
|
long to_account = new_len - old_len;
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
struct vm_area_struct *new_vma;
|
|
unsigned long vm_flags = vma->vm_flags;
|
|
unsigned long new_pgoff;
|
|
unsigned long moved_len;
|
|
bool account_start = false;
|
|
bool account_end = false;
|
|
unsigned long hiwater_vm;
|
|
int err = 0;
|
|
bool need_rmap_locks;
|
|
struct vma_iterator vmi;
|
|
|
|
/*
|
|
* We'd prefer to avoid failure later on in do_munmap:
|
|
* which may split one vma into three before unmapping.
|
|
*/
|
|
if (mm->map_count >= sysctl_max_map_count - 3)
|
|
return -ENOMEM;
|
|
|
|
if (unlikely(flags & MREMAP_DONTUNMAP))
|
|
to_account = new_len;
|
|
|
|
if (vma->vm_ops && vma->vm_ops->may_split) {
|
|
if (vma->vm_start != old_addr)
|
|
err = vma->vm_ops->may_split(vma, old_addr);
|
|
if (!err && vma->vm_end != old_addr + old_len)
|
|
err = vma->vm_ops->may_split(vma, old_addr + old_len);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* Advise KSM to break any KSM pages in the area to be moved:
|
|
* it would be confusing if they were to turn up at the new
|
|
* location, where they happen to coincide with different KSM
|
|
* pages recently unmapped. But leave vma->vm_flags as it was,
|
|
* so KSM can come around to merge on vma and new_vma afterwards.
|
|
*/
|
|
err = ksm_madvise(vma, old_addr, old_addr + old_len,
|
|
MADV_UNMERGEABLE, &vm_flags);
|
|
if (err)
|
|
return err;
|
|
|
|
if (vm_flags & VM_ACCOUNT) {
|
|
if (security_vm_enough_memory_mm(mm, to_account >> PAGE_SHIFT))
|
|
return -ENOMEM;
|
|
}
|
|
|
|
vma_start_write(vma);
|
|
new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT);
|
|
new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff,
|
|
&need_rmap_locks);
|
|
if (!new_vma) {
|
|
if (vm_flags & VM_ACCOUNT)
|
|
vm_unacct_memory(to_account >> PAGE_SHIFT);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
moved_len = move_page_tables(vma, old_addr, new_vma, new_addr, old_len,
|
|
need_rmap_locks, false);
|
|
if (moved_len < old_len) {
|
|
err = -ENOMEM;
|
|
} else if (vma->vm_ops && vma->vm_ops->mremap) {
|
|
err = vma->vm_ops->mremap(new_vma);
|
|
}
|
|
|
|
if (unlikely(err)) {
|
|
/*
|
|
* On error, move entries back from new area to old,
|
|
* which will succeed since page tables still there,
|
|
* and then proceed to unmap new area instead of old.
|
|
*/
|
|
move_page_tables(new_vma, new_addr, vma, old_addr, moved_len,
|
|
true, false);
|
|
vma = new_vma;
|
|
old_len = new_len;
|
|
old_addr = new_addr;
|
|
new_addr = err;
|
|
} else {
|
|
mremap_userfaultfd_prep(new_vma, uf);
|
|
}
|
|
|
|
if (is_vm_hugetlb_page(vma)) {
|
|
clear_vma_resv_huge_pages(vma);
|
|
}
|
|
|
|
/* Conceal VM_ACCOUNT so old reservation is not undone */
|
|
if (vm_flags & VM_ACCOUNT && !(flags & MREMAP_DONTUNMAP)) {
|
|
vm_flags_clear(vma, VM_ACCOUNT);
|
|
if (vma->vm_start < old_addr)
|
|
account_start = true;
|
|
if (vma->vm_end > old_addr + old_len)
|
|
account_end = true;
|
|
}
|
|
|
|
/*
|
|
* If we failed to move page tables we still do total_vm increment
|
|
* since do_munmap() will decrement it by old_len == new_len.
|
|
*
|
|
* Since total_vm is about to be raised artificially high for a
|
|
* moment, we need to restore high watermark afterwards: if stats
|
|
* are taken meanwhile, total_vm and hiwater_vm appear too high.
|
|
* If this were a serious issue, we'd add a flag to do_munmap().
|
|
*/
|
|
hiwater_vm = mm->hiwater_vm;
|
|
vm_stat_account(mm, vma->vm_flags, new_len >> PAGE_SHIFT);
|
|
|
|
/* Tell pfnmap has moved from this vma */
|
|
if (unlikely(vma->vm_flags & VM_PFNMAP))
|
|
untrack_pfn_clear(vma);
|
|
|
|
if (unlikely(!err && (flags & MREMAP_DONTUNMAP))) {
|
|
/* We always clear VM_LOCKED[ONFAULT] on the old vma */
|
|
vm_flags_clear(vma, VM_LOCKED_MASK);
|
|
|
|
/*
|
|
* anon_vma links of the old vma is no longer needed after its page
|
|
* table has been moved.
|
|
*/
|
|
if (new_vma != vma && vma->vm_start == old_addr &&
|
|
vma->vm_end == (old_addr + old_len))
|
|
unlink_anon_vmas(vma);
|
|
|
|
/* Because we won't unmap we don't need to touch locked_vm */
|
|
return new_addr;
|
|
}
|
|
|
|
vma_iter_init(&vmi, mm, old_addr);
|
|
if (do_vmi_munmap(&vmi, mm, old_addr, old_len, uf_unmap, false) < 0) {
|
|
/* OOM: unable to split vma, just get accounts right */
|
|
if (vm_flags & VM_ACCOUNT && !(flags & MREMAP_DONTUNMAP))
|
|
vm_acct_memory(old_len >> PAGE_SHIFT);
|
|
account_start = account_end = false;
|
|
}
|
|
|
|
if (vm_flags & VM_LOCKED) {
|
|
mm->locked_vm += new_len >> PAGE_SHIFT;
|
|
*locked = true;
|
|
}
|
|
|
|
mm->hiwater_vm = hiwater_vm;
|
|
|
|
/* Restore VM_ACCOUNT if one or two pieces of vma left */
|
|
if (account_start) {
|
|
vma = vma_prev(&vmi);
|
|
vm_flags_set(vma, VM_ACCOUNT);
|
|
}
|
|
|
|
if (account_end) {
|
|
vma = vma_next(&vmi);
|
|
vm_flags_set(vma, VM_ACCOUNT);
|
|
}
|
|
|
|
return new_addr;
|
|
}
|
|
|
|
static struct vm_area_struct *vma_to_resize(unsigned long addr,
|
|
unsigned long old_len, unsigned long new_len, unsigned long flags)
|
|
{
|
|
struct mm_struct *mm = current->mm;
|
|
struct vm_area_struct *vma;
|
|
unsigned long pgoff;
|
|
|
|
vma = vma_lookup(mm, addr);
|
|
if (!vma)
|
|
return ERR_PTR(-EFAULT);
|
|
|
|
/*
|
|
* !old_len is a special case where an attempt is made to 'duplicate'
|
|
* a mapping. This makes no sense for private mappings as it will
|
|
* instead create a fresh/new mapping unrelated to the original. This
|
|
* is contrary to the basic idea of mremap which creates new mappings
|
|
* based on the original. There are no known use cases for this
|
|
* behavior. As a result, fail such attempts.
|
|
*/
|
|
if (!old_len && !(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) {
|
|
pr_warn_once("%s (%d): attempted to duplicate a private mapping with mremap. This is not supported.\n", current->comm, current->pid);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
if ((flags & MREMAP_DONTUNMAP) &&
|
|
(vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)))
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
/* We can't remap across vm area boundaries */
|
|
if (old_len > vma->vm_end - addr)
|
|
return ERR_PTR(-EFAULT);
|
|
|
|
if (new_len == old_len)
|
|
return vma;
|
|
|
|
/* Need to be careful about a growing mapping */
|
|
pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
|
|
pgoff += vma->vm_pgoff;
|
|
if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
|
|
return ERR_PTR(-EFAULT);
|
|
|
|
if (!mlock_future_ok(mm, vma->vm_flags, new_len - old_len))
|
|
return ERR_PTR(-EAGAIN);
|
|
|
|
if (!may_expand_vm(mm, vma->vm_flags,
|
|
(new_len - old_len) >> PAGE_SHIFT))
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
return vma;
|
|
}
|
|
|
|
static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
|
|
unsigned long new_addr, unsigned long new_len, bool *locked,
|
|
unsigned long flags, struct vm_userfaultfd_ctx *uf,
|
|
struct list_head *uf_unmap_early,
|
|
struct list_head *uf_unmap)
|
|
{
|
|
struct mm_struct *mm = current->mm;
|
|
struct vm_area_struct *vma;
|
|
unsigned long ret = -EINVAL;
|
|
unsigned long map_flags = 0;
|
|
|
|
if (offset_in_page(new_addr))
|
|
goto out;
|
|
|
|
if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
|
|
goto out;
|
|
|
|
/* Ensure the old/new locations do not overlap */
|
|
if (addr + old_len > new_addr && new_addr + new_len > addr)
|
|
goto out;
|
|
|
|
/*
|
|
* move_vma() need us to stay 4 maps below the threshold, otherwise
|
|
* it will bail out at the very beginning.
|
|
* That is a problem if we have already unmaped the regions here
|
|
* (new_addr, and old_addr), because userspace will not know the
|
|
* state of the vma's after it gets -ENOMEM.
|
|
* So, to avoid such scenario we can pre-compute if the whole
|
|
* operation has high chances to success map-wise.
|
|
* Worst-scenario case is when both vma's (new_addr and old_addr) get
|
|
* split in 3 before unmapping it.
|
|
* That means 2 more maps (1 for each) to the ones we already hold.
|
|
* Check whether current map count plus 2 still leads us to 4 maps below
|
|
* the threshold, otherwise return -ENOMEM here to be more safe.
|
|
*/
|
|
if ((mm->map_count + 2) >= sysctl_max_map_count - 3)
|
|
return -ENOMEM;
|
|
|
|
if (flags & MREMAP_FIXED) {
|
|
/*
|
|
* In mremap_to().
|
|
* VMA is moved to dst address, and munmap dst first.
|
|
* do_munmap will check if dst is sealed.
|
|
*/
|
|
ret = do_munmap(mm, new_addr, new_len, uf_unmap_early);
|
|
if (ret)
|
|
goto out;
|
|
}
|
|
|
|
if (old_len > new_len) {
|
|
ret = do_munmap(mm, addr+new_len, old_len - new_len, uf_unmap);
|
|
if (ret)
|
|
goto out;
|
|
old_len = new_len;
|
|
}
|
|
|
|
vma = vma_to_resize(addr, old_len, new_len, flags);
|
|
if (IS_ERR(vma)) {
|
|
ret = PTR_ERR(vma);
|
|
goto out;
|
|
}
|
|
|
|
/* MREMAP_DONTUNMAP expands by old_len since old_len == new_len */
|
|
if (flags & MREMAP_DONTUNMAP &&
|
|
!may_expand_vm(mm, vma->vm_flags, old_len >> PAGE_SHIFT)) {
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
if (flags & MREMAP_FIXED)
|
|
map_flags |= MAP_FIXED;
|
|
|
|
if (vma->vm_flags & VM_MAYSHARE)
|
|
map_flags |= MAP_SHARED;
|
|
|
|
ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +
|
|
((addr - vma->vm_start) >> PAGE_SHIFT),
|
|
map_flags);
|
|
if (IS_ERR_VALUE(ret))
|
|
goto out;
|
|
|
|
/* We got a new mapping */
|
|
if (!(flags & MREMAP_FIXED))
|
|
new_addr = ret;
|
|
|
|
ret = move_vma(vma, addr, old_len, new_len, new_addr, locked, flags, uf,
|
|
uf_unmap);
|
|
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
|
|
{
|
|
unsigned long end = vma->vm_end + delta;
|
|
|
|
if (end < vma->vm_end) /* overflow */
|
|
return 0;
|
|
if (find_vma_intersection(vma->vm_mm, vma->vm_end, end))
|
|
return 0;
|
|
if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start,
|
|
0, MAP_FIXED) & ~PAGE_MASK)
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Expand (or shrink) an existing mapping, potentially moving it at the
|
|
* same time (controlled by the MREMAP_MAYMOVE flag and available VM space)
|
|
*
|
|
* MREMAP_FIXED option added 5-Dec-1999 by Benjamin LaHaise
|
|
* This option implies MREMAP_MAYMOVE.
|
|
*/
|
|
SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
|
|
unsigned long, new_len, unsigned long, flags,
|
|
unsigned long, new_addr)
|
|
{
|
|
struct mm_struct *mm = current->mm;
|
|
struct vm_area_struct *vma;
|
|
unsigned long ret = -EINVAL;
|
|
bool locked = false;
|
|
struct vm_userfaultfd_ctx uf = NULL_VM_UFFD_CTX;
|
|
LIST_HEAD(uf_unmap_early);
|
|
LIST_HEAD(uf_unmap);
|
|
|
|
/*
|
|
* There is a deliberate asymmetry here: we strip the pointer tag
|
|
* from the old address but leave the new address alone. This is
|
|
* for consistency with mmap(), where we prevent the creation of
|
|
* aliasing mappings in userspace by leaving the tag bits of the
|
|
* mapping address intact. A non-zero tag will cause the subsequent
|
|
* range checks to reject the address as invalid.
|
|
*
|
|
* See Documentation/arch/arm64/tagged-address-abi.rst for more
|
|
* information.
|
|
*/
|
|
addr = untagged_addr(addr);
|
|
|
|
if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP))
|
|
return ret;
|
|
|
|
if (flags & MREMAP_FIXED && !(flags & MREMAP_MAYMOVE))
|
|
return ret;
|
|
|
|
/*
|
|
* MREMAP_DONTUNMAP is always a move and it does not allow resizing
|
|
* in the process.
|
|
*/
|
|
if (flags & MREMAP_DONTUNMAP &&
|
|
(!(flags & MREMAP_MAYMOVE) || old_len != new_len))
|
|
return ret;
|
|
|
|
|
|
if (__offset_in_page_log(addr))
|
|
return ret;
|
|
|
|
old_len = __PAGE_ALIGN(old_len);
|
|
new_len = __PAGE_ALIGN(new_len);
|
|
|
|
/*
|
|
* We allow a zero old-len as a special case
|
|
* for DOS-emu "duplicate shm area" thing. But
|
|
* a zero new-len is nonsensical.
|
|
*/
|
|
if (!new_len)
|
|
return ret;
|
|
|
|
if (mmap_write_lock_killable(current->mm))
|
|
return -EINTR;
|
|
vma = vma_lookup(mm, addr);
|
|
if (!vma) {
|
|
ret = -EFAULT;
|
|
goto out;
|
|
}
|
|
|
|
/* Don't allow remapping vmas when they have already been sealed */
|
|
if (!can_modify_vma(vma)) {
|
|
ret = -EPERM;
|
|
goto out;
|
|
}
|
|
|
|
if (is_vm_hugetlb_page(vma)) {
|
|
struct hstate *h __maybe_unused = hstate_vma(vma);
|
|
|
|
old_len = ALIGN(old_len, huge_page_size(h));
|
|
new_len = ALIGN(new_len, huge_page_size(h));
|
|
|
|
/* addrs must be huge page aligned */
|
|
if (addr & ~huge_page_mask(h))
|
|
goto out;
|
|
if (new_addr & ~huge_page_mask(h))
|
|
goto out;
|
|
|
|
/*
|
|
* Don't allow remap expansion, because the underlying hugetlb
|
|
* reservation is not yet capable to handle split reservation.
|
|
*/
|
|
if (new_len > old_len)
|
|
goto out;
|
|
}
|
|
|
|
if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) {
|
|
ret = mremap_to(addr, old_len, new_addr, new_len,
|
|
&locked, flags, &uf, &uf_unmap_early,
|
|
&uf_unmap);
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Always allow a shrinking remap: that just unmaps
|
|
* the unnecessary pages..
|
|
* do_vmi_munmap does all the needed commit accounting, and
|
|
* unlocks the mmap_lock if so directed.
|
|
*/
|
|
if (old_len >= new_len) {
|
|
VMA_ITERATOR(vmi, mm, addr + new_len);
|
|
|
|
if (old_len == new_len) {
|
|
ret = addr;
|
|
goto out;
|
|
}
|
|
|
|
ret = do_vmi_munmap(&vmi, mm, addr + new_len, old_len - new_len,
|
|
&uf_unmap, true);
|
|
if (ret)
|
|
goto out;
|
|
|
|
ret = addr;
|
|
goto out_unlocked;
|
|
}
|
|
|
|
/*
|
|
* Ok, we need to grow..
|
|
*/
|
|
vma = vma_to_resize(addr, old_len, new_len, flags);
|
|
if (IS_ERR(vma)) {
|
|
ret = PTR_ERR(vma);
|
|
goto out;
|
|
}
|
|
|
|
/* old_len exactly to the end of the area..
|
|
*/
|
|
if (old_len == vma->vm_end - addr) {
|
|
unsigned long delta = new_len - old_len;
|
|
|
|
/* can we just expand the current mapping? */
|
|
if (vma_expandable(vma, delta)) {
|
|
long pages = delta >> PAGE_SHIFT;
|
|
VMA_ITERATOR(vmi, mm, vma->vm_end);
|
|
long charged = 0;
|
|
|
|
if (vma->vm_flags & VM_ACCOUNT) {
|
|
if (security_vm_enough_memory_mm(mm, pages)) {
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
charged = pages;
|
|
}
|
|
|
|
/*
|
|
* Function vma_merge_extend() is called on the
|
|
* extension we are adding to the already existing vma,
|
|
* vma_merge_extend() will merge this extension with the
|
|
* already existing vma (expand operation itself) and
|
|
* possibly also with the next vma if it becomes
|
|
* adjacent to the expanded vma and otherwise
|
|
* compatible.
|
|
*/
|
|
vma = vma_merge_extend(&vmi, vma, delta);
|
|
if (!vma) {
|
|
vm_unacct_memory(charged);
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
vm_stat_account(mm, vma->vm_flags, pages);
|
|
if (vma->vm_flags & VM_LOCKED) {
|
|
mm->locked_vm += pages;
|
|
locked = true;
|
|
new_addr = addr;
|
|
}
|
|
ret = addr;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* We weren't able to just expand or shrink the area,
|
|
* we need to create a new one and move it..
|
|
*/
|
|
ret = -ENOMEM;
|
|
if (flags & MREMAP_MAYMOVE) {
|
|
unsigned long map_flags = 0;
|
|
if (vma->vm_flags & VM_MAYSHARE)
|
|
map_flags |= MAP_SHARED;
|
|
|
|
new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
|
|
vma->vm_pgoff +
|
|
((addr - vma->vm_start) >> PAGE_SHIFT),
|
|
map_flags);
|
|
if (IS_ERR_VALUE(new_addr)) {
|
|
ret = new_addr;
|
|
goto out;
|
|
}
|
|
|
|
ret = move_vma(vma, addr, old_len, new_len, new_addr,
|
|
&locked, flags, &uf, &uf_unmap);
|
|
}
|
|
out:
|
|
if (offset_in_page(ret))
|
|
locked = false;
|
|
mmap_write_unlock(current->mm);
|
|
if (locked && new_len > old_len)
|
|
mm_populate(new_addr + old_len, new_len - old_len);
|
|
out_unlocked:
|
|
userfaultfd_unmap_complete(mm, &uf_unmap_early);
|
|
mremap_userfaultfd_complete(&uf, addr, ret, old_len);
|
|
userfaultfd_unmap_complete(mm, &uf_unmap);
|
|
return ret;
|
|
}
|