GKI (arm64) relevant 69 out of 278 changes, affecting 88 files +585/-2900b603e7759tracing: Add __print_dynamic_array() helper [3 files, +15/-1]0312735402tracing: Verify event formats that have "%*p.." [2 files, +13/-2]1c9798bf81mm/vmscan: don't try to reclaim hwpoison folio [1 file, +7/-0]db3b3964afPM: EM: use kfree_rcu() to simplify the code [1 file, +1/-9]9d5752b853PM: EM: Address RCU-related sparse warnings [2 files, +26/-25]3e12e8c273block: remove the write_hint field from struct request [4 files, +13/-12]ed7535b141block: remove the ioprio field from struct request [4 files, +11/-15]2afa5ea7c4block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone [1 file, +1/-0]46d3575209PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends [1 file, +6/-12]35ba7b2d4dPCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads [2 files, +5/-0]16c8aa5de1dma/contiguous: avoid warning about unused size_bytes [1 file, +1/-2]7ccfadfb25cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() [1 file, +8/-2]28fbd7b13bcpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() [1 file, +10/-3]7d002f5914scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort() [1 file, +5/-7]5d92e582d1cgroup/cpuset-v1: Add missing support for cpuset_v2_mode [1 file, +29/-0]29daa63f2cscsi: core: Clear flags for scsi_cmnd that did not complete [1 file, +5/-1]eeab661803scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer() [1 file, +2/-0]41143e7105net: phy: leds: fix memory leak [1 file, +13/-10]0ceef62a32tipc: fix NULL pointer dereference in tipc_mon_reinit_self() [1 file, +2/-1]a61afd5482fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount() [1 file, +36/-33]7f24ea6a46block: never reduce ra_pages in blk_apply_bdi_limits [1 file, +7/-1]3decda1a3csplice: remove duplicate noinline from pipe_clear_nowait [1 file, +1/-1]30c0d6e778virtio_console: fix missing byte order handling for cols and rows [1 file, +4/-3]c2a6b4d78cnet: selftests: initialize TCP header and skb payload with zero [1 file, +13/-5]3939d6f29dirqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode() [1 file, +1/-1]7a8a6b627fio_uring: fix 'sync' handling of io_fallback_tw() [1 file, +7/-6]1f439fe4d8scsi: Improve CDL control [1 file, +24/-12]3670dee376char: misc: register chrdev region with all possible minors [1 file, +1/-1]ea0d806b94USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe [2 files, +7/-0]1777714865xhci: Limit time spent with xHC interrupts disabled during bus resume [3 files, +20/-16]bce3055b08usb: xhci: Fix invalid pointer dereference in Etron workaround [1 file, +1/-1]52a7c9d930usb: dwc3: gadget: check that event count does not exceed event buffer length [1 file, +6/-0]9924ee1bcdusb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive [1 file, +3/-0]d85b7af3bdusb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive [1 file, +3/-0]3e52ae347eUSB: VLI disk crashes if LPM is used [1 file, +3/-0]0486de3c1bcrypto: null - Use spin lock instead of mutex [1 file, +26/-13]7758e308aebpf: Fix kmemleak warning for percpu hashmap [1 file, +3/-3]c5c833f637bpf: Fix deadlock between rcu_tasks_trace and event_mutex. [1 file, +4/-3]4139072087clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() [1 file, +4/-0]4131411f42bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage [1 file, +6/-5]b817d2bfd6bpf: Reject attaching fexit/fmod_ret to __noreturn functions [1 file, +32/-0]2ecae00138usb: dwc3: gadget: Refactor loop to avoid NULL endpoints [1 file, +18/-4]cbfa55bda1usb: xhci: Complete 'error mid TD' transfers when handling Missed Service [1 file, +5/-1]16a7a8e6c4usb: xhci: Fix isochronous Ring Underrun/Overrun event handling [1 file, +14/-6]635be13606xhci: Handle spurious events on Etron host isoc enpoints [2 files, +27/-13]9ff59cb815usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running [1 file, +7/-4]0485bdf88fobjtool, panic: Disable SMAP in __stack_chk_fail() [2 files, +10/-1]c548f956889p/net: fix improper handling of bogus negative read/write replies [1 file, +16/-14]18296b59519p/trans_fd: mark concurrent read and writes to p9_conn->err [1 file, +10/-7]3568fd9e44io_uring: always do atomic put from iowq [2 files, +8/-1]90dc6c1e3bperf/core: Fix WARN_ON(!ctx) in __free_event() for partial init [1 file, +3/-3]24ede35eb2nvme: requeue namespace scan on missed AENs [1 file, +4/-0]b9c89c97d7nvme: re-read ANA log page after ns scan completes [1 file, +5/-0]ee5521176anvme: multipath: fix return value of nvme_available_path [1 file, +1/-1]5e58b93a12gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment [1 file, +3/-3]9f8eeac3a6timekeeping: Add a lockdep override in tick_freeze() [1 file, +22/-0]b14d986413iommu: Clear iommu-dma ops on cleanup [1 file, +3/-0]b626bc3c1dext4: make block validity check resistent to sb bh corruption [2 files, +6/-6]2ef6eea2efnetfs: Only create /proc/fs/netfs with CONFIG_PROC_FS [1 file, +4/-0]d53b2d49a8iomap: skip unnecessary ifs_block_is_uptodate check [1 file, +1/-1]bfc66c4c28Revert "drivers: core: synchronize really_probe() and dev_uevent()" [1 file, +0/-3]de7c24febdusb: typec: class: Fix NULL pointer access [2 files, +14/-2]45314999f9ext4: goto right label 'out_mmap_sem' in ext4_setattr() [1 file, +1/-1]40966fc993usb: typec: class: Invalidate USB device pointers on partner unregistration [1 file, +6/-2]4833d0a92biommu: Handle race with default domain setup [1 file, +5/-0]1042d22942nvme: fixup scan failure for non-ANA multipath controllers [1 file, +1/-1]1b7647efadusb: xhci: Fix Short Packet handling rework ignoring errors [1 file, +1/-1]ab5281d21eusb: typec: class: Unlocked on error in typec_register_partner() [1 file, +1/-0]6b9ebcbd31mq-deadline: don't call req_get_ioprio from the I/O completion handler [1 file, +4/-9] Changes in 6.12.26 module: sign with sha512 instead of sha1 by default tracing: Add __print_dynamic_array() helper tracing: Verify event formats that have "%*p.." mm/vmscan: don't try to reclaim hwpoison folio soc: qcom: ice: introduce devm_of_qcom_ice_get mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get PM: EM: use kfree_rcu() to simplify the code PM: EM: Address RCU-related sparse warnings media: i2c: imx214: Use subdev active state media: i2c: imx214: Simplify with dev_err_probe() media: i2c: imx214: Convert to CCI register access helpers media: i2c: imx214: Replace register addresses with macros media: i2c: imx214: Check number of lanes from device tree media: i2c: imx214: Fix link frequency validation media: ov08x40: Move ov08x40_identify_module() function up media: ov08x40: Add missing ov08x40_identify_module() call on stream-start block: remove the write_hint field from struct request block: remove the ioprio field from struct request block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone net: dsa: mv88e6xxx: fix VTU methods for 6320 family iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check iio: adc: ad7768-1: Fix conversion result sign arm64: dts: ti: Refactor J784s4 SoC files to a common file arm64: dts: ti: k3-j784s4-j742s2-main-common: Fix serdes_ln_ctrl reg-masks of: resolver: Simplify of_resolve_phandles() using __free() of: resolver: Fix device node refcount leakage in of_resolve_phandles() scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads accel/ivpu: Add auto selection logic for job scheduler accel/ivpu: Fix the NPU's DPU frequency calculation ksmbd: use __GFP_RETRY_MAYFAIL ksmbd: add netdev-up/down event debug print ksmbd: browse interfaces list on FSCTL_QUERY_INTERFACE_INFO IOCTL ksmbd: fix use-after-free in __smb2_lease_break_noti() scsi: ufs: exynos: Remove empty drv_init method scsi: ufs: exynos: Remove superfluous function parameter scsi: ufs: exynos: Add gs101_ufs_drv_init() hook and enable WriteBooster scsi: ufs: exynos: Move UFS shareability value to drvdata scsi: ufs: exynos: Disable iocc if dma-coherent property isn't set net/niu: Niu requires MSIX ENTRY_DATA fields touch before entry reads drm/xe/bmg: Add one additional PCI ID drm/amd/display: Fix unnecessary cast warnings from checkpatch drm/amd/display/dml2: use vzalloc rather than kzalloc lib/Kconfig.ubsan: Remove 'default UBSAN' from UBSAN_INTEGER_WRAP ceph: Fix incorrect flush end position calculation cpufreq: sun50i: prevent out-of-bounds access dma/contiguous: avoid warning about unused size_bytes cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate() cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort() cpufreq: cppc: Fix invalid return value in .get() callback cpufreq: Do not enable by default during compile testing cpufreq: fix compile-test defaults btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range() btrfs: zoned: return EIO on RAID1 block group write pointer mismatch cgroup/cpuset-v1: Add missing support for cpuset_v2_mode vhost-scsi: Add better resource allocation failure handling vhost-scsi: Fix vhost_scsi_send_bad_target() vhost-scsi: Fix vhost_scsi_send_status() net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table() net/mlx5: Move ttc allocation after switch case to prevent leaks scsi: core: Clear flags for scsi_cmnd that did not complete scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer() net: lwtunnel: disable BHs when required net: phy: leds: fix memory leak tipc: fix NULL pointer dereference in tipc_mon_reinit_self() net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount() net_sched: hfsc: Fix a UAF vulnerability in class handling net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too net: dsa: mt7530: sync driver-specific behavior of MT7531 variants pds_core: Prevent possible adminq overflow/stuck condition pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result pds_core: Remove unnecessary check in pds_client_adminq_cmd() pds_core: make wait_context part of q_info block: never reduce ra_pages in blk_apply_bdi_limits iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE riscv: Replace function-like macro by static inline function riscv: uprobes: Add missing fence.i after building the XOL buffer splice: remove duplicate noinline from pipe_clear_nowait bpf: Add namespace to BPF internal symbols perf/x86: Fix non-sampling (counting) events on certain x86 platforms LoongArch: Select ARCH_USE_MEMTEST LoongArch: Make regs_irqs_disabled() more clear LoongArch: Make do_xyz() exception handlers more robust KVM: SVM: Disable AVIC on SNP-enabled system without HvInUseWrAllowed feature netfilter: fib: avoid lookup if socket is available virtio_console: fix missing byte order handling for cols and rows sched_ext: Use kvzalloc for large exit_dump allocation crypto: atmel-sha204a - Set hwrng quality to lowest possible xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() net: selftests: initialize TCP header and skb payload with zero net: phy: microchip: force IRQ polling mode for lan88xx scsi: mpi3mr: Fix pending I/O counter rust: firmware: Use `ffi::c_char` type in `FwFunc` drm: panel: jd9365da: fix reset signal polarity in unprepare drm/amd/display: Fix gpu reset in multidisplay config drm/amd/display: Force full update in gpu reset x86/insn: Fix CTEST instruction decoding irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode() LoongArch: Handle fp, lsx, lasx and lbt assembly symbols LoongArch: Return NULL from huge_pte_offset() for invalid PMD LoongArch: Remove a bogus reference to ZONE_DMA LoongArch: KVM: Fully clear some CSRs when VM reboot LoongArch: KVM: Fix PMU pass-through issue if VM exits to host finally io_uring: fix 'sync' handling of io_fallback_tw() KVM: SVM: Allocate IR data using atomic allocation cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports mcb: fix a double free bug in chameleon_parse_gdd() ata: libata-scsi: Improve CDL control ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type ata: libata-scsi: Fix ata_msense_control_ata_feature() USB: storage: quirk for ADATA Portable HDD CH94 scsi: Improve CDL control mei: me: add panther lake H DID mei: vsc: Fix fortify-panic caused by invalid counted_by() use KVM: x86: Explicitly treat routing entry type changes as changes KVM: x86: Reset IRTE to host control if *new* route isn't postable KVM: x86: Take irqfds.lock when adding/deleting IRQ bypass producer char: misc: register chrdev region with all possible minors misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack firmware: stratix10-svc: Add of_platform_default_populate() tty: Require CAP_SYS_ADMIN for all usages of TIOCL_SELMOUSEREPORT serial: msm: Configure correct working mode before starting earlycon serial: sifive: lock port in startup()/shutdown() callbacks USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe USB: serial: option: add Sierra Wireless EM9291 USB: serial: simple: add OWON HDS200 series oscilloscope support xhci: Limit time spent with xHC interrupts disabled during bus resume usb: xhci: Fix invalid pointer dereference in Etron workaround usb: cdns3: Fix deadlock when using NCM gadget usb: chipidea: ci_hdrc_imx: fix usbmisc handling usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02) usb: dwc3: gadget: check that event count does not exceed event buffer length usb: dwc3: xilinx: Prevent spike in reset signal usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive USB: VLI disk crashes if LPM is used USB: wdm: handle IO errors in wdm_wwan_port_start USB: wdm: close race between wdm_open and wdm_wwan_port_stop USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context USB: wdm: add annotation selftests/bpf: Fix stdout race condition in traffic monitor pinctrl: renesas: rza2: Fix potential NULL pointer dereference pinctrl: mcp23s08: Get rid of spurious level interrupts MIPS: cm: Detect CM quirks from device tree crypto: ccp - Add support for PCI device 0x1134 crypto: lib/Kconfig - Fix lib built-in failure when arch is modular crypto: null - Use spin lock instead of mutex bpf: Fix kmemleak warning for percpu hashmap bpf: Fix deadlock between rcu_tasks_trace and event_mutex. clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() parisc: PDT: Fix missing prototype warning s390/sclp: Add check for get_zeroed_page() s390/tty: Fix a potential memory leak bug bpf: bpftool: Setting error code in do_loader() bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage bpf: Reject attaching fexit/fmod_ret to __noreturn functions mailbox: pcc: Fix the possible race in updation of chan_in_use flag mailbox: pcc: Always clear the platform ack interrupt first usb: host: max3421-hcd: Add missing spi_device_id table fs/ntfs3: Keep write operations atomic fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size usb: dwc3: gadget: Refactor loop to avoid NULL endpoints usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield sound/virtio: Fix cancel_sync warnings on uninitialized work_structs usb: xhci: Complete 'error mid TD' transfers when handling Missed Service usb: xhci: Fix isochronous Ring Underrun/Overrun event handling xhci: Handle spurious events on Etron host isoc enpoints i3c: master: svc: Add support for Nuvoton npcm845 i3c dmaengine: dmatest: Fix dmatest waiting less when interrupted usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func thunderbolt: Scan retimers after device router has been enumerated um: work around sched_yield not yielding in time-travel mode objtool: Silence more KCOV warnings objtool, panic: Disable SMAP in __stack_chk_fail() objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler() objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc() objtool, lkdtm: Obfuscate the do_nothing() pointer qibfs: fix _another_ leak ntb: reduce stack usage in idt_scan_mws ntb_hw_amd: Add NTB PCI ID for new gen CPU 9p/net: fix improper handling of bogus negative read/write replies 9p/trans_fd: mark concurrent read and writes to p9_conn->err rtc: pcf85063: do a SW reset if POR failed io_uring: always do atomic put from iowq kbuild: add dependency from vmlinux to sorttable sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP KVM: s390: Don't use %pK through tracepoints KVM: s390: Don't use %pK through debug printing cgroup/cpuset: Don't allow creation of local partition over a remote one selftests: ublk: fix test_stripe_04 perf/core: Fix WARN_ON(!ctx) in __free_event() for partial init xen: Change xen-acpi-processor dom0 dependency nvme: requeue namespace scan on missed AENs ACPI: EC: Set ec_no_wakeup for Lenovo Go S ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls drm/amdgpu: Increase KIQ invalidate_tlbs timeout drm/xe/xe3lpg: Apply Wa_14022293748, Wa_22019794406 nvme: re-read ANA log page after ns scan completes nvme: multipath: fix return value of nvme_available_path objtool: Stop UNRET validation on UD2 gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment x86/xen: disable CPU idle and frequency drivers for PVH dom0 selftests/mincore: Allow read-ahead pages to reach the end of the file x86/bugs: Use SBPB in write_ibpb() if applicable x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline x86/bugs: Don't fill RSB on context switch with eIBRS nvmet-fc: take tgtport reference only once nvmet-fc: put ref when assoc->del_work is already scheduled cifs: Fix encoding of SMB1 Session Setup Kerberos Request in non-UNICODE mode timekeeping: Add a lockdep override in tick_freeze() cifs: Fix querying of WSL CHR and BLK reparse points over SMB1 iommu: Clear iommu-dma ops on cleanup ext4: make block validity check resistent to sb bh corruption scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init() scsi: ufs: exynos: Enable PRDT pre-fetching with UFSHCD_CAP_CRYPTO scsi: ufs: exynos: Move phy calls to .exit() callback scsi: ufs: exynos: gs101: Put UFS device in reset on .suspend() scsi: pm80xx: Set phy_attached to zero when device is gone ASoC: fsl_asrc_dma: get codec or cpu dai from backend x86/i8253: Call clockevent_i8253_disable() with interrupts disabled netfs: Only create /proc/fs/netfs with CONFIG_PROC_FS iomap: skip unnecessary ifs_block_is_uptodate check riscv: Provide all alternative macros all the time ksmbd: fix WARNING "do not call blocking ops when !TASK_RUNNING" spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts spi: tegra210-quad: add rate limiting and simplify timeout error message ubsan: Fix panic from test_ubsan_out_of_bounds x86/cpu: Add CPU model number for Bartlett Lake CPUs with Raptor Cove cores md/raid1: Add check for missing source disk in process_checks() drm/amdgpu: use a dummy owner for sysfs triggered cleaner shaders v4 drm/amdgpu: Use the right function for hdp flush spi: spi-imx: Add check for spi_imx_setupxfer() Revert "drivers: core: synchronize really_probe() and dev_uevent()" driver core: introduce device_set_driver() helper driver core: fix potential NULL pointer dereference in dev_uevent() xfs: do not check NEEDSREPAIR if ro,norecovery mount. xfs: Do not allow norecovery mount with quotacheck xfs: rename xfs_iomap_swapfile_activate to xfs_vm_swap_activate xfs: flush inodegc before swapon selftests/bpf: fix bpf_map_redirect call for cpu map test selftests/bpf: make xdp_cpumap_attach keep redirect prog attached selftests/bpf: check program redirect in xdp_cpumap_attach selftests/bpf: Adjust data size to have ETH_HLEN usb: typec: class: Fix NULL pointer access vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp comedi: jr3_pci: Fix synchronous deletion of timer ext4: goto right label 'out_mmap_sem' in ext4_setattr() usb: typec: class: Invalidate USB device pointers on partner unregistration Revert "net: dsa: mv88e6xxx: fix internal PHYs for 6320 family" net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family net: dsa: mv88e6xxx: enable PVT for 6321 switch net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family net: dsa: mv88e6xxx: enable STU methods for 6320 family iommu: Handle race with default domain setup crypto: lib/Kconfig - Hide arch options from user media: i2c: imx214: Fix uninitialized variable in imx214_set_ctrl() MIPS: cm: Fix warning if MIPS_CM is disabled nvme: fixup scan failure for non-ANA multipath controllers usb: xhci: Fix Short Packet handling rework ignoring errors objtool: Ignore end-of-section jumps for KCOV/GCOV objtool: Silence more KCOV warnings, part 2 usb: typec: class: Unlocked on error in typec_register_partner() crypto: Kconfig - Select LIB generic option arm64: dts: ti: k3-j784s4-j742s2-main-common: Correct the GICD size mq-deadline: don't call req_get_ioprio from the I/O completion handler Linux 6.12.26 Change-Id: Iff5be8c388b8b915652fafb787156a4653f060aa Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
514 lines
14 KiB
C
514 lines
14 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Contiguous Memory Allocator for DMA mapping framework
|
|
* Copyright (c) 2010-2011 by Samsung Electronics.
|
|
* Written by:
|
|
* Marek Szyprowski <m.szyprowski@samsung.com>
|
|
* Michal Nazarewicz <mina86@mina86.com>
|
|
*
|
|
* Contiguous Memory Allocator
|
|
*
|
|
* The Contiguous Memory Allocator (CMA) makes it possible to
|
|
* allocate big contiguous chunks of memory after the system has
|
|
* booted.
|
|
*
|
|
* Why is it needed?
|
|
*
|
|
* Various devices on embedded systems have no scatter-getter and/or
|
|
* IO map support and require contiguous blocks of memory to
|
|
* operate. They include devices such as cameras, hardware video
|
|
* coders, etc.
|
|
*
|
|
* Such devices often require big memory buffers (a full HD frame
|
|
* is, for instance, more than 2 mega pixels large, i.e. more than 6
|
|
* MB of memory), which makes mechanisms such as kmalloc() or
|
|
* alloc_page() ineffective.
|
|
*
|
|
* At the same time, a solution where a big memory region is
|
|
* reserved for a device is suboptimal since often more memory is
|
|
* reserved then strictly required and, moreover, the memory is
|
|
* inaccessible to page system even if device drivers don't use it.
|
|
*
|
|
* CMA tries to solve this issue by operating on memory regions
|
|
* where only movable pages can be allocated from. This way, kernel
|
|
* can use the memory for pagecache and when device driver requests
|
|
* it, allocated pages can be migrated.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "cma: " fmt
|
|
|
|
#include <asm/page.h>
|
|
|
|
#include <linux/memblock.h>
|
|
#include <linux/err.h>
|
|
#include <linux/sizes.h>
|
|
#include <linux/dma-map-ops.h>
|
|
#include <linux/cma.h>
|
|
#include <linux/nospec.h>
|
|
|
|
#ifdef CONFIG_CMA_SIZE_MBYTES
|
|
#define CMA_SIZE_MBYTES CONFIG_CMA_SIZE_MBYTES
|
|
#else
|
|
#define CMA_SIZE_MBYTES 0
|
|
#endif
|
|
|
|
struct cma *dma_contiguous_default_area;
|
|
EXPORT_SYMBOL_GPL(dma_contiguous_default_area);
|
|
|
|
/*
|
|
* Default global CMA area size can be defined in kernel's .config.
|
|
* This is useful mainly for distro maintainers to create a kernel
|
|
* that works correctly for most supported systems.
|
|
* The size can be set in bytes or as a percentage of the total memory
|
|
* in the system.
|
|
*
|
|
* Users, who want to set the size of global CMA area for their system
|
|
* should use cma= kernel parameter.
|
|
*/
|
|
#define size_bytes ((phys_addr_t)CMA_SIZE_MBYTES * SZ_1M)
|
|
static phys_addr_t size_cmdline __initdata = -1;
|
|
static phys_addr_t base_cmdline __initdata;
|
|
static phys_addr_t limit_cmdline __initdata;
|
|
|
|
static int __init early_cma(char *p)
|
|
{
|
|
if (!p) {
|
|
pr_err("Config string not provided\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
size_cmdline = memparse(p, &p);
|
|
if (*p != '@')
|
|
return 0;
|
|
base_cmdline = memparse(p + 1, &p);
|
|
if (*p != '-') {
|
|
limit_cmdline = base_cmdline + size_cmdline;
|
|
return 0;
|
|
}
|
|
limit_cmdline = memparse(p + 1, &p);
|
|
|
|
return 0;
|
|
}
|
|
early_param("cma", early_cma);
|
|
|
|
#ifdef CONFIG_DMA_NUMA_CMA
|
|
|
|
static struct cma *dma_contiguous_numa_area[MAX_NUMNODES];
|
|
static phys_addr_t numa_cma_size[MAX_NUMNODES] __initdata;
|
|
static struct cma *dma_contiguous_pernuma_area[MAX_NUMNODES];
|
|
static phys_addr_t pernuma_size_bytes __initdata;
|
|
|
|
static int __init early_numa_cma(char *p)
|
|
{
|
|
int nid, count = 0;
|
|
unsigned long tmp;
|
|
char *s = p;
|
|
|
|
while (*s) {
|
|
if (sscanf(s, "%lu%n", &tmp, &count) != 1)
|
|
break;
|
|
|
|
if (s[count] == ':') {
|
|
if (tmp >= MAX_NUMNODES)
|
|
break;
|
|
nid = array_index_nospec(tmp, MAX_NUMNODES);
|
|
|
|
s += count + 1;
|
|
tmp = memparse(s, &s);
|
|
numa_cma_size[nid] = tmp;
|
|
|
|
if (*s == ',')
|
|
s++;
|
|
else
|
|
break;
|
|
} else
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
early_param("numa_cma", early_numa_cma);
|
|
|
|
static int __init early_cma_pernuma(char *p)
|
|
{
|
|
pernuma_size_bytes = memparse(p, &p);
|
|
return 0;
|
|
}
|
|
early_param("cma_pernuma", early_cma_pernuma);
|
|
#endif
|
|
|
|
#ifdef CONFIG_CMA_SIZE_PERCENTAGE
|
|
|
|
static phys_addr_t __init __maybe_unused cma_early_percent_memory(void)
|
|
{
|
|
unsigned long total_pages = PHYS_PFN(memblock_phys_mem_size());
|
|
|
|
return (total_pages * CONFIG_CMA_SIZE_PERCENTAGE / 100) << PAGE_SHIFT;
|
|
}
|
|
|
|
#else
|
|
|
|
static inline __maybe_unused phys_addr_t cma_early_percent_memory(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_DMA_NUMA_CMA
|
|
static void __init dma_numa_cma_reserve(void)
|
|
{
|
|
int nid;
|
|
|
|
for_each_node(nid) {
|
|
int ret;
|
|
char name[CMA_MAX_NAME];
|
|
struct cma **cma;
|
|
|
|
if (!node_online(nid)) {
|
|
if (pernuma_size_bytes || numa_cma_size[nid])
|
|
pr_warn("invalid node %d specified\n", nid);
|
|
continue;
|
|
}
|
|
|
|
if (pernuma_size_bytes) {
|
|
|
|
cma = &dma_contiguous_pernuma_area[nid];
|
|
snprintf(name, sizeof(name), "pernuma%d", nid);
|
|
ret = cma_declare_contiguous_nid(0, pernuma_size_bytes, 0, 0,
|
|
0, false, name, cma, nid);
|
|
if (ret)
|
|
pr_warn("%s: reservation failed: err %d, node %d", __func__,
|
|
ret, nid);
|
|
}
|
|
|
|
if (numa_cma_size[nid]) {
|
|
|
|
cma = &dma_contiguous_numa_area[nid];
|
|
snprintf(name, sizeof(name), "numa%d", nid);
|
|
ret = cma_declare_contiguous_nid(0, numa_cma_size[nid], 0, 0, 0, false,
|
|
name, cma, nid);
|
|
if (ret)
|
|
pr_warn("%s: reservation failed: err %d, node %d", __func__,
|
|
ret, nid);
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
static inline void __init dma_numa_cma_reserve(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* dma_contiguous_reserve() - reserve area(s) for contiguous memory handling
|
|
* @limit: End address of the reserved memory (optional, 0 for any).
|
|
*
|
|
* This function reserves memory from early allocator. It should be
|
|
* called by arch specific code once the early allocator (memblock or bootmem)
|
|
* has been activated and all other subsystems have already allocated/reserved
|
|
* memory.
|
|
*/
|
|
void __init dma_contiguous_reserve(phys_addr_t limit)
|
|
{
|
|
phys_addr_t selected_size = 0;
|
|
phys_addr_t selected_base = 0;
|
|
phys_addr_t selected_limit = limit;
|
|
bool fixed = false;
|
|
|
|
dma_numa_cma_reserve();
|
|
|
|
pr_debug("%s(limit %08lx)\n", __func__, (unsigned long)limit);
|
|
|
|
if (size_cmdline != -1) {
|
|
selected_size = size_cmdline;
|
|
selected_base = base_cmdline;
|
|
selected_limit = min_not_zero(limit_cmdline, limit);
|
|
if (base_cmdline + size_cmdline == limit_cmdline)
|
|
fixed = true;
|
|
} else {
|
|
#ifdef CONFIG_CMA_SIZE_SEL_MBYTES
|
|
selected_size = size_bytes;
|
|
#elif defined(CONFIG_CMA_SIZE_SEL_PERCENTAGE)
|
|
selected_size = cma_early_percent_memory();
|
|
#elif defined(CONFIG_CMA_SIZE_SEL_MIN)
|
|
selected_size = min(size_bytes, cma_early_percent_memory());
|
|
#elif defined(CONFIG_CMA_SIZE_SEL_MAX)
|
|
selected_size = max(size_bytes, cma_early_percent_memory());
|
|
#endif
|
|
}
|
|
|
|
if (selected_size && !dma_contiguous_default_area) {
|
|
pr_debug("%s: reserving %ld MiB for global area\n", __func__,
|
|
(unsigned long)selected_size / SZ_1M);
|
|
|
|
dma_contiguous_reserve_area(selected_size, selected_base,
|
|
selected_limit,
|
|
&dma_contiguous_default_area,
|
|
fixed);
|
|
}
|
|
}
|
|
|
|
void __weak
|
|
dma_contiguous_early_fixup(phys_addr_t base, unsigned long size)
|
|
{
|
|
}
|
|
|
|
/**
|
|
* dma_contiguous_reserve_area() - reserve custom contiguous area
|
|
* @size: Size of the reserved area (in bytes),
|
|
* @base: Base address of the reserved area optional, use 0 for any
|
|
* @limit: End address of the reserved memory (optional, 0 for any).
|
|
* @res_cma: Pointer to store the created cma region.
|
|
* @fixed: hint about where to place the reserved area
|
|
*
|
|
* This function reserves memory from early allocator. It should be
|
|
* called by arch specific code once the early allocator (memblock or bootmem)
|
|
* has been activated and all other subsystems have already allocated/reserved
|
|
* memory. This function allows to create custom reserved areas for specific
|
|
* devices.
|
|
*
|
|
* If @fixed is true, reserve contiguous area at exactly @base. If false,
|
|
* reserve in range from @base to @limit.
|
|
*/
|
|
int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
|
|
phys_addr_t limit, struct cma **res_cma,
|
|
bool fixed)
|
|
{
|
|
int ret;
|
|
|
|
memblock_memsize_disable_tracking();
|
|
ret = cma_declare_contiguous(base, size, limit, 0, 0, fixed,
|
|
"reserved", res_cma);
|
|
if (ret)
|
|
goto out;
|
|
|
|
/* Architecture specific contiguous memory fixup. */
|
|
dma_contiguous_early_fixup(cma_get_base(*res_cma),
|
|
cma_get_size(*res_cma));
|
|
|
|
memblock_memsize_record("dma_cma", cma_get_base(*res_cma),
|
|
cma_get_size(*res_cma), false, true);
|
|
out:
|
|
memblock_memsize_enable_tracking();
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* dma_alloc_from_contiguous() - allocate pages from contiguous area
|
|
* @dev: Pointer to device for which the allocation is performed.
|
|
* @count: Requested number of pages.
|
|
* @align: Requested alignment of pages (in PAGE_SIZE order).
|
|
* @no_warn: Avoid printing message about failed allocation.
|
|
*
|
|
* This function allocates memory buffer for specified device. It uses
|
|
* device specific contiguous memory area if available or the default
|
|
* global one. Requires architecture specific dev_get_cma_area() helper
|
|
* function.
|
|
*/
|
|
struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,
|
|
unsigned int align, bool no_warn)
|
|
{
|
|
if (align > CONFIG_CMA_ALIGNMENT)
|
|
align = CONFIG_CMA_ALIGNMENT;
|
|
|
|
return cma_alloc(dev_get_cma_area(dev), count, align, no_warn);
|
|
}
|
|
|
|
/**
|
|
* dma_release_from_contiguous() - release allocated pages
|
|
* @dev: Pointer to device for which the pages were allocated.
|
|
* @pages: Allocated pages.
|
|
* @count: Number of allocated pages.
|
|
*
|
|
* This function releases memory allocated by dma_alloc_from_contiguous().
|
|
* It returns false when provided pages do not belong to contiguous area and
|
|
* true otherwise.
|
|
*/
|
|
bool dma_release_from_contiguous(struct device *dev, struct page *pages,
|
|
int count)
|
|
{
|
|
return cma_release(dev_get_cma_area(dev), pages, count);
|
|
}
|
|
|
|
static struct page *cma_alloc_aligned(struct cma *cma, size_t size, gfp_t gfp)
|
|
{
|
|
unsigned int align = min(get_order(size), CONFIG_CMA_ALIGNMENT);
|
|
|
|
return cma_alloc(cma, size >> PAGE_SHIFT, align, gfp & __GFP_NOWARN);
|
|
}
|
|
|
|
/**
|
|
* dma_alloc_contiguous() - allocate contiguous pages
|
|
* @dev: Pointer to device for which the allocation is performed.
|
|
* @size: Requested allocation size.
|
|
* @gfp: Allocation flags.
|
|
*
|
|
* tries to use device specific contiguous memory area if available, or it
|
|
* tries to use per-numa cma, if the allocation fails, it will fallback to
|
|
* try default global one.
|
|
*
|
|
* Note that it bypass one-page size of allocations from the per-numa and
|
|
* global area as the addresses within one page are always contiguous, so
|
|
* there is no need to waste CMA pages for that kind; it also helps reduce
|
|
* fragmentations.
|
|
*/
|
|
struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp)
|
|
{
|
|
#ifdef CONFIG_DMA_NUMA_CMA
|
|
int nid = dev_to_node(dev);
|
|
#endif
|
|
|
|
/* CMA can be used only in the context which permits sleeping */
|
|
if (!gfpflags_allow_blocking(gfp))
|
|
return NULL;
|
|
if (dev->cma_area)
|
|
return cma_alloc_aligned(dev->cma_area, size, gfp);
|
|
if (size <= PAGE_SIZE)
|
|
return NULL;
|
|
|
|
#ifdef CONFIG_DMA_NUMA_CMA
|
|
if (nid != NUMA_NO_NODE && !(gfp & (GFP_DMA | GFP_DMA32))) {
|
|
struct cma *cma = dma_contiguous_pernuma_area[nid];
|
|
struct page *page;
|
|
|
|
if (cma) {
|
|
page = cma_alloc_aligned(cma, size, gfp);
|
|
if (page)
|
|
return page;
|
|
}
|
|
|
|
cma = dma_contiguous_numa_area[nid];
|
|
if (cma) {
|
|
page = cma_alloc_aligned(cma, size, gfp);
|
|
if (page)
|
|
return page;
|
|
}
|
|
}
|
|
#endif
|
|
if (!dma_contiguous_default_area)
|
|
return NULL;
|
|
|
|
return cma_alloc_aligned(dma_contiguous_default_area, size, gfp);
|
|
}
|
|
|
|
/**
|
|
* dma_free_contiguous() - release allocated pages
|
|
* @dev: Pointer to device for which the pages were allocated.
|
|
* @page: Pointer to the allocated pages.
|
|
* @size: Size of allocated pages.
|
|
*
|
|
* This function releases memory allocated by dma_alloc_contiguous(). As the
|
|
* cma_release returns false when provided pages do not belong to contiguous
|
|
* area and true otherwise, this function then does a fallback __free_pages()
|
|
* upon a false-return.
|
|
*/
|
|
void dma_free_contiguous(struct device *dev, struct page *page, size_t size)
|
|
{
|
|
unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
|
|
|
|
/* if dev has its own cma, free page from there */
|
|
if (dev->cma_area) {
|
|
if (cma_release(dev->cma_area, page, count))
|
|
return;
|
|
} else {
|
|
/*
|
|
* otherwise, page is from either per-numa cma or default cma
|
|
*/
|
|
#ifdef CONFIG_DMA_NUMA_CMA
|
|
if (cma_release(dma_contiguous_pernuma_area[page_to_nid(page)],
|
|
page, count))
|
|
return;
|
|
if (cma_release(dma_contiguous_numa_area[page_to_nid(page)],
|
|
page, count))
|
|
return;
|
|
#endif
|
|
if (cma_release(dma_contiguous_default_area, page, count))
|
|
return;
|
|
}
|
|
|
|
/* not in any cma, free from buddy */
|
|
__free_pages(page, get_order(size));
|
|
}
|
|
|
|
/*
|
|
* Support for reserved memory regions defined in device tree
|
|
*/
|
|
#ifdef CONFIG_OF_RESERVED_MEM
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_reserved_mem.h>
|
|
|
|
#undef pr_fmt
|
|
#define pr_fmt(fmt) fmt
|
|
|
|
static int rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)
|
|
{
|
|
dev->cma_area = rmem->priv;
|
|
return 0;
|
|
}
|
|
|
|
static void rmem_cma_device_release(struct reserved_mem *rmem,
|
|
struct device *dev)
|
|
{
|
|
dev->cma_area = NULL;
|
|
}
|
|
|
|
static const struct reserved_mem_ops rmem_cma_ops = {
|
|
.device_init = rmem_cma_device_init,
|
|
.device_release = rmem_cma_device_release,
|
|
};
|
|
|
|
static int __init rmem_cma_setup(struct reserved_mem *rmem)
|
|
{
|
|
unsigned long node = rmem->fdt_node;
|
|
bool default_cma = of_get_flat_dt_prop(node, "linux,cma-default", NULL);
|
|
struct cma *cma;
|
|
bool gcma;
|
|
int err;
|
|
|
|
if (size_cmdline != -1 && default_cma) {
|
|
pr_info("Reserved memory: bypass %s node, using cmdline CMA params instead\n",
|
|
rmem->name);
|
|
return -EBUSY;
|
|
}
|
|
|
|
if (!of_get_flat_dt_prop(node, "reusable", NULL) ||
|
|
of_get_flat_dt_prop(node, "no-map", NULL))
|
|
return -EINVAL;
|
|
|
|
if (!IS_ALIGNED(rmem->base | rmem->size, CMA_MIN_ALIGNMENT_BYTES)) {
|
|
pr_err("Reserved memory: incorrect alignment of CMA region\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
gcma = !!of_get_flat_dt_prop(node, "guarantee", NULL);
|
|
#ifndef CONFIG_GCMA
|
|
if (gcma) {
|
|
pr_err("Reserved memory: unable to setup GCMA region, GCMA is not enabled\n");
|
|
return -EINVAL;
|
|
}
|
|
#endif
|
|
err = cma_init_reserved_mem(rmem->base, rmem->size, 0, rmem->name,
|
|
&cma, gcma);
|
|
if (err) {
|
|
pr_err("Reserved memory: unable to setup CMA region\n");
|
|
return err;
|
|
}
|
|
/* Architecture specific contiguous memory fixup. */
|
|
dma_contiguous_early_fixup(rmem->base, rmem->size);
|
|
|
|
if (default_cma)
|
|
dma_contiguous_default_area = cma;
|
|
|
|
rmem->ops = &rmem_cma_ops;
|
|
rmem->priv = cma;
|
|
|
|
pr_info("Reserved memory: created CMA memory pool at %pa, size %ld MiB\n",
|
|
&rmem->base, (unsigned long)rmem->size / SZ_1M);
|
|
|
|
return 0;
|
|
}
|
|
RESERVEDMEM_OF_DECLARE(cma, "shared-dma-pool", rmem_cma_setup);
|
|
#endif
|