b403cd66bd
* refs/heads/tmp-75c93eb: Revert one chunk from37432a83fa
commit Revert "rpmsg: glink: Use complete_all for open states" ANDROID: Incremental fs: Fix selinux issues ANDROID: Incremental fs: Set credentials before reading/writing ANDROID: Incremental fs: Fix memory leak on closing file ANDROID: GKI: update Sony KMI symbol list ANDROID: ABI updates for db845c (enabling wifi) ANDROID: db845c_gki.fragment: Enable wifi on db845c w/ android-5.4 UPSTREAM: arm64: dts: qcom: sdm845: Add APSS watchdog node UPSTREAM: arm64: dts: qcom: db845c: Move remoteproc firmware to sdm845 UPSTREAM: ath10k: qmi: Sleep for a while before assigning MSA memory UPSTREAM: soc: qcom: qmi: Return EPROBE_DEFER if no address family ANDROID: ABI: Update allowed list for QCOM ANDROID: GKI: update Sony symbol list for texfat ANDROID: GKI: update KMI for db845c with idr_alloc_u32 added ANDROID: ABI: Update allowed list for QCOM ANDROID: ABI: update allowed list for QCOM Revert "media: v4l2-fwnode: Return -EINVAL for invalid bus-type" Revert "seq_buf: Avoid type mismatch for seq_buf_init" Linux 5.4.86 x86/CPU/AMD: Save AMD NodeId as cpu_die_id Revert: "ring-buffer: Remove HAVE_64BIT_ALIGNED_ACCESS" rtc: ep93xx: Fix NULL pointer dereference in ep93xx_rtc_read_time regulator: axp20x: Fix DLDO2 voltage control register mask for AXP22x PCI: Fix pci_slot_release() NULL pointer dereference platform/x86: intel-vbtn: Allow switch events on Acer Switch Alpha 12 libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels xenbus/xenbus_backend: Disallow pending watch messages xen/xenbus: Count pending messages for each watch xen/xenbus/xen_bus_type: Support will_handle watch callback xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() xen/xenbus: Allow watches discard events before queueing xen-blkback: set ring->xenblkd to NULL after kthread_stop() dma-buf/dma-resv: Respect num_fences when initializing the shared fence list. device-dax/core: Fix memory leak when rmmod dax.ko clk: tegra: Do not return 0 on failure clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 clk: ingenic: Fix divider calculation with div tables pinctrl: sunxi: Always call chained_irq_{enter, exit} in sunxi_pinctrl_irq_handler md/cluster: fix deadlock when node is doing resync job md/cluster: block reshape with remote resync job iio:adc:ti-ads124s08: Fix alignment and data leak issues. iio:adc:ti-ads124s08: Fix buffer being too long. iio:imu:bmi160: Fix too large a buffer. iio:pressure:mpl3115: Force alignment of buffer iio:magnetometer:mag3110: Fix alignment and data leak issues. iio:light:st_uvis25: Fix timestamp alignment and prevent data leak. iio:light:rpr0521: Fix timestamp alignment and prevent data leak. iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume iio: buffer: Fix demux update scsi: lpfc: Re-fix use after free in lpfc_rq_buf_free() scsi: lpfc: Fix invalid sleeping context in lpfc_sli4_nvmet_alloc() scsi: qla2xxx: Fix crash during driver load on big endian machines mtd: rawnand: meson: fix meson_nfc_dma_buffer_release() arguments mtd: rawnand: qcom: Fix DMA sync on FLASH_STATUS register read mtd: parser: cmdline: Fix parsing of part-names with colons mtd: spinand: Fix OOB read soc: qcom: smp2p: Safely acquire spinlock without IRQs spi: atmel-quadspi: Fix AHB memory accesses spi: atmel-quadspi: Disable clock in probe error path spi: mt7621: Don't leak SPI master in probe error path spi: mt7621: Disable clock in probe error path spi: synquacer: Disable clock in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: pic32: Don't leak DMA channels in probe error path spi: mxic: Don't leak SPI master in probe error path spi: gpio: Don't leak SPI master in probe error path spi: fsl: fix use of spisel_boot signal on MPC8309 spi: davinci: Fix use-after-free on unbind spi: atmel-quadspi: Fix use-after-free on unbind spi: spi-sh: Fix use-after-free on unbind spi: pxa2xx: Fix use-after-free on unbind drm/i915: Fix mismatch between misplaced vma check and vma insert drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() drm/amd/display: Fix memory leaks in S3 resume platform/x86: mlx-platform: remove an unused variable jfs: Fix array index bounds check in dbAdjTree jffs2: Fix ignoring mounting options problem during remounting jffs2: Fix GC exit abnormally ubifs: wbuf: Don't leak kernel memory to flash SMB3: avoid confusing warning message on mount to Azure ceph: fix race in concurrent __ceph_remove_cap invocations um: Remove use of asprinf in umid.c ima: Don't modify file descriptor mode on the fly powerpc/powernv/memtrace: Fix crashing the kernel when enabling concurrently powerpc/powernv/memtrace: Don't leak kernel memory to user space powerpc/powernv/npu: Do not attempt NPU2 setup on POWER8NVL NPU powerpc/mm: Fix verification of MMU_FTR_TYPE_44x powerpc/8xx: Fix early debug when SMC1 is relocated powerpc/xmon: Change printk() to pr_cont() powerpc/feature: Add CPU_FTR_NOEXECUTE to G2_LE powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at xprtrdma: Fix XDRBUF_SPARSE_PAGES support ARM: dts: at91: sama5d2: fix CAN message ram offset and size ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES KVM: arm64: Introduce handling of AArch32 TTBCR2 traps ext4: fix deadlock with fs freezing and EA inodes ext4: fix a memory leak of ext4_free_data btrfs: trim: fix underflow in trim length to prevent access beyond device boundary btrfs: do not shorten unpin len for caching block groups USB: serial: keyspan_pda: fix write unthrottling USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: digi_acceleport: fix write-wakeup deadlocks USB: serial: mos7720: fix parallel-port state restore cpuset: fix race between hotplug work and later CPU offline EDAC/amd64: Fix PCI component registration EDAC/i10nm: Use readl() to access MMIO registers crypto: arm/aes-ce - work around Cortex-A57/A72 silion errata crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() powerpc/perf: Exclude kernel samples while counting events in user space. perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake perf/x86/intel: Add event constraint for CYCLE_ACTIVITY.STALLS_MEM_ANY staging: comedi: mf6x4: Fix AI end-of-conversion detection ASoC: cx2072x: Fix doubly definitions of Playback and Capture streams binder: add flag to clear buffer on txn complete s390/dasd: fix list corruption of lcu list s390/dasd: fix list corruption of pavgroup group list s390/dasd: prevent inconsistent LCU device data s390/dasd: fix hanging device offline processing s390/kexec_file: fix diag308 subcode when loading crash kernel s390/smp: perform initial CPU reset also for SMT siblings ALSA: core: memalloc: add page alignment for iram ALSA: usb-audio: Disable sample read check if firmware doesn't give back ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices ALSA: hda/realtek: Apply jack fixup for Quanta NL3 ALSA: hda/realtek: Add quirk for MSI-GP73 ALSA/hda: apply jack fixup for the Acer Veriton N4640G/N6640G/N2510G ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: hda/realtek - Add supported for more Lenovo ALC285 Headset Button ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 ALSA: hda/realtek - Enable headset mic of ASUS X430UN with ALC256 ALSA: hda/realtek: make bass spk volume adjustable on a yoga laptop ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg. ALSA: hda: Fix regressions on clear and reconfig sysfs ACPI: PNP: compare the string length in the matching_id() Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() ALSA: hda/ca0132 - Change Input Source enum strings. Input: cyapa_gen6 - fix out-of-bounds stack access media: ipu3-cio2: Make the field on subdev format V4L2_FIELD_NONE media: ipu3-cio2: Validate mbus format in setting subdev format media: ipu3-cio2: Serialise access to pad format media: ipu3-cio2: Return actual subdev format media: ipu3-cio2: Remove traces of returned buffers media: netup_unidvb: Don't leak SPI master in probe error path media: sunxi-cir: ensure IR is handled when it is continuous media: gspca: Fix memory leak in probe vfio/pci/nvlink2: Do not attempt NPU2 setup on POWER8NVL NPU Input: goodix - add upside-down quirk for Teclast X98 Pro tablet initramfs: fix clang build failure Input: cros_ec_keyb - send 'scancodes' in addition to key events drm/amdkfd: Fix leak in dmabuf import drm/amd/display: Prevent bandwidth overflow lwt: Disable BH too in run_lwt_bpf() fix namespaced fscaps when !CONFIG_SECURITY cfg80211: initialize rekey_data ARM: sunxi: Add machine match for the Allwinner V3 SoC perf probe: Fix memory leak when synthesizing SDT probes kconfig: fix return value of do_error_if() clk: sunxi-ng: Make sure divider tables have sentinel clk: s2mps11: Fix a resource leak in error handling paths in the probe function clk: at91: sam9x60: remove atmel,osc-bypass support virtio_ring: Fix two use after free bugs virtio_net: Fix error code in probe() virtio_ring: Cut and paste bugs in vring_create_virtqueue_packed() qlcnic: Fix error code in probe perf record: Fix memory leak when using '--user-regs=?' to list registers pwm: lp3943: Dynamically allocate PWM chip base pwm: zx: Add missing cleanup in error path clk: ti: Fix memleak in ti_fapll_synth_setup watchdog: coh901327: add COMMON_CLK dependency watchdog: qcom: Avoid context switch in restart handler libnvdimm/label: Return -ENXIO for no slot in __blk_label_update net: korina: fix return value net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function net: bcmgenet: Fix a resource leak in an error handling path in the probe functin lan743x: fix rx_napi_poll/interrupt ping-pong checkpatch: fix unescaped left brace mm: don't wake kswapd prematurely when watermark boosting is disabled sparc: fix handling of page table constructor failure powerpc/ps3: use dma_mapping_error() nfc: s3fwrn5: Release the nfc firmware RDMA/cma: Don't overwrite sgid_attr after device is released sunrpc: fix xs_read_xdr_buf for partial pages receive um: chan_xterm: Fix fd leak um: tty: Fix handling of close in tty lines um: Monitor error events in IRQ controller ubifs: Fix error return code in ubifs_init_authentication() watchdog: Fix potential dereferencing of null pointer watchdog: sprd: check busy bit before new loading rather than after that watchdog: sprd: remove watchdog disable from resume fail path watchdog: sirfsoc: Add missing dependency on HAS_IOMEM watchdog: armada_37xx: Add missing dependency on HAS_IOMEM irqchip/alpine-msi: Fix freeing of interrupts on allocation error path ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() mac80211: don't set set TDLS STA bandwidth wider than possible crypto: atmel-i2c - select CONFIG_BITREVERSE extcon: max77693: Fix modalias string mtd: rawnand: gpmi: Fix the random DMA timeout issue mtd: rawnand: meson: Fix a resource leak in init mtd: rawnand: gpmi: fix reference count leak in gpmi ops clk: tegra: Fix duplicated SE clock entry remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio() remoteproc: qcom: fix reference leak in adsp_start remoteproc: q6v5-mss: fix error handling in q6v5_pds_enable RDMA/core: Do not indicate device ready when device enablement fails can: m_can: m_can_config_endisable(): remove double clearing of clock stop request bit erofs: avoid using generic_block_bmap iwlwifi: mvm: hook up missing RX handlers s390/cio: fix use-after-free in ccw_device_destroy_console bus: fsl-mc: fix error return code in fsl_mc_object_allocate() platform/chrome: cros_ec_spi: Don't overwrite spi::mode x86/kprobes: Restore BTF if the single-stepping is cancelled nfs_common: need lock during iterate through the list nfsd: Fix message level for normal termination speakup: fix uninitialized flush_lock usb: oxu210hp-hcd: Fix memory leak in oxu_create usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe powerpc/mm: sanity_check_fault() should work for all, not only BOOK3S ASoC: amd: change clk_get() to devm_clk_get() and add missed checks drm/mediatek: avoid dereferencing a null hdmi_phy on an error message powerpc/pseries/hibernation: remove redundant cacheinfo update powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems scsi: fnic: Fix error return code in fnic_probe() seq_buf: Avoid type mismatch for seq_buf_init scsi: pm80xx: Fix error return in pm8001_pci_probe() scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe arm64: dts: meson: g12a: x96-max: fix PHY deassert timing requirements ARM: dts: meson: fix PHY deassert timing requirements arm64: dts: meson: fix PHY deassert timing requirements Bluetooth: btmtksdio: Add the missed release_firmware() in mtk_setup_firmware() Bluetooth: btusb: Add the missed release_firmware() in btusb_mtk_setup_firmware() cpufreq: scpi: Add missing MODULE_ALIAS cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: sun50i: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: qcom: Add missing MODULE_DEVICE_TABLE cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: ap806: Add missing MODULE_DEVICE_TABLE clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI clocksource/drivers/arm_arch_timer: Use stable count reader in erratum sne phy: renesas: rcar-gen3-usb2: disable runtime pm in case of failure dm ioctl: fix error return code in target_message ASoC: jz4740-i2s: add missed checks for clk_get() net/mlx5: Properly convey driver version to firmware MIPS: Don't round up kernel sections size for memblock_add() memstick: r592: Fix error return in r592_probe() arm64: dts: rockchip: Fix UART pull-ups on rk3328 pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() bpf: Fix bpf_put_raw_tracepoint()'s use of __module_address() ARM: dts: at91: sama5d2: map securam as device iio: hrtimer-trigger: Mark hrtimer to expire in hard interrupt context clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() clocksource/drivers/orion: Add missing clk_disable_unprepare() on error path powerpc/64: Fix an EMIT_BUG_ENTRY in head_64.S powerpc/perf: Fix crash with is_sier_available when pmu is not set media: saa7146: fix array overflow in vidioc_s_audio() hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable vfio-pci: Use io_remap_pfn_range() for PCI IO memory selftests/seccomp: Update kernel config NFS: switch nfsiod to be an UNBOUND workqueue. lockd: don't use interval-based rebinding over TCP net: sunrpc: Fix 'snprintf' return value check in 'do_xprt_debugfs' NFSv4: Fix the alignment of page data in the getdeviceinfo reply SUNRPC: xprt_load_transport() needs to support the netid "rdma6" NFSv4.2: condition READDIR's mask for security label based on LSM state SUNRPC: rpc_wake_up() should wake up tasks in the correct order ath10k: Release some resources in an error handling path ath10k: Fix an error handling path ath10k: Fix the parsing error in service available event platform/x86: dell-smbios-base: Fix error return code in dell_smbios_init ARM: dts: at91: at91sam9rl: fix ADC triggers soc: amlogic: canvas: add missing put_device() call in meson_canvas_get() arm64: dts: meson-sm1: fix typo in opp table arm64: dts: meson: fix spi-max-frequency on Khadas VIM2 PCI: iproc: Fix out-of-bound array accesses PCI: Fix overflow in command-line resource alignment requests PCI: Bounds-check command-line resource alignment requests arm64: dts: qcom: c630: Polish i2c-hid devices arm64: dts: ls1028a: fix ENETC PTP clock input genirq/irqdomain: Don't try to free an interrupt that has no mapping power: supply: bq24190_charger: fix reference leak power: supply: axp288_charger: Fix HP Pavilion x2 10 DMI matching arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc arm64: dts: armada-3720-turris-mox: update ethernet-phy handle name ARM: dts: Remove non-existent i2c1 from 98dx3236 HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI media: max2175: fix max2175_set_csm_mode() error code mips: cdmm: fix use-after-free in mips_cdmm_bus_discover media: imx214: Fix stop streaming samples: bpf: Fix lwt_len_hist reusing previous BPF map platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration platform/x86: mlx-platform: Remove PSU EEPROM from default platform configuration media: siano: fix memory leak of debugfs members in smsdvb_hotplug arm64: tegra: Fix DT binding for IO High Voltage entry dmaengine: mv_xor_v2: Fix error return code in mv_xor_v2_probe() cw1200: fix missing destroy_workqueue() on error in cw1200_init_common rsi: fix error return code in rsi_reset_card() qtnfmac: fix error return code in qtnf_pcie_probe() orinoco: Move context allocation after processing the skb mmc: pxamci: Fix error return code in pxamci_probe ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host memstick: fix a double-free bug in memstick_check RDMA/cxgb4: Validate the number of CQEs clk: meson: Kconfig: fix dependency for G12A Input: omap4-keypad - fix runtime PM error handling drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe spi: fix resource leak for drivers without .remove callback crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe crypto: crypto4xx - Replace bitwise OR with logical OR in crypto4xx_build_pd EDAC/mce_amd: Use struct cpuinfo_x86.cpu_die_id for AMD NodeId powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 powerpc: Avoid broken GCC __attribute__((optimize)) selftests/bpf: Fix broken riscv build spi: mxs: fix reference leak in mxs_spi_probe usb/max3421: fix return error code in max3421_probe() Input: ads7846 - fix unaligned access on 7845 Input: ads7846 - fix integer overflow on Rt calculation Input: ads7846 - fix race that causes missing releases drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init() media: solo6x10: fix missing snd_card_free in error handling case scsi: core: Fix VPD LUN ID designator priorities ASoC: meson: fix COMPILE_TEST error media: v4l2-fwnode: Return -EINVAL for invalid bus-type media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_enc_pm() media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_dec_pm() media: tm6000: Fix sizeof() mismatches staging: gasket: interrupt: fix the missed eventfd_ctx_put() in gasket_interrupt.c staging: greybus: codecs: Fix reference counter leak in error handling crypto: qat - fix status check in qat_hal_put_rel_rd_xfer() MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA RDMa/mthca: Work around -Wenum-conversion warning ASoC: arizona: Fix a wrong free in wm8997_probe spi: sprd: fix reference leak in sprd_spi_remove ASoC: wm8998: Fix PM disable depth imbalance on error selftest/bpf: Add missed ip6ip6 test back mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume spi: tegra114: fix reference leak in tegra spi ops spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe spi: spi-ti-qspi: fix reference leak in ti_qspi_setup Bluetooth: hci_h5: fix memory leak in h5_close Bluetooth: Fix null pointer dereference in hci_event_packet() arm64: dts: exynos: Correct psci compatible used on Exynos7 arm64: dts: exynos: Include common syscon restart/poweroff for Exynos7 brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free} spi: stm32: fix reference leak in stm32_spi_resume selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling ASoC: pcm: DRAIN support reactivation spi: spi-mem: fix reference leak in spi_mem_access_start drm/msm/dsi_pll_10nm: restore VCO rate during restore_state f2fs: call f2fs_get_meta_page_retry for nat page spi: img-spfi: fix reference leak in img_spfi_resume powerpc/64: Set up a kernel stack for secondaries before cpu_restore() drm/amdgpu: fix build_coefficients() argument ARM: dts: aspeed: tiogapass: Remove vuart ASoC: sun4i-i2s: Fix lrck_period computation for I2S justified mode crypto: inside-secure - Fix sizeof() mismatch crypto: talitos - Fix return type of current_desc_hdr() crypto: talitos - Endianess in current_desc_hdr() drm/amdgpu: fix incorrect enum type sched: Reenable interrupts in do_sched_yield() sched/deadline: Fix sched_dl_global_validate() x86/apic: Fix x2apic enablement without interrupt remapping ARM: p2v: fix handling of LPAE translation in BE mode x86/mm/ident_map: Check for errors from ident_pud_init() RDMA/rxe: Compute PSN windows correctly ARM: dts: aspeed: s2600wf: Fix VGA memory region location selinux: fix error initialization in inode_doinit_with_dentry() rtc: pcf2127: fix pcf2127_nvmem_read/write() returns RDMA/bnxt_re: Set queue pair state when being queried Revert "i2c: i2c-qcom-geni: Fix DMA transfer race" soc: qcom: geni: More properly switch to DMA mode soc: mediatek: Check if power domains can be powered on at boot time soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() arm64: dts: renesas: cat875: Remove rxc-skew-ps from ethernet-phy node arm64: dts: renesas: hihope-rzg2-ex: Drop rxc-skew-ps from ethernet-phy node drm/tve200: Fix handling of platform_get_irq() error drm/mcde: Fix handling of platform_get_irq() error drm/aspeed: Fix Kconfig warning & subsequent build errors drm/gma500: fix double free of gma_connector md: fix a warning caused by a race between concurrent md_ioctl()s crypto: af_alg - avoid undefined behavior accessing salg_name media: msi2500: assign SPI bus number dynamically quota: Sanity-check quota file headers on load Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() serial_core: Check for port state when tty is in error state HID: i2c-hid: add Vero K147 to descriptor override scsi: megaraid_sas: Check user-provided offsets coresight: etb10: Fix possible NULL ptr dereference in etb_enable_perf() coresight: tmc-etr: Fix barrier packet insertion for perf buffer coresight: tmc-etr: Check if page is valid before dma_map_page() coresight: tmc-etf: Fix NULL ptr dereference in tmc_enable_etf_sink_perf() ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul USB: gadget: f_rndis: fix bitrate for SuperSpeed and above usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_acm: add support for SuperSpeed Plus USB: serial: option: add interface-number sanity check to flag handling usb: mtu3: fix memory corruption in mtu3_debugfs_regset() soc/tegra: fuse: Fix index bug in get_process_id kbuild: avoid split lines in .mod files perf/x86/intel: Check PEBS status correctly drm/amd/display: Init clock value by current vbios CLKs iwlwifi: pcie: add one missing entry for AX210 dm table: Remove BUG_ON(in_interrupt()) scsi: mpt3sas: Increase IOCInit request timeout to 30s vxlan: Copy needed_tailroom from lowerdev vxlan: Add needed_headroom for lower device arm64: syscall: exit userspace before unmasking exceptions habanalabs: put devices before driver removal drm/tegra: sor: Disable clocks on error in tegra_sor_init() kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling drm/tegra: replace idr_init() by idr_init_base() net: mvpp2: add mvpp2_phylink_to_port() helper selftests: fix poll error in udpgro.sh ixgbe: avoid premature Rx buffer reuse i40e: avoid premature Rx buffer reuse i40e: optimise prefetch page refcount i40e: Refactor rx_bi accesses RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait selftests/bpf/test_offload.py: Reset ethtool features after failed setting netfilter: nft_ct: Remove confirmation check for NFT_CT_ID gpio: eic-sprd: break loop when getting NULL device resource Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()" afs: Fix memory leak when mounting with multiple source parameters netfilter: nft_dynset: fix timeouts later than 23 days netfilter: nft_compat: make sure xtables destructors have run netfilter: x_tables: Switch synchronization to RCU pinctrl: aspeed: Fix GPIO requests on pass-through banks blk-mq: In blk_mq_dispatch_rq_list() "no budget" is a reason to kick block: factor out requeue handling from dispatch code block: Simplify REQ_OP_ZONE_RESET_ALL handling clk: renesas: r9a06g032: Drop __packed for portability can: softing: softing_netdev_open(): fix error handling xsk: Replace datagram_poll by sock_poll_wait xsk: Fix xsk_poll()'s return type scsi: bnx2i: Requires MMU gpio: mvebu: fix potential user-after-free on probe gpio: zynq: fix reference leak in zynq_gpio functions PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter ARM: dts: imx6qdl-kontron-samx6i: fix I2C_PM scl pin ARM: dts: imx6qdl-wandboard-revd1: Remove PAD_GPIO_6 from enetgrp ARM: dts: sun7i: pcduino3-nano: enable RGMII RX/TX delay on PHY ARM: dts: sun8i: v3s: fix GIC node memory range pinctrl: baytrail: Avoid clearing debounce value when turning it off pinctrl: merrifield: Set default bias in case no particular value given ARM: dts: sun8i: v40: bananapi-m2-berry: Fix ethernet node ARM: dts: sun8i: r40: bananapi-m2-berry: Fix dcdc1 regulator ARM: dts: sun7i: bananapi: Enable RGMII RX/TX delay on Ethernet PHY Linux 5.4.85 x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled x86/resctrl: Remove unused struct mbm_state::chunks_bw membarrier: Explicitly sync remote cores when SYNC_CORE is requested Revert "selftests/ftrace: check for do_sys_openat2 in user-memory test" KVM: mmu: Fix SPTE encoding of MMIO generation upper half serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access ALSA: pcm: oss: Fix potential out-of-bounds shift USB: sisusbvga: Make console support depend on BROKEN USB: UAS: introduce a quirk to set no_write_same xhci-pci: Allow host runtime PM as default for Intel Alpine Ridge LP xhci: Give USB2 ports time to enter U3 in bus suspend ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: usb-audio: Fix potential out-of-bounds shift USB: add RESET_RESUME quirk for Snapscan 1212 USB: dummy-hcd: Fix uninitialized array use in init() ktest.pl: If size of log is too big to email, email error message net: stmmac: delete the eee_ctrl_timer after napi disabled net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux net: ll_temac: Fix potential NULL dereference in temac_probe() net/mlx4_en: Handle TX error CQE lan743x: fix for potential NULL pointer dereference with bare card net/mlx4_en: Avoid scheduling restart task if it is already running tcp: fix cwnd-limited bug for TSO deferral where we send nothing tcp: select sane initial rcvq_space.space for big MSS net: stmmac: free tx skb buffer in stmmac_resume() bridge: Fix a deadlock when enabling multicast snooping enetc: Fix reporting of h/w packet counters udp: fix the proto value passed to ip_protocol_deliver_rcu for the segments net: hns3: remove a misused pragma packed vrf: packets with lladdr src needs dst at input with orig_iif when needs strict net: bridge: vlan: fix error return code in __vlan_add() mac80211: mesh: fix mesh_pathtbl_init() error path ipv4: fix error return code in rtm_to_fib_config() ptrace: Prevent kernel-infoleak in ptrace_get_syscall_info() Linux 5.4.84 compiler.h: fix barrier_data() on clang mm/zsmalloc.c: drop ZSMALLOC_PGTABLE_MAPPING x86/apic/vector: Fix ordering in vector assignment x86/membarrier: Get rid of a dubious optimization x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" proc: use untagged_addr() for pagemap_read addresses kbuild: avoid static_assert for genksyms drm/i915/display/dp: Compute the correct slice count for VDSC on DP mmc: block: Fixup condition for CMD13 polling for RPMB requests pinctrl: amd: remove debounce filter setting in IRQ type setting Input: i8042 - add Acer laptops to the i8042 reset list Input: cm109 - do not stomp on control URB ktest.pl: Fix incorrect reboot for grub2bls can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0 platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet platform/x86: intel-vbtn: Support for tablet mode on HP Pavilion 13 x360 PC platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE platform/x86: thinkpad_acpi: Add BAT1 is primary battery quirk for Thinkpad Yoga 11e 4th gen platform/x86: thinkpad_acpi: Do not report SW_TABLET_MODE on Yoga 11e arm64: tegra: Disable the ACONNECT for Jetson TX2 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend ibmvnic: skip tx timeout reset while in resetting interconnect: qcom: qcs404: Remove GPU and display RPM IDs scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE ARC: stack unwinding: don't assume non-current task is sleeping arm64: dts: broadcom: clear the warnings caused by empty dma-ranges powerpc: Drop -me200 addition to build flags iwlwifi: mvm: fix kernel panic in case of assert during CSA iwlwifi: pcie: set LTR to avoid completion timeout arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. iwlwifi: pcie: limit memory read spin time x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S Kbuild: do not emit debug info for assembly with LLVM_IAS=1 ANDROID: GKI: bring back irq_create_mapping() Linux 5.4.83 Revert "geneve: pull IP header before ECN decapsulation" x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes netfilter: nftables_offload: set address type in control dissector netfilter: nf_tables: avoid false-postive lockdep splat Input: i8042 - fix error return code in i8042_setup_aux() dm writecache: remove BUG() and fail gracefully instead i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc() rtw88: debug: Fix uninitialized memory in debugfs code ASoC: wm_adsp: fix error return code in wm_adsp_load() tipc: fix a deadlock when flushing scheduled work netfilter: ipset: prevent uninit-value in hash_ip6_add gfs2: check for empty rgrp tree in gfs2_ri_update can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check lib/syscall: fix syscall registers retrieval on 32-bit platforms tracing: Fix userstacktrace option for instances iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs spi: bcm2835: Release the DMA channel if probe fails after dma_init i2c: imx: Check for I2SR_IAL after every byte i2c: imx: Fix reset of I2SR_IAL flag speakup: Reject setting the speakup line discipline outside of speakup mm/swapfile: do not sleep with a spin lock held mm: list_lru: set shrinker map bit when child nr_items is not zero coredump: fix core_pattern parse error x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes dm: remove invalid sparse __acquires and __releases annotations dm: fix bug with RCU locking in dm_blk_report_zones powerpc/pseries: Pass MSI affinity to irq_create_mapping() genirq/irqdomain: Add an irq_create_mapping_affinity() function powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE dm writecache: fix the maximum number of arguments scsi: mpt3sas: Fix ioctl timeout drm/i915/gt: Program mocs:63 for cache eviction on gen9 thunderbolt: Fix use-after-free in remove_unplugged_switch() i2c: imx: Don't generate STOP condition if arbitration has been lost cifs: fix potential use-after-free in cifs_echo_request() cifs: allow syscalls to be restarted in __smb_send_rqst() ftrace: Fix updating FTRACE_FL_TRAMP ALSA: hda/generic: Add option to enforce preferred_dacs pairs ALSA: hda/realtek - Add new codec supported for ALC897 ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294 ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model ALSA: hda/realtek: Fix bass speaker DAC assignment on Asus Zephyrus G14 tty: Fix ->session locking tty: Fix ->pgrp locking in tiocspgrp() USB: serial: option: fix Quectel BG96 matching USB: serial: option: add support for Thales Cinterion EXS82 USB: serial: option: add Fibocom NL668 variants USB: serial: ch341: sort device-id entries USB: serial: ch341: add new Product ID for CH341A USB: serial: kl5kusb105: fix memleak on open usb: gadget: f_fs: Use local copy of descriptors for userspace copy Partially revert bpf: Zero-fill re-used per-cpu map element pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH) pinctrl: baytrail: Replace WARN with dev_info_once when setting direct-irq pin to output Linux 5.4.82 RDMA/i40iw: Address an mmap handler exploit in i40iw tracing: Remove WARN_ON in start_thread() Input: i8042 - add ByteSpeed touchpad to noloop table Input: xpad - support Ardwiino Controllers ALSA: usb-audio: US16x08: fix value count for level meters net/mlx5: Fix wrong address reclaim when command interface is down net/mlx5: DR, Proper handling of unsupported Connect-X6DX SW steering net/sched: act_mpls: ensure LSE is pullable before reading it net: openvswitch: ensure LSE is pullable before reading it net: skbuff: ensure LSE is pullable before decrementing the MPLS ttl net: mvpp2: Fix error return code in mvpp2_open() chelsio/chtls: fix a double free in chtls_setkey() vxlan: fix error return code in __vxlan_dev_create() net: pasemi: fix error return code in pasemi_mac_open() cxgb3: fix error return code in t3_sge_alloc_qset() net/x25: prevent a couple of overflows net: ip6_gre: set dev->hard_header_len when using header_ops geneve: pull IP header before ECN decapsulation inet_ecn: Fix endianness of checksum update when setting ECT(1) ibmvnic: Fix TX completion error handling ibmvnic: Ensure that SCRQ entry reads are correctly ordered chelsio/chtls: fix panic during unload reload chtls dt-bindings: net: correct interrupt flags in examples ipv4: Fix tos mask in inet_rtm_getroute() netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list ima: extend boot_aggregate with kernel measurements staging/octeon: fix up merge error bonding: wait for sysfs kobject destruction before freeing struct slave usbnet: ipheth: fix connectivity with iOS 14 tun: honor IOCB_NOWAIT flag tcp: Set INET_ECN_xmit configuration in tcp_reinit_congestion_control sock: set sk_err to ee_errno on dequeue from errq rose: Fix Null pointer dereference in rose_send_frame() net/tls: Protect from calling tls_dev_del for TLS RX twice net/tls: missing received data after fast remote close net/af_iucv: set correct sk_protocol for child sockets ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init devlink: Hold rtnl lock while reading netdev attributes Linux 5.4.81 ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT ASoC: Intel: Multiple I/O PCM format support for pipe ASoC: Intel: Skylake: Await purge request ack on CNL ASoC: Intel: Allow for ROM init retry on CNL platforms ASoC: Intel: Skylake: Shield against no-NHLT configurations ASoC: Intel: Skylake: Enable codec wakeup during chip init ASoC: Intel: Skylake: Select hda configuration permissively ASoC: Intel: Skylake: Remove superfluous chip initialization USB: core: Fix regression in Hercules audio card x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb x86/mce: Do not overwrite no_way_out if mce_end() fails irqchip/exiu: Fix the index of fwspec for IRQ type usb: gadget: Fix memleak in gadgetfs_fill_super USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card usb: gadget: f_midi: Fix memleak in f_midi_alloc USB: core: Change %pK for __user pointers to %px spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe perf probe: Fix to die_entrypc() returns error correctly perf stat: Use proper cpu for shadow stats can: m_can: fix nominal bitiming tseg2 min for version >= 3.1 can: m_can: m_can_open(): remove IRQF_TRIGGER_FALLING from request_threaded_irq()'s flags RDMA/hns: Bugfix for memory window mtpt configuration RDMA/hns: Fix retry_cnt and rnr_cnt when querying QP platform/x86: toshiba_acpi: Fix the wrong variable assignment platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time can: gs_usb: fix endianess problem with candleLight firmware efi: EFI_EARLYCON should depend on EFI efivarfs: revert "fix memory leak in efivarfs_create()" arm64: tegra: Wrong AON HSP reg property size optee: add writeback to valid memory type ibmvnic: fix NULL pointer dereference in ibmvic_reset_crq ibmvnic: fix NULL pointer dereference in reset_sub_crq_queues net: ena: set initial DMA width to avoid intel iommu issue nfc: s3fwrn5: use signed integer for parsing GPIO numbers i40e: Fix removing driver while bare-metal VFs pass traffic IB/mthca: fix return value of error branch in mthca_init_cq() powerpc/64s: Fix allnoconfig build since uaccess flush ibmvnic: notify peers when failover and migration happen ibmvnic: fix call_netdevice_notifiers in do_reset s390/qeth: fix tear down of async TX buffers s390/qeth: fix af_iucv notification race s390/qeth: make af_iucv TX notification call more robust cxgb4: fix the panic caused by non smac rewrite bnxt_en: Release PCI regions when DMA mask setup fails during probe. video: hyperv_fb: Fix the cache type when mapping the VRAM bnxt_en: fix error return code in bnxt_init_board() bnxt_en: fix error return code in bnxt_init_one() scsi: ufs: Fix race between shutdown and runtime resume flow ARM: dts: dra76x: m_can: fix order of clocks arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where needed batman-adv: set .owner to THIS_MODULE iwlwifi: mvm: write queue_sync_state only for sync phy: tegra: xusb: Fix dangling pointer on probe failure ARM: OMAP2+: Manage MPU state properly for omap_enter_idle_coupled() bus: ti-sysc: Fix bogus resetdone warning on enable for cpsw net: dsa: mv88e6xxx: Wait for EEPROM done after HW reset xtensa: uaccess: Add missing __user to strncpy_from_user() prototype perf/x86: fix sysfs type mismatches scsi: target: iscsi: Fix cmd abort fabric stop race scsi: libiscsi: Fix NOP race condition dmaengine: pl330: _prep_dma_memcpy: Fix wrong burst size vhost scsi: fix cmd completion race nvme: free sq/cq dbbuf pointers when dbbuf set fails proc: don't allow async path resolution of /proc/self components HID: Add Logitech Dinovo Edge battery quirk HID: logitech-hidpp: Add HIDPP_CONSUMER_VENDOR_KEYS quirk for the Dinovo Edge x86/xen: don't unbind uninitialized lock_kicker_irq dmaengine: xilinx_dma: use readl_poll_timeout_atomic variant HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices staging: ralink-gdma: fix kconfig dependency bug for DMA_RALINK HID: hid-sensor-hub: Fix issue with devices with no report ID Input: i8042 - allow insmod to succeed on devices without an i8042 controller HID: add support for Sega Saturn HID: cypress: Support Varmilo Keyboards' media hotkeys HID: ite: Replace ABS_MISC 120/121 events with touchpad on/off keypresses HID: uclogic: Add ID for Trust Flex Design Tablet arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect() arm64: pgtable: Fix pte_accessible() trace: fix potenial dangerous pointer KVM: x86: Fix split-irqchip vs interrupt injection window request KVM: x86: handle !lapic_in_kernel case in kvm_cpu_*_extint KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace KVM: PPC: Book3S HV: XIVE: Fix possible oops when accessing ESB page cifs: fix a memleak with modefromsid smb3: Handle error case during offload read path smb3: Avoid Mid pending list corruption smb3: Call cifs reconnect from demultiplex thread wireless: Use linux/stddef.h instead of stddef.h btrfs: fix lockdep splat when reading qgroup config on mount btrfs: don't access possibly stale fs_info data for printing duplicate device btrfs: tree-checker: add missing returns after data_ref alignment checks btrfs: tree-checker: add missing return after error in root_item netfilter: clear skb->next in NF_HOOK_LIST() ipv4: use IS_ENABLED instead of ifdef spi: bcm2835: Fix use-after-free on unbind spi: bcm-qspi: Fix use-after-free on unbind Revert "Exempt multicast addresses from five-second neighbor lifetime" Linux 5.4.80 sched/fair: Fix overutilized update in enqueue_task_fair() mm, page_alloc: skip ->waternark_boost for atomic order-0 allocations mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault() mm: memcg/slab: fix root memcg vmstats x86/microcode/intel: Check patch signature before saving microcode for early loading seccomp: Set PF_SUPERPRIV when checking capability ptrace: Set PF_SUPERPRIV when checking capability mmc: sdhci-pci: Prefer SDR25 timing for High Speed mode for BYT-based Intel controllers drm/i915: Handle max_bpc==16 drm/amd/display: Add missing pflip irq for dcn2.0 Drivers: hv: vmbus: Allow cleanup of VMBUS_CONNECT_CPU if disconnected s390/dasd: fix null pointer dereference for ERP requests s390/cpum_sf.c: fix file permission for cpum_sfb_size mac80211: free sta in sta_info_insert_finish() on errors mac80211: minstrel: fix tx status processing corner case mac80211: minstrel: remove deferred sampling code xtensa: disable preemption around cache alias management calls xtensa: fix TLBTEMP area placement regulator: workaround self-referent regulators regulator: avoid resolve_supply() infinite recursion regulator: fix memory leak with repeated set_machine_constraints() regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200} spi: bcm2835aux: Fix use-after-free on unbind spi: npcm-fiu: Don't leak SPI master in probe error path spi: Introduce device-managed SPI controller allocation spi: lpspi: Fix use-after-free on unbind iio: adc: mediatek: fix unset field iio: accel: kxcjk1013: Add support for KIOX010A ACPI DSM for setting tablet-mode iio: accel: kxcjk1013: Replace is_smo8500_device with an acpi_type enum ext4: fix bogus warning in ext4_update_dx_flag() iio: light: fix kconfig dependency bug for VCNL4035 staging: rtl8723bs: Add 024c:0627 to the list of SDIO device-ids efivarfs: fix memory leak in efivarfs_create() HID: logitech-dj: Fix an error in mse_bluetooth_descriptor tty: serial: imx: keep console clocks always on tty: serial: imx: fix potential deadlock ALSA: hda/realtek: Add some Clove SSID in the ALC293(ALC1220) ALSA: hda/realtek - Add supported for Lenovo ThinkPad Headset Button ALSA: mixart: Fix mutex deadlock ALSA: ctl: fix error path at adding user-defined element set ALSA: usb-audio: Add delay quirk for all Logitech USB devices ALSA: firewire: Clean up a locking issue in copy_resp_to_buf() speakup: Do not let the line discipline be used several times HID: logitech-dj: Fix Dinovo Mini when paired with a MX5x00 receiver HID: logitech-dj: Handle quad/bluetooth keyboards with a builtin trackpad HID: logitech-hidpp: Add PID for MX Anywhere 2 libfs: fix error cast of negative value in simple_attr_write() efi/x86: Free efi_pgd with free_pages() bpf, sockmap: Avoid returning unneeded EAGAIN when redirecting to self bpf, sockmap: Use truesize with sk_rmem_schedule() bpf, sockmap: On receive programs try to fast track SK_PASS ingress bpf, sockmap: Skb verdict SK_PASS to self already checked rmem limits xfs: revert "xfs: fix rmap key and record comparison functions" fail_function: Remove a redundant mutex unlock regulator: ti-abb: Fix array out of bound read access on the first transition xfs: return corresponding errcode if xfs_initialize_perag() fail xfs: strengthen rmap record flags checking xfs: fix the minrecs logic when dealing with inode root child blocks can: m_can: process interrupt only when not runtime suspended can: flexcan: flexcan_chip_start(): fix erroneous flexcan_transceiver_enable() during bus-off recovery iommu/vt-d: Avoid panic if iommu init fails in tboot system iommu/vt-d: Move intel_iommu_gfx_mapped to Intel IOMMU header can: kvaser_usb: kvaser_usb_hydra: Fix KCAN bittiming limits can: kvaser_pciefd: Fix KCAN bittiming limits bpf, sockmap: Ensure SO_RCVBUF memory is observed on ingress redirect bpf, sockmap: Fix partial copy_page_to_iter so progress can still be made net/mlx5: E-Switch, Fail mlx5_esw_modify_vport_rate if qos disabled drm/sun4i: dw-hdmi: fix error return code in sun8i_dw_hdmi_bind() MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu selftests/bpf: Fix error return code in run_getsockopt_test() ASoC: qcom: lpass-platform: Fix memory leak can: m_can: m_can_stop(): set device to software init mode before closing can: m_can: m_can_class_free_dev(): introduce new function can: m_can: m_can_handle_state_change(): fix state change can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI can: flexcan: fix failure handling of pm_runtime_get_sync() can: peak_usb: fix potential integer overflow on shift of a int can: mcba_usb: mcba_usb_start_xmit(): first fill skb, then pass to can_put_echo_skb() can: ti_hecc: Fix memleak in ti_hecc_probe can: dev: can_restart(): post buffer from the right context can: af_can: prevent potential access of uninitialized member in canfd_rcv() can: af_can: prevent potential access of uninitialized member in can_rcv() ip_tunnels: Set tunnel option flag when tunnel metadata is present tools, bpftool: Add missing close before bpftool net attach exit perf lock: Don't free "lock_seq_stat" if read_count isn't zero RMDA/sw: Don't allow drivers using dma_virt_ops on highmem configs RDMA/pvrdma: Fix missing kfree() in pvrdma_register_device() rfkill: Fix use-after-free in rfkill_resume() Input: resistive-adc-touch - fix kconfig dependency on IIO_BUFFER ARM: dts: imx50-evk: Fix the chip select 1 IOMUX arm64: dts: imx8mm: fix voltage for 1.6GHz CPU operating point swiotlb: using SIZE_MAX needs limits.h included arm: dts: imx6qdl-udoo: fix rgmii phy-mode for ksz9031 phy arm64: dts imx8mn: Remove non-existent USB OTG2 arm64: dts: allwinner: h5: OrangePi Prime: Fix ethernet node MIPS: export has_transparent_hugepage() for modules Input: adxl34x - clean up a data type in adxl34x_probe() arm64: dts: allwinner: a64: bananapi-m64: Enable RGMII RX/TX delay on PHY ARM: dts: sunxi: bananapi-m2-plus: Enable RGMII RX/TX delay on Ethernet PHY ARM: dts: sun9i: Enable both RGMII RX/TX delay on Ethernet PHY ARM: dts: sun8i: a83t: Enable both RGMII RX/TX delay on Ethernet PHY ARM: dts: sun8i: h3: orangepi-plus2e: Enable RGMII RX/TX delay on Ethernet PHY ARM: dts: sun7i: bananapi-m1-plus: Enable RGMII RX/TX delay on Ethernet PHY ARM: dts: sun7i: cubietruck: Enable RGMII RX/TX delay on Ethernet PHY ARM: dts: sun6i: a31-hummingbird: Enable RGMII RX/TX delay on Ethernet PHY Revert "arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high" ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet node arm64: dts: allwinner: a64: Pine64 Plus: Fix ethernet node arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet node arm64: dts: allwinner: Pine H64: Enable both RGMII RX/TX delay arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay hwmon: (pwm-fan) Fix RPM calculation gfs2: fix possible reference leak in gfs2_check_blk_type vfs: remove lockdep bogosity in __sb_start_write arm64: smp: Tell RCU about CPUs that fail to come online arm64: psci: Avoid printing in cpu_psci_cpu_die() arm64: errata: Fix handling of1418040
with late CPU onlining ACPI: button: Add DMI quirk for Medion Akoya E2228T selftests: kvm: Fix the segment descriptor layout to match the actual layout scsi: ufs: Fix unbalanced scsi_block_reqs_cnt caused by ufshcd_hold() pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq net: ftgmac100: Fix crash when removing driver net/ncsi: Fix netlink registration net: usb: qmi_wwan: Set DTR quirk for MR400 net/mlx5: Disable QoS when min_rates on all VFs are zero net/mlx5: Add handling of port type in rule deletion tcp: only postpone PROBE_RTT if RTT is < current min_rtt estimate sctp: change to hold/put transport for proto_unreach_timer qlcnic: fix error return code in qlcnic_83xx_restart_hw() qed: fix error return code in qed_iwarp_ll2_start() page_frag: Recover from memory pressure net: x25: Increase refcnt of "struct x25_neigh" in x25_rx_call_request net/tls: fix corrupted data in recvmsg net/smc: fix direct access to ib_gid_addr->ndev in smc_ib_determine_gid() net: qualcomm: rmnet: Fix incorrect receive packet handling during cleanup net/mlx4_core: Fix init_hca fields offset net: lantiq: Wait for the GPHY firmware to be ready netlabel: fix an uninitialized warning in netlbl_unlabel_staticlist() netlabel: fix our progress tracking in netlbl_unlabel_staticlist() net: Have netpoll bring-up DSA management interface net: ethernet: ti: cpsw: fix error return code in cpsw_probe() net: dsa: mv88e6xxx: Avoid VTU corruption on 6097 net: bridge: add missing counters to ndo_get_stats64 callback net: b44: fix error return code in b44_init_one() mlxsw: core: Use variable timeout for EMAD retries lan743x: prevent entire kernel HANG on open, for some platforms lan743x: fix issue causing intermittent kernel log warnings ipv6: Fix error path to cancel the meseage inet_diag: Fix error path to cancel the meseage in inet_req_diag_fill() Exempt multicast addresses from five-second neighbor lifetime devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill() bnxt_en: read EEPROM A2h address using page 0 atm: nicstar: Unmap DMA on send error ah6: fix error return code in ah6_input() Linux 5.4.79 ACPI: GED: fix -Wformat KVM: x86: clflushopt should be treated as a no-op by emulation can: proc: can_remove_proc(): silence remove_proc_entry warning mac80211: always wind down STA state Input: sunkbd - avoid use-after-free in teardown paths net: lantiq: Add locking for TX DMA channel powerpc/8xx: Always fault when _PAGE_ACCESSED is not set net/mlx5: Add retry mechanism to the command entry index allocation net/mlx5: Fix a race when moving command interface to events mode net/mlx5: poll cmd EQ in case of command timeout net/mlx5: Use async EQ setup cleanup helpers for multiple EQs MIPS: PCI: Fix MIPS build selftests/powerpc: entry flush test powerpc: Only include kup-radix.h for 64-bit Book3S powerpc/64s: flush L1D after user accesses powerpc/64s: flush L1D on kernel entry selftests/powerpc: rfi_flush: disable entry flush if present Linux 5.4.78 Convert trailing spaces and periods in path components net: sch_generic: fix the missing new qdisc assignment bug perf/core: Fix race in the perf_mmap_close() function perf scripting python: Avoid declaring function pointers with a visibility attribute x86/speculation: Allow IBPB to be conditionally enabled on CPUs with always-on STIBP powerpc/603: Always fault when _PAGE_ACCESSED is not set drm/i915: Correctly set SFC capability for video engines r8169: fix potential skb double free in an error path tipc: fix memory leak in tipc_topsrv_start() net/x25: Fix null-ptr-deref in x25_connect net: Update window_clamp if SOCK_RCVBUF is set net: udp: fix UDP header access on Fast/frag0 UDP GRO net/af_iucv: fix null pointer dereference on shutdown IPv6: Set SIT tunnel hard_header_len to zero swiotlb: fix "x86: Don't panic if can not alloc buffer for swiotlb" pinctrl: amd: fix incorrect way to disable debounce filter pinctrl: amd: use higher precision for 512 RtcClk drm/gma500: Fix out-of-bounds access to struct drm_device.vblank[] don't dump the threads that had been already exiting when zapped. mmc: renesas_sdhi_core: Add missing tmio_mmc_host_free() at remove mmc: sdhci-of-esdhc: Handle pulse width detection erratum for more SoCs gpio: pcie-idio-24: Enable PEX8311 interrupts gpio: pcie-idio-24: Fix IRQ Enable Register value gpio: pcie-idio-24: Fix irq mask when masking selinux: Fix error return code in sel_ib_pkey_sid_slow() btrfs: fix potential overflow in cluster_pages_for_defrag on 32bit arch ocfs2: initialize ip_next_orphan reboot: fix overflow parsing reboot cpu number Revert "kernel/reboot.c: convert simple_strtoul to kstrtoint" mm/slub: fix panic in slab_alloc_node() jbd2: fix up sparse warnings in checkpoint code futex: Don't enable IRQs unconditionally in put_pi_state() mei: protect mei_cl_mtu from null dereference virtio: virtio_console: fix DMA memory allocation for rproc serial xhci: hisilicon: fix refercence leak in xhci_histb_probe usb: cdc-acm: Add DISABLE_ECHO for Renesas USB Download mode uio: Fix use-after-free in uio_unregister_device() thunderbolt: Add the missed ida_simple_remove() in ring_request_msix() thunderbolt: Fix memory leak if ida_simple_get() fails in enumerate_services() KVM: arm64: Don't hide ID registers from userspace btrfs: dev-replace: fail mount if we don't have replace item with target device btrfs: fix min reserved size calculation in merge_reloc_root btrfs: ref-verify: fix memory leak in btrfs_ref_tree_mod ext4: unlock xattr_sem properly in ext4_inline_data_truncate() ext4: correctly report "not supported" for {usr,grp}jquota when !CONFIG_QUOTA erofs: derive atime instead of leaving it empty perf: Fix get_recursion_context() vrf: Fix fast path output packet handling with async Netfilter rules cosa: Add missing kfree in error path of cosa_write of/address: Fix of_node memory leak in of_dma_is_coherent xfs: fix a missing unlock on error in xfs_fs_map_blocks lan743x: fix "BUG: invalid wait context" when setting rx mode xfs: fix brainos in the refcount scrubber's rmap fragment processor xfs: fix rmap key and record comparison functions xfs: set the unwritten bit in rmap lookup flags in xchk_bmap_get_rmapextents xfs: fix flags argument to rmap lookup when converting shared file rmaps igc: Fix returning wrong statistics nbd: fix a block_device refcount leak in nbd_release bpf: Zero-fill re-used per-cpu map element SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow() net/mlx5: Fix deletion of duplicate rules pinctrl: aspeed: Fix GPI only function problem. bpf: Don't rely on GCC __attribute__((optimize)) to disable GCSE ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template pinctrl: intel: Set default bias in case no particular value given mfd: sprd: Add wakeup capability for PMIC IRQ tick/common: Touch watchdog in tick_unfreeze() on all CPUs spi: bcm2835: remove use of uninitialized gpio flags variable tpm_tis: Disable interrupts on ThinkPad T490s i2c: sh_mobile: implement atomic transfers riscv: Set text_offset correctly for M-Mode selftests: proc: fix warning: _GNU_SOURCE redefined amd/amdgpu: Disable VCN DPG mode for Picasso i2c: mediatek: move dma reset before i2c reset vfio/pci: Bypass IGD init in case of -ENODEV vfio: platform: fix reference leak in vfio_platform_open s390/smp: move rcu_cpu_starting() earlier iommu/amd: Increase interrupt remapping table limit to 512 entries nvme-tcp: avoid repeated request completion nvme-rdma: avoid repeated request completion nvme-tcp: avoid race between time out and tear down nvme-rdma: avoid race between time out and tear down nvme: introduce nvme_sync_io_queues scsi: mpt3sas: Fix timeouts observed while reenabling IRQ scsi: scsi_dh_alua: Avoid crash during alua_bus_detach() tracing: Fix the checking of stackidx in __ftrace_trace_stack cfg80211: regulatory: Fix inconsistent format argument cfg80211: initialize wdev data earlier mac80211: fix use of skb payload instead of header drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running drm/amd/pm: perform SMC reset on suspend/hibernation drm/amdgpu: perform srbm soft reset always on SDMA resume scsi: hpsa: Fix memory leak in hpsa_init_one() gfs2: check for live vs. read-only file system in gfs2_fitrim gfs2: Add missing truncate_inode_pages_final for sd_aspace gfs2: Free rd_bits later in gfs2_clear_rgrpd to fix use-after-free ALSA: hda: Reinstate runtime_allow() for all hda controllers ALSA: hda: Separate runtime and system suspend selftests: pidfd: fix compilation errors due to wait.h selftests/ftrace: check for do_sys_openat2 in user-memory test usb: gadget: goku_udc: fix potential crashes in probe opp: Reduce the size of critical section in _opp_table_kref_release() usb: dwc3: pci: add support for the Intel Alder Lake-S ASoC: cs42l51: manage mclk shutdown delay ASoC: qcom: sdm845: set driver name correctly ath9k_htc: Use appropriate rs_datalen type KVM: x86: don't expose MSR_IA32_UMWAIT_CONTROL unconditionally KVM: arm64: ARM_SMCCC_ARCH_WORKAROUND_1 doesn't return SMCCC_RET_NOT_REQUIRED random32: make prandom_u32() output unpredictable tpm: efi: Don't create binary_bios_measurements file for an empty log xfs: fix scrub flagging rtinherit even if there is no rt device xfs: flush new eof page on truncate to avoid post-eof corruption can: flexcan: flexcan_remove(): disable wakeup completely can: flexcan: remove FLEXCAN_QUIRK_DISABLE_MECR quirk for LS1021A can: peak_canfd: pucan_handle_can_rx(): fix echo management when loopback is on can: peak_usb: peak_usb_get_ts_time(): fix timestamp wrapping can: peak_usb: add range checking in decode operations can: xilinx_can: handle failure cases of pm_runtime_get_sync can: ti_hecc: ti_hecc_probe(): add missed clk_disable_unprepare() in error path can: j1939: j1939_sk_bind(): return failure if netdev is down can: j1939: swap addr and pgn in the send example can: can_create_echo_skb(): fix echo skb generation: always use skb_clone() can: dev: __can_get_echo_skb(): fix real payload length return value for RTR frames can: dev: can_get_echo_skb(): prevent call to kfree_skb() in hard IRQ context can: rx-offload: don't call kfree_skb() from IRQ context afs: Fix warning due to unadvanced marshalling pointer iommu/vt-d: Fix a bug for PDP check in prq_event_thread ALSA: hda: prevent undefined shift in snd_hdac_ext_bus_get_link() perf tools: Add missing swap for ino_generation perf trace: Fix segfault when trying to trace events by cgroup powerpc/eeh_cache: Fix a possible debugfs deadlock netfilter: ipset: Update byte and packet counters regardless of whether they match netfilter: nf_tables: missing validation from the abort path netfilter: use actual socket sk rather than skb sk when routing harder xfs: set xefi_discard when creating a deferred agfl free log intent item ASoC: codecs: wcd9335: Set digital gain range correctly net: xfrm: fix a race condition during allocing spi hv_balloon: disable warning when floor reached genirq: Let GENERIC_IRQ_IPI select IRQ_DOMAIN_HIERARCHY ASoC: Intel: kbl_rt5663_max98927: Fix kabylake_ssp_fixup function btrfs: reschedule when cloning lots of extents btrfs: sysfs: init devices outside of the chunk_mutex btrfs: tracepoints: output proper root owner for trace_find_free_extent() usb: dwc3: gadget: Reclaim extra TRBs after request completion usb: dwc3: gadget: Continue to process pending requests PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 KVM: arm64: Force PTE mapping on fault resulting in a device mapping nbd: don't update block size after device is started time: Prevent undefined behaviour in timespec64_to_ns() drm/i915/gem: Flush coherency domains on first set-domain-ioctl Linux 5.4.77 powercap: restrict energy meter to root access Linux 5.4.76 arm64: dts: marvell: espressobin: Add ethernet switch aliases perf/core: Fix a memory leak in perf_event_parse_addr_filter() xfs: flush for older, xfs specific ioctls PM: runtime: Resume the device earlier in __device_release_driver() PM: runtime: Drop pm_runtime_clean_up_links() PM: runtime: Drop runtime PM references to supplier on link removal ARC: stack unwinding: avoid indefinite looping drm/panfrost: Fix a deadlock between the shrinker and madvise path usb: mtu3: fix panic in mtu3_gadget_stop() USB: Add NO_LPM quirk for Kingston flash drive usb: dwc3: ep0: Fix delay status handling tty: serial: fsl_lpuart: LS1021A has a FIFO size of 16 words, like LS1028A tty: serial: fsl_lpuart: add LS1028A support USB: serial: option: add Telit FN980 composition 0x1055 USB: serial: option: add LE910Cx compositions 0x1203, 0x1230, 0x1231 USB: serial: option: add Quectel EC200T module support USB: serial: cyberjack: fix write-URB completion race serial: txx9: add missing platform_driver_unregister() on error in serial_txx9_init serial: 8250_mtk: Fix uart_get_baud_rate warning s390/pkey: fix paes selftest failure with paes and pkey static build fork: fix copy_process(CLONE_PARENT) race with the exiting ->real_parent vt: Disable KD_FONT_OP_COPY Revert "coresight: Make sysfs functional on topologies with per core sink" arm64/smp: Move rcu_cpu_starting() earlier drm/nouveau/gem: fix "refcount_t: underflow; use-after-free" drm/nouveau/nouveau: fix the start/end range for migration usb: cdns3: gadget: suspicious implicit sign extension ACPI: NFIT: Fix comparison to '-ENXIO' drm/vc4: drv: Add error handding for bind nvmet: fix a NULL pointer dereference when tracing the flush command nvme-rdma: handle unexpected nvme completion data length vsock: use ns_capable_noaudit() on socket create scsi: ibmvscsi: Fix potential race after loss of transport drm/amdgpu: add DID for navi10 blockchain SKU scsi: core: Don't start concurrent async scan on same host blk-cgroup: Pre-allocate tree node on blkg_conf_prep blk-cgroup: Fix memleak on error path drm/sun4i: frontend: Fix the scaler phase on A33 drm/sun4i: frontend: Reuse the ch0 phase for RGB formats drm/sun4i: frontend: Rework a bit the phase data of: Fix reserved-memory overlap detection x86/kexec: Use up-to-dated screen_info copy to fill boot params arm64: dts: meson: add missing g12 rng clock ARM: dts: sun4i-a10: fix cpu_alert temperature futex: Handle transient "ownerless" rtmutex state correctly tracing: Fix out of bounds write in get_trace_buf spi: bcm2835: fix gpio cs level inversion regulator: defer probe when trying to get voltage from unresolved supply ftrace: Handle tracing when switching between context ftrace: Fix recursion check for NMI test mtd: spi-nor: Don't copy self-pointing struct around ring-buffer: Fix recursion protection transitions between interrupt context gfs2: Wake up when sd_glock_disposal becomes zero mm: always have io_remap_pfn_range() set pgprot_decrypted() kthread_worker: prevent queuing delayed work from timer_fn when it is being canceled lib/crc32test: remove extra local_irq_disable/enable mm: mempolicy: fix potential pte_unmap_unlock pte error ALSA: usb-audio: Add implicit feedback quirk for MODX ALSA: usb-audio: Add implicit feedback quirk for Qu-16 ALSA: usb-audio: add usb vendor id as DSD-capable for Khadas devices ALSA: usb-audio: Add implicit feedback quirk for Zoom UAC-2 ALSA: hda/realtek - Enable headphone for ASUS TM420 ALSA: hda/realtek - Fixed HP headset Mic can't be detected Fonts: Replace discarded const qualifier sfp: Fix error handing in sfp_probe() sctp: Fix COMM_LOST/CANT_STR_ASSOC err reporting on big-endian platforms powerpc/vnic: Extend "failover pending" window net: usb: qmi_wwan: add Telit LE910Cx 0x1230 composition ip_tunnel: fix over-mtu packet send fail without TUNNEL_DONT_FRAGMENT flags ionic: check port ptr before use gianfar: Account for Tx PTP timestamp in the skb headroom gianfar: Replace skb_realloc_headroom with skb_cow_head for PTP chelsio/chtls: fix always leaking ctrl_skb chelsio/chtls: fix memory leaks caused by a race cadence: force nonlinear buffers to be cloned ptrace: fix task_join_group_stop() for the case when current is traced tipc: fix use-after-free in tipc_bcast_get_mode arm64: Change .weak to SYM_FUNC_START_WEAK_PI for arch/arm64/lib/mem*.S arm64: lib: Use modern annotations for assembly functions arm64: asm: Add new-style position independent function annotations linkage: Introduce new macros for assembler symbols ASoC: Intel: Skylake: Add alternative topology binary name drm/i915: Drop runtime-pm assert from vgpu io accessors drm/i915/gt: Delay execlist processing for tgl drm/i915: Break up error capture compression loops with cond_resched() Linux 5.4.75 staging: octeon: Drop on uncorrectable alignment or FCS error staging: octeon: repair "fixed-link" support staging: comedi: cb_pcidas: Allow 2-channel commands for AO subdevice staging: fieldbus: anybuss: jump to correct label in an error path KVM: arm64: Fix AArch32 handling of DBGD{CCINT,SCRext} and DBGVCR device property: Don't clear secondary pointer for shared primary firmware node device property: Keep secondary firmware node secondary by type ARM: s3c24xx: fix missing system reset ARM: samsung: fix PM debug build with DEBUG_LL but !MMU arm: dts: mt7623: add missing pause for switchport hil/parisc: Disable HIL driver when it gets stuck cachefiles: Handle readpage error correctly arm64: berlin: Select DW_APB_TIMER_OF tty: make FONTX ioctl use the tty pointer they were actually passed drm/amd/pm: increase mclk switch threshold to 200 us mmc: sdhci: Use Auto CMD Auto Select only when v4_mode is true mmc: sdhci-of-esdhc: set timeout to max before tuning drm/ttm: fix eviction valuable range check. ext4: fix invalid inode checksum ext4: fix error handling code in add_new_gdb ext4: fix leaking sysfs kobject after failed mount vringh: fix __vringh_iov() when riov and wiov are different ring-buffer: Return 0 on success from ring_buffer_resize() 9P: Cast to loff_t before multiplying libceph: clear con->out_msg on Policy::stateful_server faults ceph: promote to unsigned long long before shifting drm/amd/display: Fix kernel panic by dal_gpio_open() error drm/amd/display: Don't invoke kgdb_breakpoint() unconditionally drm/amdgpu: increase the reserved VM size to 2MB drm/amd/display: Avoid MST manager resource leak. drm/amdkfd: Use same SQ prefetch setting as amdgpu drm/amdgpu: correct the gpu reset handling for job != NULL case drm/amd/display: Increase timeout for DP Disable drm/amdgpu: don't map BO in reserved region i2c: imx: Fix external abort on interrupt in exit paths rtc: rx8010: don't modify the global rtc ops ia64: fix build error with !COREDUMP ubi: check kthread_should_stop() after the setting of task state ARC: perf: redo the pct irq missing in device-tree handling perf python scripting: Fix printable strings in python3 scripts ubifs: mount_ubifs: Release authentication resource in error handling path ubifs: Don't parse authentication mount options in remount process ubifs: Fix a memleak after dumping authentication mount options ubifs: journal: Make sure to not dirty twice for auth nodes ubifs: xattr: Fix some potential memory leaks while iterating entries ubifs: dent: Fix some potential memory leaks while iterating entries NFSD: Add missing NFSv2 .pc_func methods NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag NFSv4: Wait for stateid updates after CLOSE/OPEN_DOWNGRADE powerpc: Fix undetected data corruption with P9N DD2.1 VSX CI load emulation powerpc/powermac: Fix low_sleep_handler with KUAP and KUEP powerpc/powernv/elog: Fix race while processing OPAL error log event. powerpc/memhotplug: Make lmb size 64bit powerpc: Warn about use of smt_snooze_delay powerpc/rtas: Restrict RTAS requests from userspace s390/stp: add locking to sysfs functions MIPS: DEC: Restore bootmem reservation for firmware working memory area powerpc/drmem: Make lmb_size 64 bit iio:gyro:itg3200: Fix timestamp alignment and prevent data leak. iio:adc:ti-adc12138 Fix alignment issue with timestamp iio:adc:ti-adc0832 Fix alignment issue with timestamp iio: adc: gyroadc: fix leak of device node iterator iio:light:si1145: Fix timestamp alignment and prevent data leak. dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status udf: Fix memory leak when mounting HID: wacom: Avoid entering wacom_wac_pen_report for pad / battery vt: keyboard, extend func_buf_lock to readers vt: keyboard, simplify vt_kdgkbsent drm/i915: Force VT'd workarounds when running as a guest OS usb: host: fsl-mph-dr-of: check return of dma_set_mask() usb: typec: tcpm: reset hard_reset_count for any disconnect usb: cdc-acm: fix cooldown mechanism usb: dwc3: gadget: END_TRANSFER before CLEAR_STALL command usb: dwc3: gadget: Resume pending requests after CLEAR_STALL usb: dwc3: core: don't trigger runtime pm when remove driver usb: dwc3: core: add phy cleanup for probe error handling usb: dwc3: gadget: Check MPS of the request length usb: dwc3: ep0: Fix ZLP for OUT ep0 requests usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality usb: xhci: Workaround for S3 issue on AMD SNPS 3.0 xHC btrfs: fix readahead hang and use-after-free after removing a device btrfs: fix use-after-free on readahead extent after failure to create it btrfs: tree-checker: validate number of chunk stripes and parity btrfs: cleanup cow block on error btrfs: tree-checker: fix false alert caused by legacy btrfs root item btrfs: use kvzalloc() to allocate clone_roots in btrfs_ioctl_send() btrfs: send, recompute reference path after orphanization of a directory btrfs: send, orphanize first all conflicting inodes when processing references btrfs: reschedule if necessary when logging directory items btrfs: improve device scanning messages btrfs: qgroup: fix wrong qgroup metadata reserve for delayed inode PM: runtime: Remove link state checks in rpm_get/put_supplier() scsi: qla2xxx: Fix crash on session cleanup with unload scsi: mptfusion: Fix null pointer dereferences in mptscsih_remove() w1: mxc_w1: Fix timeout resolution problem leading to bus error acpi-cpufreq: Honor _PSD table setting on new AMD CPUs ACPI: EC: PM: Drop ec_no_wakeup check from acpi_ec_dispatch_gpe() ACPI: EC: PM: Flush EC work unconditionally after wakeup PCI/ACPI: Whitelist hotplug ports for D3 if power managed by ACPI ACPI: debug: don't allow debugging when ACPI is disabled ACPI: video: use ACPI backlight for HP 635 Notebook ACPI / extlog: Check for RDMSR failure ACPI: button: fix handling lid state changes when input device closed NFS: fix nfs_path in case of a rename retry fs: Don't invalidate page buffers in block_write_full_page() media: uvcvideo: Fix uvc_ctrl_fixup_xu_info() not having any effect leds: bcm6328, bcm6358: use devres LED registering function extcon: ptn5150: Fix usage of atomic GPIO with sleeping GPIO chips spi: sprd: Release DMA channel also on probe deferral perf/x86/amd/ibs: Fix raw sample data accumulation perf/x86/amd/ibs: Don't include randomized bits in get_ibs_op_count() perf/x86/intel: Fix Ice Lake event constraint table selftests/x86/fsgsbase: Test PTRACE_PEEKUSER for GSBASE with invalid LDT GS seccomp: Make duplicate listener detection non-racy mmc: sdhci-acpi: AMDI0040: Set SDHCI_QUIRK2_PRESET_VALUE_BROKEN mmc: sdhci: Add LTR support for some Intel BYT based controllers md/raid5: fix oops during stripe resizing nvme-rdma: fix crash when connect rejected sgl_alloc_order: fix memory leak nbd: make the config put is called before the notifying the waiter ARM: dts: s5pv210: remove dedicated 'audio-subsystem' node ARM: dts: s5pv210: move PMU node out of clock controller ARM: dts: s5pv210: move fixed clocks under root node ARM: dts: s5pv210: remove DMA controller bus node name to fix dtschema warnings memory: emif: Remove bogus debugfs error handling ARM: dts: omap4: Fix sgx clock rate for 4430 arm64: dts: renesas: ulcb: add full-pwr-cycle-in-suspend into eMMC nodes cifs: handle -EINTR in cifs_setattr gfs2: add validation checks for size of superblock gfs2: use-after-free in sysfs deregistration KVM: PPC: Book3S HV: Do not allocate HPT for a nested guest ext4: Detect already used quota file early drivers: watchdog: rdc321x_wdt: Fix race condition bugs net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid clk: ti: clockdomain: fix static checker warning rpmsg: glink: Use complete_all for open states bnxt_en: Log unknown link speed appropriately. md/bitmap: md_bitmap_get_counter returns wrong blocks btrfs: fix replace of seed device ARC: [dts] fix the errors detected by dtbs_check drm/amd/display: HDMI remote sink need mode validation for Linux power: supply: test_power: add missing newlines when printing parameters by sysfs ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3 bus/fsl_mc: Do not rely on caller to provide non NULL mc_io drivers/net/wan/hdlc_fr: Correctly handle special skb->protocol values brcmfmac: Fix warning message after dongle setup failed ACPI: Add out of bounds and numa_off protections to pxm_to_node() xfs: don't free rt blocks when we're doing a REMAP bunmapi call can: flexcan: disable clocks during stop mode arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE SUNRPC: Mitigate cond_resched() in xprt_transmit() usb: xhci: omit duplicate actions when suspending a runtime suspended host. coresight: Make sysfs functional on topologies with per core sink uio: free uio id after uio file node is freed USB: adutux: fix debugging cpufreq: sti-cpufreq: add stih418 support riscv: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO samples/bpf: Fix possible deadlock in xdpsock selftests/bpf: Define string const as global for test_sysctl_prog.c media: uvcvideo: Fix dereference of out-of-bound list iterator bpf: Permit map_ptr arithmetic with opcode add and offset 0 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon" ia64: kprobes: Use generic kretprobe trampoline handler printk: reduce LOG_BUF_SHIFT range for H8300 arm64: topology: Stop using MPIDR for topology information drm/bridge/synopsys: dsi: add support for non-continuous HS clock mmc: via-sdmmc: Fix data race bug media: imx274: fix frame interval handling media: tw5864: check status of tw5864_frameinterval_get usb: typec: tcpm: During PR_SWAP, source caps should be sent only after tSwapSourceStart media: platform: Improve queue set up flow for bug fixing media: videodev2.h: RGB BT2020 and HSV are always full range selftests/x86/fsgsbase: Reap a forgotten child drm/brige/megachips: Add checking if ge_b850v3_lvds_init() is working correctly ath10k: fix VHT NSS calculation when STBC is enabled ath10k: start recovery process when payload length exceeds max htc length for sdio video: fbdev: pvr2fb: initialize variables xfs: fix realtime bitmap/summary file truncation when growing rt volume power: supply: bq27xxx: report "not charging" on all types NFS4: Fix oops when copy_file_range is attempted with NFS4.0 source ARM: 8997/2: hw_breakpoint: Handle inexact watchpoint addresses f2fs: handle errors of f2fs_get_meta_page_nofail um: change sigio_spinlock to a mutex s390/startup: avoid save_area_sync overflow f2fs: fix to check segment boundary during SIT page readahead f2fs: fix uninit-value in f2fs_lookup f2fs: add trace exit in exception path sparc64: remove mm_cpumask clearing to fix kthread_use_mm race powerpc: select ARCH_WANT_IRQS_OFF_ACTIVATE_MM mm: fix exec activate_mm vs TLB shootdown and lazy tlb switching race powerpc/powernv/smp: Fix spurious DBG() warning futex: Fix incorrect should_fail_futex() handling ata: sata_nv: Fix retrieving of active qcs RDMA/qedr: Fix memory leak in iWARP CM mlxsw: core: Fix use-after-free in mlxsw_emad_trans_finish() x86/unwind/orc: Fix inactive tasks with stack pointer in %sp on GCC 10 compiled kernels firmware: arm_scmi: Add missing Rx size re-initialisation firmware: arm_scmi: Fix ARCH_COLD_RESET xen/events: block rogue events for some time xen/events: defer eoi in case of excessive number of events xen/events: use a common cpu hotplug hook for event channels xen/events: switch user event channels to lateeoi model xen/pciback: use lateeoi irq binding xen/pvcallsback: use lateeoi irq binding xen/scsiback: use lateeoi irq binding xen/netback: use lateeoi irq binding xen/blkback: use lateeoi irq binding xen/events: add a new "late EOI" evtchn framework xen/events: fix race in evtchn_fifo_unmask() xen/events: add a proper barrier to 2-level uevent unmasking xen/events: avoid removing an event channel while handling it ANDROID: GKI: fix up include/linux/pm.h to handle some abi changes Linux 5.4.74 phy: marvell: comphy: Convert internal SMCC firmware return codes to errno misc: rtsx: do not setting OC_POWER_DOWN reg in rtsx_pci_init_ocp() openrisc: Fix issue with get_user for 64-bit values crypto: x86/crc32c - fix building with clang ias xen/gntdev.c: Mark pages as dirty ata: sata_rcar: Fix DMA boundary mask PM: runtime: Fix timer_expires data type on 32-bit arches serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt serial: qcom_geni_serial: To correct QUP Version detection logic mtd: lpddr: Fix bad logic in print_drs_error RDMA/addr: Fix race with netevent_callback()/rdma_addr_cancel() cxl: Rework error message for incompatible slots p54: avoid accessing the data mapped to streaming DMA evm: Check size of security.evm before using it bpf: Fix comment for helper bpf_current_task_under_cgroup() fuse: fix page dereference after free ata: ahci: mvebu: Make SATA PHY optional for Armada 3720 x86/xen: disable Firmware First mode for correctable memory errors arch/x86/amd/ibs: Fix re-arming IBS Fetch erofs: avoid duplicated permission check for "trusted." xattrs bnxt_en: Invoke cancel_delayed_work_sync() for PFs also. bnxt_en: Fix regression in workqueue cleanup logic in bnxt_remove_one(). bnxt_en: Re-write PCI BARs after PCI fatal error. net: hns3: Clear the CMDQ registers before unmapping BAR region tipc: fix memory leak caused by tipc_buf_append() tcp: Prevent low rmem stalls with SO_RCVLOWAT. ravb: Fix bit fields checking in ravb_hwtstamp_get() r8169: fix issue with forced threading in combination with shared interrupts net/sched: act_mpls: Add softdep on mpls_gso.ko netem: fix zero division in tabledist mlxsw: core: Fix memory leak on module removal ibmvnic: fix ibmvnic_set_mac gtp: fix an use-before-init in gtp_newlink() cxgb4: set up filter action after rewrites chelsio/chtls: fix tls record info to user chelsio/chtls: fix memory leaks in CPL handlers chelsio/chtls: fix deadlock issue bnxt_en: Send HWRM_FUNC_RESET fw command unconditionally. bnxt_en: Check abort error state in bnxt_open_nic(). efivarfs: Replace invalid slashes with exclamation marks in dentries. x86/PCI: Fix intel_mid_pci.c build error when ACPI is not enabled arm64: link with -z norelro regardless of CONFIG_RELOCATABLE arm64: Run ARCH_WORKAROUND_2 enabling code on all CPUs arm64: Run ARCH_WORKAROUND_1 enabling code on all CPUs scripts/setlocalversion: make git describe output more reliable objtool: Support Clang non-section symbols in ORC generation socket: don't clear SOCK_TSTAMP_NEW when SO_TIMESTAMPNS is disabled netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create Revert "PCI/IOV: Mark VFs as not implementing PCI_COMMAND_MEMORY" Revert "vfio/pci: Decouple PCI_COMMAND_MEMORY bit checks from is_virtfn" Linux 5.4.73 usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets. eeprom: at25: set minimum read/write access stride to 1 usb: cdns3: gadget: free interrupt after gadget has deleted USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync(). usb: cdc-acm: add quirk to blacklist ETAS ES58X devices tty: serial: fsl_lpuart: fix lpuart32_poll_get_char tty: serial: lpuart: fix lpuart32_write usage s390/qeth: don't let HW override the configured port role net: korina: cast KSEG0 address to pointer in kfree ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n() dmaengine: dw: Activate FIFO-mode for memory peripherals only dmaengine: dw: Add DMA-channels mask cell support scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config() usb: core: Solve race condition in anchor cleanup functions brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach scsi: smartpqi: Avoid crashing kernel for controller issues ALSA: hda/ca0132 - Add new quirk ID for SoundBlaster AE-7. ALSA: hda/ca0132 - Add AE-7 microphone selection commands. mwifiex: don't call del_timer_sync() on uninitialized timer reiserfs: Fix memory leak in reiserfs_parse_options() ipvs: Fix uninit-value in do_ip_vs_set_ctl() Bluetooth: btusb: Fix memleak in btusb_mtk_submit_wmt_recv_urb tty: ipwireless: fix error handling fbmem: add margin check to fb_check_caps() scsi: qedi: Fix list_del corruption while removing active I/O scsi: qedi: Protect active command list to avoid list corruption scsi: qedf: Return SUCCESS if stale rport is encountered HID: ite: Add USB id match for Acer One S1003 keyboard dock Fix use after free in get_capset_info callback. rtl8xxxu: prevent potential memory leak brcmsmac: fix memory leak in wlc_phy_attach_lcnphy selftests/bpf: Fix test_sysctl_loop{1, 2} failure due to clang change scsi: qla2xxx: Warn if done() or free() are called on an already freed srb scsi: ibmvfc: Fix error return in ibmvfc_probe() iomap: fix WARN_ON_ONCE() from unprivileged users drm/msm/a6xx: fix a potential overflow issue Bluetooth: Only mark socket zapped after unlocking usb: ohci: Default to per-port over-current protection xfs: make sure the rt allocator doesn't run off the end opp: Prevent memory leak in dev_pm_opp_attach_genpd() reiserfs: only call unlock_new_inode() if I_NEW misc: rtsx: Fix memory leak in rtsx_pci_probe bpf: Limit caller's stack depth 256 for subprogs with tailcalls drm/panfrost: add amlogic reset quirk callback ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs() can: flexcan: flexcan_chip_stop(): add error handling and propagate error value usb: dwc3: simple: add support for Hikey 970 USB: cdc-acm: handle broken union descriptors rtw88: increse the size of rx buffer size udf: Avoid accessing uninitialized data on failed inode read udf: Limit sparing table size usb: gadget: function: printer: fix use-after-free in __lock_acquire usb: dwc3: Add splitdisable quirk for Hisilicon Kirin Soc misc: vop: add round_up(x,4) for vring_size to avoid kernel panic mic: vop: copy data to kernel space then write to io memory scsi: target: core: Add CONTROL field for trace events scsi: mvumi: Fix error return in mvumi_io_attach() PM: hibernate: remove the bogus call to get_gendisk() in software_resume() mac80211: handle lack of sband->bitrates in rates ip_gre: set dev->hard_header_len and dev->needed_headroom properly ntfs: add check for mft record size in superblock media: venus: core: Fix runtime PM imbalance in venus_probe fs: dlm: fix configfs memory leak media: venus: fixes for list corruption media: saa7134: avoid a shift overflow mmc: sdio: Check for CISTPL_VERS_1 buffer size media: uvcvideo: Ensure all probed info is returned to v4l2 x86/mce: Make mce_rdmsrl() panic on an inaccessible MSR media: media/pci: prevent memory leak in bttv_probe media: bdisp: Fix runtime PM imbalance on error media: platform: sti: hva: Fix runtime PM imbalance on error media: platform: s3c-camif: Fix runtime PM imbalance on error media: vsp1: Fix runtime PM imbalance on error media: exynos4-is: Fix a reference count leak media: exynos4-is: Fix a reference count leak due to pm_runtime_get_sync media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync media: sti: Fix reference count leaks media: st-delta: Fix reference count leak in delta_run_work media: ati_remote: sanity check for both endpoints media: firewire: fix memory leak x86/mce: Add Skylake quirk for patrol scrub reported errors x86/asm: Replace __force_order with a memory clobber crypto: ccp - fix error handling block: ratelimit handle_bad_sector() message md/bitmap: fix memory leak of temporary bitmap i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs perf: correct SNOOPX field offset sched/features: Fix !CONFIG_JUMP_LABEL case NTB: hw: amd: fix an issue about leak system resources nvmet: fix uninitialized work for zero kato powerpc/pseries: Avoid using addr_to_pfn in real mode powerpc/powernv/dump: Fix race while processing OPAL dump lightnvm: fix out-of-bounds write to array devices->info[] ARM: dts: meson8: remove two invalid interrupt lines from the GPU node arm64: dts: zynqmp: Remove additional compatible string for i2c IPs ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails soc: fsl: qbman: Fix return value on success ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers arm64: dts: actions: limit address range for pinctrl node arm64: dts: renesas: r8a774c0: Fix MSIOF1 DMA channels arm64: dts: renesas: r8a77990: Fix MSIOF1 DMA channels arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts arm64: dts: qcom: pm8916: Remove invalid reg size from wcd_codec arm64: dts: qcom: msm8916: Remove one more thermal trip point unit name arm64: dts: imx8mq: Add missing interrupts to GPC memory: fsl-corenet-cf: Fix handling of platform_get_irq() error memory: omap-gpmc: Fix build error without CONFIG_OF memory: omap-gpmc: Fix a couple off by ones arm64: dts: allwinner: h5: remove Mali GPU PMU module ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator ARM: s3c24xx: fix mmc gpio lookup tables ARM: at91: pm: of_node_put() after its usage ARM: dts: imx6sl: fix rng node arm64: dts: meson: vim3: correct led polarity netfilter: nf_fwd_netdev: clear timestamp in forwarding path netfilter: ebtables: Fixes dropping of small packets in bridge nat netfilter: conntrack: connection timeout after re-register scsi: bfa: Fix error return in bfad_pci_init() KVM: x86: emulating RDPID failure shall return #UD rather than #GP Input: sun4i-ps2 - fix handling of platform_get_irq() error Input: twl4030_keypad - fix handling of platform_get_irq() error Input: omap4-keypad - fix handling of platform_get_irq() error Input: ep93xx_keypad - fix handling of platform_get_irq() error Input: stmfts - fix a & vs && typo Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() SUNRPC: fix copying of multiple pages in gss_read_proxy_verf() clk: imx8mq: Fix usdhc parents order vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages vfio/pci: Clear token on bypass registration failure ext4: limit entries returned when counting fsmap records svcrdma: fix bounce buffers for unaligned offsets and multiple pages watchdog: sp5100: Fix definition of EFCH_PM_DECODEEN3 watchdog: Use put_device on error watchdog: Fix memleak in watchdog_cdev_register clk: bcm2835: add missing release if devm_clk_hw_register fails clk: at91: clk-main: update key before writing AT91_CKGR_MOR module: statically initialize init section freeing data clk: mediatek: add UART0 clock support clk: rockchip: Initialize hw to error to avoid undefined behavior pwm: img: Fix null pointer access in probe clk: keystone: sci-clk: fix parsing assigned-clock data during probe clk: qcom: gcc-sdm660: Fix wrong parent_map vfio/pci: Decouple PCI_COMMAND_MEMORY bit checks from is_virtfn PCI/IOV: Mark VFs as not implementing PCI_COMMAND_MEMORY rpmsg: smd: Fix a kobj leak in in qcom_smd_parse_edge() PCI: iproc: Set affinity mask on MSI interrupts PCI: aardvark: Check for errors from pci_bridge_emul_init() call clk: meson: g12a: mark fclk_div2 as critical i2c: rcar: Auto select RESET_CONTROLLER mailbox: avoid timer start from callback rapidio: fix the missed put_device() for rio_mport_add_riodev rapidio: fix error handling path ramfs: fix nommu mmap with gaps in the page cache lib/crc32.c: fix trivial typo in preprocessor condition mm/page_owner: change split_page_owner to take a count RDMA/rxe: Handle skb_clone() failure in rxe_recv.c f2fs: wait for sysfs kobject removal before freeing f2fs_sb_info selftests/powerpc: Fix eeh-basic.sh exit codes maiblox: mediatek: Fix handling of platform_get_irq() error RDMA/rxe: Fix skb lifetime in rxe_rcv_mcast_pkt() IB/rdmavt: Fix sizeof mismatch cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier i3c: master: Fix error return in cdns_i3c_master_probe() powerpc/perf/hv-gpci: Fix starting index value powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints RDMA/ipoib: Set rtnl_link_ops for ipoib interfaces overflow: Include header file with SIZE_MAX declaration kdb: Fix pager search for multi-line strings mtd: spinand: gigadevice: Add QE Bit mtd: spinand: gigadevice: Only one dummy byte in QUADIO mtd: rawnand: vf610: disable clk on error handling path in probe RDMA/hns: Fix missing sq_sig_type when querying QP RDMA/hns: Fix the wrong value of rnr_retry when querying qp perf stat: Skip duration_time in setup_system_wide i40iw: Add support to make destroy QP synchronous RDMA/mlx5: Disable IB_DEVICE_MEM_MGT_EXTENSIONS if IB_WR_REG_MR can't work RDMA/hns: Set the unsupported wr opcode perf intel-pt: Fix "context_switch event has no tid" error RDMA/cma: Consolidate the destruction of a cma_multicast in one place RDMA/cma: Remove dead code for kernel rdmacm multicast powerpc/64s/radix: Fix mm_cpumask trimming race vs kthread_use_mm powerpc/tau: Disable TAU between measurements powerpc/tau: Check processor type before enabling TAU interrupt powerpc/tau: Remove duplicated set_thresholds() call powerpc/tau: Convert from timer to workqueue powerpc/tau: Use appropriate temperature sample interval powerpc/book3s64/hash/4k: Support large linear mapping range with 4K RDMA/qedr: Fix inline size returned for iWARP RDMA/qedr: Fix return code if accept is called on a destroyed qp RDMA/qedr: Fix use of uninitialized field RDMA/qedr: Fix qp structure memory leak RDMA/umem: Prevent small pages from being returned by ib_umem_find_best_pgsz() RDMA/umem: Fix ib_umem_find_best_pgsz() for mappings that cross a page boundary xfs: fix high key handling in the rt allocator's query_range function xfs: fix deadlock and streamline xfs_getfsmap performance xfs: limit entries returned when counting fsmap records ida: Free allocated bitmap in error path arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER ARM: 9007/1: l2c: fix prefetch bits init in L2X0_AUX_CTRL using DT values mtd: mtdoops: Don't write panic data twice RDMA/mlx5: Fix potential race between destroy and CQE poll pseries/drmem: don't cache node id in drmem_lmb struct powerpc/pseries: explicitly reschedule during drmem_lmb list traversal RDMA/umem: Fix signature of stub ib_umem_find_best_pgsz() RDMA/hns: Add a check for current state before modifying QP mtd: lpddr: fix excessive stack usage with clang RDMA/ucma: Add missing locking around rdma_leave_multicast() RDMA/ucma: Fix locking for ctx->events_reported powerpc/icp-hv: Fix missing of_node_put() in success path powerpc/pseries: Fix missing of_node_put() in rng_init() IB/mlx4: Adjust delayed work when a dup is observed IB/mlx4: Fix starvation in paravirt mux/demux i3c: master add i3c_master_attach_boardinfo to preserve boardinfo selftests/ftrace: Change synthetic event name for inter-event-combined test fs: fix NULL dereference due to data race in prepend_path() mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary mm/memcg: fix device private memcg accounting mm/swapfile.c: fix potential memory leak in sys_swapon netfilter: nf_log: missing vlan offload tag and proto net: korina: fix kfree of rx/tx descriptor array ipvs: clear skb->tstamp in forwarding path mwifiex: fix double free platform/x86: mlx-platform: Remove PSU EEPROM configuration ipmi_si: Fix wrong return value in try_smi_init() scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs() scsi: target: tcmu: Fix warning: 'page' may be used uninitialized usb: dwc2: Fix INTR OUT transfers in DDMA mode. nl80211: fix non-split wiphy information usb: gadget: u_ether: enable qmult on SuperSpeed Plus as well usb: gadget: f_ncm: fix ncm_bitrate for SuperSpeed and above. iwlwifi: mvm: split a print to avoid a WARNING in ROC mfd: sm501: Fix leaks in probe() net: enic: Cure the enic api locking trainwreck iio: adc: stm32-adc: fix runtime autosuspend delay when slow polling qtnfmac: fix resource leaks on unsupported iftype error return path ibmvnic: set up 200GBPS speed coresight: etm: perf: Fix warning caused by etm_setup_aux failure nl80211: fix OBSS PD min and max offset validation nvmem: core: fix possibly memleak when use nvmem_cell_info_to_nvmem_cell() HID: hid-input: fix stylus battery reporting ASoC: fsl_sai: Instantiate snd_soc_dai_driver slimbus: qcom-ngd-ctrl: disable ngd in qmi server down callback slimbus: core: do not enter to clock pause mode in core slimbus: core: check get_addr before removing laddr ida quota: clear padding in v2r1_mem2diskdqb() usb: dwc2: Fix parameter type in function pointer prototype ALSA: seq: oss: Avoid mutex lock for a long-time ioctl misc: mic: scif: Fix error handling path dmaengine: dmatest: Check list for emptiness before access its last entry ath6kl: wmi: prevent a shift wrapping bug in ath6kl_wmi_delete_pstream_cmd() spi: omap2-mcspi: Improve performance waiting for CHSTAT net: dsa: rtl8366rb: Support all 4096 VLANs ASoC: tlv320aic32x4: Fix bdiv clock rate derivation net: wilc1000: clean up resource in error path of init mon interface net: dsa: rtl8366: Skip PVID setting if not requested net: dsa: rtl8366: Refactor VLAN/PVID init net: dsa: rtl8366: Check validity of passed VLANs xhci: don't create endpoint debugfs entry before ring buffer is set. coresight: etm4x: Handle unreachable sink in perf mode drm: mxsfb: check framebuffer pitch cpufreq: armada-37xx: Add missing MODULE_DEVICE_TABLE net: stmmac: use netif_tx_start|stop_all_queues() function scsi: mpt3sas: Fix sync irqs net/mlx5: Don't call timecounter cyc2time directly from 1PPS flow pinctrl: mcp23s08: Fix mcp23x17 precious range pinctrl: mcp23s08: Fix mcp23x17_regmap initialiser iomap: Clear page error before beginning a write drm/panfrost: Ensure GPU quirks are always initialised drm/msm: Avoid div-by-zero in dpu_crtc_atomic_check() HID: roccat: add bounds checking in kone_sysfs_write_settings() ASoC: fsl: imx-es8328: add missing put_device() call in imx_es8328_probe() video: fbdev: radeon: Fix memleak in radeonfb_pci_register video: fbdev: sis: fix null ptr dereference video: fbdev: vga16fb: fix setting of pixclock because a pass-by-value error drivers/virt/fsl_hypervisor: Fix error handling path pwm: lpss: Add range limit check for the base_unit register value pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() pty: do tty_flip_buffer_push without port->lock in pty_write tty: hvcs: Don't NULL tty->driver_data until hvcs_cleanup() tty: serial: earlycon dependency binder: Remove bogus warning on failed same-process transaction drm/crc-debugfs: Fix memleak in crc_control_write drm: panel: Fix bpc for OrtusTech COM43H4M85ULC panel mm/error_inject: Fix allow_error_inject function signatures. VMCI: check return value of get_user_pages_fast() for errors staging: emxx_udc: Fix passing of NULL to dma_alloc_coherent() backlight: sky81452-backlight: Fix refcount imbalance on error scsi: csiostor: Fix wrong return value in csio_hw_prep_fw() scsi: qla2xxx: Fix wrong return value in qla_nvme_register_hba() scsi: qla2xxx: Fix wrong return value in qlt_chk_unresolv_exchg() scsi: qla4xxx: Fix an error handling path in 'qla4xxx_get_host_stats()' drm/gma500: fix error check staging: rtl8192u: Do not use GFP_KERNEL in atomic context mwifiex: Do not use GFP_KERNEL in atomic context brcmfmac: check ndev pointer ASoC: qcom: lpass-cpu: fix concurrency issue ASoC: qcom: lpass-platform: fix memory leak wcn36xx: Fix reported 802.11n rx_highest rate wcn3660/wcn3680 ath10k: Fix the size used in a 'dma_free_coherent()' call in an error handling path ath9k: Fix potential out of bounds in ath9k_htc_txcompletion_cb() ath6kl: prevent potential array overflow in ath6kl_add_new_sta() drm: panel: Fix bus format for OrtusTech COM43H4M85ULC panel drm/amd/display: Fix wrong return value in dm_update_plane_state() Bluetooth: hci_uart: Cancel init work before unregistering drm/vkms: fix xrgb on compute crc ath10k: provide survey info as accumulated data blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue spi: spi-s3c64xx: Check return values spi: spi-s3c64xx: swap s3c64xx_spi_set_cs() and s3c64xx_enable_datapath() pinctrl: bcm: fix kconfig dependency warning when !GPIOLIB regulator: resolve supply after creating regulator media: ti-vpe: Fix a missing check and reference count leak media: stm32-dcmi: Fix a reference count leak media: s5p-mfc: Fix a reference count leak media: camss: Fix a reference count leak. media: platform: fcp: Fix a reference count leak. media: rockchip/rga: Fix a reference count leak. media: rcar-vin: Fix a reference count leak. media: tc358743: cleanup tc358743_cec_isr media: tc358743: initialize variable media: mx2_emmaprp: Fix memleak in emmaprp_probe cypto: mediatek - fix leaks in mtk_desc_ring_alloc hwmon: (pmbus/max34440) Fix status register reads for MAX344{51,60,61} crypto: omap-sham - fix digcnt register handling with export/import media: rcar-csi2: Allocate v4l2_async_subdev dynamically media: rcar_drif: Allocate v4l2_async_subdev dynamically media: rcar_drif: Fix fwnode reference leak when parsing DT media: i2c: ov5640: Enable data pins on poweron for DVP mode media: i2c: ov5640: Separate out mipi configuration from s_power media: i2c: ov5640: Remain in power down for DVP mode unless streaming media: omap3isp: Fix memleak in isp_probe media: staging/intel-ipu3: css: Correctly reset some memory media: uvcvideo: Silence shift-out-of-bounds warning media: uvcvideo: Set media controller entity functions media: m5mols: Check function pointer in m5mols_sensor_power media: ov5640: Correct Bit Div register in clock tree diagram media: Revert "media: exynos4-is: Add missed check for pinctrl_lookup_state()" media: tuner-simple: fix regression in simple_set_radio_freq crypto: picoxcell - Fix potential race condition bug crypto: ixp4xx - Fix the size used in a 'dma_free_coherent()' call crypto: mediatek - Fix wrong return value in mtk_desc_ring_alloc() crypto: algif_skcipher - EBUSY on aio should be an error x86/events/amd/iommu: Fix sizeof mismatch x86/nmi: Fix nmi_handle() duration miscalculation perf/x86/intel/uncore: Reduce the number of CBOX counters perf/x86/intel/uncore: Update Ice Lake uncore units sched/fair: Fix wrong cpu selecting from isolated domain drivers/perf: thunderx2_pmu: Fix memory resource error handling drivers/perf: xgene_pmu: Fix uninitialized resource struct x86/fpu: Allow multiple bits in clearcpuid= parameter perf/x86/intel/ds: Fix x86_pmu_stop warning for large PEBS EDAC/ti: Fix handling of platform_get_irq() error EDAC/aspeed: Fix handling of platform_get_irq() error EDAC/i5100: Fix error handling order in i5100_init_one() crypto: caam/qi - add fallback for XTS with more than 8B IV crypto: algif_aead - Do not set MAY_BACKLOG on the async path ima: Don't ignore errors from crypto_shash_update() KVM: SVM: Initialize prev_ga_tag before use KVM: x86/mmu: Commit zap of remaining invalid pages when recovering lpages KVM: nVMX: Reload vmcs01 if getting vmcs12's pages fails KVM: nVMX: Reset the segment cache when stuffing guest segs SMB3: Resolve data corruption of TCP server info fields cifs: Return the error from crypt_message when enc/dec key not found. cifs: remove bogus debug code ALSA: hda/realtek: Enable audio jacks of ASUS D700SA with ALC887 ALSA: hda/realtek - Add mute Led support for HP Elitebook 845 G7 ALSA: hda/realtek - set mic to auto detect on a HP AIO machine ALSA: hda/realtek - The front Mic on a HP machine doesn't work icmp: randomize the global rate limiter tcp: fix to update snd_wl1 in bulk receiver fast path selftests: rtnetlink: load fou module for kci_test_encap_fou() test selftests: forwarding: Add missing 'rp_filter' configuration r8169: fix operation under forced interrupt threading nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download() nexthop: Fix performance regression in nexthop deletion net/sched: act_tunnel_key: fix OOB write in case of IPv6 ERSPAN tunnels net: Properly typecast int values to set sk_max_pacing_rate net: hdlc_raw_eth: Clear the IFF_TX_SKB_SHARING flag after calling ether_setup net: hdlc: In hdlc_rcv, check to make sure dev is an HDLC device net: ftgmac100: Fix Aspeed ast2600 TX hang issue ibmvnic: save changed mac address to adapter->mac_addr chelsio/chtls: correct function return and return type chelsio/chtls: correct netdevice for vlan interface chelsio/chtls: fix socket lock nvme-pci: disable the write zeros command for Intel 600P/P3100 ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close ALSA: hda: fix jack detection with Realtek codecs when in D3 ALSA: bebob: potential info leak in hwdep_read() binder: fix UAF when releasing todo list cxgb4: handle 4-tuple PEDIT to NAT mode translation r8169: fix data corruption issue on RTL8402 net_sched: remove a redundant goto chain check net/ipv4: always honour route mtu during forwarding net: j1939: j1939_session_fresh_new(): fix missing initialization of skbcnt can: j1935: j1939_tp_tx_dat_new(): fix missing initialization of skbcnt can: m_can_platform: don't call m_can_class_suspend in runtime suspend socket: fix option SO_TIMESTAMPING_NEW tipc: fix the skb_unshare() in tipc_buf_append() net: usb: qmi_wwan: add Cellient MPL200 card net/tls: sendfile fails with ktls offload net/smc: fix valid DMBE buffer sizes net: fix pos incrementment in ipv6_route_seq_next net: fec: Fix PHY init after phy_reset_after_clk_enable() net: fec: Fix phy_device lookup for phy_reset_after_clk_enable() mlx4: handle non-napi callers to napi_poll ipv4: Restore flowi4_oif update before call to xfrm_lookup_route ibmveth: Identify ingress large send packets. ibmveth: Switch order of ibmveth_helper calls. Linux 5.4.72 crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA crypto: bcm - Verify GCM/CCM key length in setkey xen/events: don't use chip_data for legacy IRQs reiserfs: Fix oops during mount reiserfs: Initialize inode keys properly USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters USB: serial: pl2303: add device-id for HP GC device staging: comedi: check validity of wMaxPacketSize of usb endpoints found USB: serial: option: Add Telit FT980-KS composition USB: serial: option: add Cellient MPL200 card media: usbtv: Fix refcounting mixup Bluetooth: Disconnect if E0 is used for Level 4 Bluetooth: Fix update of connection state in `hci_encrypt_cfm` Bluetooth: Consolidate encryption handling in hci_encrypt_cfm Bluetooth: MGMT: Fix not checking if BT_HS is enabled Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel Bluetooth: A2MP: Fix not initializing all members ACPI: Always build evged in ARM: 8939/1: kbuild: use correct nm executable btrfs: take overcommit into account in inc_block_group_ro btrfs: don't pass system_chunk into can_overcommit perf cs-etm: Move definition of 'traceid_list' global variable from header file Linux 5.4.71 net_sched: commit action insertions together net_sched: defer tcf_idr_insert() in tcf_action_init_1() net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Input: ati_remote2 - add missing newlines when printing module parameters net/mlx5e: Fix driver's declaration to support GRE offload net/tls: race causes kernel panic net/core: check length before updating Ethertype in skb_mpls_{push,pop} tcp: fix receive window update in tcp_add_backlog() mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged mmc: core: don't set limits.discard_granularity as 0 perf: Fix task_function_call() error handling rxrpc: Fix server keyring leak rxrpc: The server keyring isn't network-namespaced rxrpc: Fix some missing _bh annotations on locking conn->state_lock rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read() rxrpc: Fix rxkad token xdr encoding net/mlx5e: Fix VLAN create flow net/mlx5e: Fix VLAN cleanup flow net/mlx5e: Add resiliency in Striding RQ mode for packets larger than MTU net/mlx5: Fix request_irqs error flow net/mlx5: Avoid possible free of command entry while timeout comp handler virtio-net: don't disable guest csum when disable LRO net: usb: ax88179_178a: fix missing stop entry in driver_info r8169: fix RTL8168f/RTL8411 EPHY config mlxsw: spectrum_acl: Fix mlxsw_sp_acl_tcam_group_add()'s error path mdio: fix mdio-thunder.c dependency & build error bonding: set dev->needed_headroom in bond_setup_by_slave() net: ethernet: cavium: octeon_mgmt: use phy_start and phy_stop iavf: Fix incorrect adapter get in iavf_resume iavf: use generic power management xfrm: Use correct address family in xfrm_state_find platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP net: stmmac: removed enabling eee in EEE set callback xfrm: clone whole liftime_cur structure in xfrm_do_migrate xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate iommu/vt-d: Fix lockdep splat in iommu_flush_dev_iotlb() drm/amdgpu: prevent double kfree ttm->sg openvswitch: handle DNAT tuple collision net: team: fix memory leak in __team_options_register team: set dev->needed_headroom in team_setup_by_port() sctp: fix sctp_auth_init_hmacs() error path i2c: owl: Clear NACK and BUS error bits i2c: meson: fixup rate calculation with filter delay i2c: meson: fix clock setting overwrite cifs: Fix incomplete memory allocation on setxattr path xfrmi: drop ignore_df check before updating pmtu nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() tcp: use sendpage_ok() to detect misused .sendpage net: introduce helper sendpage_ok() in include/linux/net.h mm/khugepaged: fix filemap page_to_pgoff(page) != offset macsec: avoid use-after-free in macsec_handle_frame() nvme-core: put ctrl ref when module ref get fail btrfs: allow btrfs_truncate_block() to fallback to nocow for data space reservation btrfs: fix RWF_NOWAIT write not failling when we need to cow btrfs: Ensure we trim ranges across block group boundary btrfs: volumes: Use more straightforward way to calculate map length Btrfs: send, fix emission of invalid clone operations within the same file Btrfs: send, allow clone operations within the same file arm64: dts: stratix10: add status to qspi dts node i2c: i801: Exclude device from suspend direct complete optimization perf top: Fix stdio interface input handling with glibc 2.28+ perf test session topology: Fix data path driver core: Fix probe_count imbalance in really_probe() platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting bpf: Prevent .BTF section elimination bpf: Fix sysfs export of empty BTF section platform/x86: thinkpad_acpi: initialize tp_nvram_state variable platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360 Platform: OLPC: Fix memleak in olpc_ec_probe usermodehelper: reset umask to default before executing user process vhost: Use vhost_get_used_size() in vhost_vring_set_addr() vhost: Don't call access_ok() when using IOTLB drm/nouveau/mem: guard against NULL pointer access in mem_del net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() io_uring: Fix double list add in io_queue_async_work() io_uring: Fix remove irrelevant req from the task_list io_uring: Fix missing smp_mb() in io_cancel_async_work() io_uring: Fix resource leaking when kill the process Revert "ravb: Fixed to be able to unload modules" fbcon: Fix global-out-of-bounds read in fbcon_get_font() Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h Linux 5.4.70 netfilter: ctnetlink: add a range check for l3/l4 protonum ep_create_wakeup_source(): dentry name can change under you... epoll: EPOLL_CTL_ADD: close the race in decision to take fast path epoll: replace ->visited/visited_list with generation count epoll: do not insert into poll queues until all sanity checks are done nvme: consolidate chunk_sectors settings nvme: Introduce nvme_lba_to_sect() nvme: Cleanup and rename nvme_block_nr() mm: don't rely on system state to detect hot-plug operations mm: replace memmap_context by meminit_context block/diskstats: more accurate approximation of io_ticks for slow disks random32: Restore __latent_entropy attribute on net_rand_state scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting Input: trackpoint - enable Synaptics trackpoints i2c: cpm: Fix i2c_ram structure gpio: aspeed: fix ast2600 bank properties gpio/aspeed-sgpio: don't enable all interrupts by default gpio/aspeed-sgpio: enable access to all 80 input & output sgpios iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate() clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED clk: tegra: Always program PLL_E when enabled nfs: Fix security label length not being reset pinctrl: mvebu: Fix i2c sda definition for 98DX3236 phy: ti: am654: Fix a leak in serdes_am654_probe() gpio: sprd: Clear interrupt when setting the type as edge nvme-fc: fail new connections to a deleted host or remote port nvme-pci: fix NULL req in completion handler spi: fsl-espi: Only process interrupts for expected events tools/io_uring: fix compile breakage tracing: Make the space reserved for the pid wider mac80211: do not allow bigger VHT MPDUs than the hardware supports mac80211: Fix radiotap header channel flag for 6GHz band drivers/net/wan/hdlc: Set skb->protocol before transmitting drivers/net/wan/lapbether: Make skb->protocol consistent with the header fuse: fix the ->direct_IO() treatment of iov_iter nvme-core: get/put ctrl and transport module in nvme_dev_open/release() rndis_host: increase sleep time in the query-response loop net: dec: de2104x: Increase receive ring size for Tulip drm/sun4i: mixer: Extend regmap max_register drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices libbpf: Remove arch-specific include path in Makefile clocksource/drivers/timer-gx6605s: Fixup counter reload drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config memstick: Skip allocating card when removing host ftrace: Move RCU is watching check after recursion check iio: adc: qcom-spmi-adc5: fix driver name Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 xfs: trim IO to found COW extent limit net: virtio_vsock: Enhance connection semantics vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock() clk: socfpga: stratix10: fix the divider for the emac_ptp_free_clk gpio: tc35894: fix up tc35894 interrupt configuration gpio: mockup: fix resource leak in error path gpio: siox: explicitly support only threaded irqs USB: gadget: f_ncm: Fix NDP16 datagram validation mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models btrfs: fix filesystem corruption after a device replace Revert "opp: Replace list_kref with a local counter" Revert "opp: Increase parsed_static_opps in _of_add_opp_table_v1()" Revert "mmc: core: Fix size overflow for mmc partitions" Revert "exec: Add exec_update_mutex to replace cred_guard_mutex" Revert "exec: Fix a deadlock in strace" Revert "selftests/ptrace: add test cases for dead-locks" Revert "kernel/kcmp.c: Use new infrastructure to fix deadlocks in execve" Revert "proc: Use new infrastructure to fix deadlocks in execve" Revert "proc: io_accounting: Use new infrastructure to fix deadlocks in execve" Revert "perf: Use new infrastructure to fix deadlocks in execve" Linux 5.4.69 ata: sata_mv, avoid trigerrable BUG_ON ata: make qc_prep return ata_completion_errors ata: define AC_ERR_OK kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE dm: fix bio splitting and its bio completion order for regular IO KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl mm/gup: fix gup_fast with dynamic page table folding mm, THP, swap: fix allocating cluster for swapfile by mistake dmabuf: fix NULL pointer dereference in dma_buf_release() btrfs: fix overflow when copying corrupt csums for a message kprobes: tracing/kprobes: Fix to kill kprobes on initmem after boot kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() s390/dasd: Fix zero write for FBA devices tracing: fix double free lib/string.c: implement stpcpy ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged ALSA: usb-audio: Add delay quirk for H570e USB headsets scsi: lpfc: Fix initial FLOGI failure due to BBSCN not supported x86/ioapic: Unbreak check_timer() arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback mm: validate pmd after splitting KVM: SVM: Add a dedicated INVD intercept routine KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE regulator: axp20x: fix LDO2/4 description MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() regmap: fix page selection for noinc writes regmap: fix page selection for noinc reads ALSA: asihpi: fix iounmap in error handler lib80211: fix unmet direct dependendices config warning when !CRYPTO bpf: Fix a rcu warning for bpffs map pretty-print batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN nvme-tcp: fix kconfig dependency warning when !CRYPTO batman-adv: Add missing include for in_interrupt() drm/sun4i: sun8i-csc: Secondary CSC register correction net: qed: RDMA personality shouldn't fail VF load net: qede: Disable aRFS for NPAR and 100G net: qed: Disable aRFS for NPAR and 100G drm/vc4/vc4_hdmi: fill ASoC card owner bpf: Fix clobbering of r2 in bpf_gen_ld_abs mac802154: tx: fix use-after-free netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled batman-adv: mcast/TT: fix wrongly dropped or rerouted packets atm: eni: fix the missed pci_disable_device() for eni_init_one() batman-adv: bla: fix type misuse for backbone_gw hash indexing mwifiex: Increase AES key storage size to 256 bits clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() ieee802154/adf7242: check status of adf7242_read_reg ieee802154: fix one possible memleak in ca8210_dev_com_init objtool: Fix noreturn detection for ignored functions i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() drm/amdgpu/dc: Require primary plane to be enabled whenever the CRTC is drm/amd/display: update nv1x stutter latencies drm/amdkfd: fix a memory leak issue EDAC/ghes: Check whether the driver is on the safe list correctly lockdep: fix order in trace_hardirqs_off_caller() s390/init: add missing __init annotations i2c: aspeed: Mask IRQ status to relevant bits RISC-V: Take text_mutex in ftrace_init_nop() ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1 ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811 ASoC: pcm3168a: ignore 0 Hz settings device_cgroup: Fix RCU list debugging warning nvme: explicitly update mpath disk capacity on revalidation net: openvswitch: use div_u64() for 64-by-32 divisions ALSA: hda: Workaround for spurious wakeups on some Intel platforms ALSA: hda: Always use jackpoll helper for jack update after resume perf parse-events: Use strcmp() to compare the PMU name opp: Increase parsed_static_opps in _of_add_opp_table_v1() mt76: fix LED link time failure ubi: fastmap: Free unused fastmap anchor peb during detach scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure perf tests: Fix test 68 zstd compression for s390 btrfs: qgroup: fix data leak caused by race between writeback and truncate vfio/pci: fix racy on error and request eventfd ctx selftests/x86/syscall_nt: Clear weird flags after each test scsi: libfc: Skip additional kref updating work event scsi: libfc: Handling of extra kref mac80211: skip mpath lookup also for control port tx nvme: fix possible deadlock when I/O is blocked cifs: Fix double add page to memcg when cifs_readpages vfio/pci: Clear error and request eventfd ctx after releasing NFS: nfs_xdr_status should record the procedure name x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline mtd: parser: cmdline: Support MTD names containing one or more colons rapidio: avoid data race between file operation callbacks and mport_cdev_add(). mm: memcontrol: fix stat-corrupting race in charge moving mm/swap_state: fix a data race in swapin_nr_pages ceph: fix potential race in ceph_check_caps PCI: tegra: Fix runtime PM imbalance on error mtd: rawnand: omap_elm: Fix runtime PM imbalance on error mtd: rawnand: gpmi: Fix runtime PM imbalance on error wlcore: fix runtime pm imbalance in wlcore_regdomain_config wlcore: fix runtime pm imbalance in wl1271_tx_work ASoC: img-i2s-out: Fix runtime PM imbalance on error PCI: tegra194: Fix runtime PM imbalance on error perf kcore_copy: Fix module map when there are no modules loaded perf metricgroup: Free metric_events on error perf util: Fix memory leak of prefix_if_not_in perf stat: Fix duration_time value for higher intervals perf trace: Fix the selection for architectures to generate the errno name tables perf evsel: Fix 2 memory leaks KVM: PPC: Book3S HV: Close race with page faults around memslot flushes vfio/pci: fix memory leaks of eventfd ctx gpio: rcar: Fix runtime PM imbalance on error btrfs: fix double __endio_write_update_ordered in direct I/O btrfs: don't force read-only after error in drop snapshot usb: dwc3: Increase timeout for CmdAct cleared by device controller printk: handle blank console arguments passed in. drm/nouveau/dispnv50: fix runtime pm imbalance on error drm/nouveau: fix runtime pm imbalance on error drm/nouveau/debugfs: fix runtime pm imbalance on error e1000: Do not perform reset in reset_task if we are already down drm/amdkfd: fix restore worker race condition arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register scsi: cxlflash: Fix error return code in cxlflash_probe() arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work coresight: etm4x: Fix use-after-free of per-cpu etm drvdata USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int fuse: update attr_version counter on fuse_notify_inval_inode() fuse: don't check refcount after stealing page svcrdma: Fix backchannel return code powerpc/traps: Make unrecoverable NMIs die instead of panic ipmi:bt-bmc: Fix error handling and status check drm/exynos: dsi: Remove bridge node reference in error handling path in probe function ALSA: hda: Fix potential race in unsol event handler tty: serial: samsung: Correct clock selection logic tipc: fix memory leak in service subscripting KVM: x86: handle wrap around 32-bit address space USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Bluetooth: Handle Inquiry Cancel error after Inquiry Complete phy: samsung: s5pv210-usb2: Add delay after reset power: supply: max17040: Correct voltage reading i2c: tegra: Restore pinmux on system resume mm/slub: fix incorrect interpretation of s->offset perf mem2node: Avoid double free related to realloc media: venus: vdec: Init registered list unconditionally atm: fix a memory leak of vcc->user_back devlink: Fix reporter's recovery condition dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion dpaa2-eth: fix error return code in setup_dpni() sched/fair: Eliminate bandwidth race between throttling and distribution arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] sparc64: vcc: Fix error return code in vcc_probe() staging:r8188eu: avoid skb_clone for amsdu to msdu conversion scsi: aacraid: Fix error handling paths in aac_probe_one() net: openvswitch: use u64 for meter bucket KVM: arm64: vgic-its: Fix memory leak on the error path of vgic_add_lpi() KVM: arm64: vgic-v3: Retire all pending LPIs on vcpu destroy drivers: char: tlclk.c: Avoid data race between init and interrupt handler bdev: Reduce time holding bd_mutex in sync in blkdev_close() perf stat: Force error in fallback on :k events KVM: Remove CREATE_IRQCHIP/SET_PIT2 race btrfs: fix setting last_trans for reloc roots serial: uartps: Wait for tx_empty in console setup scsi: qedi: Fix termination timeouts in session logout ALSA: hda: Skip controller resume if not needed mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset workqueue: Remove the warning in wq_worker_sleeping() nvmet-rdma: fix double free of rdma queue SUNRPC: Don't start a timer on an already queued rpc task mm/vmscan.c: fix data races using kswapd_classzone_idx mm/swapfile: fix data races in try_to_unuse() mm/filemap.c: clear page error before actual read mm/kmemleak.c: use address-of operator on section symbols powerpc/perf: Implement a global lock to avoid races between trace, core and thread imc events. drm/amdgpu/vcn2.0: stall DPG when WPTR/RPTR reset NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() PCI: pciehp: Fix MSI interrupt race ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len ubifs: ubifs_add_orphan: Fix a memory leak bug ubifs: ubifs_jnl_write_inode: Fix a memory leak bug PCI: Use ioremap(), not phys_to_virt() for platform ROM netfilter: nf_tables: silence a RCU-list warning in nft_table_lookup() svcrdma: Fix leak of transport addresses SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' scsi: hpsa: correct race condition in offload enabled IB/iser: Always check sig MR before putting it to the free pool RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices xfs: prohibit fs freezing when using empty transactions brcmfmac: Fix double freeing in the fmac usb data path nvme: Fix controller creation races with teardown flow nvme: Fix ctrl use-after-free during sysfs deletion nvme-multipath: do not reset on unknown status perf: Use new infrastructure to fix deadlocks in execve proc: io_accounting: Use new infrastructure to fix deadlocks in execve proc: Use new infrastructure to fix deadlocks in execve kernel/kcmp.c: Use new infrastructure to fix deadlocks in execve selftests/ptrace: add test cases for dead-locks exec: Fix a deadlock in strace exec: Add exec_update_mutex to replace cred_guard_mutex tools: gpio-hammer: Avoid potential overflow in main cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn net: axienet: Propagate failure of DMA descriptor setup net: axienet: Convert DMA error handler to a work queue perf cpumap: Fix snprintf overflow check serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout serial: 8250_omap: Fix sleeping function called from invalid context during probe serial: 8250_port: Don't service RX FIFO if throttled r8169: improve RTL8168b FIFO overflow workaround btrfs: free the reloc_control in a consistent way btrfs: do not init a reloc root if we aren't relocating perf parse-events: Fix 3 use after frees found with clang ASAN KVM: LAPIC: Mark hrtimer for period or oneshot mode to expire in hard interrupt context thermal: rcar_thermal: Handle probe error gracefully tracing: Use address-of operator on section symbols drm/msm/a5xx: Always set an OPP supported hardware value drm/msm: fix leaks if initialization fails KVM: PPC: Book3S HV: Treat TM-related invalid form instructions on P9 like the valid ones intel_th: Disallow multi mode on devices where it's broken RDMA/cm: Remove a race freeing timewait_info nfsd: Don't add locks to closed or closing open stateids rtc: ds1374: fix possible race condition rtc: sa1100: fix possible race condition tpm: ibmvtpm: Wait for buffer to be set before proceeding ext4: mark block bitmap corrupted when found instead of BUGON xfs: mark dir corrupt when lookup-by-hash fails xfs: don't ever return a stale pointer from __xfs_dir3_free_read tty: sifive: Finish transmission before changing the clock media: tda10071: fix unsigned sign extension overflow Bluetooth: L2CAP: handle l2cap config request during open state scsi: aacraid: Disabling TM path and only processing IOP reset ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read perf cs-etm: Correct synthesizing instruction samples perf cs-etm: Swap packets for instruction samples s390/irq: replace setup_irq() by request_irq() cpu-topology: Fix the potential data corruption clk: imx: Fix division by zero warning on pfdv2 drm/amd/display: Stop if retimer is not available ARM: OMAP2+: Handle errors for cpu_pm drm/amdgpu: increase atombios cmd timeout mm: avoid data corruption on CoW fault into PFN-mapped VMA perf jevents: Fix leak of mapfile memory ext4: fix a data race at inode->i_disksize drm/amd/display: fix image corruption with ODM 2:1 DSC 2 slice powerpc/book3s64: Fix error handling in mm_iommu_do_alloc() timekeeping: Prevent 32bit truncation in scale64_check_overflow() Bluetooth: guard against controllers sending zero'd events media: go7007: Fix URB type for interrupt handling ASoC: SOF: ipc: check ipc return value before data copy bus: hisi_lpc: Fixup IO ports addresses to avoid use-after-free in host removal random: fix data races at timer_rand_state firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp iavf: use tc_cls_can_offload_and_chain0() instead of chain check drm/omap: dss: Cleanup DSS ports on initialisation failure drm/amd/display: dal_ddc_i2c_payloads_create can fail causing panic soundwire: bus: disable pm_runtime in sdw_slave_delete dmaengine: tegra-apb: Prevent race conditions on channel's freeing dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all bpf: Remove recursion prevention from rcu free callback x86/pkeys: Add check for pkey "overflow" media: staging/imx: Missing assignment in imx_media_capture_device_register() dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all KVM: nVMX: Hold KVM's srcu lock when syncing vmcs12->shadow KVM: x86: fix incorrect comparison in trace event RDMA/rxe: Fix configuration of atomic queue pair attributes perf test: Fix test trace+probe_vfs_getname.sh on s390 ALSA: usb-audio: Don't create a mixer element with bogus volume range mt76: fix handling full tx queues in mt76_dma_tx_queue_skb_raw mt76: clear skb pointers from rx aggregation reorder buffer during cleanup crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test clk: stratix10: use do_div() for 64-bit calculation locking/lockdep: Decrement IRQ context counters when removing lock chain drm/omap: fix possible object reference leak scsi: lpfc: Fix coverity errors in fmdi attribute handling scsi: lpfc: Fix release of hwq to clear the eq relationship scsi: lpfc: Fix RQ buffer leakage when no IOCBs available selinux: sel_avc_get_stat_idx should increase position index audit: CONFIG_CHANGE don't log internal bookkeeping as an event drm/amd/display: fix workaround for incorrect double buffer register for DLG ADL and TTU nfsd: Fix a perf warning skbuff: fix a data race in skb_queue_len() ALSA: hda: Clear RIRB status before reading WP KVM: fix overflow of zero page refcount with ksm running Bluetooth: prefetch channel before killing sock mm: pagewalk: fix termination condition in walk_pte_range() mm/swapfile.c: swap_next should increase position index Bluetooth: Fix refcount use-after-free issue tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility selftests/ftrace: fix glob selftest ceph: ensure we have a new cap before continuing in fill_inode ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter ARM: 8948/1: Prevent OOB access in stacktrace tracing: Set kernel_stack's caller size properly Bluetooth: btrtl: Use kvmalloc for FW allocations powerpc/eeh: Only dump stack once if an MMIO loop is detected nfsd: Fix a soft lockup race in nfsd_file_mark_find_or_create() s390/cpum_sf: Use kzalloc and minor changes dmaengine: zynqmp_dma: fix burst length configuration btrfs: tree-checker: Check leaf chunk item size i2c: tegra: Prevent interrupt triggering after transfer timeout drm/amd/display: Initialize DSC PPS variables to 0 scsi: ufs: Fix a race condition in the tracing code scsi: ufs: Make ufshcd_add_command_trace() easier to read ACPI: EC: Reference count query handlers under lock sctp: move trace_sctp_probe_path into sctp_outq_sack scsi: lpfc: Fix incomplete NVME discovery when target scsi: qla2xxx: Fix stuck session in GNL opp: Replace list_kref with a local counter media: ti-vpe: cal: Restrict DMA to avoid memory corruption drm/scheduler: Avoid accessing freed bad job. seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier drm/mcde: Handle pending vblank while disabling display ipv6_route_seq_next should increase position index rt_cpu_seq_next should increase position index neigh_stat_seq_next() should increase position index vcc_seq_next should increase position index tipc: fix link overflow issue at socket shutdown ALSA: hda: enable regmap internal locking xfs: fix log reservation overflows when allocating large rt extents module: Remove accidental change of module_enable_x() KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy() kernel/sys.c: avoid copying possible padding bytes in copy_to_user kernel/notifier.c: intercept duplicate registrations to avoid infinite loops selftests/bpf: De-flake test_tcpbpf arm64: insn: consistently handle exit text drm/amdgpu: fix calltrace during kmd unload(v3) xfs: fix realtime file data space leak s390: avoid misusing CALL_ON_STACK for task stack setup xtensa: fix system_call interaction with ptrace ASoC: max98090: remove msleep in PLL unlocked workaround f2fs: stop GC when the victim becomes fully valid CIFS: Properly process SMB3 lease breaks CIFS: Use common error handling code in smb2_ioctl_query_info() SUNRPC: Capture completion of all RPC tasks debugfs: Fix !DEBUG_FS debugfs_create_automount mt76: add missing locking around ampdu action mt76: do not use devm API for led classdev scsi: pm80xx: Cleanup command when a reset times out gfs2: clean up iopen glock mess in gfs2_create_inode mmc: core: Fix size overflow for mmc partitions ubi: Fix producing anchor PEBs RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' xfs: fix attr leaf header freemap.size underflow fix dget_parent() fastpath race PCI: Avoid double hpmemsize MMIO window assignment RDMA/i40iw: Fix potential use after free RDMA/qedr: Fix potential use after free x86/kdump: Always reserve the low 1M when the crashkernel option is specified dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails bcache: fix a lost wake-up problem caused by mca_cannibalize_lock tracing: Adding NULL checks for trace_array descriptor pointer tracing: Verify if trace array exists before destroying it. tpm_crb: fix fTPM on AMD Zen+ CPUs drm/amdgpu/powerplay/smu7: fix AVFS handling with custom powerplay table mfd: mfd-core: Protect against NULL call-back function pointer mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() ice: Fix to change Rx/Tx ring descriptor size via ethtool with DCBx drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table clk/ti/adpll: allocate room for terminating null f2fs: avoid kernel panic on corruption test iomap: Fix overflow in iomap_page_mkwrite dax: Fix alloc_dax_region() compile warning net: silence data-races on sk_backlog.tail powerpc/64s: Always disable branch profiling for prom_init.o scsi: lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce scsi: fnic: fix use after free PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out dm table: do not allow request-based DM to stack on partitions leds: mlxreg: Fix possible buffer overflow xfs: properly serialise fallocate against AIO+DIO drm/amd/display: Free gamma after calculating legacy transfer function media: smiapp: Fix error handling at NVM reading soundwire: intel/cadence: fix startup sequence ASoC: kirkwood: fix IRQ error handling gma/gma500: fix a memory disclosure bug due to uninitialized bytes xfs: fix inode fork extent count overflow m68k: q40: Fix info-leak in rtc_ioctl scsi: aacraid: fix illegal IO beyond last LBA mm: fix double page fault on arm64 if PTE_AF is cleared PCI/IOV: Serialize sysfs sriov_numvfs reads vs writes ath10k: fix memory leak for tpc_stats_final ath10k: fix array out-of-bounds access scsi: qla2xxx: Add error handling for PLOGI ELS passthrough dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling) drm/amdkfd: Fix race in gfx10 context restore handler drm/amd/display: Do not double-buffer DTO adjustments media: mc-device.c: fix memleak in media_device_register_entity selinux: allow labeling before policy is loaded scsi: mpt3sas: Free diag buffer without any status check scsi: lpfc: Fix pt2pt discovery on SLI3 HBAs kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec() Linux 5.4.68 iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE mm: memcg: fix memcg reclaim soft lockup net: add __must_check to skb_put_padto() net: qrtr: check skb_put_padto() return value net: phy: Do not warn in phy_stop() on PHY_DOWN net: phy: Avoid NPD upon phy_detach() when driver is unbound net: lantiq: Disable IRQs only if NAPI gets scheduled net: lantiq: Use napi_complete_done() net: lantiq: use netif_tx_napi_add() for TX NAPI net: lantiq: Wake TX queue again bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. bnxt_en: return proper error codes in bnxt_show_temp net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported tipc: use skb_unshare() instead in tipc_buf_append() tipc: fix shutdown() of connection oriented socket tipc: Fix memory leak in tipc_group_create_member() taprio: Fix allowing too small intervals nfp: use correct define to return NONE fec net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc net/mlx5: Fix FTE cleanup net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC net: Fix bridge enslavement failure net: dsa: rtl8366: Properly clear member config net: DCB: Validate DCB_ATTR_DCB_BUFFER argument net: bridge: br_vlan_get_pvid_rcu() should dereference the VLAN group under RCU ipv6: avoid lockdep issue in fib6_del() ipv4: Update exception handling for multipath routes via same device ipv4: Initialize flowi4_multipath_hash in data path ip: fix tos reflection in ack and reset packets hdlc_ppp: add range checks in ppp_cp_parse_cr() geneve: add transport ports in route lookup for geneve cxgb4: Fix offset when clearing filter byte counters cxgb4: fix memory leak during module unload bnxt_en: Fix NULL ptr dereference crash in bnxt_fw_reset_task() bnxt_en: Avoid sending firmware messages when AER error is detected. act_ife: load meta modules before tcf_idr_check_alloc() mm/thp: fix __split_huge_pmd_locked() for migration PMD kprobes: fix kill kprobe which has been marked as gone ibmvnic: add missing parenthesis in do_reset() ibmvnic fix NULL tx_pools and rx_tools issue at do_reset af_key: pfkey_dump needs parameter validation Revert "ehci-hcd: Move include to keep CRC stable" Linux 5.4.67 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX dm: Call proper helper to determine dax support mm/memory_hotplug: drain per-cpu pages again during memory offline dm/dax: Fix table reference counts selftests/vm: fix display of page size in map_hugetlb powerpc/dma: Fix dma_map_ops::get_required_mask ehci-hcd: Move include to keep CRC stable s390/zcrypt: fix kmalloc 256k failure x86/boot/compressed: Disable relocation relaxation serial: 8250_pci: Add Realtek 816a and 816b Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists Input: trackpoint - add new trackpoint variant IDs percpu: fix first chunk size calculation for populated bitmap ALSA: hda/realtek - The Mic on a RedmiBook doesn't work ALSA: hda: fixup headset for ASUS GX502 laptop Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO" i2c: i801: Fix resume bug usb: typec: ucsi: Prevent mode overrun usblp: fix race between disconnect() and read() USB: UAS: fix disconnect by unplugging a hub USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook drm/i915: Filter wake_flags passed to default_wake_function riscv: Add sfence.vma after early page table changes i2c: mxs: use MXS_DMA_CTRL_WAIT4END instead of DMA_CTRL_ACK iommu/amd: Fix potential @entry null deref arm64: bpf: Fix branch offset in JIT drm/mediatek: Add missing put_device() call in mtk_hdmi_dt_parse_pdata() drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail MIPS: SNI: Fix spurious interrupts fbcon: Fix user font detection test at fbcon_resize(). perf test: Free formats for perf pmu parse test perf parse-event: Fix memory leak in evsel->unit perf evlist: Fix cpu/thread map leak MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT perf test: Fix the "signal" test inline assembly Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload arm64: Allow CPUs unffected by ARM erratum1418040
to come in late scsi: libsas: Fix error path in sas_notify_lldd_dev_found() Drivers: hv: vmbus: hibernation: do not hang forever in vmbus_bus_resume() ASoC: meson: axg-toddr: fix channel order on g12 platforms powerpc/book3s64/radix: Fix boot failure with large amount of guest memory ASoC: qcom: common: Fix refcount imbalance on error ASoC: qcom: Set card->owner to avoid warnings clk: rockchip: Fix initialization of mux_pll_src_4plls_p clk: davinci: Use the correct size when allocating memory KVM: MIPS: Change the definition of kvm type spi: Fix memory leak on splited transfers i2c: algo: pca: Reapply i2c bus settings after reset f2fs: Return EOF on unaligned end of file DIO read f2fs: fix indefinite loop scanning for free nid block: only call sched requeue_request() for scheduled requests nvme-tcp: cancel async events before freeing event struct nvme-rdma: cancel async events before freeing event struct nvme-fc: cancel async events before freeing event struct openrisc: Fix cache API compile issue when not inlining cifs: fix DFS mount with cifsacl/modefromsid rapidio: Replace 'select' DMAENGINES 'with depends on' SUNRPC: stop printk reading past end of string NFS: Zero-stateid SETATTR should first return delegation spi: spi-loopback-test: Fix out-of-bounds read regulator: pwm: Fix machine constraints application scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery scsi: libfc: Fix for double free() scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall firmware_loader: fix memory leak for paged buffer hv_netvsc: Remove "unlikely" from netvsc_select_queue net: handle the return value of pskb_carve_frag_list() correctly dsa: Allow forwarding of redirected IGMP traffic e1000e: Add support for Comet Lake RDMA/bnxt_re: Restrict the max_gids to 256 gfs2: initialize transaction tr_ailX_lists earlier Revert "netfilter: conntrack: allow sctp hearbeat after connection re-use" Linux 5.4.66 gcov: add support for GCC 10.1 drm/msm: Disable the RPTR shadow drm/msm/gpu: make ringbuffer readonly usb: typec: ucsi: acpi: Check the _DEP dependencies usb: Fix out of sync data toggle if a configured device is reconfigured USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules USB: serial: option: support dynamic Quectel USB compositions USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter usb: core: fix slab-out-of-bounds Read in read_descriptors phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init staging: greybus: audio: fix uninitialized value issue video: fbdev: fix OOB read in vga_8planes_imageblit() ARM: dts: vfxxx: Add syscon compatible with OCOTP debugfs: Fix module state check condition KVM: fix memory leak in kvm_io_bus_unregister_dev() KVM: arm64: Do not try to map PUDs when they are folded into PMD KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit vgacon: remove software scrollback support fbcon: remove now unusued 'softback_lines' cursor() argument fbcon: remove soft scrollback code RDMA/mlx4: Read pkey table length instead of hardcoded value RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars rbd: require global CAP_SYS_ADMIN for mapping and unmapping mmc: sdhci-of-esdhc: Don't walk device-tree on every interrupt mmc: sdio: Use mmc_pre_req() / mmc_post_req() drm/msm: Disable preemption on all 5xx targets drm/tve200: Stabilize enable/disable drm/i915/gvt: do not check len & max_len for lri scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem scsi: target: iscsi: Fix data digest calculation regulator: core: Fix slab-out-of-bounds in regulator_unlock_recursive() regulator: plug of_node leak in regulator_register()'s error path regulator: push allocation in set_consumer_device_supply() out of lock regulator: push allocations in create_regulator() outside of lock regulator: push allocation in regulator_init_coupling() outside of lock kobject: Restore old behaviour of kobject_del(NULL) btrfs: fix wrong address when faulting in pages in the search ioctl btrfs: fix lockdep splat in add_missing_dev btrfs: require only sector size alignment for parent eb bytenr staging: wlan-ng: fix out of bounds read in prism2sta_probe_usb() iio:accel:mma8452: Fix timestamp alignment and prevent data leak. iio:accel:mma7455: Fix timestamp alignment and prevent data leak. iio: accel: kxsd9: Fix alignment of local buffer. iio:chemical:ccs811: Fix timestamp alignment and prevent data leak. iio:light:max44000 Fix timestamp alignment and prevent data leak. iio:magnetometer:ak8975 Fix alignment and data leak issues. iio:adc:ti-adc081c Fix alignment and data leak issues iio:adc:max1118 Fix alignment of timestamp and data leak issues iio:adc:ina2xx Fix timestamp alignment issue. iio:adc:ti-adc084s021 Fix alignment and data leak issues. iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak. iio:proximity:mb1232: Fix timestamp alignment and prevent data leak. iio:light:ltr501 Fix timestamp alignment issue. iio: cros_ec: Set Gyroscope default frequency to 25Hz iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set gcov: Disable gcov build with GCC 10 iommu/amd: Do not use IOMMUv2 functionality when SME is active drm/amdgpu: Fix bug in reporting voltage for CIK ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled ALSA: hda: hdmi - add Rocketlake support arm64/module: set trampoline section flags regardless of CONFIG_DYNAMIC_FTRACE cpufreq: intel_pstate: Fix intel_pstate_get_hwp_max() for turbo disabled cpufreq: intel_pstate: Refuse to turn off with HWP enabled ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id HID: elan: Fix memleak in elan_input_configured drivers/net/wan/hdlc_cisco: Add hard_header_len HID: microsoft: Add rumble support for the 8bitdo SN30 Pro+ controller HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for all Saitek X52 devices nvme-pci: cancel nvme device request before disabling nvme-rdma: fix reset hang if controller died in the middle of a reset nvme-rdma: fix timeout handler nvme-rdma: serialize controller teardown sequences nvme-tcp: fix reset hang if controller died in the middle of a reset nvme-tcp: fix timeout handler nvme-tcp: serialize controller teardown sequences nvme: have nvme_wait_freeze_timeout return if it timed out nvme-fabrics: don't check state NVME_CTRL_NEW for request acceptance nvmet-tcp: Fix NULL dereference when a connect data comes in h2cdata pdu irqchip/eznps: Fix build error for !ARC700 builds xfs: initialize the shortform attr header padding entry cfg80211: Adjust 6 GHz frequency to channel conversion drivers/net/wan/lapbether: Set network_header before transmitting xfs: fix off-by-one in inode alloc block reservation calculation net: hns3: Fix for geneve tx checksum bug drivers/dma/dma-jz4780: Fix race condition between probe and irq handler ALSA: hda/tegra: Program WAKEEN register for Tegra ALSA: hda: Fix 2 channel swapping for Tegra firestream: Fix memleak in fs_open NFC: st95hf: Fix memleak in st95hf_in_send_cmd drivers/net/wan/lapbether: Added needed_tailroom netfilter: conntrack: allow sctp hearbeat after connection re-use dmaengine: acpi: Put the CSRT table after using it ARC: HSDK: wireup perf irq arm64: dts: ns2: Fixed QSPI compatible string ARM: dts: BCM5301X: Fixed QSPI compatible string ARM: dts: NSP: Fixed QSPI compatible string ARM: dts: bcm: HR2: Fixed QSPI compatible string IB/isert: Fix unaligned immediate-data handling block: Set same_page to false in __bio_try_merge_page if ret is false spi: stm32: fix pm_runtime_get_sync() error checking nvme-fabrics: allow to queue requests for live queues spi: stm32: Rate-limit the 'Communication suspended' message mmc: sdhci-msm: Add retries when all tuning phases are found valid mmc: sdhci-acpi: Clear amd_sdhci_host on reset drm/sun4i: backend: Disable alpha on the lowest plane on the A20 drm/sun4i: backend: Support alpha property on lowest plane soundwire: fix double free of dangling pointer scsi: mpt3sas: Don't call disable_irq from IRQ poll handler scsi: megaraid_sas: Don't call disable_irq from process IRQ poll RDMA/core: Fix reported speed and width scsi: libsas: Set data_dir as DMA_NONE if libata marks qc as NODATA iio: adc: mcp3422: fix locking scope iio: adc: mcp3422: fix locking on error path drm/sun4i: Fix dsi dcs long write function arm64: dts: imx8mq: Fix TMU interrupt property drm/sun4i: add missing put_device() call in sun8i_r40_tcon_tv_set_mux() RDMA/bnxt_re: Do not report transparent vlan from QP1 RDMA/rxe: Fix panic when calling kmem_cache_create() RDMA/rxe: Drop pointless checks in rxe_init_ports RDMA/rxe: Fix memleak in rxe_mem_init_user ARM: dts: imx7ulp: Correct gpio ranges ARM: dts: ls1021a: fix QuadSPI-memory reg range selftests/timers: Turn off timeout setting ARM: dts: socfpga: fix register entry for timer3 on Arria10 regulator: remove superfluous lock in regulator_resolve_coupling() regulator: push allocation in regulator_ena_gpio_request() out of lock ARM: dts: logicpd-som-lv-baseboard: Fix missing video ARM: dts: logicpd-som-lv-baseboard: Fix broken audio ARM: dts: logicpd-torpedo-baseboard: Fix broken audio Linux 5.4.65 net: disable netpoll on fresh napis tipc: fix shutdown() of connectionless socket taprio: Fix using wrong queues in gate mask sctp: not disable bh in the whole sctp_get_port_local() net: usb: dm9601: Add USB ID of Keenetic Plus DSL netlabel: fix problems with mapping removal ipv6: Fix sysctl max for fib_multipath_hash_policy ipv4: Silence suspicious RCU usage warning Linux 5.4.64 net: usb: Fix uninit-was-stored issue in asix_read_phy_addr() cfg80211: regulatory: reject invalid hints mm/khugepaged.c: fix khugepaged's request size in collapse_file mm/hugetlb: fix a race between hugetlb sysctl handlers checkpatch: fix the usage of capture group ( ... ) sdhci: tegra: Add missing TMCLK for data timeout perf record: Correct the help info of option "--no-bpf-event" vfio/pci: Fix SR-IOV VF handling with MMIO blocking mm: madvise: fix vma user-after-free mm: slub: fix conversion of freelist_corrupted() dm thin metadata: Fix use-after-free in dm_bm_set_read_only dm thin metadata: Avoid returning cmd->bm wild pointer on error dm cache metadata: Avoid returning cmd->bm wild pointer on error dm crypt: Initialize crypto wait structures dm integrity: fix error reporting in bitmap mode after creation dm mpath: fix racey management of PG initialization dm writecache: handle DAX to partitions on persistent memory correctly drm/amd/pm: avoid false alarm due to confusing softwareshutdowntemp setting dmaengine: dw-edma: Fix scatter-gather address calculation blk-iocost: ioc_pd_free() shouldn't assume irq disabled libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks block: ensure bdi->io_pages is always initialized block: allow for_each_bvec to support zero len bvec affs: fix basic permission bits to actually work media: rc: uevent sysfs file races with rc_unregister_device() media: rc: do not access device via sysfs after rc_unregister_device() mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers mmc: cqhci: Add cqhci_deactivate() mmc: dt-bindings: Add resets/reset-names for Mediatek MMC bindings mmc: mediatek: add optional module reset property arm64: dts: mt7622: add reset node for mmc device ALSA: hda/realtek - Improved routing for Thinkpad X1 7th/8th Gen ALSA: hda/realtek: Add quirk for Samsung Galaxy Book Ion NT950XCJ-X716A ALSA; firewire-tascam: exclude Tascam FE-8 from detection ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO ALSA: firewire-digi00x: exclude Avid Adrenaline from detection ALSA: hda/hdmi: always check pin power status in i915 pin fixup ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check ALSA: usb-audio: Add implicit feedback quirk for UR22C ALSA: ca0106: fix error code handling Revert "ALSA: hda: Add support for Loongson 7A1000 controller" Revert "net: dsa: microchip: set the correct number of ports" btrfs: fix potential deadlock in the search ioctl net: core: use listified Rx for GRO_NORMAL in napi_gro_receive() btrfs: tree-checker: fix the error message for transid error btrfs: set the lockdep class for log tree extent buffers btrfs: set the correct lockdep class for new nodes btrfs: allocate scrub workqueues outside of locks btrfs: drop path before adding new uuid tree entry ARC: perf: don't bail setup if pct irq missing in device-tree xfs: don't update mtime on COW faults ext2: don't update mtime on COW faults tracing/kprobes, x86/ptrace: Fix regs argument order for i386 iommu/vt-d: Handle 36bit addressing for x86-32 vfio-pci: Invalidate mmaps and block MMIO access on disabled memory vfio-pci: Fault mmaps to enable vma tracking vfio/type1: Support faulting PFNMAP vmas include/linux/log2.h: add missing () around n in roundup_pow_of_two() net/packet: fix overflow in tpacket_rcv iommu/amd: Restore IRTE.RemapEn bit after programming IRTE thermal: qcom-spmi-temp-alarm: Don't suppress negative temp thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 iommu/vt-d: Serialize IOMMU GCMD register modifications x86, fakenuma: Fix invalid starting node ID tg3: Fix soft lockup when tg3_reset_task() fails. perf jevents: Fix suspicious code in fixregex() xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files MIPS: add missing MSACSR and upper MSA initialization net: gemini: Fix another missing clk_disable_unprepare() in probe fix regression in "epoll: Keep a reference on files added to the check list" net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init() perf tools: Correct SNOOPX field offset cxgb4: fix thermal zone device registration nvme: fix controller instance leak nvmet-fc: Fix a missed _irqsave version of spin_lock in 'nvmet_fc_fod_op_done()' netfilter: nfnetlink: nfnetlink_unicast() reports EAGAIN instead of ENOBUFS net: dsa: mt7530: fix advertising unsupported 1000baseT_Half selftests/bpf: Fix massive output from test_maps media: cedrus: Add missing v4l2_ctrl_request_hdl_put() media: vicodec: add missing v4l2_ctrl_request_hdl_put() bnxt: don't enable NAPI until rings are ready xfs: fix boundary test in xfs_attr_shortform_verify bnxt_en: fix HWRM error when querying VF temperature bnxt_en: Fix possible crash in bnxt_fw_reset_task(). bnxt_en: Fix PCI AER error recovery flow bnxt_en: Check for zero dir entries in NVRAM. bnxt_en: Don't query FW when netif_running() is false. net: ethernet: ti: cpsw: fix clean up of vlan mc entries for host port gtp: add GTPA_LINK info to msg sent to userspace dmaengine: pl330: Fix burst length if burst size is smaller than bus width net: arc_emac: Fix memleak in arc_mdio_probe ravb: Fixed to be able to unload modules net: systemport: Fix memleak in bcm_sysport_probe net: hns: Fix memleak in hns_nic_dev_probe netfilter: nf_tables: fix destination register zeroing netfilter: nf_tables: incorrect enum nft_list_attributes definition netfilter: nf_tables: add NFTA_SET_USERDATA if not null mmc: sdhci-acpi: Fix HS400 tuning for AMDI0040 MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores MIPS: mm: BMIPS5000 has inclusive physical caches rxrpc: Make rxrpc_kernel_get_srtt() indicate validity rxrpc: Keep the ACK serial in a var in rxrpc_input_ack() dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() batman-adv: bla: use netif_rx_ni when not in interrupt context batman-adv: Fix own OGM check in aggregated OGMs batman-adv: Avoid uninitialized chaddr when handling DHCP dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling fsldma: fix very broken 32-bit ppc ioread64 functionality xen/xenbus: Fix granting of vmalloc'd memory drm/amd/display: Fix memleak in amdgpu_dm_mode_config_init drm/amd/display: Retry AUX write when fail occurs drivers: gpu: amd: Initialize amdgpu_dm_backlight_caps object to 0 in amdgpu_dm_update_backlight_caps drm/amd/display: Reject overlay plane configurations in multi-display scenarios s390: don't trace preemption in percpu macros nbd: restore default timeout when setting it to zero cpuidle: Fixup IRQ state drm/omap: fix incorrect lock state ceph: don't allow setlease on cephfs drm/msm/a6xx: fix gmu start on newer firmware habanalabs: check correct vmalloc return code habanalabs: validate FW file size drm/msm: enable vblank during atomic commits nvmet: Disable keep-alive timer when kato is cleared to 0h hwmon: (applesmc) check status earlier. drm/msm: add shutdown support for display platform_driver tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup drm/msm/dpu: Fix scale params in plane validation HID: quirks: Always poll three more Lenovo PixArt mice Linux 5.4.63 scsi: target: tcmu: Optimize use of flush_dcache_page scsi: target: tcmu: Fix size in calls to tcmu_flush_dcache_range sdhci: tegra: Remove SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK for Tegra186 sdhci: tegra: Remove SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK for Tegra210 arm64: tegra: Add missing timeout clock to Tegra210 SDMMC arm64: tegra: Add missing timeout clock to Tegra186 SDMMC nodes arm64: tegra: Add missing timeout clock to Tegra194 SDMMC nodes dt-bindings: mmc: tegra: Add tmclk for Tegra210 and later KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception KVM: arm64: Survive synchronous exceptions caused by AT instructions KVM: arm64: Add kvm_extable for vaxorcism code drm/etnaviv: fix TS cache flushing on GPUs with BLT engine drm/sched: Fix passing zero to 'PTR_ERR' warning v2 perf record/stat: Explicitly call out event modifiers in the documentation HID: core: Sanitize event code and type when mapping input HID: core: Correctly handle ReportSize being zero Linux 5.4.62 io_uring: Fix NULL pointer dereference in io_sq_wq_submit_work() ALSA: usb-audio: Update documentation comment for MS2109 quirk HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage() kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables kbuild: add variables for compression tools kheaders: explain why include/config/autoconf.h is excluded from md5sum kheaders: remove the last bashism to allow sh to run it kheaders: optimize header copy for in-tree builds kheaders: optimize md5sum calculation for in-tree builds kheaders: remove unneeded 'cat' command piped to 'head' / 'tail' fbmem: pull fbcon_update_vcs() out of fb_set_var() usb: dwc3: gadget: Handle ZLP for sg requests usb: dwc3: gadget: Fix handling ZLP usb: dwc3: gadget: Don't setup more than requested drm/i915: Fix cmd parser desc matching with masks usb: storage: Add unusual_uas entry for Sony PSZ drives USB: cdc-acm: rework notification_buffer resizing USB: gadget: u_f: Unbreak offset calculation in VLAs USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb() USB: gadget: u_f: add overflow checks to VLA macros usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe() USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D USB: quirks: Add no-lpm quirk for another Raydium touchscreen usb: uas: Add quirk for PNY Pro Elite USB: yurex: Fix bad gfp argument drm/amd/pm: correct the thermal alert temperature limit settings drm/amd/pm: correct Vega20 swctf limit setting drm/amd/pm: correct Vega12 swctf limit setting drm/amd/pm: correct Vega10 swctf limit setting drm/amd/powerplay: Fix hardmins not being sent to SMU for RV drm/amdgpu/gfx10: refine mgcg setting drm/amdgpu: Fix buffer overflow in INFO ioctl x86/hotplug: Silence APIC only after all interrupts are migrated irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake genirq/matrix: Deal with the sillyness of for_each_cpu() on UP crypto: af_alg - Work around empty control messages without MSG_MORE device property: Fix the secondary firmware node handling in set_primary_fwnode() powerpc/perf: Fix crashes with generic_compat_pmu & BHRB PM: sleep: core: Fix the handling of pending runtime resume requests arm64: vdso32: make vdso32 install conditional xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed xhci: Do warm-reset when both CAS and XDEV_RESUME are set usb: host: xhci: fix ep context print mismatch in debugfs XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information. writeback: Fix sync livelock due to b_dirty_time processing writeback: Avoid skipping inode writeback writeback: Protect inode->i_io_list with inode->i_lock serial: 8250: change lock order in serial8250_do_startup() serial: 8250_exar: Fix number of ports for Commtech PCIe cards serial: stm32: avoid kernel warning on absence of optional IRQ serial: pl011: Don't leak amba_ports entry on driver register error serial: pl011: Fix oops on -EPROBE_DEFER serial: samsung: Removes the IRQ not found warning vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize() vt: defer kfree() of vc_screenbuf in vc_do_resize() USB: lvtest: return proper error code in probe fbcon: prevent user font height or width change from causing potential out-of-bounds access btrfs: detect nocow for swap after snapshot delete btrfs: fix space cache memory leak after transaction abort btrfs: check the right error variable in btrfs_del_dir_entries_in_log btrfs: reset compression level for lzo on remount blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands block: loop: set discard granularity and alignment for block device backed loop block: fix get_max_io_size() arm64: Allow booting of late CPUs affected by erratum1418040
arm64: Move handling of erratum1418040
into C code powerpc/perf: Fix soft lockups due to missed interrupt accounting net: gianfar: Add of_node_put() before goto statement macvlan: validate setting of multiple remote source MAC addresses Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command" scsi: qla2xxx: Fix null pointer access during disconnect from subsystem scsi: qla2xxx: Check if FW supports MQ before enabling scsi: qla2xxx: Fix login timeout scsi: ufs: Clean up completed request without interrupt notification scsi: ufs: Improve interrupt handling for shared interrupts scsi: ufs: Fix possible infinite loop in ufshcd_hold scsi: fcoe: Fix I/O path allocation selftests: disable rp_filter for icmp_redirect.sh ASoC: wm8994: Avoid attempts to read unreadable registers s390/cio: add cond_resched() in the slow_eval_known_fn() loop ALSA: hda/realtek: Add model alc298-samsung-headphone can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency drm/amd/display: Switch to immediate mode for updating infopackets drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading drm/amd/powerplay: correct Vega20 cached smu feature state spi: stm32: always perform registers configuration prior to transfer spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate spi: stm32: fix fifo threshold level in case of short transfer spi: stm32h7: fix race condition at end of transfer fs: prevent BUG_ON in submit_bh_wbc() ext4: correctly restore system zone info when remount fails ext4: handle error of ext4_setup_system_zone() on remount ext4: handle option set by mount flags correctly jbd2: abort journal if free a async write error metadata buffer ext4: handle read only external journal device ext4: don't BUG on inconsistent journal feature jbd2: make sure jh have b_transaction set in refile/unfile_buffer spi: stm32: clear only asserted irq flags on interrupt usb: gadget: f_tcm: Fix some resource leaks in some error paths i2c: rcar: in slave mode, clear NACK earlier i2c: core: Don't fail PRP0001 enumeration when no ID table exist null_blk: fix passing of REQ_FUA flag in null_handle_rq nvme: multipath: round-robin: fix single non-optimized path case nvme-fc: Fix wrong return value in __nvme_fc_init_request() blkcg: fix memleak for iolatency blk-mq: insert request not through ->queue_rq into sw/scheduler queue hwmon: (nct7904) Correct divide by 0 bfq: fix blkio cgroup leakage v4 block: Fix page_is_mergeable() for compound pages drm/msm/adreno: fix updating ring fence block: virtio_blk: fix handling single range discard request block: respect queue limit of max discard segment media: gpio-ir-tx: improve precision of transmitted signal due to scheduling ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1) cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode PCI: qcom: Add missing reset for ipq806x PCI: qcom: Change duplicate PCI reset to phy reset PCI: qcom: Add missing ipq806x clocks in PCIe driver EDAC/{i7core,sb,pnd2,skx}: Fix error event severity EDAC: skx_common: get rid of unused type var EDAC: sb_edac: get rid of unused vars mm/vunmap: add cond_resched() in vunmap_pmd_range drm/amd/display: Fix dmesg warning from setting abm level drm/amd/display: Add additional config guards for DCN drm/amd/display: Trigger modesets on MST DSC connectors drm/ingenic: Fix incorrect assumption about plane->index gpu/drm: ingenic: Use the plane's src_[x,y] to configure DMA length cma: don't quit at first error when activating reserved areas mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation mm: fix kthread_use_mm() vs TLB invalidate mm/shuffle: don't move pages between zones and don't read garbage memmaps btrfs: only commit delayed items at fsync if we are logging a directory btrfs: only commit the delayed inode when doing a full fsync btrfs: factor out inode items copy loop from btrfs_log_inode() s390/numa: set node distance to LOCAL_DISTANCE drm/xen-front: Fix misused IS_ERR_OR_NULL checks drm/xen: fix passing zero to 'PTR_ERR' warning PM / devfreq: rk3399_dmc: Fix kernel oops when rockchip,pmu is absent PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails PM / devfreq: rk3399_dmc: Add missing of_node_put() usb: cdns3: gadget: always zeroed TRB buffer when enable endpoint sched/uclamp: Fix a deadlock when enabling uclamp static key sched/uclamp: Protect uclamp fast path code with static key Revert "ath10k: fix DMA related firmware crashes on multiple devices" arm64: Fix __cpu_logical_map undefined issue efi: provide empty efi_enter_virtual_mode implementation brcmfmac: Set timeout value when configuring power save USB: sisusbvga: Fix a potential UB casued by left shifting a negative value powerpc/spufs: add CONFIG_COREDUMP dependency KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe media: davinci: vpif_capture: fix potential double free hugetlbfs: prevent filesystem stacking of hugetlbfs EDAC/ie31200: Fallback if host bridge device is already initialized scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del() ceph: do not access the kiocb after aio requests ceph: fix potential mdsc use-after-free crash scsi: iscsi: Do not put host in iscsi_set_flashnode_param() btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode btrfs: file: reserve qgroup space after the hole punch range is locked locking/lockdep: Fix overflow in presentation of average lock-time drm/nouveau: Fix reference count leak in nouveau_connector_detect drm/nouveau: fix reference count leak in nv50_disp_atomic_commit drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open f2fs: fix use-after-free issue HID: quirks: add NOGET quirk for Logitech GROUP cec-api: prevent leaking memory through hole in structure ALSA: hda: Add support for Loongson 7A1000 controller mips/vdso: Fix resource leaks in genvdso.c rtlwifi: rtl8192cu: Prevent leaking urb ARM: dts: ls1021a: output PPS signal on FIPER2 PCI: Fix pci_create_slot() reference count leak omapfb: fix multiple reference count leaks due to pm_runtime_get_sync f2fs: fix error path in do_recover_data() selftests/powerpc: Purge extra count_pmc() calls of ebb selftests scsi: target: Fix xcopy sess release leak xfs: Don't allow logging of XFS_ISTALE inodes scsi: lpfc: Fix shost refcount mismatch when deleting vport drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config drm/amd/display: fix ref count leak in amdgpu_drm_ioctl drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms drm/radeon: fix multiple reference count leak drm/amdkfd: Fix reference count leaks. iommu/iova: Don't BUG on invalid PFNs mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs scsi: target: tcmu: Fix crash on ARM during cmd completion blktrace: ensure our debugfs dir exists media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq() powerpc/xive: Ignore kmemleak false positives arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs ASoC: tegra: Fix reference count leaks. ASoC: img-parallel-out: Fix a reference count leak ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged ALSA: pci: delete repeated words in comments ALSA: hda/hdmi: Add quirk to force connectivity ipvlan: fix device features net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow net: ena: Make missed_tx stat incremental tipc: fix uninit skb->data in tipc_nl_compat_dumpit() net/smc: Prevent kernel-infoleak in __smc_diag_dump() net: sctp: Fix negotiation of the number of data streams. net: qrtr: fix usage of idr in port assignment to socket net: nexthop: don't allow empty NHA_GROUP net: Fix potential wrong skb->protocol in skb_vlan_untag() gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY binfmt_flat: revert "binfmt_flat: don't offset the data start" powerpc/64s: Don't init FSCR_DSCR in __init_FSCR() Conflicts: Documentation/devicetree/bindings Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt Documentation/devicetree/bindings/mmc/mtk-sd.txt Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt Documentation/devicetree/bindings/net/can/tcan4x5x.txt Documentation/devicetree/bindings/net/nfc/nxp-nci.txt Documentation/devicetree/bindings/net/nfc/pn544.txt Documentation/devicetree/bindings/sound/wm8994.txt block/bio.c block/blk-mq-sysfs.c block/blk-sysfs.c drivers/hid/hid-quirks.c drivers/mailbox/mailbox.c drivers/mmc/host/cqhci.c drivers/scsi/ufs/ufshcd.c drivers/soc/qcom/smp2p.c drivers/usb/dwc3/core.c drivers/usb/dwc3/core.h drivers/usb/dwc3/ep0.c drivers/usb/dwc3/gadget.c drivers/usb/dwc3/gadget.h drivers/usb/gadget/function/f_fs.c drivers/usb/host/xhci.c kernel/sched/cpufreq_schedutil.c mm/cma.c mm/madvise.c mm/memory.c mm/page_alloc.c net/qrtr/qrtr.c Change-Id: I5d64dc5428045e92d5d1ce73dd55f78b36e83371 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
5196 lines
140 KiB
C
5196 lines
140 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Generic hugetlb support.
|
|
* (C) Nadia Yvette Chambers, April 2004
|
|
*/
|
|
#include <linux/list.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/sysctl.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/mmu_notifier.h>
|
|
#include <linux/nodemask.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/mempolicy.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/cpuset.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mmdebug.h>
|
|
#include <linux/sched/signal.h>
|
|
#include <linux/rmap.h>
|
|
#include <linux/string_helpers.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/swapops.h>
|
|
#include <linux/jhash.h>
|
|
#include <linux/numa.h>
|
|
#include <linux/llist.h>
|
|
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/tlb.h>
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/hugetlb.h>
|
|
#include <linux/hugetlb_cgroup.h>
|
|
#include <linux/node.h>
|
|
#include <linux/userfaultfd_k.h>
|
|
#include <linux/page_owner.h>
|
|
#include "internal.h"
|
|
|
|
int hugetlb_max_hstate __read_mostly;
|
|
unsigned int default_hstate_idx;
|
|
struct hstate hstates[HUGE_MAX_HSTATE];
|
|
/*
|
|
* Minimum page order among possible hugepage sizes, set to a proper value
|
|
* at boot time.
|
|
*/
|
|
static unsigned int minimum_order __read_mostly = UINT_MAX;
|
|
|
|
__initdata LIST_HEAD(huge_boot_pages);
|
|
|
|
/* for command line parsing */
|
|
static struct hstate * __initdata parsed_hstate;
|
|
static unsigned long __initdata default_hstate_max_huge_pages;
|
|
static unsigned long __initdata default_hstate_size;
|
|
static bool __initdata parsed_valid_hugepagesz = true;
|
|
|
|
/*
|
|
* Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages,
|
|
* free_huge_pages, and surplus_huge_pages.
|
|
*/
|
|
DEFINE_SPINLOCK(hugetlb_lock);
|
|
|
|
/*
|
|
* Serializes faults on the same logical page. This is used to
|
|
* prevent spurious OOMs when the hugepage pool is fully utilized.
|
|
*/
|
|
static int num_fault_mutexes;
|
|
struct mutex *hugetlb_fault_mutex_table ____cacheline_aligned_in_smp;
|
|
|
|
/* Forward declaration */
|
|
static int hugetlb_acct_memory(struct hstate *h, long delta);
|
|
|
|
static inline void unlock_or_release_subpool(struct hugepage_subpool *spool)
|
|
{
|
|
bool free = (spool->count == 0) && (spool->used_hpages == 0);
|
|
|
|
spin_unlock(&spool->lock);
|
|
|
|
/* If no pages are used, and no other handles to the subpool
|
|
* remain, give up any reservations mased on minimum size and
|
|
* free the subpool */
|
|
if (free) {
|
|
if (spool->min_hpages != -1)
|
|
hugetlb_acct_memory(spool->hstate,
|
|
-spool->min_hpages);
|
|
kfree(spool);
|
|
}
|
|
}
|
|
|
|
struct hugepage_subpool *hugepage_new_subpool(struct hstate *h, long max_hpages,
|
|
long min_hpages)
|
|
{
|
|
struct hugepage_subpool *spool;
|
|
|
|
spool = kzalloc(sizeof(*spool), GFP_KERNEL);
|
|
if (!spool)
|
|
return NULL;
|
|
|
|
spin_lock_init(&spool->lock);
|
|
spool->count = 1;
|
|
spool->max_hpages = max_hpages;
|
|
spool->hstate = h;
|
|
spool->min_hpages = min_hpages;
|
|
|
|
if (min_hpages != -1 && hugetlb_acct_memory(h, min_hpages)) {
|
|
kfree(spool);
|
|
return NULL;
|
|
}
|
|
spool->rsv_hpages = min_hpages;
|
|
|
|
return spool;
|
|
}
|
|
|
|
void hugepage_put_subpool(struct hugepage_subpool *spool)
|
|
{
|
|
spin_lock(&spool->lock);
|
|
BUG_ON(!spool->count);
|
|
spool->count--;
|
|
unlock_or_release_subpool(spool);
|
|
}
|
|
|
|
/*
|
|
* Subpool accounting for allocating and reserving pages.
|
|
* Return -ENOMEM if there are not enough resources to satisfy the
|
|
* the request. Otherwise, return the number of pages by which the
|
|
* global pools must be adjusted (upward). The returned value may
|
|
* only be different than the passed value (delta) in the case where
|
|
* a subpool minimum size must be manitained.
|
|
*/
|
|
static long hugepage_subpool_get_pages(struct hugepage_subpool *spool,
|
|
long delta)
|
|
{
|
|
long ret = delta;
|
|
|
|
if (!spool)
|
|
return ret;
|
|
|
|
spin_lock(&spool->lock);
|
|
|
|
if (spool->max_hpages != -1) { /* maximum size accounting */
|
|
if ((spool->used_hpages + delta) <= spool->max_hpages)
|
|
spool->used_hpages += delta;
|
|
else {
|
|
ret = -ENOMEM;
|
|
goto unlock_ret;
|
|
}
|
|
}
|
|
|
|
/* minimum size accounting */
|
|
if (spool->min_hpages != -1 && spool->rsv_hpages) {
|
|
if (delta > spool->rsv_hpages) {
|
|
/*
|
|
* Asking for more reserves than those already taken on
|
|
* behalf of subpool. Return difference.
|
|
*/
|
|
ret = delta - spool->rsv_hpages;
|
|
spool->rsv_hpages = 0;
|
|
} else {
|
|
ret = 0; /* reserves already accounted for */
|
|
spool->rsv_hpages -= delta;
|
|
}
|
|
}
|
|
|
|
unlock_ret:
|
|
spin_unlock(&spool->lock);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Subpool accounting for freeing and unreserving pages.
|
|
* Return the number of global page reservations that must be dropped.
|
|
* The return value may only be different than the passed value (delta)
|
|
* in the case where a subpool minimum size must be maintained.
|
|
*/
|
|
static long hugepage_subpool_put_pages(struct hugepage_subpool *spool,
|
|
long delta)
|
|
{
|
|
long ret = delta;
|
|
|
|
if (!spool)
|
|
return delta;
|
|
|
|
spin_lock(&spool->lock);
|
|
|
|
if (spool->max_hpages != -1) /* maximum size accounting */
|
|
spool->used_hpages -= delta;
|
|
|
|
/* minimum size accounting */
|
|
if (spool->min_hpages != -1 && spool->used_hpages < spool->min_hpages) {
|
|
if (spool->rsv_hpages + delta <= spool->min_hpages)
|
|
ret = 0;
|
|
else
|
|
ret = spool->rsv_hpages + delta - spool->min_hpages;
|
|
|
|
spool->rsv_hpages += delta;
|
|
if (spool->rsv_hpages > spool->min_hpages)
|
|
spool->rsv_hpages = spool->min_hpages;
|
|
}
|
|
|
|
/*
|
|
* If hugetlbfs_put_super couldn't free spool due to an outstanding
|
|
* quota reference, free it now.
|
|
*/
|
|
unlock_or_release_subpool(spool);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline struct hugepage_subpool *subpool_inode(struct inode *inode)
|
|
{
|
|
return HUGETLBFS_SB(inode->i_sb)->spool;
|
|
}
|
|
|
|
static inline struct hugepage_subpool *subpool_vma(struct vm_area_struct *vma)
|
|
{
|
|
return subpool_inode(file_inode(vma->vm_file));
|
|
}
|
|
|
|
/*
|
|
* Region tracking -- allows tracking of reservations and instantiated pages
|
|
* across the pages in a mapping.
|
|
*
|
|
* The region data structures are embedded into a resv_map and protected
|
|
* by a resv_map's lock. The set of regions within the resv_map represent
|
|
* reservations for huge pages, or huge pages that have already been
|
|
* instantiated within the map. The from and to elements are huge page
|
|
* indicies into the associated mapping. from indicates the starting index
|
|
* of the region. to represents the first index past the end of the region.
|
|
*
|
|
* For example, a file region structure with from == 0 and to == 4 represents
|
|
* four huge pages in a mapping. It is important to note that the to element
|
|
* represents the first element past the end of the region. This is used in
|
|
* arithmetic as 4(to) - 0(from) = 4 huge pages in the region.
|
|
*
|
|
* Interval notation of the form [from, to) will be used to indicate that
|
|
* the endpoint from is inclusive and to is exclusive.
|
|
*/
|
|
struct file_region {
|
|
struct list_head link;
|
|
long from;
|
|
long to;
|
|
};
|
|
|
|
/*
|
|
* Add the huge page range represented by [f, t) to the reserve
|
|
* map. In the normal case, existing regions will be expanded
|
|
* to accommodate the specified range. Sufficient regions should
|
|
* exist for expansion due to the previous call to region_chg
|
|
* with the same range. However, it is possible that region_del
|
|
* could have been called after region_chg and modifed the map
|
|
* in such a way that no region exists to be expanded. In this
|
|
* case, pull a region descriptor from the cache associated with
|
|
* the map and use that for the new range.
|
|
*
|
|
* Return the number of new huge pages added to the map. This
|
|
* number is greater than or equal to zero.
|
|
*/
|
|
static long region_add(struct resv_map *resv, long f, long t)
|
|
{
|
|
struct list_head *head = &resv->regions;
|
|
struct file_region *rg, *nrg, *trg;
|
|
long add = 0;
|
|
|
|
spin_lock(&resv->lock);
|
|
/* Locate the region we are either in or before. */
|
|
list_for_each_entry(rg, head, link)
|
|
if (f <= rg->to)
|
|
break;
|
|
|
|
/*
|
|
* If no region exists which can be expanded to include the
|
|
* specified range, the list must have been modified by an
|
|
* interleving call to region_del(). Pull a region descriptor
|
|
* from the cache and use it for this range.
|
|
*/
|
|
if (&rg->link == head || t < rg->from) {
|
|
VM_BUG_ON(resv->region_cache_count <= 0);
|
|
|
|
resv->region_cache_count--;
|
|
nrg = list_first_entry(&resv->region_cache, struct file_region,
|
|
link);
|
|
list_del(&nrg->link);
|
|
|
|
nrg->from = f;
|
|
nrg->to = t;
|
|
list_add(&nrg->link, rg->link.prev);
|
|
|
|
add += t - f;
|
|
goto out_locked;
|
|
}
|
|
|
|
/* Round our left edge to the current segment if it encloses us. */
|
|
if (f > rg->from)
|
|
f = rg->from;
|
|
|
|
/* Check for and consume any regions we now overlap with. */
|
|
nrg = rg;
|
|
list_for_each_entry_safe(rg, trg, rg->link.prev, link) {
|
|
if (&rg->link == head)
|
|
break;
|
|
if (rg->from > t)
|
|
break;
|
|
|
|
/* If this area reaches higher then extend our area to
|
|
* include it completely. If this is not the first area
|
|
* which we intend to reuse, free it. */
|
|
if (rg->to > t)
|
|
t = rg->to;
|
|
if (rg != nrg) {
|
|
/* Decrement return value by the deleted range.
|
|
* Another range will span this area so that by
|
|
* end of routine add will be >= zero
|
|
*/
|
|
add -= (rg->to - rg->from);
|
|
list_del(&rg->link);
|
|
kfree(rg);
|
|
}
|
|
}
|
|
|
|
add += (nrg->from - f); /* Added to beginning of region */
|
|
nrg->from = f;
|
|
add += t - nrg->to; /* Added to end of region */
|
|
nrg->to = t;
|
|
|
|
out_locked:
|
|
resv->adds_in_progress--;
|
|
spin_unlock(&resv->lock);
|
|
VM_BUG_ON(add < 0);
|
|
return add;
|
|
}
|
|
|
|
/*
|
|
* Examine the existing reserve map and determine how many
|
|
* huge pages in the specified range [f, t) are NOT currently
|
|
* represented. This routine is called before a subsequent
|
|
* call to region_add that will actually modify the reserve
|
|
* map to add the specified range [f, t). region_chg does
|
|
* not change the number of huge pages represented by the
|
|
* map. However, if the existing regions in the map can not
|
|
* be expanded to represent the new range, a new file_region
|
|
* structure is added to the map as a placeholder. This is
|
|
* so that the subsequent region_add call will have all the
|
|
* regions it needs and will not fail.
|
|
*
|
|
* Upon entry, region_chg will also examine the cache of region descriptors
|
|
* associated with the map. If there are not enough descriptors cached, one
|
|
* will be allocated for the in progress add operation.
|
|
*
|
|
* Returns the number of huge pages that need to be added to the existing
|
|
* reservation map for the range [f, t). This number is greater or equal to
|
|
* zero. -ENOMEM is returned if a new file_region structure or cache entry
|
|
* is needed and can not be allocated.
|
|
*/
|
|
static long region_chg(struct resv_map *resv, long f, long t)
|
|
{
|
|
struct list_head *head = &resv->regions;
|
|
struct file_region *rg, *nrg = NULL;
|
|
long chg = 0;
|
|
|
|
retry:
|
|
spin_lock(&resv->lock);
|
|
retry_locked:
|
|
resv->adds_in_progress++;
|
|
|
|
/*
|
|
* Check for sufficient descriptors in the cache to accommodate
|
|
* the number of in progress add operations.
|
|
*/
|
|
if (resv->adds_in_progress > resv->region_cache_count) {
|
|
struct file_region *trg;
|
|
|
|
VM_BUG_ON(resv->adds_in_progress - resv->region_cache_count > 1);
|
|
/* Must drop lock to allocate a new descriptor. */
|
|
resv->adds_in_progress--;
|
|
spin_unlock(&resv->lock);
|
|
|
|
trg = kmalloc(sizeof(*trg), GFP_KERNEL);
|
|
if (!trg) {
|
|
kfree(nrg);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
spin_lock(&resv->lock);
|
|
list_add(&trg->link, &resv->region_cache);
|
|
resv->region_cache_count++;
|
|
goto retry_locked;
|
|
}
|
|
|
|
/* Locate the region we are before or in. */
|
|
list_for_each_entry(rg, head, link)
|
|
if (f <= rg->to)
|
|
break;
|
|
|
|
/* If we are below the current region then a new region is required.
|
|
* Subtle, allocate a new region at the position but make it zero
|
|
* size such that we can guarantee to record the reservation. */
|
|
if (&rg->link == head || t < rg->from) {
|
|
if (!nrg) {
|
|
resv->adds_in_progress--;
|
|
spin_unlock(&resv->lock);
|
|
nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
|
|
if (!nrg)
|
|
return -ENOMEM;
|
|
|
|
nrg->from = f;
|
|
nrg->to = f;
|
|
INIT_LIST_HEAD(&nrg->link);
|
|
goto retry;
|
|
}
|
|
|
|
list_add(&nrg->link, rg->link.prev);
|
|
chg = t - f;
|
|
goto out_nrg;
|
|
}
|
|
|
|
/* Round our left edge to the current segment if it encloses us. */
|
|
if (f > rg->from)
|
|
f = rg->from;
|
|
chg = t - f;
|
|
|
|
/* Check for and consume any regions we now overlap with. */
|
|
list_for_each_entry(rg, rg->link.prev, link) {
|
|
if (&rg->link == head)
|
|
break;
|
|
if (rg->from > t)
|
|
goto out;
|
|
|
|
/* We overlap with this area, if it extends further than
|
|
* us then we must extend ourselves. Account for its
|
|
* existing reservation. */
|
|
if (rg->to > t) {
|
|
chg += rg->to - t;
|
|
t = rg->to;
|
|
}
|
|
chg -= rg->to - rg->from;
|
|
}
|
|
|
|
out:
|
|
spin_unlock(&resv->lock);
|
|
/* We already know we raced and no longer need the new region */
|
|
kfree(nrg);
|
|
return chg;
|
|
out_nrg:
|
|
spin_unlock(&resv->lock);
|
|
return chg;
|
|
}
|
|
|
|
/*
|
|
* Abort the in progress add operation. The adds_in_progress field
|
|
* of the resv_map keeps track of the operations in progress between
|
|
* calls to region_chg and region_add. Operations are sometimes
|
|
* aborted after the call to region_chg. In such cases, region_abort
|
|
* is called to decrement the adds_in_progress counter.
|
|
*
|
|
* NOTE: The range arguments [f, t) are not needed or used in this
|
|
* routine. They are kept to make reading the calling code easier as
|
|
* arguments will match the associated region_chg call.
|
|
*/
|
|
static void region_abort(struct resv_map *resv, long f, long t)
|
|
{
|
|
spin_lock(&resv->lock);
|
|
VM_BUG_ON(!resv->region_cache_count);
|
|
resv->adds_in_progress--;
|
|
spin_unlock(&resv->lock);
|
|
}
|
|
|
|
/*
|
|
* Delete the specified range [f, t) from the reserve map. If the
|
|
* t parameter is LONG_MAX, this indicates that ALL regions after f
|
|
* should be deleted. Locate the regions which intersect [f, t)
|
|
* and either trim, delete or split the existing regions.
|
|
*
|
|
* Returns the number of huge pages deleted from the reserve map.
|
|
* In the normal case, the return value is zero or more. In the
|
|
* case where a region must be split, a new region descriptor must
|
|
* be allocated. If the allocation fails, -ENOMEM will be returned.
|
|
* NOTE: If the parameter t == LONG_MAX, then we will never split
|
|
* a region and possibly return -ENOMEM. Callers specifying
|
|
* t == LONG_MAX do not need to check for -ENOMEM error.
|
|
*/
|
|
static long region_del(struct resv_map *resv, long f, long t)
|
|
{
|
|
struct list_head *head = &resv->regions;
|
|
struct file_region *rg, *trg;
|
|
struct file_region *nrg = NULL;
|
|
long del = 0;
|
|
|
|
retry:
|
|
spin_lock(&resv->lock);
|
|
list_for_each_entry_safe(rg, trg, head, link) {
|
|
/*
|
|
* Skip regions before the range to be deleted. file_region
|
|
* ranges are normally of the form [from, to). However, there
|
|
* may be a "placeholder" entry in the map which is of the form
|
|
* (from, to) with from == to. Check for placeholder entries
|
|
* at the beginning of the range to be deleted.
|
|
*/
|
|
if (rg->to <= f && (rg->to != rg->from || rg->to != f))
|
|
continue;
|
|
|
|
if (rg->from >= t)
|
|
break;
|
|
|
|
if (f > rg->from && t < rg->to) { /* Must split region */
|
|
/*
|
|
* Check for an entry in the cache before dropping
|
|
* lock and attempting allocation.
|
|
*/
|
|
if (!nrg &&
|
|
resv->region_cache_count > resv->adds_in_progress) {
|
|
nrg = list_first_entry(&resv->region_cache,
|
|
struct file_region,
|
|
link);
|
|
list_del(&nrg->link);
|
|
resv->region_cache_count--;
|
|
}
|
|
|
|
if (!nrg) {
|
|
spin_unlock(&resv->lock);
|
|
nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
|
|
if (!nrg)
|
|
return -ENOMEM;
|
|
goto retry;
|
|
}
|
|
|
|
del += t - f;
|
|
|
|
/* New entry for end of split region */
|
|
nrg->from = t;
|
|
nrg->to = rg->to;
|
|
INIT_LIST_HEAD(&nrg->link);
|
|
|
|
/* Original entry is trimmed */
|
|
rg->to = f;
|
|
|
|
list_add(&nrg->link, &rg->link);
|
|
nrg = NULL;
|
|
break;
|
|
}
|
|
|
|
if (f <= rg->from && t >= rg->to) { /* Remove entire region */
|
|
del += rg->to - rg->from;
|
|
list_del(&rg->link);
|
|
kfree(rg);
|
|
continue;
|
|
}
|
|
|
|
if (f <= rg->from) { /* Trim beginning of region */
|
|
del += t - rg->from;
|
|
rg->from = t;
|
|
} else { /* Trim end of region */
|
|
del += rg->to - f;
|
|
rg->to = f;
|
|
}
|
|
}
|
|
|
|
spin_unlock(&resv->lock);
|
|
kfree(nrg);
|
|
return del;
|
|
}
|
|
|
|
/*
|
|
* A rare out of memory error was encountered which prevented removal of
|
|
* the reserve map region for a page. The huge page itself was free'ed
|
|
* and removed from the page cache. This routine will adjust the subpool
|
|
* usage count, and the global reserve count if needed. By incrementing
|
|
* these counts, the reserve map entry which could not be deleted will
|
|
* appear as a "reserved" entry instead of simply dangling with incorrect
|
|
* counts.
|
|
*/
|
|
void hugetlb_fix_reserve_counts(struct inode *inode)
|
|
{
|
|
struct hugepage_subpool *spool = subpool_inode(inode);
|
|
long rsv_adjust;
|
|
|
|
rsv_adjust = hugepage_subpool_get_pages(spool, 1);
|
|
if (rsv_adjust) {
|
|
struct hstate *h = hstate_inode(inode);
|
|
|
|
hugetlb_acct_memory(h, 1);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Count and return the number of huge pages in the reserve map
|
|
* that intersect with the range [f, t).
|
|
*/
|
|
static long region_count(struct resv_map *resv, long f, long t)
|
|
{
|
|
struct list_head *head = &resv->regions;
|
|
struct file_region *rg;
|
|
long chg = 0;
|
|
|
|
spin_lock(&resv->lock);
|
|
/* Locate each segment we overlap with, and count that overlap. */
|
|
list_for_each_entry(rg, head, link) {
|
|
long seg_from;
|
|
long seg_to;
|
|
|
|
if (rg->to <= f)
|
|
continue;
|
|
if (rg->from >= t)
|
|
break;
|
|
|
|
seg_from = max(rg->from, f);
|
|
seg_to = min(rg->to, t);
|
|
|
|
chg += seg_to - seg_from;
|
|
}
|
|
spin_unlock(&resv->lock);
|
|
|
|
return chg;
|
|
}
|
|
|
|
/*
|
|
* Convert the address within this vma to the page offset within
|
|
* the mapping, in pagecache page units; huge pages here.
|
|
*/
|
|
static pgoff_t vma_hugecache_offset(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long address)
|
|
{
|
|
return ((address - vma->vm_start) >> huge_page_shift(h)) +
|
|
(vma->vm_pgoff >> huge_page_order(h));
|
|
}
|
|
|
|
pgoff_t linear_hugepage_index(struct vm_area_struct *vma,
|
|
unsigned long address)
|
|
{
|
|
return vma_hugecache_offset(hstate_vma(vma), vma, address);
|
|
}
|
|
EXPORT_SYMBOL_GPL(linear_hugepage_index);
|
|
|
|
/*
|
|
* Return the size of the pages allocated when backing a VMA. In the majority
|
|
* cases this will be same size as used by the page table entries.
|
|
*/
|
|
unsigned long vma_kernel_pagesize(struct vm_area_struct *vma)
|
|
{
|
|
if (vma->vm_ops && vma->vm_ops->pagesize)
|
|
return vma->vm_ops->pagesize(vma);
|
|
return PAGE_SIZE;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vma_kernel_pagesize);
|
|
|
|
/*
|
|
* Return the page size being used by the MMU to back a VMA. In the majority
|
|
* of cases, the page size used by the kernel matches the MMU size. On
|
|
* architectures where it differs, an architecture-specific 'strong'
|
|
* version of this symbol is required.
|
|
*/
|
|
__weak unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
|
|
{
|
|
return vma_kernel_pagesize(vma);
|
|
}
|
|
|
|
/*
|
|
* Flags for MAP_PRIVATE reservations. These are stored in the bottom
|
|
* bits of the reservation map pointer, which are always clear due to
|
|
* alignment.
|
|
*/
|
|
#define HPAGE_RESV_OWNER (1UL << 0)
|
|
#define HPAGE_RESV_UNMAPPED (1UL << 1)
|
|
#define HPAGE_RESV_MASK (HPAGE_RESV_OWNER | HPAGE_RESV_UNMAPPED)
|
|
|
|
/*
|
|
* These helpers are used to track how many pages are reserved for
|
|
* faults in a MAP_PRIVATE mapping. Only the process that called mmap()
|
|
* is guaranteed to have their future faults succeed.
|
|
*
|
|
* With the exception of reset_vma_resv_huge_pages() which is called at fork(),
|
|
* the reserve counters are updated with the hugetlb_lock held. It is safe
|
|
* to reset the VMA at fork() time as it is not in use yet and there is no
|
|
* chance of the global counters getting corrupted as a result of the values.
|
|
*
|
|
* The private mapping reservation is represented in a subtly different
|
|
* manner to a shared mapping. A shared mapping has a region map associated
|
|
* with the underlying file, this region map represents the backing file
|
|
* pages which have ever had a reservation assigned which this persists even
|
|
* after the page is instantiated. A private mapping has a region map
|
|
* associated with the original mmap which is attached to all VMAs which
|
|
* reference it, this region map represents those offsets which have consumed
|
|
* reservation ie. where pages have been instantiated.
|
|
*/
|
|
static unsigned long get_vma_private_data(struct vm_area_struct *vma)
|
|
{
|
|
return (unsigned long)vma->vm_private_data;
|
|
}
|
|
|
|
static void set_vma_private_data(struct vm_area_struct *vma,
|
|
unsigned long value)
|
|
{
|
|
vma->vm_private_data = (void *)value;
|
|
}
|
|
|
|
struct resv_map *resv_map_alloc(void)
|
|
{
|
|
struct resv_map *resv_map = kmalloc(sizeof(*resv_map), GFP_KERNEL);
|
|
struct file_region *rg = kmalloc(sizeof(*rg), GFP_KERNEL);
|
|
|
|
if (!resv_map || !rg) {
|
|
kfree(resv_map);
|
|
kfree(rg);
|
|
return NULL;
|
|
}
|
|
|
|
kref_init(&resv_map->refs);
|
|
spin_lock_init(&resv_map->lock);
|
|
INIT_LIST_HEAD(&resv_map->regions);
|
|
|
|
resv_map->adds_in_progress = 0;
|
|
|
|
INIT_LIST_HEAD(&resv_map->region_cache);
|
|
list_add(&rg->link, &resv_map->region_cache);
|
|
resv_map->region_cache_count = 1;
|
|
|
|
return resv_map;
|
|
}
|
|
|
|
void resv_map_release(struct kref *ref)
|
|
{
|
|
struct resv_map *resv_map = container_of(ref, struct resv_map, refs);
|
|
struct list_head *head = &resv_map->region_cache;
|
|
struct file_region *rg, *trg;
|
|
|
|
/* Clear out any active regions before we release the map. */
|
|
region_del(resv_map, 0, LONG_MAX);
|
|
|
|
/* ... and any entries left in the cache */
|
|
list_for_each_entry_safe(rg, trg, head, link) {
|
|
list_del(&rg->link);
|
|
kfree(rg);
|
|
}
|
|
|
|
VM_BUG_ON(resv_map->adds_in_progress);
|
|
|
|
kfree(resv_map);
|
|
}
|
|
|
|
static inline struct resv_map *inode_resv_map(struct inode *inode)
|
|
{
|
|
/*
|
|
* At inode evict time, i_mapping may not point to the original
|
|
* address space within the inode. This original address space
|
|
* contains the pointer to the resv_map. So, always use the
|
|
* address space embedded within the inode.
|
|
* The VERY common case is inode->mapping == &inode->i_data but,
|
|
* this may not be true for device special inodes.
|
|
*/
|
|
return (struct resv_map *)(&inode->i_data)->private_data;
|
|
}
|
|
|
|
static struct resv_map *vma_resv_map(struct vm_area_struct *vma)
|
|
{
|
|
VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);
|
|
if (vma->vm_flags & VM_MAYSHARE) {
|
|
struct address_space *mapping = vma->vm_file->f_mapping;
|
|
struct inode *inode = mapping->host;
|
|
|
|
return inode_resv_map(inode);
|
|
|
|
} else {
|
|
return (struct resv_map *)(get_vma_private_data(vma) &
|
|
~HPAGE_RESV_MASK);
|
|
}
|
|
}
|
|
|
|
static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)
|
|
{
|
|
VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);
|
|
VM_BUG_ON_VMA(vma->vm_flags & VM_MAYSHARE, vma);
|
|
|
|
set_vma_private_data(vma, (get_vma_private_data(vma) &
|
|
HPAGE_RESV_MASK) | (unsigned long)map);
|
|
}
|
|
|
|
static void set_vma_resv_flags(struct vm_area_struct *vma, unsigned long flags)
|
|
{
|
|
VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);
|
|
VM_BUG_ON_VMA(vma->vm_flags & VM_MAYSHARE, vma);
|
|
|
|
set_vma_private_data(vma, get_vma_private_data(vma) | flags);
|
|
}
|
|
|
|
static int is_vma_resv_set(struct vm_area_struct *vma, unsigned long flag)
|
|
{
|
|
VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);
|
|
|
|
return (get_vma_private_data(vma) & flag) != 0;
|
|
}
|
|
|
|
/* Reset counters to 0 and clear all HPAGE_RESV_* flags */
|
|
void reset_vma_resv_huge_pages(struct vm_area_struct *vma)
|
|
{
|
|
VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);
|
|
if (!(vma->vm_flags & VM_MAYSHARE))
|
|
vma->vm_private_data = (void *)0;
|
|
}
|
|
|
|
/* Returns true if the VMA has associated reserve pages */
|
|
static bool vma_has_reserves(struct vm_area_struct *vma, long chg)
|
|
{
|
|
if (vma->vm_flags & VM_NORESERVE) {
|
|
/*
|
|
* This address is already reserved by other process(chg == 0),
|
|
* so, we should decrement reserved count. Without decrementing,
|
|
* reserve count remains after releasing inode, because this
|
|
* allocated page will go into page cache and is regarded as
|
|
* coming from reserved pool in releasing step. Currently, we
|
|
* don't have any other solution to deal with this situation
|
|
* properly, so add work-around here.
|
|
*/
|
|
if (vma->vm_flags & VM_MAYSHARE && chg == 0)
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
/* Shared mappings always use reserves */
|
|
if (vma->vm_flags & VM_MAYSHARE) {
|
|
/*
|
|
* We know VM_NORESERVE is not set. Therefore, there SHOULD
|
|
* be a region map for all pages. The only situation where
|
|
* there is no region map is if a hole was punched via
|
|
* fallocate. In this case, there really are no reverves to
|
|
* use. This situation is indicated if chg != 0.
|
|
*/
|
|
if (chg)
|
|
return false;
|
|
else
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* Only the process that called mmap() has reserves for
|
|
* private mappings.
|
|
*/
|
|
if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) {
|
|
/*
|
|
* Like the shared case above, a hole punch or truncate
|
|
* could have been performed on the private mapping.
|
|
* Examine the value of chg to determine if reserves
|
|
* actually exist or were previously consumed.
|
|
* Very Subtle - The value of chg comes from a previous
|
|
* call to vma_needs_reserves(). The reserve map for
|
|
* private mappings has different (opposite) semantics
|
|
* than that of shared mappings. vma_needs_reserves()
|
|
* has already taken this difference in semantics into
|
|
* account. Therefore, the meaning of chg is the same
|
|
* as in the shared case above. Code could easily be
|
|
* combined, but keeping it separate draws attention to
|
|
* subtle differences.
|
|
*/
|
|
if (chg)
|
|
return false;
|
|
else
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
static void enqueue_huge_page(struct hstate *h, struct page *page)
|
|
{
|
|
int nid = page_to_nid(page);
|
|
list_move(&page->lru, &h->hugepage_freelists[nid]);
|
|
h->free_huge_pages++;
|
|
h->free_huge_pages_node[nid]++;
|
|
}
|
|
|
|
static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid)
|
|
{
|
|
struct page *page;
|
|
|
|
list_for_each_entry(page, &h->hugepage_freelists[nid], lru)
|
|
if (!PageHWPoison(page))
|
|
break;
|
|
/*
|
|
* if 'non-isolated free hugepage' not found on the list,
|
|
* the allocation fails.
|
|
*/
|
|
if (&h->hugepage_freelists[nid] == &page->lru)
|
|
return NULL;
|
|
list_move(&page->lru, &h->hugepage_activelist);
|
|
set_page_refcounted(page);
|
|
h->free_huge_pages--;
|
|
h->free_huge_pages_node[nid]--;
|
|
return page;
|
|
}
|
|
|
|
static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, int nid,
|
|
nodemask_t *nmask)
|
|
{
|
|
unsigned int cpuset_mems_cookie;
|
|
struct zonelist *zonelist;
|
|
struct zone *zone;
|
|
struct zoneref *z;
|
|
int node = NUMA_NO_NODE;
|
|
|
|
zonelist = node_zonelist(nid, gfp_mask);
|
|
|
|
retry_cpuset:
|
|
cpuset_mems_cookie = read_mems_allowed_begin();
|
|
for_each_zone_zonelist_nodemask(zone, z, zonelist, gfp_zone(gfp_mask), nmask) {
|
|
struct page *page;
|
|
|
|
if (!cpuset_zone_allowed(zone, gfp_mask))
|
|
continue;
|
|
/*
|
|
* no need to ask again on the same node. Pool is node rather than
|
|
* zone aware
|
|
*/
|
|
if (zone_to_nid(zone) == node)
|
|
continue;
|
|
node = zone_to_nid(zone);
|
|
|
|
page = dequeue_huge_page_node_exact(h, node);
|
|
if (page)
|
|
return page;
|
|
}
|
|
if (unlikely(read_mems_allowed_retry(cpuset_mems_cookie)))
|
|
goto retry_cpuset;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Movability of hugepages depends on migration support. */
|
|
static inline gfp_t htlb_alloc_mask(struct hstate *h)
|
|
{
|
|
if (hugepage_movable_supported(h))
|
|
return GFP_HIGHUSER_MOVABLE;
|
|
else
|
|
return GFP_HIGHUSER;
|
|
}
|
|
|
|
static struct page *dequeue_huge_page_vma(struct hstate *h,
|
|
struct vm_area_struct *vma,
|
|
unsigned long address, int avoid_reserve,
|
|
long chg)
|
|
{
|
|
struct page *page;
|
|
struct mempolicy *mpol;
|
|
gfp_t gfp_mask;
|
|
nodemask_t *nodemask;
|
|
int nid;
|
|
|
|
/*
|
|
* A child process with MAP_PRIVATE mappings created by their parent
|
|
* have no page reserves. This check ensures that reservations are
|
|
* not "stolen". The child may still get SIGKILLed
|
|
*/
|
|
if (!vma_has_reserves(vma, chg) &&
|
|
h->free_huge_pages - h->resv_huge_pages == 0)
|
|
goto err;
|
|
|
|
/* If reserves cannot be used, ensure enough pages are in the pool */
|
|
if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
|
|
goto err;
|
|
|
|
gfp_mask = htlb_alloc_mask(h);
|
|
nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask);
|
|
page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask);
|
|
if (page && !avoid_reserve && vma_has_reserves(vma, chg)) {
|
|
SetPagePrivate(page);
|
|
h->resv_huge_pages--;
|
|
}
|
|
|
|
mpol_cond_put(mpol);
|
|
return page;
|
|
|
|
err:
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* common helper functions for hstate_next_node_to_{alloc|free}.
|
|
* We may have allocated or freed a huge page based on a different
|
|
* nodes_allowed previously, so h->next_node_to_{alloc|free} might
|
|
* be outside of *nodes_allowed. Ensure that we use an allowed
|
|
* node for alloc or free.
|
|
*/
|
|
static int next_node_allowed(int nid, nodemask_t *nodes_allowed)
|
|
{
|
|
nid = next_node_in(nid, *nodes_allowed);
|
|
VM_BUG_ON(nid >= MAX_NUMNODES);
|
|
|
|
return nid;
|
|
}
|
|
|
|
static int get_valid_node_allowed(int nid, nodemask_t *nodes_allowed)
|
|
{
|
|
if (!node_isset(nid, *nodes_allowed))
|
|
nid = next_node_allowed(nid, nodes_allowed);
|
|
return nid;
|
|
}
|
|
|
|
/*
|
|
* returns the previously saved node ["this node"] from which to
|
|
* allocate a persistent huge page for the pool and advance the
|
|
* next node from which to allocate, handling wrap at end of node
|
|
* mask.
|
|
*/
|
|
static int hstate_next_node_to_alloc(struct hstate *h,
|
|
nodemask_t *nodes_allowed)
|
|
{
|
|
int nid;
|
|
|
|
VM_BUG_ON(!nodes_allowed);
|
|
|
|
nid = get_valid_node_allowed(h->next_nid_to_alloc, nodes_allowed);
|
|
h->next_nid_to_alloc = next_node_allowed(nid, nodes_allowed);
|
|
|
|
return nid;
|
|
}
|
|
|
|
/*
|
|
* helper for free_pool_huge_page() - return the previously saved
|
|
* node ["this node"] from which to free a huge page. Advance the
|
|
* next node id whether or not we find a free huge page to free so
|
|
* that the next attempt to free addresses the next node.
|
|
*/
|
|
static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed)
|
|
{
|
|
int nid;
|
|
|
|
VM_BUG_ON(!nodes_allowed);
|
|
|
|
nid = get_valid_node_allowed(h->next_nid_to_free, nodes_allowed);
|
|
h->next_nid_to_free = next_node_allowed(nid, nodes_allowed);
|
|
|
|
return nid;
|
|
}
|
|
|
|
#define for_each_node_mask_to_alloc(hs, nr_nodes, node, mask) \
|
|
for (nr_nodes = nodes_weight(*mask); \
|
|
nr_nodes > 0 && \
|
|
((node = hstate_next_node_to_alloc(hs, mask)) || 1); \
|
|
nr_nodes--)
|
|
|
|
#define for_each_node_mask_to_free(hs, nr_nodes, node, mask) \
|
|
for (nr_nodes = nodes_weight(*mask); \
|
|
nr_nodes > 0 && \
|
|
((node = hstate_next_node_to_free(hs, mask)) || 1); \
|
|
nr_nodes--)
|
|
|
|
#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE
|
|
static void destroy_compound_gigantic_page(struct page *page,
|
|
unsigned int order)
|
|
{
|
|
int i;
|
|
int nr_pages = 1 << order;
|
|
struct page *p = page + 1;
|
|
|
|
atomic_set(compound_mapcount_ptr(page), 0);
|
|
for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
|
|
clear_compound_head(p);
|
|
set_page_refcounted(p);
|
|
}
|
|
|
|
set_compound_order(page, 0);
|
|
__ClearPageHead(page);
|
|
}
|
|
|
|
static void free_gigantic_page(struct page *page, unsigned int order)
|
|
{
|
|
free_contig_range(page_to_pfn(page), 1 << order);
|
|
}
|
|
|
|
#ifdef CONFIG_CONTIG_ALLOC
|
|
static int __alloc_gigantic_page(unsigned long start_pfn,
|
|
unsigned long nr_pages, gfp_t gfp_mask)
|
|
{
|
|
unsigned long end_pfn = start_pfn + nr_pages;
|
|
return alloc_contig_range(start_pfn, end_pfn, MIGRATE_MOVABLE,
|
|
gfp_mask);
|
|
}
|
|
|
|
static bool pfn_range_valid_gigantic(struct zone *z,
|
|
unsigned long start_pfn, unsigned long nr_pages)
|
|
{
|
|
unsigned long i, end_pfn = start_pfn + nr_pages;
|
|
struct page *page;
|
|
|
|
for (i = start_pfn; i < end_pfn; i++) {
|
|
page = pfn_to_online_page(i);
|
|
if (!page)
|
|
return false;
|
|
|
|
if (page_zone(page) != z)
|
|
return false;
|
|
|
|
if (PageReserved(page))
|
|
return false;
|
|
|
|
if (page_count(page) > 0)
|
|
return false;
|
|
|
|
if (PageHuge(page))
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool zone_spans_last_pfn(const struct zone *zone,
|
|
unsigned long start_pfn, unsigned long nr_pages)
|
|
{
|
|
unsigned long last_pfn = start_pfn + nr_pages - 1;
|
|
return zone_spans_pfn(zone, last_pfn);
|
|
}
|
|
|
|
static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
|
|
int nid, nodemask_t *nodemask)
|
|
{
|
|
unsigned int order = huge_page_order(h);
|
|
unsigned long nr_pages = 1 << order;
|
|
unsigned long ret, pfn, flags;
|
|
struct zonelist *zonelist;
|
|
struct zone *zone;
|
|
struct zoneref *z;
|
|
|
|
zonelist = node_zonelist(nid, gfp_mask);
|
|
for_each_zone_zonelist_nodemask(zone, z, zonelist, gfp_zone(gfp_mask), nodemask) {
|
|
spin_lock_irqsave(&zone->lock, flags);
|
|
|
|
pfn = ALIGN(zone->zone_start_pfn, nr_pages);
|
|
while (zone_spans_last_pfn(zone, pfn, nr_pages)) {
|
|
if (pfn_range_valid_gigantic(zone, pfn, nr_pages)) {
|
|
/*
|
|
* We release the zone lock here because
|
|
* alloc_contig_range() will also lock the zone
|
|
* at some point. If there's an allocation
|
|
* spinning on this lock, it may win the race
|
|
* and cause alloc_contig_range() to fail...
|
|
*/
|
|
spin_unlock_irqrestore(&zone->lock, flags);
|
|
ret = __alloc_gigantic_page(pfn, nr_pages, gfp_mask);
|
|
if (!ret)
|
|
return pfn_to_page(pfn);
|
|
spin_lock_irqsave(&zone->lock, flags);
|
|
}
|
|
pfn += nr_pages;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&zone->lock, flags);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void prep_new_huge_page(struct hstate *h, struct page *page, int nid);
|
|
static void prep_compound_gigantic_page(struct page *page, unsigned int order);
|
|
#else /* !CONFIG_CONTIG_ALLOC */
|
|
static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
|
|
int nid, nodemask_t *nodemask)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif /* CONFIG_CONTIG_ALLOC */
|
|
|
|
#else /* !CONFIG_ARCH_HAS_GIGANTIC_PAGE */
|
|
static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
|
|
int nid, nodemask_t *nodemask)
|
|
{
|
|
return NULL;
|
|
}
|
|
static inline void free_gigantic_page(struct page *page, unsigned int order) { }
|
|
static inline void destroy_compound_gigantic_page(struct page *page,
|
|
unsigned int order) { }
|
|
#endif
|
|
|
|
static void update_and_free_page(struct hstate *h, struct page *page)
|
|
{
|
|
int i;
|
|
|
|
if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
|
|
return;
|
|
|
|
h->nr_huge_pages--;
|
|
h->nr_huge_pages_node[page_to_nid(page)]--;
|
|
for (i = 0; i < pages_per_huge_page(h); i++) {
|
|
page[i].flags &= ~(1 << PG_locked | 1 << PG_error |
|
|
1 << PG_referenced | 1 << PG_dirty |
|
|
1 << PG_active | 1 << PG_private |
|
|
1 << PG_writeback);
|
|
}
|
|
VM_BUG_ON_PAGE(hugetlb_cgroup_from_page(page), page);
|
|
set_compound_page_dtor(page, NULL_COMPOUND_DTOR);
|
|
set_page_refcounted(page);
|
|
if (hstate_is_gigantic(h)) {
|
|
destroy_compound_gigantic_page(page, huge_page_order(h));
|
|
free_gigantic_page(page, huge_page_order(h));
|
|
} else {
|
|
__free_pages(page, huge_page_order(h));
|
|
}
|
|
}
|
|
|
|
struct hstate *size_to_hstate(unsigned long size)
|
|
{
|
|
struct hstate *h;
|
|
|
|
for_each_hstate(h) {
|
|
if (huge_page_size(h) == size)
|
|
return h;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Test to determine whether the hugepage is "active/in-use" (i.e. being linked
|
|
* to hstate->hugepage_activelist.)
|
|
*
|
|
* This function can be called for tail pages, but never returns true for them.
|
|
*/
|
|
bool page_huge_active(struct page *page)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHuge(page), page);
|
|
return PageHead(page) && PagePrivate(&page[1]);
|
|
}
|
|
|
|
/* never called for tail page */
|
|
static void set_page_huge_active(struct page *page)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHeadHuge(page), page);
|
|
SetPagePrivate(&page[1]);
|
|
}
|
|
|
|
static void clear_page_huge_active(struct page *page)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHeadHuge(page), page);
|
|
ClearPagePrivate(&page[1]);
|
|
}
|
|
|
|
/*
|
|
* Internal hugetlb specific page flag. Do not use outside of the hugetlb
|
|
* code
|
|
*/
|
|
static inline bool PageHugeTemporary(struct page *page)
|
|
{
|
|
if (!PageHuge(page))
|
|
return false;
|
|
|
|
return (unsigned long)page[2].mapping == -1U;
|
|
}
|
|
|
|
static inline void SetPageHugeTemporary(struct page *page)
|
|
{
|
|
page[2].mapping = (void *)-1U;
|
|
}
|
|
|
|
static inline void ClearPageHugeTemporary(struct page *page)
|
|
{
|
|
page[2].mapping = NULL;
|
|
}
|
|
|
|
static void __free_huge_page(struct page *page)
|
|
{
|
|
/*
|
|
* Can't pass hstate in here because it is called from the
|
|
* compound page destructor.
|
|
*/
|
|
struct hstate *h = page_hstate(page);
|
|
int nid = page_to_nid(page);
|
|
struct hugepage_subpool *spool =
|
|
(struct hugepage_subpool *)page_private(page);
|
|
bool restore_reserve;
|
|
|
|
VM_BUG_ON_PAGE(page_count(page), page);
|
|
VM_BUG_ON_PAGE(page_mapcount(page), page);
|
|
|
|
set_page_private(page, 0);
|
|
page->mapping = NULL;
|
|
restore_reserve = PagePrivate(page);
|
|
ClearPagePrivate(page);
|
|
|
|
/*
|
|
* If PagePrivate() was set on page, page allocation consumed a
|
|
* reservation. If the page was associated with a subpool, there
|
|
* would have been a page reserved in the subpool before allocation
|
|
* via hugepage_subpool_get_pages(). Since we are 'restoring' the
|
|
* reservtion, do not call hugepage_subpool_put_pages() as this will
|
|
* remove the reserved page from the subpool.
|
|
*/
|
|
if (!restore_reserve) {
|
|
/*
|
|
* A return code of zero implies that the subpool will be
|
|
* under its minimum size if the reservation is not restored
|
|
* after page is free. Therefore, force restore_reserve
|
|
* operation.
|
|
*/
|
|
if (hugepage_subpool_put_pages(spool, 1) == 0)
|
|
restore_reserve = true;
|
|
}
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
clear_page_huge_active(page);
|
|
hugetlb_cgroup_uncharge_page(hstate_index(h),
|
|
pages_per_huge_page(h), page);
|
|
if (restore_reserve)
|
|
h->resv_huge_pages++;
|
|
|
|
if (PageHugeTemporary(page)) {
|
|
list_del(&page->lru);
|
|
ClearPageHugeTemporary(page);
|
|
update_and_free_page(h, page);
|
|
} else if (h->surplus_huge_pages_node[nid]) {
|
|
/* remove the page from active list */
|
|
list_del(&page->lru);
|
|
update_and_free_page(h, page);
|
|
h->surplus_huge_pages--;
|
|
h->surplus_huge_pages_node[nid]--;
|
|
} else {
|
|
arch_clear_hugepage_flags(page);
|
|
enqueue_huge_page(h, page);
|
|
}
|
|
spin_unlock(&hugetlb_lock);
|
|
}
|
|
|
|
/*
|
|
* As free_huge_page() can be called from a non-task context, we have
|
|
* to defer the actual freeing in a workqueue to prevent potential
|
|
* hugetlb_lock deadlock.
|
|
*
|
|
* free_hpage_workfn() locklessly retrieves the linked list of pages to
|
|
* be freed and frees them one-by-one. As the page->mapping pointer is
|
|
* going to be cleared in __free_huge_page() anyway, it is reused as the
|
|
* llist_node structure of a lockless linked list of huge pages to be freed.
|
|
*/
|
|
static LLIST_HEAD(hpage_freelist);
|
|
|
|
static void free_hpage_workfn(struct work_struct *work)
|
|
{
|
|
struct llist_node *node;
|
|
struct page *page;
|
|
|
|
node = llist_del_all(&hpage_freelist);
|
|
|
|
while (node) {
|
|
page = container_of((struct address_space **)node,
|
|
struct page, mapping);
|
|
node = node->next;
|
|
__free_huge_page(page);
|
|
}
|
|
}
|
|
static DECLARE_WORK(free_hpage_work, free_hpage_workfn);
|
|
|
|
void free_huge_page(struct page *page)
|
|
{
|
|
/*
|
|
* Defer freeing if in non-task context to avoid hugetlb_lock deadlock.
|
|
*/
|
|
if (!in_task()) {
|
|
/*
|
|
* Only call schedule_work() if hpage_freelist is previously
|
|
* empty. Otherwise, schedule_work() had been called but the
|
|
* workfn hasn't retrieved the list yet.
|
|
*/
|
|
if (llist_add((struct llist_node *)&page->mapping,
|
|
&hpage_freelist))
|
|
schedule_work(&free_hpage_work);
|
|
return;
|
|
}
|
|
|
|
__free_huge_page(page);
|
|
}
|
|
|
|
static void prep_new_huge_page(struct hstate *h, struct page *page, int nid)
|
|
{
|
|
INIT_LIST_HEAD(&page->lru);
|
|
set_compound_page_dtor(page, HUGETLB_PAGE_DTOR);
|
|
spin_lock(&hugetlb_lock);
|
|
set_hugetlb_cgroup(page, NULL);
|
|
h->nr_huge_pages++;
|
|
h->nr_huge_pages_node[nid]++;
|
|
spin_unlock(&hugetlb_lock);
|
|
}
|
|
|
|
static void prep_compound_gigantic_page(struct page *page, unsigned int order)
|
|
{
|
|
int i;
|
|
int nr_pages = 1 << order;
|
|
struct page *p = page + 1;
|
|
|
|
/* we rely on prep_new_huge_page to set the destructor */
|
|
set_compound_order(page, order);
|
|
__ClearPageReserved(page);
|
|
__SetPageHead(page);
|
|
for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
|
|
/*
|
|
* For gigantic hugepages allocated through bootmem at
|
|
* boot, it's safer to be consistent with the not-gigantic
|
|
* hugepages and clear the PG_reserved bit from all tail pages
|
|
* too. Otherwse drivers using get_user_pages() to access tail
|
|
* pages may get the reference counting wrong if they see
|
|
* PG_reserved set on a tail page (despite the head page not
|
|
* having PG_reserved set). Enforcing this consistency between
|
|
* head and tail pages allows drivers to optimize away a check
|
|
* on the head page when they need know if put_page() is needed
|
|
* after get_user_pages().
|
|
*/
|
|
__ClearPageReserved(p);
|
|
set_page_count(p, 0);
|
|
set_compound_head(p, page);
|
|
}
|
|
atomic_set(compound_mapcount_ptr(page), -1);
|
|
}
|
|
|
|
/*
|
|
* PageHuge() only returns true for hugetlbfs pages, but not for normal or
|
|
* transparent huge pages. See the PageTransHuge() documentation for more
|
|
* details.
|
|
*/
|
|
int PageHuge(struct page *page)
|
|
{
|
|
if (!PageCompound(page))
|
|
return 0;
|
|
|
|
page = compound_head(page);
|
|
return page[1].compound_dtor == HUGETLB_PAGE_DTOR;
|
|
}
|
|
EXPORT_SYMBOL_GPL(PageHuge);
|
|
|
|
/*
|
|
* PageHeadHuge() only returns true for hugetlbfs head page, but not for
|
|
* normal or transparent huge pages.
|
|
*/
|
|
int PageHeadHuge(struct page *page_head)
|
|
{
|
|
if (!PageHead(page_head))
|
|
return 0;
|
|
|
|
return get_compound_page_dtor(page_head) == free_huge_page;
|
|
}
|
|
|
|
pgoff_t __basepage_index(struct page *page)
|
|
{
|
|
struct page *page_head = compound_head(page);
|
|
pgoff_t index = page_index(page_head);
|
|
unsigned long compound_idx;
|
|
|
|
if (!PageHuge(page_head))
|
|
return page_index(page);
|
|
|
|
if (compound_order(page_head) >= MAX_ORDER)
|
|
compound_idx = page_to_pfn(page) - page_to_pfn(page_head);
|
|
else
|
|
compound_idx = page - page_head;
|
|
|
|
return (index << compound_order(page_head)) + compound_idx;
|
|
}
|
|
|
|
static struct page *alloc_buddy_huge_page(struct hstate *h,
|
|
gfp_t gfp_mask, int nid, nodemask_t *nmask,
|
|
nodemask_t *node_alloc_noretry)
|
|
{
|
|
int order = huge_page_order(h);
|
|
struct page *page;
|
|
bool alloc_try_hard = true;
|
|
|
|
/*
|
|
* By default we always try hard to allocate the page with
|
|
* __GFP_RETRY_MAYFAIL flag. However, if we are allocating pages in
|
|
* a loop (to adjust global huge page counts) and previous allocation
|
|
* failed, do not continue to try hard on the same node. Use the
|
|
* node_alloc_noretry bitmap to manage this state information.
|
|
*/
|
|
if (node_alloc_noretry && node_isset(nid, *node_alloc_noretry))
|
|
alloc_try_hard = false;
|
|
gfp_mask |= __GFP_COMP|__GFP_NOWARN;
|
|
if (alloc_try_hard)
|
|
gfp_mask |= __GFP_RETRY_MAYFAIL;
|
|
if (nid == NUMA_NO_NODE)
|
|
nid = numa_mem_id();
|
|
page = __alloc_pages_nodemask(gfp_mask, order, nid, nmask);
|
|
if (page)
|
|
__count_vm_event(HTLB_BUDDY_PGALLOC);
|
|
else
|
|
__count_vm_event(HTLB_BUDDY_PGALLOC_FAIL);
|
|
|
|
/*
|
|
* If we did not specify __GFP_RETRY_MAYFAIL, but still got a page this
|
|
* indicates an overall state change. Clear bit so that we resume
|
|
* normal 'try hard' allocations.
|
|
*/
|
|
if (node_alloc_noretry && page && !alloc_try_hard)
|
|
node_clear(nid, *node_alloc_noretry);
|
|
|
|
/*
|
|
* If we tried hard to get a page but failed, set bit so that
|
|
* subsequent attempts will not try as hard until there is an
|
|
* overall state change.
|
|
*/
|
|
if (node_alloc_noretry && !page && alloc_try_hard)
|
|
node_set(nid, *node_alloc_noretry);
|
|
|
|
return page;
|
|
}
|
|
|
|
/*
|
|
* Common helper to allocate a fresh hugetlb page. All specific allocators
|
|
* should use this function to get new hugetlb pages
|
|
*/
|
|
static struct page *alloc_fresh_huge_page(struct hstate *h,
|
|
gfp_t gfp_mask, int nid, nodemask_t *nmask,
|
|
nodemask_t *node_alloc_noretry)
|
|
{
|
|
struct page *page;
|
|
|
|
if (hstate_is_gigantic(h))
|
|
page = alloc_gigantic_page(h, gfp_mask, nid, nmask);
|
|
else
|
|
page = alloc_buddy_huge_page(h, gfp_mask,
|
|
nid, nmask, node_alloc_noretry);
|
|
if (!page)
|
|
return NULL;
|
|
|
|
if (hstate_is_gigantic(h))
|
|
prep_compound_gigantic_page(page, huge_page_order(h));
|
|
prep_new_huge_page(h, page, page_to_nid(page));
|
|
|
|
return page;
|
|
}
|
|
|
|
/*
|
|
* Allocates a fresh page to the hugetlb allocator pool in the node interleaved
|
|
* manner.
|
|
*/
|
|
static int alloc_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed,
|
|
nodemask_t *node_alloc_noretry)
|
|
{
|
|
struct page *page;
|
|
int nr_nodes, node;
|
|
gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
|
|
|
|
for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) {
|
|
page = alloc_fresh_huge_page(h, gfp_mask, node, nodes_allowed,
|
|
node_alloc_noretry);
|
|
if (page)
|
|
break;
|
|
}
|
|
|
|
if (!page)
|
|
return 0;
|
|
|
|
put_page(page); /* free it into the hugepage allocator */
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Free huge page from pool from next node to free.
|
|
* Attempt to keep persistent huge pages more or less
|
|
* balanced over allowed nodes.
|
|
* Called with hugetlb_lock locked.
|
|
*/
|
|
static int free_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed,
|
|
bool acct_surplus)
|
|
{
|
|
int nr_nodes, node;
|
|
int ret = 0;
|
|
|
|
for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) {
|
|
/*
|
|
* If we're returning unused surplus pages, only examine
|
|
* nodes with surplus pages.
|
|
*/
|
|
if ((!acct_surplus || h->surplus_huge_pages_node[node]) &&
|
|
!list_empty(&h->hugepage_freelists[node])) {
|
|
struct page *page =
|
|
list_entry(h->hugepage_freelists[node].next,
|
|
struct page, lru);
|
|
list_del(&page->lru);
|
|
h->free_huge_pages--;
|
|
h->free_huge_pages_node[node]--;
|
|
if (acct_surplus) {
|
|
h->surplus_huge_pages--;
|
|
h->surplus_huge_pages_node[node]--;
|
|
}
|
|
update_and_free_page(h, page);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Dissolve a given free hugepage into free buddy pages. This function does
|
|
* nothing for in-use hugepages and non-hugepages.
|
|
* This function returns values like below:
|
|
*
|
|
* -EBUSY: failed to dissolved free hugepages or the hugepage is in-use
|
|
* (allocated or reserved.)
|
|
* 0: successfully dissolved free hugepages or the page is not a
|
|
* hugepage (considered as already dissolved)
|
|
*/
|
|
int dissolve_free_huge_page(struct page *page)
|
|
{
|
|
int rc = -EBUSY;
|
|
|
|
/* Not to disrupt normal path by vainly holding hugetlb_lock */
|
|
if (!PageHuge(page))
|
|
return 0;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
if (!PageHuge(page)) {
|
|
rc = 0;
|
|
goto out;
|
|
}
|
|
|
|
if (!page_count(page)) {
|
|
struct page *head = compound_head(page);
|
|
struct hstate *h = page_hstate(head);
|
|
int nid = page_to_nid(head);
|
|
if (h->free_huge_pages - h->resv_huge_pages == 0)
|
|
goto out;
|
|
/*
|
|
* Move PageHWPoison flag from head page to the raw error page,
|
|
* which makes any subpages rather than the error page reusable.
|
|
*/
|
|
if (PageHWPoison(head) && page != head) {
|
|
SetPageHWPoison(page);
|
|
ClearPageHWPoison(head);
|
|
}
|
|
list_del(&head->lru);
|
|
h->free_huge_pages--;
|
|
h->free_huge_pages_node[nid]--;
|
|
h->max_huge_pages--;
|
|
update_and_free_page(h, head);
|
|
rc = 0;
|
|
}
|
|
out:
|
|
spin_unlock(&hugetlb_lock);
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
* Dissolve free hugepages in a given pfn range. Used by memory hotplug to
|
|
* make specified memory blocks removable from the system.
|
|
* Note that this will dissolve a free gigantic hugepage completely, if any
|
|
* part of it lies within the given range.
|
|
* Also note that if dissolve_free_huge_page() returns with an error, all
|
|
* free hugepages that were dissolved before that error are lost.
|
|
*/
|
|
int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
|
|
{
|
|
unsigned long pfn;
|
|
struct page *page;
|
|
int rc = 0;
|
|
|
|
if (!hugepages_supported())
|
|
return rc;
|
|
|
|
for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order) {
|
|
page = pfn_to_page(pfn);
|
|
rc = dissolve_free_huge_page(page);
|
|
if (rc)
|
|
break;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
* Allocates a fresh surplus page from the page allocator.
|
|
*/
|
|
static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
|
|
int nid, nodemask_t *nmask)
|
|
{
|
|
struct page *page = NULL;
|
|
|
|
if (hstate_is_gigantic(h))
|
|
return NULL;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
if (h->surplus_huge_pages >= h->nr_overcommit_huge_pages)
|
|
goto out_unlock;
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
page = alloc_fresh_huge_page(h, gfp_mask, nid, nmask, NULL);
|
|
if (!page)
|
|
return NULL;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
/*
|
|
* We could have raced with the pool size change.
|
|
* Double check that and simply deallocate the new page
|
|
* if we would end up overcommiting the surpluses. Abuse
|
|
* temporary page to workaround the nasty free_huge_page
|
|
* codeflow
|
|
*/
|
|
if (h->surplus_huge_pages >= h->nr_overcommit_huge_pages) {
|
|
SetPageHugeTemporary(page);
|
|
spin_unlock(&hugetlb_lock);
|
|
put_page(page);
|
|
return NULL;
|
|
} else {
|
|
h->surplus_huge_pages++;
|
|
h->surplus_huge_pages_node[page_to_nid(page)]++;
|
|
}
|
|
|
|
out_unlock:
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
return page;
|
|
}
|
|
|
|
struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask,
|
|
int nid, nodemask_t *nmask)
|
|
{
|
|
struct page *page;
|
|
|
|
if (hstate_is_gigantic(h))
|
|
return NULL;
|
|
|
|
page = alloc_fresh_huge_page(h, gfp_mask, nid, nmask, NULL);
|
|
if (!page)
|
|
return NULL;
|
|
|
|
/*
|
|
* We do not account these pages as surplus because they are only
|
|
* temporary and will be released properly on the last reference
|
|
*/
|
|
SetPageHugeTemporary(page);
|
|
|
|
return page;
|
|
}
|
|
|
|
/*
|
|
* Use the VMA's mpolicy to allocate a huge page from the buddy.
|
|
*/
|
|
static
|
|
struct page *alloc_buddy_huge_page_with_mpol(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
struct page *page;
|
|
struct mempolicy *mpol;
|
|
gfp_t gfp_mask = htlb_alloc_mask(h);
|
|
int nid;
|
|
nodemask_t *nodemask;
|
|
|
|
nid = huge_node(vma, addr, gfp_mask, &mpol, &nodemask);
|
|
page = alloc_surplus_huge_page(h, gfp_mask, nid, nodemask);
|
|
mpol_cond_put(mpol);
|
|
|
|
return page;
|
|
}
|
|
|
|
/* page migration callback function */
|
|
struct page *alloc_huge_page_node(struct hstate *h, int nid)
|
|
{
|
|
gfp_t gfp_mask = htlb_alloc_mask(h);
|
|
struct page *page = NULL;
|
|
|
|
if (nid != NUMA_NO_NODE)
|
|
gfp_mask |= __GFP_THISNODE;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
if (h->free_huge_pages - h->resv_huge_pages > 0)
|
|
page = dequeue_huge_page_nodemask(h, gfp_mask, nid, NULL);
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
if (!page)
|
|
page = alloc_migrate_huge_page(h, gfp_mask, nid, NULL);
|
|
|
|
return page;
|
|
}
|
|
|
|
/* page migration callback function */
|
|
struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
|
|
nodemask_t *nmask)
|
|
{
|
|
gfp_t gfp_mask = htlb_alloc_mask(h);
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
if (h->free_huge_pages - h->resv_huge_pages > 0) {
|
|
struct page *page;
|
|
|
|
page = dequeue_huge_page_nodemask(h, gfp_mask, preferred_nid, nmask);
|
|
if (page) {
|
|
spin_unlock(&hugetlb_lock);
|
|
return page;
|
|
}
|
|
}
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
return alloc_migrate_huge_page(h, gfp_mask, preferred_nid, nmask);
|
|
}
|
|
|
|
/* mempolicy aware migration callback */
|
|
struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma,
|
|
unsigned long address)
|
|
{
|
|
struct mempolicy *mpol;
|
|
nodemask_t *nodemask;
|
|
struct page *page;
|
|
gfp_t gfp_mask;
|
|
int node;
|
|
|
|
gfp_mask = htlb_alloc_mask(h);
|
|
node = huge_node(vma, address, gfp_mask, &mpol, &nodemask);
|
|
page = alloc_huge_page_nodemask(h, node, nodemask);
|
|
mpol_cond_put(mpol);
|
|
|
|
return page;
|
|
}
|
|
|
|
/*
|
|
* Increase the hugetlb pool such that it can accommodate a reservation
|
|
* of size 'delta'.
|
|
*/
|
|
static int gather_surplus_pages(struct hstate *h, int delta)
|
|
{
|
|
struct list_head surplus_list;
|
|
struct page *page, *tmp;
|
|
int ret, i;
|
|
int needed, allocated;
|
|
bool alloc_ok = true;
|
|
|
|
needed = (h->resv_huge_pages + delta) - h->free_huge_pages;
|
|
if (needed <= 0) {
|
|
h->resv_huge_pages += delta;
|
|
return 0;
|
|
}
|
|
|
|
allocated = 0;
|
|
INIT_LIST_HEAD(&surplus_list);
|
|
|
|
ret = -ENOMEM;
|
|
retry:
|
|
spin_unlock(&hugetlb_lock);
|
|
for (i = 0; i < needed; i++) {
|
|
page = alloc_surplus_huge_page(h, htlb_alloc_mask(h),
|
|
NUMA_NO_NODE, NULL);
|
|
if (!page) {
|
|
alloc_ok = false;
|
|
break;
|
|
}
|
|
list_add(&page->lru, &surplus_list);
|
|
cond_resched();
|
|
}
|
|
allocated += i;
|
|
|
|
/*
|
|
* After retaking hugetlb_lock, we need to recalculate 'needed'
|
|
* because either resv_huge_pages or free_huge_pages may have changed.
|
|
*/
|
|
spin_lock(&hugetlb_lock);
|
|
needed = (h->resv_huge_pages + delta) -
|
|
(h->free_huge_pages + allocated);
|
|
if (needed > 0) {
|
|
if (alloc_ok)
|
|
goto retry;
|
|
/*
|
|
* We were not able to allocate enough pages to
|
|
* satisfy the entire reservation so we free what
|
|
* we've allocated so far.
|
|
*/
|
|
goto free;
|
|
}
|
|
/*
|
|
* The surplus_list now contains _at_least_ the number of extra pages
|
|
* needed to accommodate the reservation. Add the appropriate number
|
|
* of pages to the hugetlb pool and free the extras back to the buddy
|
|
* allocator. Commit the entire reservation here to prevent another
|
|
* process from stealing the pages as they are added to the pool but
|
|
* before they are reserved.
|
|
*/
|
|
needed += allocated;
|
|
h->resv_huge_pages += delta;
|
|
ret = 0;
|
|
|
|
/* Free the needed pages to the hugetlb pool */
|
|
list_for_each_entry_safe(page, tmp, &surplus_list, lru) {
|
|
if ((--needed) < 0)
|
|
break;
|
|
/*
|
|
* This page is now managed by the hugetlb allocator and has
|
|
* no users -- drop the buddy allocator's reference.
|
|
*/
|
|
put_page_testzero(page);
|
|
VM_BUG_ON_PAGE(page_count(page), page);
|
|
enqueue_huge_page(h, page);
|
|
}
|
|
free:
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
/* Free unnecessary surplus pages to the buddy allocator */
|
|
list_for_each_entry_safe(page, tmp, &surplus_list, lru)
|
|
put_page(page);
|
|
spin_lock(&hugetlb_lock);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* This routine has two main purposes:
|
|
* 1) Decrement the reservation count (resv_huge_pages) by the value passed
|
|
* in unused_resv_pages. This corresponds to the prior adjustments made
|
|
* to the associated reservation map.
|
|
* 2) Free any unused surplus pages that may have been allocated to satisfy
|
|
* the reservation. As many as unused_resv_pages may be freed.
|
|
*
|
|
* Called with hugetlb_lock held. However, the lock could be dropped (and
|
|
* reacquired) during calls to cond_resched_lock. Whenever dropping the lock,
|
|
* we must make sure nobody else can claim pages we are in the process of
|
|
* freeing. Do this by ensuring resv_huge_page always is greater than the
|
|
* number of huge pages we plan to free when dropping the lock.
|
|
*/
|
|
static void return_unused_surplus_pages(struct hstate *h,
|
|
unsigned long unused_resv_pages)
|
|
{
|
|
unsigned long nr_pages;
|
|
|
|
/* Cannot return gigantic pages currently */
|
|
if (hstate_is_gigantic(h))
|
|
goto out;
|
|
|
|
/*
|
|
* Part (or even all) of the reservation could have been backed
|
|
* by pre-allocated pages. Only free surplus pages.
|
|
*/
|
|
nr_pages = min(unused_resv_pages, h->surplus_huge_pages);
|
|
|
|
/*
|
|
* We want to release as many surplus pages as possible, spread
|
|
* evenly across all nodes with memory. Iterate across these nodes
|
|
* until we can no longer free unreserved surplus pages. This occurs
|
|
* when the nodes with surplus pages have no free pages.
|
|
* free_pool_huge_page() will balance the the freed pages across the
|
|
* on-line nodes with memory and will handle the hstate accounting.
|
|
*
|
|
* Note that we decrement resv_huge_pages as we free the pages. If
|
|
* we drop the lock, resv_huge_pages will still be sufficiently large
|
|
* to cover subsequent pages we may free.
|
|
*/
|
|
while (nr_pages--) {
|
|
h->resv_huge_pages--;
|
|
unused_resv_pages--;
|
|
if (!free_pool_huge_page(h, &node_states[N_MEMORY], 1))
|
|
goto out;
|
|
cond_resched_lock(&hugetlb_lock);
|
|
}
|
|
|
|
out:
|
|
/* Fully uncommit the reservation */
|
|
h->resv_huge_pages -= unused_resv_pages;
|
|
}
|
|
|
|
|
|
/*
|
|
* vma_needs_reservation, vma_commit_reservation and vma_end_reservation
|
|
* are used by the huge page allocation routines to manage reservations.
|
|
*
|
|
* vma_needs_reservation is called to determine if the huge page at addr
|
|
* within the vma has an associated reservation. If a reservation is
|
|
* needed, the value 1 is returned. The caller is then responsible for
|
|
* managing the global reservation and subpool usage counts. After
|
|
* the huge page has been allocated, vma_commit_reservation is called
|
|
* to add the page to the reservation map. If the page allocation fails,
|
|
* the reservation must be ended instead of committed. vma_end_reservation
|
|
* is called in such cases.
|
|
*
|
|
* In the normal case, vma_commit_reservation returns the same value
|
|
* as the preceding vma_needs_reservation call. The only time this
|
|
* is not the case is if a reserve map was changed between calls. It
|
|
* is the responsibility of the caller to notice the difference and
|
|
* take appropriate action.
|
|
*
|
|
* vma_add_reservation is used in error paths where a reservation must
|
|
* be restored when a newly allocated huge page must be freed. It is
|
|
* to be called after calling vma_needs_reservation to determine if a
|
|
* reservation exists.
|
|
*/
|
|
enum vma_resv_mode {
|
|
VMA_NEEDS_RESV,
|
|
VMA_COMMIT_RESV,
|
|
VMA_END_RESV,
|
|
VMA_ADD_RESV,
|
|
};
|
|
static long __vma_reservation_common(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr,
|
|
enum vma_resv_mode mode)
|
|
{
|
|
struct resv_map *resv;
|
|
pgoff_t idx;
|
|
long ret;
|
|
|
|
resv = vma_resv_map(vma);
|
|
if (!resv)
|
|
return 1;
|
|
|
|
idx = vma_hugecache_offset(h, vma, addr);
|
|
switch (mode) {
|
|
case VMA_NEEDS_RESV:
|
|
ret = region_chg(resv, idx, idx + 1);
|
|
break;
|
|
case VMA_COMMIT_RESV:
|
|
ret = region_add(resv, idx, idx + 1);
|
|
break;
|
|
case VMA_END_RESV:
|
|
region_abort(resv, idx, idx + 1);
|
|
ret = 0;
|
|
break;
|
|
case VMA_ADD_RESV:
|
|
if (vma->vm_flags & VM_MAYSHARE)
|
|
ret = region_add(resv, idx, idx + 1);
|
|
else {
|
|
region_abort(resv, idx, idx + 1);
|
|
ret = region_del(resv, idx, idx + 1);
|
|
}
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
if (vma->vm_flags & VM_MAYSHARE)
|
|
return ret;
|
|
else if (is_vma_resv_set(vma, HPAGE_RESV_OWNER) && ret >= 0) {
|
|
/*
|
|
* In most cases, reserves always exist for private mappings.
|
|
* However, a file associated with mapping could have been
|
|
* hole punched or truncated after reserves were consumed.
|
|
* As subsequent fault on such a range will not use reserves.
|
|
* Subtle - The reserve map for private mappings has the
|
|
* opposite meaning than that of shared mappings. If NO
|
|
* entry is in the reserve map, it means a reservation exists.
|
|
* If an entry exists in the reserve map, it means the
|
|
* reservation has already been consumed. As a result, the
|
|
* return value of this routine is the opposite of the
|
|
* value returned from reserve map manipulation routines above.
|
|
*/
|
|
if (ret)
|
|
return 0;
|
|
else
|
|
return 1;
|
|
}
|
|
else
|
|
return ret < 0 ? ret : 0;
|
|
}
|
|
|
|
static long vma_needs_reservation(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
return __vma_reservation_common(h, vma, addr, VMA_NEEDS_RESV);
|
|
}
|
|
|
|
static long vma_commit_reservation(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
return __vma_reservation_common(h, vma, addr, VMA_COMMIT_RESV);
|
|
}
|
|
|
|
static void vma_end_reservation(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
(void)__vma_reservation_common(h, vma, addr, VMA_END_RESV);
|
|
}
|
|
|
|
static long vma_add_reservation(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
return __vma_reservation_common(h, vma, addr, VMA_ADD_RESV);
|
|
}
|
|
|
|
/*
|
|
* This routine is called to restore a reservation on error paths. In the
|
|
* specific error paths, a huge page was allocated (via alloc_huge_page)
|
|
* and is about to be freed. If a reservation for the page existed,
|
|
* alloc_huge_page would have consumed the reservation and set PagePrivate
|
|
* in the newly allocated page. When the page is freed via free_huge_page,
|
|
* the global reservation count will be incremented if PagePrivate is set.
|
|
* However, free_huge_page can not adjust the reserve map. Adjust the
|
|
* reserve map here to be consistent with global reserve count adjustments
|
|
* to be made by free_huge_page.
|
|
*/
|
|
static void restore_reserve_on_error(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long address,
|
|
struct page *page)
|
|
{
|
|
if (unlikely(PagePrivate(page))) {
|
|
long rc = vma_needs_reservation(h, vma, address);
|
|
|
|
if (unlikely(rc < 0)) {
|
|
/*
|
|
* Rare out of memory condition in reserve map
|
|
* manipulation. Clear PagePrivate so that
|
|
* global reserve count will not be incremented
|
|
* by free_huge_page. This will make it appear
|
|
* as though the reservation for this page was
|
|
* consumed. This may prevent the task from
|
|
* faulting in the page at a later time. This
|
|
* is better than inconsistent global huge page
|
|
* accounting of reserve counts.
|
|
*/
|
|
ClearPagePrivate(page);
|
|
} else if (rc) {
|
|
rc = vma_add_reservation(h, vma, address);
|
|
if (unlikely(rc < 0))
|
|
/*
|
|
* See above comment about rare out of
|
|
* memory condition.
|
|
*/
|
|
ClearPagePrivate(page);
|
|
} else
|
|
vma_end_reservation(h, vma, address);
|
|
}
|
|
}
|
|
|
|
struct page *alloc_huge_page(struct vm_area_struct *vma,
|
|
unsigned long addr, int avoid_reserve)
|
|
{
|
|
struct hugepage_subpool *spool = subpool_vma(vma);
|
|
struct hstate *h = hstate_vma(vma);
|
|
struct page *page;
|
|
long map_chg, map_commit;
|
|
long gbl_chg;
|
|
int ret, idx;
|
|
struct hugetlb_cgroup *h_cg;
|
|
|
|
idx = hstate_index(h);
|
|
/*
|
|
* Examine the region/reserve map to determine if the process
|
|
* has a reservation for the page to be allocated. A return
|
|
* code of zero indicates a reservation exists (no change).
|
|
*/
|
|
map_chg = gbl_chg = vma_needs_reservation(h, vma, addr);
|
|
if (map_chg < 0)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
/*
|
|
* Processes that did not create the mapping will have no
|
|
* reserves as indicated by the region/reserve map. Check
|
|
* that the allocation will not exceed the subpool limit.
|
|
* Allocations for MAP_NORESERVE mappings also need to be
|
|
* checked against any subpool limit.
|
|
*/
|
|
if (map_chg || avoid_reserve) {
|
|
gbl_chg = hugepage_subpool_get_pages(spool, 1);
|
|
if (gbl_chg < 0) {
|
|
vma_end_reservation(h, vma, addr);
|
|
return ERR_PTR(-ENOSPC);
|
|
}
|
|
|
|
/*
|
|
* Even though there was no reservation in the region/reserve
|
|
* map, there could be reservations associated with the
|
|
* subpool that can be used. This would be indicated if the
|
|
* return value of hugepage_subpool_get_pages() is zero.
|
|
* However, if avoid_reserve is specified we still avoid even
|
|
* the subpool reservations.
|
|
*/
|
|
if (avoid_reserve)
|
|
gbl_chg = 1;
|
|
}
|
|
|
|
ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), &h_cg);
|
|
if (ret)
|
|
goto out_subpool_put;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
/*
|
|
* glb_chg is passed to indicate whether or not a page must be taken
|
|
* from the global free pool (global change). gbl_chg == 0 indicates
|
|
* a reservation exists for the allocation.
|
|
*/
|
|
page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve, gbl_chg);
|
|
if (!page) {
|
|
spin_unlock(&hugetlb_lock);
|
|
page = alloc_buddy_huge_page_with_mpol(h, vma, addr);
|
|
if (!page)
|
|
goto out_uncharge_cgroup;
|
|
if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) {
|
|
SetPagePrivate(page);
|
|
h->resv_huge_pages--;
|
|
}
|
|
spin_lock(&hugetlb_lock);
|
|
list_move(&page->lru, &h->hugepage_activelist);
|
|
/* Fall through */
|
|
}
|
|
hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page);
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
set_page_private(page, (unsigned long)spool);
|
|
|
|
map_commit = vma_commit_reservation(h, vma, addr);
|
|
if (unlikely(map_chg > map_commit)) {
|
|
/*
|
|
* The page was added to the reservation map between
|
|
* vma_needs_reservation and vma_commit_reservation.
|
|
* This indicates a race with hugetlb_reserve_pages.
|
|
* Adjust for the subpool count incremented above AND
|
|
* in hugetlb_reserve_pages for the same page. Also,
|
|
* the reservation count added in hugetlb_reserve_pages
|
|
* no longer applies.
|
|
*/
|
|
long rsv_adjust;
|
|
|
|
rsv_adjust = hugepage_subpool_put_pages(spool, 1);
|
|
hugetlb_acct_memory(h, -rsv_adjust);
|
|
}
|
|
return page;
|
|
|
|
out_uncharge_cgroup:
|
|
hugetlb_cgroup_uncharge_cgroup(idx, pages_per_huge_page(h), h_cg);
|
|
out_subpool_put:
|
|
if (map_chg || avoid_reserve)
|
|
hugepage_subpool_put_pages(spool, 1);
|
|
vma_end_reservation(h, vma, addr);
|
|
return ERR_PTR(-ENOSPC);
|
|
}
|
|
|
|
int alloc_bootmem_huge_page(struct hstate *h)
|
|
__attribute__ ((weak, alias("__alloc_bootmem_huge_page")));
|
|
int __alloc_bootmem_huge_page(struct hstate *h)
|
|
{
|
|
struct huge_bootmem_page *m;
|
|
int nr_nodes, node;
|
|
|
|
for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) {
|
|
void *addr;
|
|
|
|
addr = memblock_alloc_try_nid_raw(
|
|
huge_page_size(h), huge_page_size(h),
|
|
0, MEMBLOCK_ALLOC_ACCESSIBLE, node);
|
|
if (addr) {
|
|
/*
|
|
* Use the beginning of the huge page to store the
|
|
* huge_bootmem_page struct (until gather_bootmem
|
|
* puts them into the mem_map).
|
|
*/
|
|
m = addr;
|
|
goto found;
|
|
}
|
|
}
|
|
return 0;
|
|
|
|
found:
|
|
BUG_ON(!IS_ALIGNED(virt_to_phys(m), huge_page_size(h)));
|
|
/* Put them into a private list first because mem_map is not up yet */
|
|
INIT_LIST_HEAD(&m->list);
|
|
list_add(&m->list, &huge_boot_pages);
|
|
m->hstate = h;
|
|
return 1;
|
|
}
|
|
|
|
static void __init prep_compound_huge_page(struct page *page,
|
|
unsigned int order)
|
|
{
|
|
if (unlikely(order > (MAX_ORDER - 1)))
|
|
prep_compound_gigantic_page(page, order);
|
|
else
|
|
prep_compound_page(page, order);
|
|
}
|
|
|
|
/* Put bootmem huge pages into the standard lists after mem_map is up */
|
|
static void __init gather_bootmem_prealloc(void)
|
|
{
|
|
struct huge_bootmem_page *m;
|
|
|
|
list_for_each_entry(m, &huge_boot_pages, list) {
|
|
struct page *page = virt_to_page(m);
|
|
struct hstate *h = m->hstate;
|
|
|
|
WARN_ON(page_count(page) != 1);
|
|
prep_compound_huge_page(page, h->order);
|
|
WARN_ON(PageReserved(page));
|
|
prep_new_huge_page(h, page, page_to_nid(page));
|
|
put_page(page); /* free it into the hugepage allocator */
|
|
|
|
/*
|
|
* If we had gigantic hugepages allocated at boot time, we need
|
|
* to restore the 'stolen' pages to totalram_pages in order to
|
|
* fix confusing memory reports from free(1) and another
|
|
* side-effects, like CommitLimit going negative.
|
|
*/
|
|
if (hstate_is_gigantic(h))
|
|
adjust_managed_page_count(page, 1 << h->order);
|
|
cond_resched();
|
|
}
|
|
}
|
|
|
|
static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
|
|
{
|
|
unsigned long i;
|
|
nodemask_t *node_alloc_noretry;
|
|
|
|
if (!hstate_is_gigantic(h)) {
|
|
/*
|
|
* Bit mask controlling how hard we retry per-node allocations.
|
|
* Ignore errors as lower level routines can deal with
|
|
* node_alloc_noretry == NULL. If this kmalloc fails at boot
|
|
* time, we are likely in bigger trouble.
|
|
*/
|
|
node_alloc_noretry = kmalloc(sizeof(*node_alloc_noretry),
|
|
GFP_KERNEL);
|
|
} else {
|
|
/* allocations done at boot time */
|
|
node_alloc_noretry = NULL;
|
|
}
|
|
|
|
/* bit mask controlling how hard we retry per-node allocations */
|
|
if (node_alloc_noretry)
|
|
nodes_clear(*node_alloc_noretry);
|
|
|
|
for (i = 0; i < h->max_huge_pages; ++i) {
|
|
if (hstate_is_gigantic(h)) {
|
|
if (!alloc_bootmem_huge_page(h))
|
|
break;
|
|
} else if (!alloc_pool_huge_page(h,
|
|
&node_states[N_MEMORY],
|
|
node_alloc_noretry))
|
|
break;
|
|
cond_resched();
|
|
}
|
|
if (i < h->max_huge_pages) {
|
|
char buf[32];
|
|
|
|
string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32);
|
|
pr_warn("HugeTLB: allocating %lu of page size %s failed. Only allocated %lu hugepages.\n",
|
|
h->max_huge_pages, buf, i);
|
|
h->max_huge_pages = i;
|
|
}
|
|
|
|
kfree(node_alloc_noretry);
|
|
}
|
|
|
|
static void __init hugetlb_init_hstates(void)
|
|
{
|
|
struct hstate *h;
|
|
|
|
for_each_hstate(h) {
|
|
if (minimum_order > huge_page_order(h))
|
|
minimum_order = huge_page_order(h);
|
|
|
|
/* oversize hugepages were init'ed in early boot */
|
|
if (!hstate_is_gigantic(h))
|
|
hugetlb_hstate_alloc_pages(h);
|
|
}
|
|
VM_BUG_ON(minimum_order == UINT_MAX);
|
|
}
|
|
|
|
static void __init report_hugepages(void)
|
|
{
|
|
struct hstate *h;
|
|
|
|
for_each_hstate(h) {
|
|
char buf[32];
|
|
|
|
string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32);
|
|
pr_info("HugeTLB registered %s page size, pre-allocated %ld pages\n",
|
|
buf, h->free_huge_pages);
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
static void try_to_free_low(struct hstate *h, unsigned long count,
|
|
nodemask_t *nodes_allowed)
|
|
{
|
|
int i;
|
|
|
|
if (hstate_is_gigantic(h))
|
|
return;
|
|
|
|
for_each_node_mask(i, *nodes_allowed) {
|
|
struct page *page, *next;
|
|
struct list_head *freel = &h->hugepage_freelists[i];
|
|
list_for_each_entry_safe(page, next, freel, lru) {
|
|
if (count >= h->nr_huge_pages)
|
|
return;
|
|
if (PageHighMem(page))
|
|
continue;
|
|
list_del(&page->lru);
|
|
update_and_free_page(h, page);
|
|
h->free_huge_pages--;
|
|
h->free_huge_pages_node[page_to_nid(page)]--;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
static inline void try_to_free_low(struct hstate *h, unsigned long count,
|
|
nodemask_t *nodes_allowed)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Increment or decrement surplus_huge_pages. Keep node-specific counters
|
|
* balanced by operating on them in a round-robin fashion.
|
|
* Returns 1 if an adjustment was made.
|
|
*/
|
|
static int adjust_pool_surplus(struct hstate *h, nodemask_t *nodes_allowed,
|
|
int delta)
|
|
{
|
|
int nr_nodes, node;
|
|
|
|
VM_BUG_ON(delta != -1 && delta != 1);
|
|
|
|
if (delta < 0) {
|
|
for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) {
|
|
if (h->surplus_huge_pages_node[node])
|
|
goto found;
|
|
}
|
|
} else {
|
|
for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) {
|
|
if (h->surplus_huge_pages_node[node] <
|
|
h->nr_huge_pages_node[node])
|
|
goto found;
|
|
}
|
|
}
|
|
return 0;
|
|
|
|
found:
|
|
h->surplus_huge_pages += delta;
|
|
h->surplus_huge_pages_node[node] += delta;
|
|
return 1;
|
|
}
|
|
|
|
#define persistent_huge_pages(h) (h->nr_huge_pages - h->surplus_huge_pages)
|
|
static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid,
|
|
nodemask_t *nodes_allowed)
|
|
{
|
|
unsigned long min_count, ret;
|
|
NODEMASK_ALLOC(nodemask_t, node_alloc_noretry, GFP_KERNEL);
|
|
|
|
/*
|
|
* Bit mask controlling how hard we retry per-node allocations.
|
|
* If we can not allocate the bit mask, do not attempt to allocate
|
|
* the requested huge pages.
|
|
*/
|
|
if (node_alloc_noretry)
|
|
nodes_clear(*node_alloc_noretry);
|
|
else
|
|
return -ENOMEM;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
|
|
/*
|
|
* Check for a node specific request.
|
|
* Changing node specific huge page count may require a corresponding
|
|
* change to the global count. In any case, the passed node mask
|
|
* (nodes_allowed) will restrict alloc/free to the specified node.
|
|
*/
|
|
if (nid != NUMA_NO_NODE) {
|
|
unsigned long old_count = count;
|
|
|
|
count += h->nr_huge_pages - h->nr_huge_pages_node[nid];
|
|
/*
|
|
* User may have specified a large count value which caused the
|
|
* above calculation to overflow. In this case, they wanted
|
|
* to allocate as many huge pages as possible. Set count to
|
|
* largest possible value to align with their intention.
|
|
*/
|
|
if (count < old_count)
|
|
count = ULONG_MAX;
|
|
}
|
|
|
|
/*
|
|
* Gigantic pages runtime allocation depend on the capability for large
|
|
* page range allocation.
|
|
* If the system does not provide this feature, return an error when
|
|
* the user tries to allocate gigantic pages but let the user free the
|
|
* boottime allocated gigantic pages.
|
|
*/
|
|
if (hstate_is_gigantic(h) && !IS_ENABLED(CONFIG_CONTIG_ALLOC)) {
|
|
if (count > persistent_huge_pages(h)) {
|
|
spin_unlock(&hugetlb_lock);
|
|
NODEMASK_FREE(node_alloc_noretry);
|
|
return -EINVAL;
|
|
}
|
|
/* Fall through to decrease pool */
|
|
}
|
|
|
|
/*
|
|
* Increase the pool size
|
|
* First take pages out of surplus state. Then make up the
|
|
* remaining difference by allocating fresh huge pages.
|
|
*
|
|
* We might race with alloc_surplus_huge_page() here and be unable
|
|
* to convert a surplus huge page to a normal huge page. That is
|
|
* not critical, though, it just means the overall size of the
|
|
* pool might be one hugepage larger than it needs to be, but
|
|
* within all the constraints specified by the sysctls.
|
|
*/
|
|
while (h->surplus_huge_pages && count > persistent_huge_pages(h)) {
|
|
if (!adjust_pool_surplus(h, nodes_allowed, -1))
|
|
break;
|
|
}
|
|
|
|
while (count > persistent_huge_pages(h)) {
|
|
/*
|
|
* If this allocation races such that we no longer need the
|
|
* page, free_huge_page will handle it by freeing the page
|
|
* and reducing the surplus.
|
|
*/
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
/* yield cpu to avoid soft lockup */
|
|
cond_resched();
|
|
|
|
ret = alloc_pool_huge_page(h, nodes_allowed,
|
|
node_alloc_noretry);
|
|
spin_lock(&hugetlb_lock);
|
|
if (!ret)
|
|
goto out;
|
|
|
|
/* Bail for signals. Probably ctrl-c from user */
|
|
if (signal_pending(current))
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Decrease the pool size
|
|
* First return free pages to the buddy allocator (being careful
|
|
* to keep enough around to satisfy reservations). Then place
|
|
* pages into surplus state as needed so the pool will shrink
|
|
* to the desired size as pages become free.
|
|
*
|
|
* By placing pages into the surplus state independent of the
|
|
* overcommit value, we are allowing the surplus pool size to
|
|
* exceed overcommit. There are few sane options here. Since
|
|
* alloc_surplus_huge_page() is checking the global counter,
|
|
* though, we'll note that we're not allowed to exceed surplus
|
|
* and won't grow the pool anywhere else. Not until one of the
|
|
* sysctls are changed, or the surplus pages go out of use.
|
|
*/
|
|
min_count = h->resv_huge_pages + h->nr_huge_pages - h->free_huge_pages;
|
|
min_count = max(count, min_count);
|
|
try_to_free_low(h, min_count, nodes_allowed);
|
|
while (min_count < persistent_huge_pages(h)) {
|
|
if (!free_pool_huge_page(h, nodes_allowed, 0))
|
|
break;
|
|
cond_resched_lock(&hugetlb_lock);
|
|
}
|
|
while (count < persistent_huge_pages(h)) {
|
|
if (!adjust_pool_surplus(h, nodes_allowed, 1))
|
|
break;
|
|
}
|
|
out:
|
|
h->max_huge_pages = persistent_huge_pages(h);
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
NODEMASK_FREE(node_alloc_noretry);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define HSTATE_ATTR_RO(_name) \
|
|
static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
|
|
|
|
#define HSTATE_ATTR(_name) \
|
|
static struct kobj_attribute _name##_attr = \
|
|
__ATTR(_name, 0644, _name##_show, _name##_store)
|
|
|
|
static struct kobject *hugepages_kobj;
|
|
static struct kobject *hstate_kobjs[HUGE_MAX_HSTATE];
|
|
|
|
static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp);
|
|
|
|
static struct hstate *kobj_to_hstate(struct kobject *kobj, int *nidp)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < HUGE_MAX_HSTATE; i++)
|
|
if (hstate_kobjs[i] == kobj) {
|
|
if (nidp)
|
|
*nidp = NUMA_NO_NODE;
|
|
return &hstates[i];
|
|
}
|
|
|
|
return kobj_to_node_hstate(kobj, nidp);
|
|
}
|
|
|
|
static ssize_t nr_hugepages_show_common(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long nr_huge_pages;
|
|
int nid;
|
|
|
|
h = kobj_to_hstate(kobj, &nid);
|
|
if (nid == NUMA_NO_NODE)
|
|
nr_huge_pages = h->nr_huge_pages;
|
|
else
|
|
nr_huge_pages = h->nr_huge_pages_node[nid];
|
|
|
|
return sprintf(buf, "%lu\n", nr_huge_pages);
|
|
}
|
|
|
|
static ssize_t __nr_hugepages_store_common(bool obey_mempolicy,
|
|
struct hstate *h, int nid,
|
|
unsigned long count, size_t len)
|
|
{
|
|
int err;
|
|
nodemask_t nodes_allowed, *n_mask;
|
|
|
|
if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
|
|
return -EINVAL;
|
|
|
|
if (nid == NUMA_NO_NODE) {
|
|
/*
|
|
* global hstate attribute
|
|
*/
|
|
if (!(obey_mempolicy &&
|
|
init_nodemask_of_mempolicy(&nodes_allowed)))
|
|
n_mask = &node_states[N_MEMORY];
|
|
else
|
|
n_mask = &nodes_allowed;
|
|
} else {
|
|
/*
|
|
* Node specific request. count adjustment happens in
|
|
* set_max_huge_pages() after acquiring hugetlb_lock.
|
|
*/
|
|
init_nodemask_of_node(&nodes_allowed, nid);
|
|
n_mask = &nodes_allowed;
|
|
}
|
|
|
|
err = set_max_huge_pages(h, count, nid, n_mask);
|
|
|
|
return err ? err : len;
|
|
}
|
|
|
|
static ssize_t nr_hugepages_store_common(bool obey_mempolicy,
|
|
struct kobject *kobj, const char *buf,
|
|
size_t len)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long count;
|
|
int nid;
|
|
int err;
|
|
|
|
err = kstrtoul(buf, 10, &count);
|
|
if (err)
|
|
return err;
|
|
|
|
h = kobj_to_hstate(kobj, &nid);
|
|
return __nr_hugepages_store_common(obey_mempolicy, h, nid, count, len);
|
|
}
|
|
|
|
static ssize_t nr_hugepages_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
return nr_hugepages_show_common(kobj, attr, buf);
|
|
}
|
|
|
|
static ssize_t nr_hugepages_store(struct kobject *kobj,
|
|
struct kobj_attribute *attr, const char *buf, size_t len)
|
|
{
|
|
return nr_hugepages_store_common(false, kobj, buf, len);
|
|
}
|
|
HSTATE_ATTR(nr_hugepages);
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
/*
|
|
* hstate attribute for optionally mempolicy-based constraint on persistent
|
|
* huge page alloc/free.
|
|
*/
|
|
static ssize_t nr_hugepages_mempolicy_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
return nr_hugepages_show_common(kobj, attr, buf);
|
|
}
|
|
|
|
static ssize_t nr_hugepages_mempolicy_store(struct kobject *kobj,
|
|
struct kobj_attribute *attr, const char *buf, size_t len)
|
|
{
|
|
return nr_hugepages_store_common(true, kobj, buf, len);
|
|
}
|
|
HSTATE_ATTR(nr_hugepages_mempolicy);
|
|
#endif
|
|
|
|
|
|
static ssize_t nr_overcommit_hugepages_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
struct hstate *h = kobj_to_hstate(kobj, NULL);
|
|
return sprintf(buf, "%lu\n", h->nr_overcommit_huge_pages);
|
|
}
|
|
|
|
static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
|
|
struct kobj_attribute *attr, const char *buf, size_t count)
|
|
{
|
|
int err;
|
|
unsigned long input;
|
|
struct hstate *h = kobj_to_hstate(kobj, NULL);
|
|
|
|
if (hstate_is_gigantic(h))
|
|
return -EINVAL;
|
|
|
|
err = kstrtoul(buf, 10, &input);
|
|
if (err)
|
|
return err;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
h->nr_overcommit_huge_pages = input;
|
|
spin_unlock(&hugetlb_lock);
|
|
|
|
return count;
|
|
}
|
|
HSTATE_ATTR(nr_overcommit_hugepages);
|
|
|
|
static ssize_t free_hugepages_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long free_huge_pages;
|
|
int nid;
|
|
|
|
h = kobj_to_hstate(kobj, &nid);
|
|
if (nid == NUMA_NO_NODE)
|
|
free_huge_pages = h->free_huge_pages;
|
|
else
|
|
free_huge_pages = h->free_huge_pages_node[nid];
|
|
|
|
return sprintf(buf, "%lu\n", free_huge_pages);
|
|
}
|
|
HSTATE_ATTR_RO(free_hugepages);
|
|
|
|
static ssize_t resv_hugepages_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
struct hstate *h = kobj_to_hstate(kobj, NULL);
|
|
return sprintf(buf, "%lu\n", h->resv_huge_pages);
|
|
}
|
|
HSTATE_ATTR_RO(resv_hugepages);
|
|
|
|
static ssize_t surplus_hugepages_show(struct kobject *kobj,
|
|
struct kobj_attribute *attr, char *buf)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long surplus_huge_pages;
|
|
int nid;
|
|
|
|
h = kobj_to_hstate(kobj, &nid);
|
|
if (nid == NUMA_NO_NODE)
|
|
surplus_huge_pages = h->surplus_huge_pages;
|
|
else
|
|
surplus_huge_pages = h->surplus_huge_pages_node[nid];
|
|
|
|
return sprintf(buf, "%lu\n", surplus_huge_pages);
|
|
}
|
|
HSTATE_ATTR_RO(surplus_hugepages);
|
|
|
|
static struct attribute *hstate_attrs[] = {
|
|
&nr_hugepages_attr.attr,
|
|
&nr_overcommit_hugepages_attr.attr,
|
|
&free_hugepages_attr.attr,
|
|
&resv_hugepages_attr.attr,
|
|
&surplus_hugepages_attr.attr,
|
|
#ifdef CONFIG_NUMA
|
|
&nr_hugepages_mempolicy_attr.attr,
|
|
#endif
|
|
NULL,
|
|
};
|
|
|
|
static const struct attribute_group hstate_attr_group = {
|
|
.attrs = hstate_attrs,
|
|
};
|
|
|
|
static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent,
|
|
struct kobject **hstate_kobjs,
|
|
const struct attribute_group *hstate_attr_group)
|
|
{
|
|
int retval;
|
|
int hi = hstate_index(h);
|
|
|
|
hstate_kobjs[hi] = kobject_create_and_add(h->name, parent);
|
|
if (!hstate_kobjs[hi])
|
|
return -ENOMEM;
|
|
|
|
retval = sysfs_create_group(hstate_kobjs[hi], hstate_attr_group);
|
|
if (retval)
|
|
kobject_put(hstate_kobjs[hi]);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static void __init hugetlb_sysfs_init(void)
|
|
{
|
|
struct hstate *h;
|
|
int err;
|
|
|
|
hugepages_kobj = kobject_create_and_add("hugepages", mm_kobj);
|
|
if (!hugepages_kobj)
|
|
return;
|
|
|
|
for_each_hstate(h) {
|
|
err = hugetlb_sysfs_add_hstate(h, hugepages_kobj,
|
|
hstate_kobjs, &hstate_attr_group);
|
|
if (err)
|
|
pr_err("Hugetlb: Unable to add hstate %s", h->name);
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
/*
|
|
* node_hstate/s - associate per node hstate attributes, via their kobjects,
|
|
* with node devices in node_devices[] using a parallel array. The array
|
|
* index of a node device or _hstate == node id.
|
|
* This is here to avoid any static dependency of the node device driver, in
|
|
* the base kernel, on the hugetlb module.
|
|
*/
|
|
struct node_hstate {
|
|
struct kobject *hugepages_kobj;
|
|
struct kobject *hstate_kobjs[HUGE_MAX_HSTATE];
|
|
};
|
|
static struct node_hstate node_hstates[MAX_NUMNODES];
|
|
|
|
/*
|
|
* A subset of global hstate attributes for node devices
|
|
*/
|
|
static struct attribute *per_node_hstate_attrs[] = {
|
|
&nr_hugepages_attr.attr,
|
|
&free_hugepages_attr.attr,
|
|
&surplus_hugepages_attr.attr,
|
|
NULL,
|
|
};
|
|
|
|
static const struct attribute_group per_node_hstate_attr_group = {
|
|
.attrs = per_node_hstate_attrs,
|
|
};
|
|
|
|
/*
|
|
* kobj_to_node_hstate - lookup global hstate for node device hstate attr kobj.
|
|
* Returns node id via non-NULL nidp.
|
|
*/
|
|
static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
|
|
{
|
|
int nid;
|
|
|
|
for (nid = 0; nid < nr_node_ids; nid++) {
|
|
struct node_hstate *nhs = &node_hstates[nid];
|
|
int i;
|
|
for (i = 0; i < HUGE_MAX_HSTATE; i++)
|
|
if (nhs->hstate_kobjs[i] == kobj) {
|
|
if (nidp)
|
|
*nidp = nid;
|
|
return &hstates[i];
|
|
}
|
|
}
|
|
|
|
BUG();
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Unregister hstate attributes from a single node device.
|
|
* No-op if no hstate attributes attached.
|
|
*/
|
|
static void hugetlb_unregister_node(struct node *node)
|
|
{
|
|
struct hstate *h;
|
|
struct node_hstate *nhs = &node_hstates[node->dev.id];
|
|
|
|
if (!nhs->hugepages_kobj)
|
|
return; /* no hstate attributes */
|
|
|
|
for_each_hstate(h) {
|
|
int idx = hstate_index(h);
|
|
if (nhs->hstate_kobjs[idx]) {
|
|
kobject_put(nhs->hstate_kobjs[idx]);
|
|
nhs->hstate_kobjs[idx] = NULL;
|
|
}
|
|
}
|
|
|
|
kobject_put(nhs->hugepages_kobj);
|
|
nhs->hugepages_kobj = NULL;
|
|
}
|
|
|
|
|
|
/*
|
|
* Register hstate attributes for a single node device.
|
|
* No-op if attributes already registered.
|
|
*/
|
|
static void hugetlb_register_node(struct node *node)
|
|
{
|
|
struct hstate *h;
|
|
struct node_hstate *nhs = &node_hstates[node->dev.id];
|
|
int err;
|
|
|
|
if (nhs->hugepages_kobj)
|
|
return; /* already allocated */
|
|
|
|
nhs->hugepages_kobj = kobject_create_and_add("hugepages",
|
|
&node->dev.kobj);
|
|
if (!nhs->hugepages_kobj)
|
|
return;
|
|
|
|
for_each_hstate(h) {
|
|
err = hugetlb_sysfs_add_hstate(h, nhs->hugepages_kobj,
|
|
nhs->hstate_kobjs,
|
|
&per_node_hstate_attr_group);
|
|
if (err) {
|
|
pr_err("Hugetlb: Unable to add hstate %s for node %d\n",
|
|
h->name, node->dev.id);
|
|
hugetlb_unregister_node(node);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* hugetlb init time: register hstate attributes for all registered node
|
|
* devices of nodes that have memory. All on-line nodes should have
|
|
* registered their associated device by this time.
|
|
*/
|
|
static void __init hugetlb_register_all_nodes(void)
|
|
{
|
|
int nid;
|
|
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
struct node *node = node_devices[nid];
|
|
if (node->dev.id == nid)
|
|
hugetlb_register_node(node);
|
|
}
|
|
|
|
/*
|
|
* Let the node device driver know we're here so it can
|
|
* [un]register hstate attributes on node hotplug.
|
|
*/
|
|
register_hugetlbfs_with_node(hugetlb_register_node,
|
|
hugetlb_unregister_node);
|
|
}
|
|
#else /* !CONFIG_NUMA */
|
|
|
|
static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
|
|
{
|
|
BUG();
|
|
if (nidp)
|
|
*nidp = -1;
|
|
return NULL;
|
|
}
|
|
|
|
static void hugetlb_register_all_nodes(void) { }
|
|
|
|
#endif
|
|
|
|
static int __init hugetlb_init(void)
|
|
{
|
|
int i;
|
|
|
|
if (!hugepages_supported())
|
|
return 0;
|
|
|
|
if (!size_to_hstate(default_hstate_size)) {
|
|
if (default_hstate_size != 0) {
|
|
pr_err("HugeTLB: unsupported default_hugepagesz %lu. Reverting to %lu\n",
|
|
default_hstate_size, HPAGE_SIZE);
|
|
}
|
|
|
|
default_hstate_size = HPAGE_SIZE;
|
|
if (!size_to_hstate(default_hstate_size))
|
|
hugetlb_add_hstate(HUGETLB_PAGE_ORDER);
|
|
}
|
|
default_hstate_idx = hstate_index(size_to_hstate(default_hstate_size));
|
|
if (default_hstate_max_huge_pages) {
|
|
if (!default_hstate.max_huge_pages)
|
|
default_hstate.max_huge_pages = default_hstate_max_huge_pages;
|
|
}
|
|
|
|
hugetlb_init_hstates();
|
|
gather_bootmem_prealloc();
|
|
report_hugepages();
|
|
|
|
hugetlb_sysfs_init();
|
|
hugetlb_register_all_nodes();
|
|
hugetlb_cgroup_file_init();
|
|
|
|
#ifdef CONFIG_SMP
|
|
num_fault_mutexes = roundup_pow_of_two(8 * num_possible_cpus());
|
|
#else
|
|
num_fault_mutexes = 1;
|
|
#endif
|
|
hugetlb_fault_mutex_table =
|
|
kmalloc_array(num_fault_mutexes, sizeof(struct mutex),
|
|
GFP_KERNEL);
|
|
BUG_ON(!hugetlb_fault_mutex_table);
|
|
|
|
for (i = 0; i < num_fault_mutexes; i++)
|
|
mutex_init(&hugetlb_fault_mutex_table[i]);
|
|
return 0;
|
|
}
|
|
subsys_initcall(hugetlb_init);
|
|
|
|
/* Should be called on processing a hugepagesz=... option */
|
|
void __init hugetlb_bad_size(void)
|
|
{
|
|
parsed_valid_hugepagesz = false;
|
|
}
|
|
|
|
void __init hugetlb_add_hstate(unsigned int order)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long i;
|
|
|
|
if (size_to_hstate(PAGE_SIZE << order)) {
|
|
pr_warn("hugepagesz= specified twice, ignoring\n");
|
|
return;
|
|
}
|
|
BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE);
|
|
BUG_ON(order == 0);
|
|
h = &hstates[hugetlb_max_hstate++];
|
|
h->order = order;
|
|
h->mask = ~((1ULL << (order + PAGE_SHIFT)) - 1);
|
|
h->nr_huge_pages = 0;
|
|
h->free_huge_pages = 0;
|
|
for (i = 0; i < MAX_NUMNODES; ++i)
|
|
INIT_LIST_HEAD(&h->hugepage_freelists[i]);
|
|
INIT_LIST_HEAD(&h->hugepage_activelist);
|
|
h->next_nid_to_alloc = first_memory_node;
|
|
h->next_nid_to_free = first_memory_node;
|
|
snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",
|
|
huge_page_size(h)/1024);
|
|
|
|
parsed_hstate = h;
|
|
}
|
|
|
|
static int __init hugetlb_nrpages_setup(char *s)
|
|
{
|
|
unsigned long *mhp;
|
|
static unsigned long *last_mhp;
|
|
|
|
if (!parsed_valid_hugepagesz) {
|
|
pr_warn("hugepages = %s preceded by "
|
|
"an unsupported hugepagesz, ignoring\n", s);
|
|
parsed_valid_hugepagesz = true;
|
|
return 1;
|
|
}
|
|
/*
|
|
* !hugetlb_max_hstate means we haven't parsed a hugepagesz= parameter yet,
|
|
* so this hugepages= parameter goes to the "default hstate".
|
|
*/
|
|
else if (!hugetlb_max_hstate)
|
|
mhp = &default_hstate_max_huge_pages;
|
|
else
|
|
mhp = &parsed_hstate->max_huge_pages;
|
|
|
|
if (mhp == last_mhp) {
|
|
pr_warn("hugepages= specified twice without interleaving hugepagesz=, ignoring\n");
|
|
return 1;
|
|
}
|
|
|
|
if (sscanf(s, "%lu", mhp) <= 0)
|
|
*mhp = 0;
|
|
|
|
/*
|
|
* Global state is always initialized later in hugetlb_init.
|
|
* But we need to allocate >= MAX_ORDER hstates here early to still
|
|
* use the bootmem allocator.
|
|
*/
|
|
if (hugetlb_max_hstate && parsed_hstate->order >= MAX_ORDER)
|
|
hugetlb_hstate_alloc_pages(parsed_hstate);
|
|
|
|
last_mhp = mhp;
|
|
|
|
return 1;
|
|
}
|
|
__setup("hugepages=", hugetlb_nrpages_setup);
|
|
|
|
static int __init hugetlb_default_setup(char *s)
|
|
{
|
|
default_hstate_size = memparse(s, &s);
|
|
return 1;
|
|
}
|
|
__setup("default_hugepagesz=", hugetlb_default_setup);
|
|
|
|
static unsigned int cpuset_mems_nr(unsigned int *array)
|
|
{
|
|
int node;
|
|
unsigned int nr = 0;
|
|
|
|
for_each_node_mask(node, cpuset_current_mems_allowed)
|
|
nr += array[node];
|
|
|
|
return nr;
|
|
}
|
|
|
|
#ifdef CONFIG_SYSCTL
|
|
static int proc_hugetlb_doulongvec_minmax(struct ctl_table *table, int write,
|
|
void *buffer, size_t *length,
|
|
loff_t *ppos, unsigned long *out)
|
|
{
|
|
struct ctl_table dup_table;
|
|
|
|
/*
|
|
* In order to avoid races with __do_proc_doulongvec_minmax(), we
|
|
* can duplicate the @table and alter the duplicate of it.
|
|
*/
|
|
dup_table = *table;
|
|
dup_table.data = out;
|
|
|
|
return proc_doulongvec_minmax(&dup_table, write, buffer, length, ppos);
|
|
}
|
|
|
|
static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
|
|
struct ctl_table *table, int write,
|
|
void __user *buffer, size_t *length, loff_t *ppos)
|
|
{
|
|
struct hstate *h = &default_hstate;
|
|
unsigned long tmp = h->max_huge_pages;
|
|
int ret;
|
|
|
|
if (!hugepages_supported())
|
|
return -EOPNOTSUPP;
|
|
|
|
ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
|
|
&tmp);
|
|
if (ret)
|
|
goto out;
|
|
|
|
if (write)
|
|
ret = __nr_hugepages_store_common(obey_mempolicy, h,
|
|
NUMA_NO_NODE, tmp, *length);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
int hugetlb_sysctl_handler(struct ctl_table *table, int write,
|
|
void __user *buffer, size_t *length, loff_t *ppos)
|
|
{
|
|
|
|
return hugetlb_sysctl_handler_common(false, table, write,
|
|
buffer, length, ppos);
|
|
}
|
|
|
|
#ifdef CONFIG_NUMA
|
|
int hugetlb_mempolicy_sysctl_handler(struct ctl_table *table, int write,
|
|
void __user *buffer, size_t *length, loff_t *ppos)
|
|
{
|
|
return hugetlb_sysctl_handler_common(true, table, write,
|
|
buffer, length, ppos);
|
|
}
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
int hugetlb_overcommit_handler(struct ctl_table *table, int write,
|
|
void __user *buffer,
|
|
size_t *length, loff_t *ppos)
|
|
{
|
|
struct hstate *h = &default_hstate;
|
|
unsigned long tmp;
|
|
int ret;
|
|
|
|
if (!hugepages_supported())
|
|
return -EOPNOTSUPP;
|
|
|
|
tmp = h->nr_overcommit_huge_pages;
|
|
|
|
if (write && hstate_is_gigantic(h))
|
|
return -EINVAL;
|
|
|
|
ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
|
|
&tmp);
|
|
if (ret)
|
|
goto out;
|
|
|
|
if (write) {
|
|
spin_lock(&hugetlb_lock);
|
|
h->nr_overcommit_huge_pages = tmp;
|
|
spin_unlock(&hugetlb_lock);
|
|
}
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
#endif /* CONFIG_SYSCTL */
|
|
|
|
void hugetlb_report_meminfo(struct seq_file *m)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long total = 0;
|
|
|
|
if (!hugepages_supported())
|
|
return;
|
|
|
|
for_each_hstate(h) {
|
|
unsigned long count = h->nr_huge_pages;
|
|
|
|
total += (PAGE_SIZE << huge_page_order(h)) * count;
|
|
|
|
if (h == &default_hstate)
|
|
seq_printf(m,
|
|
"HugePages_Total: %5lu\n"
|
|
"HugePages_Free: %5lu\n"
|
|
"HugePages_Rsvd: %5lu\n"
|
|
"HugePages_Surp: %5lu\n"
|
|
"Hugepagesize: %8lu kB\n",
|
|
count,
|
|
h->free_huge_pages,
|
|
h->resv_huge_pages,
|
|
h->surplus_huge_pages,
|
|
(PAGE_SIZE << huge_page_order(h)) / 1024);
|
|
}
|
|
|
|
seq_printf(m, "Hugetlb: %8lu kB\n", total / 1024);
|
|
}
|
|
|
|
int hugetlb_report_node_meminfo(int nid, char *buf)
|
|
{
|
|
struct hstate *h = &default_hstate;
|
|
if (!hugepages_supported())
|
|
return 0;
|
|
return sprintf(buf,
|
|
"Node %d HugePages_Total: %5u\n"
|
|
"Node %d HugePages_Free: %5u\n"
|
|
"Node %d HugePages_Surp: %5u\n",
|
|
nid, h->nr_huge_pages_node[nid],
|
|
nid, h->free_huge_pages_node[nid],
|
|
nid, h->surplus_huge_pages_node[nid]);
|
|
}
|
|
|
|
void hugetlb_show_meminfo(void)
|
|
{
|
|
struct hstate *h;
|
|
int nid;
|
|
|
|
if (!hugepages_supported())
|
|
return;
|
|
|
|
for_each_node_state(nid, N_MEMORY)
|
|
for_each_hstate(h)
|
|
pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n",
|
|
nid,
|
|
h->nr_huge_pages_node[nid],
|
|
h->free_huge_pages_node[nid],
|
|
h->surplus_huge_pages_node[nid],
|
|
1UL << (huge_page_order(h) + PAGE_SHIFT - 10));
|
|
}
|
|
|
|
void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm)
|
|
{
|
|
seq_printf(m, "HugetlbPages:\t%8lu kB\n",
|
|
atomic_long_read(&mm->hugetlb_usage) << (PAGE_SHIFT - 10));
|
|
}
|
|
|
|
/* Return the number pages of memory we physically have, in PAGE_SIZE units. */
|
|
unsigned long hugetlb_total_pages(void)
|
|
{
|
|
struct hstate *h;
|
|
unsigned long nr_total_pages = 0;
|
|
|
|
for_each_hstate(h)
|
|
nr_total_pages += h->nr_huge_pages * pages_per_huge_page(h);
|
|
return nr_total_pages;
|
|
}
|
|
|
|
static int hugetlb_acct_memory(struct hstate *h, long delta)
|
|
{
|
|
int ret = -ENOMEM;
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
/*
|
|
* When cpuset is configured, it breaks the strict hugetlb page
|
|
* reservation as the accounting is done on a global variable. Such
|
|
* reservation is completely rubbish in the presence of cpuset because
|
|
* the reservation is not checked against page availability for the
|
|
* current cpuset. Application can still potentially OOM'ed by kernel
|
|
* with lack of free htlb page in cpuset that the task is in.
|
|
* Attempt to enforce strict accounting with cpuset is almost
|
|
* impossible (or too ugly) because cpuset is too fluid that
|
|
* task or memory node can be dynamically moved between cpusets.
|
|
*
|
|
* The change of semantics for shared hugetlb mapping with cpuset is
|
|
* undesirable. However, in order to preserve some of the semantics,
|
|
* we fall back to check against current free page availability as
|
|
* a best attempt and hopefully to minimize the impact of changing
|
|
* semantics that cpuset has.
|
|
*/
|
|
if (delta > 0) {
|
|
if (gather_surplus_pages(h, delta) < 0)
|
|
goto out;
|
|
|
|
if (delta > cpuset_mems_nr(h->free_huge_pages_node)) {
|
|
return_unused_surplus_pages(h, delta);
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
ret = 0;
|
|
if (delta < 0)
|
|
return_unused_surplus_pages(h, (unsigned long) -delta);
|
|
|
|
out:
|
|
spin_unlock(&hugetlb_lock);
|
|
return ret;
|
|
}
|
|
|
|
static void hugetlb_vm_op_open(struct vm_area_struct *vma)
|
|
{
|
|
struct resv_map *resv = vma_resv_map(vma);
|
|
|
|
/*
|
|
* This new VMA should share its siblings reservation map if present.
|
|
* The VMA will only ever have a valid reservation map pointer where
|
|
* it is being copied for another still existing VMA. As that VMA
|
|
* has a reference to the reservation map it cannot disappear until
|
|
* after this open call completes. It is therefore safe to take a
|
|
* new reference here without additional locking.
|
|
*/
|
|
if (resv && is_vma_resv_set(vma, HPAGE_RESV_OWNER))
|
|
kref_get(&resv->refs);
|
|
}
|
|
|
|
static void hugetlb_vm_op_close(struct vm_area_struct *vma)
|
|
{
|
|
struct hstate *h = hstate_vma(vma);
|
|
struct resv_map *resv = vma_resv_map(vma);
|
|
struct hugepage_subpool *spool = subpool_vma(vma);
|
|
unsigned long reserve, start, end;
|
|
long gbl_reserve;
|
|
|
|
if (!resv || !is_vma_resv_set(vma, HPAGE_RESV_OWNER))
|
|
return;
|
|
|
|
start = vma_hugecache_offset(h, vma, vma->vm_start);
|
|
end = vma_hugecache_offset(h, vma, vma->vm_end);
|
|
|
|
reserve = (end - start) - region_count(resv, start, end);
|
|
|
|
kref_put(&resv->refs, resv_map_release);
|
|
|
|
if (reserve) {
|
|
/*
|
|
* Decrement reserve counts. The global reserve count may be
|
|
* adjusted if the subpool has a minimum size.
|
|
*/
|
|
gbl_reserve = hugepage_subpool_put_pages(spool, reserve);
|
|
hugetlb_acct_memory(h, -gbl_reserve);
|
|
}
|
|
}
|
|
|
|
static int hugetlb_vm_op_split(struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
if (addr & ~(huge_page_mask(hstate_vma(vma))))
|
|
return -EINVAL;
|
|
return 0;
|
|
}
|
|
|
|
static unsigned long hugetlb_vm_op_pagesize(struct vm_area_struct *vma)
|
|
{
|
|
struct hstate *hstate = hstate_vma(vma);
|
|
|
|
return 1UL << huge_page_shift(hstate);
|
|
}
|
|
|
|
/*
|
|
* We cannot handle pagefaults against hugetlb pages at all. They cause
|
|
* handle_mm_fault() to try to instantiate regular-sized pages in the
|
|
* hugegpage VMA. do_page_fault() is supposed to trap this, so BUG is we get
|
|
* this far.
|
|
*/
|
|
static vm_fault_t hugetlb_vm_op_fault(struct vm_fault *vmf)
|
|
{
|
|
BUG();
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* When a new function is introduced to vm_operations_struct and added
|
|
* to hugetlb_vm_ops, please consider adding the function to shm_vm_ops.
|
|
* This is because under System V memory model, mappings created via
|
|
* shmget/shmat with "huge page" specified are backed by hugetlbfs files,
|
|
* their original vm_ops are overwritten with shm_vm_ops.
|
|
*/
|
|
const struct vm_operations_struct hugetlb_vm_ops = {
|
|
.fault = hugetlb_vm_op_fault,
|
|
.open = hugetlb_vm_op_open,
|
|
.close = hugetlb_vm_op_close,
|
|
.split = hugetlb_vm_op_split,
|
|
.pagesize = hugetlb_vm_op_pagesize,
|
|
};
|
|
|
|
static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
|
|
int writable)
|
|
{
|
|
pte_t entry;
|
|
|
|
if (writable) {
|
|
entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_huge_pte(page,
|
|
vma->vm_page_prot)));
|
|
} else {
|
|
entry = huge_pte_wrprotect(mk_huge_pte(page,
|
|
vma->vm_page_prot));
|
|
}
|
|
entry = pte_mkyoung(entry);
|
|
entry = pte_mkhuge(entry);
|
|
entry = arch_make_huge_pte(entry, vma, page, writable);
|
|
|
|
return entry;
|
|
}
|
|
|
|
static void set_huge_ptep_writable(struct vm_area_struct *vma,
|
|
unsigned long address, pte_t *ptep)
|
|
{
|
|
pte_t entry;
|
|
|
|
entry = huge_pte_mkwrite(huge_pte_mkdirty(huge_ptep_get(ptep)));
|
|
if (huge_ptep_set_access_flags(vma, address, ptep, entry, 1))
|
|
update_mmu_cache(vma, address, ptep);
|
|
}
|
|
|
|
bool is_hugetlb_entry_migration(pte_t pte)
|
|
{
|
|
swp_entry_t swp;
|
|
|
|
if (huge_pte_none(pte) || pte_present(pte))
|
|
return false;
|
|
swp = pte_to_swp_entry(pte);
|
|
if (non_swap_entry(swp) && is_migration_entry(swp))
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
static int is_hugetlb_entry_hwpoisoned(pte_t pte)
|
|
{
|
|
swp_entry_t swp;
|
|
|
|
if (huge_pte_none(pte) || pte_present(pte))
|
|
return 0;
|
|
swp = pte_to_swp_entry(pte);
|
|
if (non_swap_entry(swp) && is_hwpoison_entry(swp))
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
|
|
struct vm_area_struct *vma)
|
|
{
|
|
pte_t *src_pte, *dst_pte, entry, dst_entry;
|
|
struct page *ptepage;
|
|
unsigned long addr;
|
|
int cow;
|
|
struct hstate *h = hstate_vma(vma);
|
|
unsigned long sz = huge_page_size(h);
|
|
struct mmu_notifier_range range;
|
|
int ret = 0;
|
|
|
|
cow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
|
|
|
|
if (cow) {
|
|
mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, src,
|
|
vma->vm_start,
|
|
vma->vm_end);
|
|
mmu_notifier_invalidate_range_start(&range);
|
|
}
|
|
|
|
for (addr = vma->vm_start; addr < vma->vm_end; addr += sz) {
|
|
spinlock_t *src_ptl, *dst_ptl;
|
|
src_pte = huge_pte_offset(src, addr, sz);
|
|
if (!src_pte)
|
|
continue;
|
|
dst_pte = huge_pte_alloc(dst, addr, sz);
|
|
if (!dst_pte) {
|
|
ret = -ENOMEM;
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* If the pagetables are shared don't copy or take references.
|
|
* dst_pte == src_pte is the common case of src/dest sharing.
|
|
*
|
|
* However, src could have 'unshared' and dst shares with
|
|
* another vma. If dst_pte !none, this implies sharing.
|
|
* Check here before taking page table lock, and once again
|
|
* after taking the lock below.
|
|
*/
|
|
dst_entry = huge_ptep_get(dst_pte);
|
|
if ((dst_pte == src_pte) || !huge_pte_none(dst_entry))
|
|
continue;
|
|
|
|
dst_ptl = huge_pte_lock(h, dst, dst_pte);
|
|
src_ptl = huge_pte_lockptr(h, src, src_pte);
|
|
spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING);
|
|
entry = huge_ptep_get(src_pte);
|
|
dst_entry = huge_ptep_get(dst_pte);
|
|
if (huge_pte_none(entry) || !huge_pte_none(dst_entry)) {
|
|
/*
|
|
* Skip if src entry none. Also, skip in the
|
|
* unlikely case dst entry !none as this implies
|
|
* sharing with another vma.
|
|
*/
|
|
;
|
|
} else if (unlikely(is_hugetlb_entry_migration(entry) ||
|
|
is_hugetlb_entry_hwpoisoned(entry))) {
|
|
swp_entry_t swp_entry = pte_to_swp_entry(entry);
|
|
|
|
if (is_write_migration_entry(swp_entry) && cow) {
|
|
/*
|
|
* COW mappings require pages in both
|
|
* parent and child to be set to read.
|
|
*/
|
|
make_migration_entry_read(&swp_entry);
|
|
entry = swp_entry_to_pte(swp_entry);
|
|
set_huge_swap_pte_at(src, addr, src_pte,
|
|
entry, sz);
|
|
}
|
|
set_huge_swap_pte_at(dst, addr, dst_pte, entry, sz);
|
|
} else {
|
|
if (cow) {
|
|
/*
|
|
* No need to notify as we are downgrading page
|
|
* table protection not changing it to point
|
|
* to a new page.
|
|
*
|
|
* See Documentation/vm/mmu_notifier.rst
|
|
*/
|
|
huge_ptep_set_wrprotect(src, addr, src_pte);
|
|
}
|
|
entry = huge_ptep_get(src_pte);
|
|
ptepage = pte_page(entry);
|
|
get_page(ptepage);
|
|
page_dup_rmap(ptepage, true);
|
|
set_huge_pte_at(dst, addr, dst_pte, entry);
|
|
hugetlb_count_add(pages_per_huge_page(h), dst);
|
|
}
|
|
spin_unlock(src_ptl);
|
|
spin_unlock(dst_ptl);
|
|
}
|
|
|
|
if (cow)
|
|
mmu_notifier_invalidate_range_end(&range);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
|
|
unsigned long start, unsigned long end,
|
|
struct page *ref_page)
|
|
{
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
unsigned long address;
|
|
pte_t *ptep;
|
|
pte_t pte;
|
|
spinlock_t *ptl;
|
|
struct page *page;
|
|
struct hstate *h = hstate_vma(vma);
|
|
unsigned long sz = huge_page_size(h);
|
|
struct mmu_notifier_range range;
|
|
|
|
WARN_ON(!is_vm_hugetlb_page(vma));
|
|
BUG_ON(start & ~huge_page_mask(h));
|
|
BUG_ON(end & ~huge_page_mask(h));
|
|
|
|
/*
|
|
* This is a hugetlb vma, all the pte entries should point
|
|
* to huge page.
|
|
*/
|
|
tlb_change_page_size(tlb, sz);
|
|
tlb_start_vma(tlb, vma);
|
|
|
|
/*
|
|
* If sharing possible, alert mmu notifiers of worst case.
|
|
*/
|
|
mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, start,
|
|
end);
|
|
adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end);
|
|
mmu_notifier_invalidate_range_start(&range);
|
|
address = start;
|
|
for (; address < end; address += sz) {
|
|
ptep = huge_pte_offset(mm, address, sz);
|
|
if (!ptep)
|
|
continue;
|
|
|
|
ptl = huge_pte_lock(h, mm, ptep);
|
|
if (huge_pmd_unshare(mm, &address, ptep)) {
|
|
spin_unlock(ptl);
|
|
/*
|
|
* We just unmapped a page of PMDs by clearing a PUD.
|
|
* The caller's TLB flush range should cover this area.
|
|
*/
|
|
continue;
|
|
}
|
|
|
|
pte = huge_ptep_get(ptep);
|
|
if (huge_pte_none(pte)) {
|
|
spin_unlock(ptl);
|
|
continue;
|
|
}
|
|
|
|
/*
|
|
* Migrating hugepage or HWPoisoned hugepage is already
|
|
* unmapped and its refcount is dropped, so just clear pte here.
|
|
*/
|
|
if (unlikely(!pte_present(pte))) {
|
|
huge_pte_clear(mm, address, ptep, sz);
|
|
spin_unlock(ptl);
|
|
continue;
|
|
}
|
|
|
|
page = pte_page(pte);
|
|
/*
|
|
* If a reference page is supplied, it is because a specific
|
|
* page is being unmapped, not a range. Ensure the page we
|
|
* are about to unmap is the actual page of interest.
|
|
*/
|
|
if (ref_page) {
|
|
if (page != ref_page) {
|
|
spin_unlock(ptl);
|
|
continue;
|
|
}
|
|
/*
|
|
* Mark the VMA as having unmapped its page so that
|
|
* future faults in this VMA will fail rather than
|
|
* looking like data was lost
|
|
*/
|
|
set_vma_resv_flags(vma, HPAGE_RESV_UNMAPPED);
|
|
}
|
|
|
|
pte = huge_ptep_get_and_clear(mm, address, ptep);
|
|
tlb_remove_huge_tlb_entry(h, tlb, ptep, address);
|
|
if (huge_pte_dirty(pte))
|
|
set_page_dirty(page);
|
|
|
|
hugetlb_count_sub(pages_per_huge_page(h), mm);
|
|
page_remove_rmap(page, true);
|
|
|
|
spin_unlock(ptl);
|
|
tlb_remove_page_size(tlb, page, huge_page_size(h));
|
|
/*
|
|
* Bail out after unmapping reference page if supplied
|
|
*/
|
|
if (ref_page)
|
|
break;
|
|
}
|
|
mmu_notifier_invalidate_range_end(&range);
|
|
tlb_end_vma(tlb, vma);
|
|
}
|
|
|
|
void __unmap_hugepage_range_final(struct mmu_gather *tlb,
|
|
struct vm_area_struct *vma, unsigned long start,
|
|
unsigned long end, struct page *ref_page)
|
|
{
|
|
__unmap_hugepage_range(tlb, vma, start, end, ref_page);
|
|
|
|
/*
|
|
* Clear this flag so that x86's huge_pmd_share page_table_shareable
|
|
* test will fail on a vma being torn down, and not grab a page table
|
|
* on its way out. We're lucky that the flag has such an appropriate
|
|
* name, and can in fact be safely cleared here. We could clear it
|
|
* before the __unmap_hugepage_range above, but all that's necessary
|
|
* is to clear it before releasing the i_mmap_rwsem. This works
|
|
* because in the context this is called, the VMA is about to be
|
|
* destroyed and the i_mmap_rwsem is held.
|
|
*/
|
|
vma->vm_flags &= ~VM_MAYSHARE;
|
|
}
|
|
|
|
void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
|
|
unsigned long end, struct page *ref_page)
|
|
{
|
|
struct mm_struct *mm;
|
|
struct mmu_gather tlb;
|
|
unsigned long tlb_start = start;
|
|
unsigned long tlb_end = end;
|
|
|
|
/*
|
|
* If shared PMDs were possibly used within this vma range, adjust
|
|
* start/end for worst case tlb flushing.
|
|
* Note that we can not be sure if PMDs are shared until we try to
|
|
* unmap pages. However, we want to make sure TLB flushing covers
|
|
* the largest possible range.
|
|
*/
|
|
adjust_range_if_pmd_sharing_possible(vma, &tlb_start, &tlb_end);
|
|
|
|
mm = vma->vm_mm;
|
|
|
|
tlb_gather_mmu(&tlb, mm, tlb_start, tlb_end);
|
|
__unmap_hugepage_range(&tlb, vma, start, end, ref_page);
|
|
tlb_finish_mmu(&tlb, tlb_start, tlb_end);
|
|
}
|
|
|
|
/*
|
|
* This is called when the original mapper is failing to COW a MAP_PRIVATE
|
|
* mappping it owns the reserve page for. The intention is to unmap the page
|
|
* from other VMAs and let the children be SIGKILLed if they are faulting the
|
|
* same region.
|
|
*/
|
|
static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
struct page *page, unsigned long address)
|
|
{
|
|
struct hstate *h = hstate_vma(vma);
|
|
struct vm_area_struct *iter_vma;
|
|
struct address_space *mapping;
|
|
pgoff_t pgoff;
|
|
|
|
/*
|
|
* vm_pgoff is in PAGE_SIZE units, hence the different calculation
|
|
* from page cache lookup which is in HPAGE_SIZE units.
|
|
*/
|
|
address = address & huge_page_mask(h);
|
|
pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) +
|
|
vma->vm_pgoff;
|
|
mapping = vma->vm_file->f_mapping;
|
|
|
|
/*
|
|
* Take the mapping lock for the duration of the table walk. As
|
|
* this mapping should be shared between all the VMAs,
|
|
* __unmap_hugepage_range() is called as the lock is already held
|
|
*/
|
|
i_mmap_lock_write(mapping);
|
|
vma_interval_tree_foreach(iter_vma, &mapping->i_mmap, pgoff, pgoff) {
|
|
/* Do not unmap the current VMA */
|
|
if (iter_vma == vma)
|
|
continue;
|
|
|
|
/*
|
|
* Shared VMAs have their own reserves and do not affect
|
|
* MAP_PRIVATE accounting but it is possible that a shared
|
|
* VMA is using the same page so check and skip such VMAs.
|
|
*/
|
|
if (iter_vma->vm_flags & VM_MAYSHARE)
|
|
continue;
|
|
|
|
/*
|
|
* Unmap the page from other VMAs without their own reserves.
|
|
* They get marked to be SIGKILLed if they fault in these
|
|
* areas. This is because a future no-page fault on this VMA
|
|
* could insert a zeroed page instead of the data existing
|
|
* from the time of fork. This would look like data corruption
|
|
*/
|
|
if (!is_vma_resv_set(iter_vma, HPAGE_RESV_OWNER))
|
|
unmap_hugepage_range(iter_vma, address,
|
|
address + huge_page_size(h), page);
|
|
}
|
|
i_mmap_unlock_write(mapping);
|
|
}
|
|
|
|
/*
|
|
* Hugetlb_cow() should be called with page lock of the original hugepage held.
|
|
* Called with hugetlb_instantiation_mutex held and pte_page locked so we
|
|
* cannot race with other handlers or page migration.
|
|
* Keep the pte_same checks anyway to make transition from the mutex easier.
|
|
*/
|
|
static vm_fault_t hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
unsigned long address, pte_t *ptep,
|
|
struct page *pagecache_page, spinlock_t *ptl)
|
|
{
|
|
pte_t pte;
|
|
struct hstate *h = hstate_vma(vma);
|
|
struct page *old_page, *new_page;
|
|
int outside_reserve = 0;
|
|
vm_fault_t ret = 0;
|
|
unsigned long haddr = address & huge_page_mask(h);
|
|
struct mmu_notifier_range range;
|
|
|
|
pte = huge_ptep_get(ptep);
|
|
old_page = pte_page(pte);
|
|
|
|
retry_avoidcopy:
|
|
/* If no-one else is actually using this page, avoid the copy
|
|
* and just make the page writable */
|
|
if (page_mapcount(old_page) == 1 && PageAnon(old_page)) {
|
|
page_move_anon_rmap(old_page, vma);
|
|
set_huge_ptep_writable(vma, haddr, ptep);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* If the process that created a MAP_PRIVATE mapping is about to
|
|
* perform a COW due to a shared page count, attempt to satisfy
|
|
* the allocation without using the existing reserves. The pagecache
|
|
* page is used to determine if the reserve at this address was
|
|
* consumed or not. If reserves were used, a partial faulted mapping
|
|
* at the time of fork() could consume its reserves on COW instead
|
|
* of the full address range.
|
|
*/
|
|
if (is_vma_resv_set(vma, HPAGE_RESV_OWNER) &&
|
|
old_page != pagecache_page)
|
|
outside_reserve = 1;
|
|
|
|
get_page(old_page);
|
|
|
|
/*
|
|
* Drop page table lock as buddy allocator may be called. It will
|
|
* be acquired again before returning to the caller, as expected.
|
|
*/
|
|
spin_unlock(ptl);
|
|
new_page = alloc_huge_page(vma, haddr, outside_reserve);
|
|
|
|
if (IS_ERR(new_page)) {
|
|
/*
|
|
* If a process owning a MAP_PRIVATE mapping fails to COW,
|
|
* it is due to references held by a child and an insufficient
|
|
* huge page pool. To guarantee the original mappers
|
|
* reliability, unmap the page from child processes. The child
|
|
* may get SIGKILLed if it later faults.
|
|
*/
|
|
if (outside_reserve) {
|
|
put_page(old_page);
|
|
BUG_ON(huge_pte_none(pte));
|
|
unmap_ref_private(mm, vma, old_page, haddr);
|
|
BUG_ON(huge_pte_none(pte));
|
|
spin_lock(ptl);
|
|
ptep = huge_pte_offset(mm, haddr, huge_page_size(h));
|
|
if (likely(ptep &&
|
|
pte_same(huge_ptep_get(ptep), pte)))
|
|
goto retry_avoidcopy;
|
|
/*
|
|
* race occurs while re-acquiring page table
|
|
* lock, and our job is done.
|
|
*/
|
|
return 0;
|
|
}
|
|
|
|
ret = vmf_error(PTR_ERR(new_page));
|
|
goto out_release_old;
|
|
}
|
|
|
|
/*
|
|
* When the original hugepage is shared one, it does not have
|
|
* anon_vma prepared.
|
|
*/
|
|
if (unlikely(anon_vma_prepare(vma))) {
|
|
ret = VM_FAULT_OOM;
|
|
goto out_release_all;
|
|
}
|
|
|
|
copy_user_huge_page(new_page, old_page, address, vma,
|
|
pages_per_huge_page(h));
|
|
__SetPageUptodate(new_page);
|
|
|
|
mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, mm, haddr,
|
|
haddr + huge_page_size(h));
|
|
mmu_notifier_invalidate_range_start(&range);
|
|
|
|
/*
|
|
* Retake the page table lock to check for racing updates
|
|
* before the page tables are altered
|
|
*/
|
|
spin_lock(ptl);
|
|
ptep = huge_pte_offset(mm, haddr, huge_page_size(h));
|
|
if (likely(ptep && pte_same(huge_ptep_get(ptep), pte))) {
|
|
ClearPagePrivate(new_page);
|
|
|
|
/* Break COW */
|
|
huge_ptep_clear_flush(vma, haddr, ptep);
|
|
mmu_notifier_invalidate_range(mm, range.start, range.end);
|
|
set_huge_pte_at(mm, haddr, ptep,
|
|
make_huge_pte(vma, new_page, 1));
|
|
page_remove_rmap(old_page, true);
|
|
hugepage_add_new_anon_rmap(new_page, vma, haddr);
|
|
set_page_huge_active(new_page);
|
|
/* Make the old page be freed below */
|
|
new_page = old_page;
|
|
}
|
|
spin_unlock(ptl);
|
|
mmu_notifier_invalidate_range_end(&range);
|
|
out_release_all:
|
|
restore_reserve_on_error(h, vma, haddr, new_page);
|
|
put_page(new_page);
|
|
out_release_old:
|
|
put_page(old_page);
|
|
|
|
spin_lock(ptl); /* Caller expects lock to be held */
|
|
return ret;
|
|
}
|
|
|
|
/* Return the pagecache page at a given address within a VMA */
|
|
static struct page *hugetlbfs_pagecache_page(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long address)
|
|
{
|
|
struct address_space *mapping;
|
|
pgoff_t idx;
|
|
|
|
mapping = vma->vm_file->f_mapping;
|
|
idx = vma_hugecache_offset(h, vma, address);
|
|
|
|
return find_lock_page(mapping, idx);
|
|
}
|
|
|
|
/*
|
|
* Return whether there is a pagecache page to back given address within VMA.
|
|
* Caller follow_hugetlb_page() holds page_table_lock so we cannot lock_page.
|
|
*/
|
|
static bool hugetlbfs_pagecache_present(struct hstate *h,
|
|
struct vm_area_struct *vma, unsigned long address)
|
|
{
|
|
struct address_space *mapping;
|
|
pgoff_t idx;
|
|
struct page *page;
|
|
|
|
mapping = vma->vm_file->f_mapping;
|
|
idx = vma_hugecache_offset(h, vma, address);
|
|
|
|
page = find_get_page(mapping, idx);
|
|
if (page)
|
|
put_page(page);
|
|
return page != NULL;
|
|
}
|
|
|
|
int huge_add_to_page_cache(struct page *page, struct address_space *mapping,
|
|
pgoff_t idx)
|
|
{
|
|
struct inode *inode = mapping->host;
|
|
struct hstate *h = hstate_inode(inode);
|
|
int err = add_to_page_cache(page, mapping, idx, GFP_KERNEL);
|
|
|
|
if (err)
|
|
return err;
|
|
ClearPagePrivate(page);
|
|
|
|
/*
|
|
* set page dirty so that it will not be removed from cache/file
|
|
* by non-hugetlbfs specific code paths.
|
|
*/
|
|
set_page_dirty(page);
|
|
|
|
spin_lock(&inode->i_lock);
|
|
inode->i_blocks += blocks_per_huge_page(h);
|
|
spin_unlock(&inode->i_lock);
|
|
return 0;
|
|
}
|
|
|
|
static vm_fault_t hugetlb_no_page(struct mm_struct *mm,
|
|
struct vm_area_struct *vma,
|
|
struct address_space *mapping, pgoff_t idx,
|
|
unsigned long address, pte_t *ptep, unsigned int flags)
|
|
{
|
|
struct hstate *h = hstate_vma(vma);
|
|
vm_fault_t ret = VM_FAULT_SIGBUS;
|
|
int anon_rmap = 0;
|
|
unsigned long size;
|
|
struct page *page;
|
|
pte_t new_pte;
|
|
spinlock_t *ptl;
|
|
unsigned long haddr = address & huge_page_mask(h);
|
|
bool new_page = false;
|
|
|
|
/*
|
|
* Currently, we are forced to kill the process in the event the
|
|
* original mapper has unmapped pages from the child due to a failed
|
|
* COW. Warn that such a situation has occurred as it may not be obvious
|
|
*/
|
|
if (is_vma_resv_set(vma, HPAGE_RESV_UNMAPPED)) {
|
|
pr_warn_ratelimited("PID %d killed due to inadequate hugepage pool\n",
|
|
current->pid);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Use page lock to guard against racing truncation
|
|
* before we get page_table_lock.
|
|
*/
|
|
retry:
|
|
page = find_lock_page(mapping, idx);
|
|
if (!page) {
|
|
size = i_size_read(mapping->host) >> huge_page_shift(h);
|
|
if (idx >= size)
|
|
goto out;
|
|
|
|
/*
|
|
* Check for page in userfault range
|
|
*/
|
|
if (userfaultfd_missing(vma)) {
|
|
u32 hash;
|
|
struct vm_fault vmf = {
|
|
.vma = vma,
|
|
.address = haddr,
|
|
.flags = flags,
|
|
.vma_flags = vma->vm_flags,
|
|
.vma_page_prot = vma->vm_page_prot,
|
|
/*
|
|
* Hard to debug if it ends up being
|
|
* used by a callee that assumes
|
|
* something about the other
|
|
* uninitialized fields... same as in
|
|
* memory.c
|
|
*/
|
|
};
|
|
|
|
/*
|
|
* hugetlb_fault_mutex must be dropped before
|
|
* handling userfault. Reacquire after handling
|
|
* fault to make calling code simpler.
|
|
*/
|
|
hash = hugetlb_fault_mutex_hash(h, mapping, idx);
|
|
mutex_unlock(&hugetlb_fault_mutex_table[hash]);
|
|
ret = handle_userfault(&vmf, VM_UFFD_MISSING);
|
|
mutex_lock(&hugetlb_fault_mutex_table[hash]);
|
|
goto out;
|
|
}
|
|
|
|
page = alloc_huge_page(vma, haddr, 0);
|
|
if (IS_ERR(page)) {
|
|
/*
|
|
* Returning error will result in faulting task being
|
|
* sent SIGBUS. The hugetlb fault mutex prevents two
|
|
* tasks from racing to fault in the same page which
|
|
* could result in false unable to allocate errors.
|
|
* Page migration does not take the fault mutex, but
|
|
* does a clear then write of pte's under page table
|
|
* lock. Page fault code could race with migration,
|
|
* notice the clear pte and try to allocate a page
|
|
* here. Before returning error, get ptl and make
|
|
* sure there really is no pte entry.
|
|
*/
|
|
ptl = huge_pte_lock(h, mm, ptep);
|
|
if (!huge_pte_none(huge_ptep_get(ptep))) {
|
|
ret = 0;
|
|
spin_unlock(ptl);
|
|
goto out;
|
|
}
|
|
spin_unlock(ptl);
|
|
ret = vmf_error(PTR_ERR(page));
|
|
goto out;
|
|
}
|
|
clear_huge_page(page, address, pages_per_huge_page(h));
|
|
__SetPageUptodate(page);
|
|
new_page = true;
|
|
|
|
if (vma->vm_flags & VM_MAYSHARE) {
|
|
int err = huge_add_to_page_cache(page, mapping, idx);
|
|
if (err) {
|
|
put_page(page);
|
|
if (err == -EEXIST)
|
|
goto retry;
|
|
goto out;
|
|
}
|
|
} else {
|
|
lock_page(page);
|
|
if (unlikely(anon_vma_prepare(vma))) {
|
|
ret = VM_FAULT_OOM;
|
|
goto backout_unlocked;
|
|
}
|
|
anon_rmap = 1;
|
|
}
|
|
} else {
|
|
/*
|
|
* If memory error occurs between mmap() and fault, some process
|
|
* don't have hwpoisoned swap entry for errored virtual address.
|
|
* So we need to block hugepage fault by PG_hwpoison bit check.
|
|
*/
|
|
if (unlikely(PageHWPoison(page))) {
|
|
ret = VM_FAULT_HWPOISON |
|
|
VM_FAULT_SET_HINDEX(hstate_index(h));
|
|
goto backout_unlocked;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* If we are going to COW a private mapping later, we examine the
|
|
* pending reservations for this page now. This will ensure that
|
|
* any allocations necessary to record that reservation occur outside
|
|
* the spinlock.
|
|
*/
|
|
if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
|
|
if (vma_needs_reservation(h, vma, haddr) < 0) {
|
|
ret = VM_FAULT_OOM;
|
|
goto backout_unlocked;
|
|
}
|
|
/* Just decrements count, does not deallocate */
|
|
vma_end_reservation(h, vma, haddr);
|
|
}
|
|
|
|
ptl = huge_pte_lock(h, mm, ptep);
|
|
size = i_size_read(mapping->host) >> huge_page_shift(h);
|
|
if (idx >= size)
|
|
goto backout;
|
|
|
|
ret = 0;
|
|
if (!huge_pte_none(huge_ptep_get(ptep)))
|
|
goto backout;
|
|
|
|
if (anon_rmap) {
|
|
ClearPagePrivate(page);
|
|
hugepage_add_new_anon_rmap(page, vma, haddr);
|
|
} else
|
|
page_dup_rmap(page, true);
|
|
new_pte = make_huge_pte(vma, page, ((vma->vm_flags & VM_WRITE)
|
|
&& (vma->vm_flags & VM_SHARED)));
|
|
set_huge_pte_at(mm, haddr, ptep, new_pte);
|
|
|
|
hugetlb_count_add(pages_per_huge_page(h), mm);
|
|
if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
|
|
/* Optimization, do the COW without a second fault */
|
|
ret = hugetlb_cow(mm, vma, address, ptep, page, ptl);
|
|
}
|
|
|
|
spin_unlock(ptl);
|
|
|
|
/*
|
|
* Only make newly allocated pages active. Existing pages found
|
|
* in the pagecache could be !page_huge_active() if they have been
|
|
* isolated for migration.
|
|
*/
|
|
if (new_page)
|
|
set_page_huge_active(page);
|
|
|
|
unlock_page(page);
|
|
out:
|
|
return ret;
|
|
|
|
backout:
|
|
spin_unlock(ptl);
|
|
backout_unlocked:
|
|
unlock_page(page);
|
|
restore_reserve_on_error(h, vma, haddr, page);
|
|
put_page(page);
|
|
goto out;
|
|
}
|
|
|
|
#ifdef CONFIG_SMP
|
|
u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
|
|
pgoff_t idx)
|
|
{
|
|
unsigned long key[2];
|
|
u32 hash;
|
|
|
|
key[0] = (unsigned long) mapping;
|
|
key[1] = idx;
|
|
|
|
hash = jhash2((u32 *)&key, sizeof(key)/(sizeof(u32)), 0);
|
|
|
|
return hash & (num_fault_mutexes - 1);
|
|
}
|
|
#else
|
|
/*
|
|
* For uniprocesor systems we always use a single mutex, so just
|
|
* return 0 and avoid the hashing overhead.
|
|
*/
|
|
u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
|
|
pgoff_t idx)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
unsigned long address, unsigned int flags)
|
|
{
|
|
pte_t *ptep, entry;
|
|
spinlock_t *ptl;
|
|
vm_fault_t ret;
|
|
u32 hash;
|
|
pgoff_t idx;
|
|
struct page *page = NULL;
|
|
struct page *pagecache_page = NULL;
|
|
struct hstate *h = hstate_vma(vma);
|
|
struct address_space *mapping;
|
|
int need_wait_lock = 0;
|
|
unsigned long haddr = address & huge_page_mask(h);
|
|
|
|
ptep = huge_pte_offset(mm, haddr, huge_page_size(h));
|
|
if (ptep) {
|
|
entry = huge_ptep_get(ptep);
|
|
if (unlikely(is_hugetlb_entry_migration(entry))) {
|
|
migration_entry_wait_huge(vma, mm, ptep);
|
|
return 0;
|
|
} else if (unlikely(is_hugetlb_entry_hwpoisoned(entry)))
|
|
return VM_FAULT_HWPOISON_LARGE |
|
|
VM_FAULT_SET_HINDEX(hstate_index(h));
|
|
} else {
|
|
ptep = huge_pte_alloc(mm, haddr, huge_page_size(h));
|
|
if (!ptep)
|
|
return VM_FAULT_OOM;
|
|
}
|
|
|
|
mapping = vma->vm_file->f_mapping;
|
|
idx = vma_hugecache_offset(h, vma, haddr);
|
|
|
|
/*
|
|
* Serialize hugepage allocation and instantiation, so that we don't
|
|
* get spurious allocation failures if two CPUs race to instantiate
|
|
* the same page in the page cache.
|
|
*/
|
|
hash = hugetlb_fault_mutex_hash(h, mapping, idx);
|
|
mutex_lock(&hugetlb_fault_mutex_table[hash]);
|
|
|
|
entry = huge_ptep_get(ptep);
|
|
if (huge_pte_none(entry)) {
|
|
ret = hugetlb_no_page(mm, vma, mapping, idx, address, ptep, flags);
|
|
goto out_mutex;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
/*
|
|
* entry could be a migration/hwpoison entry at this point, so this
|
|
* check prevents the kernel from going below assuming that we have
|
|
* a active hugepage in pagecache. This goto expects the 2nd page fault,
|
|
* and is_hugetlb_entry_(migration|hwpoisoned) check will properly
|
|
* handle it.
|
|
*/
|
|
if (!pte_present(entry))
|
|
goto out_mutex;
|
|
|
|
/*
|
|
* If we are going to COW the mapping later, we examine the pending
|
|
* reservations for this page now. This will ensure that any
|
|
* allocations necessary to record that reservation occur outside the
|
|
* spinlock. For private mappings, we also lookup the pagecache
|
|
* page now as it is used to determine if a reservation has been
|
|
* consumed.
|
|
*/
|
|
if ((flags & FAULT_FLAG_WRITE) && !huge_pte_write(entry)) {
|
|
if (vma_needs_reservation(h, vma, haddr) < 0) {
|
|
ret = VM_FAULT_OOM;
|
|
goto out_mutex;
|
|
}
|
|
/* Just decrements count, does not deallocate */
|
|
vma_end_reservation(h, vma, haddr);
|
|
|
|
if (!(vma->vm_flags & VM_MAYSHARE))
|
|
pagecache_page = hugetlbfs_pagecache_page(h,
|
|
vma, haddr);
|
|
}
|
|
|
|
ptl = huge_pte_lock(h, mm, ptep);
|
|
|
|
/* Check for a racing update before calling hugetlb_cow */
|
|
if (unlikely(!pte_same(entry, huge_ptep_get(ptep))))
|
|
goto out_ptl;
|
|
|
|
/*
|
|
* hugetlb_cow() requires page locks of pte_page(entry) and
|
|
* pagecache_page, so here we need take the former one
|
|
* when page != pagecache_page or !pagecache_page.
|
|
*/
|
|
page = pte_page(entry);
|
|
if (page != pagecache_page)
|
|
if (!trylock_page(page)) {
|
|
need_wait_lock = 1;
|
|
goto out_ptl;
|
|
}
|
|
|
|
get_page(page);
|
|
|
|
if (flags & FAULT_FLAG_WRITE) {
|
|
if (!huge_pte_write(entry)) {
|
|
ret = hugetlb_cow(mm, vma, address, ptep,
|
|
pagecache_page, ptl);
|
|
goto out_put_page;
|
|
}
|
|
entry = huge_pte_mkdirty(entry);
|
|
}
|
|
entry = pte_mkyoung(entry);
|
|
if (huge_ptep_set_access_flags(vma, haddr, ptep, entry,
|
|
flags & FAULT_FLAG_WRITE))
|
|
update_mmu_cache(vma, haddr, ptep);
|
|
out_put_page:
|
|
if (page != pagecache_page)
|
|
unlock_page(page);
|
|
put_page(page);
|
|
out_ptl:
|
|
spin_unlock(ptl);
|
|
|
|
if (pagecache_page) {
|
|
unlock_page(pagecache_page);
|
|
put_page(pagecache_page);
|
|
}
|
|
out_mutex:
|
|
mutex_unlock(&hugetlb_fault_mutex_table[hash]);
|
|
/*
|
|
* Generally it's safe to hold refcount during waiting page lock. But
|
|
* here we just wait to defer the next page fault to avoid busy loop and
|
|
* the page is not used after unlocked before returning from the current
|
|
* page fault. So we are safe from accessing freed page, even if we wait
|
|
* here without taking refcount.
|
|
*/
|
|
if (need_wait_lock)
|
|
wait_on_page_locked(page);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Used by userfaultfd UFFDIO_COPY. Based on mcopy_atomic_pte with
|
|
* modifications for huge pages.
|
|
*/
|
|
int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
|
|
pte_t *dst_pte,
|
|
struct vm_area_struct *dst_vma,
|
|
unsigned long dst_addr,
|
|
unsigned long src_addr,
|
|
struct page **pagep)
|
|
{
|
|
struct address_space *mapping;
|
|
pgoff_t idx;
|
|
unsigned long size;
|
|
int vm_shared = dst_vma->vm_flags & VM_SHARED;
|
|
struct hstate *h = hstate_vma(dst_vma);
|
|
pte_t _dst_pte;
|
|
spinlock_t *ptl;
|
|
int ret;
|
|
struct page *page;
|
|
|
|
if (!*pagep) {
|
|
ret = -ENOMEM;
|
|
page = alloc_huge_page(dst_vma, dst_addr, 0);
|
|
if (IS_ERR(page))
|
|
goto out;
|
|
|
|
ret = copy_huge_page_from_user(page,
|
|
(const void __user *) src_addr,
|
|
pages_per_huge_page(h), false);
|
|
|
|
/* fallback to copy_from_user outside mmap_sem */
|
|
if (unlikely(ret)) {
|
|
ret = -ENOENT;
|
|
*pagep = page;
|
|
/* don't free the page */
|
|
goto out;
|
|
}
|
|
} else {
|
|
page = *pagep;
|
|
*pagep = NULL;
|
|
}
|
|
|
|
/*
|
|
* The memory barrier inside __SetPageUptodate makes sure that
|
|
* preceding stores to the page contents become visible before
|
|
* the set_pte_at() write.
|
|
*/
|
|
__SetPageUptodate(page);
|
|
|
|
mapping = dst_vma->vm_file->f_mapping;
|
|
idx = vma_hugecache_offset(h, dst_vma, dst_addr);
|
|
|
|
/*
|
|
* If shared, add to page cache
|
|
*/
|
|
if (vm_shared) {
|
|
size = i_size_read(mapping->host) >> huge_page_shift(h);
|
|
ret = -EFAULT;
|
|
if (idx >= size)
|
|
goto out_release_nounlock;
|
|
|
|
/*
|
|
* Serialization between remove_inode_hugepages() and
|
|
* huge_add_to_page_cache() below happens through the
|
|
* hugetlb_fault_mutex_table that here must be hold by
|
|
* the caller.
|
|
*/
|
|
ret = huge_add_to_page_cache(page, mapping, idx);
|
|
if (ret)
|
|
goto out_release_nounlock;
|
|
}
|
|
|
|
ptl = huge_pte_lockptr(h, dst_mm, dst_pte);
|
|
spin_lock(ptl);
|
|
|
|
/*
|
|
* Recheck the i_size after holding PT lock to make sure not
|
|
* to leave any page mapped (as page_mapped()) beyond the end
|
|
* of the i_size (remove_inode_hugepages() is strict about
|
|
* enforcing that). If we bail out here, we'll also leave a
|
|
* page in the radix tree in the vm_shared case beyond the end
|
|
* of the i_size, but remove_inode_hugepages() will take care
|
|
* of it as soon as we drop the hugetlb_fault_mutex_table.
|
|
*/
|
|
size = i_size_read(mapping->host) >> huge_page_shift(h);
|
|
ret = -EFAULT;
|
|
if (idx >= size)
|
|
goto out_release_unlock;
|
|
|
|
ret = -EEXIST;
|
|
if (!huge_pte_none(huge_ptep_get(dst_pte)))
|
|
goto out_release_unlock;
|
|
|
|
if (vm_shared) {
|
|
page_dup_rmap(page, true);
|
|
} else {
|
|
ClearPagePrivate(page);
|
|
hugepage_add_new_anon_rmap(page, dst_vma, dst_addr);
|
|
}
|
|
|
|
_dst_pte = make_huge_pte(dst_vma, page, dst_vma->vm_flags & VM_WRITE);
|
|
if (dst_vma->vm_flags & VM_WRITE)
|
|
_dst_pte = huge_pte_mkdirty(_dst_pte);
|
|
_dst_pte = pte_mkyoung(_dst_pte);
|
|
|
|
set_huge_pte_at(dst_mm, dst_addr, dst_pte, _dst_pte);
|
|
|
|
(void)huge_ptep_set_access_flags(dst_vma, dst_addr, dst_pte, _dst_pte,
|
|
dst_vma->vm_flags & VM_WRITE);
|
|
hugetlb_count_add(pages_per_huge_page(h), dst_mm);
|
|
|
|
/* No need to invalidate - it was non-present before */
|
|
update_mmu_cache(dst_vma, dst_addr, dst_pte);
|
|
|
|
spin_unlock(ptl);
|
|
set_page_huge_active(page);
|
|
if (vm_shared)
|
|
unlock_page(page);
|
|
ret = 0;
|
|
out:
|
|
return ret;
|
|
out_release_unlock:
|
|
spin_unlock(ptl);
|
|
if (vm_shared)
|
|
unlock_page(page);
|
|
out_release_nounlock:
|
|
put_page(page);
|
|
goto out;
|
|
}
|
|
|
|
long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
struct page **pages, struct vm_area_struct **vmas,
|
|
unsigned long *position, unsigned long *nr_pages,
|
|
long i, unsigned int flags, int *nonblocking)
|
|
{
|
|
unsigned long pfn_offset;
|
|
unsigned long vaddr = *position;
|
|
unsigned long remainder = *nr_pages;
|
|
struct hstate *h = hstate_vma(vma);
|
|
int err = -EFAULT;
|
|
|
|
while (vaddr < vma->vm_end && remainder) {
|
|
pte_t *pte;
|
|
spinlock_t *ptl = NULL;
|
|
int absent;
|
|
struct page *page;
|
|
|
|
/*
|
|
* If we have a pending SIGKILL, don't keep faulting pages and
|
|
* potentially allocating memory.
|
|
*/
|
|
if (fatal_signal_pending(current)) {
|
|
remainder = 0;
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* Some archs (sparc64, sh*) have multiple pte_ts to
|
|
* each hugepage. We have to make sure we get the
|
|
* first, for the page indexing below to work.
|
|
*
|
|
* Note that page table lock is not held when pte is null.
|
|
*/
|
|
pte = huge_pte_offset(mm, vaddr & huge_page_mask(h),
|
|
huge_page_size(h));
|
|
if (pte)
|
|
ptl = huge_pte_lock(h, mm, pte);
|
|
absent = !pte || huge_pte_none(huge_ptep_get(pte));
|
|
|
|
/*
|
|
* When coredumping, it suits get_dump_page if we just return
|
|
* an error where there's an empty slot with no huge pagecache
|
|
* to back it. This way, we avoid allocating a hugepage, and
|
|
* the sparse dumpfile avoids allocating disk blocks, but its
|
|
* huge holes still show up with zeroes where they need to be.
|
|
*/
|
|
if (absent && (flags & FOLL_DUMP) &&
|
|
!hugetlbfs_pagecache_present(h, vma, vaddr)) {
|
|
if (pte)
|
|
spin_unlock(ptl);
|
|
remainder = 0;
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* We need call hugetlb_fault for both hugepages under migration
|
|
* (in which case hugetlb_fault waits for the migration,) and
|
|
* hwpoisoned hugepages (in which case we need to prevent the
|
|
* caller from accessing to them.) In order to do this, we use
|
|
* here is_swap_pte instead of is_hugetlb_entry_migration and
|
|
* is_hugetlb_entry_hwpoisoned. This is because it simply covers
|
|
* both cases, and because we can't follow correct pages
|
|
* directly from any kind of swap entries.
|
|
*/
|
|
if (absent || is_swap_pte(huge_ptep_get(pte)) ||
|
|
((flags & FOLL_WRITE) &&
|
|
!huge_pte_write(huge_ptep_get(pte)))) {
|
|
vm_fault_t ret;
|
|
unsigned int fault_flags = 0;
|
|
|
|
if (pte)
|
|
spin_unlock(ptl);
|
|
if (flags & FOLL_WRITE)
|
|
fault_flags |= FAULT_FLAG_WRITE;
|
|
if (nonblocking)
|
|
fault_flags |= FAULT_FLAG_ALLOW_RETRY;
|
|
if (flags & FOLL_NOWAIT)
|
|
fault_flags |= FAULT_FLAG_ALLOW_RETRY |
|
|
FAULT_FLAG_RETRY_NOWAIT;
|
|
if (flags & FOLL_TRIED) {
|
|
VM_WARN_ON_ONCE(fault_flags &
|
|
FAULT_FLAG_ALLOW_RETRY);
|
|
fault_flags |= FAULT_FLAG_TRIED;
|
|
}
|
|
ret = hugetlb_fault(mm, vma, vaddr, fault_flags);
|
|
if (ret & VM_FAULT_ERROR) {
|
|
err = vm_fault_to_errno(ret, flags);
|
|
remainder = 0;
|
|
break;
|
|
}
|
|
if (ret & VM_FAULT_RETRY) {
|
|
if (nonblocking &&
|
|
!(fault_flags & FAULT_FLAG_RETRY_NOWAIT))
|
|
*nonblocking = 0;
|
|
*nr_pages = 0;
|
|
/*
|
|
* VM_FAULT_RETRY must not return an
|
|
* error, it will return zero
|
|
* instead.
|
|
*
|
|
* No need to update "position" as the
|
|
* caller will not check it after
|
|
* *nr_pages is set to 0.
|
|
*/
|
|
return i;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
pfn_offset = (vaddr & ~huge_page_mask(h)) >> PAGE_SHIFT;
|
|
page = pte_page(huge_ptep_get(pte));
|
|
|
|
/*
|
|
* Instead of doing 'try_get_page()' below in the same_page
|
|
* loop, just check the count once here.
|
|
*/
|
|
if (unlikely(page_count(page) <= 0)) {
|
|
if (pages) {
|
|
spin_unlock(ptl);
|
|
remainder = 0;
|
|
err = -ENOMEM;
|
|
break;
|
|
}
|
|
}
|
|
same_page:
|
|
if (pages) {
|
|
pages[i] = mem_map_offset(page, pfn_offset);
|
|
get_page(pages[i]);
|
|
}
|
|
|
|
if (vmas)
|
|
vmas[i] = vma;
|
|
|
|
vaddr += PAGE_SIZE;
|
|
++pfn_offset;
|
|
--remainder;
|
|
++i;
|
|
if (vaddr < vma->vm_end && remainder &&
|
|
pfn_offset < pages_per_huge_page(h)) {
|
|
/*
|
|
* We use pfn_offset to avoid touching the pageframes
|
|
* of this compound page.
|
|
*/
|
|
goto same_page;
|
|
}
|
|
spin_unlock(ptl);
|
|
}
|
|
*nr_pages = remainder;
|
|
/*
|
|
* setting position is actually required only if remainder is
|
|
* not zero but it's faster not to add a "if (remainder)"
|
|
* branch.
|
|
*/
|
|
*position = vaddr;
|
|
|
|
return i ? i : err;
|
|
}
|
|
|
|
#ifndef __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE
|
|
/*
|
|
* ARCHes with special requirements for evicting HUGETLB backing TLB entries can
|
|
* implement this.
|
|
*/
|
|
#define flush_hugetlb_tlb_range(vma, addr, end) flush_tlb_range(vma, addr, end)
|
|
#endif
|
|
|
|
unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
|
|
unsigned long address, unsigned long end, pgprot_t newprot)
|
|
{
|
|
struct mm_struct *mm = vma->vm_mm;
|
|
unsigned long start = address;
|
|
pte_t *ptep;
|
|
pte_t pte;
|
|
struct hstate *h = hstate_vma(vma);
|
|
unsigned long pages = 0;
|
|
bool shared_pmd = false;
|
|
struct mmu_notifier_range range;
|
|
|
|
/*
|
|
* In the case of shared PMDs, the area to flush could be beyond
|
|
* start/end. Set range.start/range.end to cover the maximum possible
|
|
* range if PMD sharing is possible.
|
|
*/
|
|
mmu_notifier_range_init(&range, MMU_NOTIFY_PROTECTION_VMA,
|
|
0, vma, mm, start, end);
|
|
adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end);
|
|
|
|
BUG_ON(address >= end);
|
|
flush_cache_range(vma, range.start, range.end);
|
|
|
|
mmu_notifier_invalidate_range_start(&range);
|
|
i_mmap_lock_write(vma->vm_file->f_mapping);
|
|
for (; address < end; address += huge_page_size(h)) {
|
|
spinlock_t *ptl;
|
|
ptep = huge_pte_offset(mm, address, huge_page_size(h));
|
|
if (!ptep)
|
|
continue;
|
|
ptl = huge_pte_lock(h, mm, ptep);
|
|
if (huge_pmd_unshare(mm, &address, ptep)) {
|
|
pages++;
|
|
spin_unlock(ptl);
|
|
shared_pmd = true;
|
|
continue;
|
|
}
|
|
pte = huge_ptep_get(ptep);
|
|
if (unlikely(is_hugetlb_entry_hwpoisoned(pte))) {
|
|
spin_unlock(ptl);
|
|
continue;
|
|
}
|
|
if (unlikely(is_hugetlb_entry_migration(pte))) {
|
|
swp_entry_t entry = pte_to_swp_entry(pte);
|
|
|
|
if (is_write_migration_entry(entry)) {
|
|
pte_t newpte;
|
|
|
|
make_migration_entry_read(&entry);
|
|
newpte = swp_entry_to_pte(entry);
|
|
set_huge_swap_pte_at(mm, address, ptep,
|
|
newpte, huge_page_size(h));
|
|
pages++;
|
|
}
|
|
spin_unlock(ptl);
|
|
continue;
|
|
}
|
|
if (!huge_pte_none(pte)) {
|
|
pte_t old_pte;
|
|
|
|
old_pte = huge_ptep_modify_prot_start(vma, address, ptep);
|
|
pte = pte_mkhuge(huge_pte_modify(old_pte, newprot));
|
|
pte = arch_make_huge_pte(pte, vma, NULL, 0);
|
|
huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte);
|
|
pages++;
|
|
}
|
|
spin_unlock(ptl);
|
|
}
|
|
/*
|
|
* Must flush TLB before releasing i_mmap_rwsem: x86's huge_pmd_unshare
|
|
* may have cleared our pud entry and done put_page on the page table:
|
|
* once we release i_mmap_rwsem, another task can do the final put_page
|
|
* and that page table be reused and filled with junk. If we actually
|
|
* did unshare a page of pmds, flush the range corresponding to the pud.
|
|
*/
|
|
if (shared_pmd)
|
|
flush_hugetlb_tlb_range(vma, range.start, range.end);
|
|
else
|
|
flush_hugetlb_tlb_range(vma, start, end);
|
|
/*
|
|
* No need to call mmu_notifier_invalidate_range() we are downgrading
|
|
* page table protection not changing it to point to a new page.
|
|
*
|
|
* See Documentation/vm/mmu_notifier.rst
|
|
*/
|
|
i_mmap_unlock_write(vma->vm_file->f_mapping);
|
|
mmu_notifier_invalidate_range_end(&range);
|
|
|
|
return pages << h->order;
|
|
}
|
|
|
|
int hugetlb_reserve_pages(struct inode *inode,
|
|
long from, long to,
|
|
struct vm_area_struct *vma,
|
|
vm_flags_t vm_flags)
|
|
{
|
|
long ret, chg;
|
|
struct hstate *h = hstate_inode(inode);
|
|
struct hugepage_subpool *spool = subpool_inode(inode);
|
|
struct resv_map *resv_map;
|
|
long gbl_reserve;
|
|
|
|
/* This should never happen */
|
|
if (from > to) {
|
|
VM_WARN(1, "%s called with a negative range\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* Only apply hugepage reservation if asked. At fault time, an
|
|
* attempt will be made for VM_NORESERVE to allocate a page
|
|
* without using reserves
|
|
*/
|
|
if (vm_flags & VM_NORESERVE)
|
|
return 0;
|
|
|
|
/*
|
|
* Shared mappings base their reservation on the number of pages that
|
|
* are already allocated on behalf of the file. Private mappings need
|
|
* to reserve the full area even if read-only as mprotect() may be
|
|
* called to make the mapping read-write. Assume !vma is a shm mapping
|
|
*/
|
|
if (!vma || vma->vm_flags & VM_MAYSHARE) {
|
|
/*
|
|
* resv_map can not be NULL as hugetlb_reserve_pages is only
|
|
* called for inodes for which resv_maps were created (see
|
|
* hugetlbfs_get_inode).
|
|
*/
|
|
resv_map = inode_resv_map(inode);
|
|
|
|
chg = region_chg(resv_map, from, to);
|
|
|
|
} else {
|
|
resv_map = resv_map_alloc();
|
|
if (!resv_map)
|
|
return -ENOMEM;
|
|
|
|
chg = to - from;
|
|
|
|
set_vma_resv_map(vma, resv_map);
|
|
set_vma_resv_flags(vma, HPAGE_RESV_OWNER);
|
|
}
|
|
|
|
if (chg < 0) {
|
|
ret = chg;
|
|
goto out_err;
|
|
}
|
|
|
|
/*
|
|
* There must be enough pages in the subpool for the mapping. If
|
|
* the subpool has a minimum size, there may be some global
|
|
* reservations already in place (gbl_reserve).
|
|
*/
|
|
gbl_reserve = hugepage_subpool_get_pages(spool, chg);
|
|
if (gbl_reserve < 0) {
|
|
ret = -ENOSPC;
|
|
goto out_err;
|
|
}
|
|
|
|
/*
|
|
* Check enough hugepages are available for the reservation.
|
|
* Hand the pages back to the subpool if there are not
|
|
*/
|
|
ret = hugetlb_acct_memory(h, gbl_reserve);
|
|
if (ret < 0) {
|
|
/* put back original number of pages, chg */
|
|
(void)hugepage_subpool_put_pages(spool, chg);
|
|
goto out_err;
|
|
}
|
|
|
|
/*
|
|
* Account for the reservations made. Shared mappings record regions
|
|
* that have reservations as they are shared by multiple VMAs.
|
|
* When the last VMA disappears, the region map says how much
|
|
* the reservation was and the page cache tells how much of
|
|
* the reservation was consumed. Private mappings are per-VMA and
|
|
* only the consumed reservations are tracked. When the VMA
|
|
* disappears, the original reservation is the VMA size and the
|
|
* consumed reservations are stored in the map. Hence, nothing
|
|
* else has to be done for private mappings here
|
|
*/
|
|
if (!vma || vma->vm_flags & VM_MAYSHARE) {
|
|
long add = region_add(resv_map, from, to);
|
|
|
|
if (unlikely(chg > add)) {
|
|
/*
|
|
* pages in this range were added to the reserve
|
|
* map between region_chg and region_add. This
|
|
* indicates a race with alloc_huge_page. Adjust
|
|
* the subpool and reserve counts modified above
|
|
* based on the difference.
|
|
*/
|
|
long rsv_adjust;
|
|
|
|
rsv_adjust = hugepage_subpool_put_pages(spool,
|
|
chg - add);
|
|
hugetlb_acct_memory(h, -rsv_adjust);
|
|
}
|
|
}
|
|
return 0;
|
|
out_err:
|
|
if (!vma || vma->vm_flags & VM_MAYSHARE)
|
|
/* Don't call region_abort if region_chg failed */
|
|
if (chg >= 0)
|
|
region_abort(resv_map, from, to);
|
|
if (vma && is_vma_resv_set(vma, HPAGE_RESV_OWNER))
|
|
kref_put(&resv_map->refs, resv_map_release);
|
|
return ret;
|
|
}
|
|
|
|
long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
|
|
long freed)
|
|
{
|
|
struct hstate *h = hstate_inode(inode);
|
|
struct resv_map *resv_map = inode_resv_map(inode);
|
|
long chg = 0;
|
|
struct hugepage_subpool *spool = subpool_inode(inode);
|
|
long gbl_reserve;
|
|
|
|
/*
|
|
* Since this routine can be called in the evict inode path for all
|
|
* hugetlbfs inodes, resv_map could be NULL.
|
|
*/
|
|
if (resv_map) {
|
|
chg = region_del(resv_map, start, end);
|
|
/*
|
|
* region_del() can fail in the rare case where a region
|
|
* must be split and another region descriptor can not be
|
|
* allocated. If end == LONG_MAX, it will not fail.
|
|
*/
|
|
if (chg < 0)
|
|
return chg;
|
|
}
|
|
|
|
spin_lock(&inode->i_lock);
|
|
inode->i_blocks -= (blocks_per_huge_page(h) * freed);
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
/*
|
|
* If the subpool has a minimum size, the number of global
|
|
* reservations to be released may be adjusted.
|
|
*/
|
|
gbl_reserve = hugepage_subpool_put_pages(spool, (chg - freed));
|
|
hugetlb_acct_memory(h, -gbl_reserve);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
|
|
static unsigned long page_table_shareable(struct vm_area_struct *svma,
|
|
struct vm_area_struct *vma,
|
|
unsigned long addr, pgoff_t idx)
|
|
{
|
|
unsigned long saddr = ((idx - svma->vm_pgoff) << PAGE_SHIFT) +
|
|
svma->vm_start;
|
|
unsigned long sbase = saddr & PUD_MASK;
|
|
unsigned long s_end = sbase + PUD_SIZE;
|
|
|
|
/* Allow segments to share if only one is marked locked */
|
|
unsigned long vm_flags = vma->vm_flags & VM_LOCKED_CLEAR_MASK;
|
|
unsigned long svm_flags = svma->vm_flags & VM_LOCKED_CLEAR_MASK;
|
|
|
|
/*
|
|
* match the virtual addresses, permission and the alignment of the
|
|
* page table page.
|
|
*/
|
|
if (pmd_index(addr) != pmd_index(saddr) ||
|
|
vm_flags != svm_flags ||
|
|
sbase < svma->vm_start || svma->vm_end < s_end)
|
|
return 0;
|
|
|
|
return saddr;
|
|
}
|
|
|
|
static bool vma_shareable(struct vm_area_struct *vma, unsigned long addr)
|
|
{
|
|
unsigned long base = addr & PUD_MASK;
|
|
unsigned long end = base + PUD_SIZE;
|
|
|
|
/*
|
|
* check on proper vm_flags and page table alignment
|
|
*/
|
|
if (vma->vm_flags & VM_MAYSHARE && range_in_vma(vma, base, end))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Determine if start,end range within vma could be mapped by shared pmd.
|
|
* If yes, adjust start and end to cover range associated with possible
|
|
* shared pmd mappings.
|
|
*/
|
|
void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma,
|
|
unsigned long *start, unsigned long *end)
|
|
{
|
|
unsigned long a_start, a_end;
|
|
|
|
if (!(vma->vm_flags & VM_MAYSHARE))
|
|
return;
|
|
|
|
/* Extend the range to be PUD aligned for a worst case scenario */
|
|
a_start = ALIGN_DOWN(*start, PUD_SIZE);
|
|
a_end = ALIGN(*end, PUD_SIZE);
|
|
|
|
/*
|
|
* Intersect the range with the vma range, since pmd sharing won't be
|
|
* across vma after all
|
|
*/
|
|
*start = max(vma->vm_start, a_start);
|
|
*end = min(vma->vm_end, a_end);
|
|
}
|
|
|
|
/*
|
|
* Search for a shareable pmd page for hugetlb. In any case calls pmd_alloc()
|
|
* and returns the corresponding pte. While this is not necessary for the
|
|
* !shared pmd case because we can allocate the pmd later as well, it makes the
|
|
* code much cleaner. pmd allocation is essential for the shared case because
|
|
* pud has to be populated inside the same i_mmap_rwsem section - otherwise
|
|
* racing tasks could either miss the sharing (see huge_pte_offset) or select a
|
|
* bad pmd for sharing.
|
|
*/
|
|
pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
|
|
{
|
|
struct vm_area_struct *vma = find_vma(mm, addr);
|
|
struct address_space *mapping = vma->vm_file->f_mapping;
|
|
pgoff_t idx = ((addr - vma->vm_start) >> PAGE_SHIFT) +
|
|
vma->vm_pgoff;
|
|
struct vm_area_struct *svma;
|
|
unsigned long saddr;
|
|
pte_t *spte = NULL;
|
|
pte_t *pte;
|
|
spinlock_t *ptl;
|
|
|
|
if (!vma_shareable(vma, addr))
|
|
return (pte_t *)pmd_alloc(mm, pud, addr);
|
|
|
|
i_mmap_lock_write(mapping);
|
|
vma_interval_tree_foreach(svma, &mapping->i_mmap, idx, idx) {
|
|
if (svma == vma)
|
|
continue;
|
|
|
|
saddr = page_table_shareable(svma, vma, addr, idx);
|
|
if (saddr) {
|
|
spte = huge_pte_offset(svma->vm_mm, saddr,
|
|
vma_mmu_pagesize(svma));
|
|
if (spte) {
|
|
get_page(virt_to_page(spte));
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!spte)
|
|
goto out;
|
|
|
|
ptl = huge_pte_lock(hstate_vma(vma), mm, spte);
|
|
if (pud_none(*pud)) {
|
|
pud_populate(mm, pud,
|
|
(pmd_t *)((unsigned long)spte & PAGE_MASK));
|
|
mm_inc_nr_pmds(mm);
|
|
} else {
|
|
put_page(virt_to_page(spte));
|
|
}
|
|
spin_unlock(ptl);
|
|
out:
|
|
pte = (pte_t *)pmd_alloc(mm, pud, addr);
|
|
i_mmap_unlock_write(mapping);
|
|
return pte;
|
|
}
|
|
|
|
/*
|
|
* unmap huge page backed by shared pte.
|
|
*
|
|
* Hugetlb pte page is ref counted at the time of mapping. If pte is shared
|
|
* indicated by page_count > 1, unmap is achieved by clearing pud and
|
|
* decrementing the ref count. If count == 1, the pte page is not shared.
|
|
*
|
|
* called with page table lock held.
|
|
*
|
|
* returns: 1 successfully unmapped a shared pte page
|
|
* 0 the underlying pte page is not shared, or it is the last user
|
|
*/
|
|
int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
|
|
{
|
|
pgd_t *pgd = pgd_offset(mm, *addr);
|
|
p4d_t *p4d = p4d_offset(pgd, *addr);
|
|
pud_t *pud = pud_offset(p4d, *addr);
|
|
|
|
BUG_ON(page_count(virt_to_page(ptep)) == 0);
|
|
if (page_count(virt_to_page(ptep)) == 1)
|
|
return 0;
|
|
|
|
pud_clear(pud);
|
|
put_page(virt_to_page(ptep));
|
|
mm_dec_nr_pmds(mm);
|
|
*addr = ALIGN(*addr, HPAGE_SIZE * PTRS_PER_PTE) - HPAGE_SIZE;
|
|
return 1;
|
|
}
|
|
#define want_pmd_share() (1)
|
|
#else /* !CONFIG_ARCH_WANT_HUGE_PMD_SHARE */
|
|
pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma,
|
|
unsigned long *start, unsigned long *end)
|
|
{
|
|
}
|
|
#define want_pmd_share() (0)
|
|
#endif /* CONFIG_ARCH_WANT_HUGE_PMD_SHARE */
|
|
|
|
#ifdef CONFIG_ARCH_WANT_GENERAL_HUGETLB
|
|
pte_t *huge_pte_alloc(struct mm_struct *mm,
|
|
unsigned long addr, unsigned long sz)
|
|
{
|
|
pgd_t *pgd;
|
|
p4d_t *p4d;
|
|
pud_t *pud;
|
|
pte_t *pte = NULL;
|
|
|
|
pgd = pgd_offset(mm, addr);
|
|
p4d = p4d_alloc(mm, pgd, addr);
|
|
if (!p4d)
|
|
return NULL;
|
|
pud = pud_alloc(mm, p4d, addr);
|
|
if (pud) {
|
|
if (sz == PUD_SIZE) {
|
|
pte = (pte_t *)pud;
|
|
} else {
|
|
BUG_ON(sz != PMD_SIZE);
|
|
if (want_pmd_share() && pud_none(*pud))
|
|
pte = huge_pmd_share(mm, addr, pud);
|
|
else
|
|
pte = (pte_t *)pmd_alloc(mm, pud, addr);
|
|
}
|
|
}
|
|
BUG_ON(pte && pte_present(*pte) && !pte_huge(*pte));
|
|
|
|
return pte;
|
|
}
|
|
|
|
/*
|
|
* huge_pte_offset() - Walk the page table to resolve the hugepage
|
|
* entry at address @addr
|
|
*
|
|
* Return: Pointer to page table or swap entry (PUD or PMD) for
|
|
* address @addr, or NULL if a p*d_none() entry is encountered and the
|
|
* size @sz doesn't match the hugepage size at this level of the page
|
|
* table.
|
|
*/
|
|
pte_t *huge_pte_offset(struct mm_struct *mm,
|
|
unsigned long addr, unsigned long sz)
|
|
{
|
|
pgd_t *pgd;
|
|
p4d_t *p4d;
|
|
pud_t *pud, pud_entry;
|
|
pmd_t *pmd, pmd_entry;
|
|
|
|
pgd = pgd_offset(mm, addr);
|
|
if (!pgd_present(*pgd))
|
|
return NULL;
|
|
p4d = p4d_offset(pgd, addr);
|
|
if (!p4d_present(*p4d))
|
|
return NULL;
|
|
|
|
pud = pud_offset(p4d, addr);
|
|
pud_entry = READ_ONCE(*pud);
|
|
if (sz != PUD_SIZE && pud_none(pud_entry))
|
|
return NULL;
|
|
/* hugepage or swap? */
|
|
if (pud_huge(pud_entry) || !pud_present(pud_entry))
|
|
return (pte_t *)pud;
|
|
|
|
pmd = pmd_offset(pud, addr);
|
|
pmd_entry = READ_ONCE(*pmd);
|
|
if (sz != PMD_SIZE && pmd_none(pmd_entry))
|
|
return NULL;
|
|
/* hugepage or swap? */
|
|
if (pmd_huge(pmd_entry) || !pmd_present(pmd_entry))
|
|
return (pte_t *)pmd;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */
|
|
|
|
/*
|
|
* These functions are overwritable if your architecture needs its own
|
|
* behavior.
|
|
*/
|
|
struct page * __weak
|
|
follow_huge_addr(struct mm_struct *mm, unsigned long address,
|
|
int write)
|
|
{
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
struct page * __weak
|
|
follow_huge_pd(struct vm_area_struct *vma,
|
|
unsigned long address, hugepd_t hpd, int flags, int pdshift)
|
|
{
|
|
WARN(1, "hugepd follow called with no support for hugepage directory format\n");
|
|
return NULL;
|
|
}
|
|
|
|
struct page * __weak
|
|
follow_huge_pmd(struct mm_struct *mm, unsigned long address,
|
|
pmd_t *pmd, int flags)
|
|
{
|
|
struct page *page = NULL;
|
|
spinlock_t *ptl;
|
|
pte_t pte;
|
|
retry:
|
|
ptl = pmd_lockptr(mm, pmd);
|
|
spin_lock(ptl);
|
|
/*
|
|
* make sure that the address range covered by this pmd is not
|
|
* unmapped from other threads.
|
|
*/
|
|
if (!pmd_huge(*pmd))
|
|
goto out;
|
|
pte = huge_ptep_get((pte_t *)pmd);
|
|
if (pte_present(pte)) {
|
|
page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT);
|
|
if (flags & FOLL_GET)
|
|
get_page(page);
|
|
} else {
|
|
if (is_hugetlb_entry_migration(pte)) {
|
|
spin_unlock(ptl);
|
|
__migration_entry_wait(mm, (pte_t *)pmd, ptl);
|
|
goto retry;
|
|
}
|
|
/*
|
|
* hwpoisoned entry is treated as no_page_table in
|
|
* follow_page_mask().
|
|
*/
|
|
}
|
|
out:
|
|
spin_unlock(ptl);
|
|
return page;
|
|
}
|
|
|
|
struct page * __weak
|
|
follow_huge_pud(struct mm_struct *mm, unsigned long address,
|
|
pud_t *pud, int flags)
|
|
{
|
|
if (flags & FOLL_GET)
|
|
return NULL;
|
|
|
|
return pte_page(*(pte_t *)pud) + ((address & ~PUD_MASK) >> PAGE_SHIFT);
|
|
}
|
|
|
|
struct page * __weak
|
|
follow_huge_pgd(struct mm_struct *mm, unsigned long address, pgd_t *pgd, int flags)
|
|
{
|
|
if (flags & FOLL_GET)
|
|
return NULL;
|
|
|
|
return pte_page(*(pte_t *)pgd) + ((address & ~PGDIR_MASK) >> PAGE_SHIFT);
|
|
}
|
|
|
|
bool isolate_huge_page(struct page *page, struct list_head *list)
|
|
{
|
|
bool ret = true;
|
|
|
|
VM_BUG_ON_PAGE(!PageHead(page), page);
|
|
spin_lock(&hugetlb_lock);
|
|
if (!page_huge_active(page) || !get_page_unless_zero(page)) {
|
|
ret = false;
|
|
goto unlock;
|
|
}
|
|
clear_page_huge_active(page);
|
|
list_move_tail(&page->lru, list);
|
|
unlock:
|
|
spin_unlock(&hugetlb_lock);
|
|
return ret;
|
|
}
|
|
|
|
void putback_active_hugepage(struct page *page)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHead(page), page);
|
|
spin_lock(&hugetlb_lock);
|
|
set_page_huge_active(page);
|
|
list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist);
|
|
spin_unlock(&hugetlb_lock);
|
|
put_page(page);
|
|
}
|
|
|
|
void move_hugetlb_state(struct page *oldpage, struct page *newpage, int reason)
|
|
{
|
|
struct hstate *h = page_hstate(oldpage);
|
|
|
|
hugetlb_cgroup_migrate(oldpage, newpage);
|
|
set_page_owner_migrate_reason(newpage, reason);
|
|
|
|
/*
|
|
* transfer temporary state of the new huge page. This is
|
|
* reverse to other transitions because the newpage is going to
|
|
* be final while the old one will be freed so it takes over
|
|
* the temporary status.
|
|
*
|
|
* Also note that we have to transfer the per-node surplus state
|
|
* here as well otherwise the global surplus count will not match
|
|
* the per-node's.
|
|
*/
|
|
if (PageHugeTemporary(newpage)) {
|
|
int old_nid = page_to_nid(oldpage);
|
|
int new_nid = page_to_nid(newpage);
|
|
|
|
SetPageHugeTemporary(oldpage);
|
|
ClearPageHugeTemporary(newpage);
|
|
|
|
spin_lock(&hugetlb_lock);
|
|
if (h->surplus_huge_pages_node[old_nid]) {
|
|
h->surplus_huge_pages_node[old_nid]--;
|
|
h->surplus_huge_pages_node[new_nid]++;
|
|
}
|
|
spin_unlock(&hugetlb_lock);
|
|
}
|
|
}
|