6.18.8-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 6.18.8-rc1 review
This is the start of the stable review cycle for the 6.18.8 release. There are 227 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 Fri, 30 Jan 2026 14:53:02 +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.18.8-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.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.18.8-rc1
Lorenzo Stoakes <[email protected]>
mm/vma: enforce VMA fork limit on unfaulted,faulted mremap merge too
Lorenzo Stoakes <[email protected]>
mm/vma: fix anon_vma UAF on mremap() faulted, unfaulted merge
Biju Das <[email protected]>
irqchip/renesas-rzv2h: Prevent TINT spurious interrupt during resume
Pradeep P V K <[email protected]>
arm64: dts: qcom: talos: Correct UFS clocks ordering
Rasmus Villemoes <[email protected]>
iio: core: add separate lockdep class for info_exist_lock
Andy Shevchenko <[email protected]>
iio: core: Replace lockdep_set_class() + mutex_init() by combined call
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix two comments related to huge_pmd_unshare()
jianyun.gao <[email protected]>
mm: fix some typos in mm module
Ravindra <[email protected]>
Bluetooth: btintel_pcie: Support for S4 (Hibernate)
Tzung-Bi Shih <[email protected]>
gpio: cdev: Fix resource leaks on errors in gpiolib_cdev_register()
Tzung-Bi Shih <[email protected]>
gpio: cdev: Fix resource leaks on errors in lineinfo_changed_notify()
Tzung-Bi Shih <[email protected]>
gpio: cdev: Correct return code on memory allocation failure
Marco Crivellari <[email protected]>
drm/xe: fix WQ_MEM_RECLAIM passed as max_active to alloc_workqueue()
Matthew Brost <[email protected]>
drm/xe: Adjust page count tracepoints in shrinker
Osama Abdelkader <[email protected]>
drm/bridge: synopsys: dw-dp: fix error paths of dw_dp_bind
Likun Gao <[email protected]>
drm/amdgpu: remove frame cntl for gfx v12
Marc Kleine-Budde <[email protected]>
can: usb_8dev: usb_8dev_read_bulk_callback(): fix URB memory leak
Marc Kleine-Budde <[email protected]>
can: mcba_usb: mcba_usb_read_bulk_callback(): fix URB memory leak
Marc Kleine-Budde <[email protected]>
can: kvaser_usb: kvaser_usb_read_bulk_callback(): fix URB memory leak
Marc Kleine-Budde <[email protected]>
can: esd_usb: esd_usb_read_bulk_callback(): fix URB memory leak
Marc Kleine-Budde <[email protected]>
can: ems_usb: ems_usb_read_bulk_callback(): fix URB memory leak
Jiawen Wu <[email protected]>
net: txgbe: remove the redundant data return in SW-FW mailbox
Hamza Mahfooz <[email protected]>
net: sfp: add potron quirk to the H-COM SPP425H-GAB4 SFP+ Stick
Clemens Gruber <[email protected]>
net: fec: account for VLAN header in frame length calculations
Arnd Bergmann <[email protected]>
irqchip/gic-v3-its: Avoid truncating memory addresses
Fernand Sieber <[email protected]>
perf/x86/intel: Do not enable BTS for guests
David Howells <[email protected]>
rxrpc: Fix data-race warning and potential load/store tearing
Alexandre Courbot <[email protected]>
rust: irq: always inline functions using build_assert with arguments
Alexandre Courbot <[email protected]>
rust: io: always inline functions using build_assert with arguments
Frank Zhang <[email protected]>
pmdomain:rockchip: Fix init genpd as GENPD_STATE_ON before regulator ready
Ming Qian <[email protected]>
pmdomain: imx8m-blk-ctrl: Remove separate rst and clk mask for 8mq vpu
Mario Limonciello <[email protected]>
platform/x86: hp-bioscfg: Fix automatic module loading
Jeongjun Park <[email protected]>
netrom: fix double-free in nr_route_frame()
Chenghai Huang <[email protected]>
uacce: ensure safe queue release with state management
Yang Shen <[email protected]>
uacce: implement mremap in uacce_vm_ops to return -EPERM
Chenghai Huang <[email protected]>
uacce: fix isolate sysfs check condition
Wenkai Lin <[email protected]>
uacce: fix cdev handling in the cleanup path
Alexander Egorenkov <[email protected]>
s390/boot/vmlinux.lds.S: Ensure bzImage ends with SecureBoot trailer
Harald Freudenberger <[email protected]>
s390/ap: Fix wrong APQN fill calculation
Alexander Usyskin <[email protected]>
mei: trace: treat reg parameter as string
Johan Hovold <[email protected]>
intel_th: fix device leak on output open()
Steven Rostedt <[email protected]>
tracing: Fix crash on synthetic stacktrace field usage
Johan Hovold <[email protected]>
slimbus: core: fix device reference leak on report present
Johan Hovold <[email protected]>
slimbus: core: fix runtime PM imbalance on report present
Thomas Fourier <[email protected]>
octeontx2: Fix otx2_dma_map_page() error return code
Thomas Fourier <[email protected]>
ksmbd: smbd: fix dma_unmap_sg() nents
Zhaoyang Huang <[email protected]>
arm64: Set __nocfi on swsusp_arch_resume()
Mark Rutland <[email protected]>
arm64/fpsimd: signal: Fix restoration of SVE context
Mark Rutland <[email protected]>
arm64/fpsimd: signal: Allocate SSVE storage when restoring ZA
Mark Rutland <[email protected]>
arm64/fpsimd: ptrace: Fix SVE writes on !SME systems
Marek Vasut <[email protected]>
wifi: rsi: Fix memory corruption due to not set vif driver data size
Dan Carpenter <[email protected]>
wifi: mwifiex: Fix a loop in mwifiex_update_ampdu_rxwinsize()
Thomas Fourier <[email protected]>
wifi: ath12k: fix dma_free_coherent() pointer
Thomas Fourier <[email protected]>
wifi: ath10k: fix dma_free_coherent() pointer
Lyude Paul <[email protected]>
drm/nouveau/disp: Set drm_mode_config_funcs.atomic_(check|commit)
Chaitanya Kulkarni <[email protected]>
iommu/io-pgtable-arm: fix size_t signedness bug in unmap path
Shawn Lin <[email protected]>
mmc: sdhci-of-dwcmshc: Prevent illegal clock reduction in HS200/HS400 mode
Matthew Schwartz <[email protected]>
mmc: rtsx_pci_sdmmc: implement sdmmc_card_busy function
Berk Cem Goksel <[email protected]>
ALSA: usb-audio: Fix use-after-free in snd_usb_mixer_free()
Samasth Norway Ananda <[email protected]>
ALSA: scarlett2: Fix buffer overflow in config retrieval
Zhang Heng <[email protected]>
ALSA: hda/realtek: Add quirk for Samsung 730QED to fix headphone
Takashi Iwai <[email protected]>
ALSA: ctxfi: Fix potential OOB access in audio mixer handling
Kübrich, Andreas <[email protected]>
iio: dac: ad5686: add AD5695R to ad5686_chip_info_tbl
Miaoqian Lin <[email protected]>
iio: dac: ad3552r-hs: fix out-of-bound write in ad3552r_hs_write_data_source
Fiona Klute <[email protected]>
iio: chemical: scd4x: fix reported channel endianness
Thorsten Blum <[email protected]>
iio: adc: pac1934: Fix clamped value in pac1934_reg_snapshot
Johan Hovold <[email protected]>
iio: adc: exynos_adc: fix OF populate on driver rebind
Pei Xiao <[email protected]>
iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
Tomas Melin <[email protected]>
iio: adc: ad9467: fix ad9434 vref mask
Markus Koeniger <[email protected]>
iio: accel: iis328dq: fix gain values
Francesco Lavra <[email protected]>
iio: accel: adxl380: fix handling of unavailable "INT1" interrupt
Matthew Wilcox (Oracle) <[email protected]>
migrate: correct lock ordering for hugetlb file folios
Rob Herring (Arm) <[email protected]>
of: platform: Use default match table for /firmware
Weigang He <[email protected]>
of: fix reference count leak in of_alias_scan()
Gal Pressman <[email protected]>
panic: only warn about deprecated panic_print on write access
Hans de Goede <[email protected]>
leds: led-class: Only Add LED to leds_list when it is fully ready
Srish Srinivasan <[email protected]>
keys/trusted_keys: fix handle passed to tpm_buf_append_name during unseal
Cedric Xing <[email protected]>
x86: make page fault handling disable interrupts properly
Hariprasad Kelam <[email protected]>
Octeontx2-af: Add proper checks for fwdata
Ivan Vecera <[email protected]>
dpll: Prevent duplicate registrations
Eric Dumazet <[email protected]>
net/sched: act_ife: avoid possible NULL deref
Fan Gong <[email protected]>
hinic3: Fix netif_queue_set_napi queue_index input parameter error
Melbin K Mathew <[email protected]>
vsock/virtio: cap TX credit to local buffer size
Stefano Garzarella <[email protected]>
vsock/test: fix seqpacket message bounds test
Melbin K Mathew <[email protected]>
vsock/virtio: fix potential underflow in virtio_transport_get_credit()
David Yang <[email protected]>
net: openvswitch: fix data race in ovs_vport_get_upcall_stats
Ratheesh Kannoth <[email protected]>
octeontx2-af: Fix error handling
Daniel Golle <[email protected]>
net: pcs: pcs-mtk-lynxi: report in-band capability for 2500Base-X
Vladimir Oltean <[email protected]>
net: dsa: fix off-by-one in maximum bridge ID determination
Justin Chen <[email protected]>
net: bcmasp: Fix network filter wake for asp-3.0
Eric Dumazet <[email protected]>
bonding: provide a net pointer to __skb_flow_dissect()
Taehee Yoo <[email protected]>
selftests: net: amt: wait longer for connection before sending packets
Andrey Vatoropin <[email protected]>
be2net: Fix NULL pointer dereference in be_cmd_get_mac_from_list
Alex Ramírez <[email protected]>
drm/nouveau: implement missing DCB connector types; gracefully handle unknown connectors
Alex Ramírez <[email protected]>
drm/nouveau: add missing DCB connector types
Alex Deucher <[email protected]>
drm/amdgpu: fix type for wptr in ring backup
Timur Kristóf <[email protected]>
drm/amd/pm: Workaround SI powertune issue on Radeon 430 (v2)
Timur Kristóf <[email protected]>
drm/amd/pm: Don't clear SI SMC table when setting power limit
Timur Kristóf <[email protected]>
drm/amd/pm: Fix si_dpm mmCG_THERMAL_INT setting
Vincent Guittot <[email protected]>
sched/fair: Fix pelt clock sync when entering idle
Will Rosenberg <[email protected]>
perf: Fix refcount warning on event->mmap_count increment
Ming Lei <[email protected]>
selftests/ublk: fix garbage output in foreground mode
Ming Lei <[email protected]>
selftests/ublk: fix error handling for starting device
Ming Lei <[email protected]>
selftests/ublk: fix IO thread idle check
Seamus Connor <[email protected]>
ublk: fix ublksrv pid handling for pid namespaces
Lukasz Laguna <[email protected]>
drm/xe: Update wedged.mode only after successful reset policy change
Matt Roper <[email protected]>
drm/xe/pm: Add scope-based cleanup helper for runtime PM
Matthew Auld <[email protected]>
drm/xe/migrate: fix job lock assert
Matthew Auld <[email protected]>
drm/xe/uapi: disallow bind queue sharing
Thomas Gleixner <[email protected]>
clocksource: Reduce watchdog readout delay limit to prevent false positives
Hariprasad Kelam <[email protected]>
Octeontx2-pf: Update xdp features
Laurent Vivier <[email protected]>
usbnet: limit max_mtu based on device's hard_mtu
Eric Dumazet <[email protected]>
ipv6: annotate data-race in ndisc_router_discovery()
Eric Dumazet <[email protected]>
mISDN: annotate data-race around dev->work
Jijie Shao <[email protected]>
net: hns3: fix the HCLGE_FD_AD_NXT_KEY error setting issue
Jijie Shao <[email protected]>
net: hns3: fix wrong GENMASK() for HCLGE_FD_AD_COUNTER_NUM_M
David Yang <[email protected]>
be2net: fix data race in be_get_new_eqd
David Yang <[email protected]>
idpf: Fix data race in idpf_net_dim
David Yang <[email protected]>
net: hns3: fix data race in hns3_fetch_stats
Daniel Golle <[email protected]>
net: phy: intel-xway: fix OF node refcount leakage
Mina Almasry <[email protected]>
idpf: read lower clock bits inside the time sandwich
Paul Greenwalt <[email protected]>
ice: fix devlink reload call trace
Paul Greenwalt <[email protected]>
ice: add missing ice_deinit_hw() in devlink reinit path
Cody Haas <[email protected]>
ice: Fix persistent failure in ice_get_rxfh
Yun Lu <[email protected]>
netdevsim: fix a race issue related to the operation on bpf_bound_progs list
Michal Luczaj <[email protected]>
vsock/test: Do not filter kallsyms by symbol type
Brajesh Gupta <[email protected]>
drm/imagination: Wait for FW trace update command completion
Chen-Yu Tsai <[email protected]>
drm/mediatek: dpi: Find next bridge during probe
Matthew Brost <[email protected]>
drm/xe: Disable timestamp WA on VFs
Jani Nikula <[email protected]>
drm/xe/vm: fix xe_vm_validation_exec() kernel-doc
Jani Nikula <[email protected]>
drm/xe/xe_late_bind_fw: fix enum xe_late_bind_fw_id kernel-doc
Vasant Hegde <[email protected]>
iommu/amd: Fix error path in amd_iommu_probe_device()
Dave Jiang <[email protected]>
ntb: transport: Fix uninitialized mutex
Arun Raghavan <[email protected]>
ALSA: usb: Increase volume range that triggers a warning
Jiasheng Jiang <[email protected]>
scsi: qla2xxx: Sanitize payload size to prevent member overflow
David Jeffery <[email protected]>
scsi: core: Wake up the error handler when final completions race against each other
Zilin Guan <[email protected]>
platform/x86/amd: Fix memory leak in wbrf_record()
Oleksandr Shamray <[email protected]>
platform/mellanox: Fix SN5640/SN5610 LED platform data
Naohiko Shimizu <[email protected]>
riscv: suspend: Fix stimecmp update hazard on RV32
Naohiko Shimizu <[email protected]>
riscv: clocksource: Fix stimecmp update hazard on RV32
Arkadiusz Kozdra <[email protected]>
kconfig: fix static linking of nconf
Cheng-Yu Lee <[email protected]>
regmap: Fix race condition in hwspinlock irqsave routine
Felix Gu <[email protected]>
spi: spi-sprd-adi: Fix double free in probe error path
Georgi Djakov <[email protected]>
interconnect: debugfs: initialize src_node and dst_node to empty strings
Haotian Zhang <[email protected]>
iio: adc: ad7606: Fix incorrect type for error return variable
Pavel Zhigulin <[email protected]>
iio: adc: ad7280a: handle spi_setup() errors in probe()
Francesco Lavra <[email protected]>
iio: imu: st_lsm6dsx: fix iio_chan_spec for sensors without event detection
Jens Axboe <[email protected]>
io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
Thomas Weißschuh <[email protected]>
timekeeping: Adjust the leap state for the correct auxiliary timekeeper
Yosry Ahmed <[email protected]>
mm: restore per-memcg proactive reclaim with !CONFIG_NUMA
David Hildenbrand (Red Hat) <[email protected]>
mm/rmap: fix two comments related to huge_pmd_unshare()
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix hugetlb_pmd_shared()
Mario Limonciello <[email protected]>
platform/x86: hp-bioscfg: Fix kernel panic in GET_INSTANCE_ID macro
Mario Limonciello <[email protected]>
platform/x86: hp-bioscfg: Fix kobject warnings for empty attribute names
Thomas Hellström <[email protected]>
drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE
Joanne Koong <[email protected]>
fs/writeback: skip AS_NO_DATA_INTEGRITY mappings in wait_sb_inodes()
Ian Abbott <[email protected]>
comedi: Fix getting range information for subdevices 16 to 255
Andrew Cooper <[email protected]>
x86/kfence: avoid writing L1TF-vulnerable PTEs
David Howells <[email protected]>
rxrpc: Fix recvmsg() unconditional requeue
Swaraj Gaikwad <[email protected]>
slab: fix kmalloc_nolock() context check for PREEMPT_RT
Alexey Charkov <[email protected]>
arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5
Alexey Charkov <[email protected]>
arm64: dts: rockchip: Fix headphones widget name on NanoPi M5
Quentin Schulz <[email protected]>
arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU
Ondrej Jirman <[email protected]>
arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro
Geraldo Nascimento <[email protected]>
arm64: dts: rockchip: remove dangerous max-link-speed from helios64
Geraldo Nascimento <[email protected]>
arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
Nicolas Ferre <[email protected]>
ARM: dts: microchip: sama7d65: fix size-cells property for i2c3
Hari Prasath Gujulan Elango <[email protected]>
ARM: dts: microchip: sama7d65: fix the ranges property for flx9
Yixun Lan <[email protected]>
i2c: spacemit: drop IRQF_ONESHOT flag from IRQ request
Abdun Nihaal <[email protected]>
scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()
Long Li <[email protected]>
scsi: storvsc: Process unsupported MODE_SENSE_10
feng <[email protected]>
Input: i8042 - add quirk for ASUS Zenbook UX425QA_UM425QA
gongqi <[email protected]>
Input: i8042 - add quirks for MECHREVO Wujie 15X Pro
Thadeu Lima de Souza Cascardo <[email protected]>
Revert "nfc/nci: Add the inconsistency check between the input data length and count"
Haoxiang Li <[email protected]>
w1: fix redundant counter decrement in w1_attach_slave_device()
Thorsten Blum <[email protected]>
w1: therm: Fix off-by-one buffer overflow in alarms_store
Ian Abbott <[email protected]>
comedi: dmm32at: serialize use of paged registers
Krzysztof Kozlowski <[email protected]>
serial: Fix not set tty->port race condition
Marnix Rijnart <[email protected]>
serial: 8250_pci: Fix broken RS485 for F81504/508/512
Lachlan Hodges <[email protected]>
wifi: mac80211: don't perform DA check on S1G beacon
Taeyang Lee <[email protected]>
crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec
Jamal Hadi Salim <[email protected]>
net/sched: qfq: Use cl_is_active to determine whether class is active in qfq_rm_from_ag
Jamal Hadi Salim <[email protected]>
net/sched: Enforce that teql can only be used as root qdisc
Alok Tiwari <[email protected]>
octeontx2: cn10k: fix RX flowid TCAM mask handling
Dmitry Skorodumov <[email protected]>
ipvlan: Make the addrs_lock be per port
Eric Dumazet <[email protected]>
l2tp: avoid one data-race in l2tp_tunnel_del_work()
Richard Genoud <[email protected]>
pwm: max7360: Populate missing .sizeof_wfhw in max7360_pwm_ops
Uwe Kleine-König <[email protected]>
pwm: Ensure ioctl() returns a negative errno on error
David Yang <[email protected]>
veth: fix data race in veth_get_ethtool_stats
Kuniyuki Iwashima <[email protected]>
fou: Don't allow 0 for FOU_ATTR_IPPROTO.
Kuniyuki Iwashima <[email protected]>
tools: ynl: Specify --no-line-number in ynl-regen.sh.
Kuniyuki Iwashima <[email protected]>
gue: Fix skb memleak with inner IP protocol 0.
Raju Rangoju <[email protected]>
amd-xgbe: avoid misleading per-packet error log
Xin Long <[email protected]>
sctp: move SCTP_CMD_ASSOC_SHKEY right after SCTP_CMD_PEER_INIT
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_usb_receive_bulk_callback(): unanchor URL on usb_submit_urb() error
Maxime Chevallier <[email protected]>
net: freescale: ucc_geth: Return early when TBI PHY can't be found
Ricardo B. Marlière <[email protected]>
selftests: net: fib-onlink-tests: Convert to use namespaces by default
Kuniyuki Iwashima <[email protected]>
l2tp: Fix memleak in l2tp_udp_encap_recv().
Eric Dumazet <[email protected]>
bonding: limit BOND_MODE_8023AD to Ethernet devices
Ethan Nelson-Moore <[email protected]>
net: usb: dm9601: remove broken SR9700 support
Michal Luczaj <[email protected]>
vsock/virtio: Coalesce only linear skb
Chwee-Lin Choong <[email protected]>
igc: Reduce TSN TX packet buffer from 7KB to 5KB per queue
Chwee-Lin Choong <[email protected]>
igc: fix race condition in TX timestamp read for register 0
Kurt Kanzenbach <[email protected]>
igc: Restore default Qbv schedule when changing channels
Ding Hui <[email protected]>
ice: Fix incorrect timeout ice_release_res()
Dave Ertman <[email protected]>
ice: Avoid detrimental cleanup for bond during interface stop
Jacob Keller <[email protected]>
ice: initialize ring_stats->syncp
Yingying Tang <[email protected]>
wifi: ath12k: Fix wrong P2P device link id issue
Baochen Qiang <[email protected]>
wifi: ath12k: fix dead lock while flushing management frames
Yingying Tang <[email protected]>
wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel
Manish Dharanenthiran <[email protected]>
wifi: ath12k: cancel scan only on active scan vdev
Niklas Cassel <[email protected]>
ata: libata: Print features also for ATAPI devices
Niklas Cassel <[email protected]>
ata: libata: Add DIPM and HIPM to ata_dev_print_features() early return
Niklas Cassel <[email protected]>
ata: libata: Add cpr_log to ata_dev_print_features() early return
Niklas Cassel <[email protected]>
ata: libata-sata: Improve link_power_management_supported sysfs attribute
Niklas Cassel <[email protected]>
ata: libata: Call ata_dev_config_lpm() for ATAPI devices
Niklas Cassel <[email protected]>
ata: ahci: Do not read the per port area for unimplemented ports
Baochen Qiang <[email protected]>
wifi: ath12k: don't force radio frequency check in freq_to_idx()
Konrad Dybcio <[email protected]>
pmdomain: qcom: rpmhpd: Add MXC to SC8280XP
Konrad Dybcio <[email protected]>
dt-bindings: power: qcom,rpmpd: Add SC8280XP_MXC_AO
Mark Harmstone <[email protected]>
btrfs: fix missing fields in superblock backup with BLOCK_GROUP_TREE
Michael Kelley <[email protected]>
Drivers: hv: Always do Hyper-V panic notification in hv_kmsg_dump()
Faisal Bukhari <[email protected]>
perf parse-events: Fix evsel allocation failure
Chaoyi Chen <[email protected]>
arm64: dts: rockchip: Fix wrong register range of rk3576 gpu
Krishna Kurapati <[email protected]>
arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node
Krishna Kurapati <[email protected]>
arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc8280xp: Add missing VDD_MXC links
-------------
Diffstat:
Documentation/netlink/specs/fou.yaml | 2 + Makefile | 4 +- arch/arm/boot/dts/microchip/sama7d65.dtsi | 4 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 +++- arch/arm64/boot/dts/qcom/sm6150.dtsi | 4 +- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 - arch/arm64/boot/dts/qcom/sm8650.dtsi | 3 - .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 - .../arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 1 - .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 12 ++- arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 4 +- arch/arm64/kernel/hibernate.c | 2 +- arch/arm64/kernel/ptrace.c | 26 +++--- arch/arm64/kernel/signal.c | 26 ++++-- arch/riscv/kernel/suspend.c | 3 +- arch/s390/boot/vmlinux.lds.S | 17 ++-- arch/x86/events/perf_event.h | 13 ++- arch/x86/include/asm/kfence.h | 29 +++++- arch/x86/mm/fault.c | 15 +-- crypto/authencesn.c | 6 ++ drivers/ata/ahci.c | 10 +- drivers/ata/libata-core.c | 8 +- drivers/ata/libata-sata.c | 2 +- drivers/base/regmap/regmap.c | 4 +- drivers/block/ublk_drv.c | 39 +++++++- drivers/bluetooth/btintel_pcie.c | 41 +++++++++ drivers/bluetooth/btintel_pcie.h | 2 + drivers/clocksource/timer-riscv.c | 3 +- drivers/comedi/comedi_fops.c | 2 +- drivers/comedi/drivers/dmm32at.c | 32 ++++++- drivers/comedi/range.c | 2 +- drivers/dpll/dpll_core.c | 12 +-- drivers/gpio/gpiolib-cdev.c | 12 ++- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 12 --- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 31 ++++--- drivers/gpu/drm/bridge/synopsys/dw-dp.c | 20 ++-- drivers/gpu/drm/imagination/pvr_fw_trace.c | 8 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 23 ++--- .../drm/nouveau/include/nvkm/subdev/bios/conn.h | 95 ++++++++++++++----- drivers/gpu/drm/nouveau/nouveau_display.c | 2 + drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 73 +++++++++++---- drivers/gpu/drm/xe/Kconfig | 2 +- drivers/gpu/drm/xe/xe_bo.c | 9 +- drivers/gpu/drm/xe/xe_debugfs.c | 72 ++++++++++++--- drivers/gpu/drm/xe/xe_device_types.h | 18 ++++ drivers/gpu/drm/xe/xe_exec_queue.c | 32 ++++++- drivers/gpu/drm/xe/xe_exec_queue.h | 1 + drivers/gpu/drm/xe/xe_exec_queue_types.h | 6 ++ drivers/gpu/drm/xe/xe_ggtt.c | 2 +- drivers/gpu/drm/xe/xe_guc_ads.c | 14 +-- drivers/gpu/drm/xe/xe_guc_ads.h | 5 +- drivers/gpu/drm/xe/xe_late_bind_fw_types.h | 4 +- drivers/gpu/drm/xe/xe_lrc.c | 3 + drivers/gpu/drm/xe/xe_migrate.c | 4 +- drivers/gpu/drm/xe/xe_pm.c | 21 +++++ drivers/gpu/drm/xe/xe_pm.h | 17 ++++ drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 2 +- drivers/gpu/drm/xe/xe_vm.c | 7 +- drivers/gpu/drm/xe/xe_vm.h | 2 +- drivers/hv/hv_common.c | 12 ++- drivers/hwtracing/intel_th/core.c | 19 +++- drivers/i2c/busses/i2c-k1.c | 2 +- drivers/iio/accel/adxl380.c | 6 +- drivers/iio/accel/st_accel_core.c | 72 ++++++++++++++- drivers/iio/adc/ad7280a.c | 4 +- drivers/iio/adc/ad7606_par.c | 3 +- drivers/iio/adc/ad9467.c | 2 +- drivers/iio/adc/at91-sama5d2_adc.c | 1 + drivers/iio/adc/exynos_adc.c | 15 +-- drivers/iio/adc/pac1934.c | 6 +- drivers/iio/chemical/scd4x.c | 6 +- drivers/iio/dac/ad3552r-hs.c | 5 +- drivers/iio/dac/ad5686.c | 6 ++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 15 ++- drivers/iio/industrialio-core.c | 7 +- drivers/input/serio/i8042-acpipnpio.h | 18 ++++ drivers/interconnect/debugfs-client.c | 5 + drivers/iommu/amd/iommu.c | 3 +- drivers/iommu/io-pgtable-arm.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 8 +- drivers/irqchip/irq-renesas-rzv2h.c | 11 ++- drivers/isdn/mISDN/timerdev.c | 13 ++- drivers/leds/led-class.c | 10 +- drivers/misc/mei/mei-trace.h | 18 ++-- drivers/misc/uacce/uacce.c | 48 ++++++++-- drivers/mmc/host/rtsx_pci_sdmmc.c | 41 +++++++++ drivers/mmc/host/sdhci-of-dwcmshc.c | 7 ++ drivers/net/bonding/bond_main.c | 11 ++- drivers/net/can/usb/ems_usb.c | 8 +- drivers/net/can/usb/esd_usb.c | 9 +- drivers/net/can/usb/gs_usb.c | 7 ++ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 9 +- drivers/net/can/usb/mcba_usb.c | 8 +- drivers/net/can/usb/usb_8dev.c | 8 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 5 +- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 5 +- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 1 + drivers/net/ethernet/emulex/benet/be_cmds.c | 3 +- drivers/net/ethernet/emulex/benet/be_main.c | 8 +- drivers/net/ethernet/freescale/fec_main.c | 13 +-- drivers/net/ethernet/freescale/ucc_geth.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 69 +++++++------- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- drivers/net/ethernet/huawei/hinic3/hinic3_irq.c | 22 +++-- drivers/net/ethernet/intel/ice/devlink/devlink.c | 1 + drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_common.c | 2 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +- drivers/net/ethernet/intel/ice/ice_lib.c | 29 ++++-- drivers/net/ethernet/intel/ice/ice_main.c | 31 ++++++- drivers/net/ethernet/intel/idpf/idpf_ptp.c | 2 +- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 16 +++- drivers/net/ethernet/intel/igc/igc_defines.h | 5 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +- drivers/net/ethernet/intel/igc/igc_main.c | 5 + drivers/net/ethernet/intel/igc/igc_ptp.c | 43 +++++---- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 86 ++++++++++++----- .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 3 + .../net/ethernet/marvell/octeontx2/af/rvu_sdp.c | 2 +- .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 2 +- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 4 +- drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c | 4 +- drivers/net/ipvlan/ipvlan.h | 2 +- drivers/net/ipvlan/ipvlan_core.c | 16 ++-- drivers/net/ipvlan/ipvlan_main.c | 49 ++++++---- drivers/net/netdevsim/bpf.c | 6 ++ drivers/net/netdevsim/dev.c | 2 + drivers/net/netdevsim/netdevsim.h | 1 + drivers/net/pcs/pcs-mtk-lynxi.c | 4 +- drivers/net/phy/intel-xway.c | 7 +- drivers/net/phy/sfp.c | 2 + drivers/net/usb/dm9601.c | 4 - drivers/net/usb/usbnet.c | 9 +- drivers/net/veth.c | 8 +- drivers/net/wireless/ath/ath10k/ce.c | 16 ++-- drivers/net/wireless/ath/ath12k/ce.c | 12 +-- drivers/net/wireless/ath/ath12k/mac.c | 16 ++-- drivers/net/wireless/ath/ath12k/wmi.c | 9 +- .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 6 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 + drivers/nfc/virtual_ncidev.c | 4 - drivers/ntb/ntb_transport.c | 1 + drivers/of/base.c | 8 +- drivers/of/platform.c | 2 +- drivers/platform/mellanox/mlx-platform.c | 2 +- drivers/platform/x86/amd/wbrf.c | 4 +- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 ++ drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 12 ++- drivers/pmdomain/imx/imx8m-blk-ctrl.c | 11 ++- drivers/pmdomain/qcom/rpmhpd.c | 4 + drivers/pmdomain/rockchip/pm-domains.c | 10 ++ drivers/pwm/core.c | 10 +- drivers/pwm/pwm-max7360.c | 1 + drivers/s390/crypto/ap_card.c | 2 +- drivers/s390/crypto/ap_queue.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 7 ++ drivers/scsi/scsi_error.c | 11 ++- drivers/scsi/scsi_lib.c | 8 ++ drivers/scsi/storvsc_drv.c | 3 +- drivers/slimbus/core.c | 19 ++-- drivers/spi/spi-sprd-adi.c | 33 ++----- drivers/tty/serial/8250/8250_pci.c | 2 +- drivers/tty/serial/serial_core.c | 6 ++ drivers/w1/slaves/w1_therm.c | 60 ++++-------- drivers/w1/w1.c | 2 - drivers/xen/xen-scsiback.c | 1 + fs/btrfs/disk-io.c | 2 +- fs/fs-writeback.c | 7 +- fs/fuse/file.c | 4 +- fs/smb/server/transport_rdma.c | 15 ++- include/drm/drm_pagemap.h | 19 +++- include/dt-bindings/power/qcom,rpmhpd.h | 1 + include/linux/hugetlb.h | 2 +- include/linux/iio/iio-opaque.h | 2 + include/linux/pagemap.h | 11 +++ include/trace/events/rxrpc.h | 4 + include/uapi/linux/comedi.h | 2 +- io_uring/io-wq.c | 2 +- kernel/events/core.c | 9 ++ kernel/panic.c | 4 +- kernel/sched/fair.c | 6 -- kernel/sched/idle.c | 6 ++ kernel/time/clocksource.c | 2 +- kernel/time/timekeeping.c | 2 +- kernel/trace/trace_events_hist.c | 9 ++ kernel/trace/trace_events_synth.c | 8 +- mm/damon/sysfs.c | 2 +- mm/gup.c | 2 +- mm/hugetlb.c | 28 ++---- mm/hugetlb_vmemmap.c | 6 +- mm/internal.h | 8 -- mm/kmsan/core.c | 2 +- mm/ksm.c | 2 +- mm/memory-tiers.c | 2 +- mm/memory.c | 4 +- mm/migrate.c | 12 +-- mm/rmap.c | 20 +--- mm/secretmem.c | 2 +- mm/slab_common.c | 2 +- mm/slub.c | 10 +- mm/swapfile.c | 2 +- mm/userfaultfd.c | 2 +- mm/vma.c | 102 ++++++++++++++------- mm/vma.h | 3 + mm/vmscan.c | 13 ++- net/dsa/dsa.c | 2 +- net/ipv4/fou_core.c | 3 + net/ipv4/fou_nl.c | 2 +- net/ipv6/ndisc.c | 4 +- net/l2tp/l2tp_core.c | 8 +- net/mac80211/scan.c | 9 +- net/netrom/nr_route.c | 13 ++- net/openvswitch/vport.c | 11 ++- net/rxrpc/ar-internal.h | 9 +- net/rxrpc/conn_event.c | 2 +- net/rxrpc/output.c | 14 +-- net/rxrpc/peer_event.c | 17 +++- net/rxrpc/proc.c | 4 +- net/rxrpc/recvmsg.c | 19 +++- net/rxrpc/rxgk.c | 2 +- net/rxrpc/rxkad.c | 2 +- net/sched/act_ife.c | 6 +- net/sched/sch_qfq.c | 2 +- net/sched/sch_teql.c | 5 + net/sctp/sm_statefuns.c | 10 +- net/vmw_vsock/virtio_transport_common.c | 36 +++++--- rust/kernel/io.rs | 9 +- rust/kernel/io/resource.rs | 2 + rust/kernel/irq/flags.rs | 2 + scripts/kconfig/nconf-cfg.sh | 11 ++- security/keys/trusted-keys/trusted_tpm2.c | 4 +- sound/hda/codecs/realtek/alc269.c | 1 + sound/pci/ctxfi/ctamixer.c | 2 + sound/usb/mixer.c | 22 ++++- sound/usb/mixer_scarlett2.c | 6 +- tools/net/ynl/ynl-regen.sh | 2 +- tools/perf/util/parse-events.c | 7 +- tools/testing/selftests/net/amt.sh | 7 +- tools/testing/selftests/net/fib-onlink-tests.sh | 71 ++++++-------- tools/testing/selftests/ublk/kublk.c | 11 ++- tools/testing/vsock/util.h | 2 +- tools/testing/vsock/vsock_test.c | 11 +++ 249 files changed, 1889 insertions(+), 875 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/227 arm64: dts: qcom: sc8280xp: Add missing VDD_MXC links
6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 868b979c5328b867c95a6d5a93ba13ad0d3cd2f1 ]
To make sure that power rail is voted for, wire it up to its consumers.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +12 -4
@@ -5773,8 +5773,12 @@ remoteproc_nsp0: remoteproc@1b300000 { clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo"; - power-domains = <&rpmhpd SC8280XP_NSP>; - power-domain-names = "nsp"; + power-domains = <&rpmhpd SC8280XP_NSP>, + <&rpmhpd SC8280XP_CX>, + <&rpmhpd SC8280XP_MXC>; + power-domain-names = "nsp", + "cx", + "mxc"; memory-region = <&pil_nsp0_mem>;
@@ -5904,8 +5908,12 @@ remoteproc_nsp1: remoteproc@21300000 { clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo"; - power-domains = <&rpmhpd SC8280XP_NSP>; - power-domain-names = "nsp"; + power-domains = <&rpmhpd SC8280XP_NSP>, + <&rpmhpd SC8280XP_CX>, + <&rpmhpd SC8280XP_MXC>; + power-domain-names = "nsp", + "cx", + "mxc"; memory-region = <&pil_nsp1_mem>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 2/227 arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna Kurapati <[email protected]>
[ Upstream commit 9dbc9bed01837717b8ab755cf5067a6f8d35b00f ]
With W=1, the following error comes up:
Warning (avoid_unnecessary_addr_size): /soc@0/usb@a600000: unnecessary #address-cells/#size-cells without "ranges", "dma-ranges" or child "reg" or "ranges" property
This is because the child node being removed during flattening and moving to latest bindings.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +0 -2
@@ -4097,8 +4097,6 @@ usb_dp_qmpphy_dp_in: endpoint { usb_1: usb@a600000 { compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3"; reg = <0x0 0x0a600000 0x0 0xfc100>; - #address-cells = <1>; - #size-cells = <0>; clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, <&gcc GCC_USB30_PRIM_MASTER_CLK>,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 3/227 arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna Kurapati <[email protected]>
[ Upstream commit 1f6ca557088eb96c8c554f853eb7c60862f8a0a8 ]
With W=1, the following error comes up:
Warning (avoid_unnecessary_addr_size): /soc@0/usb@a600000: unnecessary #address-cells/#size-cells without "ranges", "dma-ranges" or child "reg" or "ranges" property
This is because the child node being removed during flattening and moving to latest bindings.
--- arch/arm64/boot/dts/qcom/sm8650.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8650.dtsi +0 -3
@@ -5115,9 +5115,6 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, dma-coherent; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; ports {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 4/227 arm64: dts: rockchip: Fix wrong register range of rk3576 gpu
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chaoyi Chen <[email protected]>
[ Upstream commit 955b263c421c6fe5075369c52199f278289ec8c4 ]
According to RK3576 TRM part1 Table 1-1 Address Mapping, the size of the GPU registers is 128 KB.
The current mapping incorrectly includes the addresses of multiple following IP like the eInk interface at 0x27900000. This has not been detected by the DT tooling as none of the extra mapped IP is described in the upstream RK3576 DT so far.
--- arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3576.dtsi +1 -1
@@ -1261,7 +1261,7 @@ power-domain@RK3576_PD_VO1 { gpu: gpu@27800000 { compatible = "rockchip,rk3576-mali", "arm,mali-bifrost"; - reg = <0x0 0x27800000 0x0 0x200000>; + reg = <0x0 0x27800000 0x0 0x20000>; assigned-clocks = <&scmi_clk SCMI_CLK_GPU>; assigned-clock-rates = <198000000>; clocks = <&cru CLK_GPU>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 5/227 perf parse-events: Fix evsel allocation failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Faisal Bukhari <[email protected]>
[ Upstream commit 1eb217ab2e737609f8a861b517649e82e7236d05 ]
If evsel__new_idx() returns NULL, the function currently jumps to label 'out_err'. Here, references to cpus and pmu_cpus are dropped. Also, resources held by evsel->name and evsel->metric_id are freed.
But if evsel__new_idx() returns NULL, it can lead to NULL pointer dereference.
--- tools/perf/util/parse-events.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +5 -2
@@ -286,8 +286,11 @@ __add_event(struct list_head *list, int *idx,event_attr_init (attr); evsel =evsel__new_idx (attr, *idx); -if (!evsel) - goto out_err; +if (!evsel) { +perf_cpu_map__put (cpus); +perf_cpu_map__put (pmu_cpus); +return NULL ; + }if (name) { evsel->name =strdup (name);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 6/227 Drivers: hv: Always do Hyper-V panic notification in hv_kmsg_dump()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Kelley <[email protected]>
[ Upstream commit 49f49d47af67f8a7b221db1d758fc634242dc91a ]
hv_kmsg_dump() currently skips the panic notification entirely if it doesn't get any message bytes to pass to Hyper-V due to an error from kmsg_dump_get_buffer(). Skipping the notification is undesirable because it leaves the Hyper-V host uncertain about the state of a panic'ed guest.
Fix this by always doing the panic notification, even if bytes_written is zero. Also ensure that bytes_written is initialized, which fixes a kernel test robot warning. The warning is actually bogus because kmsg_dump_get_buffer() happens to set bytes_written even if it fails, and in the kernel test robot's CONFIG_PRINTK not set case, hv_kmsg_dump() is never called. But do the initialization for robustness and to quiet the static checker.
--- drivers/hv/hv_common.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/hv/hv_common.c +7 -5
@@ -195,13 +195,15 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper,/* * Write dump contents to the page. No need to synchronize; panic should -* be single-threaded. +* be single-threaded. Ignore failures from kmsg_dump_get_buffer() since +* panic notification should be done even if there is no message data. +* Don't assume bytes_written is set in case of failure, so initialize it. */ kmsg_dump_rewind (&iter); -kmsg_dump_get_buffer (&iter, false, hv_panic_page,HV_HYP_PAGE_SIZE , + bytes_written =0 ; + (void )kmsg_dump_get_buffer (&iter, false, hv_panic_page,HV_HYP_PAGE_SIZE , &bytes_written); -if (!bytes_written) -return ; +/* * P3 to contain the physical address of the panic page & P4 to * contain the size of the panic data in that page. Rest of the
@@ -210,7 +212,7 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper,hv_set_msr (HV_MSR_CRASH_P0 ,0 );hv_set_msr (HV_MSR_CRASH_P1 ,0 );hv_set_msr (HV_MSR_CRASH_P2 ,0 ); -hv_set_msr (HV_MSR_CRASH_P3 ,virt_to_phys (hv_panic_page)); +hv_set_msr (HV_MSR_CRASH_P3 , bytes_written ?virt_to_phys (hv_panic_page) :0 );hv_set_msr (HV_MSR_CRASH_P4 , bytes_written);/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 7/227 btrfs: fix missing fields in superblock backup with BLOCK_GROUP_TREE
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 1d8f69f453c2e8a2d99b158e58e02ed65031fa6d ]
When the BLOCK_GROUP_TREE compat_ro flag is set, the extent root and csum root fields are getting missed.
This is because EXTENT_TREE_V2 treated these differently, and when they were split off this special-casing was mistakenly assigned to BGT rather than the rump EXTENT_TREE_V2. There's no reason why the existence of the block group tree should mean that we don't record the details of the last commit's extent root and csum root.
Fix the code in backup_super_roots() so that the correct check gets made.
--- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -1
@@ -1666,7 +1666,7 @@ static void backup_super_roots(struct btrfs_fs_info *info)btrfs_set_backup_chunk_root_level (root_backup,btrfs_header_level (info->chunk_root->node)); -if (!btrfs_fs_compat_ro (info,BLOCK_GROUP_TREE )) { +if (!btrfs_fs_incompat (info,EXTENT_TREE_V2 )) {struct btrfs_root *extent_root =btrfs_extent_root (info,0 );struct btrfs_root *csum_root =btrfs_csum_root (info,0 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 8/227 dt-bindings: power: qcom,rpmpd: Add SC8280XP_MXC_AO
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 45e1be5ddec98db71e7481fa7a3005673200d85c ]
Not sure how useful it's gonna be in practice, but the definition is missing (unlike the previously-unused SC8280XP_MXC-non-_AO), so add it to allow the driver to create the corresponding pmdomain.
--- include/dt-bindings/power/qcom,rpmhpd.h | 1 + 1 file changed, 1 insertion(+)
include/dt-bindings/power/qcom,rpmhpd.h +1 -0
@@ -261,5 +261,6 @@#define SC8280XP_NSP 13#define SC8280XP_QPHY 14#define SC8280XP_XO 15 +#define SC8280XP_MXC_AO 16#endif
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 9/227 pmdomain: qcom: rpmhpd: Add MXC to SC8280XP
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 5bc3e720e725cd5fa34875fa1e5434d565858067 ]
This was apparently accounted for in dt-bindings, but never made its way into the driver.
Fix it for SC8280XP and its VDD_GFX-less cousin, SA8540P.
--- drivers/pmdomain/qcom/rpmhpd.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/pmdomain/qcom/rpmhpd.c +4 -0
@@ -246,6 +246,8 @@ static struct rpmhpd *sa8540p_rpmhpds[] = { [SC8280XP_MMCX_AO] = &mmcx_ao, [SC8280XP_MX] = &mx, [SC8280XP_MX_AO] = &mx_ao, + [SC8280XP_MXC] = &mxc, + [SC8280XP_MXC_AO] = &mxc_ao, [SC8280XP_NSP] = &nsp, };
@@ -675,6 +677,8 @@ static struct rpmhpd *sc8280xp_rpmhpds[] = { [SC8280XP_MMCX_AO] = &mmcx_ao, [SC8280XP_MX] = &mx, [SC8280XP_MX_AO] = &mx_ao, + [SC8280XP_MXC] = &mxc, + [SC8280XP_MXC_AO] = &mxc_ao, [SC8280XP_NSP] = &nsp, [SC8280XP_QPHY] = &qphy, };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 10/227 wifi: ath12k: dont force radio frequency check in freq_to_idx()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 1fed08c5519d2f929457f354d3c06c6a8c33829c ]
freq_to_idx() is used to map a channel to a survey index. Commit acc152f9be20 ("wifi: ath12k: combine channel list for split-phy devices in single-wiphy") adds radio specific frequency range check in this helper to make sure an invalid index is returned if the channel falls outside that range. However, this check introduces a race, resulting in below warnings as reported in [1].
ath12k_pci 0000:08:00.0: chan info: invalid frequency 6455 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6535 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6615 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6695 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6775 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6855 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6935 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 7015 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 7095 (idx 101 out of bounds) ath12k_pci 0000:08:00.0: chan info: invalid frequency 6435 (idx 101 out of bounds)
Race scenario:
1) A regdomain covering below frequency range is uploaded to host via WMI_REG_CHAN_LIST_CC_EXT_EVENTID event:
Country 00, CFG Regdomain UNSET FW Regdomain 0, num_reg_rules 6
1. (2402 - 2472 @ 40) (0, 20) (0 ms) (FLAGS 360448) (0, 0)
2. (2457 - 2477 @ 20) (0, 20) (0 ms) (FLAGS 360576) (0, 0)
3. (5170 - 5330 @ 160) (0, 20) (0 ms) (FLAGS 264320) (0, 0)
4. (5490 - 5730 @ 160) (0, 20) (0 ms) (FLAGS 264320) (0, 0)
5. (5735 - 5895 @ 160) (0, 20) (0 ms) (FLAGS 264320) (0, 0)
6. (5925 - 7125 @ 320) (0, 24) (0 ms) (FLAGS 2056) (0, 255)
As a result, radio frequency range is updated as [2402, 7125]
ath12k_pci 0000:08:00.0: mac pdev 0 freq limit updated. New range 2402->7125 MHz
If no scan in progress or after scan finished, command WMI_SCAN_CHAN_LIST_CMDID is sent to firmware notifying that firmware is allowed to do scan on all channels within that range.
The running path is:
/* redomain uploaded */
1. WMI_REG_CHAN_LIST_CC_EXT_EVENTID
2. ath12k_reg_chan_list_event()
3. ath12k_reg_handle_chan_list()
4. queue_work(..., &ar->regd_update_work)
5. ath12k_regd_update_work()
6. ath12k_regd_update()
/* update radio frequency range */
7. ath12k_mac_update_freq_range()
8. regulatory_set_wiphy_regd()
9. ath12k_reg_notifier()
10. ath12k_reg_update_chan_list()
11. queue_work(..., &ar->regd_channel_update_work)
12. ath12k_regd_update_chan_list_work()
/* wait scan finishes */
13. wait_for_completion_timeout(&ar->scan.completed, ...)
/* command notifying list of valid channels */
14. ath12k_wmi_send_scan_chan_list_cmd()
2) Hardware scan is triggered on all allowed channels.
3) Before scan completed, 11D mechanism detects a new country code
ath12k_pci 0000:08:00.0: wmi 11d new cc GB
With this code sent to firmware, firmware uploads a new regdomain
Country GB, CFG Regdomain ETSI FW Regdomain 2, num_reg_rules 9
1. (2402 - 2482 @ 40) (0, 20) (0 ms) (FLAGS 360448) (0, 0)
2. (5170 - 5250 @ 80) (0, 23) (0 ms) (FLAGS 264192) (0, 0)
3. (5250 - 5330 @ 80) (0, 23) (0 ms) (FLAGS 264216) (0, 0)
4. (5490 - 5590 @ 80) (0, 30) (0 ms) (FLAGS 264208)
5. (5590 - 5650 @ 40) (0, 30) (600000 ms) (FLAGS 264208)
6. (5650 - 5730 @ 80) (0, 30) (0 ms) (FLAGS 264208)
7. (5735 - 5875 @ 80) (0, 14) (0 ms) (FLAGS 264192) (0, 0)
8. (5855 - 5875 @ 20) (0, 14) (0 ms) (FLAGS 264192) (0, 0)
9. (5945 - 6425 @ 320) (0, 24) (0 ms) (FLAGS 2056) (0, 11)
Then radio frequency range is updated as [2402, 6425]
ath12k_pci 0000:08:00.0: mac pdev 0 freq limit updated. New range 2402->6425 MHz
Please note this is a smaller range than the previous one. Later host runs the same path for the purpose of notifying the new channel list. However since scan not completed, host just waits there. Meanwhile, firmware is possibly scanning channels outside the new range. As a result, WMI_CHAN_INFO_EVENTID events for those channels fail freq_to_idx() check and triggers warnings above.
Fix this issue by removing radio frequency check in freq_to_idx(). This is valid because channels being scanned do not synchronize with frequency range update. Besides, this won't cause any problem, since freq_to_idx() is only used for survey data. Even out-of-range channels filled in the survey, they won't get delivered to userspace due to the range check already there in ath12k_mac_op_get_survey().
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3
--- drivers/net/wireless/ath/ath12k/wmi.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +1 -8
@@ -6520,16 +6520,9 @@ static int freq_to_idx(struct ath12k *ar, int freq)if (!sband)continue ; -for (ch =0 ; ch < sband->n_channels; ch++, idx++) { -if (sband->channels[ch].center_freq < -KHZ_TO_MHZ (ar->freq_range.start_freq) || - sband->channels[ch].center_freq > -KHZ_TO_MHZ (ar->freq_range.end_freq)) -continue ; - +for (ch =0 ; ch < sband->n_channels; ch++, idx++)if (sband->channels[ch].center_freq == freq) goto exit; - } } exit:
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 11/227 ata: ahci: Do not read the per port area for unimplemented ports
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit ea4d4ea6d10a561043922d285f1765c7e4bfd32a ]
An AHCI HBA specifies the number of ports it supports using CAP.NP. The HBA is free to only make a subset of the number of ports available using the PI (Ports Implemented) register.
libata currently creates dummy ports for HBA ports that are provided by the HBA, but which are marked as "unavailable" using the PI register.
Each port will have a per port area of registers in the HBA, regardless if the port is marked as "unavailable" or not.
ahci_mark_external_port() currently reads this per port area of registers using readl() to see if the port is marked as external/hotplug-capable.
However, AHCI 1.3.1, section "3.1.4 Offset 0Ch: PI – Ports Implemented"
states: "Software must not read or write to registers within unavailable ports."
Thus, make sure that we only call ahci_mark_external_port() and ahci_update_initial_lpm_policy() for ports that are implemented.
Quoted 1 line
From a libata perspective, this should not change anything related to LPM,
as dummy ports do not provide any ap->ops (they do not have a .set_lpm() callback), so even if EH were to call .set_lpm() on a dummy port, it was already a no-op.
--- drivers/ata/ahci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/ata/ahci.c +5 -5
@@ -2094,13 +2094,13 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (ap->flags &ATA_FLAG_EM ) ap->em_message_type = hpriv->em_msg_type; -ahci_mark_external_port (ap); - -ahci_update_initial_lpm_policy (ap); -/* disabled/not-implemented port */ -if (!(hpriv->port_map & (1 << i))) +if (!(hpriv->port_map & (1 << i))) { ap->ops = &ata_dummy_port_ops; + }else { +ahci_mark_external_port (ap); +ahci_update_initial_lpm_policy (ap); + } }/* apply workaround for ASUS P5W DH Deluxe mainboard */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 12/227 ata: libata: Call ata_dev_config_lpm() for ATAPI devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 8f3fb33f8f3f825c708ece800c921977c157f9b6 ]
Commit d360121832d8 ("ata: libata-core: Introduce ata_dev_config_lpm()") introduced ata_dev_config_lpm(). However, it only called this function for ATA_DEV_ATA and ATA_DEV_ZAC devices, not for ATA_DEV_ATAPI devices.
Additionally, commit d99a9142e782 ("ata: libata-core: Move device LPM quirk settings to ata_dev_config_lpm()") moved the LPM quirk application from ata_dev_configure() to ata_dev_config_lpm(), causing LPM quirks for ATAPI devices to no longer be applied.
Call ata_dev_config_lpm() also for ATAPI devices, such that LPM quirks are applied for ATAPI devices with an entry in __ata_dev_quirks once again.
--- drivers/ata/libata-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/libata-core.c +2 -0
@@ -3116,6 +3116,8 @@ int ata_dev_configure(struct ata_device *dev)ata_mode_string (xfer_mask), cdb_intr_string, atapi_an_string, dma_dir_string); + +ata_dev_config_lpm (dev); }/* determine max_sectors */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 13/227 ata: libata-sata: Improve link_power_management_supported sysfs attribute
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit ce83767ea323baf8509a75eb0c783cd203e14789 ]
The link_power_management_supported sysfs attribute is currently set as true even for ata ports that lack a .set_lpm() callback, e.g. dummy ports.
This is a bit silly, because while writing to the link_power_management_policy sysfs attribute will make ata_scsi_lpm_store() update ap->target_lpm_policy (thus sysfs will reflect the new value) and call ata_port_schedule_eh() for the port, it is essentially a no-op.
This is because for a port without a .set_lpm() callback, once EH gets to run, the ata_eh_link_set_lpm() will simply return, since the port does not provide a .set_lpm() callback.
Thus, make sure that the link_power_management_supported sysfs attribute is set to false for ports that lack a .set_lpm() callback. This way the link_power_management_policy sysfs attribute will no longer be writable, so we will no longer be misleading users to think that their sysfs write actually does something.
--- drivers/ata/libata-sata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-sata.c +1 -1
@@ -909,7 +909,7 @@ static bool ata_scsi_lpm_supported(struct ata_port *ap)struct ata_link *link;struct ata_device *dev; -if (ap->flags &ATA_FLAG_NO_LPM ) +if ((ap->flags &ATA_FLAG_NO_LPM ) || !ap->ops->set_lpm)return false;ata_for_each_link (link, ap,EDGE ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 14/227 ata: libata: Add cpr_log to ata_dev_print_features() early return
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit a6bee5e5243ad02cae575becc4c83df66fc29573 ]
ata_dev_print_features() is supposed to return early and not print anything if there are no features supported.
However, commit fe22e1c2f705 ("libata: support concurrent positioning ranges log") added another feature to ata_dev_print_features() without updating the early return conditional.
Add the missing feature to the early return conditional.
--- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-core.c +1 -1
@@ -2872,7 +2872,7 @@ static void ata_dev_config_lpm(struct ata_device *dev)static void ata_dev_print_features (struct ata_device *dev) { -if (!(dev->flags &ATA_DFLAG_FEATURES_MASK )) +if (!(dev->flags &ATA_DFLAG_FEATURES_MASK ) && !dev->cpr_log)return ; ata_dev_info(dev,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 15/227 ata: libata: Add DIPM and HIPM to ata_dev_print_features() early return
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 89531b68fc293e91187bf0992147e8d22c65cff3 ]
ata_dev_print_features() is supposed to return early and not print anything if there are no features supported.
However, commit b1f5af54f1f5 ("ata: libata-core: Advertize device support for DIPM and HIPM features") added additional features to ata_dev_print_features() without updating the early return conditional.
Add the missing features to the early return conditional.
--- drivers/ata/libata-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ata/libata-core.c +2 -1
@@ -2872,7 +2872,8 @@ static void ata_dev_config_lpm(struct ata_device *dev)static void ata_dev_print_features (struct ata_device *dev) { -if (!(dev->flags &ATA_DFLAG_FEATURES_MASK ) && !dev->cpr_log) +if (!(dev->flags &ATA_DFLAG_FEATURES_MASK ) && !dev->cpr_log && + !ata_id_has_hipm (dev->id) && !ata_id_has_dipm (dev->id))return ; ata_dev_info(dev,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 16/227 ata: libata: Print features also for ATAPI devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit c8c6fb886f57d5bf71fb6de6334a143608d35707 ]
Commit d633b8a702ab ("libata: print feature list on device scan") added a print of the features supported by the device for ATA_DEV_ATA and ATA_DEV_ZAC devices, but not for ATA_DEV_ATAPI devices.
Fix this by printing the features also for ATAPI devices.
Before changes:
ata1.00: ATAPI: Slimtype DVD A DU8AESH, 6C2M, max UDMA/133
After changes:
ata1.00: ATAPI: Slimtype DVD A DU8AESH, 6C2M, max UDMA/133 ata1.00: Features: Dev-Attention HIPM DIPM
--- drivers/ata/libata-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libata-core.c +3 -0
@@ -3119,6 +3119,9 @@ int ata_dev_configure(struct ata_device *dev) dma_dir_string);ata_dev_config_lpm (dev); + +if (print_info) +ata_dev_print_features (dev); }/* determine max_sectors */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 17/227 wifi: ath12k: cancel scan only on active scan vdev
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Dharanenthiran <[email protected]>
[ Upstream commit 39c90b1a1dbe6d7c49d19da6e5aec00980c55d8b ]
Cancel the scheduled scan request only on the vdev that has an active scan running. Currently, ahvif->links_map is used to obtain the links, but this includes links for which no scan is scheduled. In failure cases where the scan fails due to an invalid channel definition, other links which are not yet brought up (vdev not created) may also be accessed, leading to the following trace:
Unable to handle kernel paging request at virtual address 0000000000004c8c pc : _raw_spin_lock_bh+0x1c/0x54 lr : ath12k_scan_abort+0x20/0xc8 [ath12k] Call trace: _raw_spin_lock_bh+0x1c/0x54 (P) ath12k_mac_op_cancel_hw_scan+0xac/0xc4 [ath12k] ieee80211_scan_cancel+0xcc/0x12c [mac80211] ieee80211_do_stop+0x6c4/0x7a8 [mac80211] ieee80211_stop+0x60/0xd8 [mac80211]
Skip links that are not created or are not the current scan vdev. This ensures only the scan for the matching links is aborted and avoids aborting unrelated links during cancellation, thus aligning with how start/cleanup manage ar->scan.arvif.
Also, remove the redundant arvif->is_started check from ath12k_mac_op_cancel_hw_scan() that was introduced in commit 3863f014ad23 ("wifi: ath12k: symmetrize scan vdev creation and deletion during HW scan") to avoid deleting the scan interface if the scan is triggered on the existing AP vdev as this use case is already handled in ath12k_scan_vdev_clean_work().
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -1
@@ -5254,7 +5254,8 @@ static void ath12k_mac_op_cancel_hw_scan(struct ieee80211_hw *hw,for_each_set_bit (link_id, &links_map,ATH12K_NUM_MAX_LINKS ) { arvif =wiphy_dereference (hw->wiphy, ahvif->link[link_id]); -if (!arvif || arvif->is_started) +if (!arvif || !arvif->is_created || + arvif->ar->scan.arvif != arvif)continue ; ar = arvif->ar;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 18/227 wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yingying Tang <[email protected]>
[ Upstream commit 8b8d6ee53dfdee61b0beff66afe3f712456e707a ]
Scan finish workqueue was introduced in __ath12k_mac_scan_finish() by [1].
During ath12k_mac_op_cancel_remain_on_channel(), scan state is set to ABORTING and should be reset to IDLE in the queued work. However, wiphy_work_cancel() is called before exiting ath12k_mac_op_cancel_remain_on_channel(), which prevents the work from running and leaves the state in ABORTING. This blocks all subsequent scan requests.
Replace wiphy_work_cancel() with wiphy_work_flush() to ensure the queued work runs and scan state is reset to IDLE.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3
--- drivers/net/wireless/ath/ath12k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/mac.c +1 -1
@@ -12833,7 +12833,7 @@ static int ath12k_mac_op_cancel_remain_on_channel(struct ieee80211_hw *hw,ath12k_scan_abort (ar);cancel_delayed_work_sync (&ar->scan.timeout); -wiphy_work_cancel (hw->wiphy, &ar->scan.vdev_clean_wk); +wiphy_work_flush (hw->wiphy, &ar->scan.vdev_clean_wk);return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 19/227 wifi: ath12k: fix dead lock while flushing management frames
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit f88e9fc30a261d63946ddc6cc6a33405e6aa27c3 ]
Commit [1] converted the management transmission work item into a wiphy work. Since a wiphy work can only run under wiphy lock protection, a race condition happens in below scenario:
1. a management frame is queued for transmission.
2. ath12k_mac_op_flush() gets called to flush pending frames associated with the hardware (i.e, vif being NULL). Then in ath12k_mac_flush() the process waits for the transmission done.
3. Since wiphy lock has been taken by the flush process, the transmission work item has no chance to run, hence the dead lock.
Quoted 1 line
From user view, this dead lock results in below issue:
wlp8s0: authenticate with xxxxxx (local address=xxxxxx)
wlp8s0: send auth to xxxxxx (try 1/3)
wlp8s0: authenticate with xxxxxx (local address=xxxxxx)
wlp8s0: send auth to xxxxxx (try 1/3)
wlp8s0: authenticated
wlp8s0: associate with xxxxxx (try 1/3)
wlp8s0: aborting association with xxxxxx by local choice (Reason: 3=DEAUTH_LEAVING) ath12k_pci 0000:08:00.0: failed to flush mgmt transmit queue, mgmt pkts pending 1
The dead lock can be avoided by invoking wiphy_work_flush() to proactively run the queued work item. Note actually it is already present in ath12k_mac_op_flush(), however it does not protect the case where vif being NULL. Hence move it ahead to cover this case as well.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3
--- drivers/net/wireless/ath/ath12k/mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +3 -3
@@ -11798,6 +11798,9 @@ static void ath12k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif (drop)return ; +for_each_ar (ah, ar, i) +wiphy_work_flush (hw->wiphy, &ar->wmi_mgmt_tx_work); +/* vif can be NULL when flush() is considered for hw */ if (!vif) {for_each_ar (ah, ar, i)
@@ -11805,9 +11808,6 @@ static void ath12k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vreturn ; } -for_each_ar (ah, ar, i) -wiphy_work_flush (hw->wiphy, &ar->wmi_mgmt_tx_work); - ahvif =ath12k_vif_to_ahvif (vif); links = ahvif->links_map;for_each_set_bit (link_id, &links,IEEE80211_MLD_MAX_NUM_LINKS ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 20/227 wifi: ath12k: Fix wrong P2P device link id issue
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yingying Tang <[email protected]>
[ Upstream commit 31707572108da55a005e7fed32cc3869c16b7c16 ]
Wrong P2P device link id value of 0 was introduced in ath12k_mac_op_tx() by [1].
During the P2P negotiation process, there is only one scan vdev with link ID 15. Currently, the device link ID is incorrectly set to 0 in ath12k_mac_op_tx() during the P2P negotiation process, which leads to TX failures.
Set the correct P2P device link ID to 15 to fix the TX failure issue.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3
---
Note to linux-next and netdev maintainers:
This patch going through the "current" tree conflicts with the following going through the "next" tree:
commit 631ee338f04d ("Merge branch 'ath12k-ng' into ath-next")
The conflict resolution is to leave the following file unmodified:drivers/net/wireless/ath/ath12k/mac.
And to apply the following patch to ath12k_wifi7_mac_op_tx() in the file drivers/net/wireless/ath/ath12k/wifi7/hw.c -705,7 +705,10
return;
}
} else {
- link_id = 0;
+ if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
+ link_id = ATH12K_FIRST_SCAN_LINK;
+ else
+ link_id = 0;
}
arvif = rcu_dereference(ahvif->link[link_id]);
--- drivers/net/wireless/ath/ath12k/mac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/mac.c +4 -1
@@ -8840,7 +8840,10 @@ static void ath12k_mac_op_tx(struct ieee80211_hw *hw,return ; } }else { - link_id =0 ; +if (vif->type ==NL80211_IFTYPE_P2P_DEVICE ) + link_id =ATH12K_FIRST_SCAN_LINK ; +else + link_id =0 ; } arvif =rcu_dereference (ahvif->link[link_id]);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 21/227 ice: initialize ring_stats->syncp
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit 8439016c3b8b5ab687c2420317b1691585106611 ]
The u64_stats_sync structure is empty on 64-bit systems. However, on 32-bit systems it contains a seqcount_t which needs to be initialized. While the memory is zero-initialized, a lack of u64_stats_init means that lockdep won't get initialized properly. Fix this by adding u64_stats_init() calls to the rings just after allocation.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/ice/ice_lib.c +4 -0
@@ -398,6 +398,8 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)if (!ring_stats) goto err_out; +u64_stats_init (&ring_stats->syncp); +WRITE_ONCE (tx_ring_stats[i], ring_stats); }
@@ -417,6 +419,8 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)if (!ring_stats) goto err_out; +u64_stats_init (&ring_stats->syncp); +WRITE_ONCE (rx_ring_stats[i], ring_stats); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 22/227 ice: Avoid detrimental cleanup for bond during interface stop
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Ertman <[email protected]>
[ Upstream commit a9d45c22ed120cdd15ff56d0a6e4700c46451901 ]
When the user issues an administrative down to an interface that is the primary for an aggregate bond, the prune lists are being purged. This breaks communication to the secondary interface, which shares a prune list on the main switch block while bonded together.
For the primary interface of an aggregate, avoid deleting these prune lists during stop, and since they are hardcoded to specific values for the default vlan and QinQ vlans, the attempt to re-add them during the up phase will quietly fail without any additional problem.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ice/ice_lib.c +17 -8
@@ -3810,22 +3810,31 @@ int ice_vsi_add_vlan_zero(struct ice_vsi *vsi)int ice_vsi_del_vlan_zero (struct ice_vsi *vsi) {struct ice_vsi_vlan_ops *vlan_ops =ice_get_compat_vsi_vlan_ops (vsi); +struct ice_pf *pf = vsi->back;struct ice_vlan vlan;int err; - vlan =ICE_VLAN (0 ,0 ,0 ); - err = vlan_ops->del_vlan (vsi, &vlan); -if (err && err != -EEXIST ) -return err; +if (pf->lag && pf->lag->primary) { +dev_dbg (ice_pf_to_dev (pf),"Interface is primary in aggregate - not deleting prune list\n" ); + }else { + vlan =ICE_VLAN (0 ,0 ,0 ); + err = vlan_ops->del_vlan (vsi, &vlan); +if (err && err != -EEXIST ) +return err; + }/* in SVM both VLAN 0 filters are identical */ if (!ice_is_dvm_ena (&vsi->back->hw))return 0 ; - vlan =ICE_VLAN (ETH_P_8021Q ,0 ,0 ); - err = vlan_ops->del_vlan (vsi, &vlan); -if (err && err != -EEXIST ) -return err; +if (pf->lag && pf->lag->primary) { +dev_dbg (ice_pf_to_dev (pf),"Interface is primary in aggregate - not deleting QinQ prune list\n" ); + }else { + vlan =ICE_VLAN (ETH_P_8021Q ,0 ,0 ); + err = vlan_ops->del_vlan (vsi, &vlan); +if (err && err != -EEXIST ) +return err; + }/* when deleting the last VLAN filter, make sure to disable the VLAN * promisc mode so the filter isn't left by accident
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 23/227 ice: Fix incorrect timeout ice_release_res()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ding Hui <[email protected]>
[ Upstream commit 01139a2ce532d77379e1593230127caa261a8036 ]
The commit 5f6df173f92e ("ice: implement and use rd32_poll_timeout for ice_sq_done timeout") converted ICE_CTL_Q_SQ_CMD_TIMEOUT from jiffies to microseconds.
But the ice_release_res() function was missed, and its logic still treats ICE_CTL_Q_SQ_CMD_TIMEOUT as a jiffies value.
So correct the issue by usecs_to_jiffies().
Found by inspection of the DDP downloading process. Compile and modprobe tested only.
--- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_common.c +1 -1
@@ -2251,7 +2251,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)/* there are some rare cases when trying to release the resource * results in an admin queue timeout, so handle them correctly */ - timeout = jiffies +10 *ICE_CTL_Q_SQ_CMD_TIMEOUT ; + timeout = jiffies +10 *usecs_to_jiffies (ICE_CTL_Q_SQ_CMD_TIMEOUT ); do { status = ice_aq_release_res(hw, res, 0, NULL); if (status != -EIO)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 24/227 igc: Restore default Qbv schedule when changing channels
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Kanzenbach <[email protected]>
[ Upstream commit 41a9a6826f20a524242a6c984845c4855f629841 ]
The Multi-queue Priority (MQPRIO) and Earliest TxTime First (ETF) offloads utilize the Time Sensitive Networking (TSN) Tx mode. This mode is always coupled to IEEE 802.1Qbv time aware shaper (Qbv). Therefore, the driver sets a default Qbv schedule of all gates opened and a cycle time of 1s. This schedule is set during probe.
However, the following sequence of events lead to Tx issues:
- Boot a dual core system
igc_probe():
igc_tsn_clear_schedule():
-> Default Schedule is set
Note: At this point the driver has allocated two Tx/Rx queues, because there are only two CPUs.
- ethtool -L enp3s0 combined 4
igc_ethtool_set_channels():
igc_reinit_queues()
-> Default schedule is gone, per Tx ring start and end time are zero- tc qdisc replace dev enp3s0 handle 100 parent root mqprio \
num_tc 4 map 3 3 2 2 0 1 1 1 3 3 3 3 3 3 3 3 \
queues 1@0 1@1 1@2 1@3 hw 1
igc_tsn_offload_apply():
igc_tsn_enable_offload():
-> Writes zeros to IGC_STQT(i) and IGC_ENDQT(i), causing Tx to stall/failTherefore, restore the default Qbv schedule after changing the number of channels.
Furthermore, add a restriction to not allow queue reconfiguration when TSN/Qbv is enabled, because it may lead to inconsistent states.
--- drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 ++-- drivers/net/ethernet/intel/igc/igc_main.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc_ethtool.c +2 -2
@@ -1561,8 +1561,8 @@ static int igc_ethtool_set_channels(struct net_device *netdev,if (ch->other_count !=NON_Q_VECTORS )return -EINVAL ; -/* Do not allow channel reconfiguration when mqprio is enabled */ -if (adapter->strict_priority_enable) +/* Do not allow channel reconfiguration when any TSN qdisc is enabled */ +if (adapter->flags &IGC_FLAG_TSN_ANY_ENABLED )return -EINVAL ;/* Verify the number of channels doesn't exceed hw limits */
drivers/net/ethernet/intel/igc/igc_main.c +5 -0
@@ -7761,6 +7761,11 @@ int igc_reinit_queues(struct igc_adapter *adapter)if (netif_running (netdev)) err =igc_open (netdev); +if (!err) { +/* Restore default IEEE 802.1Qbv schedule after queue reinit */ +igc_tsn_clear_schedule (adapter); + } +return err; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 25/227 igc: fix race condition in TX timestamp read for register 0
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chwee-Lin Choong <[email protected]>
[ Upstream commit 6990dc392a9ab10e52af37e0bee8c7b753756dc4 ]
The current HW bug workaround checks the TXTT_0 ready bit first, then reads TXSTMPL_0 twice (before and after reading TXSTMPH_0) to detect whether a new timestamp was captured by timestamp register 0 during the workaround.
This sequence has a race: if a new timestamp is captured after checking the TXTT_0 bit but before the first TXSTMPL_0 read, the detection fails because both the "old" and "new" values come from the same timestamp.
Fix by reading TXSTMPL_0 first to establish a baseline, then checking the TXTT_0 bit. This ensures any timestamp captured during the race window will be detected.
Old sequence:
1. Check TXTT_0 ready bit
2. Read TXSTMPL_0 (baseline)
3. Read TXSTMPH_0 (interrupt workaround)
4. Read TXSTMPL_0 (detect changes vs baseline)
New sequence:
1. Read TXSTMPL_0 (baseline)
2. Check TXTT_0 ready bit
3. Read TXSTMPH_0 (interrupt workaround)
4. Read TXSTMPL_0 (detect changes vs baseline)
--- drivers/net/ethernet/intel/igc/igc_ptp.c | 43 ++++++++++++++---------- 1 file changed, 25 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/igc/igc_ptp.c +25 -18
@@ -774,36 +774,43 @@ static void igc_ptp_tx_reg_to_stamp(struct igc_adapter *adapter,static void igc_ptp_tx_hwtstamp (struct igc_adapter *adapter) {struct igc_hw *hw = &adapter->hw; +u32 txstmpl_old;u64 regval;u32 mask;int i; +/* Establish baseline of TXSTMPL_0 before checking TXTT_0. +* This baseline is used to detect if a new timestamp arrives in +* register 0 during the hardware bug workaround below. +*/ + txstmpl_old =rd32 (IGC_TXSTMPL ); + mask =rd32 (IGC_TSYNCTXCTL ) &IGC_TSYNCTXCTL_TXTT_ANY ;if (mask &IGC_TSYNCTXCTL_TXTT_0 ) { regval =rd32 (IGC_TXSTMPL ); regval |= (u64 )rd32 (IGC_TXSTMPH ) <<32 ; }else { -/* There's a bug in the hardware that could cause -* missing interrupts for TX timestamping. The issue -* is that for new interrupts to be triggered, the -* IGC_TXSTMPH_0 register must be read. +/* TXTT_0 not set - register 0 has no new timestamp initially. +* +* Hardware bug: Future timestamp interrupts won't fire unless +* TXSTMPH_0 is read, even if the timestamp was captured in +* registers 1-3. * -* To avoid discarding a valid timestamp that just -* happened at the "wrong" time, we need to confirm -* that there was no timestamp captured, we do that by -* assuming that no two timestamps in sequence have -* the same nanosecond value. +* Workaround: Read TXSTMPH_0 here to enable future interrupts. +* However, this read clears TXTT_0. If a timestamp arrives in +* register 0 after checking TXTT_0 but before this read, it +* would be lost. * -* So, we read the "low" register, read the "high" -* register (to latch a new timestamp) and read the -* "low" register again, if "old" and "new" versions -* of the "low" register are different, a valid -* timestamp was captured, we can read the "high" -* register again. +* To detect this race: We saved a baseline read of TXSTMPL_0 +* before TXTT_0 check. After performing the workaround read of +* TXSTMPH_0, we read TXSTMPL_0 again. Since consecutive +* timestamps never share the same nanosecond value, a change +* between the baseline and new TXSTMPL_0 indicates a timestamp +* arrived during the race window. If so, read the complete +* timestamp. */ -u32 txstmpl_old, txstmpl_new; +u32 txstmpl_new; - txstmpl_old =rd32 (IGC_TXSTMPL );rd32 (IGC_TXSTMPH ); txstmpl_new =rd32 (IGC_TXSTMPL );
@@ -818,7 +825,7 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter) done:/* Now that the problematic first register was handled, we can -* use retrieve the timestamps from the other registers +* retrieve the timestamps from the other registers * (starting from '1') with less complications. */ for (i =1 ; i <IGC_MAX_TX_TSTAMP_REGS ; i++) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 26/227 igc: Reduce TSN TX packet buffer from 7KB to 5KB per queue
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chwee-Lin Choong <[email protected]>
[ Upstream commit 8ad1b6c1e63d25f5465b7a8aa403bdcee84b86f9 ]
The previous 7 KB per queue caused TX unit hangs under heavy timestamping load. Reducing to 5 KB avoids these hangs and matches the TSN recommendation in I225/I226 SW User Manual Section 7.5.4.
The 8 KB "freed" by this change is currently unused. This reduction is not expected to impact throughput, as the i226 is PCIe-limited for small TSN packets rather than TX-buffer-limited.
--- drivers/net/ethernet/intel/igc/igc_defines.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc_defines.h +3 -2
@@ -443,9 +443,10 @@#define IGC_TXPBSIZE_DEFAULT ( \ IGC_TXPB0SIZE(20) | IGC_TXPB1SIZE(0) | IGC_TXPB2SIZE(0) | \ IGC_TXPB3SIZE(0) | IGC_OS2BMCPBSIZE(4)) +/* TSN value following I225/I226 SW User Manual Section 7.5.4 */ #define IGC_TXPBSIZE_TSN ( \ - IGC_TXPB0SIZE(7) | IGC_TXPB1SIZE(7) | IGC_TXPB2SIZE(7) | \ - IGC_TXPB3SIZE(7) | IGC_OS2BMCPBSIZE(4)) + IGC_TXPB0SIZE(5) | IGC_TXPB1SIZE(5) | IGC_TXPB2SIZE(5) | \ + IGC_TXPB3SIZE(5) | IGC_OS2BMCPBSIZE(4))#define IGC_DTXMXPKTSZ_TSN 0x19/* 1600 bytes of max TX DMA packet size */ #define IGC_DTXMXPKTSZ_DEFAULT 0x98/* 9728-byte Jumbo frames */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 27/227 vsock/virtio: Coalesce only linear skb
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit 0386bd321d0f95d041a7b3d7b07643411b044a96 ]
vsock/virtio common tries to coalesce buffers in rx queue: if a linear skb (with a spare tail room) is followed by a small skb (length limited by GOOD_COPY_LEN = 128), an attempt is made to join them.
Since the introduction of MSG_ZEROCOPY support, assumption that a small skb will always be linear is incorrect. In the zerocopy case, data is lost and the linear skb is appended with uninitialized kernel memory.
Of all 3 supported virtio-based transports, only loopback-transport is affected. G2H virtio-transport rx queue operates on explicitly linear skbs; see virtio_vsock_alloc_linear_skb() in virtio_vsock_rx_fill(). H2G vhost-transport may allocate non-linear skbs, but only for sizes that are not considered for coalescence; see PAGE_ALLOC_COSTLY_ORDER in virtio_vsock_alloc_skb().
Ensure only linear skbs are coalesced. Note that skb_tailroom(last_skb) > 0 guarantees last_skb is linear.
--- net/vmw_vsock/virtio_transport_common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/vmw_vsock/virtio_transport_common.c +4 -2
@@ -1359,9 +1359,11 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,/* Try to copy small packets into the buffer of last packet queued, * to avoid wasting memory queueing the entire buffer with a small -* payload. +* payload. Skip non-linear (e.g. zerocopy) skbs; these carry payload +* in skb_shinfo. */ -if (len <=GOOD_COPY_LEN && !skb_queue_empty (&vvs->rx_queue)) { +if (len <=GOOD_COPY_LEN && !skb_queue_empty (&vvs->rx_queue) && + !skb_is_nonlinear (skb)) {struct virtio_vsock_hdr *last_hdr;struct sk_buff *last_skb;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 28/227 net: usb: dm9601: remove broken SR9700 support
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Nelson-Moore <[email protected]>
[ Upstream commit 7d7dbafefbe74f5a25efc4807af093b857a7612e ]
The SR9700 chip sends more than one packet in a USB transaction, like the DM962x chips can optionally do, but the dm9601 driver does not support this mode, and the hardware does not have the DM962x MODE_CTL register to disable it, so this driver drops packets on SR9700 devices. The sr9700 driver correctly handles receiving more than one packet per transaction.
While the dm9601 driver could be improved to handle this, the easiest way to fix this issue in the short term is to remove the SR9700 device ID from the dm9601 driver so the sr9700 driver is always used. This device ID should not have been in more than one driver to begin with.
The "Fixes" commit was chosen so that the patch is automatically included in all kernels that have the sr9700 driver, even though the issue affects dm9601.
--- drivers/net/usb/dm9601.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/usb/dm9601.c +0 -4
@@ -603,10 +603,6 @@ static const struct usb_device_id products[] = { USB_DEVICE(0x0fe6, 0x8101), /* DM9601 USB to Fast Ethernet Adapter */ .driver_info = (unsigned long )&dm9601_info, }, - { -USB_DEVICE (0x0fe6 ,0x9700 ),/* DM9601 USB to Fast Ethernet Adapter */ - .driver_info = (unsigned long)&dm9601_info, - }, {USB_DEVICE (0x0a46 ,0x9000 ),/* DM9000E */ .driver_info = (unsigned long)&dm9601_info,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 29/227 bonding: limit BOND_MODE_8023AD to Ethernet devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit c84fcb79e5dbde0b8d5aeeaf04282d2149aebcf6 ]
BOND_MODE_8023AD makes sense for ARPHRD_ETHER only.
syzbot reported:
BUG: KASAN: global-out-of-bounds in __hw_addr_create net/core/dev_addr_lists.c:63 [inline] BUG: KASAN: global-out-of-bounds in __hw_addr_add_ex+0x25d/0x760 net/core/dev_addr_lists.c:118 Read of size 16 at addr ffffffff8bf94040 by task syz.1.3580/19497 CPU: 1 UID: 0 PID: 19497 Comm: syz.1.3580 Tainted: G L syzkaller #0 PREEMPT(full) Tainted: [L]=SOFTLOCKUP Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/25/2025 Call Trace: <TASK> dump_stack_lvl+0xe8/0x150 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xca/0x240 mm/kasan/report.c:482 kasan_report+0x118/0x150 mm/kasan/report.c:595 check_region_inline mm/kasan/generic.c:-1 [inline] kasan_check_range+0x2b0/0x2c0 mm/kasan/generic.c:200 __asan_memcpy+0x29/0x70 mm/kasan/shadow.c:105 __hw_addr_create net/core/dev_addr_lists.c:63 [inline] __hw_addr_add_ex+0x25d/0x760 net/core/dev_addr_lists.c:118 __dev_mc_add net/core/dev_addr_lists.c:868 [inline] dev_mc_add+0xa1/0x120 net/core/dev_addr_lists.c:886 bond_enslave+0x2b8b/0x3ac0 drivers/net/bonding/bond_main.c:2180 do_set_master+0x533/0x6d0 net/core/rtnetlink.c:2963 do_setlink+0xcf0/0x41c0 net/core/rtnetlink.c:3165 rtnl_changelink net/core/rtnetlink.c:3776 [inline] __rtnl_newlink net/core/rtnetlink.c:3935 [inline] rtnl_newlink+0x161c/0x1c90 net/core/rtnetlink.c:4072 rtnetlink_rcv_msg+0x7cf/0xb70 net/core/rtnetlink.c:6958 netlink_rcv_skb+0x208/0x470 net/netlink/af_netlink.c:2550 netlink_unicast_kernel net/netlink/af_netlink.c:1318 [inline] netlink_unicast+0x82f/0x9e0 net/netlink/af_netlink.c:1344 netlink_sendmsg+0x805/0xb30 net/netlink/af_netlink.c:1894 sock_sendmsg_nosec net/socket.c:727 [inline] __sock_sendmsg+0x21c/0x270 net/socket.c:742 ____sys_sendmsg+0x505/0x820 net/socket.c:2592 ___sys_sendmsg+0x21f/0x2a0 net/socket.c:2646 __sys_sendmsg+0x164/0x220 net/socket.c:2678 do_syscall_32_irqs_on arch/x86/entry/syscall_32.c:83 [inline] __do_fast_syscall_32+0x1dc/0x560 arch/x86/entry/syscall_32.c:307 do_fast_syscall_32+0x34/0x80 arch/x86/entry/syscall_32.c:332 entry_SYSENTER_compat_after_hwframe+0x84/0x8e </TASK> The buggy address belongs to the variable: lacpdu_mcast_addr+0x0/0x40
--- drivers/net/bonding/bond_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/bonding/bond_main.c +6 -0
@@ -1953,6 +1953,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,*/ if (!bond_has_slaves (bond)) {if (bond_dev->type != slave_dev->type) { +if (slave_dev->type !=ARPHRD_ETHER && +BOND_MODE (bond) ==BOND_MODE_8023AD ) { +SLAVE_NL_ERR (bond_dev, slave_dev, extack, +"8023AD mode requires Ethernet devices" ); +return -EINVAL ; + }slave_dbg (bond_dev, slave_dev,"change device type from %d to %d\n" , bond_dev->type, slave_dev->type);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 30/227 l2tp: Fix memleak in l2tp_udp_encap_recv().
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 4d10edfd1475b69dbd4c47f34b61a3772ece83ca ]
syzbot reported memleak of struct l2tp_session, l2tp_tunnel, sock, etc. [0]
The cited commit moved down the validation of the protocol version in l2tp_udp_encap_recv().
The new place requires an extra error handling to avoid the memleak.
Let's call l2tp_session_put() there.
[0]:
BUG: memory leak
unreferenced object 0xffff88810a290200 (size 512):
comm "syz.0.17", pid 6086, jiffies 4294944299
hex dump (first 32 bytes):
7d eb 04 0c 00 00 00 00 01 00 00 00 00 00 00 00 }...............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace (crc babb6a4f):
kmemleak_alloc_recursive include/linux/kmemleak.h:44 [inline]
slab_post_alloc_hook mm/slub.c:4958 [inline]
slab_alloc_node mm/slub.c:5263 [inline]
__do_kmalloc_node mm/slub.c:5656 [inline]
__kmalloc_noprof+0x3e0/0x660 mm/slub.c:5669
kmalloc_noprof include/linux/slab.h:961 [inline]
kzalloc_noprof include/linux/slab.h:1094 [inline]
l2tp_session_create+0x3a/0x3b0 net/l2tp/l2tp_core.c:1778
pppol2tp_connect+0x48b/0x920 net/l2tp/l2tp_ppp.c:755
__sys_connect_file+0x7a/0xb0 net/socket.c:2089
__sys_connect+0xde/0x110 net/socket.c:2108
__do_sys_connect net/socket.c:2114 [inline]
__se_sys_connect net/socket.c:2111 [inline]
__x64_sys_connect+0x1c/0x30 net/socket.c:2111
do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline]
do_syscall_64+0xa4/0xf80 arch/x86/entry/syscall_64.c:94
entry_SYSCALL_64_after_hwframe+0x77/0x7f--- net/l2tp/l2tp_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/l2tp/l2tp_core.c +3 -1
@@ -1086,8 +1086,10 @@ int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) tunnel = session->tunnel;/* Check protocol version */ -if (version != tunnel->version) +if (version != tunnel->version) { +l2tp_session_put (session); goto invalid; + }if (version ==L2TP_HDR_VER_3 &&l2tp_v3_ensure_opt_in_linear (session, skb, &ptr, &optr)) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 31/227 selftests: net: fib-onlink-tests: Convert to use namespaces by default
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo B. Marlière <[email protected]>
[ Upstream commit 4f5f148dd7c0459229d2ab9a769b2e820f9ee6a2 ]
Currently, the test breaks if the SUT already has a default route configured for IPv6. Fix by avoiding the use of the default namespace.
--- .../testing/selftests/net/fib-onlink-tests.sh | 71 ++++++++----------- 1 file changed, 30 insertions(+), 41 deletions(-)
tools/testing/selftests/net/fib-onlink-tests.sh +30 -41
@@ -120,7 +120,7 @@ log_subsection() run_cmd() { - local cmd="$*" + local cmd="$1" local out local rc
@@ -145,7 +145,7 @@ get_linklocal() local pfx local addr - addr=$(${pfx} ip -6 -br addr show dev ${dev} | \ + addr=$(${pfx} ${IP} -6 -br addr show dev ${dev} | \ awk '{ for (i = 3; i <= NF; ++i) { if ($i ~ /^fe80/)
@@ -173,58 +173,48 @@ setup() set -e - # create namespace - setup_ns PEER_NS + # create namespaces + setup_ns ns1 + IP="ip -netns $ns1" + setup_ns ns2 # add vrf table - ip li add ${VRF} type vrf table ${VRF_TABLE} - ip li set ${VRF} up - ip ro add table ${VRF_TABLE} unreachable default metric 8192 - ip -6 ro add table ${VRF_TABLE} unreachable default metric 8192 + ${IP} li add ${VRF} type vrf table ${VRF_TABLE} + ${IP} li set ${VRF} up + ${IP} ro add table ${VRF_TABLE} unreachable default metric 8192 + ${IP} -6 ro add table ${VRF_TABLE} unreachable default metric 8192 # create test interfaces - ip li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} - ip li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} - ip li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} - ip li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} + ${IP} li add ${NETIFS[p1]} type veth peer name ${NETIFS[p2]} + ${IP} li add ${NETIFS[p3]} type veth peer name ${NETIFS[p4]} + ${IP} li add ${NETIFS[p5]} type veth peer name ${NETIFS[p6]} + ${IP} li add ${NETIFS[p7]} type veth peer name ${NETIFS[p8]} # enslave vrf interfaces for n in 5 7; do - ip li set ${NETIFS[p${n}]} vrf ${VRF} + ${IP} li set ${NETIFS[p${n}]} vrf ${VRF} done # add addresses for n in 1 3 5 7; do - ip li set ${NETIFS[p${n}]} up - ip addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} - ip addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad + ${IP} li set ${NETIFS[p${n}]} up + ${IP} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} + ${IP} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad done # move peer interfaces to namespace and add addresses for n in 2 4 6 8; do - ip li set ${NETIFS[p${n}]} netns ${PEER_NS} up - ip -netns ${PEER_NS} addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} - ip -netns ${PEER_NS} addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad + ${IP} li set ${NETIFS[p${n}]} netns ${ns2} up + ip -netns $ns2 addr add ${V4ADDRS[p${n}]}/24 dev ${NETIFS[p${n}]} + ip -netns $ns2 addr add ${V6ADDRS[p${n}]}/64 dev ${NETIFS[p${n}]} nodad done - ip -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} - ip -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} + ${IP} -6 ro add default via ${V6ADDRS[p3]/::[0-9]/::64} + ${IP} -6 ro add table ${VRF_TABLE} default via ${V6ADDRS[p7]/::[0-9]/::64} set +e } -cleanup() -{ - # make sure we start from a clean slate - cleanup_ns ${PEER_NS} 2>/dev/null - for n in 1 3 5 7; do - ip link del ${NETIFS[p${n}]} 2>/dev/null - done - ip link del ${VRF} 2>/dev/null - ip ro flush table ${VRF_TABLE} - ip -6 ro flush table ${VRF_TABLE} -} - ################################################################################ # IPv4 tests #
@@ -241,7 +231,7 @@ run_ip() # dev arg may be empty [ -n "${dev}" ] && dev="dev ${dev}" - run_cmd ip ro add table "${table}" "${prefix}"/32 via "${gw}" "${dev}" onlink + run_cmd "${IP} ro add table ${table} ${prefix}/32 via ${gw} ${dev} onlink" log_test $? ${exp_rc} "${desc}" }
@@ -257,8 +247,8 @@ run_ip_mpath() # dev arg may be empty [ -n "${dev}" ] && dev="dev ${dev}" - run_cmd ip ro add table "${table}" "${prefix}"/32 \ - nexthop via ${nh1} nexthop via ${nh2} + run_cmd "${IP} ro add table ${table} ${prefix}/32 \ + nexthop via ${nh1} nexthop via ${nh2}" log_test $? ${exp_rc} "${desc}" }
@@ -339,7 +329,7 @@ run_ip6() # dev arg may be empty [ -n "${dev}" ] && dev="dev ${dev}" - run_cmd ip -6 ro add table "${table}" "${prefix}"/128 via "${gw}" "${dev}" onlink + run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 via ${gw} ${dev} onlink" log_test $? ${exp_rc} "${desc}" }
@@ -353,8 +343,8 @@ run_ip6_mpath() local exp_rc="$6" local desc="$7" - run_cmd ip -6 ro add table "${table}" "${prefix}"/128 "${opts}" \ - nexthop via ${nh1} nexthop via ${nh2} + run_cmd "${IP} -6 ro add table ${table} ${prefix}/128 ${opts} \ + nexthop via ${nh1} nexthop via ${nh2}" log_test $? ${exp_rc} "${desc}" }
@@ -491,10 +481,9 @@ do esac done -cleanup setup run_onlink_tests -cleanup +cleanup_ns ${ns1} ${ns2} if [ "$TESTS" != "none" ]; then printf "\nTests passed: %3d\n" ${nsuccess}
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 32/227 net: freescale: ucc_geth: Return early when TBI PHY cant be found
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Chevallier <[email protected]>
[ Upstream commit a74c7a58ca2ca1cbb93f4c01421cf24b8642b962 ]
In ucc_geth's .mac_config(), we configure the TBI Serdes block represented by a struct phy_device that we get from firmware.
While porting to phylink, a check was missed to make sure we don't try to access the TBI PHY if we can't get it. Let's add it and return early in case of error
--- drivers/net/ethernet/freescale/ucc_geth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/ucc_geth.c +3 -1
@@ -1602,8 +1602,10 @@ static void ugeth_mac_config(struct phylink_config *config, unsigned int mode,pr_warn ("TBI mode requires that the device tree specify a tbi-handle\n" ); tbiphy =of_phy_find_device (ug_info->tbi_node); -if (!tbiphy) +if (!tbiphy) {pr_warn ("Could not get TBI device\n" ); +return ; + } value =phy_read (tbiphy,ENET_TBI_MII_CR ); value &= ~0x1000 ;/* Turn off autonegotiation */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 33/227 can: gs_usb: gs_usb_receive_bulk_callback(): unanchor URL on usb_submit_urb() error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Kleine-Budde <[email protected]>
[ Upstream commit 79a6d1bfe1148bc921b8d7f3371a7fbce44e30f7 ]
In commit 7352e1d5932a ("can: gs_usb: gs_usb_receive_bulk_callback(): fix URB memory leak"), the URB was re-anchored before usb_submit_urb() in gs_usb_receive_bulk_callback() to prevent a leak of this URB during cleanup.
However, this patch did not take into account that usb_submit_urb() could fail. The URB remains anchored and usb_kill_anchored_urbs(&parent->rx_submitted) in gs_can_close() loops infinitely since the anchor list never becomes empty.
To fix the bug, unanchor the URB when an usb_submit_urb() error occurs, also print an info message.
--- drivers/net/can/usb/gs_usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/can/usb/gs_usb.c +7 -0
@@ -754,6 +754,10 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)usb_anchor_urb (urb, &parent->rx_submitted); rc =usb_submit_urb (urb,GFP_ATOMIC ); +if (!rc) +return ; + +usb_unanchor_urb (urb);/* USB failure take down all interfaces */ if (rc == -ENODEV ) {
@@ -762,6 +766,9 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)if (parent->canch[rc])netif_device_detach (parent->canch[rc]->netdev); } + }else if (rc != -ESHUTDOWN &&net_ratelimit ()) { +netdev_info (netdev,"failed to re-submit IN URB: %pe\n" , +ERR_PTR (urb->status)); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 34/227 sctp: move SCTP_CMD_ASSOC_SHKEY right after SCTP_CMD_PEER_INIT
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit a80c9d945aef55b23b54838334345f20251dad83 ]
A null-ptr-deref was reported in the SCTP transmit path when SCTP-AUTH key initialization fails:
==================================================================
KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] CPU: 0 PID: 16 Comm: ksoftirqd/0 Tainted: G W 6.6.0 #2 RIP: 0010:sctp_packet_bundle_auth net/sctp/output.c:264 [inline] RIP: 0010:sctp_packet_append_chunk+0xb36/0x1260 net/sctp/output.c:401 Call Trace: sctp_packet_transmit_chunk+0x31/0x250 net/sctp/output.c:189 sctp_outq_flush_data+0xa29/0x26d0 net/sctp/outqueue.c:1111 sctp_outq_flush+0xc80/0x1240 net/sctp/outqueue.c:1217 sctp_cmd_interpreter.isra.0+0x19a5/0x62c0 net/sctp/sm_sideeffect.c:1787 sctp_side_effects net/sctp/sm_sideeffect.c:1198 [inline] sctp_do_sm+0x1a3/0x670 net/sctp/sm_sideeffect.c:1169 sctp_assoc_bh_rcv+0x33e/0x640 net/sctp/associola.c:1052 sctp_inq_push+0x1dd/0x280 net/sctp/inqueue.c:88 sctp_rcv+0x11ae/0x3100 net/sctp/input.c:243 sctp6_rcv+0x3d/0x60 net/sctp/ipv6.c:1127
The issue is triggered when sctp_auth_asoc_init_active_key() fails in sctp_sf_do_5_1C_ack() while processing an INIT_ACK. In this case, the command sequence is currently:
- SCTP_CMD_PEER_INIT
- SCTP_CMD_TIMER_STOP (T1_INIT)
- SCTP_CMD_TIMER_START (T1_COOKIE)
- SCTP_CMD_NEW_STATE (COOKIE_ECHOED)
- SCTP_CMD_ASSOC_SHKEY
- SCTP_CMD_GEN_COOKIE_ECHO
If SCTP_CMD_ASSOC_SHKEY fails, asoc->shkey remains NULL, while asoc->peer.auth_capable and asoc->peer.peer_chunks have already been set by SCTP_CMD_PEER_INIT. This allows a DATA chunk with auth = 1 and shkey = NULL to be queued by sctp_datamsg_from_user().
Since command interpretation stops on failure, no COOKIE_ECHO should been sent via SCTP_CMD_GEN_COOKIE_ECHO. However, the T1_COOKIE timer has already been started, and it may enqueue a COOKIE_ECHO into the outqueue later. As a result, the DATA chunk can be transmitted together with the COOKIE_ECHO in sctp_outq_flush_data(), leading to the observed issue.
Similar to the other places where it calls sctp_auth_asoc_init_active_key() right after sctp_process_init(), this patch moves the SCTP_CMD_ASSOC_SHKEY immediately after SCTP_CMD_PEER_INIT, before stopping T1_INIT and starting T1_COOKIE. This ensures that if shared key generation fails, authenticated DATA cannot be sent. It also allows the T1_INIT timer to retransmit INIT, giving the client another chance to process INIT_ACK and retry key setup.
--- net/sctp/sm_statefuns.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/sctp/sm_statefuns.c +5 -5
@@ -603,6 +603,11 @@ enum sctp_disposition sctp_sf_do_5_1C_ack(struct net *net,sctp_add_cmd_sf (commands,SCTP_CMD_PEER_INIT ,SCTP_PEER_INIT (initchunk)); +/* SCTP-AUTH: generate the association shared keys so that +* we can potentially sign the COOKIE-ECHO. +*/ +sctp_add_cmd_sf (commands,SCTP_CMD_ASSOC_SHKEY ,SCTP_NULL ()); +/* Reset init error count upon receipt of INIT-ACK. */ sctp_add_cmd_sf (commands,SCTP_CMD_INIT_COUNTER_RESET ,SCTP_NULL ());
@@ -617,11 +622,6 @@ enum sctp_disposition sctp_sf_do_5_1C_ack(struct net *net,sctp_add_cmd_sf (commands,SCTP_CMD_NEW_STATE ,SCTP_STATE (SCTP_STATE_COOKIE_ECHOED )); -/* SCTP-AUTH: generate the association shared keys so that -* we can potentially sign the COOKIE-ECHO. -*/ -sctp_add_cmd_sf (commands,SCTP_CMD_ASSOC_SHKEY ,SCTP_NULL ()); -/* 5.1 C) "A" shall then send the State Cookie received in the * INIT ACK chunk in a COOKIE ECHO chunk, ... */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 35/227 amd-xgbe: avoid misleading per-packet error log
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raju Rangoju <[email protected]>
[ Upstream commit c158f985cf6c2c36c99c4f67af2ff3f5ebe09f8f ]
On the receive path, packet can be damaged because of buffer overflow in Rx FIFO. Avoid misleading per-packet error log when packet->errors is set, this can flood the log. Instead, rely on the standard rtnl_link_stats64 stats.
--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -4
@@ -1823,7 +1823,7 @@ static void xgbe_get_stats64(struct net_device *netdev, s->multicast = pstats->rxmulticastframes_g; s->rx_length_errors = pstats->rxlengtherror; s->rx_crc_errors = pstats->rxcrcerror; - s->rx_fifo_errors = pstats->rxfifooverflow; + s->rx_over_errors = pstats->rxfifooverflow; s->tx_packets = pstats->txframecount_gb; s->tx_bytes = pstats->txoctetcount_gb;
@@ -2277,9 +2277,6 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget) goto read_again;if (error || packet->errors) { -if (packet->errors) -netif_err (pdata, rx_err, netdev, -"error in received packet\n" );dev_kfree_skb (skb); goto next_packet; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 36/227 gue: Fix skb memleak with inner IP protocol 0.
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 9a56796ad258786d3624eef5aefba394fc9bdded ]
syzbot reported skb memleak below. [0]
The repro generated a GUE packet with its inner protocol 0.
gue_udp_recv() returns -guehdr->proto_ctype for "resubmit" in ip_protocol_deliver_rcu(), but this only works with non-zero protocol number.
Let's drop such packets.
Note that 0 is a valid number (IPv6 Hop-by-Hop Option).
I think it is not practical to encap HOPOPT in GUE, so once someone starts to complain, we could pass down a resubmit flag pointer to distinguish two zeros from the upper layer:
* no error
* resubmit HOPOPT
[0]
BUG: memory leak
unreferenced object 0xffff888109695a00 (size 240):
comm "syz.0.17", pid 6088, jiffies 4294943096
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 40 c2 10 81 88 ff ff 00 00 00 00 00 00 00 00 .@..............
backtrace (crc a84b336f):
kmemleak_alloc_recursive include/linux/kmemleak.h:44 [inline]
slab_post_alloc_hook mm/slub.c:4958 [inline]
slab_alloc_node mm/slub.c:5263 [inline]
kmem_cache_alloc_noprof+0x3b4/0x590 mm/slub.c:5270
__build_skb+0x23/0x60 net/core/skbuff.c:474
build_skb+0x20/0x190 net/core/skbuff.c:490
__tun_build_skb drivers/net/tun.c:1541 [inline]
tun_build_skb+0x4a1/0xa40 drivers/net/tun.c:1636
tun_get_user+0xc12/0x2030 drivers/net/tun.c:1770
tun_chr_write_iter+0x71/0x120 drivers/net/tun.c:1999
new_sync_write fs/read_write.c:593 [inline]
vfs_write+0x45d/0x710 fs/read_write.c:686
ksys_write+0xa7/0x170 fs/read_write.c:738
do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline]
do_syscall_64+0xa4/0xf80 arch/x86/entry/syscall_64.c:94
entry_SYSCALL_64_after_hwframe+0x77/0x7f--- net/ipv4/fou_core.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv4/fou_core.c +3 -0
@@ -215,6 +215,9 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)return gue_control_message (skb, guehdr); proto_ctype = guehdr->proto_ctype; +if (unlikely (!proto_ctype)) + goto drop; +__skb_pull (skb,sizeof (struct udphdr ) + hdrlen);skb_reset_transport_header (skb);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 37/227 tools: ynl: Specify --no-line-number in ynl-regen.sh.
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 68578370f9b3a2aba5964b273312d51c581b6aad ]
If grep.lineNumber is enabled in .gitconfig,
[grep]
lineNumber = true
ynl-regen.sh fails with the following error:
$ ./tools/net/ynl/ynl-regen.sh -f ... ynl_gen_c.py: error: argument --mode: invalid choice: '4:' (choose from user, kernel, uapi) GEN 4: net/ipv4/fou_nl.c
Let's specify --no-line-number explicitly.
--- tools/net/ynl/ynl-regen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/net/ynl/ynl-regen.sh +1 -1
@@ -21,7 +21,7 @@ files=$(git grep --files-with-matches '^/\* YNL-GEN \(kernel\|uapi\|user\)') for f in $files; do # params: 0 1 2 3 # $YAML YNL-GEN kernel $mode - params=( $(git grep -B1 -h '/\* YNL-GEN' $f | sed 's@/\*\(.*\)\*/@\1@') ) + params=( $(git grep --no-line-number -B1 -h '/\* YNL-GEN' $f | sed 's@/\*\(.*\)\*/@\1@') ) args=$(sed -n 's@/\* YNL-ARG \(.*\) \*/@\1@p' $f) if [ $f -nt ${params[0]} -a -z "$force" ]; then
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 38/227 fou: Dont allow 0 for FOU_ATTR_IPPROTO.
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 7a9bc9e3f42391e4c187e099263cf7a1c4b69ff5 ]
fou_udp_recv() has the same problem mentioned in the previous patch.
If FOU_ATTR_IPPROTO is set to 0, skb is not freed by fou_udp_recv() nor "resubmit"-ted in ip_protocol_deliver_rcu().
Let's forbid 0 for FOU_ATTR_IPPROTO.
--- Documentation/netlink/specs/fou.yaml | 2 ++ net/ipv4/fou_nl.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
Documentation/netlink/specs/fou.yaml +2 -0
@@ -39,6 +39,8 @@ attribute-sets: - name: ipproto type: u8 + checks: + min: 1 - name: type type: u8
net/ipv4/fou_nl.c +1 -1
@@ -14,7 +14,7 @@const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX +1 ] = { [FOU_ATTR_PORT ] = { .type =NLA_BE16 , }, [FOU_ATTR_AF ] = { .type =NLA_U8 , }, - [FOU_ATTR_IPPROTO ] = { .type =NLA_U8 , }, + [FOU_ATTR_IPPROTO ] =NLA_POLICY_MIN (NLA_U8 ,1 ), [FOU_ATTR_TYPE ] = { .type =NLA_U8 , }, [FOU_ATTR_REMCSUM_NOPARTIAL ] = { .type =NLA_FLAG , }, [FOU_ATTR_LOCAL_V4 ] = { .type =NLA_U32 , },
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 39/227 veth: fix data race in veth_get_ethtool_stats
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yang <[email protected]>
[ Upstream commit b47adaab8b3d443868096bac08fdbb3d403194ba ]
In veth_get_ethtool_stats(), some statistics protected by u64_stats_sync, are read and accumulated in ignorance of possible u64_stats_fetch_retry() events. These statistics, peer_tq_xdp_xmit and peer_tq_xdp_xmit_err, are already accumulated by veth_xdp_xmit(). Fix this by reading them into a temporary buffer first.
--- drivers/net/veth.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/veth.c +6 -2
@@ -228,16 +228,20 @@ static void veth_get_ethtool_stats(struct net_device *dev,const struct veth_rq_stats *rq_stats = &rcv_priv->rq[i].stats;const void *base = (void *)&rq_stats->vs;unsigned int start, tx_idx = idx; +u64 buf[VETH_TQ_STATS_LEN ];size_t offset; - tx_idx += (i % dev->real_num_tx_queues) *VETH_TQ_STATS_LEN ;do { start =u64_stats_fetch_begin (&rq_stats->syncp);for (j =0 ; j <VETH_TQ_STATS_LEN ; j++) { offset = veth_tq_stats_desc[j].offset; - data[tx_idx + j] += *(u64 *)(base + offset); + buf[j] = *(u64 *)(base + offset); } }while (u64_stats_fetch_retry (&rq_stats->syncp, start)); + + tx_idx += (i % dev->real_num_tx_queues) *VETH_TQ_STATS_LEN ; +for (j =0 ; j <VETH_TQ_STATS_LEN ; j++) + data[tx_idx + j] += buf[j]; } pp_idx = idx + dev->real_num_tx_queues *VETH_TQ_STATS_LEN ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 40/227 pwm: Ensure ioctl() returns a negative errno on error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit c198b7773ca5bc3bdfb15b85e414fb9a99a5e5ba ]
copy_to_user() returns the number of bytes not copied, thus if there is a problem a positive number. However the ioctl callback is supposed to return a negative error code on error.
This error is a unfortunate as strictly speaking it became ABI with the introduction of pwm character devices. However I never saw the issue in real life -- I found this by code inspection -- and it only affects an error case where readonly memory is passed to the ioctls or the address mapping changes while the ioctl is active. Also there are already error cases returning negative values, so the calling code must be prepared to see such values already.
--- drivers/pwm/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/pwm/core.c +6 -4
@@ -2294,8 +2294,9 @@ static long pwm_cdev_ioctl(struct file *file, unsigned int cmd, unsigned long ar .duty_offset_ns = wf.duty_offset_ns, }; -return copy_to_user ((struct pwmchip_waveform __user *)arg, - &cwf,sizeof (cwf)); + ret =copy_to_user ((struct pwmchip_waveform __user *)arg, + &cwf,sizeof (cwf)); +return ret ? -EFAULT :0 ; }case PWM_IOCTL_GETWF :
@@ -2328,8 +2329,9 @@ static long pwm_cdev_ioctl(struct file *file, unsigned int cmd, unsigned long ar .duty_offset_ns = wf.duty_offset_ns, }; -return copy_to_user ((struct pwmchip_waveform __user *)arg, - &cwf,sizeof (cwf)); + ret =copy_to_user ((struct pwmchip_waveform __user *)arg, + &cwf,sizeof (cwf)); +return ret ? -EFAULT :0 ; }case PWM_IOCTL_SETROUNDEDWF :
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 41/227 pwm: max7360: Populate missing .sizeof_wfhw in max7360_pwm_ops
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Genoud <[email protected]>
[ Upstream commit 63faf32666e03a78cc985bcbae196418cf7d7938 ]
The sizeof_wfhw field wasn't populated in max7360_pwm_ops so it was set to 0 by default.
While this is ok for now because:sizeof(struct max7360_pwm_waveform) < PWM_WFHWSIZE
in the future, if struct max7360_pwm_waveform grows, it could lead to stack corruption.
--- drivers/pwm/pwm-max7360.c | 1 + 1 file changed, 1 insertion(+)
drivers/pwm/pwm-max7360.c +1 -0
@@ -153,6 +153,7 @@ static int max7360_pwm_read_waveform(struct pwm_chip *chip, }static const struct pwm_ops max7360_pwm_ops = { + .sizeof_wfhw =sizeof (struct max7360_pwm_waveform ), .request = max7360_pwm_request, .round_waveform_tohw = max7360_pwm_round_waveform_tohw, .round_waveform_fromhw = max7360_pwm_round_waveform_fromhw,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 42/227 l2tp: avoid one data-race in l2tp_tunnel_del_work()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 7a29f6bf60f2590fe5e9c4decb451e19afad2bcf ]
We should read sk->sk_socket only when dealing with kernel sockets.
syzbot reported the following data-race:
BUG: KCSAN: data-race in l2tp_tunnel_del_work / sk_common_release
write to 0xffff88811c182b20 of 8 bytes by task 5365 on cpu 0:
sk_set_socket include/net/sock.h:2092 [inline] sock_orphan include/net/sock.h:2118 [inline] sk_common_release+0xae/0x230 net/core/sock.c:4003 udp_lib_close+0x15/0x20 include/net/udp.h:325 inet_release+0xce/0xf0 net/ipv4/af_inet.c:437 __sock_release net/socket.c:662 [inline] sock_close+0x6b/0x150 net/socket.c:1455 __fput+0x29b/0x650 fs/file_table.c:468 ____fput+0x1c/0x30 fs/file_table.c:496 task_work_run+0x131/0x1a0 kernel/task_work.c:233 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] __exit_to_user_mode_loop kernel/entry/common.c:44 [inline] exit_to_user_mode_loop+0x1fe/0x740 kernel/entry/common.c:75 __exit_to_user_mode_prepare include/linux/irq-entry-common.h:226 [inline] syscall_exit_to_user_mode_prepare include/linux/irq-entry-common.h:256 [inline] syscall_exit_to_user_mode_work include/linux/entry-common.h:159 [inline] syscall_exit_to_user_mode include/linux/entry-common.h:194 [inline] do_syscall_64+0x1e1/0x2b0 arch/x86/entry/syscall_64.c:100 entry_SYSCALL_64_after_hwframe+0x77/0x7f
read to 0xffff88811c182b20 of 8 bytes by task 827 on cpu 1:
l2tp_tunnel_del_work+0x2f/0x1a0 net/l2tp/l2tp_core.c:1418 process_one_work kernel/workqueue.c:3257 [inline] process_scheduled_works+0x4ce/0x9d0 kernel/workqueue.c:3340 worker_thread+0x582/0x770 kernel/workqueue.c:3421 kthread+0x489/0x510 kernel/kthread.c:463 ret_from_fork+0x149/0x290 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246
value changed: 0xffff88811b818000 -> 0x0000000000000000
--- net/l2tp/l2tp_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/l2tp/l2tp_core.c +2 -2
@@ -1416,8 +1416,6 @@ static void l2tp_tunnel_del_work(struct work_struct *work) { struct l2tp_tunnel *tunnel = container_of(work, struct l2tp_tunnel, del_work); -struct sock *sk = tunnel->sock; -struct socket *sock = sk->sk_socket;l2tp_tunnel_closeall (tunnel);
@@ -1425,6 +1423,8 @@ static void l2tp_tunnel_del_work(struct work_struct *work)* the sk API to release it here. */ if (tunnel->fd <0 ) { +struct socket *sock = tunnel->sock->sk_socket; +if (sock) {kernel_sock_shutdown (sock,SHUT_RDWR );sock_release (sock);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 43/227 ipvlan: Make the addrs_lock be per port
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Skorodumov <[email protected]>
[ Upstream commit d3ba32162488283c0a4c5bedd8817aec91748802 ]
Make the addrs_lock be per port, not per ipvlan dev.
Initial code seems to be written in the assumption, that any address change must occur under RTNL. But it is not so for the case of IPv6. So
1) Introduce per-port addrs_lock.
2) It was needed to fix places where it was forgotten to take lock (ipvlan_open/ipvlan_close)
This appears to be a very minor problem though. Since it's highly unlikely that ipvlan_add_addr() will be called on 2 CPU simultaneously. But nevertheless, this could cause:
1) False-negative of ipvlan_addr_busy(): one interface iterated through all port->ipvlans + ipvlan->addrs under some ipvlan spinlock, and another added IP under its own lock. Though this is only possible for IPv6, since looks like only ipvlan_addr6_event() can be called without rtnl_lock.
2) Race since ipvlan_ht_addr_add(port) is called under different ipvlan->addrs_lock locks
This should not affect performance, since add/remove IP is a rare situation and spinlock is not taken on fast paths.
--- drivers/net/ipvlan/ipvlan.h | 2 +- drivers/net/ipvlan/ipvlan_core.c | 16 +++++------ drivers/net/ipvlan/ipvlan_main.c | 49 +++++++++++++++++++------------- 3 files changed, 37 insertions(+), 30 deletions(-)
drivers/net/ipvlan/ipvlan.h +1 -1
@@ -69,7 +69,6 @@ struct ipvl_dev {DECLARE_BITMAP (mac_filters,IPVLAN_MAC_FILTER_SIZE );netdev_features_t sfeatures;u32 msg_enable; -spinlock_t addrs_lock; };struct ipvl_addr {
@@ -90,6 +89,7 @@ struct ipvl_port {struct net_device *dev;possible_net_t pnet;struct hlist_head hlhead[IPVLAN_HASH_SIZE ]; +spinlock_t addrs_lock;/* guards hash-table and addrs */ struct list_head ipvlans;u16 mode;u16 flags;
drivers/net/ipvlan/ipvlan_core.c +7 -9
@@ -107,17 +107,15 @@ void ipvlan_ht_addr_del(struct ipvl_addr *addr)struct ipvl_addr *ipvlan_find_addr (const struct ipvl_dev *ipvlan,const void *iaddr,bool is_v6) { -struct ipvl_addr *addr, *ret =NULL ; +struct ipvl_addr *addr; -rcu_read_lock (); -list_for_each_entry_rcu (addr, &ipvlan->addrs, anode) { -if (addr_equal (is_v6, addr, iaddr)) { - ret = addr; -break ; - } +assert_spin_locked (&ipvlan->port->addrs_lock); + +list_for_each_entry (addr, &ipvlan->addrs, anode) { +if (addr_equal (is_v6, addr, iaddr)) +return addr; } -rcu_read_unlock (); -return ret; +return NULL ; }bool ipvlan_addr_busy (struct ipvl_port *port,void *iaddr,bool is_v6)
drivers/net/ipvlan/ipvlan_main.c +29 -20
173 lines not on this page · raw message
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 44/227 octeontx2: cn10k: fix RX flowid TCAM mask handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit ab9b218a1521133a4410722907fa7189566be9bc ]
The RX flowid programming initializes the TCAM mask to all ones, but then overwrites it when clearing the MAC DA mask bits. This results in losing the intended initialization and may affect other match fields.
Update the code to clear the MAC DA bits using an AND operation, making the handling of mask[0] consistent with mask[1], where the field-specific bits are cleared after initializing the mask to ~0ULL.
--- drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c +1 -1
@@ -328,7 +328,7 @@ static int cn10k_mcs_write_rx_flowid(struct otx2_nic *pfvf, req->data[0 ] =FIELD_PREP (MCS_TCAM0_MAC_DA_MASK , mac_da); req->mask[0 ] = ~0ULL ; - req->mask[0 ] = ~MCS_TCAM0_MAC_DA_MASK ; + req->mask[0 ] &= ~MCS_TCAM0_MAC_DA_MASK ; req->data[1 ] =FIELD_PREP (MCS_TCAM1_ETYPE_MASK ,ETH_P_MACSEC ); req->mask[1 ] = ~0ULL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 45/227 net/sched: Enforce that teql can only be used as root qdisc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit 50da4b9d07a7a463e2cfb738f3ad4cff6b2c9c3b ]
Design intent of teql is that it is only supposed to be used as root qdisc. We need to check for that constraint.
Although not important, I will describe the scenario that unearthed this issue for the curious.
GangMin Kim <[email protected]> managed to concot a scenario as follows:
ROOT qdisc 1:0 (QFQ)
├── class 1:1 (weight=15, lmax=16384) netem with delay 6.4s └── class 1:2 (weight=1, lmax=1514) teql
GangMin sends a packet which is enqueued to 1:1 (netem).
Any invocation of dequeue by QFQ from this class will not return a packet until after 6.4s. In the meantime, a second packet is sent and it lands on 1:2. teql's enqueue will return success and this will activate class 1:2. Main issue is that teql only updates the parent visible qlen (sch->q.qlen) at dequeue. Since QFQ will only call dequeue if peek succeeds (and teql's peek always returns NULL), dequeue will never be called and thus the qlen will remain as 0. With that in mind, when GangMin updates 1:2's lmax value, the qfq_change_class calls qfq_deact_rm_from_agg. Since the child qdisc's qlen was not incremented, qfq fails to deactivate the class, but still frees its pointers from the aggregate. So when the first packet is rescheduled after 6.4 seconds (netem's delay), a dangling pointer is accessed causing GangMin's causing a UAF.
--- net/sched/sch_teql.c | 5 +++++ 1 file changed, 5 insertions(+)
net/sched/sch_teql.c +5 -0
@@ -178,6 +178,11 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,if (m->dev == dev)return -ELOOP ; +if (sch->parent !=TC_H_ROOT ) { +NL_SET_ERR_MSG_MOD (extack,"teql can only be used as root" ); +return -EOPNOTSUPP ; + } + q->m = m;skb_queue_head_init (&q->q);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 46/227 net/sched: qfq: Use cl_is_active to determine whether class is active in qfq_rm_from_ag
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit d837fbee92453fbb829f950c8e7cf76207d73f33 ]
This is more of a preventive patch to make the code more consistent and to prevent possible exploits that employ child qlen manipulations on qfq. use cl_is_active instead of relying on the child qdisc's qlen to determine class activation.
--- net/sched/sch_qfq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_qfq.c +1 -1
@@ -373,7 +373,7 @@ static void qfq_rm_from_agg(struct qfq_sched *q, struct qfq_class *cl)/* Deschedule class and remove it from its parent aggregate. */ static void qfq_deact_rm_from_agg (struct qfq_sched *q,struct qfq_class *cl) { -if (cl->qdisc->q.qlen >0 )/* class is active */ +if (cl_is_active (cl))/* class is active */ qfq_deactivate_class (q, cl);qfq_rm_from_agg (q, cl);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 47/227 crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taeyang Lee <[email protected]>
[ Upstream commit 2397e9264676be7794f8f7f1e9763d90bd3c7335 ]
authencesn assumes an ESP/ESN-formatted AAD. When assoclen is shorter than the minimum expected length, crypto_authenc_esn_decrypt() can advance past the end of the destination scatterlist and trigger a NULL pointer dereference in scatterwalk_map_and_copy(), leading to a kernel panic (DoS).
Add a minimum AAD length check to fail fast on invalid inputs.
--- crypto/authencesn.c | 6 ++++++ 1 file changed, 6 insertions(+)
crypto/authencesn.c +6 -0
@@ -169,6 +169,9 @@ static int crypto_authenc_esn_encrypt(struct aead_request *req)struct scatterlist *src, *dst;int err; +if (assoclen <8 ) +return -EINVAL ; +sg_init_table (areq_ctx->src,2 ); src =scatterwalk_ffwd (areq_ctx->src, req->src, assoclen); dst = src;
@@ -256,6 +259,9 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)u32 tmp[2 ];int err; +if (assoclen <8 ) +return -EINVAL ; + cryptlen -= authsize;if (req->src != dst)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 48/227 wifi: mac80211: dont perform DA check on S1G beacon
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lachlan Hodges <[email protected]>
[ Upstream commit 5dc6975566f5d142ec53eb7e97af688c45dd314d ]
S1G beacons don't contain the DA field as per IEEE80211-2024 9.3.4.3, so the DA broadcast check reads the SA address of the S1G beacon which will subsequently lead to the beacon being dropped. As a result, passive scanning is not possible. Fix this by only performing the check on non-S1G beacons to allow S1G long beacons to be processed during a passive scan.
--- net/mac80211/scan.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/mac80211/scan.c +7 -2
@@ -343,8 +343,13 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb) mgmt->da))return ; }else { -/* Beacons are expected only with broadcast address */ -if (!is_broadcast_ether_addr (mgmt->da)) +/* +* Non-S1G beacons are expected only with broadcast address. +* S1G beacons only carry the SA so no DA check is required +* nor possible. +*/ +if (!ieee80211_is_s1g_beacon (mgmt->frame_control) && + !is_broadcast_ether_addr (mgmt->da))return ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 49/227 serial: 8250_pci: Fix broken RS485 for F81504/508/512
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marnix Rijnart <[email protected]>
commit 27aff0a56b3c77ea1a73641c9b3c4172a8f7238f upstream.
Fintek F81504/508/512 can support both RTS_ON_SEND and RTS_AFTER_SEND, but pci_fintek_rs485_supported only announces the former.
This makes it impossible to unset SER_RS485_RTS_ON_SEND from userspace because of uart_sanitize_serial_rs485(). Some devices with these chips need RTS low on TX, so they are effectively broken.
Fix this by announcing the support for SER_RS485_RTS_AFTER_SEND, similar to commit 068d35a7be65 ("serial: sc16is7xx: announce support for SER_RS485_RTS_ON_SEND").
--- drivers/tty/serial/8250/8250_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_pci.c +1 -1
@@ -1650,7 +1650,7 @@ static int pci_fintek_rs485_config(struc }static const struct serial_rs485 pci_fintek_rs485_supported = { - .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND , + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND |SER_RS485_RTS_AFTER_SEND ,/* F81504/508/512 does not support RTS delay before or after send */ };
Greg Kroah-Hartman
maintainerPATCH 50/227 serial: Fix not set tty->port race condition
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 32f37e57583f869140cff445feedeea8a5fea986 upstream.
Revert commit bfc467db60b7 ("serial: remove redundant tty_port_link_device()") because the tty_port_link_device() is not
redundant: the tty->port has to be confured before we call uart_configure_port(), otherwise user-space can open console without TTY linked to the driver.
This tty_port_link_device() was added explicitly to avoid this exact issue in commit fb2b90014d78 ("tty: link tty and port before configuring it as console"), so offending commit basically reverted the fix saying it is redundant without addressing the actual race condition presented there.
Reproducible always as tty->port warning on Qualcomm SoC with most of devices disabled, so with very fast boot, and one serial device being the console:
printk: legacy console [ttyMSM0] enabled
printk: legacy console [ttyMSM0] enabled
printk: legacy bootconsole [qcom_geni0] disabled
printk: legacy bootconsole [qcom_geni0] disabled
------------[ cut here ]------------ tty_init_dev: ttyMSM driver does not set tty->port. This would crash the kernel. Fix the driver! WARNING: drivers/tty/tty_io.c:1414 at tty_init_dev.part.0+0x228/0x25c, CPU#2: systemd/1 Modules linked in: socinfo tcsrcc_eliza gcc_eliza sm3_ce fuse ipv6 CPU: 2 UID: 0 PID: 1 Comm: systemd Tainted: G S 6.19.0-rc4-next-20260108-00024-g2202f4d30aa8 #73 PREEMPT Tainted: [S]=CPU_OUT_OF_SPEC Hardware name: Qualcomm Technologies, Inc. Eliza (DT) ... tty_init_dev.part.0 (drivers/tty/tty_io.c:1414 (discriminator 11)) (P) tty_open (arch/arm64/include/asm/atomic_ll_sc.h:95 (discriminator 3) drivers/tty/tty_io.c:2073 (discriminator 3) drivers/tty/tty_io.c:2120 (discriminator 3)) chrdev_open (fs/char_dev.c:411) do_dentry_open (fs/open.c:962) vfs_open (fs/open.c:1094) do_open (fs/namei.c:4634) path_openat (fs/namei.c:4793) do_filp_open (fs/namei.c:4820) do_sys_openat2 (fs/open.c:1391 (discriminator 3)) ... Starting Network Name Resolution...
Apparently the flow with this small Yocto-based ramdisk user-space is:
driver (qcom_geni_serial.c): user-space:
============================ ===========qcom_geni_serial_probe()
uart_add_one_port()
serial_core_register_port()
serial_core_add_one_port()
uart_configure_port()
register_console()
|
| open console
| ...
| tty_init_dev()
| driver->ports[idx] is NULL
|
tty_port_register_device_attr_serdev()
tty_port_link_device() <- set driver->ports[idx]--- drivers/tty/serial/serial_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/serial_core.c +6 -0
@@ -3102,6 +3102,12 @@ static int serial_core_add_one_port(struif (uport->cons && uport->dev)of_console_check (uport->dev->of_node, uport->cons->name, uport->line); +/* +* TTY port has to be linked with the driver before register_console() +* in uart_configure_port(), because user-space could open the console +* immediately after. +*/ +tty_port_link_device (port, drv->tty_driver, uport->line);uart_configure_port (drv, state, uport); port->console =uart_console (uport);
Greg Kroah-Hartman
maintainerPATCH 51/227 comedi: dmm32at: serialize use of paged registers
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit e03b29b55f2b7c345a919a6ee36633b06bf3fb56 upstream.
Some of the hardware registers of the DMM-32-AT board are multiplexed, using the least significant two bits of the Miscellaneous Control register to select the function of registers at offsets 12 to 15:
00 => 8254 timer/counter registers are accessible 01 => 8255 digital I/O registers are accessible 10 => Reserved
11 => Calibration registers are accessible
The interrupt service routine (dmm32at_isr()) clobbers the bottom two bits of the register with value 00, which would interfere with access to the 8255 registers by the dm32at_8255_io() function (used for Comedi instruction handling on the digital I/O subdevice).
Make use of the generic Comedi device spin-lock dev->spinlock (which is otherwise unused by this driver) to serialize access to the miscellaneous control register and paged registers.
--- drivers/comedi/drivers/dmm32at.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/comedi/drivers/dmm32at.c +30 -2
@@ -330,6 +330,7 @@ static int dmm32at_ai_cmdtest(struct comstatic void dmm32at_setaitimer (struct comedi_device *dev,unsigned int nansec) { +unsigned long irq_flags;unsigned char lo1, lo2, hi2;unsigned short both2;
@@ -342,6 +343,9 @@ static void dmm32at_setaitimer(struct co/* set counter clocks to 10MHz, disable all aux dio */ outb (0 , dev->iobase +DMM32AT_CTRDIO_CFG_REG ); +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* get access to the clock regs */ outb (DMM32AT_CTRL_PAGE_8254 , dev->iobase +DMM32AT_CTRL_REG );
@@ -354,6 +358,8 @@ static void dmm32at_setaitimer(struct cooutb (lo2, dev->iobase +DMM32AT_CLK2 );outb (hi2, dev->iobase +DMM32AT_CLK2 ); +spin_unlock_irqrestore (&dev->spinlock, irq_flags); +/* enable the ai conversion interrupt and the clock to start scans */ outb(DMM32AT_INTCLK_ADINT | DMM32AT_INTCLK_CLKEN | DMM32AT_INTCLK_CLKSEL,
@@ -363,13 +369,19 @@ static void dmm32at_setaitimer(struct costatic int dmm32at_ai_cmd (struct comedi_device *dev,struct comedi_subdevice *s) {struct comedi_cmd *cmd = &s->async->cmd; +unsigned long irq_flags;int ret;dmm32at_ai_set_chanspec (dev, s, cmd->chanlist[0 ], cmd->chanlist_len); +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* reset the interrupt just in case */ outb (DMM32AT_CTRL_INTRST , dev->iobase +DMM32AT_CTRL_REG ); +spin_unlock_irqrestore (&dev->spinlock, irq_flags); +/* * wait for circuit to settle * we don't have the 'insn' here but it's not needed
@@ -429,8 +441,13 @@ static irqreturn_t dmm32at_isr(int irq,comedi_handle_events (dev, s); } +/* serialize access to control register and paged registers */ +spin_lock (&dev->spinlock); +/* reset the interrupt */ outb (DMM32AT_CTRL_INTRST , dev->iobase +DMM32AT_CTRL_REG ); + +spin_unlock (&dev->spinlock);return IRQ_HANDLED ; }
@@ -481,14 +498,25 @@ static int dmm32at_ao_insn_write(structstatic int dmm32at_8255_io (struct comedi_device *dev,int dir,int port,int data,unsigned long regbase) { +unsigned long irq_flags; +int ret; + +/* serialize access to control register and paged registers */ +spin_lock_irqsave (&dev->spinlock, irq_flags); +/* get access to the DIO regs */ outb (DMM32AT_CTRL_PAGE_8255 , dev->iobase +DMM32AT_CTRL_REG );if (dir) {outb (data, dev->iobase + regbase + port); -return 0 ; + ret =0 ; + }else { + ret =inb (dev->iobase + regbase + port); } -return inb (dev->iobase + regbase + port); + +spin_unlock_irqrestore (&dev->spinlock, irq_flags); + +return ret; }/* Make sure the board is there and put it to a known state */
Greg Kroah-Hartman
maintainerPATCH 52/227 w1: therm: Fix off-by-one buffer overflow in alarms_store
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
commit 761fcf46a1bd797bd32d23f3ea0141ffd437668a upstream.
The sysfs buffer passed to alarms_store() is allocated with 'size + 1' bytes and a NUL terminator is appended. However, the 'size' argument does not account for this extra byte. The original code then allocated 'size' bytes and used strcpy() to copy 'buf', which always writes one byte past the allocated buffer since strcpy() copies until the NUL terminator at index 'size'.
Fix this by parsing the 'buf' parameter directly using simple_strtoll() without allocating any intermediate memory or string copying. This removes the overflow while simplifying the code.
--- drivers/w1/slaves/w1_therm.c | 60 +++++++++++++------------------------------ 1 file changed, 19 insertions(+), 41 deletions(-)
drivers/w1/slaves/w1_therm.c +19 -41
@@ -1836,53 +1836,35 @@ static ssize_t alarms_store(struct devicstruct w1_slave *sl =dev_to_w1_slave (device);struct therm_info info;u8 new_config_register[3 ];/* array of data to be written */ -int temp, ret; -char *token =NULL ; +long long temp; +int ret =0 ;s8 tl, th;/* 1 byte per value + temp ring order */ -char *p_args, *orig; +const char *p = buf; +char *endp; - p_args = orig =kmalloc (size,GFP_KERNEL ); -/* Safe string copys as buf is const */ -if (!p_args) { -dev_warn (device, -"%s: error unable to allocate memory %d\n" , - __func__, -ENOMEM ); -return size; - } -strcpy (p_args, buf); - -/* Split string using space char */ - token =strsep (&p_args," " ); - -if (!token) { -dev_info (device, -"%s: error parsing args %d\n" , __func__, -EINVAL ); - goto free_m; - } - -/* Convert 1st entry to int */ - ret =kstrtoint (token,10 , &temp); + temp =simple_strtoll (p, &endp,10 ); +if (p == endp || *endp !=' ' ) + ret = -EINVAL ; +else if (temp <INT_MIN || temp >INT_MAX ) + ret = -ERANGE ;if (ret) {dev_info (device,"%s: error parsing args %d\n" , __func__, ret); - goto free_m; +return size; } tl =int_to_short (temp); -/* Split string using space char */ - token =strsep (&p_args," " ); -if (!token) { -dev_info (device, -"%s: error parsing args %d\n" , __func__, -EINVAL ); - goto free_m; - } -/* Convert 2nd entry to int */ - ret =kstrtoint (token,10 , &temp); + p = endp +1 ; + temp =simple_strtoll (p, &endp,10 ); +if (p == endp) + ret = -EINVAL ; +else if (temp <INT_MIN || temp >INT_MAX ) + ret = -ERANGE ;if (ret) {dev_info (device,"%s: error parsing args %d\n" , __func__, ret); - goto free_m; +return size; }/* Prepare to cast to short by eliminating out of range values */
@@ -1905,7 +1887,7 @@ static ssize_t alarms_store(struct devicdev_info (device,"%s: error reading from the slave device %d\n" , __func__, ret); - goto free_m; +return size; }/* Write data in the device RAM */
@@ -1913,7 +1895,7 @@ static ssize_t alarms_store(struct devicdev_info (device,"%s: Device not supported by the driver %d\n" , __func__, -ENODEV ); - goto free_m; +return size; } ret =SLAVE_SPECIFIC_FUNC (sl)->write_data (sl, new_config_register);
@@ -1922,10 +1904,6 @@ static ssize_t alarms_store(struct devic"%s: error writing to the slave device %d\n" , __func__, ret); -free_m: -/* free allocated memory */ -kfree (orig); -return size; }
Greg Kroah-Hartman
maintainerPATCH 53/227 w1: fix redundant counter decrement in w1_attach_slave_device()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit cc8f92e41eb76f450f05234fef2054afc3633100 upstream.
In w1_attach_slave_device(), if __w1_attach_slave_device() fails, put_device() -> w1_slave_release() is called to do the cleanup job. In w1_slave_release(), sl->family->refcnt and sl->master->slave_count have already been decremented. There is no need to decrement twice in w1_attach_slave_device().
--- drivers/w1/w1.c | 2 -- 1 file changed, 2 deletions(-)
drivers/w1/w1.c +0 -2
@@ -758,8 +758,6 @@ int w1_attach_slave_device(struct w1_masif (err <0 ) {dev_err (&dev->dev,"%s: Attaching %s failed.\n" , __func__, sl->name); - dev->slave_count--; -w1_family_put (sl->family);atomic_dec (&sl->master->refcnt);kfree (sl);return err;
Greg Kroah-Hartman
maintainerPATCH 54/227 Revert "nfc/nci: Add the inconsistency check between the input data length and count"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit f40ddcc0c0ca1a0122a7f4440b429f97d5832bdf upstream.
This reverts commit 068648aab72c9ba7b0597354ef4d81ffaac7b979.
NFC packets may have NUL-bytes. Checking for string length is not a correct assumption here. As long as there is a check for the length copied from copy_from_user, all should be fine.
The fix only prevented the syzbot reproducer from triggering the bug because the packet is not enqueued anymore and the code that triggers the bug is not exercised.
The fix even broke
testing/selftests/nci/nci_dev, making all tests there fail. After the revert, 6 out of 8 tests pass.
--- drivers/nfc/virtual_ncidev.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/nfc/virtual_ncidev.c +0 -4
@@ -125,10 +125,6 @@ static ssize_t virtual_ncidev_write(strukfree_skb (skb);return -EFAULT ; } -if (strnlen (skb->data, count) != count) { -kfree_skb (skb); -return -EINVAL ; - }nci_recv_frame (vdev->ndev, skb);return count;
Greg Kroah-Hartman
maintainerPATCH 55/227 Input: i8042 - add quirks for MECHREVO Wujie 15X Pro
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: gongqi <[email protected]>
commit 19a5d9ba6208e9006a2a9d5962aea4d6e427d8ab upstream.
The MECHREVO Wujie 15X Pro requires several i8042 quirks to function correctly. Specifically, NOMUX, RESET_ALWAYS, NOLOOP, and NOPNP are needed to ensure the keyboard and touchpad work reliably.
--- drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +7 -0
@@ -1176,6 +1176,13 @@ static const struct dmi_system_id i8042_ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, + { + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "WUJIE Series-X5SP4NAG"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) + }, /* * A lot of modern Clevo barebones have touchpad and/or keyboard issues * after suspend fixable with the forcenorestore quirk.
Greg Kroah-Hartman
maintainerPATCH 56/227 Input: i8042 - add quirk for ASUS Zenbook UX425QA_UM425QA
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: feng <[email protected]>
commit 2934325f56150ad8dab8ab92cbe2997242831396 upstream.
The ASUS Zenbook UX425QA_UM425QA fails to initialize the keyboard after a cold boot.
A quirk already exists for "ZenBook UX425", but some Zenbooks report "Zenbook" with a lowercase 'b'. Since DMI matching is case-sensitive, the existing quirk is not applied to these "extra special" Zenbooks.
Testing confirms that this model needs the same quirks as the ZenBook UX425 variants.
--- drivers/input/serio/i8042-acpipnpio.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +11 -0
@@ -116,6 +116,17 @@ static const struct dmi_system_id i8042_ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER) }, { +/* +* ASUS Zenbook UX425QA_UM425QA +* Some Zenbooks report "Zenbook" with a lowercase b. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Zenbook UX425QA_UM425QA"), + }, + .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER |SERIO_QUIRK_RESET_NEVER ) + }, + {/* ASUS ZenBook UX425UA/QA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
Greg Kroah-Hartman
maintainerPATCH 57/227 scsi: storvsc: Process unsupported MODE_SENSE_10
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Long Li <[email protected]>
commit 9eacec5d18f98f89be520eeeef4b377acee3e4b8 upstream.
The Hyper-V host does not support MODE_SENSE_10 and MODE_SENSE. The driver handles MODE_SENSE as unsupported command, but not for MODE_SENSE_10. Add MODE_SENSE_10 to the same handling logic and return correct code to SCSI layer.
--- drivers/scsi/storvsc_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/storvsc_drv.c +2 -1
@@ -1144,7 +1144,7 @@ static void storvsc_on_io_completion(str* The current SCSI handling on the host side does * not correctly handle: * INQUIRY command with page code parameter set to 0x80 -* MODE_SENSE command with cmd[2] == 0x1c +* MODE_SENSE and MODE_SENSE_10 command with cmd[2] == 0x1c * MAINTENANCE_IN is not supported by HyperV FC passthrough * * Setup srb and scsi status so this won't be fatal.
@@ -1154,6 +1154,7 @@ static void storvsc_on_io_completion(strif ((stor_pkt->vm_srb.cdb[0 ] ==INQUIRY ) || (stor_pkt->vm_srb.cdb[0 ] ==MODE_SENSE ) || + (stor_pkt->vm_srb.cdb[0 ] ==MODE_SENSE_10 ) || (stor_pkt->vm_srb.cdb[0 ] ==MAINTENANCE_IN &&hv_dev_is_fc (device))) { vstor_packet->vm_srb.scsi_status =0 ;
Greg Kroah-Hartman
maintainerPATCH 58/227 scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdun Nihaal <[email protected]>
commit 901a5f309daba412e2a30364d7ec1492fa11c32c upstream.
Memory allocated for struct vscsiblk_info in scsiback_probe() is not freed in scsiback_remove() leading to potential memory leaks on remove, as well as in the scsiback_probe() error paths. Fix that by freeing it in scsiback_remove().
--- drivers/xen/xen-scsiback.c | 1 + 1 file changed, 1 insertion(+)
drivers/xen/xen-scsiback.c +1 -0
@@ -1262,6 +1262,7 @@ static void scsiback_remove(struct xenbugnttab_page_cache_shrink (&info->free_pages,0 );dev_set_drvdata (&dev->dev,NULL ); +kfree (info); } static int scsiback_probe(struct xenbus_device *dev,
Greg Kroah-Hartman
maintainerPATCH 59/227 i2c: spacemit: drop IRQF_ONESHOT flag from IRQ request
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yixun Lan <[email protected]>
commit e351836a54e3b0b4483f896abcd6a0dc71097693 upstream.
In commit aef30c8d569c ("genirq: Warn about using IRQF_ONESHOT without a threaded handler")[1], it will check IRQF_ONESHOT flag in IRQ request, and gives a warning if there is no threaded handler. Drop this flag to fix this warning.
--- drivers/i2c/busses/i2c-k1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-k1.c +1 -1
@@ -566,7 +566,7 @@ static int spacemit_i2c_probe(struct plareturn dev_err_probe (dev, i2c->irq,"failed to get irq resource" ); ret =devm_request_irq (i2c->dev, i2c->irq, spacemit_i2c_irq_handler, -IRQF_NO_SUSPEND |IRQF_ONESHOT ,dev_name (i2c->dev), i2c); +IRQF_NO_SUSPEND ,dev_name (i2c->dev), i2c);if (ret)return dev_err_probe (dev, ret,"failed to request irq" );
Greg Kroah-Hartman
maintainerPATCH 60/227 ARM: dts: microchip: sama7d65: fix the ranges property for flx9
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Prasath Gujulan Elango <[email protected]>
commit aabc977aa472ccf756372ae594d890022c19c9c8 upstream.
Update the ranges property for the flexcom9 as per the datasheet and align with the reg property.
--- arch/arm/boot/dts/microchip/sama7d65.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/microchip/sama7d65.dtsi +1 -1
@@ -676,7 +676,7 @@ i2c8: i2c@600 { flx9: flexcom@e2820000 { compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom"; reg = <0xe2820000 0x200>; - ranges = <0x0 0xe281c000 0x800>; + ranges = <0x0 0xe2820000 0x800>; clocks = <&pmc PMC_TYPE_PERIPHERAL 43>; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.52.0
Greg Kroah-Hartman
maintainerPATCH 61/227 ARM: dts: microchip: sama7d65: fix size-cells property for i2c3
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Ferre <[email protected]>
commit 94ad504e67cd3be94fa1b2fed0cb87da0d8f9396 upstream.
Fix the #size-cells property for i2c3 node and remove the dtbs_check error telling that "#size-cells: 0 was expected" from schema atmel,at91sam-i2c.yaml and i2c-controller.yaml.
--- arch/arm/boot/dts/microchip/sama7d65.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/microchip/sama7d65.dtsi +1 -1
@@ -527,7 +527,7 @@ i2c3: i2c@600 { interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pmc PMC_TYPE_PERIPHERAL 37>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>, <&dma0 AT91_XDMAC_DT_PERID(11)>; dma-names = "tx", "rx";
Signature · 1 line
2.52.0
Greg Kroah-Hartman
maintainerPATCH 62/227 arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geraldo Nascimento <[email protected]>
commit ce652c98a7bfa0b7c675ef5cd85c44c186db96af upstream.
This is already the default in rk3399-base.dtsi, remove redundant declaration from rk3399-nanopi-r4s.dtsi.
--- arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi +0 -1
@@ -71,7 +71,6 @@ }; &pcie0 { - max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; };
Greg Kroah-Hartman
maintainerPATCH 63/227 arm64: dts: rockchip: remove dangerous max-link-speed from helios64
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geraldo Nascimento <[email protected]>
commit 0368e4afcf20f377c81fa77b1c7d0dee4a625a44 upstream.
Shawn Lin from Rockchip strongly discourages attempts to use their RK3399 PCIe core at 5.0 GT/s speed, citing concerns about catastrophic failures that may happen. Even if the odds are low, drop from last user of this non-default property for the RK3399 platform, helios64 board dts.
--- arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +0 -1
@@ -424,7 +424,6 @@ &pcie0 { ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - max-link-speed = <2>; num-lanes = <2>; pinctrl-names = "default"; status = "okay";
Greg Kroah-Hartman
maintainerPATCH 64/227 arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Jirman <[email protected]>
commit 5497ffe305b2ea31ae62d4a311d7cabfb671f54a upstream.
Previously sometimes pressing the volume-down button would register as a volume-up button. Match the thresholds as shown in the Pinephone Pro schematic.
Tests:
~ $ evtest
// Mashed the volume down ~100 times with varying intensity
Event: time xxx, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 1
Event: time xxx, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 0 // Mashed the volume up ~100 times with varying intensity
Event: time xxx, type 1 (EV_KEY), code 115 (KEY_VOLUMEUP), value 1
Event: time xxx, type 1 (EV_KEY), code 115 (KEY_VOLUMEUP), value 0
--- arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +2 -2
@@ -40,13 +40,13 @@ button-up { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; - press-threshold-microvolt = <100000>; + press-threshold-microvolt = <2000>; }; button-down { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; - press-threshold-microvolt = <600000>; + press-threshold-microvolt = <300000>; }; };
Greg Kroah-Hartman
maintainerPATCH 65/227 arm64: dts: rockchip: fix unit-address for RK3588 NPUs core1 and core2s IOMMU
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Schulz <[email protected]>
commit cd8967ea3105d30adb878a9fea0e34a9378df610 upstream.
The Device Tree specification specifies[1] that
"""
Each node in the devicetree is named according to the following convention:
node-name@unit-address
[...]
The unit-address must match the first address specified in the reg property of the node.
"""
The first address in the reg property is fdaXa000 and not fdaX9000. This is likely a copy-paste error as the IOMMU for core0 has two entries in the reg property, the first one being fdab9000 and the second fdaba000.
Let's fix this oversight to match what the spec is expecting.
[1] https://github.com/devicetree-org/devicetree-specification/releases/download/v0.4/devicetree-specification-v0.4.pdf 2.2.1 Node Names
--- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +2 -2
@@ -1200,7 +1200,7 @@ rknn_core_1: npu@fdac0000 { status = "disabled"; }; - rknn_mmu_1: iommu@fdac9000 { + rknn_mmu_1: iommu@fdaca000 { compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; reg = <0x0 0xfdaca000 0x0 0x100>; interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1230,7 +1230,7 @@ rknn_core_2: npu@fdad0000 { status = "disabled"; }; - rknn_mmu_2: iommu@fdad9000 { + rknn_mmu_2: iommu@fdada000 { compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; reg = <0x0 0xfdada000 0x0 0x100>; interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH 0>;
Signature · 1 line
2.52.0
Greg Kroah-Hartman
maintainerPATCH 66/227 arm64: dts: rockchip: Fix headphones widget name on NanoPi M5
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Charkov <[email protected]>
commit 5ab3dd9d0a63af66377f58633fec9dad650e6827 upstream.
Fix the mismatch between the simple-audio-card routing table vs. widget names, which caused the following error at boot preventing the sound card from getting added:
[ 6.625634] asoc-simple-card sound: ASoC: DAPM unknown pin Headphones [ 6.627247] asoc-simple-card sound: ASoC: Failed to add route HPOL -> Headphones(*) [ 6.627988] asoc-simple-card sound: ASoC: Failed to add route HPOR -> Headphones(*)
--- arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts +1 -1
@@ -211,7 +211,7 @@ sound { "Headphones", "HPOR", "IN1P", "Microphone Jack"; simple-audio-card,widgets = - "Headphone", "Headphone Jack", + "Headphone", "Headphones", "Microphone", "Microphone Jack"; simple-audio-card,codec {
Signature · 1 line
2.52.0
Greg Kroah-Hartman
maintainerPATCH 67/227 arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Charkov <[email protected]>
commit 3e4a81881c0929b21a0577bc6e69514c09da5c3f upstream.
NanoPi M5 derives its analog sound signal from SAI2 in M0 pin mode, so the MCLK pin should be configured accordingly for the sound codec to get its I2S signal from the SoC. Request the required pin config.
The clock itself should also be CLK_SAI2_MCLKOUT_TO_IO for the sound to work (otherwise there is only silence out of the audio out jack).
--- arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts +7 -3
@@ -201,6 +201,7 @@ sound { pinctrl-names = "default"; pinctrl-0 = <&hp_det_l>; + simple-audio-card,bitclock-master = <&masterdai>; simple-audio-card,format = "i2s"; simple-audio-card,hp-det-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; simple-audio-card,mclk-fs = <256>;
@@ -218,8 +219,9 @@ simple-audio-card,codec { sound-dai = <&rt5616>; }; - simple-audio-card,cpu { + masterdai: simple-audio-card,cpu { sound-dai = <&sai2>; + system-clock-frequency = <12288000>; }; }; };
@@ -727,10 +729,12 @@ &i2c5 { rt5616: audio-codec@1b { compatible = "realtek,rt5616"; reg = <0x1b>; - assigned-clocks = <&cru CLK_SAI2_MCLKOUT>; + assigned-clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>; assigned-clock-rates = <12288000>; - clocks = <&cru CLK_SAI2_MCLKOUT>; + clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>; clock-names = "mclk"; + pinctrl-0 = <&sai2m0_mclk>; + pinctrl-names = "default"; #sound-dai-cells = <0>; }; };
Signature · 1 line
2.52.0
Greg Kroah-Hartman
maintainerPATCH 68/227 slab: fix kmalloc_nolock() context check for PREEMPT_RT
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Swaraj Gaikwad <[email protected]>
commit 99a3e3a1cfc93b8fe318c0a3a5cfb01f1d4ad53c upstream.
On PREEMPT_RT kernels, local_lock becomes a sleeping lock. The current check in kmalloc_nolock() only verifies we're not in NMI or hard IRQ context, but misses the case where preemption is disabled.
When a BPF program runs from a tracepoint with preemption disabled (preempt_count > 0), kmalloc_nolock() proceeds to call local_lock_irqsave() which attempts to acquire a sleeping lock, triggering:
BUG: sleeping function called from invalid context in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 6128 preempt_count: 2, expected: 0
Fix this by checking !preemptible() on PREEMPT_RT, which directly expresses the constraint that we cannot take a sleeping lock when preemption is disabled. This encompasses the previous checks for NMI and hard IRQ contexts while also catching cases where preemption is disabled.
--- mm/slub.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
mm/slub.c +6 -2
@@ -5692,8 +5692,12 @@ void *kmalloc_nolock_noprof(size_t size,if (unlikely (!size))return ZERO_SIZE_PTR ; -if (IS_ENABLED (CONFIG_PREEMPT_RT ) && (in_nmi () ||in_hardirq ())) -/* kmalloc_nolock() in PREEMPT_RT is not supported from irq */ +if (IS_ENABLED (CONFIG_PREEMPT_RT ) && !preemptible ()) +/* +* kmalloc_nolock() in PREEMPT_RT is not supported from +* non-preemptible context because local_lock becomes a +* sleeping lock on RT. +*/ return NULL ; retry:if (unlikely (size >KMALLOC_MAX_CACHE_SIZE ))
Greg Kroah-Hartman
maintainerPATCH 69/227 rxrpc: Fix recvmsg() unconditional requeue
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
commit 2c28769a51deb6022d7fbd499987e237a01dd63a upstream.
If rxrpc_recvmsg() fails because MSG_DONTWAIT was specified but the call at the front of the recvmsg queue already has its mutex locked, it requeues the call - whether or not the call is already queued. The call may be on the queue because MSG_PEEK was also passed and so the call was not dequeued or because the I/O thread requeued it.
The unconditional requeue may then corrupt the recvmsg queue, leading to things like UAFs or refcount underruns.
Fix this by only requeuing the call if it isn't already on the queue - and moving it to the front if it is already queued. If we don't queue it, we have to put the ref we obtained by dequeuing it.
Also, MSG_PEEK doesn't dequeue the call so shouldn't call rxrpc_notify_socket() for the call if we didn't use up all the data on the queue, so fix that also.
--- include/trace/events/rxrpc.h | 4 ++++ net/rxrpc/recvmsg.c | 19 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
include/trace/events/rxrpc.h +4 -0
@@ -322,6 +322,7 @@ EM(rxrpc_call_put_kernel, "PUT kernel ") \ EM(rxrpc_call_put_poke, "PUT poke ") \ EM(rxrpc_call_put_recvmsg, "PUT recvmsg ") \ + EM(rxrpc_call_put_recvmsg_peek_nowait, "PUT peek-nwt") \ EM(rxrpc_call_put_release_recvmsg_q, "PUT rls-rcmq") \ EM(rxrpc_call_put_release_sock, "PUT rls-sock") \EM (rxrpc_call_put_release_sock_tba,"PUT rls-sk-a" ) \
@@ -340,6 +341,9 @@ EM(rxrpc_call_see_input, "SEE input ") \ EM(rxrpc_call_see_notify_released, "SEE nfy-rlsd") \ EM(rxrpc_call_see_recvmsg, "SEE recvmsg ") \ + EM(rxrpc_call_see_recvmsg_requeue, "SEE recv-rqu") \ + EM(rxrpc_call_see_recvmsg_requeue_first, "SEE recv-rqF") \ + EM(rxrpc_call_see_recvmsg_requeue_move, "SEE recv-rqM") \ EM(rxrpc_call_see_release, "SEE release ") \ EM(rxrpc_call_see_userid_exists, "SEE u-exists") \EM (rxrpc_call_see_waiting_call,"SEE q-conn " ) \
net/rxrpc/recvmsg.c +15 -4
@@ -518,7 +518,8 @@ try_again:if (rxrpc_call_has_failed (call)) goto call_failed; -if (!skb_queue_empty (&call->recvmsg_queue)) +if (!(flags &MSG_PEEK ) && + !skb_queue_empty (&call->recvmsg_queue))rxrpc_notify_socket (call); goto not_yet_complete;
@@ -549,11 +550,21 @@ error_unlock_call: error_requeue_call:if (!(flags &MSG_PEEK )) {spin_lock_irq (&rx->recvmsg_lock); -list_add (&call->recvmsg_link, &rx->recvmsg_q); -spin_unlock_irq (&rx->recvmsg_lock); +if (list_empty (&call->recvmsg_link)) { +list_add (&call->recvmsg_link, &rx->recvmsg_q); +rxrpc_see_call (call, rxrpc_call_see_recvmsg_requeue); +spin_unlock_irq (&rx->recvmsg_lock); + }else if (list_is_first (&call->recvmsg_link, &rx->recvmsg_q)) { +spin_unlock_irq (&rx->recvmsg_lock); +rxrpc_put_call (call, rxrpc_call_see_recvmsg_requeue_first); + }else { +list_move (&call->recvmsg_link, &rx->recvmsg_q); +spin_unlock_irq (&rx->recvmsg_lock); +rxrpc_put_call (call, rxrpc_call_see_recvmsg_requeue_move); + }trace_rxrpc_recvmsg (call_debug_id, rxrpc_recvmsg_requeue,0 ); }else { -rxrpc_put_call (call, rxrpc_call_put_recvmsg); +rxrpc_put_call (call, rxrpc_call_put_recvmsg_peek_nowait); } error_no_call:release_sock (&rx->sk);
Greg Kroah-Hartman
maintainerPATCH 70/227 x86/kfence: avoid writing L1TF-vulnerable PTEs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Cooper <[email protected]>
commit b505f1944535f83d369ae68813e7634d11b990d3 upstream.
For native, the choice of PTE is fine. There's real memory backing the non-present PTE. However, for XenPV, Xen complains:
(XEN) d1 L1TF-vulnerable L1e 8010000018200066 - Shadowing
To explain, some background on XenPV pagetables:
Xen PV guests are control their own pagetables; they choose the new PTE value, and use hypercalls to make changes so Xen can audit for safety.
In addition to a regular reference count, Xen also maintains a type reference count. e.g. SegDesc (referenced by vGDT/vLDT), Writable (referenced with _PAGE_RW) or L{1..4} (referenced by vCR3 or a lower pagetable level). This is in order to prevent e.g. a page being inserted into the pagetables for which the guest has a writable mapping.
For non-present mappings, all other bits become software accessible, and typically contain metadata rather a real frame address. There is nothing that a reference count could sensibly be tied to. As such, even if Xen could recognise the address as currently safe, nothing would prevent that frame from changing owner to another VM in the future.
When Xen detects a PV guest writing a L1TF-PTE, it responds by activating shadow paging. This is normally only used for the live phase of migration, and comes with a reasonable overhead.
KFENCE only cares about getting #PF to catch wild accesses; it doesn't care about the value for non-present mappings. Use a fully inverted PTE, to avoid hitting the slow path when running under Xen.
While adjusting the logic, take the opportunity to skip all actions if the PTE is already in the right state, half the number PVOps callouts, and skip TLB maintenance on a !P -> P transition which benefits non-Xen cases too.
--- arch/x86/include/asm/kfence.h | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
arch/x86/include/asm/kfence.h +24 -5
@@ -42,10 +42,34 @@ static inline bool kfence_protect_page(u {unsigned int level;pte_t *pte =lookup_address (addr, &level); +pteval_t val;if (WARN_ON (!pte || level !=PG_LEVEL_4K ))return false; + val =pte_val (*pte); + +/* +* protect requires making the page not-present. If the PTE is +* already in the right state, there's nothing to do. +*/ +if (protect != !!(val & _PAGE_PRESENT)) +return true; + +/* +* Otherwise, invert the entire PTE. This avoids writing out an +* L1TF-vulnerable PTE (not present, without the high address bits +* set). +*/ +set_pte (pte,__pte (~val)); + +/* +* If the page was protected (non-present) and we're making it +* present, there is no need to flush the TLB at all. +*/ +if (!protect) +return true; +/* * We need to avoid IPIs, as we may get KFENCE allocations or faults * with interrupts disabled. Therefore, the below is best-effort, and
@@ -53,11 +77,6 @@ static inline bool kfence_protect_page(u* lazy fault handling takes care of faults after the page is PRESENT. */ -if (protect) -set_pte (pte,__pte (pte_val (*pte) & ~_PAGE_PRESENT)); -else -set_pte (pte,__pte (pte_val (*pte) | _PAGE_PRESENT)); -/* * Flush this CPU's TLB, assuming whoever did the allocation/free is * likely to continue running on this CPU.
Greg Kroah-Hartman
maintainerPATCH 71/227 comedi: Fix getting range information for subdevices 16 to 255
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 10d28cffb3f6ec7ad67f0a4cd32c2afa92909452 upstream.
The COMEDI_RANGEINFO ioctl does not work properly for subdevice indices above 15. Currently, the only in-tree COMEDI drivers that support more than 16 subdevices are the "8255" driver and the "comedi_bond" driver. Making the ioctl work for subdevice indices up to 255 is achievable. It needs minor changes to the handling of the COMEDI_RANGEINFO and COMEDI_CHANINFO ioctls that should be mostly harmless to user-space, apart from making them less broken. Details follow...
The COMEDI_RANGEINFO ioctl command gets the list of supported ranges (usually with units of volts or milliamps) for a COMEDI subdevice or channel. (Only some subdevices have per-channel range tables, indicated by the SDF_RANGETYPE flag in the subdevice information.) It uses a range_type value and a user-space pointer, both supplied by user-space, but the range_type value should match what was obtained using the COMEDI_CHANINFO ioctl (if the subdevice has per-channel range tables) or COMEDI_SUBDINFO ioctl (if the subdevice uses a single range table for all channels). Bits 15 to 0 of the range_type value contain the length of the range table, which is the only part that user-space should care about (so it can use a suitably sized buffer to fetch the range table). Bits 23 to 16 store the channel index, which is assumed to be no more than 255 if the subdevice has per-channel range tables, and is set to 0 if the subdevice has a single range table. For range_type values produced by the COMEDI_SUBDINFO ioctl, bits 31 to 24 contain the subdevice index, which is assumed to be no more than 255. But for range_type values produced by the COMEDI_CHANINFO ioctl, bits 27 to 24 contain the subdevice index, which is assumed to be no more than 15, and bits 31 to 28 contain the COMEDI device's minor device number for some unknown reason lost in the mists of time. The COMEDI_RANGEINFO ioctl extract the length from bits 15 to 0 of the user-supplied range_type value, extracts the channel index from bits 23 to 16 (only used if the subdevice has per-channel range tables), extracts the subdevice index from bits 27 to 24, and ignores bits 31 to
28. So for subdevice indices 16 to 255, the COMEDI_SUBDINFO or COMEDI_CHANINFO ioctl will report a range_type value that doesn't work with the COMEDI_RANGEINFO ioctl. It will either get the range table for the subdevice index modulo 16, or will fail with -EINVAL.
To fix this, always use bits 31 to 24 of the range_type value to hold the subdevice index (assumed to be no more than 255). This affects the COMEDI_CHANINFO and COMEDI_RANGEINFO ioctls. There should not be anything in user-space that depends on the old, broken usage, although it may now see different values in bits 31 to 28 of the range_type values reported by the COMEDI_CHANINFO ioctl for subdevices that have per-channel subdevices. User-space should not be trying to decode bits 31 to 16 of the range_type values anyway.
--- drivers/comedi/comedi_fops.c | 2 +- drivers/comedi/range.c | 2 +- include/uapi/linux/comedi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/comedi/comedi_fops.c +1 -1
@@ -1099,7 +1099,7 @@ static int do_chaninfo_ioctl(struct comefor (i =0 ; i < s->n_chan; i++) {int x; - x = (dev->minor <<28 ) | (it->subdev <<24 ) | (i <<16 ) | + x = (it->subdev <<24 ) | (i <<16 ) | (s->range_table_list[i]->length);if (put_user (x, it->rangelist + i))return -EFAULT ;
drivers/comedi/range.c +1 -1
@@ -52,7 +52,7 @@ int do_rangeinfo_ioctl(struct comedi_devconst struct comedi_lrange *lr;struct comedi_subdevice *s; - subd = (it->range_type >>24 ) &0xf ; + subd = (it->range_type >>24 ) &0xff ; chan = (it->range_type >>16 ) &0xff ;if (!dev->attached)
include/uapi/linux/comedi.h +1 -1
@@ -640,7 +640,7 @@ struct comedi_chaninfo {/** * struct comedi_rangeinfo - used to retrieve the range table for a channel -* @range_type: Encodes subdevice index (bits 27:24), channel index +* @range_type: Encodes subdevice index (bits 31:24), channel index * (bits 23:16) and range table length (bits 15:0). * @range_ptr: Pointer to array of @struct comedi_krange to be filled * in with the range table for the channel or subdevice.
Greg Kroah-Hartman
maintainerPATCH 72/227 fs/writeback: skip AS_NO_DATA_INTEGRITY mappings in wait_sb_inodes()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joanne Koong <[email protected]>
commit f9a49aa302a05e91ca01f69031cb79a0ea33031f upstream.
Above the while() loop in wait_sb_inodes(), we document that we must wait for all pages under writeback for data integrity. Consequently, if a mapping, like fuse, traditionally does not have data integrity semantics, there is no need to wait at all; we can simply skip these inodes.
This restores fuse back to prior behavior where syncs are no-ops. This fixes a user regression where if a system is running a faulty fuse server that does not reply to issued write requests, this causes wait_sb_inodes() to wait forever.
--- fs/fs-writeback.c | 7 ++++++- fs/fuse/file.c | 4 +++- include/linux/pagemap.h | 11 +++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-)
fs/fs-writeback.c +6 -1
@@ -2729,8 +2729,13 @@ static void wait_sb_inodes(struct super_* The mapping can appear untagged while still on-list since we * do not have the mapping lock. Skip it here, wb completion * will remove it. +* +* If the mapping does not have data integrity semantics, +* there's no need to wait for the writeout to complete, as the +* mapping cannot guarantee that data is persistently stored. */ -if (!mapping_tagged (mapping,PAGECACHE_TAG_WRITEBACK )) +if (!mapping_tagged (mapping,PAGECACHE_TAG_WRITEBACK ) || +mapping_no_data_integrity (mapping))continue ;spin_unlock_irq (&sb->s_inode_wblist_lock);
fs/fuse/file.c +3 -1
@@ -3146,8 +3146,10 @@ void fuse_init_file_inode(struct inode * inode->i_fop = &fuse_file_operations; inode->i_data.a_ops = &fuse_file_aops; -if (fc->writeback_cache) +if (fc->writeback_cache) {mapping_set_writeback_may_deadlock_on_reclaim (&inode->i_data); +mapping_set_no_data_integrity (&inode->i_data); + }INIT_LIST_HEAD (&fi->write_files);INIT_LIST_HEAD (&fi->queued_writes);
include/linux/pagemap.h +11 -0
@@ -213,6 +213,7 @@ enum mapping_flags {AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM =9 ,AS_KERNEL_FILE =10 ,/* mapping for a fake kernel file that shouldn't account usage to user cgroups */ +AS_NO_DATA_INTEGRITY =11 ,/* no data integrity guarantees */ /* Bits 16-25 are used for FOLIO_ORDER */ AS_FOLIO_ORDER_BITS =5 , AS_FOLIO_ORDER_MIN = 16,
@@ -348,6 +349,16 @@ static inline bool mapping_writeback_mayreturn test_bit (AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM , &mapping->flags); } +static inline void mapping_set_no_data_integrity (struct address_space *mapping) +{ +set_bit (AS_NO_DATA_INTEGRITY , &mapping->flags); +} + +static inline bool mapping_no_data_integrity (const struct address_space *mapping) +{ +return test_bit (AS_NO_DATA_INTEGRITY , &mapping->flags); +} +static inline gfp_t mapping_gfp_mask (const struct address_space *mapping) {return mapping->gfp_mask;
Greg Kroah-Hartman
maintainerPATCH 73/227 drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellström <[email protected]>
commit bdcdf968be314b6fc8835b99fb4519e7619671e6 upstream.
CONFIG_DEVICE_PRIVATE is not selected by default by some distros, for example Fedora, and that leads to a regression in the xe driver since userptr support gets compiled out.
It turns out that DRM_GPUSVM, which is needed for xe userptr support compiles also without CONFIG_DEVICE_PRIVATE, but doesn't compile without CONFIG_ZONE_DEVICE.
Exclude the drm_pagemap files from compilation with !CONFIG_ZONE_DEVICE, and remove the CONFIG_DEVICE_PRIVATE dependency from CONFIG_DRM_GPUSVM and the xe driver's selection of it, re-enabling xe userptr for those configs.
v2:
- Don't compile the drm_pagemap files unless CONFIG_ZONE_DEVICE is set.
- Adjust the drm_pagemap.h header accordingly.
--- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/Makefile | 4 +++- drivers/gpu/drm/xe/Kconfig | 2 +- include/drm/drm_pagemap.h | 19 +++++++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-)
drivers/gpu/drm/Kconfig +1 -1
@@ -210,7 +210,7 @@ config DRM_GPUVM config DRM_GPUSVM tristate - depends on DRM && DEVICE_PRIVATE + depends on DRM select HMM_MIRROR select MMU_NOTIFIER help
drivers/gpu/drm/Makefile +3 -1
@@ -106,8 +106,10 @@ obj-$(CONFIG_DRM_EXEC) += drm_exec.o obj-$(CONFIG_DRM_GPUVM) += drm_gpuvm.o drm_gpusvm_helper-y := \ - drm_gpusvm.o\ + drm_gpusvm.o +drm_gpusvm_helper-$(CONFIG_ZONE_DEVICE) += \ drm_pagemap.o + obj-$(CONFIG_DRM_GPUSVM) += drm_gpusvm_helper.o obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o
drivers/gpu/drm/xe/Kconfig +1 -1
@@ -39,7 +39,7 @@ config DRM_XE select DRM_TTM select DRM_TTM_HELPER select DRM_EXEC - select DRM_GPUSVM if !UML && DEVICE_PRIVATE + select DRM_GPUSVM if !UML select DRM_GPUVM select DRM_SCHED select MMU_NOTIFIER
include/drm/drm_pagemap.h +17 -2
@@ -209,6 +209,19 @@ struct drm_pagemap_devmem_ops { struct dma_fence *pre_migrate_fence); }; +#if IS_ENABLED (CONFIG_ZONE_DEVICE ) + +struct drm_pagemap *drm_pagemap_page_to_dpagemap (struct page *page); + +#else + +static inline struct drm_pagemap *drm_pagemap_page_to_dpagemap (struct page *page) +{ +return NULL ; +} + +#endif /* IS_ENABLED(CONFIG_ZONE_DEVICE) */ +/** * struct drm_pagemap_devmem - Structure representing a GPU SVM device memory allocation *
@@ -233,6 +246,8 @@ struct drm_pagemap_devmem {struct dma_fence *pre_migrate_fence; }; +#if IS_ENABLED (CONFIG_ZONE_DEVICE ) + int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, struct mm_struct *mm, unsigned long start, unsigned long end,
@@ -243,8 +258,6 @@ int drm_pagemap_evict_to_ram(struct drm_const struct dev_pagemap_ops *drm_pagemap_pagemap_ops_get (void ); -struct drm_pagemap *drm_pagemap_page_to_dpagemap (struct page *page); - void drm_pagemap_devmem_init(struct drm_pagemap_devmem *devmem_allocation, struct device *dev, struct mm_struct *mm, const struct drm_pagemap_devmem_ops *ops,
@@ -256,4 +269,6 @@ int drm_pagemap_populate_mm(struct drm_pstruct mm_struct *mm, unsigned long timeslice_ms); +#endif /* IS_ENABLED(CONFIG_ZONE_DEVICE) */ +#endif
Greg Kroah-Hartman
maintainerPATCH 74/227 platform/x86: hp-bioscfg: Fix kobject warnings for empty attribute names
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit fdee1b09721605f532352628d0a24623e7062efb upstream.
The hp-bioscfg driver attempts to register kobjects with empty names when the HP BIOS returns attributes with empty name strings. This causes multiple kernel warnings:
kobject: (00000000135fb5e6): attempted to be registered with empty name!
WARNING: CPU: 14 PID: 3336 at lib/kobject.c:219 kobject_add_internal+0x2eb/0x310
Add validation in hp_init_bios_buffer_attribute() to check if the attribute name is empty after parsing it from the WMI buffer. If empty, log a debug message and skip registration of that attribute, allowing the module to continue processing other valid attributes.
--- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +8 -0
@@ -10,6 +10,8 @@#include <linux/fs.h> #include <linux/module.h> #include <linux/kernel.h> +#include <linux/printk.h> +#include <linux/string.h> #include <linux/wmi.h> #include "bioscfg.h" #include "../../firmware_attributes_class.h"
@@ -781,6 +783,12 @@ static int hp_init_bios_buffer_attributeif (ret <0 ) goto buff_attr_exit; +if (strlen (str) ==0 ) { +pr_debug ("Ignoring attribute with empty name\n" ); + ret =0 ; + goto buff_attr_exit; + } +if (attr_type ==HPWMI_PASSWORD_TYPE || attr_type ==HPWMI_SECURE_PLATFORM_TYPE ) temp_kset = bioscfg_drv.authentication_dir_kset;
Greg Kroah-Hartman
maintainerPATCH 75/227 platform/x86: hp-bioscfg: Fix kernel panic in GET_INSTANCE_ID macro
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 25150715e0b049b99df664daf05dab12f41c3e13 upstream.
The GET_INSTANCE_ID macro that caused a kernel panic when accessing sysfs attributes:
1. Off-by-one error: The loop condition used '<=' instead of '<', causing access beyond array bounds. Since array indices are 0-based and go from 0 to instances_count-1, the loop should use '<'.
2. Missing NULL check: The code dereferenced attr_name_kobj->name without checking if attr_name_kobj was NULL, causing a null pointer dereference in min_length_show() and other attribute show functions.
The panic occurred when fwupd tried to read BIOS configuration attributes:
Oops: general protection fault [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:min_length_show+0xcf/0x1d0 [hp_bioscfg]
Add a NULL check for attr_name_kobj before dereferencing and corrects the loop boundary to match the pattern used elsewhere in the driver.
--- drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/hp/hp-bioscfg/bioscfg.h +4 -2
@@ -10,6 +10,7 @@#include <linux/wmi.h> #include <linux/types.h> +#include <linux/string.h> #include <linux/device.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -285,8 +286,9 @@ enum hp_wmi_data_elements { { \int i; \ \ - for (i = 0; i <= bioscfg_drv.type##_instances_count; i++) { \ - if (!strcmp(kobj->name, bioscfg_drv.type##_data[i].attr_name_kobj->name)) \ + for (i = 0; i < bioscfg_drv.type##_instances_count; i++) { \ + if (bioscfg_drv.type##_data[i].attr_name_kobj && \ + !strcmp(kobj->name, bioscfg_drv.type##_data[i].attr_name_kobj->name)) \return i; \ } \return -EIO ; \
Greg Kroah-Hartman
maintainerPATCH 76/227 mm/hugetlb: fix hugetlb_pmd_shared()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand (Red Hat) <[email protected]>
commit ca1a47cd3f5f4c46ca188b1c9a27af87d1ab2216 upstream.
Patch series "mm/hugetlb: fixes for PMD table sharing (incl. using mmu_gather)", v3.
One functional fix, one performance regression fix, and two related comment fixes.
I cleaned up my prototype I recently shared [1] for the performance fix, deferring most of the cleanups I had in the prototype to a later point. While doing that I identified the other things.
The goal of this patch set is to be backported to stable trees "fairly" easily. At least patch #1 and #4.
Patch #1 fixes hugetlb_pmd_shared() not detecting any sharing Patch #2 + #3 are simple comment fixes that patch #4 interacts with. Patch #4 is a fix for the reported performance regression due to excessive IPI broadcasts during fork()+exit().
The last patch is all about TLB flushes, IPIs and mmu_gather.
Read: complicated
There are plenty of cleanups in the future to be had + one reasonable optimization on x86. But that's all out of scope for this series.
Runtime tested, with a focus on fixing the performance regression using the original reproducer [2] on x86.
This patch (of 4):
We switched from (wrongly) using the page count to an independent shared count. Now, shared page tables have a refcount of 1 (excluding speculative references) and instead use ptdesc->pt_share_count to identify sharing.
We didn't convert hugetlb_pmd_shared(), so right now, we would never detect a shared PMD table as such, because sharing/unsharing no longer touches the refcount of a PMD table.
Page migration, like mbind() or migrate_pages() would allow for migrating folios mapped into such shared PMD tables, even though the folios are not exclusive. In smaps we would account them as "private" although they are "shared", and we would be wrongly setting the PM_MMAP_EXCLUSIVE in the pagemap interface.
Fix it by properly using ptdesc_pmd_is_shared() in hugetlb_pmd_shared().
--- include/linux/hugetlb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/hugetlb.h +1 -1
@@ -1323,7 +1323,7 @@ static inline __init void hugetlb_cma_re#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING static inline bool hugetlb_pmd_shared (pte_t *pte) { -return page_count (virt_to_page (pte)) >1 ; +return ptdesc_pmd_is_shared (virt_to_ptdesc (pte)); }#else static inline bool hugetlb_pmd_shared (pte_t *pte)
Greg Kroah-Hartman
maintainerPATCH 77/227 mm/rmap: fix two comments related to huge_pmd_unshare()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand (Red Hat) <[email protected]>
commit a8682d500f691b6dfaa16ae1502d990aeb86e8be upstream.
PMD page table unsharing no longer touches the refcount of a PMD page table. Also, it is not about dropping the refcount of a "PMD page" but the "PMD page table".
Let's just simplify by saying that the PMD page table was unmapped, consequently also unmapping the folio that was mapped into this page.
This code should be deduplicated in the future.
--- mm/rmap.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
mm/rmap.c +4 -16
@@ -2027,14 +2027,8 @@ static bool try_to_unmap_one(struct foliflush_tlb_range (vma, range.start, range.end);/* -* The ref count of the PMD page was -* dropped which is part of the way map -* counting is done for shared PMDs. -* Return 'true' here. When there is -* no other sharing, huge_pmd_unshare -* returns false and we will unmap the -* actual page and drop map count -* to zero. +* The PMD table was unmapped, +* consequently unmapping the folio. */ goto walk_done; }
@@ -2416,14 +2410,8 @@ static bool try_to_migrate_one(struct fo range.start, range.end);/* -* The ref count of the PMD page was -* dropped which is part of the way map -* counting is done for shared PMDs. -* Return 'true' here. When there is -* no other sharing, huge_pmd_unshare -* returns false and we will unmap the -* actual page and drop map count -* to zero. +* The PMD table was unmapped, +* consequently unmapping the folio. */ page_vma_mapped_walk_done (&pvmw);break ;
Greg Kroah-Hartman
maintainerPATCH 78/227 mm: restore per-memcg proactive reclaim with !CONFIG_NUMA
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yosry Ahmed <[email protected]>
commit 16aca2c98a6fdf071e5a1a765a295995d7c7e346 upstream.
Commit 2b7226af730c ("mm/memcg: make memory.reclaim interface generic") moved proactive reclaim logic from memory.reclaim handler to a generic user_proactive_reclaim() helper to be used for per-node proactive reclaim.
However, user_proactive_reclaim() was only defined under CONFIG_NUMA, with a stub always returning 0 otherwise. This broke memory.reclaim on !CONFIG_NUMA configs, causing it to report success without actually attempting reclaim.
Move the definition of user_proactive_reclaim() outside CONFIG_NUMA, and instead define a stub for __node_reclaim() in the !CONFIG_NUMA case. __node_reclaim() is only called from user_proactive_reclaim() when a write is made to sys/devices/system/node/nodeX/reclaim, which is only defined with CONFIG_NUMA.
--- mm/internal.h | 8 -------- mm/vmscan.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 10 deletions(-)
mm/internal.h +0 -8
@@ -538,16 +538,8 @@ extern unsigned long highest_memmap_pfn;bool folio_isolate_lru (struct folio *folio);void folio_putback_lru (struct folio *folio);extern void reclaim_throttle (pg_data_t *pgdat,enum vmscan_throttle_state reason); -#ifdef CONFIG_NUMA int user_proactive_reclaim (char *buf,struct mem_cgroup *memcg,pg_data_t *pgdat); -#else -static inline int user_proactive_reclaim (char *buf, -struct mem_cgroup *memcg,pg_data_t *pgdat) -{ -return 0 ; -} -#endif /* * in mm/rmap.c:
mm/vmscan.c +11 -2
@@ -7740,6 +7740,17 @@ int node_reclaim(struct pglist_data *pgdreturn ret; } +#else + +static unsigned long __node_reclaim (struct pglist_data *pgdat,gfp_t gfp_mask, +unsigned long nr_pages, +struct scan_control *sc) +{ +return 0 ; +} + +#endif +enum {MEMORY_RECLAIM_SWAPPINESS =0 ,MEMORY_RECLAIM_SWAPPINESS_MAX ,
@@ -7847,8 +7858,6 @@ int user_proactive_reclaim(char *buf,return 0 ; } -#endif -/** * check_move_unevictable_folios - Move evictable folios to appropriate zone * lru list
Greg Kroah-Hartman
maintainerPATCH 79/227 timekeeping: Adjust the leap state for the correct auxiliary timekeeper
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
commit e806f7dde8ba28bc72a7a0898589cac79f6362ac upstream.
When __do_ajdtimex() was introduced to handle adjtimex for any timekeeper, this reference to tk_core was not updated. When called on an auxiliary timekeeper, the core timekeeper would be updated incorrectly.
This gets caught by the lock debugging diagnostics because the timekeepers sequence lock gets written to without holding its associated spinlock:
WARNING: include/linux/seqlock.h:226 at __do_adjtimex+0x394/0x3b0, CPU#2: test/125 aux_clock_adj (kernel/time/timekeeping.c:2979) __do_sys_clock_adjtime (kernel/time/posix-timers.c:1161 kernel/time/posix-timers.c:1173) do_syscall_64 (arch/x86/entry/syscall_64.c:63 (discriminator 1) arch/x86/entry/syscall_64.c:94 (discriminator 1))
entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:131)
Update the correct auxiliary timekeeper.
--- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/timekeeping.c +1 -1
@@ -2721,7 +2721,7 @@ static int __do_adjtimex(struct tk_datatimekeeping_update_from_shadow (tkd,TK_CLOCK_WAS_SET ); result->clock_set = true; }else { -tk_update_leap_state_all (&tk_core); +tk_update_leap_state_all (tkd); }/* Update the multiplier immediately if frequency was set directly */
Greg Kroah-Hartman
maintainerPATCH 80/227 io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 10dc959398175736e495f71c771f8641e1ca1907 upstream.
Currently this is checked before running the pending work. Normally this is quite fine, as work items either end up blocking (which will create a new worker for other items), or they complete fairly quickly. But syzbot reports an issue where io-wq takes seemingly forever to exit, and with a bit of debugging, this turns out to be because it queues a bunch of big (2GB - 4096b) reads with a /dev/msr* file. Since this file type doesn't support ->read_iter(), loop_rw_iter() ends up handling them. Each read returns 16MB of data read, which takes 20 (!!) seconds. With a bunch of these pending, processing the whole chain can take a long time. Easily longer than the syzbot uninterruptible sleep timeout of 140 seconds. This then triggers a complaint off the io-wq exit path:
INFO: task syz.4.135:6326 blocked for more than 143 seconds.
Not tainted syzkaller #0
Blocked by coredump.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:syz.4.135 state:D stack:26824 pid:6326 tgid:6324 ppid:5957 task_flags:0x400548 flags:0x00080000
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5256 [inline]
__schedule+0x1139/0x6150 kernel/sched/core.c:6863
__schedule_loop kernel/sched/core.c:6945 [inline]
schedule+0xe7/0x3a0 kernel/sched/core.c:6960
schedule_timeout+0x257/0x290 kernel/time/sleep_timeout.c:75
do_wait_for_common kernel/sched/completion.c:100 [inline]
__wait_for_common+0x2fc/0x4e0 kernel/sched/completion.c:121
io_wq_exit_workers io_uring/io-wq.c:1328 [inline]
io_wq_put_and_exit+0x271/0x8a0 io_uring/io-wq.c:1356
io_uring_clean_tctx+0x10d/0x190 io_uring/tctx.c:203
io_uring_cancel_generic+0x69c/0x9a0 io_uring/cancel.c:651
io_uring_files_cancel include/linux/io_uring.h:19 [inline]
do_exit+0x2ce/0x2bd0 kernel/exit.c:911
do_group_exit+0xd3/0x2a0 kernel/exit.c:1112
get_signal+0x2671/0x26d0 kernel/signal.c:3034
arch_do_signal_or_restart+0x8f/0x7e0 arch/x86/kernel/signal.c:337
__exit_to_user_mode_loop kernel/entry/common.c:41 [inline]
exit_to_user_mode_loop+0x8c/0x540 kernel/entry/common.c:75
__exit_to_user_mode_prepare include/linux/irq-entry-common.h:226 [inline]
syscall_exit_to_user_mode_prepare include/linux/irq-entry-common.h:256 [inline]
syscall_exit_to_user_mode_work include/linux/entry-common.h:159 [inline]
syscall_exit_to_user_mode include/linux/entry-common.h:194 [inline]
do_syscall_64+0x4ee/0xf80 arch/x86/entry/syscall_64.c:100
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fa02738f749
RSP: 002b:00007fa0281ae0e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000ca
RAX: fffffffffffffe00 RBX: 00007fa0275e6098 RCX: 00007fa02738f749
RDX: 0000000000000000 RSI: 0000000000000080 RDI: 00007fa0275e6098
RBP: 00007fa0275e6090 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007fa0275e6128 R14: 00007fff14e4fcb0 R15: 00007fff14e4fd98There's really nothing wrong here, outside of processing these reads will take a LONG time. However, we can speed up the exit by checking the IO_WQ_BIT_EXIT inside the io_worker_handle_work() loop, as syzbot will exit the ring after queueing up all of these reads. Then once the first item is processed, io-wq will simply cancel the rest. That should avoid syzbot running into this complaint again.
--- io_uring/io-wq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/io-wq.c +1 -1
@@ -598,9 +598,9 @@ static void io_worker_handle_work(struct __releases(&acct->lock) {struct io_wq *wq = worker->wq; -bool do_kill =test_bit (IO_WQ_BIT_EXIT , &wq->state); do { + bool do_kill = test_bit(IO_WQ_BIT_EXIT, &wq->state); struct io_wq_work *work; /*
Greg Kroah-Hartman
maintainerPATCH 81/227 iio: imu: st_lsm6dsx: fix iio_chan_spec for sensors without event detection
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Lavra <[email protected]>
commit c34e2e2d67b3bb8d5a6d09b0d6dac845cdd13fb3 upstream.
The st_lsm6dsx_acc_channels array of struct iio_chan_spec has a non-NULL event_spec field, indicating support for IIO events. However, event detection is not supported for all sensors, and if userspace tries to configure accelerometer wakeup events on a sensor device that does not support them (e.g. LSM6DS0), st_lsm6dsx_write_event() dereferences a NULL pointer when trying to write to the wakeup register.
Define an additional struct iio_chan_spec array whose members have a NULL event_spec field, and use this array instead of st_lsm6dsx_acc_channels for sensors without event detection capability.
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +11 -4
@@ -101,6 +101,13 @@ static const struct iio_chan_spec st_lsm IIO_CHAN_SOFT_TIMESTAMP(3), }; +static const struct iio_chan_spec st_lsm6ds0_acc_channels[] = { +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x28 ,IIO_MOD_X ,0 ), +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2a ,IIO_MOD_Y ,1 ), +ST_LSM6DSX_CHANNEL (IIO_ACCEL ,0x2c ,IIO_MOD_Z ,2 ), +IIO_CHAN_SOFT_TIMESTAMP (3 ), +}; +static const struct iio_chan_spec st_lsm6dsx_gyro_channels[] = {ST_LSM6DSX_CHANNEL (IIO_ANGL_VEL ,0x22 ,IIO_MOD_X ,0 ),ST_LSM6DSX_CHANNEL (IIO_ANGL_VEL ,0x24 ,IIO_MOD_Y ,1 ),
@@ -142,8 +149,8 @@ static const struct st_lsm6dsx_settings }, .channels = { [ST_LSM6DSX_ID_ACC] = { - .chan = st_lsm6dsx_acc_channels, - .len = ARRAY_SIZE(st_lsm6dsx_acc_channels), + .chan = st_lsm6ds0_acc_channels, + .len = ARRAY_SIZE(st_lsm6ds0_acc_channels), }, [ST_LSM6DSX_ID_GYRO] = { .chan = st_lsm6ds0_gyro_channels,
@@ -1449,8 +1456,8 @@ static const struct st_lsm6dsx_settings }, .channels = { [ST_LSM6DSX_ID_ACC] = { - .chan = st_lsm6dsx_acc_channels, - .len = ARRAY_SIZE(st_lsm6dsx_acc_channels), + .chan = st_lsm6ds0_acc_channels, + .len = ARRAY_SIZE(st_lsm6ds0_acc_channels), }, [ST_LSM6DSX_ID_GYRO] = { .chan = st_lsm6dsx_gyro_channels,
Greg Kroah-Hartman
maintainerPATCH 82/227 iio: adc: ad7280a: handle spi_setup() errors in probe()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Zhigulin <[email protected]>
[ Upstream commit 6b39824ac4c15783787e6434449772bfb2e31214 ]
The probe() function ignored the return value of spi_setup(), leaving SPI configuration failures undetected. If spi_setup() fails, the driver should stop initialization and propagate the error to the caller.
Add proper error handling: check the return value of spi_setup() and return it on failure.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/iio/adc/ad7280a.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ad7280a.c +3 -1
@@ -1024,7 +1024,9 @@ static int ad7280_probe(struct spi_device *spi) st->spi->max_speed_hz =AD7280A_MAX_SPI_CLK_HZ ; st->spi->mode =SPI_MODE_1 ; -spi_setup (st->spi); + ret =spi_setup (st->spi); +if (ret <0 ) +return ret; st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , st->acquisition_time) |FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , st->thermistor_term_en);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 83/227 iio: adc: ad7606: Fix incorrect type for error return variable
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haotian Zhang <[email protected]>
[ Upstream commit c5512e016817a150fd6de97fbb3e74aa799ea3c1 ]
The variable ret is declared as unsigned int but is used to store return values from functions returning int, which may be negative error codes.
Change ret from unsigned int to int.
--- drivers/iio/adc/ad7606_par.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/adc/ad7606_par.c +2 -1
@@ -43,7 +43,8 @@ static int ad7606_par_bus_setup_iio_backend(struct device *dev, struct iio_dev *indio_dev) {struct ad7606_state *st =iio_priv (indio_dev); -unsigned int ret, c; +unsigned int c; +int ret;struct iio_backend_data_fmt data = { .sign_extend = true, .enable = true,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 84/227 interconnect: debugfs: initialize src_node and dst_node to empty strings
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Georgi Djakov <[email protected]>
[ Upstream commit 8cc27f5c6dd17dd090f3a696683f04336c162ff5 ]
The debugfs_create_str() API assumes that the string pointer is either NULL or points to valid kmalloc() memory. Leaving the pointer uninitialized can cause problems.
Initialize src_node and dst_node to empty strings before creating the debugfs entries to guarantee that reads and writes are safe.
--- drivers/interconnect/debugfs-client.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/interconnect/debugfs-client.c +5 -0
@@ -150,6 +150,11 @@ int icc_debugfs_client_init(struct dentry *icc_dir)return ret; } + src_node =devm_kstrdup (&pdev->dev,"" ,GFP_KERNEL ); + dst_node =devm_kstrdup (&pdev->dev,"" ,GFP_KERNEL ); +if (!src_node || !dst_node) +return -ENOMEM ; + client_dir =debugfs_create_dir ("test_client" , icc_dir);debugfs_create_str ("src_node" ,0600 , client_dir, &src_node);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 85/227 spi: spi-sprd-adi: Fix double free in probe error path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit 383d4f5cffcc8df930d95b06518a9d25a6d74aac ]
The driver currently uses spi_alloc_host() to allocate the controller but registers it using devm_spi_register_controller().
If devm_register_restart_handler() fails, the code jumps to the put_ctlr label and calls spi_controller_put(). However, since the controller was registered via a devm function, the device core will automatically call spi_controller_put() again when the probe fails. This results in a double-free of the spi_controller structure.
Fix this by switching to devm_spi_alloc_host() and removing the manual spi_controller_put() call.
--- drivers/spi/spi-sprd-adi.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-)
drivers/spi/spi-sprd-adi.c +10 -23
@@ -528,7 +528,7 @@ static int sprd_adi_probe(struct platform_device *pdev) pdev->id =of_alias_get_id (np,"spi" ); num_chipselect =of_get_child_count (np); - ctlr =spi_alloc_host (&pdev->dev,sizeof (struct sprd_adi )); + ctlr =devm_spi_alloc_host (&pdev->dev,sizeof (struct sprd_adi ));if (!ctlr)return -ENOMEM ;
@@ -536,10 +536,8 @@ static int sprd_adi_probe(struct platform_device *pdev) sadi =spi_controller_get_devdata (ctlr); sadi->base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (sadi->base)) { - ret =PTR_ERR (sadi->base); - goto put_ctlr; - } +if (IS_ERR (sadi->base)) +return PTR_ERR (sadi->base); sadi->slave_vbase = (unsigned long )sadi->base + data->slave_offset;
@@ -551,18 +549,15 @@ static int sprd_adi_probe(struct platform_device *pdev)if (ret >0 || (IS_ENABLED (CONFIG_HWSPINLOCK ) && ret ==0 )) { sadi->hwlock =devm_hwspin_lock_request_specific (&pdev->dev, ret); -if (!sadi->hwlock) { - ret = -ENXIO ; - goto put_ctlr; - } +if (!sadi->hwlock) +return -ENXIO ; }else {switch (ret) {case -ENOENT :dev_info (&pdev->dev,"no hardware spinlock supplied\n" );break ;default : -dev_err_probe (&pdev->dev, ret,"failed to find hwlock id\n" ); - goto put_ctlr; +return dev_err_probe (&pdev->dev, ret,"failed to find hwlock id\n" ); } }
@@ -579,26 +574,18 @@ static int sprd_adi_probe(struct platform_device *pdev) ctlr->transfer_one = sprd_adi_transfer_one; ret =devm_spi_register_controller (&pdev->dev, ctlr); -if (ret) { -dev_err (&pdev->dev,"failed to register SPI controller\n" ); - goto put_ctlr; - } +if (ret) +return dev_err_probe (&pdev->dev, ret,"failed to register SPI controller\n" );if (sadi->data->restart) { ret =devm_register_restart_handler (&pdev->dev, sadi->data->restart, sadi); -if (ret) { -dev_err (&pdev->dev,"can not register restart handler\n" ); - goto put_ctlr; - } +if (ret) +return dev_err_probe (&pdev->dev, ret,"can not register restart handler\n" ); }return 0 ; - -put_ctlr: -spi_controller_put (ctlr); -return ret; }static struct sprd_adi_data sc9860_data = {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 86/227 regmap: Fix race condition in hwspinlock irqsave routine
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cheng-Yu Lee <[email protected]>
[ Upstream commit 4b58aac989c1e3fafb1c68a733811859df388250 ]
Previously, the address of the shared member '&map->spinlock_flags' was passed directly to 'hwspin_lock_timeout_irqsave'. This creates a race condition where multiple contexts contending for the lock could overwrite the shared flags variable, potentially corrupting the state for the current lock owner.
Fix this by using a local stack variable 'flags' to store the IRQ state temporarily.
--- drivers/base/regmap/regmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/regmap/regmap.c +3 -1
@@ -408,9 +408,11 @@ static void regmap_lock_hwlock_irq(void *__map)static void regmap_lock_hwlock_irqsave (void *__map) {struct regmap *map = __map; +unsigned long flags =0 ;hwspin_lock_timeout_irqsave (map->hwlock,UINT_MAX , - &map->spinlock_flags); + &flags); + map->spinlock_flags = flags; }static void regmap_unlock_hwlock (void *__map)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 87/227 kconfig: fix static linking of nconf
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arkadiusz Kozdra <[email protected]>
[ Upstream commit baaecfcac559bcac73206df447eb5c385fa22f2a ]
When running make nconfig with a static linking host toolchain, the libraries are linked in an incorrect order, resulting in errors similar to the following:
$ MAKEFLAGS='HOSTCC=cc\ -static' make nconfig /usr/bin/ld: /usr/lib64/gcc/x86_64-unknown-linux-gnu/14.2.1/../../../../lib64/libpanel.a(p_new.o): in function `new_panel': (.text+0x13): undefined reference to `_nc_panelhook_sp' /usr/bin/ld: (.text+0x6c): undefined reference to `_nc_panelhook_sp'
--- scripts/kconfig/nconf-cfg.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
scripts/kconfig/nconf-cfg.sh +6 -5
@@ -6,8 +6,9 @@ set -eu cflags=$1 libs=$2 -PKG="ncursesw menuw panelw" -PKG2="ncurses menu panel" +# Keep library order for static linking (HOSTCC='cc -static') +PKG="menuw panelw ncursesw" +PKG2="menu panel ncurses" if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then if ${HOSTPKG_CONFIG} --exists $PKG; then
@@ -28,19 +29,19 @@ fi # find ncurses by pkg-config.) if [ -f /usr/include/ncursesw/ncurses.h ]; then echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags} - echo -lncursesw -lmenuw -lpanelw > ${libs} + echo -lmenuw -lpanelw -lncursesw > ${libs} exit 0 fi if [ -f /usr/include/ncurses/ncurses.h ]; then echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags} - echo -lncurses -lmenu -lpanel > ${libs} + echo -lmenu -lpanel -lncurses > ${libs} exit 0 fi if [ -f /usr/include/ncurses.h ]; then echo -D_GNU_SOURCE > ${cflags} - echo -lncurses -lmenu -lpanel > ${libs} + echo -lmenu -lpanel -lncurses > ${libs} exit 0 fi
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 88/227 riscv: clocksource: Fix stimecmp update hazard on RV32
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Naohiko Shimizu <[email protected]>
[ Upstream commit eaa9bb1d39d59e7c17b06cec12622b7c586ab629 ]
On RV32, updating the 64-bit stimecmp (or vstimecmp) CSR requires two separate 32-bit writes. A race condition exists if the timer triggers during these two writes.
The RISC-V Privileged Specification (e.g., Section 3.2.1 for mtimecmp) recommends a specific 3-step sequence to avoid spurious interrupts when updating 64-bit comparison registers on 32-bit systems:
1. Set the low-order bits (stimecmp) to all ones (ULONG_MAX).
2. Set the high-order bits (stimecmph) to the desired value.
3. Set the low-order bits (stimecmp) to the desired value.
Current implementation writes the LSB first without ensuring a future value, which may lead to a transient state where the 64-bit comparison is incorrectly evaluated as "expired" by the hardware. This results in spurious timer interrupts.
This patch adopts the spec-recommended 3-step sequence to ensure the intermediate 64-bit state is never smaller than the current time.
--- drivers/clocksource/timer-riscv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clocksource/timer-riscv.c +2 -1
@@ -50,8 +50,9 @@ static int riscv_clock_next_event(unsigned long delta,if (static_branch_likely (&riscv_sstc_available)) {#if defined(CONFIG_32BIT ) -csr_write (CSR_STIMECMP , next_tval &0xFFFFFFFF ); +csr_write (CSR_STIMECMP ,ULONG_MAX );csr_write (CSR_STIMECMPH , next_tval >>32 ); +csr_write (CSR_STIMECMP , next_tval &0xFFFFFFFF );#else csr_write (CSR_STIMECMP , next_tval);#endif
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 89/227 riscv: suspend: Fix stimecmp update hazard on RV32
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Naohiko Shimizu <[email protected]>
[ Upstream commit 344c5281f43851b22c7cc223fd0250c143fcbc79 ]
On RV32, updating the 64-bit stimecmp (or vstimecmp) CSR requires two separate 32-bit writes. A race condition exists if the timer triggers during these two writes.
The RISC-V Privileged Specification (e.g., Section 3.2.1 for mtimecmp) recommends a specific 3-step sequence to avoid spurious interrupts when updating 64-bit comparison registers on 32-bit systems:
1. Set the low-order bits (stimecmp) to all ones (ULONG_MAX).
2. Set the high-order bits (stimecmph) to the desired value.
3. Set the low-order bits (stimecmp) to the desired value.
Current implementation writes the LSB first without ensuring a future value, which may lead to a transient state where the 64-bit comparison is incorrectly evaluated as "expired" by the hardware. This results in spurious timer interrupts.
This patch adopts the spec-recommended 3-step sequence to ensure the intermediate 64-bit state is never smaller than the current time.
--- arch/riscv/kernel/suspend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/riscv/kernel/suspend.c +2 -1
@@ -51,10 +51,11 @@ void suspend_restore_csrs(struct suspend_context *context)#ifdef CONFIG_MMU if (riscv_has_extension_unlikely (RISCV_ISA_EXT_SSTC )) { -csr_write (CSR_STIMECMP , context->stimecmp);#if __riscv_xlen <64 +csr_write (CSR_STIMECMP ,ULONG_MAX );csr_write (CSR_STIMECMPH , context->stimecmph);#endif +csr_write (CSR_STIMECMP , context->stimecmp); }csr_write (CSR_SATP , context->satp);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 90/227 platform/mellanox: Fix SN5640/SN5610 LED platform data
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Shamray <[email protected]>
[ Upstream commit 3113bcf4ccf06c938f0bc0c34cf6efe03278badc ]
In SN5640/SN5610 platforms should be used XDR style LED data with predefined slot index per led_fan.
--- drivers/platform/mellanox/mlx-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/mellanox/mlx-platform.c +1 -1
@@ -7381,7 +7381,7 @@ static int __init mlxplat_dmi_ng400_hi171_matched(const struct dmi_system_id *dm mlxplat_hotplug = &mlxplat_mlxcpld_ng800_hi171_data; mlxplat_hotplug->deferred_nr = mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM -1 ]; - mlxplat_led = &mlxplat_default_ng_led_data; + mlxplat_led = &mlxplat_xdr_led_data; mlxplat_regs_io = &mlxplat_default_ng_regs_io_data; mlxplat_fan = &mlxplat_xdr_fan_data;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 91/227 platform/x86/amd: Fix memory leak in wbrf_record()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
[ Upstream commit 2bf1877b7094c684e1d652cac6912cfbc507ad3e ]
The tmp buffer is allocated using kcalloc() but is not freed if acpi_evaluate_dsm() fails. This causes a memory leak in the error path.
Fix this by explicitly freeing the tmp buffer in the error handling path of acpi_evaluate_dsm().
--- drivers/platform/x86/amd/wbrf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/amd/wbrf.c +3 -1
@@ -104,8 +104,10 @@ static int wbrf_record(struct acpi_device *adev, uint8_t action, struct wbrf_ran obj =acpi_evaluate_dsm (adev->handle, &wifi_acpi_dsm_guid,WBRF_REVISION ,WBRF_RECORD , &argv4); -if (!obj) +if (!obj) { +kfree (tmp);return -EINVAL ; + }if (obj->type !=ACPI_TYPE_INTEGER ) { ret = -EINVAL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 92/227 scsi: core: Wake up the error handler when final completions race against each other
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
[ Upstream commit fe2f8ad6f0999db3b318359a01ee0108c703a8c3 ]
The fragile ordering between marking commands completed or failed so that the error handler only wakes when the last running command completes or times out has race conditions. These race conditions can cause the SCSI layer to fail to wake the error handler, leaving I/O through the SCSI host stuck as the error state cannot advance.
First, there is an memory ordering issue within scsi_dec_host_busy(). The write which clears SCMD_STATE_INFLIGHT may be reordered with reads counting in scsi_host_busy(). While the local CPU will see its own write, reordering can allow other CPUs in scsi_dec_host_busy() or scsi_eh_inc_host_failed() to see a raised busy count, causing no CPU to see a host busy equal to the host_failed count.
This race condition can be prevented with a memory barrier on the error path to force the write to be visible before counting host busy commands.
Second, there is a general ordering issue with scsi_eh_inc_host_failed(). By counting busy commands before incrementing host_failed, it can race with a final command in scsi_dec_host_busy(), such that scsi_dec_host_busy() does not see host_failed incremented but scsi_eh_inc_host_failed() counts busy commands before SCMD_STATE_INFLIGHT is cleared by scsi_dec_host_busy(), resulting in neither waking the error handler task.
This needs the call to scsi_host_busy() to be moved after host_failed is incremented to close the race condition.
--- drivers/scsi/scsi_error.c | 11 ++++++++++- drivers/scsi/scsi_lib.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/scsi/scsi_error.c +10 -1
@@ -282,11 +282,20 @@ static void scsi_eh_inc_host_failed(struct rcu_head *head) {struct scsi_cmnd *scmd =container_of (head,typeof (*scmd), rcu);struct Scsi_Host *shost = scmd->device->host; -unsigned int busy =scsi_host_busy (shost); +unsigned int busy;unsigned long flags;spin_lock_irqsave (shost->host_lock, flags); shost->host_failed++; +spin_unlock_irqrestore (shost->host_lock, flags); +/* +* The counting of busy requests needs to occur after adding to +* host_failed or after the lock acquire for adding to host_failed +* to prevent a race with host unbusy and missing an eh wakeup. +*/ + busy =scsi_host_busy (shost); + +spin_lock_irqsave (shost->host_lock, flags);scsi_eh_wakeup (shost, busy);spin_unlock_irqrestore (shost->host_lock, flags); }
drivers/scsi/scsi_lib.c +8 -0
@@ -376,6 +376,14 @@ static void scsi_dec_host_busy(struct Scsi_Host *shost, struct scsi_cmnd *cmd)rcu_read_lock ();__clear_bit (SCMD_STATE_INFLIGHT , &cmd->state);if (unlikely (scsi_host_in_recovery (shost))) { +/* +* Ensure the clear of SCMD_STATE_INFLIGHT is visible to +* other CPUs before counting busy requests. Otherwise, +* reordering can cause CPUs to race and miss an eh wakeup +* when no CPU sees all busy requests as done or timed out. +*/ +smp_mb (); +unsigned int busy =scsi_host_busy (shost);spin_lock_irqsave (shost->host_lock, flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 93/227 scsi: qla2xxx: Sanitize payload size to prevent member overflow
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
[ Upstream commit 19bc5f2a6962dfaa0e32d0e0bc2271993d85d414 ]
In qla27xx_copy_fpin_pkt() and qla27xx_copy_multiple_pkt(), the frame_size reported by firmware is used to calculate the copy length into item->iocb. However, the iocb member is defined as a fixed-size 64-byte array within struct purex_item.
If the reported frame_size exceeds 64 bytes, subsequent memcpy calls will overflow the iocb member boundary. While extra memory might be allocated, this cross-member write is unsafe and triggers warnings under CONFIG_FORTIFY_SOURCE.
Fix this by capping total_bytes to the size of the iocb member (64 bytes) before allocation and copying. This ensures all copies remain within the bounds of the destination structure member.
--- drivers/scsi/qla2xxx/qla_isr.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/qla2xxx/qla_isr.c +7 -0
@@ -878,6 +878,9 @@ qla27xx_copy_multiple_pkt(struct scsi_qla_host *vha, void **pkt, payload_size =sizeof (purex->els_frame_payload); } +if (total_bytes >sizeof (item->iocb.iocb)) + total_bytes =sizeof (item->iocb.iocb); + pending_bytes = total_bytes; no_bytes = (pending_bytes > payload_size) ? payload_size : pending_bytes;
@@ -1163,6 +1166,10 @@ qla27xx_copy_fpin_pkt(struct scsi_qla_host *vha, void **pkt, total_bytes = (le16_to_cpu (purex->frame_size) &0x0FFF ) -PURX_ELS_HEADER_SIZE ; + +if (total_bytes >sizeof (item->iocb.iocb)) + total_bytes =sizeof (item->iocb.iocb); + pending_bytes = total_bytes; entry_count = entry_count_remaining = purex->entry_count; no_bytes = (pending_bytes > sizeof(purex->els_frame_payload)) ?
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 94/227 ALSA: usb: Increase volume range that triggers a warning
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arun Raghavan <[email protected]>
[ Upstream commit 6b971191fcfc9e3c2c0143eea22534f1f48dbb62 ]
On at least the HyperX Cloud III, the range is 18944 (-18944 -> 0 in steps of 1), so the original check for 255 steps is definitely obsolete. Let's give ourselves a little more headroom before we emit a warning.
--- sound/usb/mixer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
sound/usb/mixer.c +3 -4
@@ -1813,11 +1813,10 @@ static void __build_feature_ctl(struct usb_mixer_interface *mixer, range = (cval->max - cval->min) / cval->res;/* -* Are there devices with volume range more than 255? I use a bit more -* to be sure. 384 is a resolution magic number found on Logitech -* devices. It will definitively catch all buggy Logitech devices. +* There are definitely devices with a range of ~20,000, so let's be +* conservative and allow for a bit more. */ -if (range >384 ) { +if (range >65535 ) {usb_audio_warn (mixer->chip,"Warning! Unlikely big volume range (=%u), cval->res is probably wrong." , range);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 95/227 ntb: transport: Fix uninitialized mutex
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit 2ccb5e8dbcd2dedf13e0270165ac48bd79b7f673 ]
When the mutex 'link_event_lock' was introduced, it was never initialized and it triggers kernel warnings when used with locking debug turned on. Add initialization for the mutex.
--- drivers/ntb/ntb_transport.c | 1 + 1 file changed, 1 insertion(+)
drivers/ntb/ntb_transport.c +1 -0
@@ -1394,6 +1394,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) goto err2; } +mutex_init (&nt->link_event_lock);INIT_DELAYED_WORK (&nt->link_work, ntb_transport_link_work);INIT_WORK (&nt->link_cleanup, ntb_transport_link_cleanup_work);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 96/227 iommu/amd: Fix error path in amd_iommu_probe_device()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasant Hegde <[email protected]>
[ Upstream commit 3222b6de5145272c43a90cb8667377d676635ea0 ]
Currently, the error path of amd_iommu_probe_device() unconditionally references dev_data, which may not be initialized if an early failure occurs (like iommu_init_device() fails).
Move the out_err label to ensure the function exits immediately on failure without accessing potentially uninitialized dev_data.
--- drivers/iommu/amd/iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iommu/amd/iommu.c +1 -2
@@ -2426,8 +2426,6 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) goto out_err; } -out_err: -iommu_completion_wait (iommu);if (FEATURE_NUM_INT_REMAP_SUP_2K (amd_iommu_efr2))
@@ -2438,6 +2436,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev)if (dev_is_pci (dev))pci_prepare_ats (to_pci_dev (dev),PAGE_SHIFT ); +out_err:return iommu_dev; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 97/227 drm/xe/xe_late_bind_fw: fix enum xe_late_bind_fw_id kernel-doc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit dc1d0ffee09740088eb190af84a2c470d279bad9 ]
Fix kernel-doc warnings on enum xe_late_bind_fw_id:
Warning: ../drivers/gpu/drm/xe/xe_late_bind_fw_types.h:19 cannot
understand function prototype: 'enum xe_late_bind_fw_id'
--- drivers/gpu/drm/xe/xe_late_bind_fw_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_late_bind_fw_types.h +3 -1
@@ -15,10 +15,12 @@#define XE_LB_MAX_PAYLOAD_SIZE SZ_4K/** -* xe_late_bind_fw_id - enum to determine late binding fw index +* enum xe_late_bind_fw_id - enum to determine late binding fw index */ enum xe_late_bind_fw_id { +/** @XE_LB_FW_FAN_CONTROL: Fan control */ XE_LB_FW_FAN_CONTROL =0 , +/** @XE_LB_FW_MAX_ID: Number of IDs */ XE_LB_FW_MAX_ID };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 98/227 drm/xe/vm: fix xe_vm_validation_exec() kernel-doc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 47bf28e22a121b807a9a9680c4209846a78a98a6 ]
Fix kernel-doc warnings on xe_vm_validation_exec():
Warning: ../drivers/gpu/drm/xe/xe_vm.h:392 expecting prototype for
xe_vm_set_validation_exec(). Prototype was for xe_vm_validation_exec() instead
--- drivers/gpu/drm/xe/xe_vm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_vm.h +1 -1
@@ -379,7 +379,7 @@ static inline void xe_vm_set_validation_exec(struct xe_vm *vm, struct drm_exec * }/** -* xe_vm_set_validation_exec() - Accessor to read the drm_exec object +* xe_vm_validation_exec() - Accessor to read the drm_exec object * @vm: The vm we want to register a drm_exec object with. * * Return: The drm_exec object used to lock the vm's resv. The value
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 99/227 drm/xe: Disable timestamp WA on VFs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Brost <[email protected]>
[ Upstream commit b886aa65eafe3098bbd691f0ca4a9abce03f9d03 ]
The timestamp WA does not work on a VF because it requires reading MMIO registers, which are inaccessible on a VF. This timestamp WA confuses LRC sampling on a VF during TDR, as the LRC timestamp would always read as 1 for any active context. Disable the timestamp WA on VFs to avoid this confusion.
--- drivers/gpu/drm/xe/xe_lrc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/xe/xe_lrc.c +3 -0
@@ -1050,6 +1050,9 @@ static ssize_t setup_utilization_wa(struct xe_lrc *lrc, {u32 *cmd = batch; +if (IS_SRIOV_VF (gt_to_xe (lrc->gt))) +return 0 ; +if (xe_gt_WARN_ON (lrc->gt, max_len <12 ))return -ENOSPC ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 100/227 drm/mediatek: dpi: Find next bridge during probe
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 21465e73400dc69a5f732ae7bcc2a58bad673cd1 ]
Trying to find the next bridge and deferring probe in the bridge attach callback is much too late. At this point the driver has already finished probing and is now running the component bind code path. What's even worse is that in the specific case of the DSI host being the last component to be added as part of the dsi_host_attach callback, the code path that this is in:
-> devm_drm_of_get_bridge()
mtk_dpi_bridge_attach()
drm_bridge_attach()
mtk_dpi_bind()
...
component_add()
mtk_dsi_host_attach()
anx7625_attach_dsi()
anx7625_link_bridge()
- done_probing callback for of_dp_aux_populate_bus()
of_dp_aux_populate_bus()
anx7625_i2c_probe()_cannot_ return probe defer:
anx7625 4-0058: [drm:anx7625_bridge_attach] drm attach mediatek-drm mediatek-drm.15.auto: bound 14014000.dsi
(ops mtk_dsi_component_ops)
mediatek-drm mediatek-drm.15.auto: error -EPROBE_DEFER:
failed to attach bridge /soc/dpi@14015000 to encoder TMDS-37
[drm:mtk_dsi_host_attach] *ERROR* failed to add dsi_host
component: -517
anx7625 4-0058: [drm:anx7625_link_bridge] *ERROR* fail to attach dsi
to host.
panel-simple-dp-aux aux-4-0058: DP AUX done_probing() can't defer panel-simple-dp-aux aux-4-0058: probe with driver panel-simple-dp-aux
failed with error -22
anx7625 4-0058: [drm:anx7625_i2c_probe] probe done
This results in the whole display driver failing to probe.
Perhaps this was an attempt to mirror the structure in the DSI driver; but in the DSI driver the next bridge is retrieved in the DSI attach callback, not the bridge attach callback.
Move the code finding the next bridge back to the probe function so that deferred probing works correctly. Also rework the fallback to the old OF graph endpoint numbering scheme so that deferred probing logs in both cases.
This issue was found on an MT8183 Jacuzzi device with an extra patch enabling the DPI-based external display pipeline. Also tested on an MT8192 Hayato device with both DSI and DPI display pipelines enabled.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +9 -14
@@ -836,20 +836,6 @@ static int mtk_dpi_bridge_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) {struct mtk_dpi *dpi =bridge_to_dpi (bridge); -int ret; - - dpi->next_bridge =devm_drm_of_get_bridge (dpi->dev, dpi->dev->of_node,1 ,-1 ); -if (IS_ERR (dpi->next_bridge)) { - ret =PTR_ERR (dpi->next_bridge); -if (ret == -EPROBE_DEFER ) -return ret; - -/* Old devicetree has only one endpoint */ - dpi->next_bridge =devm_drm_of_get_bridge (dpi->dev, dpi->dev->of_node,0 ,0 ); -if (IS_ERR (dpi->next_bridge)) -return dev_err_probe (dpi->dev,PTR_ERR (dpi->next_bridge), -"Failed to get bridge\n" ); - }return drm_bridge_attach (encoder, dpi->next_bridge, &dpi->bridge, flags);
@@ -1319,6 +1305,15 @@ static int mtk_dpi_probe(struct platform_device *pdev)if (dpi->irq <0 )return dpi->irq; + dpi->next_bridge =devm_drm_of_get_bridge (dpi->dev, dpi->dev->of_node,1 ,-1 ); +if (IS_ERR (dpi->next_bridge) &&PTR_ERR (dpi->next_bridge) == -ENODEV ) { +/* Old devicetree has only one endpoint */ + dpi->next_bridge =devm_drm_of_get_bridge (dpi->dev, dpi->dev->of_node,0 ,0 ); + } +if (IS_ERR (dpi->next_bridge)) +return dev_err_probe (dpi->dev,PTR_ERR (dpi->next_bridge), +"Failed to get bridge\n" ); +platform_set_drvdata (pdev, dpi); dpi->bridge.of_node = dev->of_node;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 101/227 drm/imagination: Wait for FW trace update command completion
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brajesh Gupta <[email protected]>
[ Upstream commit 812062e74a3945b575dce89d330b67cb50054a77 ]
Possibility of no FW trace available after update in the fw_trace_mask due to asynchronous mode of command consumption in the FW.
To ensure FW trace is available after update, wait for FW trace log update command completion from the FW.
--- drivers/gpu/drm/imagination/pvr_fw_trace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/imagination/pvr_fw_trace.c +7 -1
@@ -136,6 +136,7 @@ update_logtype(struct pvr_device *pvr_dev, u32 group_mask)struct rogue_fwif_kccb_cmd cmd;int idx;int err; +int slot;if (group_mask) fw_trace->tracebuf_ctrl->log_type =ROGUE_FWIF_LOG_TYPE_TRACE | group_mask;
@@ -153,8 +154,13 @@ update_logtype(struct pvr_device *pvr_dev, u32 group_mask) cmd.cmd_type =ROGUE_FWIF_KCCB_CMD_LOGTYPE_UPDATE ; cmd.kccb_flags =0 ; - err =pvr_kccb_send_cmd (pvr_dev, &cmd,NULL ); + err =pvr_kccb_send_cmd (pvr_dev, &cmd, &slot); +if (err) + goto err_drm_dev_exit; + + err =pvr_kccb_wait_for_completion (pvr_dev, slot,HZ ,NULL ); +err_drm_dev_exit:drm_dev_exit (idx); err_up_read:
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 102/227 vsock/test: Do not filter kallsyms by symbol type
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit 5d54aa40c7b7e9dee5746cca99e9ddbcca13e895 ]
Blamed commit implemented logic to discover available vsock transports by grepping /proc/kallsyms for known symbols. It incorrectly filtered entries by type 'd'.
For some kernel configs having
CONFIG_VIRTIO_VSOCKETS=m
CONFIG_VSOCKETS_LOOPBACK=y
kallsyms reports
0000000000000000 d virtio_transport [vmw_vsock_virtio_transport]
0000000000000000 t loopback_transportOverzealous filtering might have affected vsock test suit, resulting in insufficient/misleading testing.
Do not filter symbols by type. It never helped much.
--- tools/testing/vsock/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/vsock/util.h +1 -1
@@ -25,7 +25,7 @@ enum transport { };static const char *const transport_ksyms[] = { - #define x(name, symbol) "d " symbol "_transport", + #define x(name, symbol) " " symbol "_transport",KNOWN_TRANSPORTS (x) #undef x };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 103/227 netdevsim: fix a race issue related to the operation on bpf_bound_progs list
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Lu <[email protected]>
[ Upstream commit b97d5eedf4976cc94321243be83b39efe81a0e15 ]
The netdevsim driver lacks a protection mechanism for operations on the bpf_bound_progs list. When the nsim_bpf_create_prog() performs list_add_tail, it is possible that nsim_bpf_destroy_prog() is simultaneously performs list_del. Concurrent operations on the list may lead to list corruption and trigger a kernel crash as follows:
[ 417.290971] kernel BUG at lib/list_debug.c:62! [ 417.290983] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 417.290992] CPU: 10 PID: 168 Comm: kworker/10:1 Kdump: loaded Not tainted 6.19.0-rc5 #1 [ 417.291003] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 417.291007] Workqueue: events bpf_prog_free_deferred [ 417.291021] RIP: 0010:__list_del_entry_valid_or_report+0xa7/0xc0 [ 417.291034] Code: a8 ff 0f 0b 48 89 fe 48 89 ca 48 c7 c7 48 a1 eb ae e8 ed fb a8 ff 0f 0b 48 89 fe 48 89 c2 48 c7 c7 80 a1 eb ae e8 d9 fb a8 ff <0f> 0b 48 89 d1 48 c7 c7 d0 a1 eb ae 48 89 f2 48 89 c6 e8 c2 fb a8 [ 417.291040] RSP: 0018:ffffb16a40807df8 EFLAGS: 00010246 [ 417.291046] RAX: 000000000000006d RBX: ffff8e589866f500 RCX: 0000000000000000 [ 417.291051] RDX: 0000000000000000 RSI: ffff8e59f7b23180 RDI: ffff8e59f7b23180 [ 417.291055] RBP: ffffb16a412c9000 R08: 0000000000000000 R09: 0000000000000003 [ 417.291059] R10: ffffb16a40807c80 R11: ffffffffaf9edce8 R12: ffff8e594427ac20 [ 417.291063] R13: ffff8e59f7b44780 R14: ffff8e58800b7a05 R15: 0000000000000000 [ 417.291074] FS: 0000000000000000(0000) GS:ffff8e59f7b00000(0000) knlGS:0000000000000000 [ 417.291079] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 417.291083] CR2: 00007fc4083efe08 CR3: 00000001c3626006 CR4: 0000000000770ee0 [ 417.291088] PKRU: 55555554 [ 417.291091] Call Trace: [ 417.291096] <TASK> [ 417.291103] nsim_bpf_destroy_prog+0x31/0x80 [netdevsim] [ 417.291154] __bpf_prog_offload_destroy+0x2a/0x80 [ 417.291163] bpf_prog_dev_bound_destroy+0x6f/0xb0 [ 417.291171] bpf_prog_free_deferred+0x18e/0x1a0 [ 417.291178] process_one_work+0x18a/0x3a0 [ 417.291188] worker_thread+0x27b/0x3a0 [ 417.291197] ? __pfx_worker_thread+0x10/0x10 [ 417.291207] kthread+0xe5/0x120 [ 417.291214] ? __pfx_kthread+0x10/0x10 [ 417.291221] ret_from_fork+0x31/0x50 [ 417.291230] ? __pfx_kthread+0x10/0x10 [ 417.291236] ret_from_fork_asm+0x1a/0x30 [ 417.291246] </TASK>
Add a mutex lock, to prevent simultaneous addition and deletion operations on the list.
--- drivers/net/netdevsim/bpf.c | 6 ++++++ drivers/net/netdevsim/dev.c | 2 ++ drivers/net/netdevsim/netdevsim.h | 1 + 3 files changed, 9 insertions(+)
drivers/net/netdevsim/bpf.c +6 -0
@@ -244,7 +244,9 @@ static int nsim_bpf_create_prog(struct nsim_dev *nsim_dev, &state->state, &nsim_bpf_string_fops);debugfs_create_bool ("loaded" ,0400 , state->ddir, &state->is_loaded); +mutex_lock (&nsim_dev->progs_list_lock);list_add_tail (&state->l, &nsim_dev->bpf_bound_progs); +mutex_unlock (&nsim_dev->progs_list_lock); prog->aux->offload->dev_priv = state;
@@ -273,12 +275,16 @@ static int nsim_bpf_translate(struct bpf_prog *prog)static void nsim_bpf_destroy_prog (struct bpf_prog *prog) {struct nsim_bpf_bound_prog *state; +struct nsim_dev *nsim_dev; state = prog->aux->offload->dev_priv; + nsim_dev = state->nsim_dev;WARN (state->is_loaded,"offload state destroyed while program still bound" );debugfs_remove_recursive (state->ddir); +mutex_lock (&nsim_dev->progs_list_lock);list_del (&state->l); +mutex_unlock (&nsim_dev->progs_list_lock);kfree (state); }
drivers/net/netdevsim/dev.c +2 -0
@@ -1591,6 +1591,7 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev) nsim_dev->max_macs =NSIM_DEV_MAX_MACS_DEFAULT ; nsim_dev->test1 =NSIM_DEV_TEST1_DEFAULT ;spin_lock_init (&nsim_dev->fa_cookie_lock); +mutex_init (&nsim_dev->progs_list_lock);dev_set_drvdata (&nsim_bus_dev->dev, nsim_dev);
@@ -1729,6 +1730,7 @@ void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev)devl_unregister (devlink);kfree (nsim_dev->vfconfigs);kfree (nsim_dev->fa_cookie); +mutex_destroy (&nsim_dev->progs_list_lock);devl_unlock (devlink);devlink_free (devlink);dev_set_drvdata (&nsim_bus_dev->dev,NULL );
drivers/net/netdevsim/netdevsim.h +1 -0
@@ -319,6 +319,7 @@ struct nsim_dev {u32 prog_id_gen;struct list_head bpf_bound_progs;struct list_head bpf_bound_maps; +struct mutex progs_list_lock;struct netdev_phys_item_id switch_id;struct list_head port_list;bool fw_update_status;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 104/227 ice: Fix persistent failure in ice_get_rxfh
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cody Haas <[email protected]>
[ Upstream commit f406220eb8e227ca344eef1a6d30aff53706b196 ]
Several ioctl functions have the ability to call ice_get_rxfh, however all of these ioctl functions do not provide all of the expected information in ethtool_rxfh_param. For example, ethtool_get_rxfh_indir does not provide an rss_key. This previously caused ethtool_get_rxfh_indir to always fail with -EINVAL.
This change draws inspiration from i40e_get_rss to handle this situation, by only calling the appropriate rss helpers when the necessary information has been provided via ethtool_rxfh_param.
--- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +---- drivers/net/ethernet/intel/ice/ice_main.c | 28 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +1 -0
@@ -977,6 +977,7 @@ void ice_map_xdp_rings(struct ice_vsi *vsi);int ice_xdp_xmit (struct net_device *dev,int n,struct xdp_frame **frames,u32 flags); +int ice_get_rss (struct ice_vsi *vsi,u8 *seed,u8 *lut,u16 lut_size);int ice_set_rss_lut (struct ice_vsi *vsi,u8 *lut,u16 lut_size);int ice_get_rss_lut (struct ice_vsi *vsi,u8 *lut,u16 lut_size);int ice_set_rss_key (struct ice_vsi *vsi,u8 *seed);
drivers/net/ethernet/intel/ice/ice_ethtool.c +1 -5
@@ -3621,11 +3621,7 @@ ice_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rxfh)if (!lut)return -ENOMEM ; - err =ice_get_rss_key (vsi, rxfh->key); -if (err) - goto out; - - err =ice_get_rss_lut (vsi, lut, vsi->rss_table_size); + err =ice_get_rss (vsi, rxfh->key, lut, vsi->rss_table_size);if (err) goto out;
drivers/net/ethernet/intel/ice/ice_main.c +28 -0
@@ -8002,6 +8002,34 @@ int ice_get_rss_key(struct ice_vsi *vsi, u8 *seed)return status; } +/** +* ice_get_rss - Get RSS LUT and/or key +* @vsi: Pointer to VSI structure +* @seed: Buffer to store the key in +* @lut: Buffer to store the lookup table entries +* @lut_size: Size of buffer to store the lookup table entries +* +* Return: 0 on success, negative on failure +*/ +int ice_get_rss (struct ice_vsi *vsi,u8 *seed,u8 *lut,u16 lut_size) +{ +int err; + +if (seed) { + err =ice_get_rss_key (vsi, seed); +if (err) +return err; + } + +if (lut) { + err =ice_get_rss_lut (vsi, lut, lut_size); +if (err) +return err; + } + +return 0 ; +} +/** * ice_set_rss_hfunc - Set RSS HASH function * @vsi: Pointer to VSI structure
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 105/227 ice: add missing ice_deinit_hw() in devlink reinit path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Greenwalt <[email protected]>
[ Upstream commit 42fb5f3deb582cb96440e4683745017dbabb83d6 ]
devlink-reload results in ice_init_hw failed error, and then removing the ice driver causes a NULL pointer dereference.
[ +0.102213] ice 0000:ca:00.0: ice_init_hw failed: -16
...
[ +0.000001] Call Trace: [ +0.000003] <TASK> [ +0.000006] ice_unload+0x8f/0x100 [ice] [ +0.000081] ice_remove+0xba/0x300 [ice]
Commit 1390b8b3d2be ("ice: remove duplicate call to ice_deinit_hw() on error paths") removed ice_deinit_hw() from ice_deinit_dev(). As a result ice_devlink_reinit_down() no longer calls ice_deinit_hw(), but ice_devlink_reinit_up() still calls ice_init_hw(). Since the control queues are not uninitialized, ice_init_hw() fails with -EBUSY.
Add ice_deinit_hw() to ice_devlink_reinit_down() to correspond with ice_init_hw() in ice_devlink_reinit_up().
--- drivers/net/ethernet/intel/ice/devlink/devlink.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ice/devlink/devlink.c +1 -0
@@ -460,6 +460,7 @@ static void ice_devlink_reinit_down(struct ice_pf *pf)ice_vsi_decfg (ice_get_main_vsi (pf));rtnl_unlock ();ice_deinit_pf (pf); +ice_deinit_hw (&pf->hw);ice_deinit_dev (pf); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 106/227 ice: fix devlink reload call trace
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Greenwalt <[email protected]>
[ Upstream commit d3f867e7a04678640ebcbfb81893c59f4af48586 ]
Commit 4da71a77fc3b ("ice: read internal temperature sensor") introduced internal temperature sensor reading via HWMON. ice_hwmon_init() was added to ice_init_feature() and ice_hwmon_exit() was added to ice_remove(). As a result if devlink reload is used to reinit the device and then the driver is removed, a call trace can occur.
BUG: unable to handle page fault for address: ffffffffc0fd4b5d Call Trace: string+0x48/0xe0 vsnprintf+0x1f9/0x650 sprintf+0x62/0x80 name_show+0x1f/0x30 dev_attr_show+0x19/0x60
The call trace repeats approximately every 10 minutes when system monitoring tools (e.g., sadc) attempt to read the orphaned hwmon sysfs attributes that reference freed module memory.
The sequence is:
1. Driver load, ice_hwmon_init() gets called from ice_init_feature()
2. Devlink reload down, flow does not call ice_remove()
3. Devlink reload up, ice_hwmon_init() gets called from ice_init_feature() resulting in a second instance
4. Driver unload, ice_hwmon_exit() called from ice_remove() leaving the first hwmon instance orphaned with dangling pointer
Fix this by moving ice_hwmon_exit() from ice_remove() to ice_deinit_features() to ensure proper cleanup symmetry with ice_hwmon_init().
--- drivers/net/ethernet/intel/ice/ice_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -2
@@ -4845,6 +4845,7 @@ static void ice_deinit_features(struct ice_pf *pf)ice_dpll_deinit (pf);if (pf->eswitch_mode ==DEVLINK_ESWITCH_MODE_SWITCHDEV )xa_destroy (&pf->eswitch.reprs); +ice_hwmon_exit (pf); }static void ice_init_wakeup (struct ice_pf *pf)
@@ -5446,8 +5447,6 @@ static void ice_remove(struct pci_dev *pdev)ice_free_vfs (pf); } -ice_hwmon_exit (pf); -if (!ice_is_safe_mode (pf))ice_remove_arfs (pf);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 107/227 idpf: read lower clock bits inside the time sandwich
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mina Almasry <[email protected]>
[ Upstream commit bdfc7b55adcd04834ccc1b6b13e55e3fd7eaa789 ]
PCIe reads need to be done inside the time sandwich because PCIe writes may get buffered in the PCIe fabric and posted to the device after the _postts completes. Doing the PCIe read inside the time sandwich guarantees that the write gets flushed before the _postts timestamp is taken.
--- drivers/net/ethernet/intel/idpf/idpf_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/idpf/idpf_ptp.c +1 -1
@@ -108,11 +108,11 @@ static u64 idpf_ptp_read_src_clk_reg_direct(struct idpf_adapter *adapter,ptp_read_system_prets (sts);idpf_ptp_enable_shtime (adapter); + lo =readl (ptp->dev_clk_regs.dev_clk_ns_l);/* Read the system timestamp post PHC read */ ptp_read_system_postts (sts); - lo =readl (ptp->dev_clk_regs.dev_clk_ns_l); hi =readl (ptp->dev_clk_regs.dev_clk_ns_h);spin_unlock (&ptp->read_dev_clk_lock);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 108/227 net: phy: intel-xway: fix OF node refcount leakage
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 79912b256e14054e6ba177d7e7e631485ce23dbe ]
Automated review spotted am OF node reference count leakage when checking if the 'leds' child node exists.
Call of_put_node() to correctly maintain the refcount.
--- drivers/net/phy/intel-xway.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/phy/intel-xway.c +5 -2
@@ -277,7 +277,7 @@ static int xway_gphy_init_leds(struct phy_device *phydev)static int xway_gphy_config_init (struct phy_device *phydev) { -struct device_node *np = phydev->mdio.dev.of_node; +struct device_node *np;int err;/* Mask all interrupts */
@@ -286,7 +286,10 @@ static int xway_gphy_config_init(struct phy_device *phydev)return err;/* Use default LED configuration if 'leds' node isn't defined */ -if (!of_get_child_by_name (np,"leds" )) + np =of_get_child_by_name (phydev->mdio.dev.of_node,"leds" ); +if (np) +of_node_put (np); +else xway_gphy_init_leds (phydev);/* Clear all pending interrupts */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 109/227 net: hns3: fix data race in hns3_fetch_stats
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yang <[email protected]>
[ Upstream commit 748a81c8ceda1fdbdcd0af595947422e810442aa ]
In hns3_fetch_stats(), ring statistics, protected by u64_stats_sync, are read and accumulated in ignorance of possible u64_stats_fetch_retry() events. These statistics are already accumulated by hns3_ring_stats_update(). Fix this by reading them into a temporary buffer first.
--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +36 -33
@@ -2500,44 +2500,47 @@ static netdev_features_t hns3_features_check(struct sk_buff *skb,static void hns3_fetch_stats (struct rtnl_link_stats64 *stats,struct hns3_enet_ring *ring,bool is_tx) { +struct ring_stats ring_stats;unsigned int start;do { start =u64_stats_fetch_begin (&ring->syncp); -if (is_tx) { - stats->tx_bytes += ring->stats.tx_bytes; - stats->tx_packets += ring->stats.tx_pkts; - stats->tx_dropped += ring->stats.sw_err_cnt; - stats->tx_dropped += ring->stats.tx_vlan_err; - stats->tx_dropped += ring->stats.tx_l4_proto_err; - stats->tx_dropped += ring->stats.tx_l2l3l4_err; - stats->tx_dropped += ring->stats.tx_tso_err; - stats->tx_dropped += ring->stats.over_max_recursion; - stats->tx_dropped += ring->stats.hw_limitation; - stats->tx_dropped += ring->stats.copy_bits_err; - stats->tx_dropped += ring->stats.skb2sgl_err; - stats->tx_dropped += ring->stats.map_sg_err; - stats->tx_errors += ring->stats.sw_err_cnt; - stats->tx_errors += ring->stats.tx_vlan_err; - stats->tx_errors += ring->stats.tx_l4_proto_err; - stats->tx_errors += ring->stats.tx_l2l3l4_err; - stats->tx_errors += ring->stats.tx_tso_err; - stats->tx_errors += ring->stats.over_max_recursion; - stats->tx_errors += ring->stats.hw_limitation; - stats->tx_errors += ring->stats.copy_bits_err; - stats->tx_errors += ring->stats.skb2sgl_err; - stats->tx_errors += ring->stats.map_sg_err; - }else { - stats->rx_bytes += ring->stats.rx_bytes; - stats->rx_packets += ring->stats.rx_pkts; - stats->rx_dropped += ring->stats.l2_err; - stats->rx_errors += ring->stats.l2_err; - stats->rx_errors += ring->stats.l3l4_csum_err; - stats->rx_crc_errors += ring->stats.l2_err; - stats->multicast += ring->stats.rx_multicast; - stats->rx_length_errors += ring->stats.err_pkt_len; - } + ring_stats = ring->stats; }while (u64_stats_fetch_retry (&ring->syncp, start)); + +if (is_tx) { + stats->tx_bytes += ring_stats.tx_bytes; + stats->tx_packets += ring_stats.tx_pkts; + stats->tx_dropped += ring_stats.sw_err_cnt; + stats->tx_dropped += ring_stats.tx_vlan_err; + stats->tx_dropped += ring_stats.tx_l4_proto_err; + stats->tx_dropped += ring_stats.tx_l2l3l4_err; + stats->tx_dropped += ring_stats.tx_tso_err; + stats->tx_dropped += ring_stats.over_max_recursion; + stats->tx_dropped += ring_stats.hw_limitation; + stats->tx_dropped += ring_stats.copy_bits_err; + stats->tx_dropped += ring_stats.skb2sgl_err; + stats->tx_dropped += ring_stats.map_sg_err; + stats->tx_errors += ring_stats.sw_err_cnt; + stats->tx_errors += ring_stats.tx_vlan_err; + stats->tx_errors += ring_stats.tx_l4_proto_err; + stats->tx_errors += ring_stats.tx_l2l3l4_err; + stats->tx_errors += ring_stats.tx_tso_err; + stats->tx_errors += ring_stats.over_max_recursion; + stats->tx_errors += ring_stats.hw_limitation; + stats->tx_errors += ring_stats.copy_bits_err; + stats->tx_errors += ring_stats.skb2sgl_err; + stats->tx_errors += ring_stats.map_sg_err; + }else { + stats->rx_bytes += ring_stats.rx_bytes; + stats->rx_packets += ring_stats.rx_pkts; + stats->rx_dropped += ring_stats.l2_err; + stats->rx_errors += ring_stats.l2_err; + stats->rx_errors += ring_stats.l3l4_csum_err; + stats->rx_crc_errors += ring_stats.l2_err; + stats->multicast += ring_stats.rx_multicast; + stats->rx_length_errors += ring_stats.err_pkt_len; + } } static void hns3_nic_get_stats64(struct net_device *netdev,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 110/227 idpf: Fix data race in idpf_net_dim
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yang <[email protected]>
[ Upstream commit 5fbe395cd1fdbc883584e7f38369e4ba5ca778d2 ]
In idpf_net_dim(), some statistics protected by u64_stats_sync, are read and accumulated in ignorance of possible u64_stats_fetch_retry() events. The correct way to copy statistics is already illustrated by idpf_add_queue_stats(). Fix this by reading them into temporary variables first.
--- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/idpf/idpf_txrx.c +11 -5
@@ -3941,7 +3941,7 @@ static void idpf_update_dim_sample(struct idpf_q_vector *q_vector,static void idpf_net_dim (struct idpf_q_vector *q_vector) {struct dim_sample dim_sample = { }; -u64 packets, bytes; +u64 packets, bytes, pkts, bts;u32 i;if (!IDPF_ITR_IS_DYNAMIC (q_vector->tx_intr_mode))
@@ -3953,9 +3953,12 @@ static void idpf_net_dim(struct idpf_q_vector *q_vector)do { start =u64_stats_fetch_begin (&txq->stats_sync); - packets +=u64_stats_read (&txq->q_stats.packets); - bytes +=u64_stats_read (&txq->q_stats.bytes); + pkts =u64_stats_read (&txq->q_stats.packets); + bts =u64_stats_read (&txq->q_stats.bytes); }while (u64_stats_fetch_retry (&txq->stats_sync, start)); + + packets += pkts; + bytes += bts; } idpf_update_dim_sample(q_vector, &dim_sample, &q_vector->tx_dim,
@@ -3972,9 +3975,12 @@ static void idpf_net_dim(struct idpf_q_vector *q_vector)do { start =u64_stats_fetch_begin (&rxq->stats_sync); - packets +=u64_stats_read (&rxq->q_stats.packets); - bytes +=u64_stats_read (&rxq->q_stats.bytes); + pkts =u64_stats_read (&rxq->q_stats.packets); + bts =u64_stats_read (&rxq->q_stats.bytes); }while (u64_stats_fetch_retry (&rxq->stats_sync, start)); + + packets += pkts; + bytes += bts; } idpf_update_dim_sample(q_vector, &dim_sample, &q_vector->rx_dim,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 111/227 be2net: fix data race in be_get_new_eqd
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yang <[email protected]>
[ Upstream commit 302e5b481caa7b3d11ec0e058434c1fc95195e50 ]
In be_get_new_eqd(), statistics of pkts, protected by u64_stats_sync, are read and accumulated in ignorance of possible u64_stats_fetch_retry() events. Before the commit in question, these statistics were retrieved one by one directly from queues. Fix this by reading them into temporary variables first.
--- drivers/net/ethernet/emulex/benet/be_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/emulex/benet/be_main.c +5 -3
@@ -2141,7 +2141,7 @@ static int be_get_new_eqd(struct be_eq_obj *eqo)struct be_aic_obj *aic;struct be_rx_obj *rxo;struct be_tx_obj *txo; -u64 rx_pkts =0 , tx_pkts =0 ; +u64 rx_pkts =0 , tx_pkts =0 , pkts;ulong now;u32 pps, delta;int i;
@@ -2157,15 +2157,17 @@ static int be_get_new_eqd(struct be_eq_obj *eqo) for_all_rx_queues_on_eq(adapter, eqo, rxo, i) {do { start =u64_stats_fetch_begin (&rxo->stats.sync); - rx_pkts += rxo->stats.rx_pkts; + pkts = rxo->stats.rx_pkts; }while (u64_stats_fetch_retry (&rxo->stats.sync, start)); + rx_pkts += pkts; } for_all_tx_queues_on_eq(adapter, eqo, txo, i) {do { start =u64_stats_fetch_begin (&txo->stats.sync); - tx_pkts += txo->stats.tx_reqs; + pkts = txo->stats.tx_reqs; }while (u64_stats_fetch_retry (&txo->stats.sync, start)); + tx_pkts += pkts; }/* Skip, if wrapped around or first calculation */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 112/227 net: hns3: fix wrong GENMASK() for HCLGE_FD_AD_COUNTER_NUM_M
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit d57c67c956a1bad15115eba6e59d77a6dfeba01d ]
HCLGE_FD_AD_COUNTER_NUM_M should be at GENMASK(19, 13), rather than at GENMASK(20, 13), because bit 20 is HCLGE_FD_AD_NXT_STEP_B.
This patch corrects the wrong definition.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +1 -1
@@ -731,7 +731,7 @@ struct hclge_fd_tcam_config_3_cmd {#define HCLGE_FD_AD_QID_M GENMASK(11, 2)#define HCLGE_FD_AD_USE_COUNTER_B 12#define HCLGE_FD_AD_COUNTER_NUM_S 13 -#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(20, 13) +#define HCLGE_FD_AD_COUNTER_NUM_M GENMASK(19, 13)#define HCLGE_FD_AD_NXT_STEP_B 20#define HCLGE_FD_AD_NXT_KEY_S 21#define HCLGE_FD_AD_NXT_KEY_M GENMASK(25, 21)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 113/227 net: hns3: fix the HCLGE_FD_AD_NXT_KEY error setting issue
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit f87e034d16e43af984380a95c32c25201b7759a7 ]
Use next_input_key instead of counter_id to set HCLGE_FD_AD_NXT_KEY.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -5690,7 +5690,7 @@ static int hclge_fd_ad_config(struct hclge_dev *hdev, u8 stage, int loc, HCLGE_FD_AD_COUNTER_NUM_S, action->counter_id);hnae3_set_bit (ad_data,HCLGE_FD_AD_NXT_STEP_B , action->use_next_stage);hnae3_set_field (ad_data,HCLGE_FD_AD_NXT_KEY_M ,HCLGE_FD_AD_NXT_KEY_S , - action->counter_id); + action->next_input_key); req->ad_data =cpu_to_le64 (ad_data); ret =hclge_cmd_send (&hdev->hw, &desc,1 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 114/227 mISDN: annotate data-race around dev->work
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 8175dbf174d487afab81e936a862a8d9b8a1ccb6 ]
dev->work can re read locklessly in mISDN_read() and mISDN_poll(). Add READ_ONCE()/WRITE_ONCE() annotations.
BUG: KCSAN: data-race in mISDN_ioctl / mISDN_read
write to 0xffff88812d848280 of 4 bytes by task 10864 on cpu 1:
misdn_add_timer drivers/isdn/mISDN/timerdev.c:175 [inline] mISDN_ioctl+0x2fb/0x550 drivers/isdn/mISDN/timerdev.c:233 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl+0xce/0x140 fs/ioctl.c:583 __x64_sys_ioctl+0x43/0x50 fs/ioctl.c:583 x64_sys_call+0x14b0/0x3000 arch/x86/include/generated/asm/syscalls_64.h:17 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd8/0x2c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
read to 0xffff88812d848280 of 4 bytes by task 10857 on cpu 0:
mISDN_read+0x1f2/0x470 drivers/isdn/mISDN/timerdev.c:112 do_loop_readv_writev fs/read_write.c:847 [inline] vfs_readv+0x3fb/0x690 fs/read_write.c:1020 do_readv+0xe7/0x210 fs/read_write.c:1080 __do_sys_readv fs/read_write.c:1165 [inline] __se_sys_readv fs/read_write.c:1162 [inline] __x64_sys_readv+0x45/0x50 fs/read_write.c:1162 x64_sys_call+0x2831/0x3000 arch/x86/include/generated/asm/syscalls_64.h:20 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd8/0x2c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
value changed: 0x00000000 -> 0x00000001
--- drivers/isdn/mISDN/timerdev.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/isdn/mISDN/timerdev.c +8 -5
@@ -109,14 +109,14 @@ mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)spin_unlock_irq (&dev->lock);if (filep->f_flags &O_NONBLOCK )return -EAGAIN ; -wait_event_interruptible (dev->wait, (dev->work || +wait_event_interruptible (dev->wait, (READ_ONCE (dev->work) || !list_empty (list)));if (signal_pending (current))return -ERESTARTSYS ;spin_lock_irq (&dev->lock); }if (dev->work) - dev->work =0 ; +WRITE_ONCE (dev->work,0 );if (!list_empty (list)) { timer = list_first_entry(list, struct mISDNtimer, list);list_del (&timer->list);
@@ -141,13 +141,16 @@ mISDN_poll(struct file *filep, poll_table *wait)if (*debug &DEBUG_TIMER )printk (KERN_DEBUG "%s(%p, %p)\n" , __func__, filep, wait);if (dev) { +u32 work; +poll_wait (filep, &dev->wait, wait); mask =0 ; -if (dev->work || !list_empty (&dev->expired)) + work =READ_ONCE (dev->work); +if (work || !list_empty (&dev->expired)) mask |= (EPOLLIN |EPOLLRDNORM );if (*debug &DEBUG_TIMER )printk (KERN_DEBUG "%s work(%d) empty(%d)\n" , __func__, - dev->work,list_empty (&dev->expired)); + work,list_empty (&dev->expired)); }return mask; }
@@ -172,7 +175,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)struct mISDNtimer *timer;if (!timeout) { - dev->work =1 ; +WRITE_ONCE (dev->work,1 );wake_up_interruptible (&dev->wait); id =0 ; }else {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 115/227 ipv6: annotate data-race in ndisc_router_discovery()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9a063f96d87efc3a6cc667f8de096a3d38d74bb5 ]
syzbot found that ndisc_router_discovery() could read and write in6_dev->ra_mtu without holding a lock [1]
This looks fine, IFLA_INET6_RA_MTU is best effort.
Add READ_ONCE()/WRITE_ONCE() to document the race.
Note that we might also reject illegal MTU values (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) in a future patch.
[1]
BUG: KCSAN: data-race in ndisc_router_discovery / ndisc_router_discovery
read to 0xffff888119809c20 of 4 bytes by task 25817 on cpu 1:
ndisc_router_discovery+0x151d/0x1c90 net/ipv6/ndisc.c:1558 ndisc_rcv+0x2ad/0x3d0 net/ipv6/ndisc.c:1841 icmpv6_rcv+0xe5a/0x12f0 net/ipv6/icmp.c:989 ip6_protocol_deliver_rcu+0xb2a/0x10d0 net/ipv6/ip6_input.c:438 ip6_input_finish+0xf0/0x1d0 net/ipv6/ip6_input.c:489 NF_HOOK include/linux/netfilter.h:318 [inline] ip6_input+0x5e/0x140 net/ipv6/ip6_input.c:500 ip6_mc_input+0x27c/0x470 net/ipv6/ip6_input.c:590 dst_input include/net/dst.h:474 [inline] ip6_rcv_finish+0x336/0x340 net/ipv6/ip6_input.c:79
...
write to 0xffff888119809c20 of 4 bytes by task 25816 on cpu 0:
ndisc_router_discovery+0x155a/0x1c90 net/ipv6/ndisc.c:1559 ndisc_rcv+0x2ad/0x3d0 net/ipv6/ndisc.c:1841 icmpv6_rcv+0xe5a/0x12f0 net/ipv6/icmp.c:989 ip6_protocol_deliver_rcu+0xb2a/0x10d0 net/ipv6/ip6_input.c:438 ip6_input_finish+0xf0/0x1d0 net/ipv6/ip6_input.c:489 NF_HOOK include/linux/netfilter.h:318 [inline] ip6_input+0x5e/0x140 net/ipv6/ip6_input.c:500 ip6_mc_input+0x27c/0x470 net/ipv6/ip6_input.c:590 dst_input include/net/dst.h:474 [inline] ip6_rcv_finish+0x336/0x340 net/ipv6/ip6_input.c:79
...
value changed: 0x00000000 -> 0xe5400659
--- net/ipv6/ndisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ndisc.c +2 -2
@@ -1555,8 +1555,8 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)memcpy (&n, ((u8 *)(ndopts.nd_opts_mtu+1 ))+2 ,sizeof (mtu)); mtu =ntohl (n); -if (in6_dev->ra_mtu != mtu) { - in6_dev->ra_mtu = mtu; +if (READ_ONCE (in6_dev->ra_mtu) != mtu) { +WRITE_ONCE (in6_dev->ra_mtu, mtu); send_ifinfo_notify = true; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 116/227 usbnet: limit max_mtu based on devices hard_mtu
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Vivier <[email protected]>
[ Upstream commit c7159e960f1472a5493ac99aff0086ab1d683594 ]
The usbnet driver initializes net->max_mtu to ETH_MAX_MTU before calling the device's bind() callback. When the bind() callback sets dev->hard_mtu based the device's actual capability (from CDC Ethernet's wMaxSegmentSize descriptor), max_mtu is never updated to reflect this hardware limitation).
This allows userspace (DHCP or IPv6 RA) to configure MTU larger than the device can handle, leading to silent packet drops when the backend sends packet exceeding the device's buffer size.
Fix this by limiting net->max_mtu to the device's hard_mtu after the bind callback returns.
See https://gitlab.com/qemu-project/qemu/-/issues/3268 and
https://bugs.passt.top/attachment.cgi?bugid=189
--- drivers/net/usb/usbnet.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/usb/usbnet.c +6 -3
@@ -1803,9 +1803,12 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)if ((dev->driver_info->flags &FLAG_NOARP ) !=0 ) net->flags |=IFF_NOARP ; -/* maybe the remote can't receive an Ethernet MTU */ -if (net->mtu > (dev->hard_mtu - net->hard_header_len)) - net->mtu = dev->hard_mtu - net->hard_header_len; +if (net->max_mtu > (dev->hard_mtu - net->hard_header_len)) + net->max_mtu = dev->hard_mtu - net->hard_header_len; + +if (net->mtu > net->max_mtu) + net->mtu = net->max_mtu; + }else if (!info->in || !info->out) status =usbnet_get_endpoints (dev, udev);else {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 117/227 Octeontx2-pf: Update xdp features
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad Kelam <[email protected]>
[ Upstream commit cdf8de9c6bfe94508d251cb290ee66e34e6f3368 ]
In recent testing, verification of XDP_REDIRECT and zero-copy features failed because the driver is not setting the corresponding feature flags.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +3 -1
@@ -3255,7 +3255,9 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) netdev->watchdog_timeo =OTX2_TX_TIMEOUT ; netdev->netdev_ops = &otx2_netdev_ops; - netdev->xdp_features =NETDEV_XDP_ACT_BASIC |NETDEV_XDP_ACT_REDIRECT ; + netdev->xdp_features =NETDEV_XDP_ACT_BASIC |NETDEV_XDP_ACT_REDIRECT | +NETDEV_XDP_ACT_NDO_XMIT | +NETDEV_XDP_ACT_XSK_ZEROCOPY ; netdev->min_mtu =OTX2_MIN_MTU ; netdev->max_mtu =otx2_get_max_mtu (pf);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 118/227 clocksource: Reduce watchdog readout delay limit to prevent false positives
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit c06343be0b4e03fe319910dd7a5d5b9929e1c0cb ]
The "valid" readout delay between the two reads of the watchdog is larger than the valid delta between the resulting watchdog and clocksource intervals, which results in false positive watchdog results.
Assume TSC is the clocksource and HPET is the watchdog and both have a uncertainty margin of 250us (default). The watchdog readout does:
1) wdnow = read(HPET);
2) csnow = read(TSC);
3) wdend = read(HPET);
The valid window for the delta between #1 and #3 is calculated by the uncertainty margins of the watchdog and the clocksource:
m = 2 * watchdog.uncertainty_margin + cs.uncertainty margin;
which results in 750us for the TSC/HPET case.
The actual interval comparison uses a smaller margin:
m = watchdog.uncertainty_margin + cs.uncertainty margin;
which results in 500us for the TSC/HPET case.
That means the following scenario will trigger the watchdog:
Watchdog cycle N:
1) wdnow[N] = read(HPET); 2) csnow[N] = read(TSC); 3) wdend[N] = read(HPET);
Assume the delay between #1 and #2 is 100us and the delay between #1 and
Watchdog cycle N + 1:
4) wdnow[N + 1] = read(HPET); 5) csnow[N + 1] = read(TSC); 6) wdend[N + 1] = read(HPET);
If the delay between #4 and #6 is within the 750us margin then any delay between #4 and #5 which is larger than 600us will fail the interval check and mark the TSC unstable because the intervals are calculated against the previous value:
wd_int = wdnow[N + 1] - wdnow[N];
cs_int = csnow[N + 1] - csnow[N];Putting the above delays in place this results in:
cs_int = (wdnow[N + 1] + 610us) - (wdnow[N] + 100us);
-> cs_int = wd_int + 510us;
which is obviously larger than the allowed 500us margin and results in marking TSC unstable.
Fix this by using the same margin as the interval comparison. If the delay between two watchdog reads is larger than that, then the readout was either disturbed by interconnect congestion, NMIs or SMIs.
--- kernel/time/clocksource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/clocksource.c +1 -1
@@ -252,7 +252,7 @@ enum wd_read_status {static enum wd_read_status cs_watchdog_read (struct clocksource *cs,u64 *csnow,u64 *wdnow) { -int64_t md =2 * watchdog->uncertainty_margin; +int64_t md = watchdog->uncertainty_margin;unsigned int nretries, max_retries;int64_t wd_delay, wd_seq_delay;u64 wd_end, wd_end2;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 119/227 drm/xe/uapi: disallow bind queue sharing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Auld <[email protected]>
[ Upstream commit 6f4b7aed61817624250e590ba0ef304146d34614 ]
Currently this is very broken if someone attempts to create a bind queue and share it across multiple VMs. For example currently we assume it is safe to acquire the user VM lock to protect some of the bind queue state, but if allow sharing the bind queue with multiple VMs then this quickly breaks down.
To fix this reject using a bind queue with any VM that is not the same VM that was originally passed when creating the bind queue. This a uAPI change, however this was more of an oversight on kernel side that we didn't reject this, and expectation is that userspace shouldn't be using bind queues in this way, so in theory this change should go unnoticed.
Based on a patch from Matt Brost.
v2 (Matt B):
- Hold the vm lock over queue create, to ensure it can't be closed as we attach the user_vm to the queue.
- Make sure we actually check for NULL user_vm in destruction path.
v3:
- Fix error path handling.
Stable-dep-of: 772157f626d0 ("drm/xe/migrate: fix job lock assert")
--- drivers/gpu/drm/xe/xe_exec_queue.c | 32 +++++++++++++++++++++++- drivers/gpu/drm/xe/xe_exec_queue.h | 1 + drivers/gpu/drm/xe/xe_exec_queue_types.h | 6 +++++ drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 2 +- drivers/gpu/drm/xe/xe_vm.c | 7 +++++- 5 files changed, 45 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_exec_queue.c +31 -1
@@ -284,6 +284,7 @@ struct xe_exec_queue *xe_exec_queue_create_class(struct xe_device *xe, struct xe* @xe: Xe device. * @tile: tile which bind exec queue belongs to. * @flags: exec queue creation flags +* @user_vm: The user VM which this exec queue belongs to * @extensions: exec queue creation extensions * * Normalize bind exec queue creation. Bind exec queue is tied to migration VM
@@ -297,6 +298,7 @@ struct xe_exec_queue *xe_exec_queue_create_class(struct xe_device *xe, struct xe*/ struct xe_exec_queue *xe_exec_queue_create_bind (struct xe_device *xe,struct xe_tile *tile, +struct xe_vm *user_vm,u32 flags,u64 extensions) {struct xe_gt *gt = tile->primary_gt;
@@ -333,6 +335,9 @@ struct xe_exec_queue *xe_exec_queue_create_bind(struct xe_device *xe,xe_exec_queue_put (q);return ERR_PTR (err); } + +if (user_vm) + q->user_vm =xe_vm_get (user_vm); }return q;
@@ -357,6 +362,11 @@ void xe_exec_queue_destroy(struct kref *ref)xe_exec_queue_put (eq); } +if (q->user_vm) { +xe_vm_put (q->user_vm); + q->user_vm =NULL ; + } + q->ops->destroy (q); }
@@ -692,6 +702,22 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, XE_IOCTL_DBG(xe, eci[0].engine_instance != 0))return -EINVAL ; + vm =xe_vm_lookup (xef, args->vm_id); +if (XE_IOCTL_DBG (xe, !vm)) +return -ENOENT ; + + err =down_read_interruptible (&vm->lock); +if (err) { +xe_vm_put (vm); +return err; + } + +if (XE_IOCTL_DBG (xe,xe_vm_is_closed_or_banned (vm))) { +up_read (&vm->lock); +xe_vm_put (vm); +return -ENOENT ; + } +for_each_tile (tile, xe, id) {struct xe_exec_queue *new;
@@ -699,9 +725,11 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,if (id) flags |=EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD ; - new =xe_exec_queue_create_bind (xe, tile, flags, + new =xe_exec_queue_create_bind (xe, tile, vm, flags, args->extensions);if (IS_ERR (new)) { +up_read (&vm->lock); +xe_vm_put (vm); err =PTR_ERR (new);if (q) goto put_exec_queue;
@@ -713,6 +741,8 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,list_add_tail (&new->multi_gt_list, &q->multi_gt_link); } +up_read (&vm->lock); +xe_vm_put (vm); }else { logical_mask = calc_validate_logical_mask(xe, eci, args->width,
drivers/gpu/drm/xe/xe_exec_queue.h +1 -0
@@ -24,6 +24,7 @@ struct xe_exec_queue *xe_exec_queue_create_class(struct xe_device *xe, struct xe u32 flags, u64 extensions);struct xe_exec_queue *xe_exec_queue_create_bind (struct xe_device *xe,struct xe_tile *tile, +struct xe_vm *user_vm,u32 flags,u64 extensions);void xe_exec_queue_fini (struct xe_exec_queue *q);
drivers/gpu/drm/xe/xe_exec_queue_types.h +6 -0
@@ -54,6 +54,12 @@ struct xe_exec_queue {struct kref refcount;/** @vm: VM (address space) for this exec queue */ struct xe_vm *vm; +/** +* @user_vm: User VM (address space) for this exec queue (bind queues +* only) +*/ +struct xe_vm *user_vm; +/** @class: class of this exec queue */ enum xe_engine_class class;/**
drivers/gpu/drm/xe/xe_sriov_vf_ccs.c +1 -1
@@ -276,7 +276,7 @@ int xe_sriov_vf_ccs_init(struct xe_device *xe) flags =EXEC_QUEUE_FLAG_KERNEL |EXEC_QUEUE_FLAG_PERMANENT |EXEC_QUEUE_FLAG_MIGRATE ; - q =xe_exec_queue_create_bind (xe, tile, flags,0 ); + q =xe_exec_queue_create_bind (xe, tile,NULL , flags,0 );if (IS_ERR (q)) { err =PTR_ERR (q); goto err_ret;
drivers/gpu/drm/xe/xe_vm.c +6 -1
@@ -1590,7 +1590,7 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags, struct xe_file *xef)if (!vm->pt_root[id])continue ; - q =xe_exec_queue_create_bind (xe, tile, create_flags,0 ); + q =xe_exec_queue_create_bind (xe, tile, vm, create_flags,0 );if (IS_ERR (q)) { err =PTR_ERR (q); goto err_close;
@@ -3536,6 +3536,11 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) } } +if (XE_IOCTL_DBG (xe, q && vm != q->user_vm)) { + err = -EINVAL ; + goto put_exec_queue; + } +/* Ensure all UNMAPs visible */ xe_svm_flush (vm);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 120/227 drm/xe/migrate: fix job lock assert
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Auld <[email protected]>
[ Upstream commit 772157f626d0e1a7c6d49dffb0bbe4b2343a1d44 ]
We are meant to be checking the user vm for the bind queue, but actually we are checking the migrate vm. For various reasons this is not currently firing but this will likely change in the future.
Now that we have the user_vm attached to the bind queue, we can fix this by directly checking that here.
--- drivers/gpu/drm/xe/xe_migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_migrate.c +2 -2
@@ -2182,7 +2182,7 @@ void xe_migrate_job_lock(struct xe_migrate *m, struct xe_exec_queue *q)if (is_migrate)mutex_lock (&m->job_mutex);else -xe_vm_assert_held (q->vm);/* User queues VM's should be locked */ +xe_vm_assert_held (q->user_vm);/* User queues VM's should be locked */ }/**
@@ -2200,7 +2200,7 @@ void xe_migrate_job_unlock(struct xe_migrate *m, struct xe_exec_queue *q)if (is_migrate)mutex_unlock (&m->job_mutex);else -xe_vm_assert_held (q->vm);/* User queues VM's should be locked */ +xe_vm_assert_held (q->user_vm);/* User queues VM's should be locked */ }#if IS_ENABLED (CONFIG_DRM_XE_KUNIT_TEST )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 121/227 drm/xe/pm: Add scope-based cleanup helper for runtime PM
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Roper <[email protected]>
[ Upstream commit 50a59230fa63989d59253622a8dd6386cca0db07 ]
Add a scope-based helpers for runtime PM that may be used to simplify cleanup logic and potentially avoid goto-based cleanup.
For example, using
guard(xe_pm_runtime)(xe);
will get runtime PM and cause a corresponding put to occur automatically when the current scope is exited. 'xe_pm_runtime_noresume' can be used as a guard replacement for the corresponding 'noresume' variant. There's also an xe_pm_runtime_ioctl conditional guard that can be used as a replacement for xe_runtime_ioctl():
ACQUIRE(xe_pm_runtime_ioctl, pm)(xe);
if ((ret = ACQUIRE_ERR(xe_pm_runtime_ioctl, &pm)) < 0)
/* failed */In a few rare cases (such as gt_reset_worker()) we need to ensure that runtime PM is dropped when the function is exited by any means (including error paths), but the function does not need to acquire runtime PM because that has already been done earlier by a different function. For these special cases, an 'xe_pm_runtime_release_only' guard can be used to handle the release without doing an acquisition.
These guards will be used in future patches to eliminate some of our goto-based cleanup.
v2:
- Specify success condition for xe_pm runtime_ioctl as _RET >= 0 so that positive values will be properly identified as success and trigger destructor cleanup properly.
v3:
- Add comments to the kerneldoc for the existing 'get' functions indicating that scope-based handling should be preferred where possible. (Gustavo)
Stable-dep-of: f262015b9797 ("drm/xe: Update wedged.mode only after successful reset policy change")
--- drivers/gpu/drm/xe/xe_pm.c | 21 +++++++++++++++++++++ drivers/gpu/drm/xe/xe_pm.h | 17 +++++++++++++++++ 2 files changed, 38 insertions(+)
drivers/gpu/drm/xe/xe_pm.c +21 -0
@@ -660,6 +660,13 @@ static void xe_pm_runtime_lockdep_prime(void)/** * xe_pm_runtime_get - Get a runtime_pm reference and resume synchronously * @xe: xe device instance +* +* When possible, scope-based runtime PM (through guard(xe_pm_runtime)) is +* be preferred over direct usage of this function. Manual get/put handling +* should only be used when the function contains goto-based logic which +* can break scope-based handling, or when the lifetime of the runtime PM +* reference does not match a specific scope (e.g., runtime PM obtained in one +* function and released in a different one). */ void xe_pm_runtime_get (struct xe_device *xe) {
@@ -692,6 +699,13 @@ void xe_pm_runtime_put(struct xe_device *xe)* xe_pm_runtime_get_ioctl - Get a runtime_pm reference before ioctl * @xe: xe device instance * +* When possible, scope-based runtime PM (through +* ACQUIRE(xe_pm_runtime_ioctl, ...)) is be preferred over direct usage of this +* function. Manual get/put handling should only be used when the function +* contains goto-based logic which can break scope-based handling, or when the +* lifetime of the runtime PM reference does not match a specific scope (e.g., +* runtime PM obtained in one function and released in a different one). +* * Returns: Any number greater than or equal to 0 for success, negative error * code otherwise. */
@@ -761,6 +775,13 @@ static bool xe_pm_suspending_or_resuming(struct xe_device *xe)* It will warn if not protected. * The reference should be put back after this function regardless, since it * will always bump the usage counter, regardless. +* +* When possible, scope-based runtime PM (through guard(xe_pm_runtime_noresume)) +* is be preferred over direct usage of this function. Manual get/put handling +* should only be used when the function contains goto-based logic which can +* break scope-based handling, or when the lifetime of the runtime PM reference +* does not match a specific scope (e.g., runtime PM obtained in one function +* and released in a different one). */ void xe_pm_runtime_get_noresume (struct xe_device *xe) {
drivers/gpu/drm/xe/xe_pm.h +17 -0
@@ -6,6 +6,7 @@#ifndef _XE_PM_H_#define _XE_PM_H_ +#include <linux/cleanup.h> #include <linux/pm_runtime.h> #define DEFAULT_VRAM_THRESHOLD 300/* in MB */
@@ -35,4 +36,20 @@ bool xe_rpm_reclaim_safe(const struct xe_device *xe);struct task_struct *xe_pm_read_callback_task (struct xe_device *xe);int xe_pm_module_init (void ); +static inline void __xe_pm_runtime_noop (struct xe_device *xe) {} + +DEFINE_GUARD(xe_pm_runtime, struct xe_device *, + xe_pm_runtime_get(_T), xe_pm_runtime_put(_T)) +DEFINE_GUARD(xe_pm_runtime_noresume, struct xe_device *, + xe_pm_runtime_get_noresume(_T), xe_pm_runtime_put(_T)) +DEFINE_GUARD_COND (xe_pm_runtime, _ioctl,xe_pm_runtime_get_ioctl (_T), _RET >=0 ) + +/* +* Used when a function needs to release runtime PM in all possible cases +* and error paths, but the wakeref was already acquired by a different +* function (i.e., get() has already happened so only a put() is needed). + */ +DEFINE_GUARD(xe_pm_runtime_release_only, struct xe_device *, +__xe_pm_runtime_noop (_T),xe_pm_runtime_put (_T)); +#endif
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 122/227 drm/xe: Update wedged.mode only after successful reset policy change
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukasz Laguna <[email protected]>
[ Upstream commit f262015b9797effdec15e8a81c81b2158ede9578 ]
Previously, the driver's internal wedged.mode state was updated without verifying whether the corresponding engine reset policy update in GuC succeeded. This could leave the driver reporting a wedged.mode state that doesn't match the actual reset behavior programmed in GuC.
With this change, the reset policy is updated first, and the driver's wedged.mode state is modified only if the policy update succeeds on all available GTs.
This patch also introduces two functional improvements:
- The policy is sent to GuC only when a change is required. An update is needed only when entering or leaving XE_WEDGED_MODE_UPON_ANY_HANG, because only in that case the reset policy changes. For example, switching between XE_WEDGED_MODE_UPON_CRITICAL_ERROR and XE_WEDGED_MODE_NEVER doesn't affect the reset policy, so there is no need to send the same value to GuC.
- An inconsistent_reset flag is added to track cases where reset policy update succeeds only on a subset of GTs. If such inconsistency is detected, future wedged mode configuration will force a retry of the reset policy update to restore a consistent state across all GTs.
--- drivers/gpu/drm/xe/xe_debugfs.c | 72 ++++++++++++++++++++++------ drivers/gpu/drm/xe/xe_device_types.h | 18 +++++++ drivers/gpu/drm/xe/xe_guc_ads.c | 14 +++--- drivers/gpu/drm/xe/xe_guc_ads.h | 5 +- 4 files changed, 87 insertions(+), 22 deletions(-)
drivers/gpu/drm/xe/xe_debugfs.c +57 -15
@@ -255,14 +255,64 @@ static ssize_t wedged_mode_show(struct file *f, char __user *ubuf,return simple_read_from_buffer (ubuf, size, pos, buf, len); } +static int __wedged_mode_set_reset_policy (struct xe_gt *gt,enum xe_wedged_mode mode) +{ +bool enable_engine_reset; +int ret; + + enable_engine_reset = (mode !=XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET ); + ret =xe_guc_ads_scheduler_policy_toggle_reset (>->uc.guc.ads, + enable_engine_reset); +if (ret) +xe_gt_err (gt,"Failed to update GuC ADS scheduler policy (%pe)\n" ,ERR_PTR (ret)); + +return ret; +} + +static int wedged_mode_set_reset_policy (struct xe_device *xe,enum xe_wedged_mode mode) +{ +struct xe_gt *gt; +int ret; +u8 id; + +guard (xe_pm_runtime)(xe); +for_each_gt (gt, xe, id) { + ret =__wedged_mode_set_reset_policy (gt, mode); +if (ret) { +if (id >0 ) { + xe->wedged.inconsistent_reset = true; +drm_err (&xe->drm,"Inconsistent reset policy state between GTs\n" ); + } +return ret; + } + } + + xe->wedged.inconsistent_reset = false; + +return 0 ; +} + +static bool wedged_mode_needs_policy_update (struct xe_device *xe,enum xe_wedged_mode mode) +{ +if (xe->wedged.inconsistent_reset) +return true; + +if (xe->wedged.mode == mode) +return false; + +if (xe->wedged.mode ==XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET || + mode ==XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET ) +return true; + +return false; +} +static ssize_t wedged_mode_set (struct file *f,const char __user *ubuf,size_t size,loff_t *pos) {struct xe_device *xe =file_inode (f)->i_private; -struct xe_gt *gt;u32 wedged_mode;ssize_t ret; -u8 id; ret =kstrtouint_from_user (ubuf, size,0 , &wedged_mode);if (ret)
@@ -271,22 +321,14 @@ static ssize_t wedged_mode_set(struct file *f, const char __user *ubuf,if (wedged_mode >2 )return -EINVAL ; -if (xe->wedged.mode == wedged_mode) -return size; +if (wedged_mode_needs_policy_update (xe, wedged_mode)) { + ret =wedged_mode_set_reset_policy (xe, wedged_mode); +if (ret) +return ret; + } xe->wedged.mode = wedged_mode; -xe_pm_runtime_get (xe); -for_each_gt (gt, xe, id) { - ret =xe_guc_ads_scheduler_policy_toggle_reset (>->uc.guc.ads); -if (ret) { -xe_gt_err (gt,"Failed to update GuC ADS scheduler policy. GuC may still cause engine reset even with wedged_mode=2\n" ); -xe_pm_runtime_put (xe); -return -EIO ; - } - } -xe_pm_runtime_put (xe); -return size; }
drivers/gpu/drm/xe/xe_device_types.h +18 -0
@@ -42,6 +42,22 @@ struct xe_pat_ops;struct xe_pxp ;struct xe_vram_region ; +/** +* enum xe_wedged_mode - possible wedged modes +* @XE_WEDGED_MODE_NEVER: Device will never be declared wedged. +* @XE_WEDGED_MODE_UPON_CRITICAL_ERROR: Device will be declared wedged only +* when critical error occurs like GT reset failure or firmware failure. +* This is the default mode. +* @XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET: Device will be declared wedged on +* any hang. In this mode, engine resets are disabled to avoid automatic +* recovery attempts. This mode is primarily intended for debugging hangs. +*/ +enum xe_wedged_mode { +XE_WEDGED_MODE_NEVER =0 , +XE_WEDGED_MODE_UPON_CRITICAL_ERROR =1 , +XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET =2 , +}; +#define XE_BO_INVALID_OFFSET LONG_MAX#define GRAPHICS_VER (xe) ((xe)->info.graphics_verx100 / 100)
@@ -556,6 +572,8 @@ struct xe_device {int mode;/** @wedged.method: Recovery method to be sent in the drm device wedged uevent */ unsigned long method; +/** @wedged.inconsistent_reset: Inconsistent reset policy state between GTs */ +bool inconsistent_reset; } wedged;/** @bo_device: Struct to control async free of BOs */
drivers/gpu/drm/xe/xe_guc_ads.c +8 -6
@@ -979,16 +979,17 @@ static int guc_ads_action_update_policies(struct xe_guc_ads *ads, u32 policy_off/** * xe_guc_ads_scheduler_policy_toggle_reset - Toggle reset policy * @ads: Additional data structures object +* @enable_engine_reset: true to enable engine resets, false otherwise * -* This function update the GuC's engine reset policy based on wedged.mode. +* This function update the GuC's engine reset policy. * * Return: 0 on success, and negative error code otherwise. */ -int xe_guc_ads_scheduler_policy_toggle_reset (struct xe_guc_ads *ads) +int xe_guc_ads_scheduler_policy_toggle_reset (struct xe_guc_ads *ads, +bool enable_engine_reset) {struct guc_policies *policies;struct xe_guc *guc =ads_to_guc (ads); -struct xe_device *xe =ads_to_xe (ads);CLASS (xe_guc_buf, buf)(&guc->buf,sizeof (*policies));if (!xe_guc_buf_is_valid (buf))
@@ -1000,10 +1001,11 @@ int xe_guc_ads_scheduler_policy_toggle_reset(struct xe_guc_ads *ads) policies->dpc_promote_time =ads_blob_read (ads, policies.dpc_promote_time); policies->max_num_work_items =ads_blob_read (ads, policies.max_num_work_items); policies->is_valid =1 ; -if (xe->wedged.mode ==2 ) - policies->global_flags |=GLOBAL_POLICY_DISABLE_ENGINE_RESET ; -else + +if (enable_engine_reset) policies->global_flags &= ~GLOBAL_POLICY_DISABLE_ENGINE_RESET ; +else + policies->global_flags |=GLOBAL_POLICY_DISABLE_ENGINE_RESET ;return guc_ads_action_update_policies (ads,xe_guc_buf_flush (buf)); }
drivers/gpu/drm/xe/xe_guc_ads.h +4 -1
@@ -6,6 +6,8 @@#ifndef _XE_GUC_ADS_H_#define _XE_GUC_ADS_H_ +#include <linux/types.h> +struct xe_guc_ads ;int xe_guc_ads_init (struct xe_guc_ads *ads);
@@ -13,6 +15,7 @@ int xe_guc_ads_init_post_hwconfig(struct xe_guc_ads *ads);void xe_guc_ads_populate (struct xe_guc_ads *ads);void xe_guc_ads_populate_minimal (struct xe_guc_ads *ads);void xe_guc_ads_populate_post_load (struct xe_guc_ads *ads); -int xe_guc_ads_scheduler_policy_toggle_reset (struct xe_guc_ads *ads); +int xe_guc_ads_scheduler_policy_toggle_reset (struct xe_guc_ads *ads, +bool enable_engine_reset);#endif
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 123/227 ublk: fix ublksrv pid handling for pid namespaces
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seamus Connor <[email protected]>
[ Upstream commit 47bdf1d29caec7207b7f112230055db36602dfc0 ]
When ublksrv runs inside a pid namespace, START/END_RECOVERY compared the stored init-ns tgid against the userspace pid (getpid vnr), so the check failed and control ops could not proceed. Compare against the caller’s init-ns tgid and store that value, then translate it back to the caller’s pid namespace when reporting GET_DEV_INFO so ublk list shows a sensible pid.
Testing: start/recover in a pid namespace; ublk list shows reasonable pid values in init, child, and sibling namespaces.
--- drivers/block/ublk_drv.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
drivers/block/ublk_drv.c +34 -5
@@ -2954,6 +2954,15 @@ static struct ublk_device *ublk_get_device_from_id(int idx)return ub; } +static bool ublk_validate_user_pid (struct ublk_device *ub,pid_t ublksrv_pid) +{ +rcu_read_lock (); + ublksrv_pid =pid_nr (find_vpid (ublksrv_pid)); +rcu_read_unlock (); + +return ub->ublksrv_tgid == ublksrv_pid; +} +static int ublk_ctrl_start_dev (struct ublk_device *ub,const struct ublksrv_ctrl_cmd *header) {
@@ -3022,7 +3031,7 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub,if (wait_for_completion_interruptible (&ub->completion) !=0 )return -EINTR ; -if (ub->ublksrv_tgid != ublksrv_pid) +if (!ublk_validate_user_pid (ub, ublksrv_pid))return -EINVAL ;mutex_lock (&ub->mutex);
@@ -3041,7 +3050,7 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, disk->fops = &ub_fops; disk->private_data = ub; - ub->dev_info.ublksrv_pid = ublksrv_pid; + ub->dev_info.ublksrv_pid = ub->ublksrv_tgid; ub->ub_disk = disk;ublk_apply_params (ub);
@@ -3389,12 +3398,32 @@ static int ublk_ctrl_stop_dev(struct ublk_device *ub)static int ublk_ctrl_get_dev_info (struct ublk_device *ub,const struct ublksrv_ctrl_cmd *header) { +struct task_struct *p; +struct pid *pid; +struct ublksrv_ctrl_dev_info dev_info; +pid_t init_ublksrv_tgid = ub->dev_info.ublksrv_pid;void __user *argp = (void __user *)(unsigned long )header->addr;if (header->len <sizeof (struct ublksrv_ctrl_dev_info ) || !header->addr)return -EINVAL ; -if (copy_to_user (argp, &ub->dev_info,sizeof (ub->dev_info))) +memcpy (&dev_info, &ub->dev_info,sizeof (dev_info)); + dev_info.ublksrv_pid =-1 ; + +if (init_ublksrv_tgid >0 ) { +rcu_read_lock (); + pid =find_pid_ns (init_ublksrv_tgid, &init_pid_ns); + p =pid_task (pid,PIDTYPE_TGID ); +if (p) { +int vnr =task_tgid_vnr (p); + +if (vnr) + dev_info.ublksrv_pid = vnr; + } +rcu_read_unlock (); + } + +if (copy_to_user (argp, &dev_info,sizeof (dev_info)))return -EFAULT ;return 0 ;
@@ -3539,7 +3568,7 @@ static int ublk_ctrl_end_recovery(struct ublk_device *ub,pr_devel ("%s: All FETCH_REQs received, dev id %d\n" , __func__, header->dev_id); -if (ub->ublksrv_tgid != ublksrv_pid) +if (!ublk_validate_user_pid (ub, ublksrv_pid))return -EINVAL ;mutex_lock (&ub->mutex);
@@ -3550,7 +3579,7 @@ static int ublk_ctrl_end_recovery(struct ublk_device *ub, ret = -EBUSY ; goto out_unlock; } - ub->dev_info.ublksrv_pid = ublksrv_pid; + ub->dev_info.ublksrv_pid = ub->ublksrv_tgid; ub->dev_info.state =UBLK_S_DEV_LIVE ;pr_devel ("%s: new ublksrv_pid %d, dev id %d\n" , __func__, ublksrv_pid, header->dev_id);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 124/227 selftests/ublk: fix IO thread idle check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 75aad5ffe099a1b1a342257236dc260493917ed2 ]
Include cmd_inflight in ublk_thread_is_done() check. Without this, the thread may exit before all FETCH commands are completed, which may cause device deletion to hang.
--- tools/testing/selftests/ublk/kublk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ublk/kublk.c +1 -1
@@ -718,7 +718,7 @@ static int ublk_thread_is_idle(struct ublk_thread *t)static int ublk_thread_is_done (struct ublk_thread *t) { -return (t->state &UBLKS_T_STOPPING ) &&ublk_thread_is_idle (t); +return (t->state &UBLKS_T_STOPPING ) &&ublk_thread_is_idle (t) && !t->cmd_inflight; } static inline void ublksrv_handle_tgt_cqe(struct ublk_thread *t,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 125/227 selftests/ublk: fix error handling for starting device
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 23e62cf75518825aac12e9a22bdc40f062428898 ]
Fix error handling in ublk_start_daemon() when start_dev fails:
1. Call ublk_ctrl_stop_dev() to cancel inflight uring_cmd before cleanup. Without this, the device deletion may hang waiting for I/O completion that will never happen.
2. Add fail_start label so that pthread_join() is called on the error path. This ensures proper thread cleanup when startup fails.
--- tools/testing/selftests/ublk/kublk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/testing/selftests/ublk/kublk.c +4 -2
@@ -1002,7 +1002,9 @@ static int ublk_start_daemon(const struct dev_ctx *ctx, struct ublk_dev *dev) }if (ret <0 ) {ublk_err ("%s: ublk_ctrl_start_dev failed: %d\n" , __func__, ret); - goto fail; +/* stop device so that inflight uring_cmd can be cancelled */ +ublk_ctrl_stop_dev (dev); + goto fail_start; }ublk_ctrl_get_info (dev);
@@ -1010,7 +1012,7 @@ static int ublk_start_daemon(const struct dev_ctx *ctx, struct ublk_dev *dev)ublk_ctrl_dump (dev); else ublk_send_dev_event(ctx, dev, dev->dev_info.dev_id); - +fail_start:/* wait until we are terminated */ for (i =0 ; i < dev->nthreads; i++)pthread_join (dev->threads[i].thread, &thread_ret);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 126/227 selftests/ublk: fix garbage output in foreground mode
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit e7e1cc18f120a415646be12470169a978a1adcd9 ]
Initialize _evtfd to -1 in struct dev_ctx to prevent garbage output when running kublk in foreground mode. Without this, _evtfd is zero-initialized to 0 (stdin), and ublk_send_dev_event() writes binary data to stdin which appears as garbage on the terminal.
Also fix debug message format string.
--- tools/testing/selftests/ublk/kublk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/ublk/kublk.c +2 -1
@@ -1221,7 +1221,7 @@ static int __cmd_dev_add(const struct dev_ctx *ctx) } ret =ublk_start_daemon (ctx, dev); -ublk_dbg (UBLK_DBG_DEV ,"%s: daemon exit %d\b" , ret); +ublk_dbg (UBLK_DBG_DEV ,"%s: daemon exit %d\n" , __func__, ret);if (ret <0 )ublk_ctrl_del_dev (dev);
@@ -1566,6 +1566,7 @@ int main(int argc, char *argv[])int option_idx, opt;const char *cmd = argv[1 ];struct dev_ctx ctx = { + ._evtfd =-1 , .queue_depth =128 , .nr_hw_queues =2 , .dev_id =-1 ,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 127/227 perf: Fix refcount warning on event->mmap_count increment
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Rosenberg <[email protected]>
[ Upstream commit d06bf78e55d5159c1b00072e606ab924ffbbad35 ]
When calling refcount_inc(&event->mmap_count) inside perf_mmap_rb(), the following warning is triggered:
refcount_t: addition on 0; use-after-free.
WARNING: lib/refcount.c:25
PoC:
struct perf_event_attr attr = {0};
int fd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0);
mmap(NULL, 0x3000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
int victim = syscall(__NR_perf_event_open, &attr, 0, -1, fd,
PERF_FLAG_FD_OUTPUT);
mmap(NULL, 0x3000, PROT_READ | PROT_WRITE, MAP_SHARED, victim, 0);This occurs when creating a group member event with the flag PERF_FLAG_FD_OUTPUT. The group leader should be mmap-ed and then mmap-ing the event triggers the warning.
Since the event has copied the output_event in perf_event_set_output(), event->rb is set. As a result, perf_mmap_rb() calls refcount_inc(&event->mmap_count) when event->mmap_count = 0.
Disallow the case when event->mmap_count = 0. This also prevents two events from updating the same user_page.
--- kernel/events/core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/events/core.c +9 -0
@@ -6996,6 +6996,15 @@ static int perf_mmap_rb(struct vm_area_struct *vma, struct perf_event *event,if (data_page_nr (event->rb) != nr_pages)return -EINVAL ; +/* +* If this event doesn't have mmap_count, we're attempting to +* create an alias of another event's mmap(); this would mean +* both events will end up scribbling the same user_page; +* which makes no sense. +*/ +if (!refcount_read (&event->mmap_count)) +return -EBUSY ; +if (refcount_inc_not_zero (&event->rb->mmap_count)) {/* * Success -- managed to mmap() the same buffer
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 128/227 sched/fair: Fix pelt clock sync when entering idle
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Guittot <[email protected]>
[ Upstream commit 98c88dc8a1ace642d9021b103b28cba7b51e3abc ]
Samuel and Alex reported regressions of the util_avg of RT rq with commit 17e3e88ed0b6 ("sched/fair: Fix pelt lost idle time detection"). It happens that fair is updating and syncing the pelt clock with task one when pick_next_task_fair() fails to pick a task but before the prev scheduling class got a chance to update its pelt signals.
Move update_idle_rq_clock_pelt() in set_next_task_idle() which is called after prev class has been called.
--- kernel/sched/fair.c | 6 ------ kernel/sched/idle.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
kernel/sched/fair.c +0 -6
@@ -8901,12 +8901,6 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf goto again; } -/* -* rq is about to be idle, check if we need to update the -* lost_idle_time of clock_pelt -*/ -update_idle_rq_clock_pelt (rq); -return NULL ; }
kernel/sched/idle.c +6 -0
@@ -464,6 +464,12 @@ static void set_next_task_idle(struct rq *rq, struct task_struct *next, bool firscx_update_idle (rq, true, true);schedstat_inc (rq->sched_goidle); next->se.exec_start =rq_clock_task (rq); + +/* +* rq is about to be idle, check if we need to update the +* lost_idle_time of clock_pelt +*/ +update_idle_rq_clock_pelt (rq); }struct task_struct *pick_task_idle (struct rq *rq)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 129/227 drm/amd/pm: Fix si_dpm mmCG_THERMAL_INT setting
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit 4ca284c6d15dda481f714e3687a1d5fb70b3bf5c ]
Use WREG32 to write mmCG_THERMAL_INT.
This is a direct access register.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +4 -4
@@ -7600,12 +7600,12 @@ static int si_dpm_set_interrupt_state(struct amdgpu_device *adev,case AMDGPU_IRQ_STATE_DISABLE : cg_thermal_int =RREG32_SMC (mmCG_THERMAL_INT); cg_thermal_int |=CG_THERMAL_INT__THERM_INT_MASK_HIGH_MASK ; -WREG32_SMC (mmCG_THERMAL_INT, cg_thermal_int); +WREG32 (mmCG_THERMAL_INT, cg_thermal_int);break ;case AMDGPU_IRQ_STATE_ENABLE : cg_thermal_int =RREG32_SMC (mmCG_THERMAL_INT); cg_thermal_int &= ~CG_THERMAL_INT__THERM_INT_MASK_HIGH_MASK ; -WREG32_SMC (mmCG_THERMAL_INT, cg_thermal_int); +WREG32 (mmCG_THERMAL_INT, cg_thermal_int);break ;default :break ;
@@ -7617,12 +7617,12 @@ static int si_dpm_set_interrupt_state(struct amdgpu_device *adev,case AMDGPU_IRQ_STATE_DISABLE : cg_thermal_int =RREG32_SMC (mmCG_THERMAL_INT); cg_thermal_int |=CG_THERMAL_INT__THERM_INT_MASK_LOW_MASK ; -WREG32_SMC (mmCG_THERMAL_INT, cg_thermal_int); +WREG32 (mmCG_THERMAL_INT, cg_thermal_int);break ;case AMDGPU_IRQ_STATE_ENABLE : cg_thermal_int =RREG32_SMC (mmCG_THERMAL_INT); cg_thermal_int &= ~CG_THERMAL_INT__THERM_INT_MASK_LOW_MASK ; -WREG32_SMC (mmCG_THERMAL_INT, cg_thermal_int); +WREG32 (mmCG_THERMAL_INT, cg_thermal_int);break ;default :break ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 130/227 drm/amd/pm: Dont clear SI SMC table when setting power limit
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit d5077426e1a76d269e518e048bde2e9fc49b32ad ]
There is no reason to clear the SMC table.
We also don't need to recalculate the power limit then.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +0 -10
@@ -2273,8 +2273,6 @@ static int si_populate_smc_tdp_limits(struct amdgpu_device *adev,if (scaling_factor ==0 )return -EINVAL ; -memset (smc_table,0 ,sizeof (SISLANDS_SMC_STATETABLE )); - ret = si_calculate_adjusted_tdp_limits(adev, false, /* ??? */ adev->pm.dpm.tdp_adjustment,
@@ -2328,16 +2326,8 @@ static int si_populate_smc_tdp_limits_2(struct amdgpu_device *adev,if (ni_pi->enable_power_containment) {SISLANDS_SMC_STATETABLE *smc_table = &si_pi->smc_statetable; -u32 scaling_factor =si_get_smc_power_scaling_factor (adev);int ret; -memset (smc_table,0 ,sizeof (SISLANDS_SMC_STATETABLE )); - - smc_table->dpm2Params.NearTDPLimit = -cpu_to_be32 (si_scale_power_for_smc (adev->pm.dpm.near_tdp_limit_adjusted, scaling_factor) *1000 ); - smc_table->dpm2Params.SafePowerLimit = -cpu_to_be32 (si_scale_power_for_smc ((adev->pm.dpm.near_tdp_limit_adjusted *SISLANDS_DPM2_TDP_SAFE_LIMIT_PERCENT ) /100 , scaling_factor) *1000 ); - ret = amdgpu_si_copy_bytes_to_smc(adev, (si_pi->state_table_start + offsetof(SISLANDS_SMC_STATETABLE, dpm2Params) +
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 131/227 drm/amd/pm: Workaround SI powertune issue on Radeon 430 (v2)
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Kristóf <[email protected]>
[ Upstream commit 764a90eb02268a23b1bb98be5f4a13671346804a ]
Radeon 430 and 520 are OEM GPUs from 2016~2017 They have the same device id: 0x6611 and revision: 0x87
On the Radeon 430, powertune is buggy and throttles the GPU, never allowing it to reach its maximum SCLK. Work around this bug by raising the TDP limits we program to the SMC from 24W (specified by the VBIOS on Radeon 430) to 32W.
Disabling powertune entirely is not a viable workaround,
because it causes the Radeon 520 to heat up above 100 C,
which I prefer to avoid.
Additionally, revise the maximum SCLK limit. Considering the above issue, these GPUs never reached a high SCLK on Linux, and the workarounds were added before the GPUs were released, so the workaround likely didn't target these specifically. Use 780 MHz (the maximum SCLK according to the VBIOS on the Radeon 430). Note that the Radeon 520 VBIOS has a higher maximum SCLK: 905 MHz, but in practice it doesn't seem to perform better with the higher clock, only heats up more.
v2:
Move the workaround to si_populate_smc_tdp_limits.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +12 -1
@@ -2281,6 +2281,12 @@ static int si_populate_smc_tdp_limits(struct amdgpu_device *adev,if (ret)return ret; +if (adev->pdev->device ==0x6611 && adev->pdev->revision ==0x87 ) { +/* Workaround buggy powertune on Radeon 430 and 520. */ + tdp_limit =32 ; + near_tdp_limit =28 ; + } + smc_table->dpm2Params.TDPLimit =cpu_to_be32 (si_scale_power_for_smc (tdp_limit, scaling_factor) *1000 ); smc_table->dpm2Params.NearTDPLimit =
@@ -3468,10 +3474,15 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, (adev->pdev->revision ==0x80 ) || (adev->pdev->revision ==0x81 ) || (adev->pdev->revision ==0x83 ) || - (adev->pdev->revision == 0x87) || + (adev->pdev->revision ==0x87 && + adev->pdev->device !=0x6611 ) || (adev->pdev->device ==0x6604 ) || (adev->pdev->device == 0x6605)) { max_sclk = 75000; + }else if (adev->pdev->revision ==0x87 && + adev->pdev->device ==0x6611 ) { +/* Radeon 430 and 520 */ + max_sclk =78000 ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 132/227 drm/amdgpu: fix type for wptr in ring backup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 095ca815174e51fc0049771712d5455cabd7231e ]
Needs to be a u64.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -1
@@ -804,7 +804,7 @@ void amdgpu_fence_save_wptr(struct dma_fence *fence) }static void amdgpu_ring_backup_unprocessed_command (struct amdgpu_ring *ring, -u64 start_wptr,u32 end_wptr) +u64 start_wptr,u64 end_wptr) {unsigned int first_idx = start_wptr & ring->buf_mask;unsigned int last_idx = end_wptr & ring->buf_mask;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 133/227 drm/nouveau: add missing DCB connector types
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Ramírez <[email protected]>
[ Upstream commit 3036b4ce4b209af690fa776e4616925892caba4c ]
* Add missing DCB connectors in conn.h as per the NVIDIA DCB specification.
A lot of connector logic was rewritten for Linux v6.5; some display connector types went unaccounted-for which caused kernel warnings on devices with the now-unsupported DCB connectors. This patch adds all of the DCB connectors as defined by NVIDIA to the dcb_connector_type enum to bring back support for these connectors to the new logic.
--- .../nouveau/include/nvkm/subdev/bios/conn.h | 95 +++++++++++++++---- 1 file changed, 74 insertions(+), 21 deletions(-)
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h +74 -21
@@ -1,28 +1,81 @@/* SPDX-License-Identifier: MIT */ #ifndef __NVBIOS_CONN_H__#define __NVBIOS_CONN_H__ + +/* +* An enumerator representing all of the possible VBIOS connector types defined +* by Nvidia at +* https://nvidia.github.io/open-gpu-doc/DCB/DCB-4.x-Specification.html. +* +* [1] Nvidia's documentation actually claims DCB_CONNECTOR_HDMI_0 is a "3-Pin +* DIN Stereo Connector". This seems very likely to be a documentation typo +* or some sort of funny historical baggage, because we've treated this +* connector type as HDMI for years without issue. +* TODO: Check with Nvidia what's actually happening here. +*/ enum dcb_connector_type { -DCB_CONNECTOR_VGA =0x00 , -DCB_CONNECTOR_TV_0 =0x10 , -DCB_CONNECTOR_TV_1 =0x11 , -DCB_CONNECTOR_TV_3 =0x13 , -DCB_CONNECTOR_DVI_I =0x30 , -DCB_CONNECTOR_DVI_D =0x31 , -DCB_CONNECTOR_DMS59_0 =0x38 , -DCB_CONNECTOR_DMS59_1 =0x39 , -DCB_CONNECTOR_LVDS =0x40 , -DCB_CONNECTOR_LVDS_SPWG =0x41 , -DCB_CONNECTOR_DP =0x46 , - DCB_CONNECTOR_eDP =0x47 , - DCB_CONNECTOR_mDP =0x48 , -DCB_CONNECTOR_HDMI_0 =0x60 , -DCB_CONNECTOR_HDMI_1 =0x61 , -DCB_CONNECTOR_HDMI_C =0x63 , -DCB_CONNECTOR_DMS59_DP0 =0x64 , -DCB_CONNECTOR_DMS59_DP1 =0x65 , -DCB_CONNECTOR_WFD =0x70 , -DCB_CONNECTOR_USB_C =0x71 , -DCB_CONNECTOR_NONE =0xff +/* Analog outputs */ +DCB_CONNECTOR_VGA =0x00 ,// VGA 15-pin connector +DCB_CONNECTOR_DVI_A =0x01 ,// DVI-A +DCB_CONNECTOR_POD_VGA =0x02 ,// Pod - VGA 15-pin connector +DCB_CONNECTOR_TV_0 =0x10 ,// TV - Composite Out +DCB_CONNECTOR_TV_1 =0x11 ,// TV - S-Video Out +DCB_CONNECTOR_TV_2 =0x12 ,// TV - S-Video Breakout - Composite +DCB_CONNECTOR_TV_3 =0x13 ,// HDTV Component - YPrPb +DCB_CONNECTOR_TV_SCART =0x14 ,// TV - SCART Connector +DCB_CONNECTOR_TV_SCART_D =0x16 ,// TV - Composite SCART over D-connector +DCB_CONNECTOR_TV_DTERM =0x17 ,// HDTV - D-connector (EIAJ4120) +DCB_CONNECTOR_POD_TV_3 =0x18 ,// Pod - HDTV - YPrPb +DCB_CONNECTOR_POD_TV_1 =0x19 ,// Pod - S-Video +DCB_CONNECTOR_POD_TV_0 =0x1a ,// Pod - Composite + +/* DVI digital outputs */ +DCB_CONNECTOR_DVI_I_TV_1 =0x20 ,// DVI-I-TV-S-Video +DCB_CONNECTOR_DVI_I_TV_0 =0x21 ,// DVI-I-TV-Composite +DCB_CONNECTOR_DVI_I_TV_2 =0x22 ,// DVI-I-TV-S-Video Breakout-Composite +DCB_CONNECTOR_DVI_I =0x30 ,// DVI-I +DCB_CONNECTOR_DVI_D =0x31 ,// DVI-D +DCB_CONNECTOR_DVI_ADC =0x32 ,// Apple Display Connector (ADC) +DCB_CONNECTOR_DMS59_0 =0x38 ,// LFH-DVI-I-1 +DCB_CONNECTOR_DMS59_1 =0x39 ,// LFH-DVI-I-2 +DCB_CONNECTOR_BNC =0x3c ,// BNC Connector [for SDI?] + +/* LVDS / TMDS digital outputs */ +DCB_CONNECTOR_LVDS =0x40 ,// LVDS-SPWG-Attached [is this name correct?] +DCB_CONNECTOR_LVDS_SPWG =0x41 ,// LVDS-OEM-Attached (non-removable) +DCB_CONNECTOR_LVDS_REM =0x42 ,// LVDS-SPWG-Detached [following naming above] +DCB_CONNECTOR_LVDS_SPWG_REM =0x43 ,// LVDS-OEM-Detached (removable) +DCB_CONNECTOR_TMDS =0x45 ,// TMDS-OEM-Attached (non-removable) + +/* DP digital outputs */ +DCB_CONNECTOR_DP =0x46 ,// DisplayPort External Connector + DCB_CONNECTOR_eDP =0x47 ,// DisplayPort Internal Connector + DCB_CONNECTOR_mDP =0x48 ,// DisplayPort (Mini) External Connector + +/* Dock outputs (not used) */ +DCB_CONNECTOR_DOCK_VGA_0 =0x50 ,// VGA 15-pin if not docked +DCB_CONNECTOR_DOCK_VGA_1 =0x51 ,// VGA 15-pin if docked +DCB_CONNECTOR_DOCK_DVI_I_0 =0x52 ,// DVI-I if not docked +DCB_CONNECTOR_DOCK_DVI_I_1 =0x53 ,// DVI-I if docked +DCB_CONNECTOR_DOCK_DVI_D_0 =0x54 ,// DVI-D if not docked +DCB_CONNECTOR_DOCK_DVI_D_1 =0x55 ,// DVI-D if docked +DCB_CONNECTOR_DOCK_DP_0 =0x56 ,// DisplayPort if not docked +DCB_CONNECTOR_DOCK_DP_1 =0x57 ,// DisplayPort if docked + DCB_CONNECTOR_DOCK_mDP_0 =0x58 ,// DisplayPort (Mini) if not docked + DCB_CONNECTOR_DOCK_mDP_1 =0x59 ,// DisplayPort (Mini) if docked + +/* HDMI? digital outputs */ +DCB_CONNECTOR_HDMI_0 =0x60 ,// HDMI? See [1] in top-level enum comment above +DCB_CONNECTOR_HDMI_1 =0x61 ,// HDMI-A connector +DCB_CONNECTOR_SPDIF =0x62 ,// Audio S/PDIF connector +DCB_CONNECTOR_HDMI_C =0x63 ,// HDMI-C (Mini) connector + +/* Misc. digital outputs */ +DCB_CONNECTOR_DMS59_DP0 =0x64 ,// LFH-DP-1 +DCB_CONNECTOR_DMS59_DP1 =0x65 ,// LFH-DP-2 +DCB_CONNECTOR_WFD =0x70 ,// Virtual connector for Wifi Display (WFD) +DCB_CONNECTOR_USB_C =0x71 ,// [DP over USB-C; not present in docs] +DCB_CONNECTOR_NONE =0xff // Skip Entry }; struct nvbios_connT {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 134/227 drm/nouveau: implement missing DCB connector types; gracefully handle unknown connectors
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Ramírez <[email protected]>
[ Upstream commit d0bd10792d6cc3725ddee43f03fd6ee234f24844 ]
* Implement missing DCB connectors in uconn.c previously defined in conn.h.
* Replace kernel WARN_ON macro with printk message to more gracefully signify an unknown connector was encountered.
With this patch, unknown connectors are explicitly marked with value 0 (DCB_CONNECTOR_VGA) to match the tested current behavior. Although 0xff (DCB_CONNECTOR_NONE) may be more suitable, I don't want to introduce a breaking change.
--- .../gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 73 ++++++++++++++----- 1 file changed, 53 insertions(+), 20 deletions(-)
drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c +53 -20
@@ -191,27 +191,60 @@ nvkm_uconn_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, struct nvspin_lock (&disp->client.lock);if (!conn->object.func) {switch (conn->info.type) { -case DCB_CONNECTOR_VGA : args->v0.type =NVIF_CONN_V0_VGA ;break ; -case DCB_CONNECTOR_TV_0 : -case DCB_CONNECTOR_TV_1 : -case DCB_CONNECTOR_TV_3 : args->v0.type =NVIF_CONN_V0_TV ;break ; -case DCB_CONNECTOR_DMS59_0 : -case DCB_CONNECTOR_DMS59_1 : -case DCB_CONNECTOR_DVI_I : args->v0.type =NVIF_CONN_V0_DVI_I ;break ; -case DCB_CONNECTOR_DVI_D : args->v0.type =NVIF_CONN_V0_DVI_D ;break ; -case DCB_CONNECTOR_LVDS : args->v0.type =NVIF_CONN_V0_LVDS ;break ; -case DCB_CONNECTOR_LVDS_SPWG : args->v0.type =NVIF_CONN_V0_LVDS_SPWG ;break ; -case DCB_CONNECTOR_DMS59_DP0 : -case DCB_CONNECTOR_DMS59_DP1 : -case DCB_CONNECTOR_DP : -case DCB_CONNECTOR_mDP : -case DCB_CONNECTOR_USB_C : args->v0.type =NVIF_CONN_V0_DP ;break ; -case DCB_CONNECTOR_eDP : args->v0.type =NVIF_CONN_V0_EDP ;break ; -case DCB_CONNECTOR_HDMI_0 : -case DCB_CONNECTOR_HDMI_1 : -case DCB_CONNECTOR_HDMI_C : args->v0.type =NVIF_CONN_V0_HDMI ;break ; +/* VGA */ +case DCB_CONNECTOR_DVI_A : +case DCB_CONNECTOR_POD_VGA : +case DCB_CONNECTOR_VGA : args->v0.type =NVIF_CONN_V0_VGA ;break ; + +/* TV */ +case DCB_CONNECTOR_TV_0 : +case DCB_CONNECTOR_TV_1 : +case DCB_CONNECTOR_TV_2 : +case DCB_CONNECTOR_TV_SCART : +case DCB_CONNECTOR_TV_SCART_D : +case DCB_CONNECTOR_TV_DTERM : +case DCB_CONNECTOR_POD_TV_3 : +case DCB_CONNECTOR_POD_TV_1 : +case DCB_CONNECTOR_POD_TV_0 : +case DCB_CONNECTOR_TV_3 : args->v0.type =NVIF_CONN_V0_TV ;break ; + +/* DVI */ +case DCB_CONNECTOR_DVI_I_TV_1 : +case DCB_CONNECTOR_DVI_I_TV_0 : +case DCB_CONNECTOR_DVI_I_TV_2 : +case DCB_CONNECTOR_DVI_ADC : +case DCB_CONNECTOR_DMS59_0 : +case DCB_CONNECTOR_DMS59_1 : +case DCB_CONNECTOR_DVI_I : args->v0.type =NVIF_CONN_V0_DVI_I ;break ; +case DCB_CONNECTOR_TMDS : +case DCB_CONNECTOR_DVI_D : args->v0.type =NVIF_CONN_V0_DVI_D ;break ; + +/* LVDS */ +case DCB_CONNECTOR_LVDS : args->v0.type =NVIF_CONN_V0_LVDS ;break ; +case DCB_CONNECTOR_LVDS_SPWG : args->v0.type =NVIF_CONN_V0_LVDS_SPWG ;break ; + +/* DP */ +case DCB_CONNECTOR_DMS59_DP0 : +case DCB_CONNECTOR_DMS59_DP1 : +case DCB_CONNECTOR_DP : +case DCB_CONNECTOR_mDP : +case DCB_CONNECTOR_USB_C : args->v0.type =NVIF_CONN_V0_DP ;break ; +case DCB_CONNECTOR_eDP : args->v0.type =NVIF_CONN_V0_EDP ;break ; + +/* HDMI */ +case DCB_CONNECTOR_HDMI_0 : +case DCB_CONNECTOR_HDMI_1 : +case DCB_CONNECTOR_HDMI_C : args->v0.type =NVIF_CONN_V0_HDMI ;break ; + +/* +* Dock & unused outputs. +* BNC, SPDIF, WFD, and detached LVDS go here. +*/ default : -WARN_ON (1 ); +nvkm_warn (&disp->engine.subdev, +"unimplemented connector type 0x%02x\n" , + conn->info.type); + args->v0.type =NVIF_CONN_V0_VGA ; ret = -EINVAL ;break ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 135/227 be2net: Fix NULL pointer dereference in be_cmd_get_mac_from_list
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vatoropin <[email protected]>
[ Upstream commit 8215794403d264739cc676668087512950b2ff31 ]
When the parameter pmac_id_valid argument of be_cmd_get_mac_from_list() is set to false, the driver may request the PMAC_ID from the firmware of the network card, and this function will store that PMAC_ID at the provided address pmac_id. This is the contract of this function.
However, there is a location within the driver where both pmac_id_valid == false and pmac_id == NULL are being passed. This could result in dereferencing a NULL pointer.
To resolve this issue, it is necessary to pass the address of a stub variable to the function.
--- drivers/net/ethernet/emulex/benet/be_cmds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/emulex/benet/be_cmds.c +2 -1
@@ -3801,6 +3801,7 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) {int status;bool pmac_valid = false; +u32 pmac_id;eth_zero_addr (mac);
@@ -3813,7 +3814,7 @@ int be_cmd_get_perm_mac(struct be_adapter *adapter, u8 *mac) adapter->if_handle, 0); }else { status =be_cmd_get_mac_from_list (adapter, mac, &pmac_valid, -NULL , adapter->if_handle,0 ); + &pmac_id, adapter->if_handle,0 ); }return status;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 136/227 selftests: net: amt: wait longer for connection before sending packets
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taehee Yoo <[email protected]>
[ Upstream commit 04708606fd7bdc34b69089a4ff848ff36d7088f9 ]
Both send_mcast4() and send_mcast6() use sleep 2 to wait for the tunnel connection between the gateway and the relay, and for the listener socket to be created in the LISTENER namespace.
However, tests sometimes fail because packets are sent before the connection is fully established.
Increase the waiting time to make the tests more reliable, and use wait_local_port_listen() to explicitly wait for the listener socket.
--- tools/testing/selftests/net/amt.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/net/amt.sh +5 -2
@@ -73,6 +73,8 @@ # +------------------------+ #============================================================================== +source lib.sh + readonly LISTENER=$(mktemp -u listener-XXXXXXXX) readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX) readonly RELAY=$(mktemp -u relay-XXXXXXXX)
@@ -246,14 +248,15 @@ test_ipv6_forward() send_mcast4() { - sleep 2 + sleep 5 + wait_local_port_listen ${LISTENER} 4000 udp ip netns exec "${SOURCE}" bash -c \ 'printf "%s %128s" 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' & } send_mcast6() { - sleep 2 + wait_local_port_listen ${LISTENER} 6000 udp ip netns exec "${SOURCE}" bash -c \ 'printf "%s %128s" 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' & }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 137/227 bonding: provide a net pointer to __skb_flow_dissect()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5f9b329096596b7e53e07d041d7fca4cbe1be752 ]
After 3cbf4ffba5ee ("net: plumb network namespace into __skb_flow_dissect") we have to provide a net pointer to __skb_flow_dissect(), either via skb->dev, skb->sk, or a user provided pointer.
In the following case, syzbot was able to cook a bare skb.
WARNING: net/core/flow_dissector.c:1131 at __skb_flow_dissect+0xb57/0x68b0 net/core/flow_dissector.c:1131, CPU#1: syz.2.1418/11053 Call Trace: <TASK> bond_flow_dissect drivers/net/bonding/bond_main.c:4093 [inline] __bond_xmit_hash+0x2d7/0xba0 drivers/net/bonding/bond_main.c:4157 bond_xmit_hash_xdp drivers/net/bonding/bond_main.c:4208 [inline] bond_xdp_xmit_3ad_xor_slave_get drivers/net/bonding/bond_main.c:5139 [inline] bond_xdp_get_xmit_slave+0x1fd/0x710 drivers/net/bonding/bond_main.c:5515 xdp_master_redirect+0x13f/0x2c0 net/core/filter.c:4388 bpf_prog_run_xdp include/net/xdp.h:700 [inline] bpf_test_run+0x6b2/0x7d0 net/bpf/test_run.c:421 bpf_prog_test_run_xdp+0x795/0x10e0 net/bpf/test_run.c:1390 bpf_prog_test_run+0x2c7/0x340 kernel/bpf/syscall.c:4703 __sys_bpf+0x562/0x860 kernel/bpf/syscall.c:6182 __do_sys_bpf kernel/bpf/syscall.c:6274 [inline] __se_sys_bpf kernel/bpf/syscall.c:6272 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:6272 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xec/0xf80 arch/x86/entry/syscall_64.c:94
--- drivers/net/bonding/bond_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +3 -2
@@ -4187,8 +4187,9 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, const vcase BOND_XMIT_POLICY_ENCAP23 :case BOND_XMIT_POLICY_ENCAP34 :memset (fk,0 ,sizeof (*fk)); -return __skb_flow_dissect (NULL , skb, &flow_keys_bonding, - fk, data, l2_proto, nhoff, hlen,0 ); +return __skb_flow_dissect (dev_net (bond->dev), skb, + &flow_keys_bonding, fk, data, + l2_proto, nhoff, hlen,0 );default :break ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 138/227 net: bcmasp: Fix network filter wake for asp-3.0
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Chen <[email protected]>
[ Upstream commit bbb11b8d758d17a4ce34b8ed0b49de150568265b ]
We need to apply the tx_chan_offset to the netfilter cfg channel or the output channel will be incorrect for asp-3.0 and newer.
--- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 5 +++-- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/asp2/bcmasp.c +3 -2
@@ -156,7 +156,7 @@ static void bcmasp_netfilt_hw_en_wake(struct bcmasp_priv *priv,ASP_RX_FILTER_NET_OFFSET_L4 (32 ), ASP_RX_FILTER_NET_OFFSET(nfilt->hw_index + 1)); - rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->port + 8) | + rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->ch) | ASP_RX_FILTER_NET_CFG_EN | ASP_RX_FILTER_NET_CFG_L2_EN | ASP_RX_FILTER_NET_CFG_L3_EN |
@@ -166,7 +166,7 @@ static void bcmasp_netfilt_hw_en_wake(struct bcmasp_priv *priv,ASP_RX_FILTER_NET_CFG_UMC (nfilt->port), ASP_RX_FILTER_NET_CFG(nfilt->hw_index)); - rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->port + 8) | + rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt->ch) | ASP_RX_FILTER_NET_CFG_EN | ASP_RX_FILTER_NET_CFG_L2_EN | ASP_RX_FILTER_NET_CFG_L3_EN |
@@ -714,6 +714,7 @@ struct bcmasp_net_filter *bcmasp_netfilt_get_init(struct bcmasp_intf *intf, nfilter = &priv->net_filters[open_index]; nfilter->claimed = true; nfilter->port = intf->port; + nfilter->ch = intf->channel + priv->tx_chan_offset; nfilter->hw_index = open_index; }
drivers/net/ethernet/broadcom/asp2/bcmasp.h +1 -0
@@ -348,6 +348,7 @@ struct bcmasp_net_filter {bool wake_filter;int port; +int ch;unsigned int hw_index; };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 139/227 net: dsa: fix off-by-one in maximum bridge ID determination
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit dfca045cd4d0ea07ff4198ba392be3e718acaddc ]
Prior to the blamed commit, the bridge_num range was from 0 to ds->max_num_bridges - 1. After the commit, it is from 1 to ds->max_num_bridges.
So this check:
if (bridge_num >= max) return 0; must be updated to: if (bridge_num > max) return 0;
in order to allow the last bridge_num value (==max) to be used.
This is easiest visible when a driver sets ds->max_num_bridges=1. The observed behaviour is that even the first created bridge triggers the netlink extack "Range of offloadable bridges exceeded" warning, and is handled in software rather than being offloaded.
--- net/dsa/dsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dsa/dsa.c +1 -1
@@ -157,7 +157,7 @@ unsigned int dsa_bridge_num_get(const struct net_device *bridge_dev, int max) bridge_num =find_next_zero_bit (&dsa_fwd_offloading_bridges,DSA_MAX_NUM_OFFLOADING_BRIDGES ,1 ); -if (bridge_num >= max) +if (bridge_num > max)return 0 ;set_bit (bridge_num, &dsa_fwd_offloading_bridges);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 140/227 net: pcs: pcs-mtk-lynxi: report in-band capability for 2500Base-X
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit e8ca461f7d19464b47c64fe4cf2f83162421bcc0 ]
It turns out that 2500Base-X actually works fine with in-band status on MediaTek's LynxI PCS -- I wrongly concluded it didn't because it is broken in all the copper SFP modules and GPON sticks I used for testing.
Hence report LINK_INBAND_ENABLE also for 2500Base-X mode.
This reverts most of commit a003c38d9bbb ("net: pcs: pcs-mtk-lynxi:
correctly report in-band status capabilities").
The removal of the QSGMII interface mode was correct and is left untouched.
--- drivers/net/pcs/pcs-mtk-lynxi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/pcs/pcs-mtk-lynxi.c +1 -3
@@ -93,12 +93,10 @@ static unsigned int mtk_pcs_lynxi_inband_caps(struct phylink_pcs *pcs, {switch (interface) {case PHY_INTERFACE_MODE_1000BASEX : +case PHY_INTERFACE_MODE_2500BASEX :case PHY_INTERFACE_MODE_SGMII :return LINK_INBAND_DISABLE |LINK_INBAND_ENABLE ; -case PHY_INTERFACE_MODE_2500BASEX : -return LINK_INBAND_DISABLE ; -default :return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 141/227 octeontx2-af: Fix error handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ratheesh Kannoth <[email protected]>
[ Upstream commit 19e4175e997a5b85eab97d522f00cc99abd1873c ]
This commit adds error handling and rollback logic to rvu_mbox_handler_attach_resources() to properly clean up partially attached resources when rvu_attach_block() fails.
--- .../net/ethernet/marvell/octeontx2/af/rvu.c | 86 ++++++++++++++----- 1 file changed, 64 insertions(+), 22 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +64 -22
@@ -1551,8 +1551,8 @@ static int rvu_get_attach_blkaddr(struct rvu *rvu, int blktype,return -ENODEV ; } -static void rvu_attach_block (struct rvu *rvu,int pcifunc,int blktype, -int num_lfs,struct rsrc_attach *attach) +static int rvu_attach_block (struct rvu *rvu,int pcifunc,int blktype, +int num_lfs,struct rsrc_attach *attach) {struct rvu_pfvf *pfvf =rvu_get_pfvf (rvu, pcifunc);struct rvu_hwinfo *hw = rvu->hw;
@@ -1562,21 +1562,21 @@ static void rvu_attach_block(struct rvu *rvu, int pcifunc, int blktype,u64 cfg;if (!num_lfs) -return ; +return -EINVAL ; blkaddr =rvu_get_attach_blkaddr (rvu, blktype, pcifunc, attach);if (blkaddr <0 ) -return ; +return -EFAULT ; block = &hw->block[blkaddr];if (!block->lf.bmap) -return ; +return -ESRCH ;for (slot =0 ; slot < num_lfs; slot++) {/* Allocate the resource */ lf =rvu_alloc_rsrc (&block->lf);if (lf <0 ) -return ; +return -EFAULT ; cfg = (1ULL <<63 ) | (pcifunc <<8 ) | slot; rvu_write64(rvu, blkaddr, block->lfcfg_reg |
@@ -1587,6 +1587,8 @@ static void rvu_attach_block(struct rvu *rvu, int pcifunc, int blktype,/* Set start MSIX vector for this LF within this PF/VF */ rvu_set_msix_offset (rvu, pfvf, block, lf); } + +return 0 ; } static int rvu_check_rsrc_availability(struct rvu *rvu,
@@ -1724,22 +1726,31 @@ int rvu_mbox_handler_attach_resources(struct rvu *rvu,int err;/* If first request, detach all existing attached resources */ -if (!attach->modify) -rvu_detach_rsrcs (rvu,NULL , pcifunc); +if (!attach->modify) { + err =rvu_detach_rsrcs (rvu,NULL , pcifunc); +if (err) +return err; + }mutex_lock (&rvu->rsrc_lock);/* Check if the request can be accommodated */ err =rvu_check_rsrc_availability (rvu, attach, pcifunc);if (err) - goto exit; + goto fail1;/* Now attach the requested resources */ -if (attach->npalf) -rvu_attach_block (rvu, pcifunc,BLKTYPE_NPA ,1 , attach); +if (attach->npalf) { + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_NPA ,1 , attach); +if (err) + goto fail1; + } -if (attach->nixlf) -rvu_attach_block (rvu, pcifunc,BLKTYPE_NIX ,1 , attach); +if (attach->nixlf) { + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_NIX ,1 , attach); +if (err) + goto fail2; + }if (attach->sso) {/* RVU func doesn't know which exact LF or slot is attached
@@ -1749,33 +1760,64 @@ int rvu_mbox_handler_attach_resources(struct rvu *rvu,*/ if (attach->modify)rvu_detach_block (rvu, pcifunc,BLKTYPE_SSO ); -rvu_attach_block (rvu, pcifunc,BLKTYPE_SSO , - attach->sso, attach); + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_SSO , + attach->sso, attach); +if (err) + goto fail3; }if (attach->ssow) {if (attach->modify)rvu_detach_block (rvu, pcifunc,BLKTYPE_SSOW ); -rvu_attach_block (rvu, pcifunc,BLKTYPE_SSOW , - attach->ssow, attach); + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_SSOW , + attach->ssow, attach); +if (err) + goto fail4; }if (attach->timlfs) {if (attach->modify)rvu_detach_block (rvu, pcifunc,BLKTYPE_TIM ); -rvu_attach_block (rvu, pcifunc,BLKTYPE_TIM , - attach->timlfs, attach); + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_TIM , + attach->timlfs, attach); +if (err) + goto fail5; }if (attach->cptlfs) {if (attach->modify &&rvu_attach_from_same_block (rvu,BLKTYPE_CPT , attach))rvu_detach_block (rvu, pcifunc,BLKTYPE_CPT ); -rvu_attach_block (rvu, pcifunc,BLKTYPE_CPT , - attach->cptlfs, attach); + err =rvu_attach_block (rvu, pcifunc,BLKTYPE_CPT , + attach->cptlfs, attach); +if (err) + goto fail6; } -exit: +mutex_unlock (&rvu->rsrc_lock); +return 0 ; + +fail6: +if (attach->timlfs) +rvu_detach_block (rvu, pcifunc,BLKTYPE_TIM ); + +fail5: +if (attach->ssow) +rvu_detach_block (rvu, pcifunc,BLKTYPE_SSOW ); + +fail4: +if (attach->sso) +rvu_detach_block (rvu, pcifunc,BLKTYPE_SSO ); + +fail3: +if (attach->nixlf) +rvu_detach_block (rvu, pcifunc,BLKTYPE_NIX ); + +fail2: +if (attach->npalf) +rvu_detach_block (rvu, pcifunc,BLKTYPE_NPA ); + +fail1:mutex_unlock (&rvu->rsrc_lock);return err; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 142/227 net: openvswitch: fix data race in ovs_vport_get_upcall_stats
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yang <[email protected]>
[ Upstream commit cc4816bdb08639e5cd9acb295a02d6f0f09736b4 ]
In ovs_vport_get_upcall_stats(), some statistics protected by u64_stats_sync, are read and accumulated in ignorance of possible u64_stats_fetch_retry() events. These statistics are already accumulated by u64_stats_inc(). Fix this by reading them into temporary variables first.
--- net/openvswitch/vport.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/openvswitch/vport.c +6 -5
@@ -310,22 +310,23 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)*/ int ovs_vport_get_upcall_stats (struct vport *vport,struct sk_buff *skb) { +u64 tx_success =0 , tx_fail =0 ;struct nlattr *nla;int i; -__u64 tx_success =0 ; -__u64 tx_fail =0 ; -for_each_possible_cpu (i) {const struct vport_upcall_stats_percpu *stats; +u64 n_success, n_fail;unsigned int start; stats =per_cpu_ptr (vport->upcall_stats, i);do { start =u64_stats_fetch_begin (&stats->syncp); - tx_success +=u64_stats_read (&stats->n_success); - tx_fail +=u64_stats_read (&stats->n_fail); + n_success =u64_stats_read (&stats->n_success); + n_fail =u64_stats_read (&stats->n_fail); }while (u64_stats_fetch_retry (&stats->syncp, start)); + tx_success += n_success; + tx_fail += n_fail; } nla =nla_nest_start_noflag (skb,OVS_VPORT_ATTR_UPCALL_STATS );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 143/227 vsock/virtio: fix potential underflow in virtio_transport_get_credit()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Melbin K Mathew <[email protected]>
[ Upstream commit 3ef3d52a1a9860d094395c7a3e593f3aa26ff012 ]
The credit calculation in virtio_transport_get_credit() uses unsigned arithmetic:
ret = vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt);
If the peer shrinks its advertised buffer (peer_buf_alloc) while bytes are in flight, the subtraction can underflow and produce a large positive value, potentially allowing more data to be queued than the peer can handle.
Reuse virtio_transport_has_space() which already handles this case and add a comment to make it clear why we are doing that.
--- net/vmw_vsock/virtio_transport_common.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/vmw_vsock/virtio_transport_common.c +9 -7
@@ -28,6 +28,7 @@static void virtio_transport_cancel_close_work (struct vsock_sock *vsk,bool cancel_timeout); +static s64 virtio_transport_has_space (struct virtio_vsock_sock *vvs);static const struct virtio_transport *virtio_transport_get_ops (struct vsock_sock *vsk)
@@ -499,9 +500,7 @@ u32 virtio_transport_get_credit(struct virtio_vsock_sock *vvs, u32 credit)return 0 ;spin_lock_bh (&vvs->tx_lock); - ret = vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt); -if (ret > credit) - ret = credit; + ret =min_t (u32, credit,virtio_transport_has_space (vvs)); vvs->tx_cnt += ret; vvs->bytes_unsent += ret;spin_unlock_bh (&vvs->tx_lock);
@@ -877,11 +876,14 @@ u32 virtio_transport_seqpacket_has_data(struct vsock_sock *vsk) }EXPORT_SYMBOL_GPL (virtio_transport_seqpacket_has_data); -static s64 virtio_transport_has_space (struct vsock_sock *vsk) +static s64 virtio_transport_has_space (struct virtio_vsock_sock *vvs) { -struct virtio_vsock_sock *vvs = vsk->trans;s64 bytes; +/* Use s64 arithmetic so if the peer shrinks peer_buf_alloc while +* we have bytes in flight (tx_cnt - peer_fwd_cnt), the subtraction +* does not underflow. +*/ bytes = (s64 )vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt);if (bytes <0 ) bytes =0 ;
@@ -895,7 +897,7 @@ s64 virtio_transport_stream_has_space(struct vsock_sock *vsk)s64 bytes;spin_lock_bh (&vvs->tx_lock); - bytes =virtio_transport_has_space (vsk); + bytes =virtio_transport_has_space (vvs);spin_unlock_bh (&vvs->tx_lock);return bytes;
@@ -1492,7 +1494,7 @@ static bool virtio_transport_space_update(struct sock *sk,spin_lock_bh (&vvs->tx_lock); vvs->peer_buf_alloc =le32_to_cpu (hdr->buf_alloc); vvs->peer_fwd_cnt =le32_to_cpu (hdr->fwd_cnt); - space_available =virtio_transport_has_space (vsk); + space_available =virtio_transport_has_space (vvs);spin_unlock_bh (&vvs->tx_lock);return space_available; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 144/227 vsock/test: fix seqpacket message bounds test
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Garzarella <[email protected]>
[ Upstream commit 0a98de80136968bab7db37b16282b37f044694d3 ]
The test requires the sender (client) to send all messages before waking up the receiver (server).
Since virtio-vsock had a bug and did not respect the size of the TX buffer, this test worked, but now that we are going to fix the bug, the test hangs because the sender would fill the TX buffer before waking up the receiver.
Set the buffer size in the sender (client) as well, as we already do for the receiver (server).
--- tools/testing/vsock/vsock_test.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/testing/vsock/vsock_test.c +11 -0
@@ -351,6 +351,7 @@ static void test_stream_msg_peek_server(const struct test_opts *opts)static void test_seqpacket_msg_bounds_client (const struct test_opts *opts) { +unsigned long long sock_buf_size;unsigned long curr_hash;size_t max_msg_size;int page_size;
@@ -363,6 +364,16 @@ static void test_seqpacket_msg_bounds_client(const struct test_opts *opts)exit (EXIT_FAILURE ); } + sock_buf_size =SOCK_BUF_SIZE ; + +setsockopt_ull_check (fd,AF_VSOCK ,SO_VM_SOCKETS_BUFFER_MAX_SIZE , + sock_buf_size, +"setsockopt(SO_VM_SOCKETS_BUFFER_MAX_SIZE)" ); + +setsockopt_ull_check (fd,AF_VSOCK ,SO_VM_SOCKETS_BUFFER_SIZE , + sock_buf_size, +"setsockopt(SO_VM_SOCKETS_BUFFER_SIZE)" ); +/* Wait, until receiver sets buffer size. */ control_expectln ("SRVREADY" );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 145/227 vsock/virtio: cap TX credit to local buffer size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Melbin K Mathew <[email protected]>
[ Upstream commit 8ee784fdf006cbe8739cfa093f54d326cbf54037 ]
The virtio transports derives its TX credit directly from peer_buf_alloc, which is set from the remote endpoint's SO_VM_SOCKETS_BUFFER_SIZE value.
On the host side this means that the amount of data we are willing to queue for a connection is scaled by a guest-chosen buffer size, rather than the host's own vsock configuration. A malicious guest can advertise a large buffer and read slowly, causing the host to allocate a correspondingly large amount of sk_buff memory.
The same thing would happen in the guest with a malicious host, since virtio transports share the same code base.
Introduce a small helper, virtio_transport_tx_buf_size(), that returns min(peer_buf_alloc, buf_alloc), and use it wherever we consume peer_buf_alloc.
This ensures the effective TX window is bounded by both the peer's advertised buffer and our own buf_alloc (already clamped to buffer_max_size via SO_VM_SOCKETS_BUFFER_MAX_SIZE), so a remote peer cannot force the other to queue more data than allowed by its own vsock settings.
On an unpatched Ubuntu 22.04 host (~64 GiB RAM), running a PoC with 32 guest vsock connections advertising 2 GiB each and reading slowly drove Slab/SUnreclaim from ~0.5 GiB to ~57 GiB; the system only recovered after killing the QEMU process. That said, if QEMU memory is limited with cgroups, the maximum memory used will be limited.
With this patch applied:
Before:
MemFree: ~61.6 GiB
Slab: ~142 MiB
SUnreclaim: ~117 MiBAfter 32 high-credit connections:
MemFree: ~61.5 GiB
Slab: ~178 MiB
SUnreclaim: ~152 MiBOnly ~35 MiB increase in Slab/SUnreclaim, no host OOM, and the guest remains responsive.
Compatibility with non-virtio transports:
- VMCI uses the AF_VSOCK buffer knobs to size its queue pairs per socket based on the local vsk->buffer_* values; the remote side cannot enlarge those queues beyond what the local endpoint configured.
- Hyper-V's vsock transport uses fixed-size VMBus ring buffers and an MTU bound; there is no peer-controlled credit field comparable to peer_buf_alloc, and the remote endpoint cannot drive in-flight kernel memory above those ring sizes.
- The loopback path reuses virtio_transport_common.c, so it naturally follows the same semantics as the virtio transport.
This change is limited to virtio_transport_common.c and thus affects virtio-vsock, vhost-vsock, and loopback, bringing them in line with the "remote window intersected with local policy" behaviour that VMCI and Hyper-V already effectively have.
--- net/vmw_vsock/virtio_transport_common.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/vmw_vsock/virtio_transport_common.c +12 -2
@@ -821,6 +821,15 @@ virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, }EXPORT_SYMBOL_GPL (virtio_transport_seqpacket_dequeue); +static u32 virtio_transport_tx_buf_size (struct virtio_vsock_sock *vvs) +{ +/* The peer advertises its receive buffer via peer_buf_alloc, but we +* cap it to our local buf_alloc so a remote peer cannot force us to +* queue more data than our own buffer configuration allows. +*/ +return min (vvs->peer_buf_alloc, vvs->buf_alloc); +} + int virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk, struct msghdr *msg,
@@ -830,7 +839,7 @@ virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk,spin_lock_bh (&vvs->tx_lock); -if (len > vvs->peer_buf_alloc) { +if (len >virtio_transport_tx_buf_size (vvs)) {spin_unlock_bh (&vvs->tx_lock);return -EMSGSIZE ; }
@@ -884,7 +893,8 @@ static s64 virtio_transport_has_space(struct virtio_vsock_sock *vvs)* we have bytes in flight (tx_cnt - peer_fwd_cnt), the subtraction * does not underflow. */ - bytes = (s64 )vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt); + bytes = (s64 )virtio_transport_tx_buf_size (vvs) - + (vvs->tx_cnt - vvs->peer_fwd_cnt);if (bytes <0 ) bytes =0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 146/227 hinic3: Fix netif_queue_set_napi queue_index input parameter error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fan Gong <[email protected]>
[ Upstream commit fb2bb2a1ebf7b9514c32b03bb5c3be5d518d437b ]
Incorrectly transmitted interrupt number instead of queue number when using netif_queue_set_napi. Besides, move this to appropriate code location to set napi.
Remove redundant netif_stop_subqueue beacuase it is not part of the hinic3_send_one_skb process.
--- .../net/ethernet/huawei/hinic3/hinic3_irq.c | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/net/ethernet/huawei/hinic3/hinic3_irq.c +13 -9
@@ -43,21 +43,12 @@ static void qp_add_napi(struct hinic3_irq_cfg *irq_cfg)struct hinic3_nic_dev *nic_dev =netdev_priv (irq_cfg->netdev);netif_napi_add (nic_dev->netdev, &irq_cfg->napi, hinic3_poll); -netif_queue_set_napi (irq_cfg->netdev, irq_cfg->irq_id, -NETDEV_QUEUE_TYPE_RX , &irq_cfg->napi); -netif_queue_set_napi (irq_cfg->netdev, irq_cfg->irq_id, -NETDEV_QUEUE_TYPE_TX , &irq_cfg->napi);napi_enable (&irq_cfg->napi); }static void qp_del_napi (struct hinic3_irq_cfg *irq_cfg) {napi_disable (&irq_cfg->napi); -netif_queue_set_napi (irq_cfg->netdev, irq_cfg->irq_id, -NETDEV_QUEUE_TYPE_RX ,NULL ); -netif_queue_set_napi (irq_cfg->netdev, irq_cfg->irq_id, -NETDEV_QUEUE_TYPE_TX ,NULL ); -netif_stop_subqueue (irq_cfg->netdev, irq_cfg->irq_id);netif_napi_del (&irq_cfg->napi); }
@@ -150,6 +141,11 @@ int hinic3_qps_irq_init(struct net_device *netdev) goto err_release_irqs; } +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_RX , &irq_cfg->napi); +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_TX , &irq_cfg->napi); +hinic3_set_msix_auto_mask_state (nic_dev->hwdev, irq_cfg->msix_entry_idx,HINIC3_SET_MSIX_AUTO_MASK );
@@ -164,6 +160,10 @@ int hinic3_qps_irq_init(struct net_device *netdev) q_id--; irq_cfg = &nic_dev->q_params.irq_cfg[q_id];qp_del_napi (irq_cfg); +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_RX ,NULL ); +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_TX ,NULL );hinic3_set_msix_state (nic_dev->hwdev, irq_cfg->msix_entry_idx,HINIC3_MSIX_DISABLE ); hinic3_set_msix_auto_mask_state(nic_dev->hwdev,
@@ -184,6 +184,10 @@ void hinic3_qps_irq_uninit(struct net_device *netdev)for (q_id =0 ; q_id < nic_dev->q_params.num_qps; q_id++) { irq_cfg = &nic_dev->q_params.irq_cfg[q_id];qp_del_napi (irq_cfg); +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_RX ,NULL ); +netif_queue_set_napi (irq_cfg->netdev, q_id, +NETDEV_QUEUE_TYPE_TX ,NULL );hinic3_set_msix_state (nic_dev->hwdev, irq_cfg->msix_entry_idx,HINIC3_MSIX_DISABLE ); hinic3_set_msix_auto_mask_state(nic_dev->hwdev,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 147/227 net/sched: act_ife: avoid possible NULL deref
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 27880b0b0d35ad1c98863d09788254e36f874968 ]
tcf_ife_encode() must make sure ife_encode() does not return NULL.
syzbot reported:
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:ife_tlv_meta_encode+0x41/0xa0 net/ife/ife.c:166 CPU: 3 UID: 0 PID: 8990 Comm: syz.0.696 Not tainted syzkaller #0 PREEMPT(full) Call Trace: <TASK> ife_encode_meta_u32+0x153/0x180 net/sched/act_ife.c:101 tcf_ife_encode net/sched/act_ife.c:841 [inline] tcf_ife_act+0x1022/0x1de0 net/sched/act_ife.c:877 tc_act include/net/tc_wrapper.h:130 [inline] tcf_action_exec+0x1c0/0xa20 net/sched/act_api.c:1152 tcf_exts_exec include/net/pkt_cls.h:349 [inline] mall_classify+0x1a0/0x2a0 net/sched/cls_matchall.c:42 tc_classify include/net/tc_wrapper.h:197 [inline] __tcf_classify net/sched/cls_api.c:1764 [inline] tcf_classify+0x7f2/0x1380 net/sched/cls_api.c:1860 multiq_classify net/sched/sch_multiq.c:39 [inline] multiq_enqueue+0xe0/0x510 net/sched/sch_multiq.c:66 dev_qdisc_enqueue+0x45/0x250 net/core/dev.c:4147 __dev_xmit_skb net/core/dev.c:4262 [inline] __dev_queue_xmit+0x2998/0x46c0 net/core/dev.c:4798
--- net/sched/act_ife.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/sched/act_ife.c +4 -2
@@ -821,6 +821,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,/* could be stupid policy setup or mtu config * so lets be conservative.. */ if ((action ==TC_ACT_SHOT ) || exceed_mtu) { +drop:qstats_drop_inc (this_cpu_ptr (ife->common.cpu_qstats));return TC_ACT_SHOT ; }
@@ -829,6 +830,8 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,skb_push (skb, skb->dev->hard_header_len); ife_meta =ife_encode (skb, metalen); +if (!ife_meta) + goto drop;spin_lock (&ife->tcf_lock);
@@ -844,8 +847,7 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,if (err <0 ) {/* too corrupt to keep around if overwritten */ spin_unlock (&ife->tcf_lock); -qstats_drop_inc (this_cpu_ptr (ife->common.cpu_qstats)); -return TC_ACT_SHOT ; + goto drop; } skboff += err; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 148/227 dpll: Prevent duplicate registrations
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit f3ddbaaaaf4d0633b40482f471753f9c71294a4a ]
Modify the internal registration helpers dpll_xa_ref_{dpll,pin}_add() to reject duplicate registration attempts.
Previously, if a caller attempted to register the same pin multiple times (with the same ops, priv, and cookie) on the same device, the core silently increments the reference count and return success. This behavior is incorrect because if the caller makes these duplicate registrations then for the first one dpll_pin_registration is allocated and for others the associated dpll_pin_ref.refcount is incremented. During the first unregistration the associated dpll_pin_registration is freed and for others WARN is fired.
Fix this by updating the logic to return -EEXIST if a matching registration is found to enforce a strict "register once" policy.
--- drivers/dpll/dpll_core.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/dpll/dpll_core.c +4 -8
@@ -83,10 +83,8 @@ dpll_xa_ref_pin_add(struct xarray *xa_pins, struct dpll_pin *pin,if (ref->pin != pin)continue ; reg =dpll_pin_registration_find (ref, ops, priv, cookie); -if (reg) { -refcount_inc (&ref->refcount); -return 0 ; - } +if (reg) +return -EEXIST ; ref_exists = true;break ; }
@@ -164,10 +162,8 @@ dpll_xa_ref_dpll_add(struct xarray *xa_dplls, struct dpll_device *dpll,if (ref->dpll != dpll)continue ; reg =dpll_pin_registration_find (ref, ops, priv, cookie); -if (reg) { -refcount_inc (&ref->refcount); -return 0 ; - } +if (reg) +return -EEXIST ; ref_exists = true;break ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 149/227 Octeontx2-af: Add proper checks for fwdata
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad Kelam <[email protected]>
[ Upstream commit 4a3dba48188208e4f66822800e042686784d29d1 ]
firmware populates MAC address, link modes (supported, advertised) and EEPROM data in shared firmware structure which kernel access via MAC block(CGX/RPM).
Accessing fwdata, on boards booted with out MAC block leading to kernel panics.
Internal error: Oops: 0000000096000005 [#1] SMP [ 10.460721] Modules linked in: [ 10.463779] CPU: 0 UID: 0 PID: 174 Comm: kworker/0:3 Not tainted 6.19.0-rc5-00154-g76ec646abdf7-dirty #3 PREEMPT [ 10.474045] Hardware name: Marvell OcteonTX CN98XX board (DT) [ 10.479793] Workqueue: events work_for_cpu_fn [ 10.484159] pstate: 80400009 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 10.491124] pc : rvu_sdp_init+0x18/0x114 [ 10.495051] lr : rvu_probe+0xe58/0x1d18
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 3 +++ drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +3 -0
@@ -1222,6 +1222,9 @@ int rvu_mbox_handler_cgx_set_link_mode(struct rvu *rvu,u8 cgx_idx, lmac;void *cgxd; +if (!rvu->fwdata) +return LMAC_AF_ERR_FIRMWARE_DATA_NOT_MAPPED ; +if (!is_cgx_config_permitted (rvu, req->hdr.pcifunc))return -EPERM ;
drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c +1 -1
@@ -56,7 +56,7 @@ int rvu_sdp_init(struct rvu *rvu)struct rvu_pfvf *pfvf;u32 i =0 ; -if (rvu->fwdata->channel_data.valid) { +if (rvu->fwdata && rvu->fwdata->channel_data.valid) { sdp_pf_num[0 ] =0 ; pfvf = &rvu->pf[sdp_pf_num[0 ]]; pfvf->sdp_info = &rvu->fwdata->channel_data.info;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 150/227 x86: make page fault handling disable interrupts properly
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cedric Xing <[email protected]>
[ Upstream commit 614da1d3d4cdbd6e41aea06bc97ec15aacff6daf ]
There's a big comment in the x86 do_page_fault() about our interrupt disabling code:
* User address page fault handling might have reenabled
* interrupts. Fixing up all potential exit points of
* do_user_addr_fault() and its leaf functions is just not
* doable w/o creating an unholy mess or turning the code
* upside down.
but it turns out that comment is subtly wrong, and the code as a result is also wrong.
Because it's certainly true that we may have re-enabled interrupts when handling user page faults. And it's most certainly true that we don't want to bother fixing up all the cases.
But what isn't true is that it's limited to user address page faults.
The confusion stems from the fact that we have logic here that depends on the address range of the access, but other code then depends on the _context_ the access was done in. The two are not related, even though both of them are about user-vs-kernel.
In other words, both user and kernel addresses can cause interrupts to have been enabled (eg when __bad_area_nosemaphore() gets called for user accesses to kernel addresses). As a result we should make sure to disable interrupts again regardless of the address range before returning to the low-level fault handling code.
The __bad_area_nosemaphore() code actually did disable interrupts again after enabling them, just not consistently. Ironically, as noted in the original comment, fixing up all the cases is just not worth it, when the simple solution is to just do it unconditionally in one single place.
So remove the incomplete case that unsuccessfully tried to do what the comment said was "not doable" in commit ca4c6a9858c2 ("x86/traps: Make interrupt enable/disable symmetric in C code"), and just make it do the simple and straightforward thing.
--- arch/x86/mm/fault.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/x86/mm/fault.c +5 -10
@@ -821,8 +821,6 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,force_sig_pkuerr ((void __user *)address, pkey); else force_sig_fault(SIGSEGV, si_code, (void __user *)address); - -local_irq_disable (); }static noinline void
@@ -1474,15 +1472,12 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code,do_kern_addr_fault (regs, error_code, address); }else {do_user_addr_fault (regs, error_code, address); -/* -* User address page fault handling might have reenabled -* interrupts. Fixing up all potential exit points of -* do_user_addr_fault() and its leaf functions is just not -* doable w/o creating an unholy mess or turning the code -* upside down. -*/ -local_irq_disable (); } +/* +* page fault handling might have reenabled interrupts, +* make sure to disable them again. +*/ +local_irq_disable (); }DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 151/227 keys/trusted_keys: fix handle passed to tpm_buf_append_name during unseal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srish Srinivasan <[email protected]>
[ Upstream commit 6342969dafbc63597cfc221aa13c3b123c2800c5 ]
TPM2_Unseal[1] expects the handle of a loaded data object, and not the handle of the parent key. But the tpm2_unseal_cmd provides the parent keyhandle instead of blob_handle for the session HMAC calculation. This causes unseal to fail.
Fix this by passing blob_handle to tpm_buf_append_name().
References:
[1] trustedcomputinggroup.org/wp-content/uploads/
Trusted-Platform-Module-2.0-Library-Part-3-Version-184_pub.pdf
--- security/keys/trusted-keys/trusted_tpm2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/keys/trusted-keys/trusted_tpm2.c +2 -2
@@ -489,7 +489,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, }/** -* tpm2_unseal_cmd() - execute a TPM2_Unload command +* tpm2_unseal_cmd() - execute a TPM2_Unseal command * * @chip: TPM chip to use * @payload: the key data in clear and encrypted form
@@ -520,7 +520,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,return rc; } - rc =tpm_buf_append_name (chip, &buf, options->keyhandle,NULL ); + rc =tpm_buf_append_name (chip, &buf, blob_handle,NULL );if (rc) goto out;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 152/227 leds: led-class: Only Add LED to leds_list when it is fully ready
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit d1883cefd31752f0504b94c3bcfa1f6d511d6e87 upstream.
Before this change the LED was added to leds_list before led_init_core() gets called adding it the list before led_classdev.set_brightness_work gets initialized.
This leaves a window where led_trigger_register() of a LED's default trigger will call led_trigger_set() which calls led_set_brightness() which in turn will end up queueing the *uninitialized* led_classdev.set_brightness_work.
This race gets hit by the lenovo-thinkpad-t14s EC driver which registers 2 LEDs with a default trigger provided by snd_ctl_led.ko in quick succession. The first led_classdev_register() causes an async modprobe of snd_ctl_led to run and that async modprobe manages to exactly hit the window where the second LED is on the leds_list without led_init_core() being called for it, resulting in:
------------[ cut here ]------------ WARNING: CPU: 11 PID: 5608 at kernel/workqueue.c:4234 __flush_work+0x344/0x390 Hardware name: LENOVO 21N2S01F0B/21N2S01F0B, BIOS N42ET93W (2.23 ) 09/01/2025 ... Call trace: __flush_work+0x344/0x390 (P) flush_work+0x2c/0x50 led_trigger_set+0x1c8/0x340 led_trigger_register+0x17c/0x1c0 led_trigger_register_simple+0x84/0xe8 snd_ctl_led_init+0x40/0xf88 [snd_ctl_led] do_one_initcall+0x5c/0x318 do_init_module+0x9c/0x2b8 load_module+0x7e0/0x998
Close the race window by moving the adding of the LED to leds_list to after the led_init_core() call.
--- drivers/leds/led-class.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/leds/led-class.c +5 -5
@@ -560,11 +560,6 @@ int led_classdev_register_ext(struct dev#ifdef CONFIG_LEDS_BRIGHTNESS_HW_CHANGED led_cdev->brightness_hw_changed =-1 ;#endif -/* add to the list of leds */ -down_write (&leds_list_lock); -list_add_tail (&led_cdev->node, &leds_list); -up_write (&leds_list_lock); -if (!led_cdev->max_brightness) led_cdev->max_brightness =LED_FULL ;
@@ -574,6 +569,11 @@ int led_classdev_register_ext(struct devled_init_core (led_cdev); +/* add to the list of leds */ +down_write (&leds_list_lock); +list_add_tail (&led_cdev->node, &leds_list); +up_write (&leds_list_lock); +#ifdef CONFIG_LEDS_TRIGGERS led_trigger_set_default (led_cdev);#endif
Greg Kroah-Hartman
maintainerPATCH 153/227 panic: only warn about deprecated panic_print on write access
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
commit 90f3c123247e9564f2ecf861946ec41ceaf5e198 upstream.
The panic_print_deprecated() warning is being triggered on both read and write operations to the panic_print parameter.
This causes spurious warnings when users run 'sysctl -a' to list all sysctl values, since that command reads /proc/sys/kernel/panic_print and triggers the deprecation notice.
Modify the handlers to only emit the deprecation warning when the parameter is actually being set:
- sysctl_panic_print_handler(): check 'write' flag before warning.
- panic_print_get(): remove the deprecation call entirely.
This way, users are only warned when they actively try to use the deprecated parameter, not when passively querying system state.
--- kernel/panic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/panic.c +2 -2
@@ -131,7 +131,8 @@ static int proc_taint(const struct ctl_tstatic int sysctl_panic_print_handler (const struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) { -panic_print_deprecated (); +if (write) +panic_print_deprecated ();return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); }
@@ -1010,7 +1011,6 @@ static int panic_print_set(const char *vstatic int panic_print_get (char *val,const struct kernel_param *kp) { -panic_print_deprecated ();return param_get_ulong (val, kp); }