6.6.34-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 6.6.34-rc1 review
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.6.34-rc1
Paolo Abeni <[email protected]>
selftests: net: more strict check in net_helper
Enzo Matsumiya <[email protected]>
smb: client: fix deadlock in smb2_find_smb_tcon()
Puranjay Mohan <[email protected]>
powerpc/bpf: enforce full ordering for ATOMIC operations with BPF_FETCH
Hari Bathini <[email protected]>
powerpc/64/bpf: fix tail calls for PCREL addressing
Takashi Iwai <[email protected]>
ALSA: seq: Fix incorrect UMP type for system messages
Filipe Manana <[email protected]>
btrfs: fix leak of qgroup extent records after transaction abort
Omar Sandoval <[email protected]>
btrfs: fix crash on racing fsync and size-extending write into prealloc
Steven Rostedt (Google) <[email protected]>
tracefs: Clear EVENT_INODE flag in tracefs_drop_inode()
Steven Rostedt (Google) <[email protected]>
eventfs: Keep the directories from having the same inode number as files
Hao Ge <[email protected]>
eventfs: Fix a possible null pointer dereference in eventfs_find_events()
Anna Schumaker <[email protected]>
NFS: Fix READ_PLUS when server doesn't support OP_READ_PLUS
Sergey Shtylyov <[email protected]>
nfs: fix undefined behavior in nfs_block_bits()
Ilpo Järvinen <[email protected]>
EDAC/igen6: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <[email protected]>
EDAC/amd64: Convert PCIBIOS_* return codes to errnos
Takashi Iwai <[email protected]>
ALSA: ump: Don't accept an invalid UMP protocol number
Takashi Iwai <[email protected]>
ALSA: ump: Don't clear bank selection after sending a program change
Peter Ujfalusi <[email protected]>
ASoC: SOF: ipc4-topology: Fix input format query of process modules without base extension
dicken.ding <[email protected]>
genirq/irqdesc: Prevent use-after-free in irq_find_at_or_after()
Frank Li <[email protected]>
i3c: master: svc: fix invalidate IBI type and miss call client IBI handler
Harald Freudenberger <[email protected]>
s390/cpacf: Make use of invalid opcode produce a link error
Harald Freudenberger <[email protected]>
s390/cpacf: Split and rework cpacf query functions
Harald Freudenberger <[email protected]>
s390/ap: Fix crash in AP internal function modify_bitmap()
Helge Deller <[email protected]>
parisc: Define sigset_t in parisc uapi header
Helge Deller <[email protected]>
parisc: Define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
Krzysztof Kozlowski <[email protected]>
ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat
Krzysztof Kozlowski <[email protected]>
ARM: dts: samsung: smdk4412: fix keypad no-autorepeat
Krzysztof Kozlowski <[email protected]>
ARM: dts: samsung: smdkv310: fix keypad no-autorepeat
Shengyu Qu <[email protected]>
riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board
Baokun Li <[email protected]>
ext4: fix mb_cache_entry's e_refcnt leak in ext4_xattr_block_cache_find()
Baokun Li <[email protected]>
ext4: set type of ac_groups_linear_remaining to __u32 to avoid overflow
Ritesh Harjani (IBM) <[email protected]>
ext4: Fixes len calculation in mpage_journal_page_buffers
Lang Yu <[email protected]>
drm/amdkfd: handle duplicate BOs in reserve_bo_and_cond_vms
Mike Gilbert <[email protected]>
sparc: move struct termio to asm/termios.h
Hui Wang <[email protected]>
e1000e: move force SMBUS near the end of enable_ulp function
Eric Dumazet <[email protected]>
net: fix __dst_negative_advice() race
Daniel Thompson <[email protected]>
kdb: Use format-specifiers rather than memset() for padding in kdb_read()
Daniel Thompson <[email protected]>
kdb: Merge identical case statements in kdb_read()
Daniel Thompson <[email protected]>
kdb: Fix console handling when editing and tab-completing commands
Daniel Thompson <[email protected]>
kdb: Use format-strings rather than '\0' injection in kdb_read()
Daniel Thompson <[email protected]>
kdb: Fix buffer overflow during tab-complete
Dmitry Baryshkov <[email protected]>
wifi: ath10k: fix QCOM_RPROC_COMMON dependency
Tony Battersby <[email protected]>
bonding: fix oops during rmmod
Judith Mendez <[email protected]>
watchdog: rti_wdt: Set min_hw_heartbeat_ms to accommodate a safety margin
Michael Ellerman <[email protected]>
selftests/mm: fix build warnings on ppc64
Dev Jain <[email protected]>
selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages
Hailong.Liu <[email protected]>
mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL
Yuanyuan Zhong <[email protected]>
mm: /proc/pid/smaps_rollup: avoid skipping vma after getting mmap_lock again
Frank van der Linden <[email protected]>
mm/hugetlb: pass correct order_per_bit to cma_declare_contiguous_nid
Frank van der Linden <[email protected]>
mm/cma: drop incorrect alignment check in cma_init_reserved_mem
Sam Ravnborg <[email protected]>
sparc64: Fix number of online CPUs
John Kacur <[email protected]>
rtla/timerlat: Fix histogram report when a cpu count is 0
Alexander Shishkin <[email protected]>
intel_th: pci: Add Meteor Lake-S CPU support
Dhananjay Ugwekar <[email protected]>
cpufreq: amd-pstate: Fix the inconsistency in max frequency units
Jan Beulich <[email protected]>
tpm_tis: Do *not* flush uninitialized work
Alexander Potapenko <[email protected]>
kmsan: do not wipe out origin when doing partial unpoisoning
Chengming Zhou <[email protected]>
mm/ksm: fix ksm_zero_pages accounting
Chengming Zhou <[email protected]>
mm/ksm: fix ksm_pages_scanned accounting
Nikita Zhandarovich <[email protected]>
net/9p: fix uninit-value in p9_client_rpc()
xu xin <[email protected]>
net/ipv6: Fix route deleting failure when metric equals 0
Martin K. Petersen <[email protected]>
scsi: core: Handle devices which return an unusually large VPD page count
Johan Hovold <[email protected]>
HID: i2c-hid: elan: fix reset suspend current leakage
Hamish Martin <[email protected]>
i2c: acpi: Unbind mux adapters before delete
Xu Yang <[email protected]>
iomap: fault in smaller chunks for non-large folio mappings
Xu Yang <[email protected]>
filemap: add helper mapping_max_folio_size()
Ryan Roberts <[email protected]>
mm: fix race between __split_huge_pmd_locked() and GUP-fast
Nathan Chancellor <[email protected]>
kbuild: Remove support for Clang's ThinLTO caching
Herbert Xu <[email protected]>
crypto: qat - Fix ADF_DEV_RESET_SYNC memory leak
Vitaly Chikunov <[email protected]>
crypto: ecrdsa - Fix module auto-load on add_key
Stefan Berger <[email protected]>
crypto: ecdsa - Fix module auto-load on add-key
Gabor Juhos <[email protected]>
clk: qcom: clk-alpha-pll: fix rate setting for Stromer PLLs
Nathan Chancellor <[email protected]>
clk: bcm: rpi: Assign ->num before accessing ->hws
Nathan Chancellor <[email protected]>
clk: bcm: dvp: Assign ->num before accessing ->hws
Jiaxun Yang <[email protected]>
LoongArch: Override higher address bits in JUMP_VIRT_ADDR
Jiaxun Yang <[email protected]>
LoongArch: Add all CPUs enabled by fdt to NUMA node 0
Marc Zyngier <[email protected]>
KVM: arm64: AArch32: Fix spurious trapping of conditional instructions
Marc Zyngier <[email protected]>
KVM: arm64: Allow AArch32 PSTATE.M to be restored as System mode
Marc Zyngier <[email protected]>
KVM: arm64: Fix AArch32 register narrowing on userspace write
Sean Christopherson <[email protected]>
KVM: SVM: WARN on vNMI + NMI window iff NMIs are outright masked
Alex Deucher <[email protected]>
Revert "drm/amdkfd: fix gfx_target_version for certain 11.0.3 devices"
Mario Limonciello <[email protected]>
drm/amd: Fix shutdown (again) on some SMU v13.0.4/11 platforms
Dominique Martinet <[email protected]>
9p: add missing locking around taking dentry fid list
Li Ma <[email protected]>
drm/amdgpu/atomfirmware: add intergrated info v2.3 table
Cai Xinchen <[email protected]>
fbdev: savage: Handle err return when savagefb_check_var failed
Thomas Zimmermann <[email protected]>
drm/fbdev-generic: Do not set physical framebuffer address
Hans de Goede <[email protected]>
mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
Hans de Goede <[email protected]>
mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
Hans de Goede <[email protected]>
mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working
Hans de Goede <[email protected]>
mmc: sdhci-acpi: Sort DMI quirks alphabetically
Adrian Hunter <[email protected]>
mmc: sdhci: Add support for "Tuning Error" interrupts
Hans de Goede <[email protected]>
mmc: core: Add mmc_gpiod_set_cd_config() function
Uwe Kleine-König <[email protected]>
mmc: davinci: Don't strip remove function when driver is builtin
Alexander Stein <[email protected]>
media: v4l: async: Fix notifier list entry init
Sakari Ailus <[email protected]>
media: v4l: async: Don't set notifier's V4L2 device if registering fails
Sakari Ailus <[email protected]>
media: v4l: async: Properly re-initialise notifier entry in unregister
Hans Verkuil <[email protected]>
media: v4l2-core: hold videodev_lock until dev reg, finishes
Nathan Chancellor <[email protected]>
media: mxl5xx: Move xpt structures off stack
Hans Verkuil <[email protected]>
media: mc: mark the media devnode as registered from the, start
Tomi Valkeinen <[email protected]>
media: mc: Fix graph walk in media_pipeline_start
Max Krummenacher <[email protected]>
arm64: dts: ti: verdin-am62: Set memory size to 2gb
Yang Xiwen <[email protected]>
arm64: dts: hi3798cv200: fix the size of GICR
Johan Hovold <[email protected]>
arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP
Bitterblue Smith <[email protected]>
wifi: rtlwifi: rtl8192de: Fix endianness issue in RX path
Bitterblue Smith <[email protected]>
wifi: rtlwifi: rtl8192de: Fix low speed with WPA3-SAE
Bitterblue Smith <[email protected]>
wifi: rtlwifi: rtl8192de: Fix 5 GHz TX power
Bitterblue Smith <[email protected]>
wifi: rtl8xxxu: Fix the TX power of RTL8192CU, RTL8723AU
Ping-Ke Shih <[email protected]>
wifi: rtw89: pci: correct TX resource checking for PCI DMA channel of firmware command
Yu Kuai <[email protected]>
md/raid5: fix deadlock that raid5d() wait for itself to clear MD_SB_CHANGE_PENDING
Johan Hovold <[email protected]>
arm64: dts: qcom: qcs404: fix bluetooth device address
Krzysztof Kozlowski <[email protected]>
arm64: tegra: Correct Tegra132 I2C alias
Christoffer Sandberg <[email protected]>
ACPI: resource: Do IRQ override on TongFang GXxHRXx and GMxHGxx
Maulik Shah <[email protected]>
soc: qcom: rpmh-rsc: Enhance check for VRM in-flight request
Konrad Dybcio <[email protected]>
thermal/drivers/qcom/lmh: Check for SCM availability at probe
Karthikeyan Ramasubramanian <[email protected]>
platform/chrome: cros_ec: Handle events during suspend after resume completion
Tyler Hicks (Microsoft) <[email protected]>
proc: Move fdinfo PTRACE_MODE_READ check into the inode .permission operation
Eric Biggers <[email protected]>
fsverity: use register_sysctl_init() to avoid kmemleak warning
Sergey Shtylyov <[email protected]>
ata: pata_legacy: make legacy_exit() work again
Ping-Ke Shih <[email protected]>
wifi: rtw89: correct aSIFSTime for 6GHz band
Matthew Mirvish <[email protected]>
bcache: fix variable length array abuse in btree_iter
Bob Zhou <[email protected]>
drm/amdgpu: add error handle to avoid out-of-bounds
Zheyu Ma <[email protected]>
media: lgdt3306a: Add a check against null-pointer-def
Chao Yu <[email protected]>
f2fs: fix to do sanity check on i_xattr_nid in sanity_check_inode()
Maxime Ripard <[email protected]>
drm/sun4i: hdmi: Move mode_set into enable
Maxime Ripard <[email protected]>
drm/sun4i: hdmi: Convert encoder to atomic
Po-Hsu Lin <[email protected]>
selftests: net: List helper scripts in TEST_FILES Makefile variable
Po-Hsu Lin <[email protected]>
selftests: net: included needed helper in the install targets
Po-Hsu Lin <[email protected]>
selftests/net: synchronize udpgro tests' tx and rx connection
Daniel Borkmann <[email protected]>
vxlan: Fix regression when dropping packets due to invalid src addresses
Shakeel Butt <[email protected]>
mm: ratelimit stat flush from workingset shrinker
Gao Xiang <[email protected]>
erofs: avoid allocating DEFLATE streams before mounting
Matthieu Baerts (NGI0) <[email protected]>
mptcp: fix full TCP keep-alive support
Paolo Abeni <[email protected]>
mptcp: cleanup SOL_TCP handling
Paolo Abeni <[email protected]>
mptcp: avoid some duplicate code in socket option handling
Haorong Lu <[email protected]>
riscv: signal: handle syscall restart before get_signal
Russell King (Oracle) <[email protected]>
net: sfp-bus: fix SFP mode detect from bitrate
Marc Dionne <[email protected]>
afs: Don't cross .backup mountpoint from backup volume
Jorge Ramirez-Ortiz <[email protected]>
mmc: core: Do not force a retune before RPMB switch
Ashutosh Dixit <[email protected]>
drm/i915/hwmon: Get rid of devm
-------------
Diffstat:
Documentation/mm/arch_pgtable_helpers.rst | 6 +- Makefile | 9 +- arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 2 +- arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 5 + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 2 +- arch/arm64/kvm/guest.c | 3 +- arch/arm64/kvm/hyp/aarch32.c | 18 ++- arch/loongarch/include/asm/numa.h | 1 + arch/loongarch/include/asm/stackframe.h | 2 +- arch/loongarch/kernel/smp.c | 5 +- arch/parisc/include/asm/page.h | 1 + arch/parisc/include/asm/signal.h | 12 -- arch/parisc/include/uapi/asm/signal.h | 10 ++ arch/powerpc/mm/book3s64/pgtable.c | 1 + arch/powerpc/net/bpf_jit_comp32.c | 12 ++ arch/powerpc/net/bpf_jit_comp64.c | 42 ++++--- .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 - arch/riscv/kernel/signal.c | 95 ++++++++-------- arch/s390/include/asm/cpacf.h | 109 ++++++++++++++---- arch/s390/include/asm/pgtable.h | 4 +- arch/sparc/include/asm/smp_64.h | 2 - arch/sparc/include/uapi/asm/termbits.h | 10 -- arch/sparc/include/uapi/asm/termios.h | 9 ++ arch/sparc/kernel/prom_64.c | 4 +- arch/sparc/kernel/setup_64.c | 1 - arch/sparc/kernel/smp_64.c | 14 --- arch/sparc/mm/tlb.c | 1 + arch/x86/kvm/svm/svm.c | 27 +++-- arch/x86/mm/pgtable.c | 2 + crypto/ecdsa.c | 3 + crypto/ecrdsa.c | 1 + drivers/acpi/resource.c | 12 ++ drivers/ata/pata_legacy.c | 8 +- drivers/char/tpm/tpm_tis_core.c | 3 +- drivers/clk/bcm/clk-bcm2711-dvp.c | 3 +- drivers/clk/bcm/clk-raspberrypi.c | 2 +- drivers/clk/qcom/clk-alpha-pll.c | 2 + drivers/cpufreq/amd-pstate.c | 2 +- drivers/crypto/intel/qat/qat_common/adf_aer.c | 19 +--- drivers/edac/amd64_edac.c | 8 +- drivers/edac/igen6_edac.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 15 +++ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 +- drivers/gpu/drm/amd/include/atomfirmware.h | 43 +++++++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 20 ++-- drivers/gpu/drm/drm_fbdev_generic.c | 1 - drivers/gpu/drm/i915/i915_hwmon.c | 46 +++++--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 47 ++++---- drivers/hid/i2c-hid/i2c-hid-of-elan.c | 59 ++++++++-- drivers/hwtracing/intel_th/pci.c | 5 + drivers/i2c/i2c-core-acpi.c | 19 +++- drivers/i3c/master/svc-i3c-master.c | 16 ++- drivers/md/bcache/bset.c | 44 ++++---- drivers/md/bcache/bset.h | 28 +++-- drivers/md/bcache/btree.c | 40 +++---- drivers/md/bcache/super.c | 5 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/bcache/writeback.c | 10 +- drivers/md/raid5.c | 15 +-- drivers/media/dvb-frontends/lgdt3306a.c | 5 + drivers/media/dvb-frontends/mxl5xx.c | 22 ++-- drivers/media/mc/mc-devnode.c | 5 +- drivers/media/mc/mc-entity.c | 6 + drivers/media/v4l2-core/v4l2-async.c | 12 +- drivers/media/v4l2-core/v4l2-dev.c | 3 + drivers/mmc/core/host.c | 3 +- drivers/mmc/core/slot-gpio.c | 20 ++++ drivers/mmc/host/davinci_mmc.c | 4 +- drivers/mmc/host/sdhci-acpi.c | 61 +++++++++- drivers/mmc/host/sdhci.c | 10 +- drivers/mmc/host/sdhci.h | 3 +- drivers/net/bonding/bond_main.c | 13 ++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 22 ++++ drivers/net/ethernet/intel/e1000e/netdev.c | 18 --- drivers/net/phy/sfp-bus.c | 8 +- drivers/net/vxlan/vxlan_core.c | 4 - drivers/net/wireless/ath/ath10k/Kconfig | 1 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 25 ++--- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 21 ++-- .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 79 ++++--------- drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- drivers/net/wireless/realtek/rtw89/pci.c | 3 +- drivers/platform/chrome/cros_ec.c | 16 +-- drivers/s390/crypto/ap_bus.c | 2 +- drivers/scsi/scsi.c | 7 ++ drivers/soc/qcom/cmd-db.c | 32 +++++- drivers/soc/qcom/rpmh-rsc.c | 3 +- drivers/thermal/qcom/lmh.c | 3 + drivers/video/fbdev/savage/savagefb_driver.c | 5 +- drivers/watchdog/rti_wdt.c | 34 +++--- fs/9p/vfs_dentry.c | 9 +- fs/afs/mntpt.c | 5 + fs/btrfs/disk-io.c | 10 +- fs/btrfs/tree-log.c | 17 ++- fs/erofs/decompressor_deflate.c | 55 ++++----- fs/ext4/inode.c | 2 +- fs/ext4/mballoc.h | 2 +- fs/ext4/xattr.c | 4 +- fs/f2fs/inode.c | 6 + fs/iomap/buffered-io.c | 2 +- fs/nfs/internal.h | 4 +- fs/nfs/nfs4proc.c | 2 +- fs/proc/base.c | 2 +- fs/proc/fd.c | 42 ++++--- fs/proc/task_mmu.c | 9 +- fs/smb/client/smb2transport.c | 2 +- fs/tracefs/event_inode.c | 13 ++- fs/tracefs/inode.c | 33 +++--- fs/verity/init.c | 7 +- include/linux/ksm.h | 17 ++- include/linux/mm_types.h | 2 +- include/linux/mmc/slot-gpio.h | 1 + include/linux/pagemap.h | 34 +++--- include/net/dst_ops.h | 2 +- include/net/sock.h | 13 +-- include/soc/qcom/cmd-db.h | 10 +- kernel/debug/kdb/kdb_io.c | 99 ++++++++++------- kernel/irq/irqdesc.c | 5 +- mm/cma.c | 4 - mm/huge_memory.c | 49 ++++---- mm/hugetlb.c | 6 +- mm/kmsan/core.c | 15 ++- mm/ksm.c | 17 ++- mm/pgtable-generic.c | 2 + mm/vmalloc.c | 5 +- mm/workingset.c | 2 +- net/9p/client.c | 2 + net/ipv4/route.c | 22 ++-- net/ipv6/route.c | 34 +++--- net/mptcp/protocol.h | 3 + net/mptcp/sockopt.c | 123 ++++++++++++++------- net/xfrm/xfrm_policy.c | 11 +- sound/core/seq/seq_ump_convert.c | 2 + sound/core/ump.c | 7 ++ sound/core/ump_convert.c | 1 - sound/soc/sof/ipc4-topology.c | 8 ++ tools/testing/selftests/mm/compaction_test.c | 2 + tools/testing/selftests/mm/gup_test.c | 1 + tools/testing/selftests/mm/uffd-common.h | 1 + tools/testing/selftests/net/Makefile | 4 +- tools/testing/selftests/net/net_helper.sh | 25 +++++ tools/testing/selftests/net/udpgro.sh | 13 +-- tools/testing/selftests/net/udpgro_bench.sh | 5 +- tools/testing/selftests/net/udpgro_frglist.sh | 5 +- tools/tracing/rtla/src/timerlat_hist.c | 60 +++++++--- 154 files changed, 1372 insertions(+), 845 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/137 drm/i915/hwmon: Get rid of devm
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ashutosh Dixit <[email protected]>
commit 5bc9de065b8bb9b8dd8799ecb4592d0403b54281 upstream.
When both hwmon and hwmon drvdata (on which hwmon depends) are device managed resources, the expectation, on device unbind, is that hwmon will be released before drvdata. However, in i915 there are two separate code paths, which both release either drvdata or hwmon and either can be released before the other. These code paths (for device unbind) are as follows (see also the bug referenced below):
Call Trace: release_nodes+0x11/0x70 devres_release_group+0xb2/0x110 component_unbind_all+0x8d/0xa0 component_del+0xa5/0x140 intel_pxp_tee_component_fini+0x29/0x40 [i915] intel_pxp_fini+0x33/0x80 [i915] i915_driver_remove+0x4c/0x120 [i915] i915_pci_remove+0x19/0x30 [i915] pci_device_remove+0x32/0xa0 device_release_driver_internal+0x19c/0x200 unbind_store+0x9c/0xb0
and
Call Trace: release_nodes+0x11/0x70 devres_release_all+0x8a/0xc0 device_unbind_cleanup+0x9/0x70 device_release_driver_internal+0x1c1/0x200 unbind_store+0x9c/0xb0
This means that in i915, if use devm, we cannot gurantee that hwmon will always be released before drvdata. Which means that we have a uaf if hwmon sysfs is accessed when drvdata has been released but hwmon hasn't.
The only way out of this seems to be do get rid of devm_ and release/free everything explicitly during device unbind.
v2: Change commit message and other minor code changes
v3: Cleanup from i915_hwmon_register on error (Armin Wolf)
v4: Eliminate potential static analyzer warning (Rodrigo)
Eliminate fetch_and_zero (Jani)
v5: Restore previous logic for ddat_gt->hwmon_dev error return (Andi)
--- drivers/gpu/drm/i915/i915_hwmon.c | 46 ++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_hwmon.c +32 -14
@@ -793,7 +793,7 @@ void i915_hwmon_register(struct drm_i915if (!IS_DGFX (i915))return ; - hwmon =devm_kzalloc (dev,sizeof (*hwmon),GFP_KERNEL ); + hwmon =kzalloc (sizeof (*hwmon),GFP_KERNEL );if (!hwmon)return ;
@@ -819,14 +819,12 @@ void i915_hwmon_register(struct drm_i915hwm_get_preregistration_info (i915);/* hwmon_dev points to device hwmon<i> */ - hwmon_dev =devm_hwmon_device_register_with_info (dev, ddat->name, - ddat, - &hwm_chip_info, - hwm_groups); -if (IS_ERR (hwmon_dev)) { - i915->hwmon =NULL ; -return ; - } + hwmon_dev =hwmon_device_register_with_info (dev, ddat->name, + ddat, + &hwm_chip_info, + hwm_groups); +if (IS_ERR (hwmon_dev)) + goto err; ddat->hwmon_dev = hwmon_dev;
@@ -839,16 +837,36 @@ void i915_hwmon_register(struct drm_i915if (!hwm_gt_is_visible (ddat_gt, hwmon_energy, hwmon_energy_input,0 ))continue ; - hwmon_dev =devm_hwmon_device_register_with_info (dev, ddat_gt->name, - ddat_gt, - &hwm_gt_chip_info, -NULL ); + hwmon_dev =hwmon_device_register_with_info (dev, ddat_gt->name, + ddat_gt, + &hwm_gt_chip_info, +NULL );if (!IS_ERR (hwmon_dev)) ddat_gt->hwmon_dev = hwmon_dev; } +return ; +err: +i915_hwmon_unregister (i915); }void i915_hwmon_unregister (struct drm_i915_private *i915) { -fetch_and_zero (&i915->hwmon); +struct i915_hwmon *hwmon = i915->hwmon; +struct intel_gt *gt; +int i; + +if (!hwmon) +return ; + +for_each_gt (gt, i915, i) +if (hwmon->ddat_gt[i].hwmon_dev) +hwmon_device_unregister (hwmon->ddat_gt[i].hwmon_dev); + +if (hwmon->ddat.hwmon_dev) +hwmon_device_unregister (hwmon->ddat.hwmon_dev); + +mutex_destroy (&hwmon->hwmon_lock); + +kfree (i915->hwmon); + i915->hwmon =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 2/137 mmc: core: Do not force a retune before RPMB switch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jorge Ramirez-Ortiz <[email protected]>
commit 67380251e8bbd3302c64fea07f95c31971b91c22 upstream.
Requesting a retune before switching to the RPMB partition has been observed to cause CRC errors on the RPMB reads (-EILSEQ).
Since RPMB reads can not be retried, the clients would be directly affected by the errors.
This commit disables the retune request prior to switching to the RPMB
partition: mmc_retune_pause() no longer triggers a retune before the pause period begins.
This was verified with the sdhci-of-arasan driver (ZynqMP) configured for HS200 using two separate eMMC cards (DG4064 and 064GB2). In both cases, the error was easy to reproduce triggering every few tenths of reads.
With this commit, systems that were utilizing OP-TEE to access RPMB variables will experience an enhanced performance. Specifically, when OP-TEE is configured to employ RPMB as a secure storage solution, it not only writes the data but also the secure filesystem within the partition. As a result, retrieving any variable involves multiple RPMB reads, typically around five.
For context, on ZynqMP, each retune request consumed approximately 8ms. Consequently, reading any RPMB variable used to take at the very minimum 40ms.
After droping the need to retune before switching to the RPMB partition, this is no longer the case.
--- drivers/mmc/core/host.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mmc/core/host.c +1 -2
@@ -119,13 +119,12 @@ void mmc_retune_enable(struct mmc_host */* * Pause re-tuning for a small set of operations. The pause begins after the -* next command and after first doing re-tuning. +* next command. */ void mmc_retune_pause (struct mmc_host *host) {if (!host->retune_paused) { host->retune_paused =1 ; -mmc_retune_needed (host);mmc_retune_hold (host); } }
Greg Kroah-Hartman
maintainerPATCH 3/137 afs: Dont cross .backup mountpoint from backup volume
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Dionne <[email protected]>
commit 29be9100aca2915fab54b5693309bc42956542e5 upstream.
Don't cross a mountpoint that explicitly specifies a backup volume (target is <vol>.backup) when starting from a backup volume.
It it not uncommon to mount a volume's backup directly in the volume itself. This can cause tools that are not paying attention to get into a loop mounting the volume onto itself as they attempt to traverse the tree, leading to a variety of problems.
This doesn't prevent the general case of loops in a sequence of mountpoints, but addresses a common special case in the same way as other afs clients.
--- fs/afs/mntpt.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/afs/mntpt.c +5 -0
@@ -140,6 +140,11 @@ static int afs_mntpt_set_params(struct fput_page (page);if (ret <0 )return ret; + +/* Don't cross a backup volume mountpoint from a backup volume */ +if (src_as->volume && src_as->volume->type ==AFSVL_BACKVOL && + ctx->type ==AFSVL_BACKVOL ) +return -ENODEV ; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 4/137 net: sfp-bus: fix SFP mode detect from bitrate
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit 97eb5d51b4a584a60e5d096bdb6b33edc9f50d8d upstream.
The referenced commit moved the setting of the Autoneg and pause bits early in sfp_parse_support(). However, we check whether the modes are empty before using the bitrate to set some modes. Setting these bits so early causes that test to always be false, preventing this working, and thus some modules that used to work no longer do.
Move them just before the call to the quirk.
--- drivers/net/phy/sfp-bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/phy/sfp-bus.c +4 -4
@@ -151,10 +151,6 @@ void sfp_parse_support(struct sfp_bus *bunsigned int br_min, br_nom, br_max;__ETHTOOL_DECLARE_LINK_MODE_MASK (modes) = {0 , }; -phylink_set (modes, Autoneg); -phylink_set (modes, Pause); -phylink_set (modes, Asym_Pause); -/* Decode the bitrate information to MBd */ br_min = br_nom = br_max =0 ;if (id->base.br_nominal) {
@@ -339,6 +335,10 @@ void sfp_parse_support(struct sfp_bus *b } } +phylink_set (modes, Autoneg); +phylink_set (modes, Pause); +phylink_set (modes, Asym_Pause); +if (bus->sfp_quirk && bus->sfp_quirk->modes) bus->sfp_quirk->modes (id, modes, interfaces);
Greg Kroah-Hartman
maintainerPATCH 5/137 riscv: signal: handle syscall restart before get_signal
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haorong Lu <[email protected]>
commit ce4f78f1b53d3327fbd32764aa333bf05fb68818 upstream.
In the current riscv implementation, blocking syscalls like read() may not correctly restart after being interrupted by ptrace. This problem arises when the syscall restart process in arch_do_signal_or_restart() is bypassed due to changes to the regs->cause register, such as an ebreak instruction.
Steps to reproduce:
1. Interrupt the tracee process with PTRACE_SEIZE & PTRACE_INTERRUPT.
2. Backup original registers and instruction at new_pc.
3. Change pc to new_pc, and inject an instruction (like ebreak) to this address.
4. Resume with PTRACE_CONT and wait for the process to stop again after executing ebreak.
5. Restore original registers and instructions, and detach from the tracee process.
6. Now the read() syscall in tracee will return -1 with errno set to ERESTARTSYS.
Specifically, during an interrupt, the regs->cause changes from EXC_SYSCALL to EXC_BREAKPOINT due to the injected ebreak, which is inaccessible via ptrace so we cannot restore it. This alteration breaks the syscall restart condition and ends the read() syscall with an ERESTARTSYS error. According to include/linux/errno.h, it should never be seen by user programs. X86 can avoid this issue as it checks the syscall condition using a register (orig_ax) exposed to user space. Arm64 handles syscall restart before calling get_signal, where it could be paused and inspected by ptrace/debugger.
This patch adjusts the riscv implementation to arm64 style, which also checks syscall using a kernel register (syscallno). It ensures the syscall restart process is not bypassed when changes to the cause register occur, providing more consistent behavior across various architectures.
For a simplified reproduction program, feel free to visit:
https://github.com/ancientmodern/riscv-ptrace-bug-demo.
--- arch/riscv/kernel/signal.c | 85 ++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 39 deletions(-)
arch/riscv/kernel/signal.c +46 -39
@@ -384,30 +384,6 @@ static void handle_signal(struct ksignalsigset_t *oldset =sigmask_to_save ();int ret; -/* Are we from a system call? */ -if (regs->cause ==EXC_SYSCALL ) { -/* Avoid additional syscall restarting via ret_from_exception */ - regs->cause =-1UL ; -/* If so, check system call restarting.. */ -switch (regs->a0) { -case -ERESTART_RESTARTBLOCK : -case -ERESTARTNOHAND : - regs->a0 = -EINTR ; -break ; - -case -ERESTARTSYS : -if (!(ksig->ka.sa.sa_flags &SA_RESTART )) { - regs->a0 = -EINTR ; -break ; - } - fallthrough; -case -ERESTARTNOINTR : - regs->a0 = regs->orig_a0; - regs->epc -=0x4 ; -break ; - } - } -rseq_signal_deliver (ksig, regs);/* Set up the stack frame */
@@ -421,36 +397,67 @@ static void handle_signal(struct ksignalvoid arch_do_signal_or_restart (struct pt_regs *regs) { +unsigned long continue_addr =0 , restart_addr =0 ; +int retval =0 ;struct ksignal ksig; +bool syscall = (regs->cause ==EXC_SYSCALL ); -if (get_signal (&ksig)) { -/* Actually deliver the signal */ -handle_signal (&ksig, regs); -return ; - } +/* If we were from a system call, check for system call restarting */ +if (syscall) { + continue_addr = regs->epc; + restart_addr = continue_addr -4 ; + retval = regs->a0; -/* Did we come from a system call? */ -if (regs->cause ==EXC_SYSCALL ) {/* Avoid additional syscall restarting via ret_from_exception */ regs->cause =-1UL ; -/* Restart the system call - no handlers present */ -switch (regs->a0) { +/* +* Prepare for system call restart. We do this here so that a +* debugger will see the already changed PC. +*/ +switch (retval) {case -ERESTARTNOHAND :case -ERESTARTSYS :case -ERESTARTNOINTR : - regs->a0 = regs->orig_a0; - regs->epc -=0x4 ; -break ;case -ERESTART_RESTARTBLOCK : - regs->a0 = regs->orig_a0; - regs->a7 = __NR_restart_syscall; - regs->epc -=0x4 ; + regs->a0 = regs->orig_a0; + regs->epc = restart_addr;break ; } }/* +* Get the signal to deliver. When running under ptrace, at this point +* the debugger may change all of our registers. +*/ +if (get_signal (&ksig)) { +/* +* Depending on the signal settings, we may need to revert the +* decision to restart the system call, but skip this if a +* debugger has chosen to restart at a different PC. +*/ +if (regs->epc == restart_addr && + (retval == -ERESTARTNOHAND || + retval == -ERESTART_RESTARTBLOCK || + (retval == -ERESTARTSYS && + !(ksig.ka.sa.sa_flags &SA_RESTART )))) { + regs->a0 = -EINTR ; + regs->epc = continue_addr; + } + +/* Actually deliver the signal */ +handle_signal (&ksig, regs); +return ; + } + +/* +* Handle restarting a different system call. As above, if a debugger +* has chosen to restart at a different PC, ignore the restart. +*/ +if (syscall && regs->epc == restart_addr && retval == -ERESTART_RESTARTBLOCK ) + regs->a7 = __NR_restart_syscall; + +/* * If there is no signal to deliver, we just put the saved * sigmask back. */
Greg Kroah-Hartman
maintainerPATCH 6/137 mptcp: avoid some duplicate code in socket option handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit a74762675f700a5473ebe54a671a0788a5b23cc9 upstream.
The mptcp_get_int_option() helper is needless open-coded in a couple of places, replace the duplicate code with the helper call.
Stable-dep-of: bd11dc4fb969 ("mptcp: fix full TCP keep-alive support")
--- net/mptcp/sockopt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
net/mptcp/sockopt.c +8 -12
@@ -626,13 +626,11 @@ static int mptcp_setsockopt_sol_tcp_cork {struct mptcp_subflow_context *subflow;struct sock *sk = (struct sock *)msk; -int val; +int val, ret; -if (optlen <sizeof (int )) -return -EINVAL ; - -if (copy_from_sockptr (&val, optval,sizeof (val))) -return -EFAULT ; + ret =mptcp_get_int_option (msk, optval, optlen, &val); +if (ret) +return ret;lock_sock (sk);sockopt_seq_inc (msk);
@@ -656,13 +654,11 @@ static int mptcp_setsockopt_sol_tcp_node {struct mptcp_subflow_context *subflow;struct sock *sk = (struct sock *)msk; -int val; - -if (optlen <sizeof (int )) -return -EINVAL ; +int val, ret; -if (copy_from_sockptr (&val, optval,sizeof (val))) -return -EFAULT ; + ret =mptcp_get_int_option (msk, optval, optlen, &val); +if (ret) +return ret;lock_sock (sk);sockopt_seq_inc (msk);
Greg Kroah-Hartman
maintainerPATCH 7/137 mptcp: cleanup SOL_TCP handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 7f71a337b5152ea0e7bef408d1af53778a919316 upstream.
Most TCP-level socket options get an integer from user space, and set the corresponding field under the msk-level socket lock.
Reduce the code duplication moving such operations in the common code.
Stable-dep-of: bd11dc4fb969 ("mptcp: fix full TCP keep-alive support") [ Without TCP_NOTSENT_LOWAT support, as it is not in this version, see
commit 29b5e5ef8739 ("mptcp: implement TCP_NOTSENT_LOWAT support") ]
--- net/mptcp/sockopt.c | 61 ++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 35 deletions(-)
net/mptcp/sockopt.c +26 -35
@@ -621,18 +621,11 @@ static int mptcp_setsockopt_sol_tcp_congreturn ret; } -static int mptcp_setsockopt_sol_tcp_cork (struct mptcp_sock *msk,sockptr_t optval, -unsigned int optlen) +static int __mptcp_setsockopt_sol_tcp_cork (struct mptcp_sock *msk,int val) {struct mptcp_subflow_context *subflow;struct sock *sk = (struct sock *)msk; -int val, ret; - ret =mptcp_get_int_option (msk, optval, optlen, &val); -if (ret) -return ret; - -lock_sock (sk);sockopt_seq_inc (msk); msk->cork = !!val;mptcp_for_each_subflow (msk, subflow) {
@@ -644,23 +637,15 @@ static int mptcp_setsockopt_sol_tcp_cork }if (!val)mptcp_check_and_set_pending (sk); -release_sock (sk);return 0 ; } -static int mptcp_setsockopt_sol_tcp_nodelay (struct mptcp_sock *msk,sockptr_t optval, -unsigned int optlen) +static int __mptcp_setsockopt_sol_tcp_nodelay (struct mptcp_sock *msk,int val) {struct mptcp_subflow_context *subflow;struct sock *sk = (struct sock *)msk; -int val, ret; - - ret =mptcp_get_int_option (msk, optval, optlen, &val); -if (ret) -return ret; -lock_sock (sk);sockopt_seq_inc (msk); msk->nodelay = !!val;mptcp_for_each_subflow (msk, subflow) {
@@ -672,8 +657,6 @@ static int mptcp_setsockopt_sol_tcp_node }if (val)mptcp_check_and_set_pending (sk); -release_sock (sk); -return 0 ; }
@@ -786,25 +769,10 @@ static int mptcp_setsockopt_sol_tcp(struint ret, val;switch (optname) { -case TCP_INQ : - ret =mptcp_get_int_option (msk, optval, optlen, &val); -if (ret) -return ret; -if (val <0 || val >1 ) -return -EINVAL ; - -lock_sock (sk); - msk->recvmsg_inq = !!val; -release_sock (sk); -return 0 ;case TCP_ULP :return -EOPNOTSUPP ;case TCP_CONGESTION :return mptcp_setsockopt_sol_tcp_congestion (msk, optval, optlen); -case TCP_CORK : -return mptcp_setsockopt_sol_tcp_cork (msk, optval, optlen); -case TCP_NODELAY : -return mptcp_setsockopt_sol_tcp_nodelay (msk, optval, optlen);case TCP_DEFER_ACCEPT :/* See tcp.c: TCP_DEFER_ACCEPT does not fail */ mptcp_setsockopt_first_sf_only (msk,SOL_TCP , optname, optval, optlen);
@@ -817,7 +785,30 @@ static int mptcp_setsockopt_sol_tcp(stru optval, optlen); } -return -EOPNOTSUPP ; + ret =mptcp_get_int_option (msk, optval, optlen, &val); +if (ret) +return ret; + +lock_sock (sk); +switch (optname) { +case TCP_INQ : +if (val <0 || val >1 ) + ret = -EINVAL ; +else + msk->recvmsg_inq = !!val; +break ; +case TCP_CORK : + ret =__mptcp_setsockopt_sol_tcp_cork (msk, val); +break ; +case TCP_NODELAY : + ret =__mptcp_setsockopt_sol_tcp_nodelay (msk, val); +break ; +default : + ret = -ENOPROTOOPT ; + } + +release_sock (sk); +return ret; } int mptcp_setsockopt(struct sock *sk, int level, int optname,
Greg Kroah-Hartman
maintainerPATCH 8/137 mptcp: fix full TCP keep-alive support
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Matthieu Baerts (NGI0)" <[email protected]>
commit bd11dc4fb969ec148e50cd87f88a78246dbc4d0b upstream.
SO_KEEPALIVE support has been added a while ago, as part of a series "adding SOL_SOCKET" support. To have a full control of this keep-alive feature, it is important to also support TCP_KEEP* socket options at the SOL_TCP level.
Supporting them on the setsockopt() part is easy, it is just a matter of remembering each value in the MPTCP sock structure, and calling tcp_sock_set_keep*() helpers on each subflow. If the value is not modified (0), calling these helpers will not do anything. For the getsockopt() part, the corresponding value from the MPTCP sock structure or the default one is simply returned. All of this is very similar to other TCP_* socket options supported by MPTCP.
It looks important for kernels supporting SO_KEEPALIVE, to also support TCP_KEEP* options as well: some apps seem to (wrongly) consider that if the former is supported, the latter ones will be supported as well. But also, not having this simple and isolated change is preventing MPTCP support in some apps, and libraries like GoLang [1]. This is why this patch is seen as a fix.
[ conflicts in the same context, because commit 29b5e5ef8739 ("mptcp:
implement TCP_NOTSENT_LOWAT support") is not in this version ]
--- net/mptcp/protocol.h | 3 ++ net/mptcp/sockopt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
net/mptcp/protocol.h +3 -0
@@ -303,6 +303,9 @@ struct mptcp_sock { in_accept_queue:1, free_first:1, rcvspace_init:1; +int keepalive_cnt; +int keepalive_idle; +int keepalive_intvl;struct work_struct work;struct sk_buff *ooo_last_skb;struct rb_root out_of_order_queue;
net/mptcp/sockopt.c +58 -0
88 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 9/137 erofs: avoid allocating DEFLATE streams before mounting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
commit 80eb4f62056d6ae709bdd0636ab96ce660f494b2 upstream.
Currently, each DEFLATE stream takes one 32 KiB permanent internal window buffer even if there is no running instance which uses DEFLATE algorithm.
It's unexpected and wasteful on embedded devices with limited resources and servers with hundreds of CPU cores if DEFLATE is enabled but unused.
--- fs/erofs/decompressor_deflate.c | 57 +++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-)
fs/erofs/decompressor_deflate.c +30 -27
@@ -47,39 +47,15 @@ int __init z_erofs_deflate_init(void)/* by default, use # of possible CPUs instead */ if (!z_erofs_deflate_nstrms) z_erofs_deflate_nstrms =num_possible_cpus (); - -for (; z_erofs_deflate_avail_strms < z_erofs_deflate_nstrms; - ++z_erofs_deflate_avail_strms) { -struct z_erofs_deflate *strm; - - strm =kzalloc (sizeof (*strm),GFP_KERNEL ); -if (!strm) - goto out_failed; - -/* XXX: in-kernel zlib cannot shrink windowbits currently */ - strm->z.workspace =vmalloc (zlib_inflate_workspacesize ()); -if (!strm->z.workspace) { -kfree (strm); - goto out_failed; - } - -spin_lock (&z_erofs_deflate_lock); - strm->next = z_erofs_deflate_head; - z_erofs_deflate_head = strm; -spin_unlock (&z_erofs_deflate_lock); - }return 0 ; - -out_failed: -pr_err ("failed to allocate zlib workspace\n" ); -z_erofs_deflate_exit (); -return -ENOMEM ; }int z_erofs_load_deflate_config (struct super_block *sb,struct erofs_super_block *dsb,void *data,int size) {struct z_erofs_deflate_cfgs *dfl = data; +static DEFINE_MUTEX (deflate_resize_mutex); +static bool inited;if (!dfl || size <sizeof (struct z_erofs_deflate_cfgs )) {erofs_err (sb,"invalid deflate cfgs, size=%u" , size);
@@ -90,9 +66,36 @@ int z_erofs_load_deflate_config(struct serofs_err (sb,"unsupported windowbits %u" , dfl->windowbits);return -EOPNOTSUPP ; } - +mutex_lock (&deflate_resize_mutex); +if (!inited) { +for (; z_erofs_deflate_avail_strms < z_erofs_deflate_nstrms; + ++z_erofs_deflate_avail_strms) { +struct z_erofs_deflate *strm; + + strm =kzalloc (sizeof (*strm),GFP_KERNEL ); +if (!strm) + goto failed; +/* XXX: in-kernel zlib cannot customize windowbits */ + strm->z.workspace =vmalloc (zlib_inflate_workspacesize ()); +if (!strm->z.workspace) { +kfree (strm); + goto failed; + } + +spin_lock (&z_erofs_deflate_lock); + strm->next = z_erofs_deflate_head; + z_erofs_deflate_head = strm; +spin_unlock (&z_erofs_deflate_lock); + } + inited = true; + } +mutex_unlock (&deflate_resize_mutex);erofs_info (sb,"EXPERIMENTAL DEFLATE feature in use. Use at your own risk!" );return 0 ; +failed: +mutex_unlock (&deflate_resize_mutex); +z_erofs_deflate_exit (); +return -ENOMEM ; } int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
Greg Kroah-Hartman
maintainerPATCH 10/137 mm: ratelimit stat flush from workingset shrinker
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shakeel Butt <[email protected]>
commit d4a5b369ad6d8aae552752ff438dddde653a72ec upstream.
One of our workloads (Postgres 14 + sysbench OLTP) regressed on newer upstream kernel and on further investigation, it seems like the cause is the always synchronous rstat flush in the count_shadow_nodes() added by the commit f82e6bf9bb9b ("mm: memcg: use rstat for non-hierarchical stats"). On further inspection it seems like we don't really need accurate stats in this function as it was already approximating the amount of appropriate shadow entries to keep for maintaining the refault information. Since there is already 2 sec periodic rstat flush, we don't need exact stats here. Let's ratelimit the rstat flush in this code path.
--- mm/workingset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/workingset.c +1 -1
@@ -664,7 +664,7 @@ static unsigned long count_shadow_nodes(struct lruvec *lruvec;int i; -mem_cgroup_flush_stats (); +mem_cgroup_flush_stats_ratelimited (); lruvec =mem_cgroup_lruvec (sc->memcg,NODE_DATA (sc->nid));for (pages =0 , i =0 ; i <NR_LRU_LISTS ; i++) pages += lruvec_page_state_local(lruvec,
Greg Kroah-Hartman
maintainerPATCH 11/137 vxlan: Fix regression when dropping packets due to invalid src addresses
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit 1cd4bc987abb2823836cbb8f887026011ccddc8a upstream.
Commit f58f45c1e5b9 ("vxlan: drop packets from invalid src-address") has recently been added to vxlan mainly in the context of source address snooping/learning so that when it is enabled, an entry in the FDB is not being created for an invalid address for the corresponding tunnel endpoint.
Before commit f58f45c1e5b9 vxlan was similarly behaving as geneve in that it passed through whichever macs were set in the L2 header. It turns out that this change in behavior breaks setups, for example, Cilium with netkit in L3 mode for Pods as well as tunnel mode has been passing before the change in f58f45c1e5b9 for both vxlan and geneve. After mentioned change it is only passing for geneve as in case of vxlan packets are dropped due to vxlan_set_mac() returning false as source and destination macs are zero which for E/W traffic via tunnel is totally fine.
Fix it by only opting into the is_valid_ether_addr() check in vxlan_set_mac() when in fact source address snooping/learning is actually enabled in vxlan. This is done by moving the check into vxlan_snoop(). With this change, the Cilium connectivity test suite passes again for both tunnel flavors.
[ Backport note: vxlan snooping/learning not supported in 6.8 or older,
so commit is simply a revert. ]
--- drivers/net/vxlan/vxlan_core.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/vxlan/vxlan_core.c +0 -4
@@ -1615,10 +1615,6 @@ static bool vxlan_set_mac(struct vxlan_dif (ether_addr_equal (eth_hdr (skb)->h_source, vxlan->dev->dev_addr))return false; -/* Ignore packets from invalid src-address */ -if (!is_valid_ether_addr (eth_hdr (skb)->h_source)) -return false; -/* Get address from the outer IP header */ if (vxlan_get_sk_family (vs) ==AF_INET ) { saddr.sin.sin_addr.s_addr =ip_hdr (skb)->saddr;
Greg Kroah-Hartman
maintainerPATCH 12/137 selftests/net: synchronize udpgro tests tx and rx connection
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Po-Hsu Lin <[email protected]>
From: Lucas Karpinski <[email protected]>
commit 3bdd9fd29cb0f136b307559a19c107210ad5c314 upstream.
The sockets used by udpgso_bench_tx aren't always ready when udpgso_bench_tx transmits packets. This issue is more prevalent in -rt kernels, but can occur in both. Replace the hacky sleep calls with a function that checks whether the ports in the namespace are ready for use.
--- tools/testing/selftests/net/net_helper.sh | 22 ++++++++++++++++++++++ tools/testing/selftests/net/udpgro.sh | 13 ++++++------- tools/testing/selftests/net/udpgro_bench.sh | 5 +++-- tools/testing/selftests/net/udpgro_frglist.sh | 5 +++-- 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100755 tools/testing/selftests/net/net_helper.sh
tools/testing/selftests/net/net_helper.sh new file +22 -0
@@ -0,0 +1,22 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Helper functions + +wait_local_port_listen() +{ + local listener_ns="${1}" + local port="${2}" + local protocol="${3}" + local port_hex + local i + + port_hex="$(printf "%04X" "${port}")" + for i in $(seq 10); do + if ip netns exec "${listener_ns}" cat /proc/net/"${protocol}"* | \ + grep -q "${port_hex}"; then + break + fi + sleep 0.1 + done +}
tools/testing/selftests/net/udpgro.sh +6 -7
@@ -3,6 +3,8 @@ # # Run a series of udpgro functional tests. +source net_helper.sh + readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" BPF_FILE="xdp_dummy.o"
@@ -51,8 +53,7 @@ run_one() { echo "ok" || \ echo "failed" & - # Hack: let bg programs complete the startup - sleep 0.2 + wait_local_port_listen ${PEER_NS} 8000 udp ./udpgso_bench_tx ${tx_args} ret=$? wait $(jobs -p)
@@ -97,7 +98,7 @@ run_one_nat() { echo "ok" || \ echo "failed"& - sleep 0.1 + wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} ret=$? kill -INT $pid
@@ -118,11 +119,9 @@ run_one_2sock() { echo "ok" || \ echo "failed" & - # Hack: let bg programs complete the startup - sleep 0.2 + wait_local_port_listen "${PEER_NS}" 12345 udp ./udpgso_bench_tx ${tx_args} -p 12345 - sleep 0.1 - # first UDP GSO socket should be closed at this point + wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} ret=$? wait $(jobs -p)
tools/testing/selftests/net/udpgro_bench.sh +3 -2
@@ -3,6 +3,8 @@ # # Run a series of udpgro benchmarks +source net_helper.sh + readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" BPF_FILE="xdp_dummy.o"
@@ -40,8 +42,7 @@ run_one() { ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r & ip netns exec "${PEER_NS}" ./udpgso_bench_rx -t ${rx_args} -r & - # Hack: let bg programs complete the startup - sleep 0.2 + wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} }
tools/testing/selftests/net/udpgro_frglist.sh +3 -2
@@ -3,6 +3,8 @@ # # Run a series of udpgro benchmarks +source net_helper.sh + readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)" BPF_FILE="xdp_dummy.o"
@@ -45,8 +47,7 @@ run_one() { echo ${rx_args} ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r & - # Hack: let bg programs complete the startup - sleep 0.2 + wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} }
Greg Kroah-Hartman
maintainerPATCH 13/137 selftests: net: included needed helper in the install targets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Po-Hsu Lin <[email protected]>
From: Paolo Abeni <[email protected]>
commit f5173fe3e13b2cbd25d0d73f40acd923d75add55 upstream.
The blamed commit below introduce a dependency in some net self-tests towards a newly introduce helper script.
Such script is currently not included into the TEST_PROGS_EXTENDED list and thus is not installed, causing failure for the relevant tests when executed from the install dir.
Fix the issue updating the install targets.
--- tools/testing/selftests/net/Makefile | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/Makefile +1 -0
@@ -55,6 +55,7 @@ TEST_PROGS += rps_default_mask.sh TEST_PROGS += big_tcp.sh TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh +TEST_PROGS_EXTENDED += net_helper.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite
Greg Kroah-Hartman
maintainerPATCH 14/137 selftests: net: List helper scripts in TEST_FILES Makefile variable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Po-Hsu Lin <[email protected]>
From: Benjamin Poirier <[email protected]>
commit 06efafd8608dac0c3a480539acc66ee41d2fb430 upstream.
Some scripts are not tests themselves; they contain utility functions used by other tests. According to Documentation/dev-tools/kselftest.rst, such files should be listed in TEST_FILES. Move those utility scripts to TEST_FILES.
--- tools/testing/selftests/net/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/testing/selftests/net/Makefile +2 -3
@@ -53,9 +53,7 @@ TEST_PROGS += bind_bhash.sh TEST_PROGS += ip_local_port_range.sh TEST_PROGS += rps_default_mask.sh TEST_PROGS += big_tcp.sh -TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh -TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh -TEST_PROGS_EXTENDED += net_helper.sh +TEST_PROGS_EXTENDED := toeplitz_client.sh toeplitz.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite
@@ -94,6 +92,7 @@ TEST_PROGS += test_vxlan_nolocalbypass.s TEST_PROGS += test_bridge_backup_port.sh TEST_FILES := settings +TEST_FILES += in_netns.sh net_helper.sh setup_loopback.sh setup_veth.sh include ../lib.mk
Greg Kroah-Hartman
maintainerPATCH 15/137 drm/sun4i: hdmi: Convert encoder to atomic
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
commit cedb7dd193f659fcc63f3a3f31454c25a5baef07 upstream.
The sun4i_hdmi driver still uses the non-atomic variants of the encoder hooks, so let's convert to their atomic equivalents.
--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +10 -7
@@ -82,7 +82,8 @@ static int sun4i_hdmi_atomic_check(strucreturn 0 ; } -static void sun4i_hdmi_disable (struct drm_encoder *encoder) +static void sun4i_hdmi_disable (struct drm_encoder *encoder, +struct drm_atomic_state *state) {struct sun4i_hdmi *hdmi =drm_encoder_to_sun4i_hdmi (encoder);u32 val;
@@ -96,7 +97,8 @@ static void sun4i_hdmi_disable(struct drclk_disable_unprepare (hdmi->tmds_clk); } -static void sun4i_hdmi_enable (struct drm_encoder *encoder) +static void sun4i_hdmi_enable (struct drm_encoder *encoder, +struct drm_atomic_state *state) {struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;struct sun4i_hdmi *hdmi =drm_encoder_to_sun4i_hdmi (encoder);
@@ -120,9 +122,10 @@ static void sun4i_hdmi_enable(struct drm }static void sun4i_hdmi_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) { +const struct drm_display_mode *mode = &crtc_state->mode;struct sun4i_hdmi *hdmi =drm_encoder_to_sun4i_hdmi (encoder);unsigned int x, y;u32 val;
@@ -201,9 +204,9 @@ static enum drm_mode_status sun4i_hdmi_mstatic const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = { .atomic_check = sun4i_hdmi_atomic_check, - .disable = sun4i_hdmi_disable, - .enable = sun4i_hdmi_enable, - .mode_set = sun4i_hdmi_mode_set, + .atomic_disable = sun4i_hdmi_disable, + .atomic_enable = sun4i_hdmi_enable, + .atomic_mode_set = sun4i_hdmi_mode_set, .mode_valid = sun4i_hdmi_mode_valid, };
Greg Kroah-Hartman
maintainerPATCH 16/137 drm/sun4i: hdmi: Move mode_set into enable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
commit 9ca6bc2460359ed49b0ee87467fea784b1a42bf5 upstream.
We're not doing anything special in atomic_mode_set so we can simply merge it into atomic_enable.
--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 38 ++++++++++++--------------------- 1 file changed, 14 insertions(+), 24 deletions(-)
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +14 -24
@@ -103,33 +103,11 @@ static void sun4i_hdmi_enable(struct drmstruct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;struct sun4i_hdmi *hdmi =drm_encoder_to_sun4i_hdmi (encoder);struct drm_display_info *display = &hdmi->connector.display_info; +unsigned int x, y;u32 val =0 ;DRM_DEBUG_DRIVER ("Enabling the HDMI Output\n" ); -clk_prepare_enable (hdmi->tmds_clk); - -sun4i_hdmi_setup_avi_infoframes (hdmi, mode); - val |=SUN4I_HDMI_PKT_CTRL_TYPE (0 ,SUN4I_HDMI_PKT_AVI ); - val |=SUN4I_HDMI_PKT_CTRL_TYPE (1 ,SUN4I_HDMI_PKT_END ); -writel (val, hdmi->base +SUN4I_HDMI_PKT_CTRL_REG (0 )); - - val =SUN4I_HDMI_VID_CTRL_ENABLE ; -if (display->is_hdmi) - val |=SUN4I_HDMI_VID_CTRL_HDMI_MODE ; - -writel (val, hdmi->base +SUN4I_HDMI_VID_CTRL_REG ); -} - -static void sun4i_hdmi_mode_set (struct drm_encoder *encoder, -struct drm_crtc_state *crtc_state, -struct drm_connector_state *conn_state) -{ -const struct drm_display_mode *mode = &crtc_state->mode; -struct sun4i_hdmi *hdmi =drm_encoder_to_sun4i_hdmi (encoder); -unsigned int x, y; -u32 val; -clk_set_rate (hdmi->mod_clk, mode->crtc_clock *1000 );clk_set_rate (hdmi->tmds_clk, mode->crtc_clock *1000 );
@@ -181,6 +159,19 @@ static void sun4i_hdmi_mode_set(struct d val |=SUN4I_HDMI_VID_TIMING_POL_VSYNC ;writel (val, hdmi->base +SUN4I_HDMI_VID_TIMING_POL_REG ); + +clk_prepare_enable (hdmi->tmds_clk); + +sun4i_hdmi_setup_avi_infoframes (hdmi, mode); + val |=SUN4I_HDMI_PKT_CTRL_TYPE (0 ,SUN4I_HDMI_PKT_AVI ); + val |=SUN4I_HDMI_PKT_CTRL_TYPE (1 ,SUN4I_HDMI_PKT_END ); +writel (val, hdmi->base +SUN4I_HDMI_PKT_CTRL_REG (0 )); + + val =SUN4I_HDMI_VID_CTRL_ENABLE ; +if (display->is_hdmi) + val |=SUN4I_HDMI_VID_CTRL_HDMI_MODE ; + +writel (val, hdmi->base +SUN4I_HDMI_VID_CTRL_REG ); } static enum drm_mode_status sun4i_hdmi_mode_valid(struct drm_encoder *encoder,
@@ -206,7 +197,6 @@ static const struct drm_encoder_helper_f .atomic_check = sun4i_hdmi_atomic_check, .atomic_disable = sun4i_hdmi_disable, .atomic_enable = sun4i_hdmi_enable, - .atomic_mode_set = sun4i_hdmi_mode_set, .mode_valid = sun4i_hdmi_mode_valid, };
Greg Kroah-Hartman
maintainerPATCH 17/137 f2fs: fix to do sanity check on i_xattr_nid in sanity_check_inode()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
commit 20faaf30e55522bba2b56d9c46689233205d7717 upstream.
syzbot reports a kernel bug as below:
F2FS-fs (loop0): Mounted with checkpoint version = 48b305e4
==================================================================
BUG: KASAN: slab-out-of-bounds in f2fs_test_bit fs/f2fs/f2fs.h:2933 [inline] BUG: KASAN: slab-out-of-bounds in current_nat_addr fs/f2fs/node.h:213 [inline] BUG: KASAN: slab-out-of-bounds in f2fs_get_node_info+0xece/0x1200 fs/f2fs/node.c:600 Read of size 1 at addr ffff88807a58c76c by task syz-executor280/5076 CPU: 1 PID: 5076 Comm: syz-executor280 Not tainted 6.9.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 print_address_description mm/kasan/report.c:377 [inline] print_report+0x169/0x550 mm/kasan/report.c:488 kasan_report+0x143/0x180 mm/kasan/report.c:601 f2fs_test_bit fs/f2fs/f2fs.h:2933 [inline] current_nat_addr fs/f2fs/node.h:213 [inline] f2fs_get_node_info+0xece/0x1200 fs/f2fs/node.c:600 f2fs_xattr_fiemap fs/f2fs/data.c:1848 [inline] f2fs_fiemap+0x55d/0x1ee0 fs/f2fs/data.c:1925 ioctl_fiemap fs/ioctl.c:220 [inline] do_vfs_ioctl+0x1c07/0x2e50 fs/ioctl.c:838 __do_sys_ioctl fs/ioctl.c:902 [inline] __se_sys_ioctl+0x81/0x170 fs/ioctl.c:890 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
The root cause is we missed to do sanity check on i_xattr_nid during f2fs_iget(), so that in fiemap() path, current_nat_addr() will access nat_bitmap w/ offset from invalid i_xattr_nid, result in triggering kasan bug report, fix it.
--- fs/f2fs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/f2fs/inode.c +6 -0
@@ -361,6 +361,12 @@ static bool sanity_check_inode(struct inreturn false; } +if (fi->i_xattr_nid &&f2fs_check_nid_range (sbi, fi->i_xattr_nid)) { +f2fs_warn (sbi,"%s: inode (ino=%lx) has corrupted i_xattr_nid: %u, run fsck to fix." , + __func__, inode->i_ino, fi->i_xattr_nid); +return false; + } +return true; }
Greg Kroah-Hartman
maintainerPATCH 18/137 media: lgdt3306a: Add a check against null-pointer-def
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheyu Ma <[email protected]>
commit c1115ddbda9c930fba0fdd062e7a8873ebaf898d upstream.
The driver should check whether the client provides the platform_data.
The following log reveals it:
[ 29.610324] BUG: KASAN: null-ptr-deref in kmemdup+0x30/0x40 [ 29.610730] Read of size 40 at addr 0000000000000000 by task bash/414 [ 29.612820] Call Trace: [ 29.613030] <TASK> [ 29.613201] dump_stack_lvl+0x56/0x6f [ 29.613496] ? kmemdup+0x30/0x40 [ 29.613754] print_report.cold+0x494/0x6b7 [ 29.614082] ? kmemdup+0x30/0x40 [ 29.614340] kasan_report+0x8a/0x190 [ 29.614628] ? kmemdup+0x30/0x40 [ 29.614888] kasan_check_range+0x14d/0x1d0 [ 29.615213] memcpy+0x20/0x60 [ 29.615454] kmemdup+0x30/0x40 [ 29.615700] lgdt3306a_probe+0x52/0x310 [ 29.616339] i2c_device_probe+0x951/0xa90
--- drivers/media/dvb-frontends/lgdt3306a.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/dvb-frontends/lgdt3306a.c +5 -0
@@ -2176,6 +2176,11 @@ static int lgdt3306a_probe(struct i2c_clstruct dvb_frontend *fe;int ret; +if (!client->dev.platform_data) { +dev_err (&client->dev,"platform data is mandatory\n" ); +return -EINVAL ; + } + config =kmemdup (client->dev.platform_data,sizeof (struct lgdt3306a_config ),GFP_KERNEL );if (config ==NULL ) {
Greg Kroah-Hartman
maintainerPATCH 19/137 drm/amdgpu: add error handle to avoid out-of-bounds
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Zhou <[email protected]>
commit 8b2faf1a4f3b6c748c0da36cda865a226534d520 upstream.
if the sdma_v4_0_irq_id_to_seq return -EINVAL, the process should be stop to avoid out-of-bounds read, so directly return -EINVAL.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -0
@@ -2031,6 +2031,9 @@ static int sdma_v4_0_process_trap_irq(stDRM_DEBUG ("IH: SDMA trap\n" ); instance =sdma_v4_0_irq_id_to_seq (entry->client_id); +if (instance <0 ) +return instance; +switch (entry->ring_id) {case 0 :amdgpu_fence_process (&adev->sdma.instance[instance].ring);
Greg Kroah-Hartman
maintainerPATCH 20/137 bcache: fix variable length array abuse in btree_iter
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Mirvish <[email protected]>
commit 3a861560ccb35f2a4f0a4b8207fa7c2a35fc7f31 upstream.
btree_iter is used in two ways: either allocated on the stack with a fixed size MAX_BSETS, or from a mempool with a dynamic size based on the specific cache set. Previously, the struct had a fixed-length array of size MAX_BSETS which was indexed out-of-bounds for the dynamically-sized iterators, which causes UBSAN to complain.
This patch uses the same approach as in bcachefs's sort_iter and splits the iterator into a btree_iter with a flexible array member and a btree_iter_stack which embeds a btree_iter as well as a fixed-length data array.
--- drivers/md/bcache/bset.c | 44 +++++++++++++++++++++--------------------- drivers/md/bcache/bset.h | 30 ++++++++++++++++++---------- drivers/md/bcache/btree.c | 40 ++++++++++++++++++++------------------ drivers/md/bcache/super.c | 5 ++-- drivers/md/bcache/sysfs.c | 2 - drivers/md/bcache/writeback.c | 10 ++++----- 6 files changed, 71 insertions(+), 60 deletions(-)
drivers/md/bcache/bset.c +22 -22
@@ -54,7 +54,7 @@ void bch_dump_bucket(struct btree_keys *int __bch_count_data (struct btree_keys *b) {unsigned int ret =0 ; -struct btree_iter iter; +struct btree_iter_stack iter;struct bkey *k;if (b->ops->is_extents)
@@ -67,7 +67,7 @@ void __bch_check_keys(struct btree_keys {va_list args;struct bkey *k, *p =NULL ; -struct btree_iter iter; +struct btree_iter_stack iter;const char *err;for_each_key (b, k, &iter) {
@@ -879,7 +879,7 @@ unsigned int bch_btree_insert_key(structunsigned int status =BTREE_INSERT_STATUS_NO_INSERT ;struct bset *i =bset_tree_last (b)->data;struct bkey *m, *prev =NULL ; -struct btree_iter iter; +struct btree_iter_stack iter;struct bkey preceding_key_on_stack =ZERO_KEY ;struct bkey *preceding_key_p = &preceding_key_on_stack;
@@ -895,9 +895,9 @@ unsigned int bch_btree_insert_key(structelse preceding_key (k, &preceding_key_p); - m =bch_btree_iter_init (b, &iter, preceding_key_p); + m =bch_btree_iter_stack_init (b, &iter, preceding_key_p); -if (b->ops->insert_fixup (b, k, &iter, replace_key)) +if (b->ops->insert_fixup (b, k, &iter.iter, replace_key))return status; status =BTREE_INSERT_STATUS_INSERT ;
@@ -1100,33 +1100,33 @@ void bch_btree_iter_push(struct btree_it btree_iter_cmp)); } -static struct bkey *__bch_btree_iter_init (struct btree_keys *b, -struct btree_iter *iter, -struct bkey *search, -struct bset_tree *start) +static struct bkey *__bch_btree_iter_stack_init (struct btree_keys *b, +struct btree_iter_stack *iter, +struct bkey *search, +struct bset_tree *start) {struct bkey *ret =NULL ; - iter->size =ARRAY_SIZE (iter->data); - iter->used =0 ; + iter->iter.size =ARRAY_SIZE (iter->stack_data); + iter->iter.used =0 ;#ifdef CONFIG_BCACHE_DEBUG - iter->b = b; + iter->iter.b = b;#endif for (; start <=bset_tree_last (b); start++) { ret =bch_bset_search (b, start, search); -bch_btree_iter_push (iter, ret,bset_bkey_last (start->data)); +bch_btree_iter_push (&iter->iter, ret,bset_bkey_last (start->data)); }return ret; } -struct bkey *bch_btree_iter_init (struct btree_keys *b, -struct btree_iter *iter, +struct bkey *bch_btree_iter_stack_init (struct btree_keys *b, +struct btree_iter_stack *iter,struct bkey *search) { -return __bch_btree_iter_init (b, iter, search, b->set); +return __bch_btree_iter_stack_init (b, iter, search, b->set); } static inline struct bkey *__bch_btree_iter_next(struct btree_iter *iter,
@@ -1293,10 +1293,10 @@ void bch_btree_sort_partial(struct btree struct bset_sort_state *state) {size_t order = b->page_order, keys =0 ; -struct btree_iter iter; +struct btree_iter_stack iter;int oldsize =bch_count_data (b); -__bch_btree_iter_init (b, &iter,NULL , &b->set[start]); +__bch_btree_iter_stack_init (b, &iter,NULL , &b->set[start]);if (start) {unsigned int i;
@@ -1307,7 +1307,7 @@ void bch_btree_sort_partial(struct btree order =get_order (__set_bytes (b->set->data, keys)); } -__btree_sort (b, &iter, start, order, false, state); +__btree_sort (b, &iter.iter, start, order, false, state);EBUG_ON (oldsize >=0 &&bch_count_data (b) != oldsize); }
@@ -1323,11 +1323,11 @@ void bch_btree_sort_into(struct btree_ke struct bset_sort_state *state) {uint64_t start_time =local_clock (); -struct btree_iter iter; +struct btree_iter_stack iter; -bch_btree_iter_init (b, &iter,NULL ); +bch_btree_iter_stack_init (b, &iter,NULL ); -btree_mergesort (b, new->set->data, &iter, false, true); +btree_mergesort (b, new->set->data, &iter.iter, false, true);bch_time_stats_update (&state->time, start_time);
drivers/md/bcache/bset.h +19 -11
@@ -321,7 +321,14 @@ struct btree_iter {#endif struct btree_iter_set {struct bkey *k, *end; - } data[MAX_BSETS ]; + } data[]; +}; + +/* Fixed-size btree_iter that can be allocated on the stack */ + +struct btree_iter_stack { +struct btree_iter iter; +struct btree_iter_set stack_data[MAX_BSETS ]; };typedef bool (*ptr_filter_fn )(struct btree_keys *b,const struct bkey *k);
@@ -333,9 +340,9 @@ struct bkey *bch_btree_iter_next_filter(void bch_btree_iter_push (struct btree_iter *iter,struct bkey *k,struct bkey *end); -struct bkey *bch_btree_iter_init (struct btree_keys *b, -struct btree_iter *iter, -struct bkey *search); +struct bkey *bch_btree_iter_stack_init (struct btree_keys *b, +struct btree_iter_stack *iter, +struct bkey *search);struct bkey *__bch_bset_search (struct btree_keys *b,struct bset_tree *t,const struct bkey *search);
@@ -350,13 +357,14 @@ static inline struct bkey *bch_bset_searreturn search ?__bch_bset_search (b, t, search) : t->data->start; } -#define for_each_key_filter (b, k, iter, filter) \ - for (bch_btree_iter_init((b), (iter), NULL); \ - ((k) = bch_btree_iter_next_filter((iter), (b), filter));) - -#define for_each_key (b, k, iter) \ - for (bch_btree_iter_init((b), (iter), NULL); \ - ((k) = bch_btree_iter_next(iter));) +#define for_each_key_filter (b, k, stack_iter, filter) \ + for (bch_btree_iter_stack_init((b), (stack_iter), NULL); \ + ((k) = bch_btree_iter_next_filter(&((stack_iter)->iter), (b), \ + filter));) + +#define for_each_key (b, k, stack_iter) \ + for (bch_btree_iter_stack_init((b), (stack_iter), NULL); \ + ((k) = bch_btree_iter_next(&((stack_iter)->iter)));)/* Sorting */
drivers/md/bcache/btree.c +21 -19
@@ -1304,7 +1304,7 @@ static bool btree_gc_mark_node(struct btuint8_t stale =0 ;unsigned int keys =0 , good_keys =0 ;struct bkey *k; -struct btree_iter iter; +struct btree_iter_stack iter;struct bset_tree *t; gc->nodes++;
@@ -1565,7 +1565,7 @@ static int btree_gc_rewrite_node(structstatic unsigned int btree_gc_count_keys (struct btree *b) {struct bkey *k; -struct btree_iter iter; +struct btree_iter_stack iter;unsigned int ret =0 ;for_each_key_filter (&b->keys, k, &iter, bch_ptr_bad)
@@ -1606,17 +1606,18 @@ static int btree_gc_recurse(struct btreeint ret =0 ;bool should_rewrite;struct bkey *k; -struct btree_iter iter; +struct btree_iter_stack iter;struct gc_merge_info r[GC_MERGE_NODES ];struct gc_merge_info *i, *last = r +ARRAY_SIZE (r) -1 ; -bch_btree_iter_init (&b->keys, &iter, &b->c->gc_done); +bch_btree_iter_stack_init (&b->keys, &iter, &b->c->gc_done);for (i = r; i < r +ARRAY_SIZE (r); i++) i->b =ERR_PTR (-EINTR );while (1 ) { - k =bch_btree_iter_next_filter (&iter, &b->keys, bch_ptr_bad); + k =bch_btree_iter_next_filter (&iter.iter, &b->keys, + bch_ptr_bad);if (k) { r->b =bch_btree_node_get (b->c, op, k, b->level -1 , true, b);
@@ -1906,7 +1907,7 @@ static int bch_btree_check_recurse(struc {int ret =0 ;struct bkey *k, *p =NULL ; -struct btree_iter iter; +struct btree_iter_stack iter;for_each_key_filter (&b->keys, k, &iter, bch_ptr_invalid)bch_initial_mark_key (b->c, b->level, k);
@@ -1914,10 +1915,10 @@ static int bch_btree_check_recurse(strucbch_initial_mark_key (b->c, b->level +1 , &b->key);if (b->level) { -bch_btree_iter_init (&b->keys, &iter,NULL ); +bch_btree_iter_stack_init (&b->keys, &iter,NULL ); do { - k = bch_btree_iter_next_filter(&iter, &b->keys, + k = bch_btree_iter_next_filter(&iter.iter, &b->keys, bch_ptr_bad); if (k) { btree_node_prefetch(b, k);
@@ -1945,7 +1946,7 @@ static int bch_btree_check_thread(void *struct btree_check_info *info = arg;struct btree_check_state *check_state = info->state;struct cache_set *c = check_state->c; -struct btree_iter iter; +struct btree_iter_stack iter;struct bkey *k, *p;int cur_idx, prev_idx, skip_nr;
@@ -1954,8 +1955,8 @@ static int bch_btree_check_thread(void * ret =0 ;/* root node keys are checked before thread created */ -bch_btree_iter_init (&c->root->keys, &iter,NULL ); - k =bch_btree_iter_next_filter (&iter, &c->root->keys, bch_ptr_bad); +bch_btree_iter_stack_init (&c->root->keys, &iter,NULL ); + k =bch_btree_iter_next_filter (&iter.iter, &c->root->keys, bch_ptr_bad);BUG_ON (!k); p = k;
@@ -1973,7 +1974,7 @@ static int bch_btree_check_thread(void * skip_nr = cur_idx - prev_idx;while (skip_nr) { - k =bch_btree_iter_next_filter (&iter, + k =bch_btree_iter_next_filter (&iter.iter, &c->root->keys, bch_ptr_bad);if (k)
@@ -2046,7 +2047,7 @@ int bch_btree_check(struct cache_set *c)int ret =0 ;int i;struct bkey *k =NULL ; -struct btree_iter iter; +struct btree_iter_stack iter;struct btree_check_state check_state;/* check and mark root node keys */
@@ -2542,11 +2543,11 @@ static int bch_btree_map_nodes_recurse(sif (b->level) {struct bkey *k; -struct btree_iter iter; +struct btree_iter_stack iter; -bch_btree_iter_init (&b->keys, &iter, from); +bch_btree_iter_stack_init (&b->keys, &iter, from); -while ((k =bch_btree_iter_next_filter (&iter, &b->keys, +while ((k =bch_btree_iter_next_filter (&iter.iter, &b->keys, bch_ptr_bad))) { ret =bcache_btree (map_nodes_recurse, k, b, op, from, fn, flags);
@@ -2575,11 +2576,12 @@ int bch_btree_map_keys_recurse(struct bt {int ret =MAP_CONTINUE ;struct bkey *k; -struct btree_iter iter; +struct btree_iter_stack iter; -bch_btree_iter_init (&b->keys, &iter, from); +bch_btree_iter_stack_init (&b->keys, &iter, from); -while ((k =bch_btree_iter_next_filter (&iter, &b->keys, bch_ptr_bad))) { +while ((k =bch_btree_iter_next_filter (&iter.iter, &b->keys, + bch_ptr_bad))) { ret = !b->level ?fn (op, b, k) : bcache_btree(map_keys_recurse, k,
drivers/md/bcache/super.c +3 -2
@@ -1913,8 +1913,9 @@ struct cache_set *bch_cache_set_alloc(stINIT_LIST_HEAD (&c->btree_cache_freed);INIT_LIST_HEAD (&c->data_buckets); - iter_size = ((meta_bucket_pages (sb) *PAGE_SECTORS ) / sb->block_size +1 ) * -sizeof (struct btree_iter_set ); + iter_size =sizeof (struct btree_iter ) + + ((meta_bucket_pages (sb) *PAGE_SECTORS ) / sb->block_size) * +sizeof (struct btree_iter_set ); c->devices =kcalloc (c->nr_uuids,sizeof (void *),GFP_KERNEL );if (!c->devices)
drivers/md/bcache/sysfs.c +1 -1
@@ -660,7 +660,7 @@ static unsigned int bch_root_usage(strucunsigned int bytes =0 ;struct bkey *k;struct btree *b; -struct btree_iter iter; +struct btree_iter_stack iter; goto lock_root;
drivers/md/bcache/writeback.c +5 -5
@@ -908,15 +908,15 @@ static int bch_dirty_init_thread(void *astruct dirty_init_thrd_info *info = arg;struct bch_dirty_init_state *state = info->state;struct cache_set *c = state->c; -struct btree_iter iter; +struct btree_iter_stack iter;struct bkey *k, *p;int cur_idx, prev_idx, skip_nr; k = p =NULL ; prev_idx =0 ; -bch_btree_iter_init (&c->root->keys, &iter,NULL ); - k =bch_btree_iter_next_filter (&iter, &c->root->keys, bch_ptr_bad); +bch_btree_iter_stack_init (&c->root->keys, &iter,NULL ); + k =bch_btree_iter_next_filter (&iter.iter, &c->root->keys, bch_ptr_bad);BUG_ON (!k); p = k;
@@ -930,7 +930,7 @@ static int bch_dirty_init_thread(void *a skip_nr = cur_idx - prev_idx;while (skip_nr) { - k =bch_btree_iter_next_filter (&iter, + k =bch_btree_iter_next_filter (&iter.iter, &c->root->keys, bch_ptr_bad);if (k)
@@ -979,7 +979,7 @@ void bch_sectors_dirty_init(struct bcachint i;struct btree *b =NULL ;struct bkey *k =NULL ; -struct btree_iter iter; +struct btree_iter_stack iter;struct sectors_dirty_init op;struct cache_set *c = d->c;struct bch_dirty_init_state state;
Greg Kroah-Hartman
maintainerPATCH 21/137 wifi: rtw89: correct aSIFSTime for 6GHz band
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
commit f506e3ee547669cd96842e03c8a772aa7df721fa upstream.
aSIFSTime is 10us for 2GHz band and 16us for 5GHz and 6GHz bands. Originally, it doesn't consider 6GHz band and use wrong value, so correct it accordingly.
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -1
@@ -303,7 +303,7 @@ static u8 rtw89_aifsn_to_aifs(struct rtwu8 sifs; slot_time = vif->bss_conf.use_short_slot ?9 :20 ; - sifs = chan->band_type ==RTW89_BAND_5G ?16 :10 ; + sifs = chan->band_type ==RTW89_BAND_2G ?10 :16 ;return aifsn * slot_time + sifs; }
Greg Kroah-Hartman
maintainerPATCH 22/137 ata: pata_legacy: make legacy_exit() work again
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
commit d4a89339f17c87c4990070e9116462d16e75894f upstream.
Commit defc9cd826e4 ("pata_legacy: resychronize with upstream changes and resubmit") missed to update legacy_exit(), so that it now fails to do any cleanup -- the loop body there can never be entered. Fix that and finally remove now useless nr_legacy_host variable...
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- drivers/ata/pata_legacy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/ata/pata_legacy.c +4 -4
@@ -173,8 +173,6 @@ static int legacy_port[NR_HOST] = { 0x1fstatic struct legacy_probe probe_list[NR_HOST ];static struct legacy_data legacy_data[NR_HOST ];static struct ata_host *legacy_host[NR_HOST ]; -static int nr_legacy_host; -/** * legacy_probe_add - Add interface to probe list
@@ -1276,9 +1274,11 @@ static __exit void legacy_exit(void) {int i; -for (i =0 ; i < nr_legacy_host; i++) { +for (i =0 ; i <NR_HOST ; i++) {struct legacy_data *ld = &legacy_data[i]; -ata_host_detach (legacy_host[i]); + +if (legacy_host[i]) +ata_host_detach (legacy_host[i]);platform_device_unregister (ld->platform_dev); } }
Greg Kroah-Hartman
maintainerPATCH 23/137 fsverity: use register_sysctl_init() to avoid kmemleak warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit ee5814dddefbaa181cb247a75676dd5103775db1 upstream.
Since the fsverity sysctl registration runs as a builtin initcall, there is no corresponding sysctl deregistration and the resulting struct ctl_table_header is not used. This can cause a kmemleak warning just after the system boots up. (A pointer to the ctl_table_header is stored in the fsverity_sysctl_header static variable, which kmemleak should detect; however, the compiler can optimize out that variable.) Avoid the kmemleak warning by using register_sysctl_init() which is intended for use by builtin initcalls and uses kmemleak_not_leak().
--- fs/verity/init.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
fs/verity/init.c +1 -6
@@ -10,8 +10,6 @@#include <linux/ratelimit.h> #ifdef CONFIG_SYSCTL -static struct ctl_table_header *fsverity_sysctl_header; - static struct ctl_table fsverity_sysctl_table[] = { #ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES {
@@ -29,10 +27,7 @@ static struct ctl_table fsverity_sysctl_static void __init fsverity_init_sysctl (void ) { - fsverity_sysctl_header =register_sysctl ("fs/verity" , - fsverity_sysctl_table); -if (!fsverity_sysctl_header) -panic ("fsverity sysctl registration failed" ); +register_sysctl_init ("fs/verity" , fsverity_sysctl_table); }#else /* CONFIG_SYSCTL */ static inline void fsverity_init_sysctl (void )
Greg Kroah-Hartman
maintainerPATCH 24/137 proc: Move fdinfo PTRACE_MODE_READ check into the inode .permission operation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tyler Hicks (Microsoft) <[email protected]>
commit 0a960ba49869ebe8ff859d000351504dd6b93b68 upstream.
The following commits loosened the permissions of /proc/<PID>/fdinfo/ directory, as well as the files within it, from 0500 to 0555 while also introducing a PTRACE_MODE_READ check between the current task and <PID>'s task:
- commit 7bc3fa0172a4 ("procfs: allow reading fdinfo with PTRACE_MODE_READ")
- commit 1927e498aee1 ("procfs: prevent unprivileged processes accessing fdinfo dir")
Before those changes, inode based system calls like inotify_add_watch(2) would fail when the current task didn't have sufficient read permissions:
[...]
lstat("/proc/1/task/1/fdinfo", {st_mode=S_IFDIR|0500, st_size=0, ...}) = 0 inotify_add_watch(64, "/proc/1/task/1/fdinfo",
IN_MODIFY|IN_ATTRIB|IN_MOVED_FROM|IN_MOVED_TO|IN_CREATE|IN_DELETE| IN_ONLYDIR|IN_DONT_FOLLOW|IN_EXCL_UNLINK) = -1 EACCES (Permission denied)
[...]
This matches the documented behavior in the inotify_add_watch(2) man page:
ERRORS
EACCES Read access to the given file is not permitted.
After those changes, inotify_add_watch(2) started succeeding despite the current task not having PTRACE_MODE_READ privileges on the target task:
[...]
lstat("/proc/1/task/1/fdinfo", {st_mode=S_IFDIR|0555, st_size=0, ...}) = 0 inotify_add_watch(64, "/proc/1/task/1/fdinfo",
IN_MODIFY|IN_ATTRIB|IN_MOVED_FROM|IN_MOVED_TO|IN_CREATE|IN_DELETE| IN_ONLYDIR|IN_DONT_FOLLOW|IN_EXCL_UNLINK) = 1757
openat(AT_FDCWD, "/proc/1/task/1/fdinfo",
O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY) = -1 EACCES (Permission denied)
[...]
This change in behavior broke .NET prior to v7. See the github link below for the v7 commit that inadvertently/quietly (?) fixed .NET after the kernel changes mentioned above.
Return to the old behavior by moving the PTRACE_MODE_READ check out of the file .open operation and into the inode .permission operation:
[...]
lstat("/proc/1/task/1/fdinfo", {st_mode=S_IFDIR|0555, st_size=0, ...}) = 0 inotify_add_watch(64, "/proc/1/task/1/fdinfo",
IN_MODIFY|IN_ATTRIB|IN_MOVED_FROM|IN_MOVED_TO|IN_CREATE|IN_DELETE| IN_ONLYDIR|IN_DONT_FOLLOW|IN_EXCL_UNLINK) = -1 EACCES (Permission denied)
[...]
--- fs/proc/fd.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-)
fs/proc/fd.c +20 -22
@@ -74,7 +74,18 @@ out:return 0 ; } -static int proc_fdinfo_access_allowed (struct inode *inode) +static int seq_fdinfo_open (struct inode *inode,struct file *file) +{ +return single_open (file, seq_show, inode); +} + +/** +* Shared /proc/pid/fdinfo and /proc/pid/fdinfo/fd permission helper to ensure +* that the current task has PTRACE_MODE_READ in addition to the normal +* POSIX-like checks. +*/ +static int proc_fdinfo_permission (struct mnt_idmap *idmap,struct inode *inode, +int mask) {bool allowed = false;struct task_struct *task =get_proc_task (inode);
@@ -88,18 +99,13 @@ static int proc_fdinfo_access_allowed(stif (!allowed)return -EACCES ; -return 0 ; +return generic_permission (idmap, inode, mask); } -static int seq_fdinfo_open (struct inode *inode,struct file *file) -{ -int ret =proc_fdinfo_access_allowed (inode); - -if (ret) -return ret; - -return single_open (file, seq_show, inode); -} +static const struct inode_operations proc_fdinfo_file_inode_operations = { + .permission = proc_fdinfo_permission, + .setattr = proc_setattr, +};static const struct file_operations proc_fdinfo_file_operations = { .open = seq_fdinfo_open,
@@ -385,6 +391,8 @@ static struct dentry *proc_fdinfo_instan ei =PROC_I (inode); ei->fd = data->fd; + inode->i_op = &proc_fdinfo_file_inode_operations; + inode->i_fop = &proc_fdinfo_file_operations;tid_fd_update_inode (task, inode,0 );
@@ -404,23 +412,13 @@ static int proc_readfdinfo(struct file * proc_fdinfo_instantiate); } -static int proc_open_fdinfo (struct inode *inode,struct file *file) -{ -int ret =proc_fdinfo_access_allowed (inode); - -if (ret) -return ret; - -return 0 ; -} -const struct inode_operations proc_fdinfo_inode_operations = { .lookup = proc_lookupfdinfo, + .permission = proc_fdinfo_permission, .setattr = proc_setattr, };const struct file_operations proc_fdinfo_operations = { - .open = proc_open_fdinfo, .read = generic_read_dir, .iterate_shared = proc_readfdinfo, .llseek = generic_file_llseek,
Greg Kroah-Hartman
maintainerPATCH 25/137 platform/chrome: cros_ec: Handle events during suspend after resume completion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Ramasubramanian <[email protected]>
commit 2fbe479c0024e1c6b992184a799055e19932aa48 upstream.
Commit 47ea0ddb1f56 ("platform/chrome: cros_ec_lpc: Separate host command and irq disable") re-ordered the resume sequence. Before that change, cros_ec resume sequence is:
1) Enable IRQ
2) Send resume event
3) Handle events during suspend
After commit 47ea0ddb1f56 ("platform/chrome: cros_ec_lpc: Separate host command and irq disable"), cros_ec resume sequence is:
1) Enable IRQ
2) Handle events during suspend
3) Send resume event.
This re-ordering leads to delayed handling of any events queued between items 2) and 3) with the updated sequence. Also in certain platforms, EC skips triggering interrupt for certain events eg. mkbp events until the resume event is received. Such events are stuck in the host event queue indefinitely. This change puts back the original order to avoid any delay in handling the pending events.
--- drivers/platform/chrome/cros_ec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/platform/chrome/cros_ec.c +8 -8
@@ -432,6 +432,12 @@ static void cros_ec_send_resume_event(stvoid cros_ec_resume_complete (struct cros_ec_device *ec_dev) {cros_ec_send_resume_event (ec_dev); + +/* +* Let the mfd devices know about events that occur during +* suspend. This way the clients know what to do with them. +*/ +cros_ec_report_events_during_suspend (ec_dev); }EXPORT_SYMBOL (cros_ec_resume_complete);
@@ -442,12 +448,6 @@ static void cros_ec_enable_irq(struct crif (ec_dev->wake_enabled)disable_irq_wake (ec_dev->irq); - -/* -* Let the mfd devices know about events that occur during -* suspend. This way the clients know what to do with them. -*/ -cros_ec_report_events_during_suspend (ec_dev); }/**
@@ -475,8 +475,8 @@ EXPORT_SYMBOL(cros_ec_resume_early);*/ int cros_ec_resume (struct cros_ec_device *ec_dev) { -cros_ec_enable_irq (ec_dev); -cros_ec_send_resume_event (ec_dev); +cros_ec_resume_early (ec_dev); +cros_ec_resume_complete (ec_dev);return 0 ; }EXPORT_SYMBOL (cros_ec_resume);
Greg Kroah-Hartman
maintainerPATCH 26/137 thermal/drivers/qcom/lmh: Check for SCM availability at probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
commit d9d3490c48df572edefc0b64655259eefdcbb9be upstream.
Up until now, the necessary scm availability check has not been performed, leading to possible null pointer dereferences (which did happen for me on RB1).
Fix that.
--- drivers/thermal/qcom/lmh.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thermal/qcom/lmh.c +3 -0
@@ -95,6 +95,9 @@ static int lmh_probe(struct platform_devunsigned int enable_alg;u32 node_id; +if (!qcom_scm_is_available ()) +return -EPROBE_DEFER ; + lmh_data =devm_kzalloc (dev,sizeof (*lmh_data),GFP_KERNEL );if (!lmh_data)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 27/137 soc: qcom: rpmh-rsc: Enhance check for VRM in-flight request
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maulik Shah <[email protected]>
commit f592cc5794747b81e53b53dd6e80219ee25f0611 upstream.
Each RPMh VRM accelerator resource has 3 or 4 contiguous 4-byte aligned addresses associated with it. These control voltage, enable state, mode, and in legacy targets, voltage headroom. The current in-flight request checking logic looks for exact address matches. Requests for different addresses of the same RPMh resource as thus not detected as in-flight.
Add new cmd-db API cmd_db_match_resource_addr() to enhance the in-flight request check for VRM requests by ignoring the address offset.
This ensures that only one request is allowed to be in-flight for a given VRM resource. This is needed to avoid scenarios where request commands are carried out by RPMh hardware out-of-order leading to LDO regulator over-current protection triggering.
--- drivers/soc/qcom/cmd-db.c | 32 +++++++++++++++++++++++++++++++- drivers/soc/qcom/rpmh-rsc.c | 3 ++- include/soc/qcom/cmd-db.h | 10 +++++++++- 3 files changed, 42 insertions(+), 3 deletions(-)
drivers/soc/qcom/cmd-db.c +31 -1
@@ -1,6 +1,10 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. */ +/* +* Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. +*/ +#include <linux/bitfield.h> #include <linux/debugfs.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -17,6 +21,8 @@#define MAX_SLV_ID 8#define SLAVE_ID_MASK 0x7#define SLAVE_ID_SHIFT 16 +#define SLAVE_ID (addr) FIELD_GET(GENMASK(19, 16), addr) +#define VRM_ADDR (addr) FIELD_GET(GENMASK(19, 4), addr)/** * struct entry_header: header for each entry in cmddb
@@ -221,6 +227,30 @@ const void *cmd_db_read_aux_data(const cEXPORT_SYMBOL (cmd_db_read_aux_data);/** +* cmd_db_match_resource_addr() - Compare if both Resource addresses are same +* +* @addr1: Resource address to compare +* @addr2: Resource address to compare +* +* Return: true if two addresses refer to the same resource, false otherwise +*/ +bool cmd_db_match_resource_addr (u32 addr1,u32 addr2) +{ +/* +* Each RPMh VRM accelerator resource has 3 or 4 contiguous 4-byte +* aligned addresses associated with it. Ignore the offset to check +* for VRM requests. +*/ +if (addr1 == addr2) +return true; +else if (SLAVE_ID (addr1) ==CMD_DB_HW_VRM &&VRM_ADDR (addr1) ==VRM_ADDR (addr2)) +return true; + +return false; +} +EXPORT_SYMBOL_GPL (cmd_db_match_resource_addr); + +/** * cmd_db_read_slave_id - Get the slave ID for a given resource address * * @id: Resource id to query the DB for version
drivers/soc/qcom/rpmh-rsc.c +2 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved. */ #define pr_fmt (fmt) "%s " fmt, KBUILD_MODNAME
@@ -557,7 +558,7 @@ static int check_for_req_inflight(structfor_each_set_bit (j, &curr_enabled,MAX_CMDS_PER_TCS ) { addr =read_tcs_cmd (drv, drv->regs[RSC_DRV_CMD_ADDR ], i, j);for (k =0 ; k < msg->num_cmds; k++) { -if (addr == msg->cmds[k].addr) +if (cmd_db_match_resource_addr (msg->cmds[k].addr, addr))return -EBUSY ; } }
include/soc/qcom/cmd-db.h +9 -1
@@ -1,5 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. */ +/* +* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. +*/ #ifndef __QCOM_COMMAND_DB_H__#define __QCOM_COMMAND_DB_H__
@@ -21,6 +24,8 @@ u32 cmd_db_read_addr(const char *resourcconst void *cmd_db_read_aux_data (const char *resource_id,size_t *len); +bool cmd_db_match_resource_addr (u32 addr1,u32 addr2); +enum cmd_db_hw_type cmd_db_read_slave_id (const char *resource_id);int cmd_db_ready (void );
@@ -31,6 +36,9 @@ static inline u32 cmd_db_read_addr(conststatic inline const void *cmd_db_read_aux_data (const char *resource_id,size_t *len) {return ERR_PTR (-ENODEV ); } +static inline bool cmd_db_match_resource_addr (u32 addr1,u32 addr2) +{return false; } +static inline enum cmd_db_hw_type cmd_db_read_slave_id (const char *resource_id) {return -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 28/137 ACPI: resource: Do IRQ override on TongFang GXxHRXx and GMxHGxx
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoffer Sandberg <[email protected]>
commit c81bf14f9db68311c2e75428eea070d97d603975 upstream.
Listed devices need the override for the keyboard to work.
--- drivers/acpi/resource.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/acpi/resource.c +12 -0
@@ -594,6 +594,18 @@ static const struct dmi_system_id lg_lap DMI_MATCH(DMI_BOARD_NAME, "17U70P"), }, }, + { +/* TongFang GXxHRXx/TUXEDO InfinityBook Pro Gen9 AMD */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GXxHRXx"), + }, + }, + { +/* TongFang GMxHGxx/TUXEDO Stellaris Slim Gen1 AMD */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GMxHGxx"), + }, + }, { } };
Greg Kroah-Hartman
maintainerPATCH 29/137 arm64: tegra: Correct Tegra132 I2C alias
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 2633c58e1354d7de2c8e7be8bdb6f68a0a01bad7 upstream.
There is no such device as "as3722@40", because its name is "pmic". Use phandles for aliases to fix relying on full node path. This corrects aliases for RTC devices and also fixes dtc W=1 warning:
tegra132-norrin.dts:12.3-36: Warning (alias_paths): /aliases:rtc0: aliases property is not a valid node (/i2c@7000d000/as3722@40)
--- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +2 -2
@@ -9,8 +9,8 @@ compatible = "nvidia,norrin", "nvidia,tegra132", "nvidia,tegra124"; aliases { - rtc0 = "/i2c@7000d000/as3722@40"; - rtc1 = "/rtc@7000e000"; + rtc0 = &as3722; + rtc1 = &tegra_rtc; serial0 = &uarta; };
arch/arm64/boot/dts/nvidia/tegra132.dtsi +1 -1
@@ -570,7 +570,7 @@ status = "disabled"; }; - rtc@7000e000 { + tegra_rtc: rtc@7000e000 { compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc"; reg = <0x0 0x7000e000 0x0 0x100>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
Greg Kroah-Hartman
maintainerPATCH 30/137 arm64: dts: qcom: qcs404: fix bluetooth device address
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit f5f390a77f18eaeb2c93211a1b7c5e66b5acd423 upstream.
The 'local-bd-address' property is used to pass a unique Bluetooth device address from the boot firmware to the kernel and should otherwise be left unset so that the OS can prevent the controller from being used until a valid address has been provided through some other means (e.g. using btmgmt).
--- arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi +1 -1
@@ -62,7 +62,7 @@ vddrf-supply = <&vreg_l1_1p3>; vddch0-supply = <&vdd_ch0_3p3>; - local-bd-address = [ 02 00 00 00 5a ad ]; + local-bd-address = [ 00 00 00 00 00 00 ]; max-speed = <3200000>; };
Greg Kroah-Hartman
maintainerPATCH 31/137 md/raid5: fix deadlock that raid5d() wait for itself to clear MD_SB_CHANGE_PENDING
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit 151f66bb618d1fd0eeb84acb61b4a9fa5d8bb0fa upstream.
Xiao reported that lvm2 test lvconvert-raid-takeover.sh can hang with small possibility, the root cause is exactly the same as commit bed9e27baf52 ("Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d"")
However, Dan reported another hang after that, and junxiao investigated the problem and found out that this is caused by plugged bio can't issue from raid5d().
Current implementation in raid5d() has a weird dependence:
1) md_check_recovery() from raid5d() must hold 'reconfig_mutex' to clear MD_SB_CHANGE_PENDING;
2) raid5d() handles IO in a deadloop, until all IO are issued;
3) IO from raid5d() must wait for MD_SB_CHANGE_PENDING to be cleared;
This behaviour is introduce before v2.6, and for consequence, if other context hold 'reconfig_mutex', and md_check_recovery() can't update super_block, then raid5d() will waste one cpu 100% by the deadloop, until 'reconfig_mutex' is released.
Refer to the implementation from raid1 and raid10, fix this problem by skipping issue IO if MD_SB_CHANGE_PENDING is still set after md_check_recovery(), daemon thread will be woken up when 'reconfig_mutex' is released. Meanwhile, the hang problem will be fixed as well.
--- drivers/md/raid5.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/md/raid5.c +3 -12
@@ -36,7 +36,6 @@*/ #include <linux/blkdev.h> -#include <linux/delay.h> #include <linux/kthread.h> #include <linux/raid/pq.h> #include <linux/async_tx.h>
@@ -6807,6 +6806,9 @@ static void raid5d(struct md_thread *thrint batch_size, released;unsigned int offset; +if (test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags)) +break ; + released =release_stripe_list (conf, conf->temp_inactive_list);if (released)clear_bit (R5_DID_ALLOC , &conf->cache_state);
@@ -6843,18 +6845,7 @@ static void raid5d(struct md_thread *thrspin_unlock_irq (&conf->device_lock);md_check_recovery (mddev);spin_lock_irq (&conf->device_lock); - -/* -* Waiting on MD_SB_CHANGE_PENDING below may deadlock -* seeing md_check_recovery() is needed to clear -* the flag when using mdmon. -*/ -continue ; } - -wait_event_lock_irq (mddev->sb_wait, - !test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags), - conf->device_lock); }pr_debug ("%d stripes handled\n" , handled);
Greg Kroah-Hartman
maintainerPATCH 32/137 wifi: rtw89: pci: correct TX resource checking for PCI DMA channel of firmware command
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
commit c6330b129786e267b14129335a08fa7c331c308d upstream.
The DMA channel of firmware command doesn't use TX WD (WiFi descriptor), so don't need to consider number of TX WD as factor of TX resource. Otherwise, during pause state (a transient state to switch to/from low power mode) firmware commands could be dropped and driver throws warnings suddenly:
rtw89_8852ce 0000:04:00.0: no tx fwcmd resource rtw89_8852ce 0000:04:00.0: failed to send h2c
The case we met is that driver sends RSSI strength of firmware command at RX path that could be running concurrently with switching low power mode. The missing of this firmware command doesn't affect user experiences, because the RSSI strength will be updated again after a while.
The DMA descriptors of normal packets has three layers like:
+-------+
| TX BD | (*n elements)
+-------+
|
| +-------+
+-> | TX WD | (*m elements)
+-------+
|
| +--------+
+-> | SKB |
+--------+And, firmware command queue (TXCH 12) is a special queue that has only two layers:
+-------+
| TX BD | (*n elements)
+-------+
|
| +------------------+
+-> | firmware command |
+------------------+--- drivers/net/wireless/realtek/rtw89/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/pci.c +2 -1
@@ -958,7 +958,8 @@ u32 __rtw89_pci_check_and_reclaim_tx_resspin_lock_bh (&rtwpci->trx_lock); cnt =rtw89_pci_get_avail_txbd_num (tx_ring); - cnt =min (cnt, wd_ring->curr_num); +if (txch !=RTW89_TXCH_CH12 ) + cnt =min (cnt, wd_ring->curr_num);spin_unlock_bh (&rtwpci->trx_lock);return cnt;
Greg Kroah-Hartman
maintainerPATCH 33/137 wifi: rtl8xxxu: Fix the TX power of RTL8192CU, RTL8723AU
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
commit 08b5d052d17a89bb8706b2888277d0b682dc1610 upstream.
Don't subtract 1 from the power index. This was added in commit 2fc0b8e5a17d ("rtl8xxxu: Add TX power base values for gen1 parts") for unknown reasons. The vendor drivers don't do this.
Also correct the calculations of values written to REG_OFDM0_X{C,D}_TX_IQ_IMBALANCE. According to the vendor driver, these are used for TX power training.
With these changes rtl8xxxu sets the TX power of RTL8192CU the same as the vendor driver.
None of this appears to have any effect on my RTL8192CU device.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 25 +++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +10 -15
@@ -1505,13 +1505,13 @@ rtl8xxxu_gen1_set_tx_power(struct rtl8xxu8 cck[RTL8723A_MAX_RF_PATHS ], ofdm[RTL8723A_MAX_RF_PATHS ];u8 ofdmbase[RTL8723A_MAX_RF_PATHS ], mcsbase[RTL8723A_MAX_RF_PATHS ];u32 val32, ofdm_a, ofdm_b, mcs_a, mcs_b; -u8 val8; +u8 val8, base;int group, i; group =rtl8xxxu_gen1_channel_to_group (channel); - cck[0 ] = priv->cck_tx_power_index_A[group] -1 ; - cck[1 ] = priv->cck_tx_power_index_B[group] -1 ; + cck[0 ] = priv->cck_tx_power_index_A[group]; + cck[1 ] = priv->cck_tx_power_index_B[group];if (priv->hi_pa) {if (cck[0 ] >0x20 )
@@ -1522,10 +1522,6 @@ rtl8xxxu_gen1_set_tx_power(struct rtl8xx ofdm[0 ] = priv->ht40_1s_tx_power_index_A[group]; ofdm[1 ] = priv->ht40_1s_tx_power_index_B[group]; -if (ofdm[0 ]) - ofdm[0 ] -=1 ; -if (ofdm[1 ]) - ofdm[1 ] -=1 ; ofdmbase[0 ] = ofdm[0 ] + priv->ofdm_tx_power_index_diff[group].a; ofdmbase[1 ] = ofdm[1 ] + priv->ofdm_tx_power_index_diff[group].b;
@@ -1614,20 +1610,19 @@ rtl8xxxu_gen1_set_tx_power(struct rtl8xxrtl8xxxu_write32 (priv,REG_TX_AGC_A_MCS15_MCS12 , mcs_a + power_base->reg_0e1c); + val8 =u32_get_bits (mcs_a + power_base->reg_0e1c,0xff000000 );for (i =0 ; i <3 ; i++) { -if (i !=2 ) - val8 = (mcsbase[0 ] >8 ) ? (mcsbase[0 ] -8 ) :0 ; -else - val8 = (mcsbase[0 ] >6 ) ? (mcsbase[0 ] -6 ) :0 ; + base = i !=2 ?8 :6 ; + val8 =max_t (int, val8 - base,0 );rtl8xxxu_write8 (priv,REG_OFDM0_XC_TX_IQ_IMBALANCE + i, val8); } +rtl8xxxu_write32 (priv,REG_TX_AGC_B_MCS15_MCS12 , mcs_b + power_base->reg_0868); + val8 =u32_get_bits (mcs_b + power_base->reg_0868,0xff000000 );for (i =0 ; i <3 ; i++) { -if (i !=2 ) - val8 = (mcsbase[1 ] >8 ) ? (mcsbase[1 ] -8 ) :0 ; -else - val8 = (mcsbase[1 ] >6 ) ? (mcsbase[1 ] -6 ) :0 ; + base = i !=2 ?8 :6 ; + val8 =max_t (int, val8 - base,0 );rtl8xxxu_write8 (priv,REG_OFDM0_XD_TX_IQ_IMBALANCE + i, val8); } }
Greg Kroah-Hartman
maintainerPATCH 34/137 wifi: rtlwifi: rtl8192de: Fix 5 GHz TX power
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
commit de4d4be4fa64ed7b4aa1c613061015bd8fa98b24 upstream.
Different channels have different TX power settings. rtl8192de is using the TX power setting from the wrong channel in the 5 GHz band because _rtl92c_phy_get_rightchnlplace expects an array which includes all the channel numbers, but it's using an array which includes only the 5 GHz channel numbers.
Use the array channel_all (defined in rtl8192de/phy.c) instead of the incorrect channel5g (defined in core.c).
Tested only with rtl8192du, which will use the same TX power code.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +2 -2
@@ -892,8 +892,8 @@ static u8 _rtl92c_phy_get_rightchnlplaceu8 place = chnl;if (chnl >14 ) { -for (place =14 ; place <ARRAY_SIZE (channel5g); place++) { -if (channel5g[place] == chnl) { +for (place =14 ; place <ARRAY_SIZE (channel_all); place++) { +if (channel_all[place] == chnl) { place++;break ; }
Greg Kroah-Hartman
maintainerPATCH 35/137 wifi: rtlwifi: rtl8192de: Fix low speed with WPA3-SAE
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
commit a7c0f48410f546772ac94a0f7b7291a15c4fc173 upstream.
Some (all?) management frames are incorrectly reported to mac80211 as decrypted when actually the hardware did not decrypt them. This results in speeds 3-5 times lower than expected, 20-30 Mbps instead of 100 Mbps.
Fix this by checking the encryption type field of the RX descriptor. rtw88 does the same thing.
This fix was tested only with rtl8192du, which will use the same code.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 5 ++--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +2 -3
@@ -414,7 +414,8 @@ bool rtl92de_rx_query_desc(struct ieee80 stats->icv = (u16 )get_rx_desc_icv (pdesc); stats->crc = (u16 )get_rx_desc_crc32 (pdesc); stats->hwerror = (stats->crc | stats->icv); - stats->decrypted = !get_rx_desc_swdec (pdesc); + stats->decrypted = !get_rx_desc_swdec (pdesc) && +get_rx_desc_enc_type (pdesc) !=RX_DESC_ENC_NONE ; stats->rate = (u8 )get_rx_desc_rxmcs (pdesc); stats->shortpreamble = (u16 )get_rx_desc_splcp (pdesc); stats->isampdu = (bool )(get_rx_desc_paggr (pdesc) ==1 );
@@ -427,8 +428,6 @@ bool rtl92de_rx_query_desc(struct ieee80 rx_status->band = hw->conf.chandef.chan->band;if (get_rx_desc_crc32 (pdesc)) rx_status->flag |=RX_FLAG_FAILED_FCS_CRC ; -if (!get_rx_desc_swdec (pdesc)) - rx_status->flag |=RX_FLAG_DECRYPTED ;if (get_rx_desc_bw (pdesc)) rx_status->bw =RATE_INFO_BW_40 ;if (get_rx_desc_rxht (pdesc))
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h +14 -0
@@ -14,6 +14,15 @@#define USB_HWDESC_HEADER_LEN 32#define CRCLENGTH 4 +enum rtl92d_rx_desc_enc { +RX_DESC_ENC_NONE =0 , +RX_DESC_ENC_WEP40 =1 , +RX_DESC_ENC_TKIP_WO_MIC =2 , +RX_DESC_ENC_TKIP_MIC =3 , +RX_DESC_ENC_AES =4 , +RX_DESC_ENC_WEP104 =5 , +}; +/* macros to read/write various fields in RX or TX descriptors */ static inline void set_tx_desc_pkt_size (__le32 *__pdesc,u32 __val)
@@ -246,6 +255,11 @@ static inline u32 get_rx_desc_drv_info_sreturn le32_get_bits (*__pdesc,GENMASK (19 ,16 )); } +static inline u32 get_rx_desc_enc_type (__le32 *__pdesc) +{ +return le32_get_bits (*__pdesc,GENMASK (22 ,20 )); +} +static inline u32 get_rx_desc_shift (__le32 *__pdesc) {return le32_get_bits (*__pdesc,GENMASK (25 ,24 ));
Greg Kroah-Hartman
maintainerPATCH 36/137 wifi: rtlwifi: rtl8192de: Fix endianness issue in RX path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
commit 2f228d364da95ab58f63a3fedc00d5b2b7db16ab upstream.
Structs rx_desc_92d and rx_fwinfo_92d will not work for big endian systems.
Delete rx_desc_92d because it's big and barely used, and instead use the get_rx_desc_rxmcs and get_rx_desc_rxht functions, which work on big endian systems too.
Fix rx_fwinfo_92d by duplicating four of its members in the correct order.
Tested only with RTL8192DU, which will use the same code. Tested only on a little endian system.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 16 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 65 ++----------------- 2 files changed, 15 insertions(+), 66 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +8 -8
@@ -35,7 +35,7 @@ static long _rtl92de_translate_todbm(str static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, struct rtl_stats *pstats, - struct rx_desc_92d *pdesc, + __le32 *pdesc, struct rx_fwinfo_92d *p_drvinfo, bool packet_match_bssid, bool packet_toself,
@@ -49,8 +49,10 @@ static void _rtl92de_query_rxphystatus(su8 i, max_spatial_stream;u32 rssi, total_rssi =0 ;bool is_cck_rate; +u8 rxmcs; - is_cck_rate =RX_HAL_IS_CCK_RATE (pdesc->rxmcs); + rxmcs =get_rx_desc_rxmcs (pdesc); + is_cck_rate = rxmcs <=DESC_RATE11M ; pstats->packet_matchbssid = packet_match_bssid; pstats->packet_toself = packet_toself; pstats->packet_beacon = packet_beacon;
@@ -158,8 +160,8 @@ static void _rtl92de_query_rxphystatus(s pstats->rx_pwdb_all = pwdb_all; pstats->rxpower = rx_pwr_all; pstats->recvsignalpower = rx_pwr_all; -if (pdesc->rxht && pdesc->rxmcs >=DESC_RATEMCS8 && - pdesc->rxmcs <=DESC_RATEMCS15 ) +if (get_rx_desc_rxht (pdesc) && rxmcs >=DESC_RATEMCS8 && + rxmcs <=DESC_RATEMCS15 ) max_spatial_stream =2 ;else max_spatial_stream =1 ;
@@ -365,7 +367,7 @@ static void _rtl92de_process_phyinfo(strstatic void _rtl92de_translate_rx_signal_stuff (struct ieee80211_hw *hw,struct sk_buff *skb,struct rtl_stats *pstats, -struct rx_desc_92d *pdesc, +__le32 *pdesc,struct rx_fwinfo_92d *p_drvinfo) {struct rtl_mac *mac =rtl_mac (rtl_priv (hw));
@@ -441,9 +443,7 @@ bool rtl92de_rx_query_desc(struct ieee80if (phystatus) { p_drvinfo = (struct rx_fwinfo_92d *)(skb->data + stats->rx_bufshift); -_rtl92de_translate_rx_signal_stuff (hw, - skb, stats, - (struct rx_desc_92d *)pdesc, +_rtl92de_translate_rx_signal_stuff (hw, skb, stats, pdesc, p_drvinfo); }/*rx_status->qual = stats->signal; */
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h +7 -58
81 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 37/137 arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 2b621971554a94094cf489314dc1c2b65401965c upstream.
Add the missing PCIe CX performance level votes to avoid relying on other drivers (e.g. USB or UFS) to maintain the nominal performance level required for Gen3 speeds.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +5 -0
@@ -1798,6 +1798,7 @@ assigned-clock-rates = <100000000>; power-domains = <&gcc PCIE_4_GDSC>; + required-opps = <&rpmhpd_opp_nom>; resets = <&gcc GCC_PCIE_4_PHY_BCR>; reset-names = "phy";
@@ -1897,6 +1898,7 @@ assigned-clock-rates = <100000000>; power-domains = <&gcc PCIE_3B_GDSC>; + required-opps = <&rpmhpd_opp_nom>; resets = <&gcc GCC_PCIE_3B_PHY_BCR>; reset-names = "phy";
@@ -1997,6 +1999,7 @@ assigned-clock-rates = <100000000>; power-domains = <&gcc PCIE_3A_GDSC>; + required-opps = <&rpmhpd_opp_nom>; resets = <&gcc GCC_PCIE_3A_PHY_BCR>; reset-names = "phy";
@@ -2098,6 +2101,7 @@ assigned-clock-rates = <100000000>; power-domains = <&gcc PCIE_2B_GDSC>; + required-opps = <&rpmhpd_opp_nom>; resets = <&gcc GCC_PCIE_2B_PHY_BCR>; reset-names = "phy";
@@ -2198,6 +2202,7 @@ assigned-clock-rates = <100000000>; power-domains = <&gcc PCIE_2A_GDSC>; + required-opps = <&rpmhpd_opp_nom>; resets = <&gcc GCC_PCIE_2A_PHY_BCR>; reset-names = "phy";
Greg Kroah-Hartman
maintainerPATCH 38/137 arm64: dts: hi3798cv200: fix the size of GICR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Xiwen <[email protected]>
commit 428a575dc9038846ad259466d5ba109858c0a023 upstream.
During boot, Linux kernel complains:
[ 0.000000] GIC: GICv2 detected, but range too small and irqchip.gicv2_force_probe not set
This SoC is using a regular GIC-400 and the GICR space size should be 8KB rather than 256B.
With this patch:
[ 0.000000] GIC: Using split EOI/Deactivate mode
So this should be the correct fix.
--- arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +1 -1
@@ -58,7 +58,7 @@ gic: interrupt-controller@f1001000 { compatible = "arm,gic-400"; reg = <0x0 0xf1001000 0x0 0x1000>, /* GICD */ - <0x0 0xf1002000 0x0 0x100>; /* GICC */ + <0x0 0xf1002000 0x0 0x2000>; /* GICC */ #address-cells = <0>; #interrupt-cells = <3>; interrupt-controller;
Greg Kroah-Hartman
maintainerPATCH 39/137 arm64: dts: ti: verdin-am62: Set memory size to 2gb
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Krummenacher <[email protected]>
commit f70a88829723c1b462ea0fec15fa75809a0d670b upstream.
The maximum DDR RAM size stuffed on the Verdin AM62 is 2GB, correct the memory node accordingly.
--- arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi +1 -1
@@ -60,7 +60,7 @@ memory@80000000 { device_type = "memory"; - reg = <0x00000000 0x80000000 0x00000000 0x40000000>; /* 1G RAM */ + reg = <0x00000000 0x80000000 0x00000000 0x80000000>; /* 2G RAM */ }; opp-table {
Greg Kroah-Hartman
maintainerPATCH 40/137 media: mc: Fix graph walk in media_pipeline_start
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
commit 8a9d420149c477e7c97fbd6453704e4612bdd3fa upstream.
The graph walk tries to follow all links, even if they are not between pads. This causes a crash with, e.g. a MEDIA_LNK_FL_ANCILLARY_LINK link.
Fix this by allowing the walk to proceed only for MEDIA_LNK_FL_DATA_LINK links.
--- drivers/media/mc/mc-entity.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/mc/mc-entity.c +6 -0
@@ -606,6 +606,12 @@ static int media_pipeline_explore_next_l link =list_entry (entry->links,typeof (*link), list); last_link =media_pipeline_walk_pop (walk); +if ((link->flags &MEDIA_LNK_FL_LINK_TYPE ) !=MEDIA_LNK_FL_DATA_LINK ) { +dev_dbg (walk->mdev->dev, +"media pipeline: skipping link (not data-link)\n" ); +return 0 ; + } + dev_dbg(walk->mdev->dev, "media pipeline: exploring link '%s':%u -> '%s':%u\n", link->source->entity->name, link->source->index,
Greg Kroah-Hartman
maintainerPATCH 41/137 media: mc: mark the media devnode as registered from the, start
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
commit 4bc60736154bc9e0e39d3b88918f5d3762ebe5e0 upstream.
First the media device node was created, and if successful it was marked as 'registered'. This leaves a small race condition where an application can open the device node and get an error back because the 'registered' flag was not yet set.
Change the order: first set the 'registered' flag, then actually register the media device node. If that fails, then clear the flag.
--- drivers/media/mc/mc-devnode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/mc/mc-devnode.c +2 -3
@@ -246,15 +246,14 @@ int __must_check media_devnode_register(kobject_set_name (&devnode->cdev.kobj,"media%d" , devnode->minor);/* Part 3: Add the media and char device */ +set_bit (MEDIA_FLAG_REGISTERED , &devnode->flags); ret =cdev_device_add (&devnode->cdev, &devnode->dev);if (ret <0 ) { +clear_bit (MEDIA_FLAG_REGISTERED , &devnode->flags);pr_err ("%s: cdev_device_add failed\n" , __func__); goto cdev_add_error; } -/* Part 4: Activate this minor. The char device can now be used. */ -set_bit (MEDIA_FLAG_REGISTERED , &devnode->flags); -return 0 ; cdev_add_error:
Greg Kroah-Hartman
maintainerPATCH 42/137 media: mxl5xx: Move xpt structures off stack
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 526f4527545b2d4ce0733733929fac7b6da09ac6 upstream.
When building for LoongArch with clang 18.0.0, the stack usage of probe() is larger than the allowed 2048 bytes:
drivers/media/dvb-frontends/mxl5xx.c:1698:12: warning: stack frame size (2368) exceeds limit (2048) in 'probe' [-Wframe-larger-than]
1698 | static int probe(struct mxl *state, struct mxl5xx_cfg *cfg)
| ^
1 warning generated.
This is the result of the linked LLVM commit, which changes how the arrays of structures in config_ts() get handled with CONFIG_INIT_STACK_ZERO and CONFIG_INIT_STACK_PATTERN, which causes the above warning in combination with inlining, as config_ts() gets inlined into probe().
This warning can be easily fixed by moving the array of structures off of the stackvia 'static const', which is a better location for these variables anyways because they are static data that is only ever read from, never modified, so allocating the stack space is wasteful.
This drops the stack usage from 2368 bytes to 256 bytes with the same compiler and configuration.
--- drivers/media/dvb-frontends/mxl5xx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/media/dvb-frontends/mxl5xx.c +11 -11
@@ -1381,57 +1381,57 @@ static int config_ts(struct mxl *state,u32 nco_count_min =0 ;u32 clk_type =0 ; -struct MXL_REG_FIELD_T xpt_sync_polarity[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_sync_polarity[MXL_HYDRA_DEMOD_MAX ] = { {0x90700010 ,8 ,1 }, {0x90700010 ,9 ,1 }, {0x90700010 ,10 ,1 }, {0x90700010 ,11 ,1 }, {0x90700010 ,12 ,1 }, {0x90700010 ,13 ,1 }, {0x90700010 ,14 ,1 }, {0x90700010 ,15 ,1 } }; -struct MXL_REG_FIELD_T xpt_clock_polarity[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_clock_polarity[MXL_HYDRA_DEMOD_MAX ] = { {0x90700010 ,16 ,1 }, {0x90700010 ,17 ,1 }, {0x90700010 ,18 ,1 }, {0x90700010 ,19 ,1 }, {0x90700010 ,20 ,1 }, {0x90700010 ,21 ,1 }, {0x90700010 ,22 ,1 }, {0x90700010 ,23 ,1 } }; -struct MXL_REG_FIELD_T xpt_valid_polarity[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_valid_polarity[MXL_HYDRA_DEMOD_MAX ] = { {0x90700014 ,0 ,1 }, {0x90700014 ,1 ,1 }, {0x90700014 ,2 ,1 }, {0x90700014 ,3 ,1 }, {0x90700014 ,4 ,1 }, {0x90700014 ,5 ,1 }, {0x90700014 ,6 ,1 }, {0x90700014 ,7 ,1 } }; -struct MXL_REG_FIELD_T xpt_ts_clock_phase[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_ts_clock_phase[MXL_HYDRA_DEMOD_MAX ] = { {0x90700018 ,0 ,3 }, {0x90700018 ,4 ,3 }, {0x90700018 ,8 ,3 }, {0x90700018 ,12 ,3 }, {0x90700018 ,16 ,3 }, {0x90700018 ,20 ,3 }, {0x90700018 ,24 ,3 }, {0x90700018 ,28 ,3 } }; -struct MXL_REG_FIELD_T xpt_lsb_first[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_lsb_first[MXL_HYDRA_DEMOD_MAX ] = { {0x9070000C ,16 ,1 }, {0x9070000C ,17 ,1 }, {0x9070000C ,18 ,1 }, {0x9070000C ,19 ,1 }, {0x9070000C ,20 ,1 }, {0x9070000C ,21 ,1 }, {0x9070000C ,22 ,1 }, {0x9070000C ,23 ,1 } }; -struct MXL_REG_FIELD_T xpt_sync_byte[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_sync_byte[MXL_HYDRA_DEMOD_MAX ] = { {0x90700010 ,0 ,1 }, {0x90700010 ,1 ,1 }, {0x90700010 ,2 ,1 }, {0x90700010 ,3 ,1 }, {0x90700010 ,4 ,1 }, {0x90700010 ,5 ,1 }, {0x90700010 ,6 ,1 }, {0x90700010 ,7 ,1 } }; -struct MXL_REG_FIELD_T xpt_enable_output[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_enable_output[MXL_HYDRA_DEMOD_MAX ] = { {0x9070000C ,0 ,1 }, {0x9070000C ,1 ,1 }, {0x9070000C ,2 ,1 }, {0x9070000C ,3 ,1 }, {0x9070000C ,4 ,1 }, {0x9070000C ,5 ,1 }, {0x9070000C ,6 ,1 }, {0x9070000C ,7 ,1 } }; -struct MXL_REG_FIELD_T xpt_err_replace_sync[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_err_replace_sync[MXL_HYDRA_DEMOD_MAX ] = { {0x9070000C ,24 ,1 }, {0x9070000C ,25 ,1 }, {0x9070000C ,26 ,1 }, {0x9070000C ,27 ,1 }, {0x9070000C ,28 ,1 }, {0x9070000C ,29 ,1 }, {0x9070000C ,30 ,1 }, {0x9070000C ,31 ,1 } }; -struct MXL_REG_FIELD_T xpt_err_replace_valid[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_err_replace_valid[MXL_HYDRA_DEMOD_MAX ] = { {0x90700014 ,8 ,1 }, {0x90700014 ,9 ,1 }, {0x90700014 ,10 ,1 }, {0x90700014 ,11 ,1 }, {0x90700014 ,12 ,1 }, {0x90700014 ,13 ,1 }, {0x90700014 ,14 ,1 }, {0x90700014 ,15 ,1 } }; -struct MXL_REG_FIELD_T xpt_continuous_clock[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_continuous_clock[MXL_HYDRA_DEMOD_MAX ] = { {0x907001D4 ,0 ,1 }, {0x907001D4 ,1 ,1 }, {0x907001D4 ,2 ,1 }, {0x907001D4 ,3 ,1 }, {0x907001D4 ,4 ,1 }, {0x907001D4 ,5 ,1 }, {0x907001D4 ,6 ,1 }, {0x907001D4 ,7 ,1 } }; -struct MXL_REG_FIELD_T xpt_nco_clock_rate[MXL_HYDRA_DEMOD_MAX ] = { +static const struct MXL_REG_FIELD_T xpt_nco_clock_rate[MXL_HYDRA_DEMOD_MAX ] = { {0x90700044 ,16 ,80 }, {0x90700044 ,16 ,81 }, {0x90700044 ,16 ,82 }, {0x90700044 ,16 ,83 }, {0x90700044 ,16 ,84 }, {0x90700044 ,16 ,85 },
Greg Kroah-Hartman
maintainerPATCH 43/137 media: v4l2-core: hold videodev_lock until dev reg, finishes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
commit 1ed4477f2ea4743e7c5e1f9f3722152d14e6eeb1 upstream.
After the new V4L2 device node was registered, some additional initialization was done before the device node was marked as 'registered'. During the time between creating the device node and marking it as 'registered' it was possible to open the device node, which would return -ENODEV since the 'registered' flag was not yet set.
Hold the videodev_lock mutex from just before the device node is registered until the 'registered' flag is set. Since v4l2_open will take the same lock, it will wait until this registration process is finished. This resolves this race condition.
--- drivers/media/v4l2-core/v4l2-dev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/v4l2-core/v4l2-dev.c +3 -0
@@ -1034,8 +1034,10 @@ int __video_register_device(struct video vdev->dev.devt =MKDEV (VIDEO_MAJOR , vdev->minor); vdev->dev.parent = vdev->dev_parent;dev_set_name (&vdev->dev,"%s%d" , name_base, vdev->num); +mutex_lock (&videodev_lock); ret =device_register (&vdev->dev);if (ret <0 ) { +mutex_unlock (&videodev_lock);pr_err ("%s: device_register failed\n" , __func__); goto cleanup; }
@@ -1055,6 +1057,7 @@ int __video_register_device(struct video/* Part 6: Activate this minor. The char device can now be used. */ set_bit (V4L2_FL_REGISTERED , &vdev->flags); +mutex_unlock (&videodev_lock);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 44/137 media: v4l: async: Properly re-initialise notifier entry in unregister
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit 9537a8425a7a0222999d5839a0b394b1e8834b4a upstream.
The notifier_entry of a notifier is not re-initialised after unregistering the notifier. This leads to dangling pointers being left there so use list_del_init() to return the notifier_entry an empty list.
--- drivers/media/v4l2-core/v4l2-async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-async.c +1 -1
@@ -639,7 +639,7 @@ __v4l2_async_nf_unregister(struct v4l2_av4l2_async_nf_unbind_all_subdevs (notifier); -list_del (¬ifier->notifier_entry); +list_del_init (¬ifier->notifier_entry); }void v4l2_async_nf_unregister (struct v4l2_async_notifier *notifier)
Greg Kroah-Hartman
maintainerPATCH 45/137 media: v4l: async: Dont set notifiers V4L2 device if registering fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit 46bc0234ad38063ce550ecf135c1a52458f0a804 upstream.
The V4L2 device used to be set when the notifier was registered but this has been moved to the notifier initialisation. Don't touch the V4L2 device if registration fails.
--- drivers/media/v4l2-core/v4l2-async.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +1 -7
@@ -618,16 +618,10 @@ err_unlock:int v4l2_async_nf_register (struct v4l2_async_notifier *notifier) { -int ret; -if (WARN_ON (!notifier->v4l2_dev == !notifier->sd))return -EINVAL ; - ret =__v4l2_async_nf_register (notifier); -if (ret) - notifier->v4l2_dev =NULL ; - -return ret; +return __v4l2_async_nf_register (notifier); }EXPORT_SYMBOL (v4l2_async_nf_register);
Greg Kroah-Hartman
maintainerPATCH 46/137 media: v4l: async: Fix notifier list entry init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
commit 6d8acd02c4c6a8f917eefac1de2e035521ca119d upstream.
struct v4l2_async_notifier has several list_head members, but only waiting_list and done_list are initialized. notifier_entry was kept 'zeroed' leading to an uninitialized list_head.
This results in a NULL-pointer dereference if csi2_async_register() fails, e.g. node for remote endpoint is disabled, and returns -ENOTCONN. The following calls to v4l2_async_nf_unregister() results in a NULL pointer dereference.
Add the missing list head initializer.
--- drivers/media/v4l2-core/v4l2-async.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/v4l2-core/v4l2-async.c +2 -0
@@ -563,6 +563,7 @@ void v4l2_async_nf_init(struct v4l2_asyn {INIT_LIST_HEAD (¬ifier->waiting_list);INIT_LIST_HEAD (¬ifier->done_list); +INIT_LIST_HEAD (¬ifier->notifier_entry); notifier->v4l2_dev = v4l2_dev; }EXPORT_SYMBOL (v4l2_async_nf_init);
@@ -572,6 +573,7 @@ void v4l2_async_subdev_nf_init(struct v4 {INIT_LIST_HEAD (¬ifier->waiting_list);INIT_LIST_HEAD (¬ifier->done_list); +INIT_LIST_HEAD (¬ifier->notifier_entry); notifier->sd = sd; }EXPORT_SYMBOL_GPL (v4l2_async_subdev_nf_init);
Greg Kroah-Hartman
maintainerPATCH 47/137 mmc: davinci: Dont strip remove function when driver is builtin
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
commit 55c421b364482b61c4c45313a535e61ed5ae4ea3 upstream.
Using __exit for the remove function results in the remove callback being discarded with CONFIG_MMC_DAVINCI=y. When such a device gets unbound (e.g. using sysfs or hotplug), the driver is just removed without the cleanup being performed. This results in resource leaks. Fix it by compiling in the remove callback unconditionally.
This also fixes a W=1 modpost warning:
WARNING: modpost: drivers/mmc/host/davinci_mmc: section mismatch in
reference: davinci_mmcsd_driver+0x10 (section: .data) -> davinci_mmcsd_remove (section: .exit.text)
--- drivers/mmc/host/davinci_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/davinci_mmc.c +2 -2
@@ -1344,7 +1344,7 @@ ioremap_fail:return ret; } -static void __exit davinci_mmcsd_remove(struct platform_device *pdev) +static void davinci_mmcsd_remove (struct platform_device *pdev) {struct mmc_davinci_host *host =platform_get_drvdata (pdev);
@@ -1399,7 +1399,7 @@ static struct platform_driver davinci_mm .of_match_table = davinci_mmc_dt_ids, }, .probe = davinci_mmcsd_probe, - .remove_new = __exit_p(davinci_mmcsd_remove), + .remove_new = davinci_mmcsd_remove, .id_table = davinci_mmc_devtype, };
Greg Kroah-Hartman
maintainerPATCH 48/137 mmc: core: Add mmc_gpiod_set_cd_config() function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 63a7cd660246aa36af263b85c33ecc6601bf04be upstream.
Some mmc host drivers may need to fixup a card-detection GPIO's config to e.g. enable the GPIO controllers builtin pull-up resistor on devices where the firmware description of the GPIO is broken (e.g. GpioInt with PullNone instead of PullUp in ACPI DSDT).
Since this is the exception rather then the rule adding a config parameter to mmc_gpiod_request_cd() seems undesirable, so instead add a new mmc_gpiod_set_cd_config() function. This is simply a wrapper to call gpiod_set_config() on the card-detect GPIO acquired through mmc_gpiod_request_cd().
--- drivers/mmc/core/slot-gpio.c | 20 ++++++++++++++++++++ include/linux/mmc/slot-gpio.h | 1 + 2 files changed, 21 insertions(+)
drivers/mmc/core/slot-gpio.c +20 -0
@@ -221,6 +221,26 @@ int mmc_gpiod_request_cd(struct mmc_host }EXPORT_SYMBOL (mmc_gpiod_request_cd); +/** +* mmc_gpiod_set_cd_config - set config for card-detection GPIO +* @host: mmc host +* @config: Generic pinconf config (from pinconf_to_config_packed()) +* +* This can be used by mmc host drivers to fixup a card-detection GPIO's config +* (e.g. set PIN_CONFIG_BIAS_PULL_UP) after acquiring the GPIO descriptor +* through mmc_gpiod_request_cd(). +* +* Returns: +* 0 on success, or a negative errno value on error. +*/ +int mmc_gpiod_set_cd_config (struct mmc_host *host,unsigned long config) +{ +struct mmc_gpio *ctx = host->slot.handler_priv; + +return gpiod_set_config (ctx->cd_gpio, config); +} +EXPORT_SYMBOL (mmc_gpiod_set_cd_config); +bool mmc_can_gpio_cd (struct mmc_host *host) {struct mmc_gpio *ctx = host->slot.handler_priv;
include/linux/mmc/slot-gpio.h +1 -0
@@ -21,6 +21,7 @@ int mmc_gpiod_request_cd(struct mmc_host unsigned int debounce);int mmc_gpiod_request_ro (struct mmc_host *host,const char *con_id,unsigned int idx,unsigned int debounce); +int mmc_gpiod_set_cd_config (struct mmc_host *host,unsigned long config);void mmc_gpio_set_cd_isr (struct mmc_host *host,irqreturn_t (*isr)(int irq,void *dev_id));int mmc_gpio_set_cd_wake (struct mmc_host *host,bool on);
Greg Kroah-Hartman
maintainerPATCH 49/137 mmc: sdhci: Add support for "Tuning Error" interrupts
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit b3855668d98cf9c6aec2db999dd27d872f8ba878 upstream.
Most Bay Trail devices do not enable UHS modes for the external sdcard slot the Lenovo Yoga Tablet 2 830 / 1050 and Lenovo Yoga Tablet 2 Pro 1380 (8", 10" and 13") models however do enable this.
Using a UHS cards in these tablets results in errors like this one:
[ 225.272001] mmc2: Unexpected interrupt 0x04000000. [ 225.272024] mmc2: sdhci: ============ SDHCI REGISTER DUMP =========== [ 225.272034] mmc2: sdhci: Sys addr: 0x0712c400 | Version: 0x0000b502 [ 225.272044] mmc2: sdhci: Blk size: 0x00007200 | Blk cnt: 0x00000007 [ 225.272054] mmc2: sdhci: Argument: 0x00000000 | Trn mode: 0x00000023 [ 225.272064] mmc2: sdhci: Present: 0x01e20002 | Host ctl: 0x00000016 [ 225.272073] mmc2: sdhci: Power: 0x0000000f | Blk gap: 0x00000000 [ 225.272082] mmc2: sdhci: Wake-up: 0x00000000 | Clock: 0x00000107 [ 225.272092] mmc2: sdhci: Timeout: 0x0000000e | Int stat: 0x00000001 [ 225.272101] mmc2: sdhci: Int enab: 0x03ff000b | Sig enab: 0x03ff000b [ 225.272110] mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000001 [ 225.272119] mmc2: sdhci: Caps: 0x076864b2 | Caps_1: 0x00000004 [ 225.272129] mmc2: sdhci: Cmd: 0x00000c1b | Max curr: 0x00000000 [ 225.272138] mmc2: sdhci: Resp[0]: 0x00000c00 | Resp[1]: 0x00000000 [ 225.272147] mmc2: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000900 [ 225.272155] mmc2: sdhci: Host ctl2: 0x0000000c [ 225.272164] mmc2: sdhci: ADMA Err: 0x00000003 | ADMA Ptr: 0x0712c200 [ 225.272172] mmc2: sdhci: ============================================
which results in IO errors leading to issues accessing the sdcard.
0x04000000 is a so-called "Tuning Error" which sofar the SDHCI driver does not support / enable. Modify the IRQ handler to process these.
This fixes UHS microsd cards not working with these tablets.
--- drivers/mmc/host/sdhci.c | 10 ++++++++-- drivers/mmc/host/sdhci.h | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +8 -2
@@ -3438,12 +3438,18 @@ static void sdhci_data_irq(struct sdhci_ host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); - }else if ((intmask &SDHCI_INT_DATA_CRC ) && + }else if ((intmask & (SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) &&SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND )) !=MMC_BUS_TEST_R ) { host->data->error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC ); +if (intmask &SDHCI_INT_TUNING_ERROR ) { +u16 ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + + ctrl2 &= ~SDHCI_CTRL_TUNED_CLK ; +sdhci_writew (host, ctrl2,SDHCI_HOST_CONTROL2 ); + } }else if (intmask &SDHCI_INT_ADMA_ERROR ) {pr_err ("%s: ADMA error: 0x%08x\n" ,mmc_hostname (host->mmc), intmask);
@@ -3978,7 +3984,7 @@ bool sdhci_cqe_irq(struct sdhci_host *ho }else *cmd_error =0 ; -if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC )) { +if (intmask & (SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC |SDHCI_INT_TUNING_ERROR )) { *data_error = -EILSEQ ;if (!mmc_op_tuning (SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND ))))sdhci_err_stats_inc (host,DAT_CRC );
drivers/mmc/host/sdhci.h +2 -1
@@ -158,6 +158,7 @@#define SDHCI_INT_BUS_POWER 0x00800000#define SDHCI_INT_AUTO_CMD_ERR 0x01000000#define SDHCI_INT_ADMA_ERROR 0x02000000 +#define SDHCI_INT_TUNING_ERROR 0x04000000#define SDHCI_INT_NORMAL_MASK 0x00007FFF#define SDHCI_INT_ERROR_MASK 0xFFFF8000
@@ -169,7 +170,7 @@ SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ SDHCI_INT_DATA_END_BIT | SDHCI_INT_ADMA_ERROR | \ - SDHCI_INT_BLK_GAP) + SDHCI_INT_BLK_GAP | SDHCI_INT_TUNING_ERROR)#define SDHCI_INT_ALL_MASK ((unsigned int)-1)#define SDHCI_CQE_INT_ERR_MASK ( \
Greg Kroah-Hartman
maintainerPATCH 50/137 mmc: sdhci-acpi: Sort DMI quirks alphabetically
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit a92a73b1d9249d155412d8ac237142fa716803ea upstream.
Sort the DMI quirks alphabetically.
--- drivers/mmc/host/sdhci-acpi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/mmc/host/sdhci-acpi.c +13 -12
@@ -719,9 +719,22 @@ static const struct acpi_device_id sdhci };MODULE_DEVICE_TABLE (acpi, sdhci_acpi_ids); +/* Please keep this list sorted alphabetically */ static const struct dmi_system_id sdhci_acpi_quirks[] = { {/* +* The Acer Aspire Switch 10 (SW5-012) microSD slot always +* reports the card being write-protected even though microSD +* cards do not have a write-protect switch at all. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire SW5-012" ), + }, + .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT , + }, + { +/* * The Lenovo Miix 320-10ICR has a bug in the _PS0 method of * the SHC1 ACPI device, this bug causes it to reprogram the * wrong LDO (DLDO3) to 1.8V if 1.8V modes are used and the
@@ -736,18 +749,6 @@ static const struct dmi_system_id sdhci_ }, {/* -* The Acer Aspire Switch 10 (SW5-012) microSD slot always -* reports the card being write-protected even though microSD -* cards do not have a write-protect switch at all. -*/ - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), - }, - .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, - }, - { -/* * The Toshiba WT8-B's microSD slot always reports the card being * write-protected. */
Greg Kroah-Hartman
maintainerPATCH 51/137 mmc: sdhci-acpi: Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit f3521d7cbaefff19cc656325787ed797e5f6a955 upstream.
The Lenovo Yoga Tablet 2 Pro 1380 sdcard slot has an active high cd pin and a broken wp pin which always reports the card being write-protected.
Add a DMI quirk to address both issues.
--- drivers/mmc/host/sdhci-acpi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/mmc/host/sdhci-acpi.c +24 -0
@@ -80,6 +80,7 @@ struct sdhci_acpi_host {enum {DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP =BIT (0 ),DMI_QUIRK_SD_NO_WRITE_PROTECT =BIT (1 ), +DMI_QUIRK_SD_CD_ACTIVE_HIGH =BIT (2 ), };static inline void *sdhci_acpi_priv (struct sdhci_acpi_host *c)
@@ -749,6 +750,26 @@ static const struct dmi_system_id sdhci_ }, {/* +* Lenovo Yoga Tablet 2 Pro 1380F/L (13" Android version) this +* has broken WP reporting and an inverted CD signal. +* Note this has more or less the same BIOS as the Lenovo Yoga +* Tablet 2 830F/L or 1050F/L (8" and 10" Android), but unlike +* the 830 / 1050 models which share the same mainboard this +* model has a different mainboard and the inverted CD and +* broken WP are unique to this board. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Intel Corp." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"VALLEYVIEW C0 PLATFORM" ), +DMI_MATCH (DMI_BOARD_NAME ,"BYT-T FFD8" ), +/* Full match so as to NOT match the 830/1050 BIOS */ + DMI_MATCH(DMI_BIOS_VERSION, "BLADE_21.X64.0005.R00.1504101516"), + }, + .driver_data = (void *)(DMI_QUIRK_SD_NO_WRITE_PROTECT | + DMI_QUIRK_SD_CD_ACTIVE_HIGH), + }, + { +/* * The Toshiba WT8-B's microSD slot always reports the card being * write-protected. */
@@ -867,6 +888,9 @@ static int sdhci_acpi_probe(struct platfif (sdhci_acpi_flag (c,SDHCI_ACPI_SD_CD )) {bool v =sdhci_acpi_flag (c,SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL ); +if (quirks &DMI_QUIRK_SD_CD_ACTIVE_HIGH ) + host->mmc->caps2 |=MMC_CAP2_CD_ACTIVE_HIGH ; + err =mmc_gpiod_request_cd (host->mmc,NULL ,0 , v,0 );if (err) {if (err == -EPROBE_DEFER )
Greg Kroah-Hartman
maintainerPATCH 52/137 mmc: sdhci-acpi: Disable write protect detection on Toshiba WT10-A
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit ef3eab75e17191e5665f52e64e85bc29d5705a7b upstream.
On the Toshiba WT10-A the microSD slot always reports the card being write-protected, just like on the Toshiba WT8-B.
Add a DMI quirk to work around this.
--- drivers/mmc/host/sdhci-acpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/mmc/host/sdhci-acpi.c +11 -0
@@ -779,6 +779,17 @@ static const struct dmi_system_id sdhci_ }, .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, }, + { + /* + * The Toshiba WT10-A's microSD slot always reports the card being + * write-protected. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A"), + }, + .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, + }, {} /* Terminating entry */ };
Greg Kroah-Hartman
maintainerPATCH 53/137 mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 431946c0f640c93421439a6c928efb3152c035a4 upstream.
The card-detect GPIO for the microSD slot on Asus T100TA / T100TAM models stopped working under Linux after commit 6fd03f024828 ("gpiolib: acpi:
support bias pull disable").
The GPIO in question is connected to a mechanical switch in the slot which shorts the pin to GND when a card is inserted.
The GPIO pin correctly gets configured with a 20K pull-up by the BIOS, but there is a bug in the DSDT where the GpioInt for the card-detect is configured with a PullNone setting:
GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x2710,
"\\_SB.GPO0", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0026
}Linux now actually honors the PullNone setting and disables the 20K pull-up configured by the BIOS.
Add a new DMI_QUIRK_SD_CD_ENABLE_PULL_UP quirk which when set calls mmc_gpiod_set_cd_config() to re-enable the pull-up and set this for the Asus T100TA models to fix this.
--- drivers/mmc/host/sdhci-acpi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/mmc/host/sdhci-acpi.c +13 -0
@@ -10,6 +10,7 @@#include <linux/export.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/pinctrl/pinconf-generic.h> #include <linux/platform_device.h> #include <linux/ioport.h> #include <linux/io.h>
@@ -81,6 +82,7 @@ enum {DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP =BIT (0 ),DMI_QUIRK_SD_NO_WRITE_PROTECT =BIT (1 ),DMI_QUIRK_SD_CD_ACTIVE_HIGH =BIT (2 ), + DMI_QUIRK_SD_CD_ENABLE_PULL_UP = BIT(3), };static inline void *sdhci_acpi_priv (struct sdhci_acpi_host *c)
@@ -735,6 +737,14 @@ static const struct dmi_system_id sdhci_ .driver_data = (void *)DMI_QUIRK_SD_NO_WRITE_PROTECT, }, { +/* Asus T100TA, needs pull-up for cd but DSDT GpioInt has NoPull set */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"), + }, + .driver_data = (void *)DMI_QUIRK_SD_CD_ENABLE_PULL_UP, + }, + {/* * The Lenovo Miix 320-10ICR has a bug in the _PS0 method of * the SHC1 ACPI device, this bug causes it to reprogram the
@@ -908,6 +918,9 @@ static int sdhci_acpi_probe(struct platf goto err_free;dev_warn (dev,"failed to setup card detect gpio\n" ); c->use_runtime_pm = false; + }else if (quirks &DMI_QUIRK_SD_CD_ENABLE_PULL_UP ) { +mmc_gpiod_set_cd_config (host->mmc, +PIN_CONF_PACKED (PIN_CONFIG_BIAS_PULL_UP ,20000 )); }if (quirks &DMI_QUIRK_RESET_SD_SIGNAL_VOLT_ON_SUSP )
Greg Kroah-Hartman
maintainerPATCH 54/137 drm/fbdev-generic: Do not set physical framebuffer address
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 87cb4a612a89690b123e68f6602d9f6581b03597 upstream.
Framebuffer memory is allocated via vzalloc() from non-contiguous physical pages. The physical framebuffer start address is therefore meaningless. Do not set it.
The value is not used within the kernel and only exported to userspace on dedicated ARM configs. No functional change is expected.
v2:
- refer to vzalloc() in commit message (Javier)
--- drivers/gpu/drm/drm_fbdev_generic.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_fbdev_generic.c +0 -1
@@ -113,7 +113,6 @@ static int drm_fbdev_generic_helper_fb_probe(struct drm_fb_helper *fb_helper,/* screen */ info->flags |=FBINFO_VIRTFB |FBINFO_READS_FAST ; info->screen_buffer = screen_buffer; - info->fix.smem_start =page_to_phys (vmalloc_to_page (info->screen_buffer)); info->fix.smem_len = screen_size;/* deferred I/O */
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 55/137 fbdev: savage: Handle err return when savagefb_check_var failed
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cai Xinchen <[email protected]>
commit 6ad959b6703e2c4c5d7af03b4cfd5ff608036339 upstream.
The commit 04e5eac8f3ab("fbdev: savage: Error out if pixclock equals zero") checks the value of pixclock to avoid divide-by-zero error. However the function savagefb_probe doesn't handle the error return of savagefb_check_var. When pixclock is 0, it will cause divide-by-zero error.
--- drivers/video/fbdev/savage/savagefb_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/video/fbdev/savage/savagefb_driver.c +4 -1
@@ -2276,7 +2276,10 @@ static int savagefb_probe(struct pci_devif (info->var.xres_virtual >0x1000 ) info->var.xres_virtual =0x1000 ;#endif -savagefb_check_var (&info->var, info); + err =savagefb_check_var (&info->var, info); +if (err) + goto failed; +savagefb_set_fix (info);/*
Greg Kroah-Hartman
maintainerPATCH 56/137 drm/amdgpu/atomfirmware: add intergrated info v2.3 table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Ma <[email protected]>
commit e64e8f7c178e5228e0b2dbb504b9dc75953a319f upstream.
[Why]
The vram width value is 0.
Because the integratedsysteminfo table in VBIOS has updated to 2.3.
[How]
Driver needs a new intergrated info v2.3 table too. Then the vram width value will be correct.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 15 ++++++++ drivers/gpu/drm/amd/include/atomfirmware.h | 43 +++++++++++++++++++++++ 2 files changed, 58 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +15 -0
@@ -211,6 +211,7 @@ union igp_info {struct atom_integrated_system_info_v1_11 v11;struct atom_integrated_system_info_v1_12 v12;struct atom_integrated_system_info_v2_1 v21; +struct atom_integrated_system_info_v2_3 v23; };union umc_info {
@@ -353,6 +354,20 @@ amdgpu_atomfirmware_get_vram_info(structif (mem_type == LpDdr5MemType) mem_channel_width =32 ;else + mem_channel_width =64 ; +if (vram_width) + *vram_width = mem_channel_number * mem_channel_width; +if (vram_type) + *vram_type =convert_atom_mem_type_to_vram_type (adev, mem_type); +break ; +case 3 : + mem_channel_number = igp_info->v23.umachannelnumber; +if (!mem_channel_number) + mem_channel_number =1 ; + mem_type = igp_info->v23.memorytype; +if (mem_type == LpDdr5MemType) + mem_channel_width =32 ; +else mem_channel_width =64 ;if (vram_width) *vram_width = mem_channel_number * mem_channel_width;
drivers/gpu/drm/amd/include/atomfirmware.h +43 -0
49 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 57/137 9p: add missing locking around taking dentry fid list
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
commit c898afdc15645efb555acb6d85b484eb40a45409 upstream.
Fix a use-after-free on dentry's d_fsdata fid list when a thread looks up a fid through dentry while another thread unlinks it:
UAF thread:refcount_t: addition on 0; use-after-free.
p9_fid_get linux/./include/net/9p/client.h:262 v9fs_fid_find+0x236/0x280 linux/fs/9p/fid.c:129 v9fs_fid_lookup_with_uid linux/fs/9p/fid.c:181 v9fs_fid_lookup+0xbf/0xc20 linux/fs/9p/fid.c:314 v9fs_vfs_getattr_dotl+0xf9/0x360 linux/fs/9p/vfs_inode_dotl.c:400 vfs_statx+0xdd/0x4d0 linux/fs/stat.c:248
Freed by:
p9_fid_destroy (inlined)
p9_client_clunk+0xb0/0xe0 linux/net/9p/client.c:1456 p9_fid_put linux/./include/net/9p/client.h:278 v9fs_dentry_release+0xb5/0x140 linux/fs/9p/vfs_dentry.c:55 v9fs_remove+0x38f/0x620 linux/fs/9p/vfs_inode.c:518 vfs_unlink+0x29a/0x810 linux/fs/namei.c:4335
The problem is that d_fsdata was not accessed under d_lock, because d_release() normally is only called once the dentry is otherwise no longer accessible but since we also call it explicitly in v9fs_remove that lock is required:
move the hlist out of the dentry under lock then unref its fids once they are no longer accessible.
Message-ID: <[email protected]>
--- fs/9p/vfs_dentry.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/9p/vfs_dentry.c +7 -2
@@ -48,12 +48,17 @@ static int v9fs_cached_dentry_delete(constatic void v9fs_dentry_release (struct dentry *dentry) {struct hlist_node *p, *n; +struct hlist_head head;p9_debug (P9_DEBUG_VFS ," dentry: %pd (%p)\n" , dentry, dentry); -hlist_for_each_safe (p, n, (struct hlist_head *)&dentry->d_fsdata) + +spin_lock (&dentry->d_lock); +hlist_move_list ((struct hlist_head *)&dentry->d_fsdata, &head); +spin_unlock (&dentry->d_lock); + +hlist_for_each_safe (p, n, &head) p9_fid_put(hlist_entry(p, struct p9_fid, dlist)); - dentry->d_fsdata =NULL ; }static int v9fs_lookup_revalidate (struct dentry *dentry,unsigned int flags)
Greg Kroah-Hartman
maintainerPATCH 58/137 drm/amd: Fix shutdown (again) on some SMU v13.0.4/11 platforms
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 267cace556e8a53d703119f7435ab556209e5b6a upstream.
commit cd94d1b182d2 ("dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users") attempted to fix shutdown issues that were reported since commit 31729e8c21ec ("drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11") but caused issues for some people.
Adjust the workaround flow to properly only apply in the S4 case:
-> For shutdown go through SMU_MSG_PrepareMp1ForUnload -> For S4 go through SMU_MSG_GfxDeviceDriverReset and
SMU_MSG_PrepareMp1ForUnload
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +11 -9
@@ -226,15 +226,17 @@ static int smu_v13_0_4_system_features_cstruct amdgpu_device *adev = smu->adev;int ret =0 ; -if (!en && adev->in_s4) { -/* Adds a GFX reset as workaround just before sending the -* MP1_UNLOAD message to prevent GC/RLC/PMFW from entering -* an invalid state. -*/ - ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset, -SMU_RESET_MODE_2 ,NULL ); -if (ret) -return ret; +if (!en && !adev->in_s0ix) { +if (adev->in_s4) { +/* Adds a GFX reset as workaround just before sending the +* MP1_UNLOAD message to prevent GC/RLC/PMFW from entering +* an invalid state. +*/ + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset, +SMU_RESET_MODE_2 ,NULL ); +if (ret) +return ret; + } ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); }
Greg Kroah-Hartman
maintainerPATCH 59/137 Revert "drm/amdkfd: fix gfx_target_version for certain 11.0.3 devices"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit dd2b75fd9a79bf418e088656822af06fc253dbe3 upstream.
This reverts commit 28ebbb4981cb1fad12e0b1227dbecc88810b1ee8.
Revert this commit as apparently the LLVM code to take advantage of this never landed.
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -9
@@ -402,15 +402,8 @@ struct kfd_dev *kgd2kfd_probe(struct amd f2g = &gfx_v11_kfd2kgd;break ;case IP_VERSION (11 ,0 ,3 ): -if ((adev->pdev->device ==0x7460 && - adev->pdev->revision ==0x00 ) || - (adev->pdev->device ==0x7461 && - adev->pdev->revision ==0x00 )) -/* Note: Compiler version is 11.0.5 while HW version is 11.0.3 */ - gfx_target_version =110005 ; -else -/* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */ - gfx_target_version =110001 ; +/* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */ + gfx_target_version =110001 ; f2g = &gfx_v11_kfd2kgd;break ;default :
Greg Kroah-Hartman
maintainerPATCH 60/137 KVM: SVM: WARN on vNMI + NMI window iff NMIs are outright masked
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit b4bd556467477420ee3a91fbcba73c579669edc6 upstream.
When requesting an NMI window, WARN on vNMI support being enabled if and only if NMIs are actually masked, i.e. if the vCPU is already handling an NMI. KVM's ABI for NMIs that arrive simultanesouly (from KVM's point of view) is to inject one NMI and pend the other. When using vNMI, KVM pends the second NMI simply by setting V_NMI_PENDING, and lets the CPU do the rest (hardware automatically sets V_NMI_BLOCKING when an NMI is injected).
However, if KVM can't immediately inject an NMI, e.g. because the vCPU is in an STI shadow or is running with GIF=0, then KVM will request an NMI window and trigger the WARN (but still function correctly).
Whether or not the GIF=0 case makes sense is debatable, as the intent of KVM's behavior is to provide functionality that is as close to real hardware as possible. E.g. if two NMIs are sent in quick succession, the probability of both NMIs arriving in an STI shadow is infinitesimally low on real hardware, but significantly larger in a virtual environment, e.g. if the vCPU is preempted in the STI shadow. For GIF=0, the argument isn't as clear cut, because the window where two NMIs can collide is much larger in bare metal (though still small).
That said, KVM should not have divergent behavior for the GIF=0 case based on whether or not vNMI support is enabled. And KVM has allowed simultaneous NMIs with GIF=0 for over a decade, since commit 7460fb4a3400 ("KVM: Fix simultaneous NMIs"). I.e. KVM's GIF=0 handling shouldn't be modified without a *really* good reason to do so, and if KVM's behavior were to be modified, it should be done irrespective of vNMI support.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/svm.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
arch/x86/kvm/svm/svm.c +19 -8
@@ -3856,16 +3856,27 @@ static void svm_enable_nmi_window(structstruct vcpu_svm *svm =to_svm (vcpu);/* -* KVM should never request an NMI window when vNMI is enabled, as KVM -* allows at most one to-be-injected NMI and one pending NMI, i.e. if -* two NMIs arrive simultaneously, KVM will inject one and set -* V_NMI_PENDING for the other. WARN, but continue with the standard -* single-step approach to try and salvage the pending NMI. +* If NMIs are outright masked, i.e. the vCPU is already handling an +* NMI, and KVM has not yet intercepted an IRET, then there is nothing +* more to do at this time as KVM has already enabled IRET intercepts. +* If KVM has already intercepted IRET, then single-step over the IRET, +* as NMIs aren't architecturally unmasked until the IRET completes. +* +* If vNMI is enabled, KVM should never request an NMI window if NMIs +* are masked, as KVM allows at most one to-be-injected NMI and one +* pending NMI. If two NMIs arrive simultaneously, KVM will inject one +* NMI and set V_NMI_PENDING for the other, but if and only if NMIs are +* unmasked. KVM _will_ request an NMI window in some situations, e.g. +* if the vCPU is in an STI shadow or if GIF=0, KVM can't immediately +* inject the NMI. In those situations, KVM needs to single-step over +* the STI shadow or intercept STGI. */ -WARN_ON_ONCE (is_vnmi_enabled (svm)); +if (svm_get_nmi_mask (vcpu)) { +WARN_ON_ONCE (is_vnmi_enabled (svm)); -if (svm_get_nmi_mask (vcpu) && !svm->awaiting_iret_completion) -return ;/* IRET will cause a vm exit */ +if (!svm->awaiting_iret_completion) +return ;/* IRET will cause a vm exit */ + }/* * SEV-ES guests are responsible for signaling when a vCPU is ready to
Greg Kroah-Hartman
maintainerPATCH 61/137 KVM: arm64: Fix AArch32 register narrowing on userspace write
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit 947051e361d551e0590777080ffc4926190f62f2 upstream.
When userspace writes to one of the core registers, we make sure to narrow the corresponding GPRs if PSTATE indicates an AArch32 context.
The code tries to check whether the context is EL0 or EL1 so that it narrows the correct registers. But it does so by checking the full PSTATE instead of PSTATE.M.
As a consequence, and if we are restoring an AArch32 EL0 context in a 64bit guest, and that PSTATE has *any* bit set outside of PSTATE.M, we narrow *all* registers instead of only the first 15, destroying the 64bit state.
Obviously, this is not something the guest is likely to enjoy.
Correctly masking PSTATE to only evaluate PSTATE.M fixes it.
--- arch/arm64/kvm/guest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/guest.c +1 -1
@@ -276,7 +276,7 @@ static int set_core_reg(struct kvm_vcpuif (*vcpu_cpsr (vcpu) &PSR_MODE32_BIT ) {int i, nr_reg; -switch (*vcpu_cpsr (vcpu)) { +switch (*vcpu_cpsr (vcpu) &PSR_AA32_MODE_MASK ) {/* * Either we are dealing with user mode, and only the * first 15 registers (+ PC) must be narrowed to 32bit.
Greg Kroah-Hartman
maintainerPATCH 62/137 KVM: arm64: Allow AArch32 PSTATE.M to be restored as System mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit dfe6d190f38fc5df5ff2614b463a5195a399c885 upstream.
It appears that we don't allow a vcpu to be restored in AArch32 System mode, as we *never* included it in the list of valid modes.
Just add it to the list of allowed modes.
--- arch/arm64/kvm/guest.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kvm/guest.c +1 -0
@@ -251,6 +251,7 @@ static int set_core_reg(struct kvm_vcpucase PSR_AA32_MODE_SVC :case PSR_AA32_MODE_ABT :case PSR_AA32_MODE_UND : +case PSR_AA32_MODE_SYS :if (!vcpu_el1_is_32bit (vcpu))return -EINVAL ;break ;
Greg Kroah-Hartman
maintainerPATCH 63/137 KVM: arm64: AArch32: Fix spurious trapping of conditional instructions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit c92e8b9eacebb4060634ebd9395bba1b29aadc68 upstream.
We recently upgraded the view of ESR_EL2 to 64bit, in keeping with the requirements of the architecture.
However, the AArch32 emulation code was left unaudited, and the (already dodgy) code that triages whether a trap is spurious or not (because the condition code failed) broke in a subtle way:
If ESR_EL2.ISS2 is ever non-zero (unlikely, but hey, this is the ARM architecture we're talking about), the hack that tests the top bits of ESR_EL2.EC will break in an interesting way.
Instead, use kvm_vcpu_trap_get_class() to obtain the EC, and list all the possible ECs that can fail a condition code check.
While we're at it, add SMC32 to the list, as it is explicitly listed as being allowed to trap despite failing a condition code check (as described in the HCR_EL2.TSC documentation).
--- arch/arm64/kvm/hyp/aarch32.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/aarch32.c +16 -2
@@ -50,9 +50,23 @@ bool kvm_condition_valid32(const structu32 cpsr_cond;int cond; -/* Top two bits non-zero? Unconditional. */ -if (kvm_vcpu_get_esr (vcpu) >>30 ) +/* +* These are the exception classes that could fire with a +* conditional instruction. +*/ +switch (kvm_vcpu_trap_get_class (vcpu)) { +case ESR_ELx_EC_CP15_32: +case ESR_ELx_EC_CP15_64: +case ESR_ELx_EC_CP14_MR: +case ESR_ELx_EC_CP14_LS: +case ESR_ELx_EC_FP_ASIMD: +case ESR_ELx_EC_CP10_ID: +case ESR_ELx_EC_CP14_64: +case ESR_ELx_EC_SVC32: +break ; +default :return true; + }/* Is condition field valid? */ cond =kvm_vcpu_get_condition (vcpu);
Greg Kroah-Hartman
maintainerPATCH 64/137 LoongArch: Add all CPUs enabled by fdt to NUMA node 0
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiaxun Yang <[email protected]>
commit 3de9c42d02a79a5e09bbee7a4421ddc00cfd5c6d upstream.
NUMA enabled kernel on FDT based machine fails to boot because CPUs are all in NUMA_NO_NODE and mm subsystem won't accept that.
Fix by adding them to default NUMA node at FDT parsing phase and move numa_add_cpu(0) to a later point.
--- arch/loongarch/include/asm/numa.h | 1 + arch/loongarch/kernel/smp.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
arch/loongarch/include/asm/numa.h +1 -0
@@ -56,6 +56,7 @@ extern int early_cpu_to_node(int cpu);static inline void early_numa_add_cpu (int cpuid,s16 node) { }static inline void numa_add_cpu (unsigned int cpu) { }static inline void numa_remove_cpu (unsigned int cpu) { } +static inline void set_cpuid_to_node (int cpuid,s16 node) { }static inline int early_cpu_to_node (int cpu) {
arch/loongarch/kernel/smp.c +4 -1
@@ -262,7 +262,6 @@ static void __init fdt_smp_setup(void)if (cpuid == loongson_sysconf.boot_cpu_id) { cpu =0 ; -numa_add_cpu (cpu); }else { cpu =cpumask_next_zero (-1 , cpu_present_mask); }
@@ -272,6 +271,9 @@ static void __init fdt_smp_setup(void)set_cpu_present (cpu, true); __cpu_number_map[cpuid] = cpu; __cpu_logical_map[cpu] = cpuid; + +early_numa_add_cpu (cpu,0 ); +set_cpuid_to_node (cpuid,0 ); } loongson_sysconf.nr_cpus = num_processors;
@@ -453,6 +455,7 @@ void smp_prepare_boot_cpu(void)set_cpu_possible (0 , true);set_cpu_online (0 , true);set_my_cpu_offset (per_cpu_offset (0 )); +numa_add_cpu (0 ); rr_node =first_node (node_online_map);for_each_possible_cpu (cpu) {
Greg Kroah-Hartman
maintainerPATCH 65/137 LoongArch: Override higher address bits in JUMP_VIRT_ADDR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiaxun Yang <[email protected]>
commit 1098efd299ffe9c8af818425338c7f6c4f930a98 upstream.
In JUMP_VIRT_ADDR we are performing an or calculation on address value directly from pcaddi.
This will only work if we are currently running from direct 1:1 mapping addresses or firmware's DMW is configured exactly same as kernel. Still, we should not rely on such assumption.
Fix by overriding higher bits in address comes from pcaddi, so we can get rid of or operator.
--- arch/loongarch/include/asm/stackframe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/include/asm/stackframe.h +1 -1
@@ -41,7 +41,7 @@ .macro JUMP_VIRT_ADDR temp1 temp2 li.d \temp1, CACHE_BASE pcaddi \temp2, 0 - or \temp1, \temp1, \temp2 + bstrins.d \temp1, \temp2, (DMW_PABITS - 1), 0 jirl zero, \temp1, 0xc .endm
Greg Kroah-Hartman
maintainerPATCH 66/137 clk: bcm: dvp: Assign ->num before accessing ->hws
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 9368cdf90f52a68120d039887ccff74ff33b4444 upstream.
Commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with __counted_by") annotated the hws member of 'struct clk_hw_onecell_data' with __counted_by, which informs the bounds sanitizer about the number of elements in hws, so that it can warn when hws is accessed out of bounds. As noted in that change, the __counted_by member must be initialized with the number of elements before the first array access happens, otherwise there will be a warning from each access prior to the initialization because the number of elements is zero. This occurs in clk_dvp_probe() due to ->num being assigned after ->hws has been accessed:
UBSAN: array-index-out-of-bounds in drivers/clk/bcm/clk-bcm2711-dvp.c:59:2 index 0 is out of range for type 'struct clk_hw *[] __counted_by(num)' (aka 'struct clk_hw *[]')
Move the ->num initialization to before the first access of ->hws, which clears up the warning.
--- drivers/clk/bcm/clk-bcm2711-dvp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/bcm/clk-bcm2711-dvp.c +2 -1
@@ -56,6 +56,8 @@ static int clk_dvp_probe(struct platform_device *pdev)if (ret)return ret; + data->num =NR_CLOCKS ; + data->hws[0] = clk_hw_register_gate_parent_data(&pdev->dev, "hdmi0-108MHz", &clk_dvp_parent, 0,
@@ -76,7 +78,6 @@ static int clk_dvp_probe(struct platform_device *pdev) goto unregister_clk0; } - data->num =NR_CLOCKS ; ret =of_clk_add_hw_provider (pdev->dev.of_node, of_clk_hw_onecell_get, data);if (ret)
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 67/137 clk: bcm: rpi: Assign ->num before accessing ->hws
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 6dc445c1905096b2ed4db1a84570375b4e00cc0f upstream.
Commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with __counted_by") annotated the hws member of 'struct clk_hw_onecell_data' with __counted_by, which informs the bounds sanitizer about the number of elements in hws, so that it can warn when hws is accessed out of bounds. As noted in that change, the __counted_by member must be initialized with the number of elements before the first array access happens, otherwise there will be a warning from each access prior to the initialization because the number of elements is zero. This occurs in raspberrypi_discover_clocks() due to ->num being assigned after ->hws has been accessed:
UBSAN: array-index-out-of-bounds in drivers/clk/bcm/clk-raspberrypi.c:374:4 index 3 is out of range for type 'struct clk_hw *[] __counted_by(num)' (aka 'struct clk_hw *[]')
Move the ->num initialization to before the first access of ->hws, which clears up the warning.
--- drivers/clk/bcm/clk-raspberrypi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/bcm/clk-raspberrypi.c +1 -1
@@ -371,8 +371,8 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,if (IS_ERR (hw))return PTR_ERR (hw); - data->hws[clks->id] = hw; data->num = clks->id +1 ; + data->hws[clks->id] = hw; } clks++;
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 68/137 clk: qcom: clk-alpha-pll: fix rate setting for Stromer PLLs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
commit 3c5b3e17b8fd1f1add5a9477306c355fab126977 upstream.
The clk_alpha_pll_stromer_set_rate() function writes inproper values into the ALPHA_VAL{,_U} registers which results in wrong clock rates when the alpha value is used.
The broken behaviour can be seen on IPQ5018 for example, when dynamic scaling sets the CPU frequency to 800000 KHz. In this case the CPU cores are running only at 792031 KHz:
# cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq 800000 # cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq 792031
This happens because the function ignores the fact that the alpha value calculated by the alpha_pll_round_rate() function is only 32 bits wide which must be extended to 40 bits if it is used on a hardware which supports 40 bits wide values.
Extend the clk_alpha_pll_stromer_set_rate() function to convert the alpha value to 40 bits before wrinting that into the registers in order to ensure that the hardware really uses the requested rate.
After the change the CPU frequency is correct:
# cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq 800000 # cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq 800000
--- drivers/clk/qcom/clk-alpha-pll.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/clk-alpha-pll.c +2 -0
@@ -2444,6 +2444,8 @@ static int clk_alpha_pll_stromer_set_rat rate =alpha_pll_round_rate (rate, prate, &l, &a,ALPHA_REG_BITWIDTH );regmap_write (pll->clkr.regmap,PLL_L_VAL (pll), l); + + a <<=ALPHA_REG_BITWIDTH -ALPHA_BITWIDTH ;regmap_write (pll->clkr.regmap,PLL_ALPHA_VAL (pll), a);regmap_write (pll->clkr.regmap,PLL_ALPHA_VAL_U (pll), a >>ALPHA_BITWIDTH );
Greg Kroah-Hartman
maintainerPATCH 69/137 crypto: ecdsa - Fix module auto-load on add-key
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Berger <[email protected]>
commit 48e4fd6d54f54d0ceab5a952d73e47a9454a6ccb upstream.
Add module alias with the algorithm cra_name similar to what we have for RSA-related and other algorithms.
The kernel attempts to modprobe asymmetric algorithms using the names "crypto-$cra_name" and "crypto-$cra_name-all." However, since these aliases are currently missing, the modules are not loaded. For instance, when using the add_key function, the hash algorithm is typically loaded automatically, but the asymmetric algorithm is not.
Steps to test:
1. Create certificate
openssl req -x509 -sha256 -newkey ec \ -pkeyopt "ec_paramgen_curve:secp384r1" -keyout key.pem -days 365 \ -subj '/CN=test' -nodes -outform der -out nist-p384.der
2. Optionally, trace module requests with: trace-cmd stream -e module &
3. Trigger add_key call for the cert:
# keyctl padd asymmetric "" @u < nist-p384.der 641069229 # lsmod | head -2 Module Size Used by ecdsa_generic 16384 0
--- crypto/ecdsa.c | 3 +++ 1 file changed, 3 insertions(+)
crypto/ecdsa.c +3 -0
@@ -373,4 +373,7 @@ module_exit(ecdsa_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Stefan Berger <[email protected]>" );MODULE_DESCRIPTION ("ECDSA generic algorithm" ); +MODULE_ALIAS_CRYPTO ("ecdsa-nist-p192" ); +MODULE_ALIAS_CRYPTO ("ecdsa-nist-p256" ); +MODULE_ALIAS_CRYPTO ("ecdsa-nist-p384" );MODULE_ALIAS_CRYPTO ("ecdsa-generic" );
Greg Kroah-Hartman
maintainerPATCH 70/137 crypto: ecrdsa - Fix module auto-load on add_key
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Chikunov <[email protected]>
commit eb5739a1efbc9ff216271aeea0ebe1c92e5383e5 upstream.
Add module alias with the algorithm cra_name similar to what we have for RSA-related and other algorithms.
The kernel attempts to modprobe asymmetric algorithms using the names "crypto-$cra_name" and "crypto-$cra_name-all." However, since these aliases are currently missing, the modules are not loaded. For instance, when using the add_key function, the hash algorithm is typically loaded automatically, but the asymmetric algorithm is not.
Steps to test:
1. Cert is generated usings ima-evm-utils test suite with gen-keys.sh, example cert is provided below:
$ base64 -d >test-gost2012_512-A.cer <<EOF MIIB/DCCAWagAwIBAgIUK8+whWevr3FFkSdU9GLDAM7ure8wDAYIKoUDBwEBAwMFADARMQ8wDQYD VQQDDAZDQSBLZXkwIBcNMjIwMjAxMjIwOTQxWhgPMjA4MjEyMDUyMjA5NDFaMBExDzANBgNVBAMM BkNBIEtleTCBoDAXBggqhQMHAQEBAjALBgkqhQMHAQIBAgEDgYQABIGALXNrTJGgeErBUOov3Cfo IrHF9fcj8UjzwGeKCkbCcINzVUbdPmCopeJRHDJEvQBX1CQUPtlwDv6ANjTTRoq5nCk9L5PPFP1H z73JIXHT0eRBDVoWy0cWDRz1mmQlCnN2HThMtEloaQI81nTlKZOcEYDtDpi5WODmjEeRNQJMdqCj UDBOMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFCwfOITMbE9VisW1i2TYeu1tAo5QMB8GA1UdIwQY MBaAFCwfOITMbE9VisW1i2TYeu1tAo5QMAwGCCqFAwcBAQMDBQADgYEAmBfJCMTdC0/NSjz4BBiQ qDIEjomO7FEHYlkX5NGulcF8FaJW2jeyyXXtbpnub1IQ8af1KFIpwoS2e93LaaofxpWlpQLlju6m KYLOcO4xK3Whwa2hBAz9YbpUSFjvxnkS2/jpH2MsOSXuUEeCruG/RkHHB3ACef9umG6HCNQuAPY= EOF
2. Optionally, trace module requests with: trace-cmd stream -e module &
3. Trigger add_key call for the cert:
# keyctl padd asymmetric "" @u <test-gost2012_512-A.cer 939910969 # lsmod | head -3 Module Size Used by ecrdsa_generic 16384 0 streebog_generic 28672 0
--- crypto/ecrdsa.c | 1 + 1 file changed, 1 insertion(+)
crypto/ecrdsa.c +1 -0
@@ -294,4 +294,5 @@ module_exit(ecrdsa_mod_fini);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Vitaly Chikunov <[email protected]>" );MODULE_DESCRIPTION ("EC-RDSA generic algorithm" ); +MODULE_ALIAS_CRYPTO ("ecrdsa" );MODULE_ALIAS_CRYPTO ("ecrdsa-generic" );
Greg Kroah-Hartman
maintainerPATCH 71/137 crypto: qat - Fix ADF_DEV_RESET_SYNC memory leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit d3b17c6d9dddc2db3670bc9be628b122416a3d26 upstream.
Using completion_done to determine whether the caller has gone away only works after a complete call. Furthermore it's still possible that the caller has not yet called wait_for_completion, resulting in another potential UAF.
Fix this by making the caller use cancel_work_sync and then freeing the memory safely.
--- drivers/crypto/intel/qat/qat_common/adf_aer.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/crypto/intel/qat/qat_common/adf_aer.c +5 -14
@@ -92,8 +92,7 @@ static void adf_device_reset_worker(struif (adf_dev_restart (accel_dev)) {/* The device hanged and we can't restart it so stop here */ dev_err (&GET_DEV (accel_dev),"Restart device failed\n" ); -if (reset_data->mode ==ADF_DEV_RESET_ASYNC || -completion_done (&reset_data->compl)) +if (reset_data->mode ==ADF_DEV_RESET_ASYNC )kfree (reset_data);WARN (1 ,"QAT: device restart failed. Device is unusable\n" );return ;
@@ -101,16 +100,8 @@ static void adf_device_reset_worker(struadf_dev_restarted_notify (accel_dev);clear_bit (ADF_STATUS_RESTARTING , &accel_dev->status); -/* -* The dev is back alive. Notify the caller if in sync mode -* -* If device restart will take a more time than expected, -* the schedule_reset() function can timeout and exit. This can be -* detected by calling the completion_done() function. In this case -* the reset_data structure needs to be freed here. -*/ -if (reset_data->mode ==ADF_DEV_RESET_ASYNC || -completion_done (&reset_data->compl)) +/* The dev is back alive. Notify the caller if in sync mode */ +if (reset_data->mode ==ADF_DEV_RESET_ASYNC )kfree (reset_data);else complete (&reset_data->compl);
@@ -145,10 +136,10 @@ static int adf_dev_aer_schedule_reset(stif (!timeout) {dev_err (&GET_DEV (accel_dev),"Reset device timeout expired\n" ); +cancel_work_sync (&reset_data->reset_work); ret = -EFAULT ; - }else { -kfree (reset_data); } +kfree (reset_data);return ret; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 72/137 kbuild: Remove support for Clangs ThinLTO caching
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit aba091547ef6159d52471f42a3ef531b7b660ed8 upstream.
There is an issue in clang's ThinLTO caching (enabled for the kernel via '--thinlto-cache-dir') with .incbin, which the kernel occasionally uses to include data within the kernel, such as the .config file for /proc/config.gz. For example, when changing the .config and rebuilding vmlinux, the copy of .config in vmlinux does not match the copy of .config in the build folder:
$ echo 'CONFIG_LTO_NONE=n CONFIG_LTO_CLANG_THIN=y CONFIG_IKCONFIG=y CONFIG_HEADERS_INSTALL=y' >kernel/configs/repro.config
$ make -skj"$(nproc)" ARCH=x86_64 LLVM=1 clean defconfig repro.config vmlinux ...
$ grep CONFIG_HEADERS_INSTALL .config CONFIG_HEADERS_INSTALL=y
$ scripts/extract-ikconfig vmlinux | grep CONFIG_HEADERS_INSTALL CONFIG_HEADERS_INSTALL=y
$ scripts/config -d HEADERS_INSTALL
$ make -kj"$(nproc)" ARCH=x86_64 LLVM=1 vmlinux
...
UPD kernel/config_data
GZIP kernel/config_data.gz
CC kernel/configs.o
...
LD vmlinux
...$ grep CONFIG_HEADERS_INSTALL .config # CONFIG_HEADERS_INSTALL is not set
$ scripts/extract-ikconfig vmlinux | grep CONFIG_HEADERS_INSTALL CONFIG_HEADERS_INSTALL=y
Without '--thinlto-cache-dir' or when using full LTO, this issue does not occur.
Benchmarking incremental builds on a few different machines with and without the cache shows a 20% increase in incremental build time without the cache when measured by touching init/main.c and running 'make all'.
ARCH=arm64 defconfig + CONFIG_LTO_CLANG_THIN=y on an arm64 host:
Benchmark 1: With ThinLTO cache
Time (mean ± σ): 56.347 s ± 0.163 s [User: 83.768 s, System: 24.661 s]
Range (min … max): 56.109 s … 56.594 s 10 runsBenchmark 2: Without ThinLTO cache
Time (mean ± σ): 67.740 s ± 0.479 s [User: 718.458 s, System: 31.797 s]
Range (min … max): 67.059 s … 68.556 s 10 runs Summary
With ThinLTO cache ran
1.20 ± 0.01 times faster than Without ThinLTO cache
ARCH=x86_64 defconfig + CONFIG_LTO_CLANG_THIN=y on an x86_64 host:
Benchmark 1: With ThinLTO cache
Time (mean ± σ): 85.772 s ± 0.252 s [User: 91.505 s, System: 8.408 s]
Range (min … max): 85.447 s … 86.244 s 10 runsBenchmark 2: Without ThinLTO cache
Time (mean ± σ): 103.833 s ± 0.288 s [User: 232.058 s, System: 8.569 s]
Range (min … max): 103.286 s … 104.124 s 10 runs Summary
With ThinLTO cache ran
1.21 ± 0.00 times faster than Without ThinLTO cache
While it is unfortunate to take this performance improvement off the table, correctness is more important. If/when this is fixed in LLVM, it can potentially be brought back in a conditional manner. Alternatively, a developer can just disable LTO if doing incremental compiles quickly is important, as a full compile cycle can still take over a minute even with the cache and it is unlikely that LTO will result in functional differences for a kernel change.
--- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Makefile +2 -3
@@ -951,7 +951,6 @@ endif ifdef CONFIG_LTO_CLANG ifdef CONFIG_LTO_CLANG_THIN CC_FLAGS_LTO := -flto=thin -fsplit-lto-unit -KBUILD_LDFLAGS += --thinlto-cache-dir=$(extmod_prefix).thinlto-cache else CC_FLAGS_LTO := -flto endif
@@ -1482,7 +1481,7 @@ endif # CONFIG_MODULES # Directories & files removed with 'make clean' CLEAN_FILES += vmlinux.symvers modules-only.symvers \ modules.builtin modules.builtin.modinfo modules.nsdeps \ - compile_commands.json .thinlto-cache rust/test \ + compile_commands.json rust/test \ rust-project.json .vmlinux.objs .vmlinux.export.c # Directories & files removed with 'make mrproper'
@@ -1786,7 +1785,7 @@ PHONY += compile_commands.json clean-dirs := $(KBUILD_EXTMOD) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \ - $(KBUILD_EXTMOD)/compile_commands.json $(KBUILD_EXTMOD)/.thinlto-cache + $(KBUILD_EXTMOD)/compile_commands.json PHONY += prepare # now expand this into a simple variable to reduce the cost of shell evaluations
Greg Kroah-Hartman
maintainerPATCH 73/137 mm: fix race between __split_huge_pmd_locked() and GUP-fast
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Roberts <[email protected]>
commit 3a5a8d343e1cf96eb9971b17cbd4b832ab19b8e7 upstream.
__split_huge_pmd_locked() can be called for a present THP, devmap or (non-present) migration entry. It calls pmdp_invalidate() unconditionally on the pmdp and only determines if it is present or not based on the returned old pmd. This is a problem for the migration entry case because pmd_mkinvalid(), called by pmdp_invalidate() must only be called for a present pmd.
On arm64 at least, pmd_mkinvalid() will mark the pmd such that any future call to pmd_present() will return true. And therefore any lockless pgtable walker could see the migration entry pmd in this state and start interpretting the fields as if it were present, leading to BadThings (TM). GUP-fast appears to be one such lockless pgtable walker.
x86 does not suffer the above problem, but instead pmd_mkinvalid() will corrupt the offset field of the swap entry within the swap pte. See link below for discussion of that problem.
Fix all of this by only calling pmdp_invalidate() for a present pmd. And for good measure let's add a warning to all implementations of pmdp_invalidate[_ad](). I've manually reviewed all other pmdp_invalidate[_ad]() call sites and believe all others to be conformant.
This is a theoretical bug found during code review. I don't have any test case to trigger it in practice.
--- Documentation/mm/arch_pgtable_helpers.rst | 6 ++- arch/powerpc/mm/book3s64/pgtable.c | 1 arch/s390/include/asm/pgtable.h | 4 +- arch/sparc/mm/tlb.c | 1 arch/x86/mm/pgtable.c | 2 + mm/huge_memory.c | 49 +++++++++++++++--------------- mm/pgtable-generic.c | 2 + 7 files changed, 39 insertions(+), 26 deletions(-)
Documentation/mm/arch_pgtable_helpers.rst +4 -2
@@ -142,7 +142,8 @@ PMD Page Table Helpers +---------------------------+--------------------------------------------------+ | pmd_swp_clear_soft_dirty | Clears a soft dirty swapped PMD | +---------------------------+--------------------------------------------------+ -| pmd_mkinvalid | Invalidates a mapped PMD [1] | +| pmd_mkinvalid | Invalidates a present PMD; do not call for | +| | non-present PMD [1] | +---------------------------+--------------------------------------------------+ | pmd_set_huge | Creates a PMD huge mapping | +---------------------------+--------------------------------------------------+
@@ -198,7 +199,8 @@ PUD Page Table Helpers +---------------------------+--------------------------------------------------+ | pud_mkdevmap | Creates a ZONE_DEVICE mapped PUD | +---------------------------+--------------------------------------------------+ -| pud_mkinvalid | Invalidates a mapped PUD [1] | +| pud_mkinvalid | Invalidates a present PUD; do not call for | +| | non-present PUD [1] | +---------------------------+--------------------------------------------------+ | pud_set_huge | Creates a PUD huge mapping | +---------------------------+--------------------------------------------------+
arch/powerpc/mm/book3s64/pgtable.c +1 -0
@@ -170,6 +170,7 @@ pmd_t pmdp_invalidate(struct vm_area_str {unsigned long old_pmd; +VM_WARN_ON_ONCE (!pmd_present (*pmdp)); old_pmd =pmd_hugepage_update (vma->vm_mm, address, pmdp, _PAGE_PRESENT, _PAGE_INVALID);flush_pmd_tlb_range (vma, address, address +HPAGE_PMD_SIZE );return __pmd (old_pmd);
arch/s390/include/asm/pgtable.h +3 -1
@@ -1774,8 +1774,10 @@ static inline pmd_t pmdp_huge_clear_flusstatic inline pmd_t pmdp_invalidate (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -pmd_t pmd =__pmd (pmd_val (*pmdp) | _SEGMENT_ENTRY_INVALID); +pmd_t pmd; +VM_WARN_ON_ONCE (!pmd_present (*pmdp)); + pmd =__pmd (pmd_val (*pmdp) | _SEGMENT_ENTRY_INVALID);return pmdp_xchg_direct (vma->vm_mm, addr, pmdp, pmd); }
arch/sparc/mm/tlb.c +1 -0
@@ -249,6 +249,7 @@ pmd_t pmdp_invalidate(struct vm_area_str {pmd_t old, entry; +VM_WARN_ON_ONCE (!pmd_present (*pmdp)); entry =__pmd (pmd_val (*pmdp) & ~_PAGE_VALID); old =pmdp_establish (vma, address, pmdp, entry);flush_tlb_range (vma, address, address +HPAGE_PMD_SIZE );
arch/x86/mm/pgtable.c +2 -0
@@ -628,6 +628,8 @@ int pmdp_clear_flush_young(struct vm_arepmd_t pmdp_invalidate_ad (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) { +VM_WARN_ON_ONCE (!pmd_present (*pmdp)); +/* * No flush is necessary. Once an invalid PTE is established, the PTE's * access and dirty bits cannot be updated.
mm/huge_memory.c +26 -23
64 lines not on this page · raw message
mm/pgtable-generic.c +2 -0
@@ -198,6 +198,7 @@ pgtable_t pgtable_trans_huge_withdraw(stpmd_t pmdp_invalidate (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) { +VM_WARN_ON_ONCE (!pmd_present (*pmdp));pmd_t old =pmdp_establish (vma, address, pmdp,pmd_mkinvalid (*pmdp));flush_pmd_tlb_range (vma, address, address +HPAGE_PMD_SIZE );return old;
@@ -208,6 +209,7 @@ pmd_t pmdp_invalidate(struct vm_area_strpmd_t pmdp_invalidate_ad (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) { +VM_WARN_ON_ONCE (!pmd_present (*pmdp));return pmdp_invalidate (vma, address, pmdp); }#endif
Greg Kroah-Hartman
maintainerPATCH 74/137 filemap: add helper mapping_max_folio_size()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 79c137454815ba5554caa8eeb4ad5c94e96e45ce upstream.
Add mapping_max_folio_size() to get the maximum folio size for this pagecache mapping.
--- include/linux/pagemap.h | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
include/linux/pagemap.h +21 -13
@@ -327,6 +327,19 @@ static inline void mapping_set_gfp_mask( m->gfp_mask = mask; } +/* +* There are some parts of the kernel which assume that PMD entries +* are exactly HPAGE_PMD_ORDER. Those should be fixed, but until then, +* limit the maximum allocation order to PMD size. I'm not aware of any +* assumptions about maximum order if THP are disabled, but 8 seems like +* a good order (that's 1MB if you're using 4kB pages) +*/ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define MAX_PAGECACHE_ORDER HPAGE_PMD_ORDER +#else +#define MAX_PAGECACHE_ORDER 8 +#endif +/** * mapping_set_large_folios() - Indicate the file supports large folios. * @mapping: The file.
@@ -353,6 +366,14 @@ static inline bool mapping_large_folio_stest_bit (AS_LARGE_FOLIO_SUPPORT , &mapping->flags); } +/* Return the maximum folio size for this pagecache mapping, in bytes. */ +static inline size_t mapping_max_folio_size (struct address_space *mapping) +{ +if (mapping_large_folio_support (mapping)) +return PAGE_SIZE <<MAX_PAGECACHE_ORDER ; +return PAGE_SIZE ; +} +static inline int filemap_nr_thps (struct address_space *mapping) {#ifdef CONFIG_READ_ONLY_THP_FOR_FS
@@ -511,19 +532,6 @@ static inline void *detach_page_private(return folio_detach_private (page_folio (page)); } -/* -* There are some parts of the kernel which assume that PMD entries -* are exactly HPAGE_PMD_ORDER. Those should be fixed, but until then, -* limit the maximum allocation order to PMD size. I'm not aware of any -* assumptions about maximum order if THP are disabled, but 8 seems like -* a good order (that's 1MB if you're using 4kB pages) -*/ -#ifdef CONFIG_TRANSPARENT_HUGEPAGE -#define MAX_PAGECACHE_ORDER HPAGE_PMD_ORDER -#else -#define MAX_PAGECACHE_ORDER 8 -#endif -#ifdef CONFIG_NUMA struct folio *filemap_alloc_folio (gfp_t gfp,unsigned int order);#else
Greg Kroah-Hartman
maintainerPATCH 75/137 iomap: fault in smaller chunks for non-large folio mappings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 4e527d5841e24623181edc7fd6f6598ffa810e10 upstream.
Since commit (5d8edfb900d5 "iomap: Copy larger chunks from userspace"), iomap will try to copy in larger chunks than PAGE_SIZE. However, if the mapping doesn't support large folio, only one page of maximum 4KB will be created and 4KB data will be writen to pagecache each time. Then, next 4KB will be handled in next iteration. This will cause potential write performance problem.
If chunk is 2MB, total 512 pages need to be handled finally. During this period, fault_in_iov_iter_readable() is called to check iov_iter readable validity. Since only 4KB will be handled each time, below address space will be checked over and over again:
start end
-
buf, buf+2MB
buf+4KB, buf+2MB
buf+8KB, buf+2MB
...
buf+2044KB buf+2MB
Obviously the checking size is wrong since only 4KB will be handled each time. So this will get a correct chunk to let iomap work well in non-large folio case.
With this change, the write speed will be stable. Tested on ARM64 device.
Before:
- dd if=/dev/zero of=/dev/sda bs=400K count=10485 (334 MB/s) - dd if=/dev/zero of=/dev/sda bs=800K count=5242 (278 MB/s) - dd if=/dev/zero of=/dev/sda bs=1600K count=2621 (204 MB/s) - dd if=/dev/zero of=/dev/sda bs=2200K count=1906 (170 MB/s) - dd if=/dev/zero of=/dev/sda bs=3000K count=1398 (150 MB/s) - dd if=/dev/zero of=/dev/sda bs=4500K count=932 (139 MB/s)
After:
- dd if=/dev/zero of=/dev/sda bs=400K count=10485 (339 MB/s) - dd if=/dev/zero of=/dev/sda bs=800K count=5242 (330 MB/s) - dd if=/dev/zero of=/dev/sda bs=1600K count=2621 (332 MB/s) - dd if=/dev/zero of=/dev/sda bs=2200K count=1906 (333 MB/s) - dd if=/dev/zero of=/dev/sda bs=3000K count=1398 (333 MB/s) - dd if=/dev/zero of=/dev/sda bs=4500K count=932 (333 MB/s)
--- fs/iomap/buffered-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/iomap/buffered-io.c +1 -1
@@ -868,11 +868,11 @@ static size_t iomap_write_end(struct iomstatic loff_t iomap_write_iter (struct iomap_iter *iter,struct iov_iter *i) {loff_t length =iomap_length (iter); -size_t chunk =PAGE_SIZE <<MAX_PAGECACHE_ORDER ;loff_t pos = iter->pos;ssize_t written =0 ;long status =0 ;struct address_space *mapping = iter->inode->i_mapping; +size_t chunk =mapping_max_folio_size (mapping);unsigned int bdp_flags = (iter->flags &IOMAP_NOWAIT ) ?BDP_ASYNC :0 ; do {
Greg Kroah-Hartman
maintainerPATCH 76/137 i2c: acpi: Unbind mux adapters before delete
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hamish Martin <[email protected]>
commit 3f858bbf04dbac934ac279aaee05d49eb9910051 upstream.
There is an issue with ACPI overlay table removal specifically related to I2C multiplexers.
Consider an ACPI SSDT Overlay that defines a PCA9548 I2C mux on an existing I2C bus. When this table is loaded we see the creation of a device for the overall PCA9548 chip and 8 further devices - one i2c_adapter each for the mux channels. These are all bound to their ACPI equivalents via an eventual invocation of acpi_bind_one().
When we unload the SSDT overlay we run into the problem. The ACPI devices are deleted as normal via acpi_device_del_work_fn() and the acpi_device_del_list.
However, the following warning and stack trace is output as the deletion does not go smoothly:
------------[ cut here ]------------ kernfs: can not remove 'physical_node', no directory WARNING: CPU: 1 PID: 11 at fs/kernfs/dir.c:1674 kernfs_remove_by_name_ns+0xb9/0xc0 Modules linked in: CPU: 1 PID: 11 Comm: kworker/u128:0 Not tainted 6.8.0-rc6+ #1 Hardware name: congatec AG conga-B7E3/conga-B7E3, BIOS 5.13 05/16/2023 Workqueue: kacpi_hotplug acpi_device_del_work_fn RIP: 0010:kernfs_remove_by_name_ns+0xb9/0xc0 Code: e4 00 48 89 ef e8 07 71 db ff 5b b8 fe ff ff ff 5d 41 5c 41 5d e9 a7 55 e4 00 0f 0b eb a6 48 c7 c7 f0 38 0d 9d e8 97 0a d5 ff <0f> 0b eb dc 0f 1f 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 RSP: 0018:ffff9f864008fb28 EFLAGS: 00010286 RAX: 0000000000000000 RBX: ffff8ef90a8d4940 RCX: 0000000000000000 RDX: ffff8f000e267d10 RSI: ffff8f000e25c780 RDI: ffff8f000e25c780 RBP: ffff8ef9186f9870 R08: 0000000000013ffb R09: 00000000ffffbfff R10: 00000000ffffbfff R11: ffff8f000e0a0000 R12: ffff9f864008fb50 R13: ffff8ef90c93dd60 R14: ffff8ef9010d0958 R15: ffff8ef9186f98c8 FS: 0000000000000000(0000) GS:ffff8f000e240000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f48f5253a08 CR3: 00000003cb82e000 CR4: 00000000003506f0 Call Trace: <TASK> ? kernfs_remove_by_name_ns+0xb9/0xc0 ? __warn+0x7c/0x130 ? kernfs_remove_by_name_ns+0xb9/0xc0 ? report_bug+0x171/0x1a0 ? handle_bug+0x3c/0x70 ? exc_invalid_op+0x17/0x70 ? asm_exc_invalid_op+0x1a/0x20 ? kernfs_remove_by_name_ns+0xb9/0xc0 ? kernfs_remove_by_name_ns+0xb9/0xc0 acpi_unbind_one+0x108/0x180 device_del+0x18b/0x490 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f device_unregister+0xd/0x30 i2c_del_adapter.part.0+0x1bf/0x250 i2c_mux_del_adapters+0xa1/0xe0 i2c_device_remove+0x1e/0x80 device_release_driver_internal+0x19a/0x200 bus_remove_device+0xbf/0x100 device_del+0x157/0x490 ? __pfx_device_match_fwnode+0x10/0x10 ? srso_return_thunk+0x5/0x5f device_unregister+0xd/0x30 i2c_acpi_notify+0x10f/0x140 notifier_call_chain+0x58/0xd0 blocking_notifier_call_chain+0x3a/0x60 acpi_device_del_work_fn+0x85/0x1d0 process_one_work+0x134/0x2f0 worker_thread+0x2f0/0x410 ? __pfx_worker_thread+0x10/0x10 kthread+0xe3/0x110 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x2f/0x50 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK> ---[ end trace 0000000000000000 ]---
...
repeated 7 more times, 1 for each channel of the mux
...
The issue is that the binding of the ACPI devices to their peer I2C adapters is not correctly cleaned up. Digging deeper into the issue we see that the deletion order is such that the ACPI devices matching the mux channel i2c adapters are deleted first during the SSDT overlay removal. For each of the channels we see a call to i2c_acpi_notify() with ACPI_RECONFIG_DEVICE_REMOVE but, because these devices are not actually i2c_clients, nothing is done for them.
Later on, after each of the mux channels has been dealt with, we come to delete the i2c_client representing the PCA9548 device. This is the call stack we see above, whereby the kernel cleans up the i2c_client including destruction of the mux and its channel adapters. At this point we do attempt to unbind from the ACPI peers but those peers no longer exist and so we hit the kernfs errors.
The fix is to augment i2c_acpi_notify() to handle i2c_adapters. But, given that the life cycle of the adapters is linked to the i2c_client, instead of deleting the i2c_adapters during the i2c_acpi_notify(), we just trigger unbinding of the ACPI device from the adapter device, and allow the clean up of the adapter to continue in the way it always has.
--- drivers/i2c/i2c-core-acpi.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-acpi.c +15 -4
@@ -445,6 +445,11 @@ static struct i2c_client *i2c_acpi_find_return i2c_find_device_by_fwnode (acpi_fwnode_handle (adev)); } +static struct i2c_adapter *i2c_acpi_find_adapter_by_adev (struct acpi_device *adev) +{ +return i2c_find_adapter_by_fwnode (acpi_fwnode_handle (adev)); +} +static int i2c_acpi_notify (struct notifier_block *nb,unsigned long value,void *arg) {
@@ -471,11 +476,17 @@ static int i2c_acpi_notify(struct notifibreak ; client =i2c_acpi_find_client_by_adev (adev); -if (!client) -break ; +if (client) { +i2c_unregister_device (client); +put_device (&client->dev); + } + + adapter =i2c_acpi_find_adapter_by_adev (adev); +if (adapter) { +acpi_unbind_one (&adapter->dev); +put_device (&adapter->dev); + } -i2c_unregister_device (client); -put_device (&client->dev);break ; }
Greg Kroah-Hartman
maintainerPATCH 77/137 HID: i2c-hid: elan: fix reset suspend current leakage
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 0eafc58f2194dbd01d4be40f99a697681171995b upstream.
The Elan eKTH5015M touch controller found on the Lenovo ThinkPad X13s shares the VCC33 supply with other peripherals that may remain powered during suspend (e.g. when enabled as wakeup sources).
The reset line is also wired so that it can be left deasserted when the supply is off.
This is important as it avoids holding the controller in reset for extended periods of time when it remains powered, which can lead to increased power consumption, and also avoids leaking current through the X13s reset circuitry during suspend (and after driver unbind).
Use the new 'no-reset-on-power-off' devicetree property to determine when reset needs to be asserted on power down.
Notably this also avoids wasting power on machine variants without a touchscreen for which the driver would otherwise exit probe with reset asserted.
--- drivers/hid/i2c-hid/i2c-hid-of-elan.c | 59 +++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 12 deletions(-)
drivers/hid/i2c-hid/i2c-hid-of-elan.c +47 -12
@@ -31,6 +31,7 @@ struct i2c_hid_of_elan {struct regulator *vcc33;struct regulator *vccio;struct gpio_desc *reset_gpio; +bool no_reset_on_power_off;const struct elan_i2c_hid_chip_data *chip_data; };
@@ -40,17 +41,17 @@ static int elan_i2c_hid_power_up(struct container_of(ops, struct i2c_hid_of_elan, ops);int ret; +gpiod_set_value_cansleep (ihid_elan->reset_gpio,1 ); +if (ihid_elan->vcc33) { ret =regulator_enable (ihid_elan->vcc33);if (ret) -return ret; + goto err_deassert_reset; } ret =regulator_enable (ihid_elan->vccio); -if (ret) { -regulator_disable (ihid_elan->vcc33); -return ret; - } +if (ret) + goto err_disable_vcc33;if (ihid_elan->chip_data->post_power_delay_ms)msleep (ihid_elan->chip_data->post_power_delay_ms);
@@ -60,6 +61,15 @@ static int elan_i2c_hid_power_up(structmsleep (ihid_elan->chip_data->post_gpio_reset_on_delay_ms);return 0 ; + +err_disable_vcc33: +if (ihid_elan->vcc33) +regulator_disable (ihid_elan->vcc33); +err_deassert_reset: +if (ihid_elan->no_reset_on_power_off) +gpiod_set_value_cansleep (ihid_elan->reset_gpio,0 ); + +return ret; }static void elan_i2c_hid_power_down (struct i2chid_ops *ops)
@@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(strustruct i2c_hid_of_elan *ihid_elan = container_of(ops, struct i2c_hid_of_elan, ops); -gpiod_set_value_cansleep (ihid_elan->reset_gpio,1 ); +/* +* Do not assert reset when the hardware allows for it to remain +* deasserted regardless of the state of the (shared) power supply to +* avoid wasting power when the supply is left on. +*/ +if (!ihid_elan->no_reset_on_power_off) +gpiod_set_value_cansleep (ihid_elan->reset_gpio,1 ); +if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)msleep (ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
@@ -79,6 +96,7 @@ static void elan_i2c_hid_power_down(strustatic int i2c_hid_of_elan_probe (struct i2c_client *client) {struct i2c_hid_of_elan *ihid_elan; +int ret; ihid_elan =devm_kzalloc (&client->dev,sizeof (*ihid_elan),GFP_KERNEL );if (!ihid_elan)
@@ -93,21 +111,38 @@ static int i2c_hid_of_elan_probe(structif (IS_ERR (ihid_elan->reset_gpio))return PTR_ERR (ihid_elan->reset_gpio); + ihid_elan->no_reset_on_power_off =of_property_read_bool (client->dev.of_node, +"no-reset-on-power-off" ); + ihid_elan->vccio =devm_regulator_get (&client->dev,"vccio" ); -if (IS_ERR (ihid_elan->vccio)) -return PTR_ERR (ihid_elan->vccio); +if (IS_ERR (ihid_elan->vccio)) { + ret =PTR_ERR (ihid_elan->vccio); + goto err_deassert_reset; + } ihid_elan->chip_data =device_get_match_data (&client->dev);if (ihid_elan->chip_data->main_supply_name) { ihid_elan->vcc33 =devm_regulator_get (&client->dev, ihid_elan->chip_data->main_supply_name); -if (IS_ERR (ihid_elan->vcc33)) -return PTR_ERR (ihid_elan->vcc33); +if (IS_ERR (ihid_elan->vcc33)) { + ret =PTR_ERR (ihid_elan->vcc33); + goto err_deassert_reset; + } } -return i2c_hid_core_probe (client, &ihid_elan->ops, - ihid_elan->chip_data->hid_descriptor_address,0 ); + ret =i2c_hid_core_probe (client, &ihid_elan->ops, + ihid_elan->chip_data->hid_descriptor_address,0 ); +if (ret) + goto err_deassert_reset; + +return 0 ; + +err_deassert_reset: +if (ihid_elan->no_reset_on_power_off) +gpiod_set_value_cansleep (ihid_elan->reset_gpio,0 ); + +return ret; }static const struct elan_i2c_hid_chip_data elan_ekth6915_chip_data = {
Greg Kroah-Hartman
maintainerPATCH 78/137 scsi: core: Handle devices which return an unusually large VPD page count
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin K. Petersen <[email protected]>
commit d09c05aa35909adb7d29f92f0cd79fdcd1338ef0 upstream.
Peter Schneider reported that a system would no longer boot after updating to 6.8.4. Peter bisected the issue and identified commit b5fc07a5fb56 ("scsi: core: Consult supported VPD page list prior to fetching page") as being the culprit.
Turns out the enclosure device in Peter's system reports a byteswapped page length for VPD page 0. It reports "02 00" as page length instead of "00 02". This causes us to attempt to access 516 bytes (page length
+ header) of information despite only 2 pages being present.
Limit the page search scope to the size of our VPD buffer to guard against devices returning a larger page count than requested.
--- drivers/scsi/scsi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/scsi.c +7 -0
@@ -350,6 +350,13 @@ static int scsi_get_vpd_size(struct scsiif (result <SCSI_VPD_HEADER_SIZE )return 0 ; +if (result >sizeof (vpd)) { +dev_warn_once (&sdev->sdev_gendev, +"%s: long VPD page 0 length: %d bytes\n" , + __func__, result); + result =sizeof (vpd); + } + result -=SCSI_VPD_HEADER_SIZE ;if (!memchr (&vpd[SCSI_VPD_HEADER_SIZE ], page, result))return 0 ;
Greg Kroah-Hartman
maintainerPATCH 79/137 net/ipv6: Fix route deleting failure when metric equals 0
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: xu xin <[email protected]>
commit bb487272380d120295e955ad8acfcbb281b57642 upstream.
Problem
=========
After commit 67f695134703 ("ipv6: Move setting default metric for routes"), we noticed that the logic of assigning the default value of fc_metirc changed in the ioctl process. That is, when users use ioctl(fd, SIOCADDRT, rt) with a non-zero metric to add a route, then they may fail to delete a route with passing in a metric value of 0 to the kernel by ioctl(fd, SIOCDELRT, rt). But iproute can succeed in deleting it.
As a reference, when using iproute tools by netlink to delete routes with a metric parameter equals 0, like the command as follows:
ip -6 route del fe80::/64 via fe81::5054:ff:fe11:3451 dev eth0 metric 0
the user can still succeed in deleting the route entry with the smallest metric.
Root Reason
===========
After commit 67f695134703 ("ipv6: Move setting default metric for routes"), When ioctl() pass in SIOCDELRT with a zero metric, rtmsg_to_fib6_config() will set a defalut value (1024) to cfg->fc_metric in kernel, and in ip6_route_del() and the line 4074 at net/ipv3/route.c, it will check by
if (cfg->fc_metric && cfg->fc_metric != rt->fib6_metric) continue;
and the condition is true and skip the later procedure (deleting route) because cfg->fc_metric != rt->fib6_metric. But before that commit, cfg->fc_metric is still zero there, so the condition is false and it will do the following procedure (deleting).
Solution
========
In order to keep a consistent behaviour across netlink() and ioctl(), we should allow to delete a route with a metric value of 0. So we only do the default setting of fc_metric in route adding.
--- net/ipv6/route.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv6/route.c +4 -1
@@ -4434,7 +4434,7 @@ static void rtmsg_to_fib6_config(struct .fc_table = l3mdev_fib_table_by_index(net, rtmsg->rtmsg_ifindex) ? : RT6_TABLE_MAIN, .fc_ifindex = rtmsg->rtmsg_ifindex, - .fc_metric = rtmsg->rtmsg_metric ? : IP6_RT_PRIO_USER, + .fc_metric = rtmsg->rtmsg_metric, .fc_expires = rtmsg->rtmsg_info, .fc_dst_len = rtmsg->rtmsg_dst_len, .fc_src_len = rtmsg->rtmsg_src_len,
@@ -4464,6 +4464,9 @@ int ipv6_route_ioctl(struct net *net, unrtnl_lock ();switch (cmd) {case SIOCADDRT : +/* Only do the default setting of fc_metric in route adding */ +if (cfg.fc_metric ==0 ) + cfg.fc_metric =IP6_RT_PRIO_USER ; err =ip6_route_add (&cfg,GFP_KERNEL ,NULL );break ;case SIOCDELRT :
Greg Kroah-Hartman
maintainerPATCH 80/137 net/9p: fix uninit-value in p9_client_rpc()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
commit 25460d6f39024cc3b8241b14c7ccf0d6f11a736a upstream.
Syzbot with the help of KMSAN reported the following error:
BUG: KMSAN: uninit-value in trace_9p_client_res include/trace/events/9p.h:146 [inline] BUG: KMSAN: uninit-value in p9_client_rpc+0x1314/0x1340 net/9p/client.c:754 trace_9p_client_res include/trace/events/9p.h:146 [inline] p9_client_rpc+0x1314/0x1340 net/9p/client.c:754 p9_client_create+0x1551/0x1ff0 net/9p/client.c:1031 v9fs_session_init+0x1b9/0x28e0 fs/9p/v9fs.c:410 v9fs_mount+0xe2/0x12b0 fs/9p/vfs_super.c:122 legacy_get_tree+0x114/0x290 fs/fs_context.c:662 vfs_get_tree+0xa7/0x570 fs/super.c:1797 do_new_mount+0x71f/0x15e0 fs/namespace.c:3352 path_mount+0x742/0x1f20 fs/namespace.c:3679 do_mount fs/namespace.c:3692 [inline] __do_sys_mount fs/namespace.c:3898 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3875 __x64_sys_mount+0xe4/0x150 fs/namespace.c:3875 do_syscall_64+0xd5/0x1f0 entry_SYSCALL_64_after_hwframe+0x6d/0x75
Uninit was created at:
__alloc_pages+0x9d6/0xe70 mm/page_alloc.c:4598 __alloc_pages_node include/linux/gfp.h:238 [inline] alloc_pages_node include/linux/gfp.h:261 [inline] alloc_slab_page mm/slub.c:2175 [inline] allocate_slab mm/slub.c:2338 [inline] new_slab+0x2de/0x1400 mm/slub.c:2391 ___slab_alloc+0x1184/0x33d0 mm/slub.c:3525 __slab_alloc mm/slub.c:3610 [inline] __slab_alloc_node mm/slub.c:3663 [inline] slab_alloc_node mm/slub.c:3835 [inline] kmem_cache_alloc+0x6d3/0xbe0 mm/slub.c:3852 p9_tag_alloc net/9p/client.c:278 [inline] p9_client_prepare_req+0x20a/0x1770 net/9p/client.c:641 p9_client_rpc+0x27e/0x1340 net/9p/client.c:688 p9_client_create+0x1551/0x1ff0 net/9p/client.c:1031 v9fs_session_init+0x1b9/0x28e0 fs/9p/v9fs.c:410 v9fs_mount+0xe2/0x12b0 fs/9p/vfs_super.c:122 legacy_get_tree+0x114/0x290 fs/fs_context.c:662 vfs_get_tree+0xa7/0x570 fs/super.c:1797 do_new_mount+0x71f/0x15e0 fs/namespace.c:3352 path_mount+0x742/0x1f20 fs/namespace.c:3679 do_mount fs/namespace.c:3692 [inline] __do_sys_mount fs/namespace.c:3898 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3875 __x64_sys_mount+0xe4/0x150 fs/namespace.c:3875 do_syscall_64+0xd5/0x1f0 entry_SYSCALL_64_after_hwframe+0x6d/0x75
If p9_check_errors() fails early in p9_client_rpc(), req->rc.tag will not be properly initialized. However, trace_9p_client_res() ends up trying to print it out anyway before p9_client_rpc() finishes.
Fix this issue by assigning default values to p9_fcall fields such as 'tag' and (just in case KMSAN unearths something new) 'id' during the tag allocation stage.
Message-ID: <[email protected]>
--- net/9p/client.c | 2 ++ 1 file changed, 2 insertions(+)
net/9p/client.c +2 -0
@@ -235,6 +235,8 @@ static int p9_fcall_init(struct p9_clienif (!fc->sdata)return -ENOMEM ; fc->capacity = alloc_msize; + fc->id =0 ; + fc->tag =P9_NOTAG ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 81/137 mm/ksm: fix ksm_pages_scanned accounting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
commit 730cdc2c72c6905a2eda2fccbbf67dcef1206590 upstream.
Patch series "mm/ksm: fix some accounting problems", v3.
We encountered some abnormal ksm_pages_scanned and ksm_zero_pages during some random tests.
1. ksm_pages_scanned unchanged even ksmd scanning has progress.
2. ksm_zero_pages maybe -1 in some rare cases.
This patch (of 2):
During testing, I found ksm_pages_scanned is unchanged although the scan_get_next_rmap_item() did return valid rmap_item that is not NULL.
The reason is the scan_get_next_rmap_item() will return NULL after a full scan, so ksm_do_scan() just return without accounting of the ksm_pages_scanned.
Fix it by just putting ksm_pages_scanned accounting in that loop, and it will be accounted more timely if that loop would last for a long time.
--- mm/ksm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/ksm.c +2 -4
@@ -2486,18 +2486,16 @@ static void ksm_do_scan(unsigned int sca {struct ksm_rmap_item *rmap_item;struct page *page; -unsigned int npages = scan_npages; -while (npages-- &&likely (!freezing (current))) { +while (scan_npages-- &&likely (!freezing (current))) {cond_resched (); rmap_item =scan_get_next_rmap_item (&page);if (!rmap_item)return ;cmp_and_merge_page (page, rmap_item);put_page (page); + ksm_pages_scanned++; } - - ksm_pages_scanned += scan_npages - npages; }static int ksmd_should_run (void )
Greg Kroah-Hartman
maintainerPATCH 82/137 mm/ksm: fix ksm_zero_pages accounting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
commit c2dc78b86e0821ecf9a9d0c35dba2618279a5bb6 upstream.
We normally ksm_zero_pages++ in ksmd when page is merged with zero page, but ksm_zero_pages-- is done from page tables side, where there is no any accessing protection of ksm_zero_pages.
So we can read very exceptional value of ksm_zero_pages in rare cases, such as -1, which is very confusing to users.
Fix it by changing to use atomic_long_t, and the same case with the mm->ksm_zero_pages.
--- fs/proc/base.c | 2 +- include/linux/ksm.h | 17 ++++++++++++++--- include/linux/mm_types.h | 2 +- mm/ksm.c | 11 +++++------ 4 files changed, 21 insertions(+), 11 deletions(-)
fs/proc/base.c +1 -1
@@ -3207,7 +3207,7 @@ static int proc_pid_ksm_stat(struct seq_ mm =get_task_mm (task);if (mm) {seq_printf (m,"ksm_rmap_items %lu\n" , mm->ksm_rmap_items); -seq_printf (m,"ksm_zero_pages %lu\n" , mm->ksm_zero_pages); +seq_printf (m,"ksm_zero_pages %ld\n" ,mm_ksm_zero_pages (mm));seq_printf (m,"ksm_merging_pages %lu\n" , mm->ksm_merging_pages);seq_printf (m,"ksm_process_profit %ld\n" ,ksm_process_profit (mm));mmput (mm);
include/linux/ksm.h +14 -3
@@ -33,16 +33,27 @@ void __ksm_exit(struct mm_struct *mm);*/ #define is_ksm_zero_pte (pte) (is_zero_pfn(pte_pfn(pte)) && pte_dirty(pte)) -extern unsigned long ksm_zero_pages; +extern atomic_long_t ksm_zero_pages; + +static inline void ksm_map_zero_page (struct mm_struct *mm) +{ +atomic_long_inc (&ksm_zero_pages); +atomic_long_inc (&mm->ksm_zero_pages); +}static inline void ksm_might_unmap_zero_page (struct mm_struct *mm,pte_t pte) {if (is_ksm_zero_pte (pte)) { - ksm_zero_pages--; - mm->ksm_zero_pages--; +atomic_long_dec (&ksm_zero_pages); +atomic_long_dec (&mm->ksm_zero_pages); } } +static inline long mm_ksm_zero_pages (struct mm_struct *mm) +{ +return atomic_long_read (&mm->ksm_zero_pages); +} +static inline int ksm_fork (struct mm_struct *mm,struct mm_struct *oldmm) {int ret;
include/linux/mm_types.h +1 -1
@@ -899,7 +899,7 @@ struct mm_struct {* Represent how many empty pages are merged with kernel zero * pages when enabling KSM use_zero_pages. */ -unsigned long ksm_zero_pages; +atomic_long_t ksm_zero_pages;#endif /* CONFIG_KSM */ #ifdef CONFIG_LRU_GEN struct {
mm/ksm.c +5 -6
@@ -282,7 +282,7 @@ static unsigned int zero_checksum __readstatic bool ksm_use_zero_pages__read_mostly ;/* The number of zero pages which is placed by KSM */ -unsigned long ksm_zero_pages; +atomic_long_t ksm_zero_pages =ATOMIC_LONG_INIT (0 );#ifdef CONFIG_NUMA /* Zeroed when merging across nodes is not allowed */
@@ -1242,8 +1242,7 @@ static int replace_page(struct vm_area_s* the dirty bit in zero page's PTE is set. */ newpte =pte_mkdirty (pte_mkspecial (pfn_pte (page_to_pfn (kpage), vma->vm_page_prot))); - ksm_zero_pages++; - mm->ksm_zero_pages++; +ksm_map_zero_page (mm);/* * We're replacing an anonymous page with a zero page, which is * not anonymous. We need to do proper accounting otherwise we
@@ -3105,7 +3104,7 @@ static void wait_while_offlining(void)#ifdef CONFIG_PROC_FS long ksm_process_profit (struct mm_struct *mm) { -return (long )(mm->ksm_merging_pages + mm->ksm_zero_pages) *PAGE_SIZE - +return (long )(mm->ksm_merging_pages +mm_ksm_zero_pages (mm)) *PAGE_SIZE - mm->ksm_rmap_items *sizeof (struct ksm_rmap_item ); }#endif /* CONFIG_PROC_FS */
@@ -3384,7 +3383,7 @@ KSM_ATTR_RO(pages_volatile);static ssize_t ksm_zero_pages_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sysfs_emit (buf,"%ld\n" , ksm_zero_pages); +return sysfs_emit (buf,"%ld\n" ,atomic_long_read (&ksm_zero_pages)); }KSM_ATTR_RO (ksm_zero_pages);
@@ -3393,7 +3392,7 @@ static ssize_t general_profit_show(struc {long general_profit; - general_profit = (ksm_pages_sharing + ksm_zero_pages) *PAGE_SIZE - + general_profit = (ksm_pages_sharing +atomic_long_read (&ksm_zero_pages)) *PAGE_SIZE - ksm_rmap_items *sizeof (struct ksm_rmap_item );return sysfs_emit (buf,"%ld\n" , general_profit);
Greg Kroah-Hartman
maintainerPATCH 83/137 kmsan: do not wipe out origin when doing partial unpoisoning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Potapenko <[email protected]>
commit 2ef3cec44c60ae171b287db7fc2aa341586d65ba upstream.
As noticed by Brian, KMSAN should not be zeroing the origin when unpoisoning parts of a four-byte uninitialized value, e.g.:
char a[4];
kmsan_unpoison_memory(a, 1);This led to false negatives, as certain poisoned values could receive zero origins, preventing those values from being reported.
To fix the problem, check that kmsan_internal_set_shadow_origin() writes zero origins only to slots which have zero shadow.
--- mm/kmsan/core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
mm/kmsan/core.c +11 -4
@@ -262,8 +262,7 @@ void kmsan_internal_set_shadow_origin(vo u32 origin, bool checked) {u64 address = (u64 )addr; -void *shadow_start; -u32 *origin_start; +u32 *shadow_start, *origin_start;size_t pad =0 ;KMSAN_WARN_ON (!kmsan_metadata_is_contiguous (addr, size));
@@ -291,8 +290,16 @@ void kmsan_internal_set_shadow_origin(vo origin_start = (u32 *)kmsan_get_metadata ((void *)address,KMSAN_META_ORIGIN ); -for (int i =0 ; i < size /KMSAN_ORIGIN_SIZE ; i++) - origin_start[i] = origin; +/* +* If the new origin is non-zero, assume that the shadow byte is also non-zero, +* and unconditionally overwrite the old origin slot. +* If the new origin is zero, overwrite the old origin slot iff the +* corresponding shadow slot is zero. +*/ +for (int i =0 ; i < size /KMSAN_ORIGIN_SIZE ; i++) { +if (origin || !shadow_start[i]) + origin_start[i] = origin; + } }struct page *kmsan_vmalloc_to_page_or_null (void *vaddr)
Greg Kroah-Hartman
maintainerPATCH 84/137 tpm_tis: Do *not* flush uninitialized work
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 0ea00e249ca992adee54dc71a526ee70ef109e40 upstream.
tpm_tis_core_init() may fail before tpm_tis_probe_irq_single() is called, in which case tpm_tis_remove() unconditionally calling flush_work() is triggering a warning for .func still being NULL.
--- drivers/char/tpm/tpm_tis_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/tpm/tpm_tis_core.c +2 -1
@@ -1020,7 +1020,8 @@ void tpm_tis_remove(struct tpm_chip *chip) interrupt =0 ;tpm_tis_write32 (priv, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt); -flush_work (&priv->free_irq_work); +if (priv->free_irq_work.func) +flush_work (&priv->free_irq_work);tpm_tis_clkrun_enable (chip, false);
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 85/137 cpufreq: amd-pstate: Fix the inconsistency in max frequency units
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
commit e4731baaf29438508197d3a8a6d4f5a8c51663f8 upstream.
The nominal frequency in cpudata is maintained in MHz whereas all other frequencies are in KHz. This means we have to convert nominal frequency value to KHz before we do any interaction with other frequency values.
In amd_pstate_set_boost(), this conversion from MHz to KHz is missed, fix that.
Tested on a AMD Zen4 EPYC server
Before:
$ cat /sys/devices/system/cpu/cpufreq/policy*/scaling_max_freq | uniq 2151 $ cat /sys/devices/system/cpu/cpufreq/policy*/cpuinfo_min_freq | uniq 400000 $ cat /sys/devices/system/cpu/cpufreq/policy*/scaling_cur_freq | uniq 2151 409422
After:
$ cat /sys/devices/system/cpu/cpufreq/policy*/scaling_max_freq | uniq 2151000 $ cat /sys/devices/system/cpu/cpufreq/policy*/cpuinfo_min_freq | uniq 400000 $ cat /sys/devices/system/cpu/cpufreq/policy*/scaling_cur_freq | uniq 2151000 1799527
--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +1 -1
@@ -675,7 +675,7 @@ static int amd_pstate_set_boost(struct cif (state) policy->cpuinfo.max_freq = cpudata->max_freq;else - policy->cpuinfo.max_freq = cpudata->nominal_freq; + policy->cpuinfo.max_freq = cpudata->nominal_freq *1000 ; policy->max = policy->cpuinfo.max_freq;
Greg Kroah-Hartman
maintainerPATCH 86/137 intel_th: pci: Add Meteor Lake-S CPU support
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit a4f813c3ec9d1c32bc402becd1f011b3904dd699 upstream.
Add support for the Trace Hub in Meteor Lake-S CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -290,6 +290,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Meteor Lake-S CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xae24), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Raptor Lake-S */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x7a26 ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 87/137 rtla/timerlat: Fix histogram report when a cpu count is 0
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Kacur <[email protected]>
commit 01b05fc0e5f3aec443a9a8ffa0022cbca2fd3608 upstream.
On short runs it is possible to get no samples on a cpu, like this:
# rtla timerlat hist -u -T50
Index IRQ-001 Thr-001 Usr-001 IRQ-002 Thr-002 Usr-002
2 1 0 0 0 0 0
33 0 1 0 0 0 0
36 0 0 1 0 0 0
49 0 0 0 1 0 0
52 0 0 0 0 1 0
over: 0 0 0 0 0 0
count: 1 1 1 1 1 0
min: 2 33 36 49 52 18446744073709551615
avg: 2 33 36 49 52 -
max: 2 33 36 49 52 0
rtla timerlat hit stop tracing
IRQ handler delay: (exit from idle) 48.21 us (91.09 %)
IRQ latency: 49.11 us
Timerlat IRQ duration: 2.17 us (4.09 %)
Blocking thread: 1.01 us (1.90 %)
swapper/2:0 1.01 us
------------------------------------------------------------------------
Thread latency: 52.93 us (100%)Max timerlat IRQ latency from idle: 49.11 us in cpu 2
Note, the value 18446744073709551615 is the same as ~0.
Fix this by reporting no results for the min, avg and max if the count is 0.
--- tools/tracing/rtla/src/timerlat_hist.c | 68 ++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 22 deletions(-)
tools/tracing/rtla/src/timerlat_hist.c +46 -22
@@ -323,17 +323,29 @@ timerlat_print_summary(struct timerlat_hif (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)continue ; -if (!params->no_irq) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].min_irq); - -if (!params->no_thread) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].min_thread); - -if (params->user_hist) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].min_user); +if (!params->no_irq) { +if (data->hist[cpu].irq_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].min_irq); +else +trace_seq_printf (trace->seq," - " ); + } + +if (!params->no_thread) { +if (data->hist[cpu].thread_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].min_thread); +else +trace_seq_printf (trace->seq," - " ); + } + +if (params->user_hist) { +if (data->hist[cpu].user_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].min_user); +else +trace_seq_printf (trace->seq," - " ); + } }trace_seq_printf (trace->seq,"\n" );
@@ -383,17 +395,29 @@ timerlat_print_summary(struct timerlat_hif (!data->hist[cpu].irq_count && !data->hist[cpu].thread_count)continue ; -if (!params->no_irq) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].max_irq); - -if (!params->no_thread) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].max_thread); - -if (params->user_hist) -trace_seq_printf (trace->seq,"%9llu " , - data->hist[cpu].max_user); +if (!params->no_irq) { +if (data->hist[cpu].irq_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].max_irq); +else +trace_seq_printf (trace->seq," - " ); + } + +if (!params->no_thread) { +if (data->hist[cpu].thread_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].max_thread); +else +trace_seq_printf (trace->seq," - " ); + } + +if (params->user_hist) { +if (data->hist[cpu].user_count) +trace_seq_printf (trace->seq,"%9llu " , + data->hist[cpu].max_user); +else +trace_seq_printf (trace->seq," - " ); + } }trace_seq_printf (trace->seq,"\n" );trace_seq_do_printf (trace->seq);
Greg Kroah-Hartman
maintainerPATCH 88/137 sparc64: Fix number of online CPUs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Ravnborg <[email protected]>
commit 98937707fea8375e8acea0aaa0b68a956dd52719 upstream.
Nick Bowler reported:
When using newer kernels on my Ultra 60 with dual 450MHz UltraSPARC-II CPUs, I noticed that only CPU 0 comes up, while older kernels (including 4.7) are working fine with both CPUs.
I bisected the failure to this commit:
9b2f753ec23710aa32c0d837d2499db92fe9115b is the first bad commit commit 9b2f753ec23710aa32c0d837d2499db92fe9115b
Author: Atish Patra <[email protected]>
Date: Thu Sep 15 14:54:40 2016 -0600
sparc64: Fix cpu_possible_mask if nr_cpus is set
This is a small change that reverts very easily on top of 5.18: there is just one trivial conflict. Once reverted, both CPUs work again.
Maybe this is related to the fact that the CPUs on this system are numbered CPU0 and CPU2 (there is no CPU1)?
The current code that adjust cpu_possible based on nr_cpu_ids do not take into account that CPU's may not come one after each other. Move the chech to the function that setup the cpu_possible mask so there is no need to adjust it later.
--- arch/sparc/include/asm/smp_64.h | 2 -- arch/sparc/kernel/prom_64.c | 4 +++- arch/sparc/kernel/setup_64.c | 1 - arch/sparc/kernel/smp_64.c | 14 -------------- 4 files changed, 3 insertions(+), 18 deletions(-)
arch/sparc/include/asm/smp_64.h +0 -2
@@ -47,7 +47,6 @@ void arch_send_call_function_ipi_mask(coint hard_smp_processor_id (void );#define raw_smp_processor_id () (current_thread_info()->cpu) -void smp_fill_in_cpu_possible_map (void );void smp_fill_in_sib_core_maps (void );void __noreturn cpu_play_dead (void );
@@ -77,7 +76,6 @@ void __cpu_die(unsigned int cpu);#define smp_fill_in_sib_core_maps () do { } while (0)#define smp_fetch_global_regs () do { } while (0)#define smp_fetch_global_pmu () do { } while (0) -#define smp_fill_in_cpu_possible_map () do { } while (0)#define smp_init_cpu_poke () do { } while (0)#define scheduler_poke () do { } while (0)
arch/sparc/kernel/prom_64.c +3 -1
@@ -483,7 +483,9 @@ static void *record_one_cpu(struct devic ncpus_probed++;#ifdef CONFIG_SMP set_cpu_present (cpuid, true); -set_cpu_possible (cpuid, true); + +if (num_possible_cpus () < nr_cpu_ids) +set_cpu_possible (cpuid, true);#endif return NULL ; }
arch/sparc/kernel/setup_64.c +0 -1
@@ -684,7 +684,6 @@ void __init setup_arch(char **cmdline_p)paging_init ();init_sparc64_elf_hwcap (); -smp_fill_in_cpu_possible_map ();/* * Once the OF device tree and MDESC have been setup and nr_cpus has * been parsed, we know the list of possible cpus. Therefore we can
arch/sparc/kernel/smp_64.c +0 -14
@@ -1220,20 +1220,6 @@ void __init smp_setup_processor_id(void) xcall_deliver_impl = hypervisor_xcall_deliver; } -void __init smp_fill_in_cpu_possible_map (void ) -{ -int possible_cpus =num_possible_cpus (); -int i; - -if (possible_cpus > nr_cpu_ids) - possible_cpus = nr_cpu_ids; - -for (i =0 ; i < possible_cpus; i++) -set_cpu_possible (i, true); -for (; i <NR_CPUS ; i++) -set_cpu_possible (i, false); -} -void smp_fill_in_sib_core_maps (void ) {unsigned int i;
Greg Kroah-Hartman
maintainerPATCH 89/137 mm/cma: drop incorrect alignment check in cma_init_reserved_mem
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank van der Linden <[email protected]>
commit b174f139bdc8aaaf72f5b67ad1bd512c4868a87e upstream.
cma_init_reserved_mem uses IS_ALIGNED to check if the size represented by one bit in the cma allocation bitmask is aligned with CMA_MIN_ALIGNMENT_BYTES (pageblock size).
However, this is too strict, as this will fail if order_per_bit > pageblock_order, which is a valid configuration.
We could check IS_ALIGNED both ways, but since both numbers are powers of two, no check is needed at all.
--- mm/cma.c | 4 ---- 1 file changed, 4 deletions(-)
mm/cma.c +0 -4
@@ -187,10 +187,6 @@ int __init cma_init_reserved_mem(phys_adif (!size || !memblock_is_region_reserved (base, size))return -EINVAL ; -/* alignment should be aligned with order_per_bit */ -if (!IS_ALIGNED (CMA_MIN_ALIGNMENT_PAGES ,1 << order_per_bit)) -return -EINVAL ; -/* ensure minimal alignment required by mm core */ if (!IS_ALIGNED (base | size,CMA_MIN_ALIGNMENT_BYTES ))return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 90/137 mm/hugetlb: pass correct order_per_bit to cma_declare_contiguous_nid
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank van der Linden <[email protected]>
commit 55d134a7b499c77e7cfd0ee41046f3c376e791e5 upstream.
The hugetlb_cma code passes 0 in the order_per_bit argument to cma_declare_contiguous_nid (the alignment, computed using the page order, is correctly passed in).
This causes a bit in the cma allocation bitmap to always represent a 4k page, making the bitmaps potentially very large, and slower.
It would create bitmaps that would be pretty big. E.g. for a 4k page size on x86, hugetlb_cma=64G would mean a bitmap size of (64G / 4k) / 8 == 2M. With HUGETLB_PAGE_ORDER as order_per_bit, as intended, this would be (64G / 2M) / 8 == 4k. So, that's quite a difference.
Also, this restricted the hugetlb_cma area to ((PAGE_SIZE << MAX_PAGE_ORDER) * 8) * PAGE_SIZE (e.g. 128G on x86) , since bitmap_alloc uses normal page allocation, and is thus restricted by MAX_PAGE_ORDER. Specifying anything about that would fail the CMA initialization.
So, correctly pass in the order instead.
--- mm/hugetlb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/hugetlb.c +3 -3
@@ -7464,9 +7464,9 @@ void __init hugetlb_cma_reserve(int orde* huge page demotion. */ res =cma_declare_contiguous_nid (0 , size,0 , -PAGE_SIZE <<HUGETLB_PAGE_ORDER , -0 , false, name, - &hugetlb_cma[nid], nid); +PAGE_SIZE <<HUGETLB_PAGE_ORDER , +HUGETLB_PAGE_ORDER , false, name, + &hugetlb_cma[nid], nid);if (res) {pr_warn ("hugetlb_cma: reservation failed: err %d, node %d" , res, nid);
Greg Kroah-Hartman
maintainerPATCH 91/137 mm: /proc/pid/smaps_rollup: avoid skipping vma after getting mmap_lock again
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuanyuan Zhong <[email protected]>
commit 6d065f507d82307d6161ac75c025111fb8b08a46 upstream.
After switching smaps_rollup to use VMA iterator, searching for next entry is part of the condition expression of the do-while loop. So the current VMA needs to be addressed before the continue statement.
Otherwise, with some VMAs skipped, userspace observed memory consumption from /proc/pid/smaps_rollup will be smaller than the sum of the corresponding fields from /proc/pid/smaps.
--- fs/proc/task_mmu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/proc/task_mmu.c +7 -2
@@ -965,12 +965,17 @@ static int show_smaps_rollup(struct seq_break ;/* Case 1 and 2 above */ -if (vma->vm_start >= last_vma_end) +if (vma->vm_start >= last_vma_end) { +smap_gather_stats (vma, &mss,0 ); + last_vma_end = vma->vm_end;continue ; + }/* Case 4 above */ -if (vma->vm_end > last_vma_end) +if (vma->vm_end > last_vma_end) {smap_gather_stats (vma, &mss, last_vma_end); + last_vma_end = vma->vm_end; + } } }for_each_vma (vmi, vma);
Greg Kroah-Hartman
maintainerPATCH 92/137 mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hailong.Liu <[email protected]>
commit 8e0545c83d672750632f46e3f9ad95c48c91a0fc upstream.
commit a421ef303008 ("mm: allow !GFP_KERNEL allocations for kvmalloc") includes support for __GFP_NOFAIL, but it presents a conflict with commit dd544141b9eb ("vmalloc: back off when the current task is OOM-killed"). A possible scenario is as follows:
process-a__vmalloc_node_range(GFP_KERNEL | __GFP_NOFAIL)
__vmalloc_area_node()
vm_area_alloc_pages()
--> oom-killer send SIGKILL to process-a
if (fatal_signal_pending(current)) break;--> return NULL;
To fix this, do not check fatal_signal_pending() in vm_area_alloc_pages() if __GFP_NOFAIL set.
This issue occurred during OPLUS KASAN TEST. Below is part of the log -> oom-killer sends signal to process
[65731.222840] [ T1308] oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0,global_oom,task_memcg=/apps/uid_10198,task=gs.intelligence,pid=32454,uid=10198
[65731.259685] [T32454] Call trace: [65731.259698] [T32454] dump_backtrace+0xf4/0x118 [65731.259734] [T32454] show_stack+0x18/0x24 [65731.259756] [T32454] dump_stack_lvl+0x60/0x7c [65731.259781] [T32454] dump_stack+0x18/0x38 [65731.259800] [T32454] mrdump_common_die+0x250/0x39c [mrdump] [65731.259936] [T32454] ipanic_die+0x20/0x34 [mrdump] [65731.260019] [T32454] atomic_notifier_call_chain+0xb4/0xfc [65731.260047] [T32454] notify_die+0x114/0x198 [65731.260073] [T32454] die+0xf4/0x5b4 [65731.260098] [T32454] die_kernel_fault+0x80/0x98 [65731.260124] [T32454] __do_kernel_fault+0x160/0x2a8 [65731.260146] [T32454] do_bad_area+0x68/0x148 [65731.260174] [T32454] do_mem_abort+0x151c/0x1b34 [65731.260204] [T32454] el1_abort+0x3c/0x5c [65731.260227] [T32454] el1h_64_sync_handler+0x54/0x90 [65731.260248] [T32454] el1h_64_sync+0x68/0x6c
[65731.260269] [T32454] z_erofs_decompress_queue+0x7f0/0x2258 --> be->decompressed_pages = kvcalloc(be->nr_pages, sizeof(struct page *), GFP_KERNEL | __GFP_NOFAIL); kernel panic by NULL pointer dereference. erofs assume kvmalloc with __GFP_NOFAIL never return NULL. [65731.260293] [T32454] z_erofs_runqueue+0xf30/0x104c [65731.260314] [T32454] z_erofs_readahead+0x4f0/0x968 [65731.260339] [T32454] read_pages+0x170/0xadc [65731.260364] [T32454] page_cache_ra_unbounded+0x874/0xf30 [65731.260388] [T32454] page_cache_ra_order+0x24c/0x714 [65731.260411] [T32454] filemap_fault+0xbf0/0x1a74 [65731.260437] [T32454] __do_fault+0xd0/0x33c [65731.260462] [T32454] handle_mm_fault+0xf74/0x3fe0 [65731.260486] [T32454] do_mem_abort+0x54c/0x1b34 [65731.260509] [T32454] el0_da+0x44/0x94 [65731.260531] [T32454] el0t_64_sync_handler+0x98/0xb4 [65731.260553] [T32454] el0t_64_sync+0x198/0x19c
--- mm/vmalloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
mm/vmalloc.c +2 -3
@@ -2994,7 +2994,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, {unsigned int nr_allocated =0 ;gfp_t alloc_gfp = gfp; -bool nofail = false; +bool nofail = gfp & __GFP_NOFAIL;struct page *page;int i;
@@ -3051,12 +3051,11 @@ vm_area_alloc_pages(gfp_t gfp, int nid,* and compaction etc. */ alloc_gfp &= ~__GFP_NOFAIL; - nofail = true; }/* High-order pages or fallback path if "bulk" fails. */ while (nr_allocated < nr_pages) { -if (fatal_signal_pending (current)) +if (!nofail &&fatal_signal_pending (current))break ;if (nid ==NUMA_NO_NODE )
Greg Kroah-Hartman
maintainerPATCH 93/137 selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dev Jain <[email protected]>
commit 9ad665ef55eaad1ead1406a58a34f615a7c18b5e upstream.
Currently, the test tries to set nr_hugepages to zero, but that is not actually done because the file offset is not reset after read(). Fix that using lseek().
--- tools/testing/selftests/mm/compaction_test.c | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/mm/compaction_test.c +2 -0
@@ -103,6 +103,8 @@ int check_compaction(unsigned long mem_f goto close_fd; } +lseek (fd,0 ,SEEK_SET ); +/* Start with the initial condition of 0 huge pages*/ if (write (fd,"0" ,sizeof (char )) !=sizeof (char )) {perror ("Failed to write 0 to /proc/sys/vm/nr_hugepages\n" );
Greg Kroah-Hartman
maintainerPATCH 94/137 selftests/mm: fix build warnings on ppc64
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
commit 1901472fa880e5706f90926cd85a268d2d16bf84 upstream.
Fix warnings like:
In file included from uffd-unit-tests.c:8:
uffd-unit-tests.c: In function `uffd_poison_handle_fault':
uffd-common.h:45:33: warning: format %llu' expects argument of type long long unsigned int', but argument 3 has type __u64' {aka long unsigned int'} [-Wformat=]
By switching to unsigned long long for u64 for ppc64 builds.
--- tools/testing/selftests/mm/gup_test.c | 1 + tools/testing/selftests/mm/uffd-common.h | 1 + 2 files changed, 2 insertions(+)
tools/testing/selftests/mm/gup_test.c +1 -0
@@ -1,3 +1,4 @@ +#define __SANE_USERSPACE_TYPES__// Use ll64 #include <fcntl.h> #include <errno.h> #include <stdio.h>
tools/testing/selftests/mm/uffd-common.h +1 -0
@@ -8,6 +8,7 @@#define __UFFD_COMMON_H__#define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__// Use ll64 #include <stdio.h> #include <errno.h> #include <unistd.h>
Greg Kroah-Hartman
maintainerPATCH 95/137 watchdog: rti_wdt: Set min_hw_heartbeat_ms to accommodate a safety margin
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Judith Mendez <[email protected]>
commit cae58516534e110f4a8558d48aa4435e15519121 upstream.
On AM62x, the watchdog is pet before the valid window is open. Fix min_hw_heartbeat and accommodate a 2% + static offset safety margin. The static offset accounts for max hardware error.
Remove the hack in the driver which shifts the open window boundary, since it is no longer necessary due to the fix mentioned above.
--- drivers/watchdog/rti_wdt.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/watchdog/rti_wdt.c +15 -19
@@ -59,6 +59,8 @@#define PON_REASON_EOF_NUM 0xCCCCBBBB#define RESERVED_MEM_MIN_SIZE 12 +#define MAX_HW_ERROR 250 +static int heartbeat =DEFAULT_HEARTBEAT ;/*
@@ -97,7 +99,7 @@ static int rti_wdt_start(struct watchdog* to be 50% or less than that; we obviouly want to configure the open * window as large as possible so we select the 50% option. */ - wdd->min_hw_heartbeat_ms =500 * wdd->timeout; + wdd->min_hw_heartbeat_ms =520 * wdd->timeout +MAX_HW_ERROR ;/* Generate NMI when wdt expires */ writel_relaxed (RTIWWDRX_NMI , wdt->base +RTIWWDRXCTRL );
@@ -131,31 +133,33 @@ static int rti_wdt_setup_hw_hb(struct wa* be petted during the open window; not too early or not too late. * The HW configuration options only allow for the open window size * to be 50% or less than that. +* To avoid any glitches, we accommodate 2% + max hardware error +* safety margin. */ switch (wsize) {case RTIWWDSIZE_50P : -/* 50% open window => 50% min heartbeat */ - wdd->min_hw_heartbeat_ms =500 * heartbeat; +/* 50% open window => 52% min heartbeat */ + wdd->min_hw_heartbeat_ms =520 * heartbeat +MAX_HW_ERROR ;break ;case RTIWWDSIZE_25P : -/* 25% open window => 75% min heartbeat */ - wdd->min_hw_heartbeat_ms =750 * heartbeat; +/* 25% open window => 77% min heartbeat */ + wdd->min_hw_heartbeat_ms =770 * heartbeat +MAX_HW_ERROR ;break ;case RTIWWDSIZE_12P5 : -/* 12.5% open window => 87.5% min heartbeat */ - wdd->min_hw_heartbeat_ms =875 * heartbeat; +/* 12.5% open window => 89.5% min heartbeat */ + wdd->min_hw_heartbeat_ms =895 * heartbeat +MAX_HW_ERROR ;break ;case RTIWWDSIZE_6P25 : -/* 6.5% open window => 93.5% min heartbeat */ - wdd->min_hw_heartbeat_ms =935 * heartbeat; +/* 6.5% open window => 95.5% min heartbeat */ + wdd->min_hw_heartbeat_ms =955 * heartbeat +MAX_HW_ERROR ;break ;case RTIWWDSIZE_3P125 : -/* 3.125% open window => 96.9% min heartbeat */ - wdd->min_hw_heartbeat_ms =969 * heartbeat; +/* 3.125% open window => 98.9% min heartbeat */ + wdd->min_hw_heartbeat_ms =989 * heartbeat +MAX_HW_ERROR ;break ;default :
@@ -233,14 +237,6 @@ static int rti_wdt_probe(struct platformreturn -EINVAL ; } -/* -* If watchdog is running at 32k clock, it is not accurate. -* Adjust frequency down in this case so that we don't pet -* the watchdog too often. -*/ -if (wdt->freq <32768 ) - wdt->freq = wdt->freq *9 /10 ; -pm_runtime_enable (dev); ret =pm_runtime_resume_and_get (dev);if (ret <0 ) {
Greg Kroah-Hartman
maintainerPATCH 96/137 bonding: fix oops during rmmod
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Battersby <[email protected]>
commit a45835a0bb6ef7d5ddbc0714dd760de979cb6ece upstream.
"rmmod bonding" causes an oops ever since commit cc317ea3d927 ("bonding:
remove redundant NULL check in debugfs function"). Here are the relevant functions being called:
bonding_exit()
bond_destroy_debugfs()
debugfs_remove_recursive(bonding_debug_root);
bonding_debug_root = NULL; <--------- SET TO NULL HERE
bond_netlink_fini()
rtnl_link_unregister()
__rtnl_link_unregister()
unregister_netdevice_many_notify()
bond_uninit()
bond_debug_unregister()
(commit removed check for bonding_debug_root == NULL)
debugfs_remove()
simple_recursive_removal()
down_write() -> OOPSHowever, reverting the bad commit does not solve the problem completely because the original code contains a race that could cause the same oops, although it was much less likely to be triggered unintentionally:
CPU1
rmmod bonding
bonding_exit()
bond_destroy_debugfs()
debugfs_remove_recursive(bonding_debug_root);CPU2
echo -bond0 > /sys/class/net/bonding_masters
bond_uninit()
bond_debug_unregister()
if (!bonding_debug_root)
CPU1
bonding_debug_root = NULL;
So do NOT revert the bad commit (since the removed checks were racy anyway), and instead change the order of actions taken during module removal. The same oops can also happen if there is an error during module init, so apply the same fix there.
--- drivers/net/bonding/bond_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/bonding/bond_main.c +7 -6
@@ -6484,16 +6484,16 @@ static int __init bonding_init(void)if (res) goto out; +bond_create_debugfs (); + res =register_pernet_subsys (&bond_net_ops);if (res) - goto out; + goto err_net_ops; res =bond_netlink_init ();if (res) goto err_link; -bond_create_debugfs (); -for (i =0 ; i < max_bonds; i++) { res =bond_create (&init_net,NULL );if (res)
@@ -6508,10 +6508,11 @@ static int __init bonding_init(void) out:return res; err: -bond_destroy_debugfs ();bond_netlink_fini (); err_link:unregister_pernet_subsys (&bond_net_ops); +err_net_ops: +bond_destroy_debugfs (); goto out; }
@@ -6520,11 +6521,11 @@ static void __exit bonding_exit(void) {unregister_netdevice_notifier (&bond_netdev_notifier); -bond_destroy_debugfs (); -bond_netlink_fini ();unregister_pernet_subsys (&bond_net_ops); +bond_destroy_debugfs (); +#ifdef CONFIG_NET_POLL_CONTROLLER /* Make sure we don't have an imbalance on our netpoll blocking */ WARN_ON (atomic_read (&netpoll_block_tx));
Greg Kroah-Hartman
maintainerPATCH 97/137 wifi: ath10k: fix QCOM_RPROC_COMMON dependency
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
commit 21ae74e1bf18331ae5e279bd96304b3630828009 upstream.
If ath10k_snoc is built-in, while Qualcomm remoteprocs are built as modules, compilation fails with:
/usr/bin/aarch64-linux-gnu-ld: drivers/net/wireless/ath/ath10k/snoc.o: in function `ath10k_modem_init':drivers/net/wireless/ath/ath10k/snoc.c:1534: undefined reference to qcom_register_ssr_notifier' /usr/bin/aarch64-linux-gnu-ld: drivers/net/wireless/ath/ath10k/snoc.o: in function ath10k_modem_deinit':drivers/net/wireless/ath/ath10k/snoc.c:1551: undefined reference to `qcom_unregister_ssr_notifier'
Add corresponding dependency to ATH10K_SNOC Kconfig entry so that it's built as module if QCOM_RPROC_COMMON is built as module too.
--- drivers/net/wireless/ath/ath10k/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/Kconfig +1 -0
@@ -45,6 +45,7 @@ config ATH10K_SNOC depends on ATH10K depends on ARCH_QCOM || COMPILE_TEST depends on QCOM_SMEM + depends on QCOM_RPROC_COMMON || QCOM_RPROC_COMMON=n select QCOM_SCM select QCOM_QMI_HELPERS help
Greg Kroah-Hartman
maintainerPATCH 98/137 kdb: Fix buffer overflow during tab-complete
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Thompson <[email protected]>
commit e9730744bf3af04cda23799029342aa3cddbc454 upstream.
Currently, when the user attempts symbol completion with the Tab key, kdb will use strncpy() to insert the completed symbol into the command buffer. Unfortunately it passes the size of the source buffer rather than the destination to strncpy() with predictably horrible results. Most obviously if the command buffer is already full but cp, the cursor position, is in the middle of the buffer, then we will write past the end of the supplied buffer.
Fix this by replacing the dubious strncpy() calls with memmove()/memcpy() calls plus explicit boundary checks to make sure we have enough space before we start moving characters around.
--- kernel/debug/kdb/kdb_io.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
kernel/debug/kdb/kdb_io.c +13 -8
@@ -367,14 +367,19 @@ poll_again:kdb_printf (kdb_prompt_str);kdb_printf ("%s" , buffer); }else if (tab !=2 && count >0 ) { - len_tmp =strlen (p_tmp); -strncpy (p_tmp+len_tmp, cp, lastchar-cp+1 ); - len_tmp =strlen (p_tmp); -strncpy (cp, p_tmp+len, len_tmp-len +1 ); - len = len_tmp - len; -kdb_printf ("%s" , cp); - cp += len; - lastchar += len; +/* How many new characters do we want from tmpbuffer? */ + len_tmp =strlen (p_tmp) - len; +if (lastchar + len_tmp >= bufend) + len_tmp = bufend - lastchar; + +if (len_tmp) { +/* + 1 ensures the '\0' is memmove'd */ +memmove (cp+len_tmp, cp, (lastchar-cp) +1 ); +memcpy (cp, p_tmp+len, len_tmp); +kdb_printf ("%s" , cp); + cp += len_tmp; + lastchar += len_tmp; + } } kdb_nextline =1 ;/* reset output line number */ break ;
Greg Kroah-Hartman
maintainerPATCH 99/137 kdb: Use format-strings rather than \0 injection in kdb_read()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Thompson <[email protected]>
commit 09b35989421dfd5573f0b4683c7700a7483c71f9 upstream.
Currently when kdb_read() needs to reposition the cursor it uses copy and paste code that works by injecting an '\0' at the cursor position before delivering a carriage-return and reprinting the line (which stops at the '\0').
Tidy up the code by hoisting the copy and paste code into an appropriately named function. Additionally let's replace the '\0' injection with a proper field width parameter so that the string will be abridged during formatting instead.
--- kernel/debug/kdb/kdb_io.c | 55 ++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 21 deletions(-)
kernel/debug/kdb/kdb_io.c +34 -21
@@ -184,6 +184,33 @@ char kdb_getchar(void)unreachable (); } +/** +* kdb_position_cursor() - Place cursor in the correct horizontal position +* @prompt: Nil-terminated string containing the prompt string +* @buffer: Nil-terminated string containing the entire command line +* @cp: Cursor position, pointer the character in buffer where the cursor +* should be positioned. +* +* The cursor is positioned by sending a carriage-return and then printing +* the content of the line until we reach the correct cursor position. +* +* There is some additional fine detail here. +* +* Firstly, even though kdb_printf() will correctly format zero-width fields +* we want the second call to kdb_printf() to be conditional. That keeps things +* a little cleaner when LOGGING=1. +* +* Secondly, we can't combine everything into one call to kdb_printf() since +* that renders into a fixed length buffer and the combined print could result +* in unwanted truncation. +*/ +static void kdb_position_cursor (char *prompt,char *buffer,char *cp) +{ +kdb_printf ("\r%s" , kdb_prompt_str); +if (cp > buffer) +kdb_printf ("%.*s" , (int )(cp - buffer), buffer); +} +/* * kdb_read *
@@ -212,7 +239,6 @@ static char *kdb_read(char *buffer, size* and null byte */ char *lastchar;char *p_tmp; -char tmp;static char tmpbuffer[CMD_BUFLEN ];int len =strlen (buffer);int len_tmp;
@@ -249,12 +275,8 @@ poll_again: } *(--lastchar) ='\0' ; --cp; -kdb_printf ("\b%s \r" , cp); - tmp = *cp; - *cp ='\0' ; -kdb_printf (kdb_prompt_str); -kdb_printf ("%s" , buffer); - *cp = tmp; +kdb_printf ("\b%s " , cp); +kdb_position_cursor (kdb_prompt_str, buffer, cp); }break ;case 10 :/* linefeed */
@@ -272,19 +294,14 @@ poll_again:memcpy (tmpbuffer, cp+1 , lastchar - cp -1 );memcpy (cp, tmpbuffer, lastchar - cp -1 ); *(--lastchar) ='\0' ; -kdb_printf ("%s \r" , cp); - tmp = *cp; - *cp ='\0' ; -kdb_printf (kdb_prompt_str); -kdb_printf ("%s" , buffer); - *cp = tmp; +kdb_printf ("%s " , cp); +kdb_position_cursor (kdb_prompt_str, buffer, cp); }break ;case 1 :/* Home */ if (cp > buffer) { -kdb_printf ("\r" ); -kdb_printf (kdb_prompt_str); cp = buffer; +kdb_position_cursor (kdb_prompt_str, buffer, cp); }break ;case 5 :/* End */
@@ -390,13 +407,9 @@ poll_again:memcpy (cp+1 , tmpbuffer, lastchar - cp); *++lastchar ='\0' ; *cp = key; -kdb_printf ("%s\r" , cp); +kdb_printf ("%s" , cp); ++cp; - tmp = *cp; - *cp ='\0' ; -kdb_printf (kdb_prompt_str); -kdb_printf ("%s" , buffer); - *cp = tmp; +kdb_position_cursor (kdb_prompt_str, buffer, cp); }else { *++lastchar ='\0' ; *cp++ = key;
Greg Kroah-Hartman
maintainerPATCH 100/137 kdb: Fix console handling when editing and tab-completing commands
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Thompson <[email protected]>
commit db2f9c7dc29114f531df4a425d0867d01e1f1e28 upstream.
Currently, if the cursor position is not at the end of the command buffer and the user uses the Tab-complete functions, then the console does not leave the cursor in the correct position.
For example consider the following buffer with the cursor positioned at the ^:
md kdb_pro 10
^
Pressing tab should result in:
md kdb_prompt_str 10
^
However this does not happen. Instead the cursor is placed at the end (after then 10) and further cursor movement redraws incorrectly. The same problem exists when we double-Tab but in a different part of the code.
Fix this by sending a carriage return and then redisplaying the text to the left of the cursor.
--- kernel/debug/kdb/kdb_io.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/debug/kdb/kdb_io.c +5 -0
@@ -383,6 +383,8 @@ poll_again:kdb_printf ("\n" );kdb_printf (kdb_prompt_str);kdb_printf ("%s" , buffer); +if (cp != lastchar) +kdb_position_cursor (kdb_prompt_str, buffer, cp); }else if (tab !=2 && count >0 ) {/* How many new characters do we want from tmpbuffer? */ len_tmp =strlen (p_tmp) - len;
@@ -396,6 +398,9 @@ poll_again:kdb_printf ("%s" , cp); cp += len_tmp; lastchar += len_tmp; +if (cp != lastchar) +kdb_position_cursor (kdb_prompt_str, + buffer, cp); } } kdb_nextline =1 ;/* reset output line number */
Greg Kroah-Hartman
maintainerPATCH 101/137 kdb: Merge identical case statements in kdb_read()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Thompson <[email protected]>
commit 6244917f377bf64719551b58592a02a0336a7439 upstream.
The code that handles case 14 (down) and case 16 (up) has been copy and pasted despite being byte-for-byte identical. Combine them.
--- kernel/debug/kdb/kdb_io.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
kernel/debug/kdb/kdb_io.c +1 -9
@@ -317,6 +317,7 @@ poll_again: }break ;case 14 :/* Down */ +case 16 :/* Up */ memset (tmpbuffer,' ' ,strlen (kdb_prompt_str) + (lastchar-buffer)); *(tmpbuffer+strlen(kdb_prompt_str) +
@@ -331,15 +332,6 @@ poll_again: ++cp; }break ; -case 16 :/* Up */ -memset (tmpbuffer,' ' , -strlen (kdb_prompt_str) + (lastchar-buffer)); - *(tmpbuffer+strlen (kdb_prompt_str) + - (lastchar-buffer)) ='\0' ; -kdb_printf ("\r%s\r" , tmpbuffer); - *lastchar = (char )key; - *(lastchar+1 ) ='\0' ; -return lastchar;case 9 :/* Tab */ if (tab <2 ) ++tab;
Greg Kroah-Hartman
maintainerPATCH 102/137 kdb: Use format-specifiers rather than memset() for padding in kdb_read()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Thompson <[email protected]>
commit c9b51ddb66b1d96e4d364c088da0f1dfb004c574 upstream.
Currently when the current line should be removed from the display kdb_read() uses memset() to fill a temporary buffer with spaces. The problem is not that this could be trivially implemented using a format string rather than open coding it. The real problem is that it is possible, on systems with a long kdb_prompt_str, to write past the end of the tmpbuffer.
Happily, as mentioned above, this can be trivially implemented using a format string. Make it so!
--- kernel/debug/kdb/kdb_io.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/debug/kdb/kdb_io.c +3 -5
@@ -318,11 +318,9 @@ poll_again:break ;case 14 :/* Down */ case 16 :/* Up */ -memset (tmpbuffer,' ' , -strlen (kdb_prompt_str) + (lastchar-buffer)); - *(tmpbuffer+strlen (kdb_prompt_str) + - (lastchar-buffer)) ='\0' ; -kdb_printf ("\r%s\r" , tmpbuffer); +kdb_printf ("\r%*c\r" , + (int )(strlen (kdb_prompt_str) + (lastchar - buffer)), +' ' ); *lastchar = (char )key; *(lastchar+1 ) ='\0' ;return lastchar;
Greg Kroah-Hartman
maintainerPATCH 103/137 net: fix __dst_negative_advice() race
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 92f1655aa2b2294d0b49925f3b875a634bd3b59e upstream.
__dst_negative_advice() does not enforce proper RCU rules when sk->dst_cache must be cleared, leading to possible UAF.
RCU rules are that we must first clear sk->sk_dst_cache, then call dst_release(old_dst).
Note that sk_dst_reset(sk) is implementing this protocol correctly, while __dst_negative_advice() uses the wrong order.
Given that ip6_negative_advice() has special logic against RTF_CACHE, this means each of the three ->negative_advice() existing methods must perform the sk_dst_reset() themselves.
Note the check against NULL dst is centralized in __dst_negative_advice(), there is no need to duplicate it in various callbacks.
Many thanks to Clement Lecigne for tracking this issue.
This old bug became visible after the blamed commit, using UDP sockets.
--- include/net/dst_ops.h | 2 +- include/net/sock.h | 13 +++---------- net/ipv4/route.c | 22 ++++++++-------------- net/ipv6/route.c | 29 +++++++++++++++-------------- net/xfrm/xfrm_policy.c | 11 +++-------- 5 files changed, 30 insertions(+), 47 deletions(-)
include/net/dst_ops.h +1 -1
@@ -24,7 +24,7 @@ struct dst_ops {void (*destroy)(struct dst_entry *);void (*ifdown)(struct dst_entry *,struct net_device *dev); -struct dst_entry * (*negative_advice)(struct dst_entry *); +void (*negative_advice)(struct sock *sk,struct dst_entry *);void (*link_failure)(struct sk_buff *); void (*update_pmtu)(struct dst_entry *dst, struct sock *sk, struct sk_buff *skb, u32 mtu,
include/net/sock.h +3 -10
@@ -2183,17 +2183,10 @@ sk_dst_get(const struct sock *sk)static inline void __dst_negative_advice (struct sock *sk) { -struct dst_entry *ndst, *dst =__sk_dst_get (sk); +struct dst_entry *dst =__sk_dst_get (sk); -if (dst && dst->ops->negative_advice) { - ndst = dst->ops->negative_advice (dst); - -if (ndst != dst) { -rcu_assign_pointer (sk->sk_dst_cache, ndst); -sk_tx_queue_clear (sk); -WRITE_ONCE (sk->sk_dst_pending_confirm,0 ); - } - } +if (dst && dst->ops->negative_advice) + dst->ops->negative_advice (sk, dst); }static inline void dst_negative_advice (struct sock *sk)
net/ipv4/route.c +8 -14
@@ -132,7 +132,8 @@ struct dst_entry *ipv4_dst_check(structstatic unsigned int ipv4_default_advmss (const struct dst_entry *dst);INDIRECT_CALLABLE_SCOPE unsigned int ipv4_mtu(const struct dst_entry *dst); -static struct dst_entry *ipv4_negative_advice (struct dst_entry *dst); +static void ipv4_negative_advice (struct sock *sk, +struct dst_entry *dst);static void ipv4_link_failure (struct sk_buff *skb); static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, struct sk_buff *skb, u32 mtu,
@@ -837,22 +838,15 @@ static void ip_do_redirect(struct dst_en__ip_do_redirect (rt, skb, &fl4, true); } -static struct dst_entry *ipv4_negative_advice (struct dst_entry *dst) +static void ipv4_negative_advice (struct sock *sk, +struct dst_entry *dst) {struct rtable *rt = (struct rtable *)dst; -struct dst_entry *ret = dst; -if (rt) { -if (dst->obsolete >0 ) { -ip_rt_put (rt); - ret =NULL ; - }else if ((rt->rt_flags &RTCF_REDIRECTED ) || - rt->dst.expires) { -ip_rt_put (rt); - ret =NULL ; - } - } -return ret; +if ((dst->obsolete >0 ) || + (rt->rt_flags &RTCF_REDIRECTED ) || + rt->dst.expires) +sk_dst_reset (sk); }/*
net/ipv6/route.c +15 -14
@@ -87,7 +87,8 @@ struct dst_entry *ip6_dst_check(struct dstatic unsigned int ip6_default_advmss (const struct dst_entry *dst);INDIRECT_CALLABLE_SCOPE unsigned int ip6_mtu(const struct dst_entry *dst); -static struct dst_entry *ip6_negative_advice (struct dst_entry *); +static void ip6_negative_advice (struct sock *sk, +struct dst_entry *dst);static void ip6_dst_destroy (struct dst_entry *);static void ip6_dst_ifdown (struct dst_entry *,struct net_device *dev);
@@ -2760,24 +2761,24 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry }EXPORT_INDIRECT_CALLABLE (ip6_dst_check); -static struct dst_entry *ip6_negative_advice (struct dst_entry *dst) +static void ip6_negative_advice (struct sock *sk, +struct dst_entry *dst) {struct rt6_info *rt = (struct rt6_info *) dst; -if (rt) { -if (rt->rt6i_flags &RTF_CACHE ) { -rcu_read_lock (); -if (rt6_check_expired (rt)) { -rt6_remove_exception_rt (rt); - dst =NULL ; - } -rcu_read_unlock (); - }else { -dst_release (dst); - dst =NULL ; +if (rt->rt6i_flags &RTF_CACHE ) { +rcu_read_lock (); +if (rt6_check_expired (rt)) { +/* counteract the dst_release() in sk_dst_reset() */ +dst_hold (dst); +sk_dst_reset (sk); + +rt6_remove_exception_rt (rt); } +rcu_read_unlock (); +return ; } -return dst; +sk_dst_reset (sk); }static void ip6_link_failure (struct sk_buff *skb)
net/xfrm/xfrm_policy.c +3 -8
@@ -3853,15 +3853,10 @@ static void xfrm_link_failure(struct sk_/* Impossible. Such dst must be popped before reaches point of failure. */ } -static struct dst_entry *xfrm_negative_advice (struct dst_entry *dst) +static void xfrm_negative_advice (struct sock *sk,struct dst_entry *dst) { -if (dst) { -if (dst->obsolete) { -dst_release (dst); - dst =NULL ; - } - } -return dst; +if (dst->obsolete) +sk_dst_reset (sk); }static void xfrm_init_pmtu (struct xfrm_dst **bundle,int nr)
Greg Kroah-Hartman
maintainerPATCH 104/137 e1000e: move force SMBUS near the end of enable_ulp function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
commit bfd546a552e140b0a4c8a21527c39d6d21addb28 upstream.
The commit 861e8086029e ("e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue") introduces a regression on PCH_MTP_I219_LM18 (PCIID: 0x8086550A). Without the referred commit, the ethernet works well after suspend and resume, but after applying the commit, the ethernet couldn't work anymore after the resume and the dmesg shows that the NIC link changes to 10Mbps (1000Mbps originally):
[ 43.305084] e1000e 0000:00:1f.6 enp0s31f6: NIC Link is Up 10 Mbps Full Duplex, Flow Control: Rx/Tx
Without the commit, the force SMBUS code will not be executed if "return 0" or "goto out" is executed in the enable_ulp(), and in my case, the "goto out" is executed since FWSM_FW_VALID is set. But after applying the commit, the force SMBUS code will be ran unconditionally.
Here move the force SMBUS code back to enable_ulp() and put it immediately ahead of hw->phy.ops.release(hw), this could allow the longest settling time as possible for interface in this function and doesn't change the original code logic.
The issue was found on a Lenovo laptop with the ethernet hw as below:
00:1f.6 Ethernet controller [0200]: Intel Corporation Device [8086:550a] (rev 20).
And this patch is verified (cable plug and unplug, system suspend and resume) on Lenovo laptops with ethernet hw: [8086:550a], [8086:550b], [8086:15bb], [8086:15be], [8086:1a1f], [8086:1a1c] and [8086:0dc7].
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 22 ++++++++++++++++++++++ drivers/net/ethernet/intel/e1000e/netdev.c | 18 ------------------ 2 files changed, 22 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +22 -0
@@ -1225,6 +1225,28 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000 } release: +/* Switching PHY interface always returns MDI error +* so disable retry mechanism to avoid wasting time +*/ +e1000e_disable_phy_retry (hw); + +/* Force SMBus mode in PHY */ + ret_val =e1000_read_phy_reg_hv_locked (hw,CV_SMB_CTRL , &phy_reg); +if (ret_val) { +e1000e_enable_phy_retry (hw); + hw->phy.ops.release (hw); + goto out; + } + phy_reg |=CV_SMB_CTRL_FORCE_SMBUS ; +e1000_write_phy_reg_hv_locked (hw,CV_SMB_CTRL , phy_reg); + +e1000e_enable_phy_retry (hw); + +/* Force SMBus mode in MAC */ + mac_reg =er32 (CTRL_EXT ); + mac_reg |=E1000_CTRL_EXT_FORCE_SMBUS ; +ew32 (CTRL_EXT , mac_reg); + hw->phy.ops.release (hw); out:if (ret_val)
drivers/net/ethernet/intel/e1000e/netdev.c +0 -18
@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dstruct e1000_hw *hw = &adapter->hw;u32 ctrl, ctrl_ext, rctl, status, wufc;int retval =0 ; -u16 smb_ctrl;/* Runtime suspend should only enable wakeup for link changes */ if (runtime)
@@ -6697,23 +6696,6 @@ static int __e1000_shutdown(struct pci_dif (retval)return retval; } - -/* Force SMBUS to allow WOL */ -/* Switching PHY interface always returns MDI error -* so disable retry mechanism to avoid wasting time -*/ -e1000e_disable_phy_retry (hw); - -e1e_rphy (hw,CV_SMB_CTRL , &smb_ctrl); - smb_ctrl |=CV_SMB_CTRL_FORCE_SMBUS ; -e1e_wphy (hw,CV_SMB_CTRL , smb_ctrl); - -e1000e_enable_phy_retry (hw); - -/* Force SMBus mode in MAC */ - ctrl_ext =er32 (CTRL_EXT ); - ctrl_ext |=E1000_CTRL_EXT_FORCE_SMBUS ; -ew32 (CTRL_EXT , ctrl_ext); }/* Ensure that the appropriate bits are set in LPI_CTRL
Greg Kroah-Hartman
maintainerPATCH 105/137 sparc: move struct termio to asm/termios.h
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Gilbert <[email protected]>
commit c32d18e7942d7589b62e301eb426b32623366565 upstream.
Every other arch declares struct termio in asm/termios.h, so make sparc match them.
Resolves a build failure in the PPP software package, which includes both bits/ioctl-types.h via sys/ioctl.h (glibc) and asm/termbits.h.
--- arch/sparc/include/uapi/asm/termbits.h | 10 ---------- arch/sparc/include/uapi/asm/termios.h | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-)
arch/sparc/include/uapi/asm/termbits.h +0 -10
@@ -10,16 +10,6 @@ typedef unsigned int tcflag_t;typedef unsigned long tcflag_t ;#endif -#define NCC 8 -struct termio { -unsigned short c_iflag;/* input mode flags */ -unsigned short c_oflag;/* output mode flags */ -unsigned short c_cflag;/* control mode flags */ -unsigned short c_lflag;/* local mode flags */ -unsigned char c_line;/* line discipline */ -unsigned char c_cc[NCC ];/* control characters */ -}; -#define NCCS 17struct termios {tcflag_t c_iflag;/* input mode flags */
arch/sparc/include/uapi/asm/termios.h +9 -0
@@ -40,5 +40,14 @@ struct winsize { unsigned short ws_ypixel; }; +#define NCC 8 +struct termio { +unsigned short c_iflag;/* input mode flags */ +unsigned short c_oflag;/* output mode flags */ +unsigned short c_cflag;/* control mode flags */ +unsigned short c_lflag;/* local mode flags */ +unsigned char c_line;/* line discipline */ +unsigned char c_cc[NCC ];/* control characters */ +};#endif /* _UAPI_SPARC_TERMIOS_H */
Greg Kroah-Hartman
maintainerPATCH 106/137 drm/amdkfd: handle duplicate BOs in reserve_bo_and_cond_vms
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lang Yu <[email protected]>
commit 2a705f3e49d20b59cd9e5cc3061b2d92ebe1e5f0 upstream.
Observed on gfx8 ASIC where KFD_IOC_ALLOC_MEM_FLAGS_AQL_QUEUE_MEM is used. Two attachments use the same VM, root PD would be locked twice.
[ 57.910418] Call Trace: [ 57.793726] ? reserve_bo_and_cond_vms+0x111/0x1c0 [amdgpu] [ 57.793820] amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu+0x6c/0x1c0 [amdgpu] [ 57.793923] ? idr_get_next_ul+0xbe/0x100 [ 57.793933] kfd_process_device_free_bos+0x7e/0xf0 [amdgpu] [ 57.794041] kfd_process_wq_release+0x2ae/0x3c0 [amdgpu] [ 57.794141] ? process_scheduled_works+0x29c/0x580 [ 57.794147] process_scheduled_works+0x303/0x580 [ 57.794157] ? __pfx_worker_thread+0x10/0x10 [ 57.794160] worker_thread+0x1a2/0x370 [ 57.794165] ? __pfx_worker_thread+0x10/0x10 [ 57.794167] kthread+0x11b/0x150 [ 57.794172] ? __pfx_kthread+0x10/0x10 [ 57.794177] ret_from_fork+0x3d/0x60 [ 57.794181] ? __pfx_kthread+0x10/0x10 [ 57.794184] ret_from_fork_asm+0x1b/0x30
[TT: trivially adjusted for 6.6 which does not have commit 05d249352f
(third argument to drm_exec_init removed)]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2 -1
@@ -1135,7 +1135,8 @@ static int reserve_bo_and_cond_vms(strucint ret; ctx->sync = &mem->sync; -drm_exec_init (&ctx->exec,DRM_EXEC_INTERRUPTIBLE_WAIT ); +drm_exec_init (&ctx->exec,DRM_EXEC_INTERRUPTIBLE_WAIT | +DRM_EXEC_IGNORE_DUPLICATES ); drm_exec_until_all_locked(&ctx->exec) { ctx->n_vms =0 ;list_for_each_entry (entry, &mem->attachments, list) {
Greg Kroah-Hartman
maintainerPATCH 107/137 ext4: Fixes len calculation in mpage_journal_page_buffers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ritesh Harjani (IBM) <[email protected]>
commit c2a09f3d782de952f09a3962d03b939e7fa7ffa4 upstream.
Truncate operation can race with writeback, in which inode->i_size can get truncated and therefore size - folio_pos() can be negative. This fixes the len calculation. However this path doesn't get easily triggered even with data journaling.
--- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inode.c +1 -1
@@ -2342,7 +2342,7 @@ static int mpage_journal_page_buffers(haif (folio_pos (folio) + len > size && !ext4_verity_in_progress (inode)) - len = size -folio_pos (folio); + len = size & (len -1 );return ext4_journal_folio_buffers (handle, folio, len); }
Greg Kroah-Hartman
maintainerPATCH 108/137 ext4: set type of ac_groups_linear_remaining to __u32 to avoid overflow
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
commit 9a9f3a9842927e4af7ca10c19c94dad83bebd713 upstream.
Now ac_groups_linear_remaining is of type __u16 and s_mb_max_linear_groups is of type unsigned int, so an overflow occurs when setting a value above 65535 through the mb_max_linear_groups sysfs interface. Therefore, the type of ac_groups_linear_remaining is set to __u32 to avoid overflow.
--- fs/ext4/mballoc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/mballoc.h +1 -1
@@ -194,8 +194,8 @@ struct ext4_allocation_context {__u32 ac_groups_considered;__u32 ac_flags;/* allocation hints */ +__u32 ac_groups_linear_remaining;__u16 ac_groups_scanned; -__u16 ac_groups_linear_remaining;__u16 ac_found;__u16 ac_cX_found[EXT4_MB_NUM_CRS ];__u16 ac_tail;
Greg Kroah-Hartman
maintainerPATCH 109/137 ext4: fix mb_cache_entrys e_refcnt leak in ext4_xattr_block_cache_find()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
commit 0c0b4a49d3e7f49690a6827a41faeffad5df7e21 upstream.
Syzbot reports a warning as follows:
============================================
WARNING: CPU: 0 PID: 5075 at fs/mbcache.c:419 mb_cache_destroy+0x224/0x290 Modules linked in: CPU: 0 PID: 5075 Comm: syz-executor199 Not tainted 6.9.0-rc6-gb947cc5bf6d7 RIP: 0010:mb_cache_destroy+0x224/0x290 fs/mbcache.c:419 Call Trace: <TASK> ext4_put_super+0x6d4/0xcd0 fs/ext4/super.c:1375 generic_shutdown_super+0x136/0x2d0 fs/super.c:641 kill_block_super+0x44/0x90 fs/super.c:1675 ext4_kill_sb+0x68/0xa0 fs/ext4/super.c:7327
[...]
============================================
This is because when finding an entry in ext4_xattr_block_cache_find(), if ext4_sb_bread() returns -ENOMEM, the ce's e_refcnt, which has already grown in the __entry_find(), won't be put away, and eventually trigger the above issue in mb_cache_destroy() due to reference count leakage.
So call mb_cache_entry_put() on the -ENOMEM error branch as a quick fix.
--- fs/ext4/xattr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ext4/xattr.c +3 -1
@@ -3126,8 +3126,10 @@ ext4_xattr_block_cache_find(struct inode bh =ext4_sb_bread (inode->i_sb, ce->e_value,REQ_PRIO );if (IS_ERR (bh)) { -if (PTR_ERR (bh) == -ENOMEM ) +if (PTR_ERR (bh) == -ENOMEM ) { +mb_cache_entry_put (ea_block_cache, ce);return NULL ; + } bh =NULL ;EXT4_ERROR_INODE (inode,"block %lu read error" , (unsigned long )ce->e_value);
Greg Kroah-Hartman
maintainerPATCH 110/137 riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengyu Qu <[email protected]>
commit 0f74c64f0a9f6e1e7cf17bea3d4350fa6581e0d7 upstream.
Interrupt line number of the AXP15060 PMIC is not a necessary part of its device tree. Originally the binding required one, so the dts patch added an invalid interrupt that the driver ignored (0) as the interrupt line of the PMIC is not actually connected on this platform. This went unnoticed during review as it would have been a valid interrupt for a GPIO controller, but it is not for the PLIC. The PLIC, on this platform at least, silently ignores the enablement of interrupt 0. Bo Gan is running a modified version of OpenSBI that faults if writes are done to reserved fields, so their kernel runs into problems.
Delete the invalid interrupt from the device tree.
--- arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0 -1
@@ -162,7 +162,6 @@ axp15060: pmic@36 { compatible = "x-powers,axp15060"; reg = <0x36>; - interrupts = <0>; interrupt-controller; #interrupt-cells = <1>;
Greg Kroah-Hartman
maintainerPATCH 111/137 ARM: dts: samsung: smdkv310: fix keypad no-autorepeat
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 87d8e522d6f5a004f0aa06c0def302df65aff296 upstream.
Although the Samsung SoC keypad binding defined linux,keypad-no-autorepeat property, Linux driver never implemented it and always used linux,input-no-autorepeat. Correct the DTS to use property actually implemented.
This also fixes dtbs_check errors like:
exynos4210-smdkv310.dtb: keypad@100a0000: 'linux,keypad-no-autorepeat' does not match any of the regexes: '^key-[0-9a-z]+$', 'pinctrl-[0-9]+'
--- arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts +1 -1
@@ -88,7 +88,7 @@ &keypad { samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; - linux,keypad-no-autorepeat; + linux,input-no-autorepeat; wakeup-source; pinctrl-names = "default"; pinctrl-0 = <&keypad_rows &keypad_cols>;
Greg Kroah-Hartman
maintainerPATCH 112/137 ARM: dts: samsung: smdk4412: fix keypad no-autorepeat
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 4ac4c1d794e7ff454d191bbdab7585ed8dbf3758 upstream.
Although the Samsung SoC keypad binding defined linux,keypad-no-autorepeat property, Linux driver never implemented it and always used linux,input-no-autorepeat. Correct the DTS to use property actually implemented.
This also fixes dtbs_check errors like:
exynos4412-smdk4412.dtb: keypad@100a0000: 'key-A', 'key-B', 'key-C', 'key-D', 'key-E', 'linux,keypad-no-autorepeat' do not match any of the regexes: '^key-[0-9a-z]+$', 'pinctrl-[0-9]+'
--- arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts +1 -1
@@ -69,7 +69,7 @@ &keypad { samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <8>; - linux,keypad-no-autorepeat; + linux,input-no-autorepeat; wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default";
Greg Kroah-Hartman
maintainerPATCH 113/137 ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 88208d3cd79821117fd3fb80d9bcab618467d37b upstream.
Although the Samsung SoC keypad binding defined linux,keypad-no-autorepeat property, Linux driver never implemented it and always used linux,input-no-autorepeat. Correct the DTS to use property actually implemented.
This also fixes dtbs_check errors like:
exynos4412-origen.dtb: keypad@100a0000: 'linux,keypad-no-autorepeat' does not match any of the regexes: '^key-[0-9a-z]+$', 'pinctrl-[0-9]+'
--- arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/samsung/exynos4412-origen.dts +1 -1
@@ -453,7 +453,7 @@ &keypad { samsung,keypad-num-rows = <3>; samsung,keypad-num-columns = <2>; - linux,keypad-no-autorepeat; + linux,input-no-autorepeat; wakeup-source; pinctrl-0 = <&keypad_rows &keypad_cols>; pinctrl-names = "default";
Greg Kroah-Hartman
maintainerPATCH 114/137 parisc: Define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit d4a599910193b85f76c100e30d8551c8794f8c2a upstream.
Define the HAVE_ARCH_HUGETLB_UNMAPPED_AREA macro like other platforms do in
their page.h files to avoid this compile warning:arch/parisc/mm/hugetlbpage.c:25:1: warning: no previous prototype for 'hugetlb_get_unmapped_area' [-Wmissing-prototypes]
--- arch/parisc/include/asm/page.h | 1 + 1 file changed, 1 insertion(+)
arch/parisc/include/asm/page.h +1 -0
@@ -16,6 +16,7 @@#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)#define PAGE_MASK (~(PAGE_SIZE-1)) +#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA #ifndef __ASSEMBLY__
Greg Kroah-Hartman
maintainerPATCH 115/137 parisc: Define sigset_t in parisc uapi header
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 487fa28fa8b60417642ac58e8beda6e2509d18f9 upstream.
The util-linux debian package fails to build on parisc, because sigset_t isn't defined in asm/signal.h when included from userspace. Move the sigset_t type from internal header to the uapi header to fix the build.
--- arch/parisc/include/asm/signal.h | 12 ------------ arch/parisc/include/uapi/asm/signal.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 12 deletions(-)
arch/parisc/include/asm/signal.h +0 -12
@@ -4,23 +4,11 @@#include <uapi/asm/signal.h> -#define _NSIG 64 -/* bits-per-word, where word apparently means 'long' not 'int' */ -#define _NSIG_BPW BITS_PER_LONG -#define _NSIG_WORDS (_NSIG / _NSIG_BPW) -# ifndef __ASSEMBLY__/* Most things should be clean enough to redefine this at will, if care is taken to make libc match. */ -typedef unsigned long old_sigset_t ;/* at least 32 bits */ - -typedef struct { -/* next_signal() assumes this is a long - no choice */ -unsigned long sig[_NSIG_WORDS]; -}sigset_t ; -#include <asm/sigcontext.h> #endif /* !__ASSEMBLY */
arch/parisc/include/uapi/asm/signal.h +10 -0
@@ -57,10 +57,20 @@#include <asm-generic/signal-defs.h> +#define _NSIG 64 +#define _NSIG_BPW (sizeof(unsigned long) * 8) +#define _NSIG_WORDS (_NSIG / _NSIG_BPW) +# ifndef __ASSEMBLY__# include <linux/types.h> +typedef unsigned long old_sigset_t ;/* at least 32 bits */ + +typedef struct { +unsigned long sig[_NSIG_WORDS]; +}sigset_t ; +/* Avoid too many header ordering problems. */ struct siginfo ;
Greg Kroah-Hartman
maintainerPATCH 116/137 s390/ap: Fix crash in AP internal function modify_bitmap()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
commit d4f9d5a99a3fd1b1c691b7a1a6f8f3f25f4116c9 upstream.
A system crash like this
Failing address: 200000cb7df6f000 TEID: 200000cb7df6f403
Fault in home space mode while using kernel ASCE. AS:00000002d71bc007 R3:00000003fe5b8007 S:000000011a446000 P:000000015660c13d
Oops: 0038 ilc:3 [#1] PREEMPT SMP Modules linked in: mlx5_ib ... CPU: 8 PID: 7556 Comm: bash Not tainted 6.9.0-rc7 #8 Hardware name: IBM 3931 A01 704 (LPAR) Krnl PSW : 0704e00180000000 0000014b75e7b606 (ap_parse_bitmap_str+0x10e/0x1f8) R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3 Krnl GPRS: 0000000000000001 ffffffffffffffc0 0000000000000001 00000048f96b75d3 000000cb00000100 ffffffffffffffff ffffffffffffffff 000000cb7df6fce0 000000cb7df6fce0 00000000ffffffff 000000000000002b 00000048ffffffff 000003ff9b2dbc80 200000cb7df6fcd8 0000014bffffffc0 000000cb7df6fbc8 Krnl Code: 0000014b75e7b5fc: a7840047 brc 8,0000014b75e7b68a 0000014b75e7b600: 18b2 lr %r11,%r2 #0000014b75e7b602: a7f4000a brc 15,0000014b75e7b616 >0000014b75e7b606: eb22d00000e6 laog %r2,%r2,0(%r13) 0000014b75e7b60c: a7680001 lhi %r6,1 0000014b75e7b610: 187b lr %r7,%r11 0000014b75e7b612: 84960021 brxh %r9,%r6,0000014b75e7b654 0000014b75e7b616: 18e9 lr %r14,%r9 Call Trace: [<0000014b75e7b606>] ap_parse_bitmap_str+0x10e/0x1f8 ([<0000014b75e7b5dc>] ap_parse_bitmap_str+0xe4/0x1f8) [<0000014b75e7b758>] apmask_store+0x68/0x140 [<0000014b75679196>] kernfs_fop_write_iter+0x14e/0x1e8 [<0000014b75598524>] vfs_write+0x1b4/0x448 [<0000014b7559894c>] ksys_write+0x74/0x100 [<0000014b7618a440>] __do_syscall+0x268/0x328 [<0000014b761a3558>] system_call+0x70/0x98 INFO: lockdep is turned off. Last Breaking-Event-Address: [<0000014b75e7b636>] ap_parse_bitmap_str+0x13e/0x1f8 Kernel panic - not syncing: Fatal exception: panic_on_oops
occured when /sys/bus/ap/a[pq]mask was updated with a relative mask value (like +0x10-0x12,+60,-90) with one of the numeric values exceeding INT_MAX.
The fix is simple: use unsigned long values for the internal variables. The correct checks are already in place in the function but a simple int for the internal variables was used with the possibility to overflow.
--- drivers/s390/crypto/ap_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/crypto/ap_bus.c +1 -1
@@ -1098,7 +1098,7 @@ static int hex2bitmap(const char *str, u*/ static int modify_bitmap (const char *str,unsigned long *bitmap,int bits) { -int a, i, z; +unsigned long a, i, z;char *np, sign;/* bits needs to be a multiple of 8 */
Greg Kroah-Hartman
maintainerPATCH 117/137 s390/cpacf: Split and rework cpacf query functions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
commit 830999bd7e72f4128b9dfa37090d9fa8120ce323 upstream.
Rework the cpacf query functions to use the correct RRE or RRF instruction formats and set register fields within instructions correctly.
--- arch/s390/include/asm/cpacf.h | 101 +++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 20 deletions(-)
arch/s390/include/asm/cpacf.h +81 -20
@@ -166,28 +166,79 @@typedef struct {unsigned char bytes[16 ]; }cpacf_mask_t ; -/** -* cpacf_query() - check if a specific CPACF function is available -* @opcode: the opcode of the crypto instruction -* @func: the function code to test for -* -* Executes the query function for the given crypto instruction @opcode -* and checks if @func is available -* -* Returns 1 if @func is available for @opcode, 0 otherwise -*/ -static __always_inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask) +static __always_inline void __cpacf_query_rre(u32 opc, u8 r1, u8 r2, +cpacf_mask_t *mask) +{ + asmvolatile ( +" la %%r1,%[mask]\n" +" xgr %%r0,%%r0\n" +" .insn rre,%[opc] << 16,%[r1],%[r2]\n" + : [mask]"=R" (*mask) + : [opc]"i" (opc), + [r1]"i" (r1), [r2]"i" (r2) + :"cc" ,"r0" ,"r1" ); +} + +static __always_inline void __cpacf_query_rrf(u32 opc, +u8 r1,u8 r2,u8 r3,u8 m4, +cpacf_mask_t *mask) { asmvolatile ( -" lghi 0,0\n" /* query function */ -" lgr 1,%[mask]\n" -" spm 0\n" /* pckmo doesn't change the cc */ -/* Parameter regs are ignored, but must be nonzero and unique */ -"0: .insn rrf,%[opc] << 16,2,4,6,0\n" -" brc 1,0b\n" /* handle partial completion */ - :"=m" (*mask) - : [mask]"d" ((unsigned long )mask), [opc]"i" (opcode) - :"cc" ,"0" ,"1" ); +" la %%r1,%[mask]\n" +" xgr %%r0,%%r0\n" +" .insn rrf,%[opc] << 16,%[r1],%[r2],%[r3],%[m4]\n" + : [mask]"=R" (*mask) + : [opc]"i" (opc), [r1]"i" (r1), [r2]"i" (r2), + [r3]"i" (r3), [m4]"i" (m4) + :"cc" ,"r0" ,"r1" ); +} + +static __always_inline void __cpacf_query(unsigned int opcode, +cpacf_mask_t *mask) +{ +switch (opcode) { +case CPACF_KDSA : +__cpacf_query_rre (CPACF_KDSA ,0 ,2 , mask); +break ; +case CPACF_KIMD : +__cpacf_query_rre (CPACF_KIMD ,0 ,2 , mask); +break ; +case CPACF_KLMD : +__cpacf_query_rre (CPACF_KLMD ,0 ,2 , mask); +break ; +case CPACF_KM : +__cpacf_query_rre (CPACF_KM ,2 ,4 , mask); +break ; +case CPACF_KMA : +__cpacf_query_rrf (CPACF_KMA ,2 ,4 ,6 ,0 , mask); +break ; +case CPACF_KMAC : +__cpacf_query_rre (CPACF_KMAC ,0 ,2 , mask); +break ; +case CPACF_KMC : +__cpacf_query_rre (CPACF_KMC ,2 ,4 , mask); +break ; +case CPACF_KMCTR : +__cpacf_query_rrf (CPACF_KMCTR ,2 ,4 ,6 ,0 , mask); +break ; +case CPACF_KMF : +__cpacf_query_rre (CPACF_KMF ,2 ,4 , mask); +break ; +case CPACF_KMO : +__cpacf_query_rre (CPACF_KMO ,2 ,4 , mask); +break ; +case CPACF_PCC : +__cpacf_query_rre (CPACF_PCC ,0 ,0 , mask); +break ; +case CPACF_PCKMO : +__cpacf_query_rre (CPACF_PCKMO ,0 ,0 , mask); +break ; +case CPACF_PRNO : +__cpacf_query_rre (CPACF_PRNO ,2 ,4 , mask); +break ; +default : +BUG (); + } } static __always_inline int __cpacf_check_opcode(unsigned int opcode)
@@ -215,6 +266,16 @@ static __always_inline int __cpacf_check } } +/** +* cpacf_query() - check if a specific CPACF function is available +* @opcode: the opcode of the crypto instruction +* @func: the function code to test for +* +* Executes the query function for the given crypto instruction @opcode +* and checks if @func is available +* +* Returns 1 if @func is available for @opcode, 0 otherwise +*/ static __always_inline int cpacf_query(unsigned int opcode, cpacf_mask_t *mask) {if (__cpacf_check_opcode (opcode)) {
Greg Kroah-Hartman
maintainerPATCH 118/137 s390/cpacf: Make use of invalid opcode produce a link error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
commit 32e8bd6423fc127d2b37bdcf804fd76af3bbec79 upstream.
Instead of calling BUG() at runtime introduce and use a prototype for a non-existing function to produce a link error during compile when a not supported opcode is used with the __cpacf_query() or __cpacf_check_opcode() inline functions.
--- arch/s390/include/asm/cpacf.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/s390/include/asm/cpacf.h +10 -2
@@ -166,6 +166,13 @@typedef struct {unsigned char bytes[16 ]; }cpacf_mask_t ; +/* +* Prototype for a not existing function to produce a link +* error if __cpacf_query() or __cpacf_check_opcode() is used +* with an invalid compile time const opcode. +*/ +void __cpacf_bad_opcode (void ); + static __always_inline void __cpacf_query_rre(u32 opc, u8 r1, u8 r2,cpacf_mask_t *mask) {
@@ -237,7 +244,7 @@ static __always_inline void __cpacf_quer__cpacf_query_rre (CPACF_PRNO ,2 ,4 , mask);break ;default : -BUG (); +__cpacf_bad_opcode (); } }
@@ -262,7 +269,8 @@ static __always_inline int __cpacf_checkcase CPACF_KMA :return test_facility (146 );/* check for MSA8 */ default : -BUG (); +__cpacf_bad_opcode (); +return 0 ; } }
Greg Kroah-Hartman
maintainerPATCH 119/137 i3c: master: svc: fix invalidate IBI type and miss call client IBI handler
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
commit 38baed9b8600008e5d7bc8cb9ceccc1af3dd54b7 upstream.
In an In-Band Interrupt (IBI) handle, the code logic is as follows:
1: writel(SVC_I3C_MCTRL_REQUEST_AUTO_IBI | SVC_I3C_MCTRL_IBIRESP_AUTO,
master->regs + SVC_I3C_MCTRL);
2: ret = readl_relaxed_poll_timeout(master->regs + SVC_I3C_MSTATUS, val,
SVC_I3C_MSTATUS_IBIWON(val), 0, 1000); ...
3: ibitype = SVC_I3C_MSTATUS_IBITYPE(status);
ibiaddr = SVC_I3C_MSTATUS_IBIADDR(status);
SVC_I3C_MSTATUS_IBIWON may be set before step 1. Thus, step 2 will return immediately, and the I3C controller has not sent out the 9th SCL yet. Consequently, ibitype and ibiaddr are 0, resulting in an unknown IBI type occurrence and missing call I3C client driver's IBI handler.
A typical case is that SVC_I3C_MSTATUS_IBIWON is set when an IBI occurs during the controller send start frame in svc_i3c_master_xfer().
Clear SVC_I3C_MSTATUS_IBIWON before issue SVC_I3C_MCTRL_REQUEST_AUTO_IBI to fix this issue.
--- drivers/i3c/master/svc-i3c-master.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/i3c/master/svc-i3c-master.c +13 -3
@@ -405,6 +405,19 @@ static void svc_i3c_master_ibi_work(struint ret;mutex_lock (&master->lock); +/* +* IBIWON may be set before SVC_I3C_MCTRL_REQUEST_AUTO_IBI, causing +* readl_relaxed_poll_timeout() to return immediately. Consequently, +* ibitype will be 0 since it was last updated only after the 8th SCL +* cycle, leading to missed client IBI handlers. +* +* A typical scenario is when IBIWON occurs and bus arbitration is lost +* at svc_i3c_master_priv_xfers(). +* +* Clear SVC_I3C_MINT_IBIWON before sending SVC_I3C_MCTRL_REQUEST_AUTO_IBI. +*/ +writel (SVC_I3C_MINT_IBIWON , master->regs +SVC_I3C_MSTATUS ); +/* Acknowledge the incoming interrupt with the AUTOIBI mechanism */ writel(SVC_I3C_MCTRL_REQUEST_AUTO_IBI | SVC_I3C_MCTRL_IBIRESP_AUTO,
@@ -419,9 +432,6 @@ static void svc_i3c_master_ibi_work(stru goto reenable_ibis; } -/* Clear the interrupt status */ -writel (SVC_I3C_MINT_IBIWON , master->regs +SVC_I3C_MSTATUS ); - status =readl (master->regs +SVC_I3C_MSTATUS ); ibitype =SVC_I3C_MSTATUS_IBITYPE (status); ibiaddr =SVC_I3C_MSTATUS_IBIADDR (status);
Greg Kroah-Hartman
maintainerPATCH 120/137 genirq/irqdesc: Prevent use-after-free in irq_find_at_or_after()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: dicken.ding <[email protected]>
commit b84a8aba806261d2f759ccedf4a2a6a80a5e55ba upstream.
irq_find_at_or_after() dereferences the interrupt descriptor which is returned by mt_find() while neither holding sparse_irq_lock nor RCU read lock, which means the descriptor can be freed between mt_find() and the dereference:
CPU0 CPU1
desc = mt_find()
delayed_free_desc(desc)
irq_desc_get_irq(desc)
The use-after-free is reported by KASAN:
Call trace:
irq_get_next_irq+0x58/0x84
show_stat+0x638/0x824
seq_read_iter+0x158/0x4ec
proc_reg_read_iter+0x94/0x12c
vfs_read+0x1e0/0x2c8
Freed by task 4471:
slab_free_freelist_hook+0x174/0x1e0
__kmem_cache_free+0xa4/0x1dc
kfree+0x64/0x128
irq_kobj_release+0x28/0x3c
kobject_put+0xcc/0x1e0
delayed_free_desc+0x14/0x2c
rcu_do_batch+0x214/0x720Guard the access with a RCU read lock section.
--- kernel/irq/irqdesc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/irq/irqdesc.c +4 -1
@@ -148,7 +148,10 @@ static int irq_find_free_area(unsigned istatic unsigned int irq_find_at_or_after (unsigned int offset) {unsigned long index = offset; -struct irq_desc *desc =mt_find (&sparse_irqs, &index, nr_irqs); +struct irq_desc *desc; + +guard (rcu)(); + desc =mt_find (&sparse_irqs, &index, nr_irqs);return desc ?irq_desc_get_irq (desc) : nr_irqs; }
Greg Kroah-Hartman
maintainerPATCH 121/137 ASoC: SOF: ipc4-topology: Fix input format query of process modules without base extension
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
commit ffa077b2f6ad124ec3d23fbddc5e4b0ff2647af8 upstream.
If a process module does not have base config extension then the same format applies to all of it's inputs and the process->base_config_ext is NULL, causing NULL dereference when specifically crafted topology and sequences used.
--- sound/soc/sof/ipc4-topology.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/sof/ipc4-topology.c +8 -0
@@ -195,6 +195,14 @@ sof_ipc4_get_input_pin_audio_fmt(struct } process = swidget->private; + +/* +* For process modules without base config extension, base module config +* format is used for all input pins +*/ +if (process->init_config !=SOF_IPC4_MODULE_INIT_CONFIG_TYPE_BASE_CFG_WITH_EXT ) +return &process->base_config.audio_fmt; + base_cfg_ext = process->base_config_ext;/*
Greg Kroah-Hartman
maintainerPATCH 122/137 ALSA: ump: Dont clear bank selection after sending a program change
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit fe85f6e607d75b856e7229924c71f55e005f8284 upstream.
The current code clears the bank selection MSB/LSB after sending a program change, but this can be wrong, as many apps may not send the full bank selection with both MSB and LSB but sending only one. Better to keep the previous bank set.
--- sound/core/ump_convert.c | 1 - 1 file changed, 1 deletion(-)
sound/core/ump_convert.c +0 -1
@@ -404,7 +404,6 @@ static int cvt_legacy_cmd_to_ump(struct ump_cvt_to_ump *cvt, midi2->pg.bank_msb = cc->cc_bank_msb; midi2->pg.bank_lsb = cc->cc_bank_lsb; cc->bank_set =0 ; - cc->cc_bank_msb = cc->cc_bank_lsb =0 ; }break ;case UMP_MSG_STATUS_CHANNEL_PRESSURE :
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 123/137 ALSA: ump: Dont accept an invalid UMP protocol number
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit ac0d71ee534e67c7e53439e8e9cb45ed40731660 upstream.
When a UMP Stream Configuration message is received, the driver tries to switch the protocol, but there was no sanity check of the protocol, hence it can pass an invalid value. Add the check and bail out if a wrong value is passed.
--- sound/core/ump.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/core/ump.c +7 -0
@@ -685,10 +685,17 @@ static void seq_notify_protocol(struct s*/ int snd_ump_switch_protocol (struct snd_ump_endpoint *ump,unsigned int protocol) { +unsigned int type; + protocol &= ump->info.protocol_caps;if (protocol == ump->info.protocol)return 0 ; + type = protocol &SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK ; +if (type !=SNDRV_UMP_EP_INFO_PROTO_MIDI1 && + type !=SNDRV_UMP_EP_INFO_PROTO_MIDI2 ) +return 0 ; + ump->info.protocol = protocol;ump_dbg (ump,"New protocol = %x (caps = %x)\n" , protocol, ump->info.protocol_caps);
Greg Kroah-Hartman
maintainerPATCH 124/137 EDAC/amd64: Convert PCIBIOS_* return codes to errnos
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit 3ec8ebd8a5b782d56347ae884de880af26f93996 upstream.
gpu_get_node_map() uses pci_read_config_dword() that returns PCIBIOS_* codes. The return code is then returned all the way into the module init function amd64_edac_init() that returns it as is. The module init functions, however, should return normal errnos.
Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal errno before returning it from gpu_get_node_map().
For consistency, convert also the other similar cases which return PCIBIOS_* codes even if they do not have any bugs at the moment.
--- drivers/edac/amd64_edac.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/edac/amd64_edac.c +5 -3
@@ -80,7 +80,7 @@ int __amd64_read_pci_cfg_dword(struct pcamd64_warn ("%s: error reading F%dx%03x.\n" , func,PCI_FUNC (pdev->devfn), offset); -return err; +return pcibios_err_to_errno (err); } int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,
@@ -93,7 +93,7 @@ int __amd64_write_pci_cfg_dword(struct pamd64_warn ("%s: error writing to F%dx%03x.\n" , func,PCI_FUNC (pdev->devfn), offset); -return err; +return pcibios_err_to_errno (err); }/*
@@ -1016,8 +1016,10 @@ static int gpu_get_node_map(void) } ret =pci_read_config_dword (pdev,REG_LOCAL_NODE_TYPE_MAP , &tmp); -if (ret) +if (ret) { + ret =pcibios_err_to_errno (ret); goto out; + } gpu_node_map.node_count =FIELD_GET (LNTM_NODE_COUNT , tmp); gpu_node_map.base_node_id =FIELD_GET (LNTM_BASE_NODE_ID , tmp);
Greg Kroah-Hartman
maintainerPATCH 125/137 EDAC/igen6: Convert PCIBIOS_* return codes to errnos
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit f8367a74aebf88dc8b58a0db6a6c90b4cb8fc9d3 upstream.
errcmd_enable_error_reporting() uses pci_{read,write}_config_word() that return PCIBIOS_* codes. The return code is then returned all the way into the probe function igen6_probe() that returns it as is. The probe functions, however, should return normal errnos.
Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal errno before returning it from errcmd_enable_error_reporting().
--- drivers/edac/igen6_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/igen6_edac.c +2 -2
@@ -627,7 +627,7 @@ static int errcmd_enable_error_reporting rc =pci_read_config_word (imc->pdev,ERRCMD_OFFSET , &errcmd);if (rc) -return rc; +return pcibios_err_to_errno (rc);if (enable) errcmd |=ERRCMD_CE |ERRSTS_UE ;
@@ -636,7 +636,7 @@ static int errcmd_enable_error_reporting rc =pci_write_config_word (imc->pdev,ERRCMD_OFFSET , errcmd);if (rc) -return rc; +return pcibios_err_to_errno (rc);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 126/137 nfs: fix undefined behavior in nfs_block_bits()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
commit 3c0a2e0b0ae661457c8505fecc7be5501aa7a715 upstream.
Shifting *signed int* typed constant 1 left by 31 bits causes undefined behavior. Specify the correct *unsigned long* type by using 1UL instead.
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- fs/nfs/internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/internal.h +2 -2
@@ -710,9 +710,9 @@ unsigned long nfs_block_bits(unsigned loif ((bsize & (bsize -1 )) || nrbitsp) {unsigned char nrbits; -for (nrbits =31 ; nrbits && !(bsize & (1 << nrbits)); nrbits--) +for (nrbits =31 ; nrbits && !(bsize & (1UL << nrbits)); nrbits--) ; - bsize =1 << nrbits; + bsize =1UL << nrbits;if (nrbitsp) *nrbitsp = nrbits; }
Greg Kroah-Hartman
maintainerPATCH 127/137 NFS: Fix READ_PLUS when server doesnt support OP_READ_PLUS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
commit f06d1b10cb016d5aaecdb1804fefca025387bd10 upstream.
Olga showed me a case where the client was sending multiple READ_PLUS calls to the server in parallel, and the server replied NFS4ERR_OPNOTSUPP to each. The client would fall back to READ for the first reply, but fail to retry the other calls.
I fix this by removing the test for NFS_CAP_READ_PLUS in nfs4_read_plus_not_supported(). This allows us to reschedule any READ_PLUS call that has a NFS4ERR_OPNOTSUPP return value, even after the capability has been cleared.
--- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4proc.c +1 -1
@@ -5435,7 +5435,7 @@ static bool nfs4_read_plus_not_supportedstruct rpc_message *msg = &task->tk_msg;if (msg->rpc_proc == &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS ] && - server->caps &NFS_CAP_READ_PLUS && task->tk_status == -ENOTSUPP ) { + task->tk_status == -ENOTSUPP ) { server->caps &= ~NFS_CAP_READ_PLUS ; msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ ];rpc_restart_call_prepare (task);
Greg Kroah-Hartman
maintainerPATCH 128/137 eventfs: Fix a possible null pointer dereference in eventfs_find_events()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hao Ge <[email protected]>
commit d4e9a968738bf66d3bb852dd5588d4c7afd6d7f4 upstream.
In function eventfs_find_events,there is a potential null pointer that may be caused by calling update_events_attr which will perform some operations on the members of the ei struct when ei is NULL.
Hence,When ei->is_freed is set,return NULL directly.
--- fs/tracefs/event_inode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/tracefs/event_inode.c +3 -4
@@ -345,10 +345,9 @@ static struct eventfs_inode *eventfs_find_events(struct dentry *dentry)* If the ei is being freed, the ownership of the children * doesn't matter. */ -if (ei->is_freed) { - ei =NULL ; -break ; - } +if (ei->is_freed) +return NULL ; +// Walk upwards until you find the events inode }while (!ei->is_events);
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 129/137 eventfs: Keep the directories from having the same inode number as files
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 8898e7f288c47d450a3cf1511c791a03550c0789 upstream.
The directories require unique inode numbers but all the eventfs files have the same inode number. Prevent the directories from having the same inode numbers as the files as that can confuse some tooling.
--- fs/tracefs/event_inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/tracefs/event_inode.c +5 -1
@@ -50,8 +50,12 @@ static struct eventfs_root_inode *get_ro/* Just try to make something consistent and unique */ static int eventfs_dir_ino (struct eventfs_inode *ei) { -if (!ei->ino) +if (!ei->ino) { ei->ino =get_next_ino (); +/* Must not have the file inode number */ +if (ei->ino ==EVENTFS_FILE_INODE_INO ) + ei->ino =get_next_ino (); + }return ei->ino; }
Greg Kroah-Hartman
maintainerPATCH 130/137 tracefs: Clear EVENT_INODE flag in tracefs_drop_inode()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 0bcfd9aa4dafa03b88d68bf66b694df2a3e76cf3 upstream.
When the inode is being dropped from the dentry, the TRACEFS_EVENT_INODE flag needs to be cleared to prevent a remount from calling eventfs_remount() on the tracefs_inode private data. There's a race between the inode is dropped (and the dentry freed) to where the inode is actually freed. If a remount happens between the two, the eventfs_inode could be accessed after it is freed (only the dentry keeps a ref count on it).
Currently the TRACEFS_EVENT_INODE flag is cleared from the dentry iput() function. But this is incorrect, as it is possible that the inode has another reference to it. The flag should only be cleared when the inode is really being dropped and has no more references. That happens in the drop_inode callback of the inode, as that gets called when the last reference of the inode is released.
Remove the tracefs_d_iput() function and move its logic to the more appropriate tracefs_drop_inode() callback function.
--- fs/tracefs/inode.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
fs/tracefs/inode.c +17 -16
@@ -439,10 +439,26 @@ static int tracefs_show_options(struct sreturn 0 ; } +static int tracefs_drop_inode (struct inode *inode) +{ +struct tracefs_inode *ti =get_tracefs (inode); + +/* +* This inode is being freed and cannot be used for +* eventfs. Clear the flag so that it doesn't call into +* eventfs during the remount flag updates. The eventfs_inode +* gets freed after an RCU cycle, so the content will still +* be safe if the iteration is going on now. +*/ + ti->flags &= ~TRACEFS_EVENT_INODE ; + +return 1 ; +} +static const struct super_operations tracefs_super_operations = { .alloc_inode = tracefs_alloc_inode, .free_inode = tracefs_free_inode, - .drop_inode = generic_delete_inode, + .drop_inode = tracefs_drop_inode, .statfs = simple_statfs, .remount_fs = tracefs_remount, .show_options = tracefs_show_options,
@@ -469,22 +485,7 @@ static int tracefs_d_revalidate(struct dreturn !(ei && ei->is_freed); } -static void tracefs_d_iput (struct dentry *dentry,struct inode *inode) -{ -struct tracefs_inode *ti =get_tracefs (inode); - -/* -* This inode is being freed and cannot be used for -* eventfs. Clear the flag so that it doesn't call into -* eventfs during the remount flag updates. The eventfs_inode -* gets freed after an RCU cycle, so the content will still -* be safe if the iteration is going on now. -*/ - ti->flags &= ~TRACEFS_EVENT_INODE ; -} -static const struct dentry_operations tracefs_dentry_operations = { - .d_iput = tracefs_d_iput, .d_revalidate = tracefs_d_revalidate, .d_release = tracefs_d_release, };
Greg Kroah-Hartman
maintainerPATCH 131/137 btrfs: fix crash on racing fsync and size-extending write into prealloc
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Omar Sandoval <[email protected]>
commit 9d274c19a71b3a276949933859610721a453946b upstream.
We have been seeing crashes on duplicate keys inbtrfs_set_item_key_safe():
BTRFS critical (device vdb): slot 4 key (450 108 8192) new key (450 108 8192)
------------[ cut here ]------------ kernel BUG at fs/btrfs/ctree.c:2620! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 0 PID: 3139 Comm: xfs_io Kdump: loaded Not tainted 6.9.0 #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-2.fc40 04/01/2014 RIP: 0010:btrfs_set_item_key_safe+0x11f/0x290 [btrfs]
With the following stack trace:
#0 btrfs_set_item_key_safe (fs/btrfs/ctree.c:2620:4) #1 btrfs_drop_extents (fs/btrfs/file.c:411:4) #2 log_one_extent (fs/btrfs/tree-log.c:4732:9) #3 btrfs_log_changed_extents (fs/btrfs/tree-log.c:4955:9) #4 btrfs_log_inode (fs/btrfs/tree-log.c:6626:9) #5 btrfs_log_inode_parent (fs/btrfs/tree-log.c:7070:8) #6 btrfs_log_dentry_safe (fs/btrfs/tree-log.c:7171:8) #7 btrfs_sync_file (fs/btrfs/file.c:1933:8) #8 vfs_fsync_range (fs/sync.c:188:9) #9 vfs_fsync (fs/sync.c:202:9)
#10 do_fsync (fs/sync.c:212:9)
#11 __do_sys_fdatasync (fs/sync.c:225:9)
#12 __se_sys_fdatasync (fs/sync.c:223:1)
#13 __x64_sys_fdatasync (fs/sync.c:223:1)
#14 do_syscall_x64 (arch/x86/entry/common.c:52:14) #15 do_syscall_64 (arch/x86/entry/common.c:83:7)
#16 entry_SYSCALL_64+0xaf/0x14c (arch/x86/entry/entry_64.S:121)
So we're logging a changed extent from fsync, which is splitting an extent in the log tree. But this split part already exists in the tree, triggering the BUG().
This is the state of the log tree at the time of the crash, dumped with drgn (https://github.com/osandov/drgn/blob/main/contrib/btrfs_tree.py)
to get more details than btrfs_print_leaf() gives us:
Quoted 1 line
Quoted 1 line
Quoted 1 line
print_extent_buffer(prog.crashed_thread().stack_trace()[0]["eb"])
leaf 33439744 level 0 items 72 generation 9 owner 18446744073709551610 leaf 33439744 flags 0x100000000000000
fs uuid e5bd3946-400c-4223-8923-190ef1f18677
chunk uuid d58cb17e-6d02-494a-829a-18b7d8a399da
item 0 key (450 INODE_ITEM 0) itemoff 16123 itemsize 160
generation 7 transid 9 size 8192 nbytes 8473563889606862198
block group 0 mode 100600 links 1 uid 0 gid 0 rdev 0
sequence 204 flags 0x10(PREALLOC)
atime 1716417703.220000000 (2024-05-22 15:41:43)
ctime 1716417704.983333333 (2024-05-22 15:41:44)
mtime 1716417704.983333333 (2024-05-22 15:41:44)
otime 17592186044416.000000000 (559444-03-08 01:40:16)
item 1 key (450 INODE_REF 256) itemoff 16110 itemsize 13
index 195 namelen 3 name: 193
item 2 key (450 XATTR_ITEM 1640047104) itemoff 16073 itemsize 37
location key (0 UNKNOWN.0 0) type XATTR
transid 7 data_len 1 name_len 6
name: user.a
data a
item 3 key (450 EXTENT_DATA 0) itemoff 16020 itemsize 53
generation 9 type 1 (regular)
extent data disk byte 303144960 nr 12288
extent data offset 0 nr 4096 ram 12288
extent compression 0 (none)
item 4 key (450 EXTENT_DATA 4096) itemoff 15967 itemsize 53
generation 9 type 2 (prealloc)
prealloc data disk byte 303144960 nr 12288
prealloc data offset 4096 nr 8192
item 5 key (450 EXTENT_DATA 8192) itemoff 15914 itemsize 53
generation 9 type 2 (prealloc)
prealloc data disk byte 303144960 nr 12288
prealloc data offset 8192 nr 4096...
So the real problem happened earlier: notice that items 4 (4k-12k) and 5 (8k-12k) overlap. Both are prealloc extents. Item 4 straddles i_size and item 5 starts at i_size.
Here is the state of the filesystem tree at the time of the crash:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
root = prog.crashed_thread().stack_trace()[2]["inode"].root ret, nodes, slots =
btrfs_search_slot(root, BtrfsKey(450, 0, 0))print_extent_buffer(nodes[0])
leaf 30425088 level 0 items 184 generation 9 owner 5 leaf 30425088 flags 0x100000000000000
fs uuid e5bd3946-400c-4223-8923-190ef1f18677 chunk uuid d58cb17e-6d02-494a-829a-18b7d8a399da
...
item 179 key (450 INODE_ITEM 0) itemoff 4907 itemsize 160
generation 7 transid 7 size 4096 nbytes 12288
block group 0 mode 100600 links 1 uid 0 gid 0 rdev 0
sequence 6 flags 0x10(PREALLOC)
atime 1716417703.220000000 (2024-05-22 15:41:43)
ctime 1716417703.220000000 (2024-05-22 15:41:43)
mtime 1716417703.220000000 (2024-05-22 15:41:43)
otime 1716417703.220000000 (2024-05-22 15:41:43)
item 180 key (450 INODE_REF 256) itemoff 4894 itemsize 13
index 195 namelen 3 name: 193
item 181 key (450 XATTR_ITEM 1640047104) itemoff 4857 itemsize 37
location key (0 UNKNOWN.0 0) type XATTR
transid 7 data_len 1 name_len 6
name: user.a
data a
item 182 key (450 EXTENT_DATA 0) itemoff 4804 itemsize 53
generation 9 type 1 (regular)
extent data disk byte 303144960 nr 12288
extent data offset 0 nr 8192 ram 12288
extent compression 0 (none)
item 183 key (450 EXTENT_DATA 8192) itemoff 4751 itemsize 53
generation 9 type 2 (prealloc)
prealloc data disk byte 303144960 nr 12288
prealloc data offset 8192 nr 4096Item 5 in the log tree corresponds to item 183 in the filesystem tree, but nothing matches item 4. Furthermore, item 183 is the last item in the leaf.
btrfs_log_prealloc_extents() is responsible for logging prealloc extents beyond i_size. It first truncates any previously logged prealloc extents that start beyond i_size. Then, it walks the filesystem tree and copies the prealloc extent items to the log tree.
If it hits the end of a leaf, then it calls btrfs_next_leaf(), which unlocks the tree and does another search. However, while the filesystem tree is unlocked, an ordered extent completion may modify the tree. In particular, it may insert an extent item that overlaps with an extent item that was already copied to the log tree.
This may manifest in several ways depending on the exact scenario, including an EEXIST error that is silently translated to a full sync, overlapping items in the log tree, or this crash. This particular crash is triggered by the following sequence of events:
- Initially, the file has i_size=4k, a regular extent from 0-4k, and a prealloc extent beyond i_size from 4k-12k. The prealloc extent item is the last item in its B-tree leaf.
- The file is fsync'd, which copies its inode item and both extent items to the log tree.
- An xattr is set on the file, which sets the BTRFS_INODE_COPY_EVERYTHING flag.
- The range 4k-8k in the file is written using direct I/O. i_size is extended to 8k, but the ordered extent is still in flight.
- The file is fsync'd. Since BTRFS_INODE_COPY_EVERYTHING is set, this calls copy_inode_items_to_log(), which calls btrfs_log_prealloc_extents().
- btrfs_log_prealloc_extents() finds the 4k-12k prealloc extent in the filesystem tree. Since it starts before i_size, it skips it. Since it is the last item in its B-tree leaf, it calls btrfs_next_leaf().
- btrfs_next_leaf() unlocks the path.
- The ordered extent completion runs, which converts the 4k-8k part of the prealloc extent to written and inserts the remaining prealloc part from 8k-12k.
- btrfs_next_leaf() does a search and finds the new prealloc extent 8k-12k.
- btrfs_log_prealloc_extents() copies the 8k-12k prealloc extent into the log tree. Note that it overlaps with the 4k-12k prealloc extent that was copied to the log tree by the first fsync.
- fsync calls btrfs_log_changed_extents(), which tries to log the 4k-8k extent that was written.
- This tries to drop the range 4k-8k in the log tree, which requires adjusting the start of the 4k-12k prealloc extent in the log tree to 8k.
- btrfs_set_item_key_safe() sees that there is already an extent starting at 8k in the log tree and calls BUG().
Fix this by detecting when we're about to insert an overlapping file extent item in the log tree and truncating the part that would overlap.
--- fs/btrfs/tree-log.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/btrfs/tree-log.c +11 -6
@@ -4800,18 +4800,23 @@ static int btrfs_log_prealloc_extents(st path->slots[0 ]++;continue ; } -if (!dropped_extents) { -/* -* Avoid logging extent items logged in past fsync calls -* and leading to duplicate keys in the log tree. -*/ +/* +* Avoid overlapping items in the log tree. The first time we +* get here, get rid of everything from a past fsync. After +* that, if the current extent starts before the end of the last +* extent we copied, truncate the last one. This can happen if +* an ordered extent completion modifies the subvolume tree +* while btrfs_next_leaf() has the tree unlocked. +*/ +if (!dropped_extents || key.offset < truncate_offset) { ret =truncate_inode_items (trans, root->log_root, inode, - truncate_offset, +min (key.offset, truncate_offset),BTRFS_EXTENT_DATA_KEY );if (ret) goto out; dropped_extents = true; } + truncate_offset =btrfs_file_extent_end (path);if (ins_nr ==0 ) start_slot = slot; ins_nr++;
Greg Kroah-Hartman
maintainerPATCH 132/137 btrfs: fix leak of qgroup extent records after transaction abort
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit fb33eb2ef0d88e75564983ef057b44c5b7e4fded upstream.
Qgroup extent records are created when delayed ref heads are created and then released after accounting extents at btrfs_qgroup_account_extents(), called during the transaction commit path.
If a transaction is aborted we free the qgroup records by calling btrfs_qgroup_destroy_extent_records() at btrfs_destroy_delayed_refs(), unless we don't have delayed references. We are incorrectly assuming that no delayed references means we don't have qgroup extents records.
We can currently have no delayed references because we ran them all during a transaction commit and the transaction was aborted after that due to some error in the commit path.
So fix this by ensuring we btrfs_qgroup_destroy_extent_records() at btrfs_destroy_delayed_refs() even if we don't have any delayed references.
--- fs/btrfs/disk-io.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
fs/btrfs/disk-io.c +1 -9
@@ -4594,18 +4594,10 @@ static void btrfs_destroy_delayed_refs(s struct btrfs_fs_info *fs_info) {struct rb_node *node; -struct btrfs_delayed_ref_root *delayed_refs; +struct btrfs_delayed_ref_root *delayed_refs = &trans->delayed_refs;struct btrfs_delayed_ref_node *ref; - delayed_refs = &trans->delayed_refs; -spin_lock (&delayed_refs->lock); -if (atomic_read (&delayed_refs->num_entries) ==0 ) { -spin_unlock (&delayed_refs->lock); -btrfs_debug (fs_info,"delayed_refs has NO entry" ); -return ; - } -while ((node =rb_first_cached (&delayed_refs->href_root)) !=NULL ) {struct btrfs_delayed_ref_head *head;struct rb_node *n;
Greg Kroah-Hartman
maintainerPATCH 133/137 ALSA: seq: Fix incorrect UMP type for system messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit edb32776196afa393c074d6a2733e3a69e66b299 upstream.
When converting a legacy system message to a UMP packet, it forgot to modify the UMP type field but keeping the default type (either type 2 or 4). Correct to the right type for system messages.
--- sound/core/seq/seq_ump_convert.c | 2 ++ 1 file changed, 2 insertions(+)
sound/core/seq/seq_ump_convert.c +2 -0
@@ -740,6 +740,7 @@ static int system_1p_ev_to_ump_midi1(con union snd_ump_midi1_msg *data, unsigned char status) { + data->system.type =UMP_MSG_TYPE_SYSTEM ;// override data->system.status = status; data->system.parm1 = event->data.control.value &0x7f ;return 1 ;
@@ -751,6 +752,7 @@ static int system_2p_ev_to_ump_midi1(con union snd_ump_midi1_msg *data, unsigned char status) { + data->system.type =UMP_MSG_TYPE_SYSTEM ;// override data->system.status = status; data->system.parm1 = event->data.control.value &0x7f ; data->system.parm2 = (event->data.control.value >>7 ) &0x7f ;
Greg Kroah-Hartman
maintainerPATCH 134/137 powerpc/64/bpf: fix tail calls for PCREL addressing
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Bathini <[email protected]>
commit 2ecfe59cd7de1f202e9af2516a61fbbf93d0bd4d upstream.
With PCREL addressing, there is no kernel TOC. So, it is not setup in prologue when PCREL addressing is used. But the number of instructions to skip on a tail call was not adjusted accordingly. That resulted in not so obvious failures while using tailcalls. 'tailcalls' selftest crashed the system with the below call trace:
bpf_test_run+0xe8/0x3cc (unreliable) bpf_prog_test_run_skb+0x348/0x778 __sys_bpf+0xb04/0x2b00 sys_bpf+0x28/0x38 system_call_exception+0x168/0x340 system_call_vectored_common+0x15c/0x2ec
Also, as bpf programs are always module addresses and a bpf helper in general is a core kernel text address, using PC relative addressing often fails with "out of range of pcrel address" error. Switch to using kernel base for relative addressing to handle this better.
--- arch/powerpc/net/bpf_jit_comp64.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
arch/powerpc/net/bpf_jit_comp64.c +16 -14
@@ -202,7 +202,8 @@ void bpf_jit_build_epilogue(u32 *image,EMIT (PPC_RAW_BLR ()); } -static int bpf_jit_emit_func_call_hlp (u32 *image,struct codegen_context *ctx,u64 func) +static int +bpf_jit_emit_func_call_hlp (u32 *image,u32 *fimage,struct codegen_context *ctx,u64 func) {unsigned long func_addr = func ?ppc_function_entry ((void *)func) :0 ;long reladdr;
@@ -211,19 +212,20 @@ static int bpf_jit_emit_func_call_hlp(u3return -EINVAL ;if (IS_ENABLED (CONFIG_PPC_KERNEL_PCREL )) { - reladdr = func_addr -CTX_NIA (ctx); + reladdr = func_addr - local_paca->kernelbase;if (reladdr >= (long )SZ_8G || reladdr < -(long )SZ_8G ) { -pr_err ("eBPF: address of %ps out of range of pcrel address.\n" , - (void *)func); +pr_err ("eBPF: address of %ps out of range of 34-bit relative address.\n" , + (void *)func);return -ERANGE ; } -/* pla r12,addr */ -EMIT (PPC_PREFIX_MLS |__PPC_PRFX_R (1 ) |IMM_H18 (reladdr)); -EMIT (PPC_INST_PADDI |___PPC_RT (_R12) |IMM_L (reladdr)); -EMIT (PPC_RAW_MTCTR (_R12)); -EMIT (PPC_RAW_BCTR ()); - +EMIT (PPC_RAW_LD (_R12, _R13, offsetof(struct paca_struct , kernelbase))); +/* Align for subsequent prefix instruction */ +if (!IS_ALIGNED ((unsigned long )fimage +CTX_NIA (ctx),8 )) +EMIT (PPC_RAW_NOP ()); +/* paddi r12,r12,addr */ +EMIT (PPC_PREFIX_MLS |__PPC_PRFX_R (0 ) |IMM_H18 (reladdr)); +EMIT (PPC_INST_PADDI |___PPC_RT (_R12) |___PPC_RA (_R12) |IMM_L (reladdr)); }else { reladdr = func_addr -kernel_toc_addr ();if (reladdr >0x7FFFFFFF || reladdr < -(0x80000000L )) {
@@ -233,9 +235,9 @@ static int bpf_jit_emit_func_call_hlp(u3EMIT (PPC_RAW_ADDIS (_R12, _R2,PPC_HA (reladdr)));EMIT (PPC_RAW_ADDI (_R12, _R12,PPC_LO (reladdr))); -EMIT (PPC_RAW_MTCTR (_R12)); -EMIT (PPC_RAW_BCTRL ()); } +EMIT (PPC_RAW_MTCTR (_R12)); +EMIT (PPC_RAW_BCTRL ());return 0 ; }
@@ -285,7 +287,7 @@ static int bpf_jit_emit_tail_call(u32 *iint b2p_index =bpf_to_ppc (BPF_REG_3 );int bpf_tailcall_prologue_size =8 ; -if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V2 )) +if (!IS_ENABLED (CONFIG_PPC_KERNEL_PCREL ) &&IS_ENABLED (CONFIG_PPC64_ELF_ABI_V2 )) bpf_tailcall_prologue_size +=4 ;/* skip past the toc load */ /*
@@ -993,7 +995,7 @@ emit_clear:return ret;if (func_addr_fixed) - ret =bpf_jit_emit_func_call_hlp (image, ctx, func_addr); + ret =bpf_jit_emit_func_call_hlp (image, fimage, ctx, func_addr);else ret =bpf_jit_emit_func_call_rel (image, ctx, func_addr);
Greg Kroah-Hartman
maintainerPATCH 135/137 powerpc/bpf: enforce full ordering for ATOMIC operations with BPF_FETCH
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puranjay Mohan <[email protected]>
commit b1e7cee96127468c2483cf10c2899c9b5cf79bf8 upstream.
The Linux Kernel Memory Model [1][2] requires RMW operations that have a return value to be fully ordered.
BPF atomic operations with BPF_FETCH (including BPF_XCHG and BPF_CMPXCHG) return a value back so they need to be JITed to fully ordered operations. POWERPC currently emits relaxed operations for these.
We can show this by running the following litmus-test:
PPC SB+atomic_add+fetch
{
0:r0=x; (* dst reg assuming offset is 0 *)
0:r1=2; (* src reg *)
0:r2=1;
0:r4=y; (* P0 writes to this, P1 reads this *)
0:r5=z; (* P1 writes to this, P0 reads this *)
0:r6=0; 1:r2=1;
1:r4=y;
1:r5=z;}
P0 | P1 ;
stw r2, 0(r4) | stw r2,0(r5) ;
| ;
loop:lwarx r3, r6, r0 | ;
mr r8, r3 | ;
add r3, r3, r1 | sync ;
stwcx. r3, r6, r0 | ;
bne loop | ;
mr r1, r8 | ;
| ;
lwa r7, 0(r5) | lwa r7,0(r4) ;~exists(0:r7=0 /\ 1:r7=0)
Witnesses
Positive: 9 Negative: 3
Condition ~exists (0:r7=0 /\ 1:r7=0)
Observation SB+atomic_add+fetch Sometimes 3 9
This test shows that the older store in P0 is reordered with a newer load to a different address. Although there is a RMW operation with fetch between them. Adding a sync before and after RMW fixes the issue:
Witnesses
Positive: 9 Negative: 0
Condition ~exists (0:r7=0 /\ 1:r7=0)
Observation SB+atomic_add+fetch Never 0 9
[1] https://www.kernel.org/doc/Documentation/memory-barriers.txt
[2] https://www.kernel.org/doc/Documentation/atomic_t.txt
--- arch/powerpc/net/bpf_jit_comp32.c | 12 ++++++++++++ arch/powerpc/net/bpf_jit_comp64.c | 12 ++++++++++++ 2 files changed, 24 insertions(+)
arch/powerpc/net/bpf_jit_comp32.c +12 -0
@@ -851,6 +851,15 @@ int bpf_jit_build_body(struct bpf_prog */* Get offset into TMP_REG */ EMIT (PPC_RAW_LI (tmp_reg, off)); +/* +* Enforce full ordering for operations with BPF_FETCH by emitting a 'sync' +* before and after the operation. +* +* This is a requirement in the Linux Kernel Memory Model. +* See __cmpxchg_u32() in asm/cmpxchg.h as an example. +*/ +if ((imm &BPF_FETCH ) &&IS_ENABLED (CONFIG_SMP )) +EMIT (PPC_RAW_SYNC ()); tmp_idx = ctx->idx *4 ;/* load value from memory into r0 */ EMIT (PPC_RAW_LWARX (_R0, tmp_reg, dst_reg,0 ));
@@ -904,6 +913,9 @@ int bpf_jit_build_body(struct bpf_prog */* For the BPF_FETCH variant, get old data into src_reg */ if (imm &BPF_FETCH ) { +/* Emit 'sync' to enforce full ordering */ +if (IS_ENABLED (CONFIG_SMP )) +EMIT (PPC_RAW_SYNC ());EMIT (PPC_RAW_MR (ret_reg, ax_reg));if (!fp->aux->verifier_zext)EMIT (PPC_RAW_LI (ret_reg -1 ,0 ));/* higher 32-bit */
arch/powerpc/net/bpf_jit_comp64.c +12 -0
@@ -805,6 +805,15 @@ emit_clear:/* Get offset into TMP_REG_1 */ EMIT (PPC_RAW_LI (tmp1_reg, off)); +/* +* Enforce full ordering for operations with BPF_FETCH by emitting a 'sync' +* before and after the operation. +* +* This is a requirement in the Linux Kernel Memory Model. +* See __cmpxchg_u64() in asm/cmpxchg.h as an example. +*/ +if ((imm &BPF_FETCH ) &&IS_ENABLED (CONFIG_SMP )) +EMIT (PPC_RAW_SYNC ()); tmp_idx = ctx->idx *4 ;/* load value from memory into TMP_REG_2 */ if (size ==BPF_DW )
@@ -867,6 +876,9 @@ emit_clear:PPC_BCC_SHORT (COND_NE , tmp_idx);if (imm &BPF_FETCH ) { +/* Emit 'sync' to enforce full ordering */ +if (IS_ENABLED (CONFIG_SMP )) +EMIT (PPC_RAW_SYNC ());EMIT (PPC_RAW_MR (ret_reg, _R0));/* * Skip unnecessary zero-extension for 32-bit cmpxchg.
Greg Kroah-Hartman
maintainerPATCH 136/137 smb: client: fix deadlock in smb2_find_smb_tcon()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Enzo Matsumiya <[email protected]>
commit 02c418774f76a0a36a6195c9dbf8971eb4130a15 upstream.
Unlock cifs_tcp_ses_lock before calling cifs_put_smb_ses() to avoid such deadlock.
--- fs/smb/client/smb2transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/smb2transport.c +1 -1
@@ -216,8 +216,8 @@ smb2_find_smb_tcon(struct TCP_Server_Inf } tcon =smb2_find_smb_sess_tcon_unlocked (ses, tid);if (!tcon) { -cifs_put_smb_ses (ses);spin_unlock (&cifs_tcp_ses_lock); +cifs_put_smb_ses (ses);return NULL ; }spin_unlock (&cifs_tcp_ses_lock);
Greg Kroah-Hartman
maintainerPATCH 137/137 selftests: net: more strict check in net_helper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit a71d0908e32f3dd41e355d83eeadd44d94811fd6 upstream.
The helper waiting for a listener port can match any socket whose hexadecimal representation of source or destination addresses matches that of the given port.
Additionally, any socket state is accepted.
All the above can let the helper return successfully before the relevant listener is actually ready, with unexpected results.
So far I could not find any related failure in the netdev CI, but the next patch is going to make the critical event more easily reproducible.
Address the issue matching the port hex only vs the relevant socket field and additionally checking the socket state for TCP sockets.
--- tools/testing/selftests/net/net_helper.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/testing/selftests/net/net_helper.sh +7 -4
@@ -8,13 +8,16 @@ wait_local_port_listen() local listener_ns="${1}" local port="${2}" local protocol="${3}" - local port_hex + local pattern local i - port_hex="$(printf "%04X" "${port}")" + pattern=":$(printf "%04X" "${port}") " + + # for tcp protocol additionally check the socket state + [ ${protocol} = "tcp" ] && pattern="${pattern}0A" for i in $(seq 10); do - if ip netns exec "${listener_ns}" cat /proc/net/"${protocol}"* | \ - grep -q "${port_hex}"; then + if ip netns exec "${listener_ns}" awk '{print $2" "$4}' \ + /proc/net/"${protocol}"* | grep -q "${pattern}"; then break fi sleep 0.1
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
The powerpc defconfig builds failed on stable-rc 6.6 branch due to below build errors with gcc-13, gcc-8 and clang.
Build log:
----arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:1010:73: error: 'fimage' undeclared (first use in this function); did you mean 'image'?
1010 | ret =
bpf_jit_emit_func_call_hlp(image, fimage, ctx, func_addr);
|
^~~~~~
|
imagearch/powerpc/net/bpf_jit_comp64.c:1010:73: note: each undeclared identifier is reported only once for each function it appears in
--
Linaro LKFT
https://lkft.linaro.org
Quoted 33 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
The powerpc defconfig builds failed on stable-rc 6.6 branch due to below build errors with gcc-13, gcc-8 and clang.
Build log:
----arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:1010:73: error: 'fimage' undeclared (first use in this function); did you mean 'image'?
1010 | ret =
Quoted 7 lines
bpf_jit_emit_func_call_hlp(image, fimage, ctx, func_addr); | ^~~~~~ | image
arch/powerpc/net/bpf_jit_comp64.c:1010:73: note: each undeclared identifier is reported only once for each function it appears in
Anders bisected this and found following patch,
first bad commit:
[2298022fd5c6c428872f5741592526b8f4aadcf8]
powerpc/64/bpf: fix tail calls for PCREL addressing
Quoted 8 lines
--
Linaro LKFT
https://lkft.linaro.org
- Naresh
Hi Greg and Naresh,
Quoted 43 lines · Naresh Kamboju
Quoted 33 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
The powerpc defconfig builds failed on stable-rc 6.6 branch due to below build errors with gcc-13, gcc-8 and clang.
Build log:
----arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:1010:73: error: 'fimage' undeclared (first use in this function); did you mean 'image'?
1010 | ret =Quoted 7 lines
bpf_jit_emit_func_call_hlp(image, fimage, ctx, func_addr); | ^~~~~~ | image
arch/powerpc/net/bpf_jit_comp64.c:1010:73: note: each undeclared identifier is reported only once for each function it appears in
Quoted 4 lines
Anders bisected this and found following patch,
first bad commit:
[2298022fd5c6c428872f5741592526b8f4aadcf8]
powerpc/64/bpf: fix tail calls for PCREL addressing
^ this patch can't be backported directly as it is using 'fimage' that was introduced by:90d862f370b6 ("powerpc/bpf: use bpf_jit_binary_pack_[alloc|finalize|free]")
We need to manually rework this patch for the backport.
Thanks,
Puranjay
Greg Kroah-Hartman
maintainerQuoted 52 lines · Puranjay Mohan
Hi Greg and Naresh,
Quoted 43 lines · Naresh Kamboju
Quoted 33 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
The powerpc defconfig builds failed on stable-rc 6.6 branch due to below build errors with gcc-13, gcc-8 and clang.
Build log:
----arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:1010:73: error: 'fimage' undeclared (first use in this function); did you mean 'image'?
1010 | ret =Quoted 7 lines
bpf_jit_emit_func_call_hlp(image, fimage, ctx, func_addr); | ^~~~~~ | image
arch/powerpc/net/bpf_jit_comp64.c:1010:73: note: each undeclared identifier is reported only once for each function it appears inQuoted 4 lines
Anders bisected this and found following patch,
first bad commit:
[2298022fd5c6c428872f5741592526b8f4aadcf8]
powerpc/64/bpf: fix tail calls for PCREL addressing
Quoted 5 lines
^ this patch can't be backported directly as it is using 'fimage' that was introduced by:
90d862f370b6("powerpc/bpf: use bpf_jit_binary_pack_[alloc|finalize|free]")We need to manually rework this patch for the backport.
Ok, now dropped, thanks!
greg k-h
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
6.6.34-rc1 tested.
Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.
Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P(x86_64) arch linux)
[ 0.000000] Linux version 6.6.34-rc1rv
(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 14.1.1 20240522, GNU ld (GNU Binutils) 2.42.0) #1 SMP PREEMPT_DYNAMIC Thu Jun 13 23:11:09 JST 2024
Thanks
Hello,
Quoted 5 lines · On Thu, 13 Jun 2024 13:33:00 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] 7d633761ea98 ("Linux 6.6.34-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 2 selftests: damon: debugfs_schemes.sh
ok 3 selftests: damon: debugfs_target_ids.sh
ok 4 selftests: damon: debugfs_empty_targets.sh
ok 5 selftests: damon: debugfs_huge_count_read_write.sh
ok 6 selftests: damon: debugfs_duplicate_context_creation.sh
ok 7 selftests: damon: debugfs_rm_non_contexts.sh
ok 8 selftests: damon: sysfs.sh
ok 9 selftests: damon: sysfs_update_removed_scheme_dir.sh
ok 10 selftests: damon: reclaim.sh
ok 11 selftests: damon: lru_sort.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_m68k.sh
ok 13 selftests: damon-tests: build_i386_idle_flag.sh
ok 14 selftests: damon-tests: build_i386_highpte.sh
ok 15 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
Build regressions on powerpc reported.
## Build
* kernel: 6.6.34-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.6.y
* git commit: 8429fc3308da68760efb0f6acfb80b41eb2f7532
* git describe: v6.6.32-876-g8429fc3308da
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.6.y/build/v6.6.32-876-g8429fc3308da
## Test Regressions (compared to v6.6.32-742-g7fa271200aef)
* powerpc, build
- clang-18-defconfig
- clang-nightly-defconfig
- gcc-13-defconfig
- gcc-8-defconfig
## Metric Regressions (compared to v6.6.32-742-g7fa271200aef)
## Test Fixes (compared to v6.6.32-742-g7fa271200aef)
## Metric Fixes (compared to v6.6.32-742-g7fa271200aef)
## Test result summary
total: 129650, pass: 112601, fail: 1079, skip: 15843, xfail: 127
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 129 total, 129 passed, 0 failed
* arm64: 37 total, 37 passed, 0 failed
* i386: 29 total, 29 passed, 0 failed
* mips: 24 total, 24 passed, 0 failed
* parisc: 3 total, 3 passed, 0 failed
* powerpc: 34 total, 30 passed, 4 failed
* riscv: 17 total, 17 passed, 0 failed
* s390: 12 total, 12 passed, 0 failed
* sh: 10 total, 10 passed, 0 failed
* sparc: 6 total, 6 passed, 0 failed
* x86_64: 33 total, 33 passed, 0 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mm
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-hugetlb
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-smoke
* ltp-smoketest
* ltp-syscalls
* ltp-tracing
* perf
* rcutorture
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.6:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
116 tests: 116 pass, 0 failLinux version: 6.6.34-rc1-g8429fc3308da
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Hi Greg,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
No problems seen on x86_64 and aarch64 with our testing.
Thanks,
Harshit
Quoted 10 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
Am 13.06.2024 um 13:33 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Builds, boots and works w/o regressions on 2-socket Ivy Bridge Xeon E5-2697 v2. I'm currently test-building 6.9.5-rc1 under it, also 2 idling VMs running at the same time and I don't see any problems; everything running smoothly. Nothing unusual or suspicious in the dmesg output.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.34 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 15 Jun 2024 11:31:50 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.34-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.6.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian