Commit Graph

1168747 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
e9df7dc25a Merge 0986efc3c7 ("spi: atmel-qspi: Memory barriers after memory-mapped I/O") into android14-6.1-lts
Steps on the way to 6.1.130

Change-Id: I9fa2d1d29e6523458cd471d93d06bfba78e920ba
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-12 16:33:40 +00:00
Greg Kroah-Hartman
9212df9856 Merge 0a09d56e16 ("memcg: fix soft lockup in the OOM process") into android14-6.1-lts
Steps on the way to 6.1.130

Resolves merge conflicts in:
	mm/oom_kill.c

Change-Id: Ie3ed449d29a900921d671f9338017da73ea61dc0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-12 16:29:25 +00:00
Greg Kroah-Hartman
1bc4f0dcdc Merge 6.1.129 into android14-6.1-lts
Changes in 6.1.129
	powerpc/book3s64/hugetlb: Fix disabling hugetlb when fadump is active
	afs: Fix EEXIST error returned from afs_rmdir() to be ENOTEMPTY
	afs: Fix directory format encoding struct
	fs: fix proc_handler for sysctl_nr_open
	block: retry call probe after request_module in blk_request_module
	nbd: don't allow reconnect after disconnect
	pstore/blk: trivial typo fixes
	nvme: Add error check for xa_store in nvme_get_effects_log
	selftests/powerpc: Fix argument order to timer_sub()
	partitions: ldm: remove the initial kernel-doc notation
	select: Fix unbalanced user_access_end()
	afs: Fix the fallback handling for the YFS.RemoveFile2 RPC call
	sched/psi: Use task->psi_flags to clear in CPU migration
	sched/fair: Fix value reported by hot tasks pulled in /proc/schedstat
	drm/msm/dp: set safe_to_exit_level before printing it
	drm/etnaviv: Fix page property being used for non writecombine buffers
	HID: core: Fix assumption that Resolution Multipliers must be in Logical Collections
	drm/amdgpu: Fix potential NULL pointer dereference in atomctrl_get_smc_sclk_range_table
	drm/rockchip: vop2: Fix cluster windows alpha ctrl regsiters offset
	drm/rockchip: vop2: Fix the mixer alpha setup for layer 0
	drm/rockchip: vop2: Set YUV/RGB overlay mode
	drm/rockchip: vop2: set bg dly and prescan dly at vop2_post_config
	drm/rockchip: vop2: Fix the windows switch between different layers
	drm/rockchip: vop2: Check linear format for Cluster windows on rk3566/8
	OPP: Rearrange entries in pm_opp.h
	OPP: Introduce dev_pm_opp_find_freq_{ceil/floor}_indexed() APIs
	OPP: Introduce dev_pm_opp_get_freq_indexed() API
	OPP: Add dev_pm_opp_find_freq_exact_indexed()
	OPP: Reuse dev_pm_opp_get_freq_indexed()
	OPP: add index check to assert to avoid buffer overflow in _read_freq()
	OPP: fix dev_pm_opp_find_bw_*() when bandwidth table not initialized
	drm/bridge: it6505: Change definition of AUX_FIFO_MAX_SIZE
	genirq: Make handle_enforce_irqctx() unconditionally available
	ipmi: ipmb: Add check devm_kasprintf() returned value
	wifi: ath11k: Fix unexpected return buffer manager error for WCN6750/WCN6855
	wifi: rtlwifi: do not complete firmware loading needlessly
	wifi: rtlwifi: rtl8192se: rise completion of firmware loading as last step
	wifi: rtlwifi: wait for firmware loading before releasing memory
	wifi: rtlwifi: fix init_sw_vars leak when probe fails
	wifi: rtlwifi: usb: fix workqueue leak when probe fails
	wifi: wcn36xx: fix channel survey memory allocation size
	net_sched: sch_sfq: annotate data-races around q->perturb_period
	net_sched: sch_sfq: handle bigger packets
	net_sched: sch_sfq: don't allow 1 packet limit
	spi: zynq-qspi: Add check for clk_enable()
	dt-bindings: mmc: controller: clarify the address-cells description
	dt-bindings: leds: class-multicolor: Fix path to color definitions
	wifi: rtlwifi: remove unused timer and related code
	wifi: rtlwifi: remove unused dualmac control leftovers
	wifi: rtlwifi: remove unused check_buddy_priv
	wifi: rtlwifi: destroy workqueue at rtl_deinit_core
	wifi: rtlwifi: fix memory leaks and invalid access at probe error path
	wifi: rtlwifi: pci: wait for firmware loading before releasing memory
	HID: multitouch: fix support for Goodix PID 0x01e9
	regulator: dt-bindings: mt6315: Drop regulator-compatible property
	ACPI: fan: cleanup resources in the error path of .probe()
	cpupower: fix TSC MHz calculation
	dt-bindings: mfd: bd71815: Fix rsense and typos
	leds: netxbig: Fix an OF node reference leak in netxbig_leds_get_of_pdata()
	inetpeer: remove create argument of inet_getpeer_v[46]()
	inetpeer: remove create argument of inet_getpeer()
	inetpeer: update inetpeer timestamp in inet_getpeer()
	inetpeer: do not get a refcount in inet_getpeer()
	pwm: stm32-lp: Add check for clk_enable()
	cpufreq: schedutil: Fix superfluous updates caused by need_freq_update
	clk: imx8mp: Fix clkout1/2 support
	team: prevent adding a device which is already a team device lower
	regulator: of: Implement the unwind path of of_regulator_match()
	ax25: rcu protect dev->ax25_ptr
	OPP: OF: Fix an OF node leak in _opp_add_static_v2()
	clk: qcom: gcc-sdm845: Do not use shared clk_ops for QUPs
	HID: hid-thrustmaster: Fix warning in thrustmaster_probe by adding endpoint check
	mfd: syscon: Remove extern from function prototypes
	mfd: syscon: Add of_syscon_register_regmap() API
	mfd: syscon: Use scoped variables with memory allocators to simplify error paths
	mfd: syscon: Fix race in device_node_get_regmap()
	samples/landlock: Fix possible NULL dereference in parse_path()
	wifi: wlcore: fix unbalanced pm_runtime calls
	wifi: mac80211: prohibit deactivating all links
	wifi: mac80211: Fix common size calculation for ML element
	net/smc: fix data error when recvmsg with MSG_PEEK flag
	landlock: Handle weird files
	wifi: mt76: mt76u_vendor_request: Do not print error messages when -EPROTO
	wifi: mt76: mt7921: fix using incorrect group cipher after disconnection.
	wifi: mt76: mt7915: fix register mapping
	cpufreq: ACPI: Fix max-frequency computation
	selftests: timers: clocksource-switch: Adapt progress to kselftest framework
	selftests: harness: fix printing of mismatch values in __EXPECT()
	wifi: cfg80211: Handle specific BSSID in 6GHz scanning
	wifi: cfg80211: adjust allocation of colocated AP data
	clk: analogbits: Fix incorrect calculation of vco rate delta
	pwm: stm32: Add check for clk_enable()
	selftests/landlock: Fix error message
	net: let net.core.dev_weight always be non-zero
	net/mlxfw: Drop hard coded max FW flash image size
	net: avoid race between device unregistration and ethnl ops
	net: sched: Disallow replacing of child qdisc from one parent to another
	netfilter: nft_flow_offload: update tcp state flags under lock
	net: ethernet: ti: am65-cpsw: fix freeing IRQ in am65_cpsw_nuss_remove_tx_chns()
	tcp_cubic: fix incorrect HyStart round start detection
	net/rose: prevent integer overflows in rose_setsockopt()
	libbpf: don't adjust USDT semaphore address if .stapsdt.base addr is missing
	tools/testing/selftests/bpf/test_tc_tunnel.sh: Fix wait for server bind
	libbpf: Fix segfault due to libelf functions not setting errno
	ASoC: sun4i-spdif: Add clock multiplier settings
	ASoC: renesas: rz-ssi: Use only the proper amount of dividers
	ktest.pl: Remove unused declarations in run_bisect_test function
	crypto: hisilicon/sec2 - optimize the error return process
	crypto: hisilicon/sec2 - fix for aead icv error
	crypto: hisilicon/sec2 - fix for aead invalid authsize
	crypto: ixp4xx - fix OF node reference leaks in init_ixp_crypto()
	padata: fix sysfs store callback check
	ASoC: Intel: avs: Fix theoretical infinite loop
	pinctrl: stm32: set default gpio line names using pin names
	pinctrl: stm32: Add check for devm_kcalloc
	pinctrl: stm32: check devm_kasprintf() returned value
	pinctrl: stm32: Add check for clk_enable()
	bpf: Send signals asynchronously if !preemptible
	bpf: tcp: Mark bpf_load_hdr_opt() arg2 as read-write
	ALSA: hda/realtek - Fixed headphone distorted sound on Acer Aspire A115-31 laptop
	padata: fix UAF in padata_reorder
	padata: add pd get/put refcnt helper
	padata: avoid UAF for reorder_work
	smb: client: fix oops due to unset link speed
	soc: atmel: fix device_node release in atmel_soc_device_init()
	ARM: at91: pm: change BU Power Switch to automatic mode
	arm64: dts: mt8183: set DMIC one-wire mode on Damu
	arm64: dts: mediatek: mt8516: fix GICv2 range
	arm64: dts: mediatek: mt8516: fix wdt irq type
	arm64: dts: mediatek: mt8516: add i2c clock-div property
	arm64: dts: mediatek: mt8516: reserve 192 KiB for TF-A
	RDMA/mlx4: Avoid false error about access to uninitialized gids array
	rdma/cxgb4: Prevent potential integer overflow on 32bit
	arm64: dts: mediatek: mt8173-evb: Drop regulator-compatible property
	arm64: dts: mediatek: mt8173-elm: Drop regulator-compatible property
	arm64: dts: mediatek: mt8192-asurada: Drop regulator-compatible property
	arm64: dts: mediatek: mt8195-cherry: Drop regulator-compatible property
	arm64: dts: mediatek: mt8195-demo: Drop regulator-compatible property
	arm64: dts: mediatek: mt8173-elm: Fix MT6397 PMIC sub-node names
	arm64: dts: mediatek: mt8173-evb: Fix MT6397 PMIC sub-node names
	arm64: dts: mediatek: mt8183: kenzo: Support second source touchscreen
	arm64: dts: mediatek: mt8183: willow: Support second source touchscreen
	RDMA/srp: Fix error handling in srp_add_port
	memory: tegra20-emc: fix an OF node reference bug in tegra_emc_find_node_by_ram_code()
	arm64: dts: mediatek: mt8183-kukui-jacuzzi: Drop pp3300_panel voltage settings
	arm64: dts: qcom: msm8996-xiaomi-gemini: Fix LP5562 LED1 reg property
	arm64: dts: qcom: msm8996: Fix up USB3 interrupts
	arm64: dts: qcom: msm8994: Describe USB interrupts
	arm64: dts: qcom: sm7225-fairphone-fp4: Drop extra qcom,msm-id value
	arm64: dts: qcom: msm8916: correct sleep clock frequency
	arm64: dts: qcom: msm8994: correct sleep clock frequency
	arm64: dts: qcom: sc7280: correct sleep clock frequency
	arm64: dts: qcom: sm6125: correct sleep clock frequency
	arm64: dts: qcom: sm8250: correct sleep clock frequency
	arm64: dts: qcom: sm8350: correct sleep clock frequency
	arm64: dts: qcom: sm8450: correct sleep clock frequency
	arm64: dts: ti: k3-am62: Remove duplicate GICR reg
	arm64: dts: ti: k3-am62a: Remove duplicate GICR reg
	arm64: dts: qcom: sc7180: Add compat qcom,sc7180-dsi-ctrl
	arm64: dts: qcom: sc7180-idp: use just "port" in panel
	arm64: dts: qcom: sc7180-trogdor-quackingstick: use just "port" in panel
	arm64: dts: qcom: sc7180-trogdor-wormdingler: use just "port" in panel
	arm64: dts: qcom: sc7180: Don't enable lpass clocks by default
	arm64: dts: qcom: sc7180: Drop redundant disable in mdp
	arm64: dts: qcom: sc7180-trogdor-quackingstick: add missing avee-supply
	arm64: dts: qcom: pm6150l: add temp sensor and thermal zone config
	arm64: dts: qcom: sc7180-*: Remove thermal zone polling delays
	arm64: dts: qcom: sc7180-trogdor-pompom: rename 5v-choke thermal zone
	arm64: dts: qcom: sm8150-microsoft-surface-duo: fix typos in da7280 properties
	arm64: dts: qcom: sc8280xp: Fix up remoteproc register space sizes
	dts: arm64: mediatek: mt8195: Remove MT8183 compatible for OVL
	arm64: dts: qcom: sdm845: Fix interrupt types of camss interrupts
	arm64: dts: qcom: sm8250: Fix interrupt types of camss interrupts
	ARM: dts: mediatek: mt7623: fix IR nodename
	fbdev: omapfb: Fix an OF node leak in dss_of_port_get_parent_device()
	RDMA/mlx5: Fix indirect mkey ODP page count
	of: reserved-memory: Do not make kmemleak ignore freed address
	efi: sysfb_efi: fix W=1 warnings when EFI is not set
	RDMA/rxe: Fix the warning "__rxe_cleanup+0x12c/0x170 [rdma_rxe]"
	iommufd/iova_bitmap: Fix shift-out-of-bounds in iova_bitmap_offset_to_index()
	media: rc: iguanair: handle timeouts
	media: lmedm04: Handle errors for lme2510_int_read
	PCI: endpoint: Destroy the EPC device in devm_pci_epc_destroy()
	media: marvell: Add check for clk_enable()
	media: i2c: imx412: Add missing newline to prints
	media: i2c: ov9282: Correct the exposure offset
	media: mipi-csis: Add check for clk_enable()
	media: camif-core: Add check for clk_enable()
	media: uvcvideo: Propagate buf->error to userspace
	mtd: hyperbus: hbmc-am654: Convert to platform remove callback returning void
	mtd: hyperbus: hbmc-am654: fix an OF node reference leak
	staging: media: imx: fix OF node leak in imx_media_add_of_subdevs()
	PCI: rcar-ep: Fix incorrect variable used when calling devm_request_mem_region()
	PCI: endpoint: pci-epf-test: Set dma_chan_rx pointer to NULL on error
	PCI: epf-test: Simplify DMA support checks
	PCI: endpoint: pci-epf-test: Fix check for DMA MEMCPY test
	scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1
	scsi: ufs: bsg: Delete bsg_dev when setting up bsg fails
	ocfs2: mark dquot as inactive if failed to start trans while releasing dquot
	module: Extend the preempt disabled section in dereference_symbol_descriptor().
	serial: 8250: Adjust the timeout for FIFO mode
	NFSv4.2: fix COPY_NOTIFY xdr buf size calculation
	NFSv4.2: mark OFFLOAD_CANCEL MOVEABLE
	tools/bootconfig: Fix the wrong format specifier
	xfrm: replay: Fix the update of replay_esn->oseq_hi for GSO
	dmaengine: ti: edma: fix OF node reference leaks in edma_driver
	rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read
	ubifs: skip dumping tnc tree when zroot is null
	regulator: core: Add missing newline character
	net: hns3: fix oops when unload drivers paralleling
	gpio: mxc: remove dead code after switch to DT-only
	net: fec: implement TSO descriptor cleanup
	ipmr: do not call mr_mfc_uses_dev() for unres entries
	PM: hibernate: Add error handling for syscore_suspend()
	iavf: allow changing VLAN state without calling PF
	net: rose: fix timer races against user threads
	net: netdevsim: try to close UDP port harness races
	vxlan: Fix uninit-value in vxlan_vnifilter_dump()
	net: davicom: fix UAF in dm9000_drv_remove
	bgmac: reduce max frame size to support just MTU 1500
	net: sh_eth: Fix missing rtnl lock in suspend/resume path
	net: hsr: fix fill_frame_info() regression vs VLAN packets
	genksyms: fix memory leak when the same symbol is added from source
	genksyms: fix memory leak when the same symbol is read from *.symref file
	ASoC: rockchip: i2s_tdm: Re-add the set_sysclk callback
	kconfig: fix file name in warnings when loading KCONFIG_DEFCONFIG_LIST
	kconfig: add warn-unknown-symbols sanity check
	kconfig: require a space after '#' for valid input
	kconfig: remove unused code for S_DEF_AUTO in conf_read_simple()
	kconfig: deduplicate code in conf_read_simple()
	kconfig: WERROR unmet symbol dependency
	kconfig: fix memory leak in sym_warn_unmet_dep()
	hexagon: fix using plain integer as NULL pointer warning in cmpxchg
	hexagon: Fix unbalanced spinlock in die()
	f2fs: Introduce linear search for dentries
	NFSD: Reset cb_seq_status after NFS4ERR_DELAY
	kbuild: switch from lz4c to lz4 for compression
	netfilter: nf_tables: reject mismatching sum of field_len with set key length
	nvme: fix metadata handling in nvme-passthrough
	drm/amd/display: fix double free issue during amdgpu module unload
	ktest.pl: Check kernelrelease return in get_version
	ALSA: usb-audio: Add delay quirk for iBasso DC07 Pro
	net: usb: rtl8150: enable basic endpoint checking
	usb: xhci: Fix NULL pointer dereference on certain command aborts
	drivers/card_reader/rtsx_usb: Restore interrupt based detection
	usb: gadget: f_tcm: Fix Get/SetInterface return value
	usb: dwc3-am62: Fix an OF node leak in phy_syscon_pll_refclk()
	usb: dwc3: core: Defer the probe until USB power supply ready
	usb: typec: tcpm: set SRC_SEND_CAPABILITIES timeout to PD_T_SENDER_RESPONSE
	usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS
	mptcp: consolidate suboption status
	mptcp: handle fastopen disconnect correctly
	remoteproc: core: Fix ida_free call while not allocated
	media: uvcvideo: Fix double free in error path
	usb: gadget: f_tcm: Don't free command immediately
	staging: media: max96712: fix kernel oops when removing module
	media: imx-jpeg: Fix potential error pointer dereference in detach_pm()
	btrfs: output the reason for open_ctree() failure
	ptp: Properly handle compat ioctls
	s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS
	pinctrl: stm32: fix array read out of bound
	btrfs: fix use-after-free when attempting to join an aborted transaction
	arm64/mm: Ensure adequate HUGE_MAX_HSTATE
	exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case
	btrfs: fix data race when accessing the inode's disk_i_size at btrfs_drop_extents()
	btrfs: convert BUG_ON in btrfs_reloc_cow_block() to proper error handling
	sched: Don't try to catch up excess steal time.
	lockdep: Fix upper limit for LOCKDEP_*_BITS configs
	x86/amd_nb: Restrict init function to AMD-based systems
	drm/virtio: New fence for every plane update
	printk: Fix signed integer overflow when defining LOG_BUF_LEN_MAX
	drm/amd/display: Fix Mode Cutoff in DSC Passthrough to DP2.1 Monitor
	drm/bridge: it6505: Change definition MAX_HDCP_DOWN_STREAM_COUNT
	drm/bridge: it6505: fix HDCP Bstatus check
	drm/bridge: it6505: fix HDCP encryption when R0 ready
	drm/bridge: it6505: fix HDCP CTS compare V matching
	safesetid: check size of policy writes
	tun: fix group permission check
	mmc: core: Respect quirk_max_rate for non-UHS SDIO card
	wifi: brcmsmac: add gain range check to wlc_phy_iqcal_gainparams_nphy()
	tomoyo: don't emit warning in tomoyo_write_control()
	mfd: lpc_ich: Add another Gemini Lake ISA bridge PCI device-id
	HID: Wacom: Add PCI Wacom device support
	net/mlx5: use do_aux_work for PHC overflow checks
	wifi: brcmfmac: Check the return value of of_property_read_string_index()
	wifi: iwlwifi: avoid memory leak
	i2c: Force ELAN06FA touchpad I2C bus freq to 100KHz
	APEI: GHES: Have GHES honor the panic= setting
	Bluetooth: MGMT: Fix slab-use-after-free Read in mgmt_remove_adv_monitor_sync
	net: wwan: iosm: Fix hibernation by re-binding the driver around it
	mmc: sdhci-msm: Correctly set the load for the regulator
	tipc: re-order conditions in tipc_crypto_key_rcv()
	selftests/net/ipsec: Fix Null pointer dereference in rtattr_pack()
	x86/kexec: Allocate PGD for x86_64 transition page tables separately
	iommu/arm-smmu-v3: Clean up more on probe failure
	platform/x86: int3472: Check for adev == NULL
	ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback
	ASoC: amd: Add ACPI dependency to fix build error
	Input: allocate keycode for phone linking
	platform/x86: acer-wmi: Ignore AC events
	KVM: PPC: e500: Mark "struct page" dirty in kvmppc_e500_shadow_map()
	KVM: PPC: e500: Mark "struct page" pfn accessed before dropping mmu_lock
	KVM: PPC: e500: Use __kvm_faultin_pfn() to handle page faults
	KVM: e500: always restore irqs
	usb: chipidea/ci_hdrc_imx: Convert to platform remove callback returning void
	usb: chipidea: ci_hdrc_imx: decrement device's refcount in .remove() and in the error path of .probe()
	net/ncsi: Add NC-SI 1.2 Get MC MAC Address command
	net/ncsi: fix locking in Get MAC Address handling
	gpio: xilinx: Convert to immutable irq_chip
	gpio: xilinx: Convert gpio_lock to raw spinlock
	xfs: report realtime block quota limits on realtime directories
	xfs: don't over-report free space or inodes in statvfs
	nvme: handle connectivity loss in nvme_set_queue_count
	firmware: iscsi_ibft: fix ISCSI_IBFT Kconfig entry
	gpu: drm_dp_cec: fix broken CEC adapter properties check
	tg3: Disable tg3 PCIe AER on system reboot
	udp: gso: do not drop small packets when PMTU reduces
	gpio: pca953x: Improve interrupt support
	net: atlantic: fix warning during hot unplug
	net: rose: lock the socket in rose_bind()
	x86/xen: fix xen_hypercall_hvm() to not clobber %rbx
	x86/xen: add FRAME_END to xen_hypercall_hvm()
	ACPI: property: Fix return value for nval == 0 in acpi_data_prop_read()
	netem: Update sch->q.qlen before qdisc_tree_reduce_backlog()
	tun: revert fix group permission check
	net: sched: Fix truncation of offloaded action statistics
	cpufreq: s3c64xx: Fix compilation warning
	leds: lp8860: Write full EEPROM, not only half of it
	ALSA: hda/realtek: Enable Mute LED on HP Laptop 14s-fq1xxx
	drm/modeset: Handle tiled displays in pan_display_atomic.
	smb: client: change lease epoch type from unsigned int to __u16
	s390/futex: Fix FUTEX_OP_ANDN implementation
	m68k: vga: Fix I/O defines
	fs/proc: do_task_stat: Fix ESP not readable during coredump
	binfmt_flat: Fix integer overflow bug on 32 bit systems
	drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event()
	arm64: dts: rockchip: increase gmac rx_delay on rk3399-puma
	KVM: Explicitly verify target vCPU is online in kvm_get_vcpu()
	KVM: s390: vsie: fix some corner-cases when grabbing vsie pages
	ksmbd: fix integer overflows on 32 bit systems
	drm/amd/pm: Mark MM activity as unsupported
	Revert "drm/amd/display: Use HW lock mgr for PSR1"
	drm/i915/guc: Debug print LRC state entries only if the context is pinned
	drm/komeda: Add check for komeda_get_layer_fourcc_list()
	drm/i915: Drop 64bpp YUV formats from ICL+ SDR planes
	Bluetooth: L2CAP: handle NULL sock pointer in l2cap_sock_alloc
	Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection
	clk: sunxi-ng: a100: enable MMC clock reparenting
	clk: qcom: clk-alpha-pll: fix alpha mode configuration
	clk: qcom: gcc-sm6350: Add missing parent_map for two clocks
	clk: qcom: dispcc-sm6350: Add missing parent_map for a clock
	clk: qcom: gcc-mdm9607: Fix cmd_rcgr offset for blsp1_uart6 rcg
	clk: qcom: clk-rpmh: prevent integer overflow in recalc_rate
	blk-cgroup: Fix class @block_class's subsystem refcount leakage
	efi: libstub: Use '-std=gnu11' to fix build with GCC 15
	scsi: ufs: core: Fix the HIGH/LOW_TEMP Bit Definitions
	of: Correct child specifier used as input of the 2nd nexus node
	of: Fix of_find_node_opts_by_path() handling of alias+path+options
	of: reserved-memory: Fix using wrong number of cells to get property 'alignment'
	HID: hid-sensor-hub: don't use stale platform-data on remove
	wifi: rtlwifi: rtl8821ae: Fix media status report
	wifi: brcmfmac: fix NULL pointer dereference in brcmf_txfinalize()
	usb: gadget: f_tcm: Translate error to sense
	usb: gadget: f_tcm: Decrement command ref count on cleanup
	usb: gadget: f_tcm: ep_autoconfig with fullspeed endpoint
	usb: gadget: f_tcm: Don't prepare BOT write request twice
	ASoC: acp: Support microphone from Lenovo Go S
	soc: qcom: socinfo: Avoid out of bounds read of serial number
	serial: sh-sci: Drop __initdata macro for port_cfg
	serial: sh-sci: Do not probe the serial port if its slot in sci_ports[] is in use
	MIPS: Loongson64: remove ROM Size unit in boardinfo
	powerpc/pseries/eeh: Fix get PE state translation
	dm-crypt: don't update io->sector after kcryptd_crypt_write_io_submit()
	dm-crypt: track tag_offset in convert_context
	mips/math-emu: fix emulation of the prefx instruction
	block: don't revert iter for -EIOCBQUEUED
	Revert "media: uvcvideo: Require entities to have a non-zero unique ID"
	ALSA: hda/realtek: Enable headset mic on Positivo C6400
	ALSA: hda: Fix headset detection failure due to unstable sort
	arm64: tegra: Fix Tegra234 PCIe interrupt-map
	PCI: endpoint: Finish virtual EP removal in pci_epf_remove_vepf()
	nvme-pci: Add TUXEDO InfinityFlex to Samsung sleep quirk
	nvme-pci: Add TUXEDO IBP Gen9 to Samsung sleep quirk
	scsi: qla2xxx: Move FCE Trace buffer allocation to user control
	scsi: storvsc: Set correct data length for sending SCSI command without payload
	kbuild: Move -Wenum-enum-conversion to W=2
	x86/boot: Use '-std=gnu11' to fix build with GCC 15
	arm64: dts: qcom: sm6350: Fix ADSP memory length
	arm64: dts: qcom: sm6350: Fix MPSS memory length
	arm64: dts: qcom: sm8350: Fix MPSS memory length
	arm64: dts: qcom: sm8450: Fix MPSS memory length
	crypto: qce - fix priority to be less than ARMv8 CE
	arm64: tegra: Disable Tegra234 sce-fabric node
	xfs: Add error handling for xfs_reflink_cancel_cow_range
	ACPI: PRM: Remove unnecessary strict handler address checks
	rv: Reset per-task monitors also for idle tasks
	kfence: skip __GFP_THISNODE allocations on NUMA systems
	media: ccs: Clean up parsed CCS static data on parse failure
	iio: light: as73211: fix channel handling in only-color triggered buffer
	soc: qcom: smem_state: fix missing of_node_put in error path
	media: mc: fix endpoint iteration
	media: ov5640: fix get_light_freq on auto
	media: ccs: Fix CCS static data parsing for large block sizes
	media: ccs: Fix cleanup order in ccs_probe()
	media: uvcvideo: Fix event flags in uvc_ctrl_send_events
	media: uvcvideo: Remove redundant NULL assignment
	mm: kmemleak: fix upper boundary check for physical address objects
	ata: libata-sff: Ensure that we cannot write outside the allocated buffer
	crypto: qce - fix goto jump in error path
	crypto: qce - unregister previously registered algos in error path
	nvmem: qcom-spmi-sdam: Set size in struct nvmem_config
	nvmem: core: improve range check for nvmem_cell_write()
	io_uring/net: don't retry connect operation on EPOLLERR
	vfio/platform: check the bounds of read/write syscalls
	selftests: mptcp: connect: -f: no reconnect
	pnfs/flexfiles: retry getting layout segment for reads
	ocfs2: fix incorrect CPU endianness conversion causing mount failure
	ocfs2: handle a symlink read error correctly
	nilfs2: fix possible int overflows in nilfs_fiemap()
	mailbox: tegra-hsp: Clear mailbox before using message
	NFC: nci: Add bounds checking in nci_hci_create_pipe()
	i3c: master: Fix missing 'ret' assignment in set_speed()
	irqchip/apple-aic: Only handle PMC interrupt as FIQ when configured so
	mtd: onenand: Fix uninitialized retlen in do_otp_read()
	misc: fastrpc: Deregister device nodes properly in error scenarios
	misc: fastrpc: Fix registered buffer page address
	misc: fastrpc: Fix copy buffer page size
	net/ncsi: wait for the last response to Deselect Package before configuring channel
	net: phy: c45-tjaxx: add delay between MDIO write and read in soft_reset
	rtla/osnoise: Distinguish missing workload option
	rtla: Add trace_instance_stop
	rtla/timerlat_hist: Stop timerlat tracer on signal
	rtla/timerlat_top: Stop timerlat tracer on signal
	pinctrl: samsung: fix fwnode refcount cleanup if platform_get_irq_optional() fails
	ptp: Ensure info->enable callback is always set
	rtc: zynqmp: Fix optional clock name property
	io_uring: fix multishots with selected buffers
	io_uring: fix io_req_prep_async with provided buffers
	io_uring/rw: commit provided buffer state on async
	MIPS: ftrace: Declare ftrace_get_parent_ra_addr() as static
	net/ncsi: use dev_set_mac_address() for Get MC MAC Address handling
	gpio: xilinx: remove excess kernel doc
	ocfs2: check dir i_size in ocfs2_find_entry
	cachefiles: Fix NULL pointer dereference in object->file
	mptcp: pm: only set fullmesh for subflow endp
	mptcp: prevent excessive coalescing on receive
	tty: xilinx_uartps: split sysrq handling
	maple_tree: fix static analyser cppcheck issue
	maple_tree: simplify split calculation
	pps: Fix a use-after-free
	Revert "btrfs: avoid monopolizing a core when activating a swap file"
	btrfs: avoid monopolizing a core when activating a swap file
	nfsd: clear acl_access/acl_default after releasing them
	NFSD: fix hang in nfsd4_shutdown_callback
	pinctrl: cy8c95x0: Respect IRQ trigger settings from firmware
	HID: multitouch: Add NULL check in mt_input_configured
	HID: hid-thrustmaster: fix stack-out-of-bounds read in usb_check_int_endpoints()
	ax25: Fix refcount leak caused by setting SO_BINDTODEVICE sockopt
	ndisc: ndisc_send_redirect() must use dev_get_by_index_rcu()
	vrf: use RCU protection in l3mdev_l3_out()
	vxlan: check vxlan_vnigroup_init() return value
	team: better TEAM_OPTION_TYPE_STRING validation
	arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array
	cgroup: Remove steal time from usage_usec
	drm/i915/selftests: avoid using uninitialized context
	gpio: bcm-kona: Fix GPIO lock/unlock for banks above bank 0
	gpio: bcm-kona: Make sure GPIO bits are unlocked when requesting IRQ
	gpio: bcm-kona: Add missing newline to dev_err format string
	xen/swiotlb: relax alignment requirements
	xen: remove a confusing comment on auto-translated guest I/O
	x86/xen: allow larger contiguous memory regions in PV guests
	RDMA/efa: Reset device on probe failure
	fbdev: omap: use threaded IRQ for LCD DMA
	media: cxd2841er: fix 64-bit division on gcc-9
	media: vidtv: Fix a null-ptr-deref in vidtv_mux_stop_thread
	PCI/DPC: Quirk PIO log size for Intel Raptor Lake-P
	PCI: switchtec: Add Microchip PCI100X device IDs
	scsi: ufs: bsg: Set bsg_queue to NULL after removal
	rtla/timerlat_hist: Abort event processing on second signal
	rtla/timerlat_top: Abort event processing on second signal
	vfio/pci: Enable iowrite64 and ioread64 for vfio pci
	Grab mm lock before grabbing pt lock
	selftests: gpio: gpio-sim: Fix missing chip disablements
	x86/mm/tlb: Only trim the mm_cpumask once a second
	orangefs: fix a oob in orangefs_debug_write
	ASoC: Intel: bytcr_rt5640: Add DMI quirk for Vexia Edu Atla 10 tablet 5V
	batman-adv: fix panic during interface removal
	batman-adv: Ignore neighbor throughput metrics in error case
	batman-adv: Drop unmanaged ELP metric worker
	drm/amdgpu: avoid buffer overflow attach in smu_sys_set_pp_table()
	KVM: x86: Reject Hyper-V's SEND_IPI hypercalls if local APIC isn't in-kernel
	KVM: nSVM: Enter guest mode before initializing nested NPT MMU
	perf/x86/intel: Ensure LBRs are disabled when a CPU is starting
	usb: dwc3: Fix timeout issue during controller enter/exit from halt state
	usb: roles: set switch registered flag early on
	usb: gadget: udc: renesas_usb3: Fix compiler warning
	usb: dwc2: gadget: remove of_node reference upon udc_stop
	USB: pci-quirks: Fix HCCPARAMS register error for LS7A EHCI
	usb: core: fix pipe creation for get_bMaxPacketSize0
	USB: quirks: add USB_QUIRK_NO_LPM quirk for Teclast dist
	USB: Add USB_QUIRK_NO_LPM quirk for sony xperia xz1 smartphone
	usb: gadget: f_midi: fix MIDI Streaming descriptor lengths
	USB: hub: Ignore non-compliant devices with too many configs or interfaces
	USB: cdc-acm: Fill in Renesas R-Car D3 USB Download mode quirk
	usb: cdc-acm: Check control transfer buffer size before access
	usb: cdc-acm: Fix handling of oversized fragments
	USB: serial: option: add MeiG Smart SLM828
	USB: serial: option: add Telit Cinterion FN990B compositions
	USB: serial: option: fix Telit Cinterion FN990A name
	USB: serial: option: drop MeiG Smart defines
	can: ctucanfd: handle skb allocation failure
	can: c_can: fix unbalanced runtime PM disable in error path
	can: j1939: j1939_sk_send_loop(): fix unable to send messages with data length zero
	alpha: make stack 16-byte aligned (most cases)
	efi: Avoid cold plugged memory for placing the kernel
	cgroup: fix race between fork and cgroup.kill
	serial: 8250: Fix fifo underflow on flush
	alpha: align stack for page fault and user unaligned trap handlers
	gpiolib: acpi: Add a quirk for Acer Nitro ANV14
	gpio: stmpe: Check return value of stmpe_reg_read in stmpe_gpio_irq_sync_unlock
	partitions: mac: fix handling of bogus partition table
	regmap-irq: Add missing kfree()
	arm64: Handle .ARM.attributes section in linker scripts
	mmc: mtk-sd: Fix register settings for hs400(es) mode
	mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw()
	btrfs: fix hole expansion when writing at an offset beyond EOF
	clocksource: Use pr_info() for "Checking clocksource synchronization" message
	clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
	ipv4: add RCU protection to ip4_dst_hoplimit()
	net: treat possible_net_t net pointer as an RCU one and add read_pnet_rcu()
	net: add dev_net_rcu() helper
	ipv4: use RCU protection in ipv4_default_advmss()
	ipv4: use RCU protection in rt_is_expired()
	ipv4: use RCU protection in inet_select_addr()
	net: ipv4: Cache pmtu for all packet paths if multipath enabled
	ipv4: use RCU protection in __ip_rt_update_pmtu()
	ipv4: icmp: convert to dev_net_rcu()
	flow_dissector: use RCU protection to fetch dev_net()
	ipv6: use RCU protection in ip6_default_advmss()
	ndisc: use RCU protection in ndisc_alloc_skb()
	neighbour: delete redundant judgment statements
	neighbour: use RCU protection in __neigh_notify()
	arp: use RCU protection in arp_xmit()
	openvswitch: use RCU protection in ovs_vport_cmd_fill_info()
	ndisc: extend RCU protection in ndisc_send_skb()
	ipv6: mcast: add RCU protection to mld_newpack()
	drm/tidss: Fix issue in irq handling causing irq-flood issue
	drm/tidss: Clear the interrupt status for interrupts being disabled
	drm/v3d: Stop active perfmon if it is being destroyed
	kdb: Do not assume write() callback available
	x86/static-call: Remove early_boot_irqs_disabled check to fix Xen PVH dom0
	iommu: Return right value in iommu_sva_bind_device()
	arm64: tegra: Fix typo in Tegra234 dce-fabric compatible
	mm: gup: fix infinite loop within __get_longterm_locked
	alpha: replace hardcoded stack offsets with autogenerated ones
	i3c: master: cdns: Fix use after free vulnerability in cdns_i3c_master Driver Due to Race Condition
	nilfs2: do not output warnings when clearing dirty buffers
	nilfs2: do not force clear folio if buffer is referenced
	nilfs2: protect access to buffers with no active references
	can: ems_pci: move ASIX AX99100 ids to pci_ids.h
	serial: 8250_pci: add support for ASIX AX99100
	parport_pc: add support for ASIX AX99100
	net: dsa: fix netdev_priv() dereference before check on non-DSA netdevice events
	netdevsim: print human readable IP address
	selftests: rtnetlink: update netdevsim ipsec output format
	ARM: dts: dra7: Add bus_dma_limit for l4 cfg bus
	f2fs: fix to wait dio completion
	drm/amd/display: Add NULL pointer check for kzalloc
	x86/i8253: Disable PIT timer 0 when not in use
	Linux 6.1.129

Change-Id: I02497ad91676f262764450c910e1b123f1d97a1f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-12 06:06:57 +00:00
Greg Kroah-Hartman
5c2815ea50 Revert "cgroup: fix race between fork and cgroup.kill"
This reverts commit 28e51dd4f2 which is
commit b69bb476dee99d564d65d418e9a20acca6f32c3f upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I679df65c191344d69cdde76cba10b66ba2bf8e1e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-12 06:05:28 +00:00
Greg Kroah-Hartman
f082ff3de7 Merge 0264d6b73e ("can: ems_pci: move ASIX AX99100 ids to pci_ids.h") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/i3c/master/i3c-master-cdns.c
	include/linux/iommu.h
	net/ipv4/icmp.c

Change-Id: I27a81ad93ee7a865b5eb17d7866220fd3cf0bb11
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 17:05:48 +00:00
Greg Kroah-Hartman
12b82de534 Merge db8686b24a ("usb: roles: set switch registered flag early on") into android14-6.1-lts
Steps on the way to 6.1.129

Merges this commit away as it depended on an upstream change that was
previously reverted.

Change-Id: I04aa99451c3e341dbf6c91d99633e7df83c2b8c7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 17:03:12 +00:00
Greg Kroah-Hartman
897e9179dd Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
This reverts commit 0e83ec8c8e which is
commit 267b21d0bef8e67dbe6c591c9991444e58237ec9 upstream.

It breaks Pixel systems and can be brought back in the future if it's
really needed.

Change-Id: Ic96fe3259ce2fe4186301e64cfa400057c3dba0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
97c6e8c639 Revert "pps: Fix a use-after-free"
This reverts commit 91932db1d9 which is
commit c79a39dc8d060b9e64e8b0fa9d245d44befeefbe upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Idce3498308fc9971cc9bc9b617598bf2848cb56d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
1a79d14d69 Merge a298df1bbe ("usb: dwc3: Fix timeout issue during controller enter/exit from halt state") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/pps/clients/pps-ldisc.c

Change-Id: Idc1822210eb87723c7e7e34ad8ba71d2ca1d4ad3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
43908d99f2 Merge 09b288fb7f ("maple_tree: simplify split calculation") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I0eb60408f7d9735b0d1cb27dbb9379661b50fdef
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
ed4c442cd6 Merge c56ba3ea8e ("misc: fastrpc: Fix copy buffer page size") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts with:
	drivers/i3c/master.c

Change-Id: Ic60a64372e5acbd938424301c505f7520ca81003
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
590a924310 Merge bde2043174 ("usb: gadget: f_tcm: Don't prepare BOT write request twice") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: Ia424f0eb75a7bd8824d1c3a4cf5453e190ebe82a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 09:31:23 -07:00
Greg Kroah-Hartman
028c8a63f1 Merge d8d6db8e98 ("of: Correct child specifier used as input of the 2nd nexus node") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I64a3f94100b109e2dfb53c83003ef3c5a7cd97fd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 11:04:13 +00:00
Greg Kroah-Hartman
aa28806b5b Merge 99bf7c8414 ("clk: qcom: clk-rpmh: prevent integer overflow in recalc_rate") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I7c033d9acac83eaf7024e1892efcecce93c607c2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 11:03:38 +00:00
Greg Kroah-Hartman
0a07f883ce Merge 7a58944173 ("Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I13037a8418b21d6b3bcda013167f75353e393153
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 11:03:24 +00:00
Greg Kroah-Hartman
15e832da23 Merge 915697c2e6 ("Revert "drm/amd/display: Use HW lock mgr for PSR1"") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I7e750d014f341867c34180b22700467141e37a2f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-11 11:03:07 +00:00
Greg Kroah-Hartman
f967d1da0e Merge 27cf74b92e ("arm64: dts: rockchip: increase gmac rx_delay on rk3399-puma") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: Id70934e90d88f1d202b708f3ad520dce2a0288eb
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-10 10:56:33 +00:00
Greg Kroah-Hartman
a3fdfc6e1c ANDROID: GKI: virtual_device: add __drm_atomic_helper_plane_duplicate_state to the symbol list
In commit b04b69819b ("drm/virtio: New fence for every plane update"),
the virtio driver calls __drm_atomic_helper_plane_destroy_state so that
function needs to be added to the gki symbol list for the virtual device
target in order to build it properly.

Fixes: b04b69819b ("drm/virtio: New fence for every plane update")
Change-Id: If3eee2d868d82be8178ff0e22ad613a6ed215a75
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-10 10:44:03 +00:00
Bence Csókás
0986efc3c7 spi: atmel-qspi: Memory barriers after memory-mapped I/O
[ Upstream commit be92ab2de0ee1a13291c3b47b2d7eb24d80c0a2c ]

The QSPI peripheral control and status registers are
accessible via the SoC's APB bus, whereas MMIO transactions'
data travels on the AHB bus.

Microchip documentation and even sample code from Atmel
emphasises the need for a memory barrier before the first
MMIO transaction to the AHB-connected QSPI, and before the
last write to its registers via APB. This is achieved by
the following lines in `atmel_qspi_transfer()`:

	/* Dummy read of QSPI_IFR to synchronize APB and AHB accesses */
	(void)atmel_qspi_read(aq, QSPI_IFR);

However, the current documentation makes no mention to
synchronization requirements in the other direction, i.e.
after the last data written via AHB, and before the first
register access on APB.

In our case, we were facing an issue where the QSPI peripheral
would cease to send any new CSR (nCS Rise) interrupts,
leading to a timeout in `atmel_qspi_wait_for_completion()`
and ultimately this panic in higher levels:

	ubi0 error: ubi_io_write: error -110 while writing 63108 bytes
 to PEB 491:128, written 63104 bytes

After months of extensive research of the codebase, fiddling
around the debugger with kgdb, and back-and-forth with
Microchip, we came to the conclusion that the issue is
probably that the peripheral is still busy receiving on AHB
when the LASTXFER bit is written to its Control Register
on APB, therefore this write gets lost, and the peripheral
still thinks there is more data to come in the MMIO transfer.
This was first formulated when we noticed that doubling the
write() of QSPI_CR_LASTXFER seemed to solve the problem.

Ultimately, the solution is to introduce memory barriers
after the AHB-mapped MMIO transfers, to ensure ordering.

Fixes: d5433def31 ("mtd: spi-nor: atmel-quadspi: Add spi-mem support to atmel-quadspi")
Cc: Hari.PrasathGE@microchip.com
Cc: Mahesh.Abotula@microchip.com
Cc: Marco.Cardellini@microchip.com
Cc: stable@vger.kernel.org # c0a0203cf579: ("spi: atmel-quadspi: Create `atmel_qspi_ops`"...)
Cc: stable@vger.kernel.org # 6.x.y
Signed-off-by: Bence Csókás <csokas.bence@prolan.hu>
Link: https://patch.msgid.link/20241219091258.395187-1-csokas.bence@prolan.hu
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:29 +01:00
Chen Ridong
0a09d56e16 memcg: fix soft lockup in the OOM process
[ Upstream commit ade81479c7dda1ce3eedb215c78bc615bbd04f06 ]

A soft lockup issue was found in the product with about 56,000 tasks were
in the OOM cgroup, it was traversing them when the soft lockup was
triggered.

watchdog: BUG: soft lockup - CPU#2 stuck for 23s! [VM Thread:1503066]
CPU: 2 PID: 1503066 Comm: VM Thread Kdump: loaded Tainted: G
Hardware name: Huawei Cloud OpenStack Nova, BIOS
RIP: 0010:console_unlock+0x343/0x540
RSP: 0000:ffffb751447db9a0 EFLAGS: 00000247 ORIG_RAX: ffffffffffffff13
RAX: 0000000000000001 RBX: 0000000000000000 RCX: 00000000ffffffff
RDX: 0000000000000000 RSI: 0000000000000004 RDI: 0000000000000247
RBP: ffffffffafc71f90 R08: 0000000000000000 R09: 0000000000000040
R10: 0000000000000080 R11: 0000000000000000 R12: ffffffffafc74bd0
R13: ffffffffaf60a220 R14: 0000000000000247 R15: 0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f2fe6ad91f0 CR3: 00000004b2076003 CR4: 0000000000360ee0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
 vprintk_emit+0x193/0x280
 printk+0x52/0x6e
 dump_task+0x114/0x130
 mem_cgroup_scan_tasks+0x76/0x100
 dump_header+0x1fe/0x210
 oom_kill_process+0xd1/0x100
 out_of_memory+0x125/0x570
 mem_cgroup_out_of_memory+0xb5/0xd0
 try_charge+0x720/0x770
 mem_cgroup_try_charge+0x86/0x180
 mem_cgroup_try_charge_delay+0x1c/0x40
 do_anonymous_page+0xb5/0x390
 handle_mm_fault+0xc4/0x1f0

This is because thousands of processes are in the OOM cgroup, it takes a
long time to traverse all of them.  As a result, this lead to soft lockup
in the OOM process.

To fix this issue, call 'cond_resched' in the 'mem_cgroup_scan_tasks'
function per 1000 iterations.  For global OOM, call
'touch_softlockup_watchdog' per 1000 iterations to avoid this issue.

Link: https://lkml.kernel.org/r/20241224025238.3768787-1-chenridong@huaweicloud.com
Fixes: 9cbb78bb31 ("mm, memcg: introduce own oom handler to iterate only over its own threads")
Signed-off-by: Chen Ridong <chenridong@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:29 +01:00
Csókás, Bence
c788bfef89 spi: atmel-quadspi: Create atmel_qspi_ops to support newer SoC families
[ Upstream commit c0a0203cf57963792d59b3e4317a1d07b73df42a ]

Refactor the code to introduce an ops struct, to prepare for merging
support for later SoCs, such as SAMA7G5. This code was based on the
vendor's kernel (linux4microchip). Cc'ing original contributors.

Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
Link: https://patch.msgid.link/20241128174316.3209354-2-csokas.bence@prolan.hu
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: be92ab2de0ee ("spi: atmel-qspi: Memory barriers after memory-mapped I/O")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:29 +01:00
Yang Yingliang
756bb7c73f spi: atmel-quadspi: switch to use modern name
[ Upstream commit ccbc6554ed ]

Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230110131805.2827248-4-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: be92ab2de0ee ("spi: atmel-qspi: Memory barriers after memory-mapped I/O")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:29 +01:00
Tudor Ambarus
baaad6765a spi: atmel-quadspi: Add support for configuring CS timing
[ Upstream commit f732646d0c ]

The at91 QSPI IP uses a default value of half of the period of the QSPI
clock period for the cs-setup time, which is not always enough, an example
being the sst26vf064b SPI NOR flash which requires a minimum cs-setup time
of 5 ns. It was observed that none of the at91 SoCs can fulfill the
minimum CS setup time for the aforementioned flash, as they operate at
high frequencies and half a period does not suffice for the required CS
setup time. Add support for configuring the CS timing in the controller.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20221117105249.115649-5-tudor.ambarus@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: be92ab2de0ee ("spi: atmel-qspi: Memory barriers after memory-mapped I/O")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:29 +01:00
Carlos Galo
2ea4658783 mm: update mark_victim tracepoints fields
[ Upstream commit 72ba14deb40a9e9668ec5e66a341ed657e5215c2 ]

The current implementation of the mark_victim tracepoint provides only the
process ID (pid) of the victim process.  This limitation poses challenges
for userspace tools requiring real-time OOM analysis and intervention.
Although this information is available from the kernel logs, it’s not
the appropriate format to provide OOM notifications.  In Android, BPF
programs are used with the mark_victim trace events to notify userspace of
an OOM kill.  For consistency, update the trace event to include the same
information about the OOMed victim as the kernel logs.

- UID
   In Android each installed application has a unique UID. Including
   the `uid` assists in correlating OOM events with specific apps.

- Process Name (comm)
   Enables identification of the affected process.

- OOM Score
  Will allow userspace to get additional insight of the relative kill
  priority of the OOM victim. In Android, the oom_score_adj is used to
  categorize app state (foreground, background, etc.), which aids in
  analyzing user-perceptible impacts of OOM events [1].

- Total VM, RSS Stats, and pgtables
  Amount of memory used by the victim that will, potentially, be freed up
  by killing it.

[1] 246dc8fc95:frameworks/base/services/core/java/com/android/server/am/ProcessList.java;l=188-283
Signed-off-by: Carlos Galo <carlosgalo@google.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: ade81479c7dd ("memcg: fix soft lockup in the OOM process")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:28 +01:00
Yu Kuai
032fa54f48 md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime
[ Upstream commit 8d28d0ddb986f56920ac97ae704cc3340a699a30 ]

After commit ec6bb299c7c3 ("md/md-bitmap: add 'sync_size' into struct
md_bitmap_stats"), following panic is reported:

Oops: general protection fault, probably for non-canonical address
RIP: 0010:bitmap_get_stats+0x2b/0xa0
Call Trace:
 <TASK>
 md_seq_show+0x2d2/0x5b0
 seq_read_iter+0x2b9/0x470
 seq_read+0x12f/0x180
 proc_reg_read+0x57/0xb0
 vfs_read+0xf6/0x380
 ksys_read+0x6c/0xf0
 do_syscall_64+0x82/0x170
 entry_SYSCALL_64_after_hwframe+0x76/0x7e

Root cause is that bitmap_get_stats() can be called at anytime if mddev
is still there, even if bitmap is destroyed, or not fully initialized.
Deferenceing bitmap in this case can crash the kernel. Meanwhile, the
above commit start to deferencing bitmap->storage, make the problem
easier to trigger.

Fix the problem by protecting bitmap_get_stats() with bitmap_info.mutex.

Cc: stable@vger.kernel.org # v6.12+
Fixes: 32a7627cf3 ("[PATCH] md: optimised resync using Bitmap based intent logging")
Reported-and-tested-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Closes: https://lore.kernel.org/linux-raid/ca3a91a2-50ae-4f68-b317-abd9889f3907@oracle.com/T/#m6e5086c95201135e4941fe38f9efa76daf9666c5
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20250124092055.4050195-1-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:28 +01:00
Yu Kuai
249d9b9da2 md/md-bitmap: add 'sync_size' into struct md_bitmap_stats
[ Upstream commit ec6bb299c7c3dd4ca1724d13d5f5fae3ee54fc65 ]

To avoid dereferencing bitmap directly in md-cluster to prepare
inventing a new bitmap.

BTW, also fix following checkpatch warnings:

WARNING: Deprecated use of 'kmap_atomic', prefer 'kmap_local_page' instead
WARNING: Deprecated use of 'kunmap_atomic', prefer 'kunmap_local' instead

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-7-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>
Stable-dep-of: 8d28d0ddb986 ("md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:28 +01:00
Yu Kuai
e83e6ea589 md/md-cluster: fix spares warnings for __le64
[ Upstream commit 82697ccf7e495c1ba81e315c2886d6220ff84c2c ]

drivers/md/md-cluster.c:1220:22: warning: incorrect type in assignment (different base types)
drivers/md/md-cluster.c:1220:22:    expected unsigned long my_sync_size
drivers/md/md-cluster.c:1220:22:    got restricted __le64 [usertype] sync_size
drivers/md/md-cluster.c:1252:35: warning: incorrect type in assignment (different base types)
drivers/md/md-cluster.c:1252:35:    expected unsigned long sync_size
drivers/md/md-cluster.c:1252:35:    got restricted __le64 [usertype] sync_size
drivers/md/md-cluster.c:1253:41: warning: restricted __le64 degrades to integer

Fix the warnings by using le64_to_cpu() to convet __le64 to integer.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-6-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>
Stable-dep-of: 8d28d0ddb986 ("md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:28 +01:00
Yu Kuai
e5c4b7b19b md/md-bitmap: replace md_bitmap_status() with a new helper md_bitmap_get_stats()
[ Upstream commit 38f287d7e495ae00d4481702f44ff7ca79f5c9bc ]

There are no functional changes, and the new helper will be used in
multiple places in following patches to avoid dereferencing bitmap
directly.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-3-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>
Stable-dep-of: 8d28d0ddb986 ("md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2025-03-07 16:56:28 +01:00
Catalin Marinas
a27c597f26 arm64: mte: Do not allow PROT_MTE on MAP_HUGETLB user mappings
PROT_MTE (memory tagging extensions) is not supported on all user mmap()
types for various reasons (memory attributes, backing storage, CoW
handling). The arm64 arch_validate_flags() function checks whether the
VM_MTE_ALLOWED flag has been set for a vma during mmap(), usually by
arch_calc_vm_flag_bits().

Linux prior to 6.13 does not support PROT_MTE hugetlb mappings. This was
added by commit 25c17c4b55de ("hugetlb: arm64: add mte support").
However, earlier kernels inadvertently set VM_MTE_ALLOWED on
(MAP_ANONYMOUS | MAP_HUGETLB) mappings by only checking for
MAP_ANONYMOUS.

Explicitly check MAP_HUGETLB in arch_calc_vm_flag_bits() and avoid
setting VM_MTE_ALLOWED for such mappings.

Fixes: 9f3419315f ("arm64: mte: Add PROT_MTE support to mmap() and mprotect()")
Cc: <stable@vger.kernel.org> # 5.10.x-6.12.x
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2025-03-07 16:56:28 +01:00
Greg Kroah-Hartman
96d435eb13 Revert "exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case"
This reverts commit b45605fac3 which is
commit 543841d1806029889c2f69f040e88b247aba8e22 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I22e4874caa735da68f10a3d6477069f24bc0462d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 14:53:08 +00:00
Greg Kroah-Hartman
ac6e319e7c Merge b3847b6622 ("iommu/arm-smmu-v3: Clean up more on probe failure") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: Ibfe96f79401fb2bf536c39c9a473a784e0543ea2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 14:52:54 +00:00
Greg Kroah-Hartman
fd1d84ca7a Revert "mptcp: handle fastopen disconnect correctly"
This reverts commit 73e268b4be which is
commit 619af16b3b57a3a4ee50b9a30add9ff155541e71 upstream.

It breaks the Android kernel build and can be brought back in the future
in an safe way if it is really needed.

Bug: 161946584
Change-Id: Ice4a456e51817eb48fad85c2ae048a88338807ef
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 14:49:39 +00:00
Greg Kroah-Hartman
f6d414dac6 Merge 73e268b4be ("mptcp: handle fastopen disconnect correctly") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I2083da426f991e78e8ec6afbd498445f63717263
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 14:48:41 +00:00
Greg Kroah-Hartman
a32de01c74 Merge 3b5332d416 ("mptcp: consolidate suboption status") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I26ab839e8edf228edbec0cddd53d59fca6075594
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 14:46:15 +00:00
Greg Kroah-Hartman
44b6a8ed8f Revert "usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS"
This reverts commit 4953207927 which is
commit 4d27afbf256028a1f54363367f30efc8854433c3 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I6b743cfeb8ce98af2f957100d6a32ab4ea4bf515
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 09:50:19 +00:00
Greg Kroah-Hartman
66c6868930 Merge 4953207927 ("usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/typec/tcpm/tcpci.c
	drivers/usb/typec/tcpm/tcpm.c

Change-Id: Id20ff6e44155d868c2542d94a30131d8658800c2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:53:02 +00:00
Greg Kroah-Hartman
6e376e10ea Merge 17d426628c ("usb: typec: tcpm: set SRC_SEND_CAPABILITIES timeout to PD_T_SENDER_RESPONSE") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/dwc3/core.c

Change-Id: I2c283da276b9179cd76403d2fa83da077615d0be
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:37:04 +00:00
Greg Kroah-Hartman
11cb0c5d29 Merge 2c3e83538f ("usb: gadget: f_tcm: Fix Get/SetInterface return value") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: Id44c263751cf95215390ad95c101ec68edf461ed
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:34:36 +00:00
Greg Kroah-Hartman
c6490faa0a Merge 93a56dbe12 ("drivers/card_reader/rtsx_usb: Restore interrupt based detection") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/host/xhci-ring.c

Change-Id: Ie123285eab89802392003b95ec495b21820ad41b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:31:24 +00:00
Greg Kroah-Hartman
9fb90380c1 Merge e10b392a74 ("net: usb: rtl8150: enable basic endpoint checking") into android14-6.1-lts
Steps on the way to 6.1.129

Resolves merge conflicts in:
	scripts/Makefile.lib

Change-Id: Id496f510e74b8576bd71449bf8ffa338072eb8e4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:11:45 +00:00
Greg Kroah-Hartman
015c802557 Merge ad8f71d64a ("tools/bootconfig: Fix the wrong format specifier") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I30bcf71d285ba65a092b9a4899532cde31208c48
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:09:42 +00:00
Greg Kroah-Hartman
3e716b1ee2 Revert "bpf: tcp: Mark bpf_load_hdr_opt() arg2 as read-write"
This reverts commit 8f7cc7c763 which is
commit 8ac412a3361173e3000b16167af3d1f6f90af613 upstream.

It breaks the Android kernel build and can be brought back in the future
in an build-safe way if it is really needed.

Bug: 161946584
Change-Id: I150a126d974ab67537cdb11d1348441834b154c5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:07:24 +00:00
Greg Kroah-Hartman
9775060702 Merge 8f7cc7c763 ("bpf: tcp: Mark bpf_load_hdr_opt() arg2 as read-write") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I624b68d0d97588c1934baa197d65c1a48c05ae34
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:06:49 +00:00
Greg Kroah-Hartman
0bc46e8fb4 Merge be42a09fe8 ("bpf: Send signals asynchronously if !preemptible") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: Ibd1adb3cc93660336fe0bd65b91d65f4ca1e0fcb
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-07 08:04:25 +00:00
Greg Kroah-Hartman
0d704e39b1 Merge e397ad3f16 ("ASoC: Intel: avs: Fix theoretical infinite loop") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I1dccc0094c873f1be70ee97b941f74b5ace58e1e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:49:40 +00:00
Greg Kroah-Hartman
759b090e5d Merge 220883fba3 ("HID: hid-thrustmaster: Fix warning in thrustmaster_probe by adding endpoint check") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I12ddac7329f6db60e21f195f3e500ac786f2db7c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:48:15 +00:00
Greg Kroah-Hartman
ef5c5ad7df Merge 0f1719a2ba ("genirq: Make handle_enforce_irqctx() unconditionally available") into android14-6.1-lts
Steps on the way to 6.1.129

Change-Id: I2092799139b4c393c1c99953d110500920fa3200
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:35:22 +00:00
Greg Kroah-Hartman
309e9dd394 Revert "OPP: Rearrange entries in pm_opp.h"
This reverts commit 4dff070117 which is
commit 754833b319 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Iee1382014bb394455d5d39e5dee9a036e8988cae
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:34:59 +00:00
Greg Kroah-Hartman
4fd8e25317 Revert "OPP: Introduce dev_pm_opp_find_freq_{ceil/floor}_indexed() APIs"
This reverts commit 92fcb46659 which is
commit 142e17c1c2 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I1af7c9d9e49c81fae8706dc5fcb1f80e5aaac0b0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:34:58 +00:00
Greg Kroah-Hartman
44a6d4af33 Revert "OPP: Introduce dev_pm_opp_get_freq_indexed() API"
This reverts commit 7f73098bc6 which is
commit 5f756d03e2 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I2e361b5c7e9306d76e606eaa5eb1fa87af5eed28
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-03-06 08:34:58 +00:00